Deleted Added
full compact
vm86bios.s (106542) vm86bios.s (112841)
1/*-
2 * Copyright (c) 1998 Jonathan Lemon
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1998 Jonathan Lemon
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/i386/i386/vm86bios.s 106542 2002-11-07 01:34:23Z davidxu $
26 * $FreeBSD: head/sys/i386/i386/vm86bios.s 112841 2003-03-30 05:24:52Z jake $
27 */
28
29#include "opt_npx.h"
30
31#include <machine/asmacros.h> /* miscellaneous asm macros */
32#include <machine/trap.h>
33
34#include "assym.s"

--- 83 unchanged lines hidden (view full) ---

118 pushl %eax /* old ptde != 0 when booting */
119 pushl %ebx /* keep for reuse */
120
121 movl %esp,SCR_STACK(%edx) /* save current stack location */
122
123 movl SCR_NEWPTD(%edx),%eax /* mapping for vm86 page table */
124 movl %eax,0(%ebx) /* ... install as PTD entry 0 */
125
27 */
28
29#include "opt_npx.h"
30
31#include <machine/asmacros.h> /* miscellaneous asm macros */
32#include <machine/trap.h>
33
34#include "assym.s"

--- 83 unchanged lines hidden (view full) ---

118 pushl %eax /* old ptde != 0 when booting */
119 pushl %ebx /* keep for reuse */
120
121 movl %esp,SCR_STACK(%edx) /* save current stack location */
122
123 movl SCR_NEWPTD(%edx),%eax /* mapping for vm86 page table */
124 movl %eax,0(%ebx) /* ... install as PTD entry 0 */
125
126#ifdef PAE
127 movl IdlePDPT,%ecx
128#endif
126 movl %ecx,%cr3 /* new page tables */
127 movl SCR_VMFRAME(%edx),%esp /* switch to new stack */
128
129 call vm86_prepcall /* finish setup */
130
131 /*
132 * Return via doreti
133 */

--- 42 unchanged lines hidden ---
129 movl %ecx,%cr3 /* new page tables */
130 movl SCR_VMFRAME(%edx),%esp /* switch to new stack */
131
132 call vm86_prepcall /* finish setup */
133
134 /*
135 * Return via doreti
136 */

--- 42 unchanged lines hidden ---