VMMSwitcher

Timestamp:

Feb 17, 2009 4:19:51 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

42966

Message:

Load hypervisor CR3 from CPUM (instead of hardcoded fixups in the switchers). Dangerous change. Watch for regressions.

Location:

trunk/src/VBox/VMM/VMMSwitcher

Files:

trunk/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm

r8155	r16859
28	28	%define SWITCHER_FIX_INTER_CR3_HC FIX_INTER_32BIT_CR3
29	29	%define SWITCHER_FIX_INTER_CR3_GC FIX_INTER_32BIT_CR3
30		~~%define SWITCHER_FIX_HYPER_CR3 FIX_HYPER_32BIT_CR3~~
31	30
32	31	;*******************************************************************************

r8155	r16859
28	28	%define SWITCHER_FIX_INTER_CR3_HC FIX_INTER_32BIT_CR3
29	29	%define SWITCHER_FIX_INTER_CR3_GC FIX_INTER_PAE_CR3
30		~~%define SWITCHER_FIX_HYPER_CR3 FIX_HYPER_PAE_CR3~~
31	30	%define NEED_PAE_ON_32BIT_HOST 1
32	31

r14169	r16859
30	30	;%define SWITCHER_FIX_INTER_CR3_HC FIX_INTER_AMD64_CR3
31	31	%define SWITCHER_FIX_INTER_CR3_GC FIX_INTER_32BIT_CR3
32		~~%define SWITCHER_FIX_HYPER_CR3 FIX_HYPER_32BIT_CR3~~
33	32
34	33

r14167	r16859
30	30	;%define SWITCHER_FIX_INTER_CR3_HC FIX_INTER_AMD64_CR3
31	31	%define SWITCHER_FIX_INTER_CR3_GC FIX_INTER_PAE_CR3
32		~~%define SWITCHER_FIX_HYPER_CR3 FIX_HYPER_PAE_CR3~~
33	32
34	33

-              r15414
+              r16859
     DEBUG_CHAR('1')                     ; trashes esi
+    ; Store the hypervisor cr3 for later loading
+    mov     ebp, [rdx + CPUM.Hyper.cr3]
     ;;
     ;; Load Intermediate memory context.
 …
 ;jnz .delay_loop
     ; load final cr3 and do far jump to load cs.
+    FIXUP SWITCHER_FIX_HYPER_CR3, 1
+    mov     eax, 0ffffffffh
+    mov     cr3, eax
+    mov     cr3, ebp                ; ebp set above
     DEBUG_CHAR('0')

r8155	r16859
28	28	%define SWITCHER_FIX_INTER_CR3_HC FIX_INTER_PAE_CR3
29	29	%define SWITCHER_FIX_INTER_CR3_GC FIX_INTER_32BIT_CR3
30		~~%define SWITCHER_FIX_HYPER_CR3 FIX_HYPER_32BIT_CR3~~
31	30	%define NEED_32BIT_ON_PAE_HOST 1
32	31

r8155	r16859
28	28	%define SWITCHER_FIX_INTER_CR3_HC FIX_INTER_PAE_CR3
29	29	%define SWITCHER_FIX_INTER_CR3_GC FIX_INTER_PAE_CR3
30		~~%define SWITCHER_FIX_HYPER_CR3 FIX_HYPER_PAE_CR3~~
31	30
32	31	;*******************************************************************************

-              r14192
+              r16859
     DEBUG_CHAR('1')                     ; trashes esi
+    ; Store the hypervisor cr3 for later loading
+    mov     ebp, [edx + CPUM.Hyper.cr3]
     ;;
     ;; Load Intermediate memory context.
 …
     DEBUG_CHAR('-')
     ; load final cr3 and do far jump to load cs.
+    FIXUP SWITCHER_FIX_HYPER_CR3, 1
+    mov     eax, 0ffffffffh
+    mov     cr3, eax
+    mov     cr3, ebp            ; ebp set above
     DEBUG_CHAR('0')

Note: See TracChangeset for help on using the changeset viewer.