Changeset 14134 in vbox

Timestamp:

Nov 12, 2008 5:22:40 PM (16 years ago)

Author:

vboxsync

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

39221

Message:

32->64 bit mode skeleton, nothing yet works, for sure

Location:

trunk/src

Files:

• VBox/VMM/Makefile.kmk (modified) (1 diff)
• VBox/VMM/VMMSwitcher.cpp (modified) (1 diff)
• VBox/VMM/VMMSwitcher/VMMSwitcher.mac (modified) (1 diff)
• recompiler_new/VBoxRecompiler.c (modified) (1 diff)

trunk/src/VBox/VMM/Makefile.kmk

@@ -138 +138 @@
         VMMSwitcher/32BitToPAE.asm \
         VMMSwitcher/PAETo32Bit.asm \
-        VMMSwitcher/PAEToPAE.asm
+        VMMSwitcher/PAEToPAE.asm \
+        VMMSwitcher/32BitToAMD64.asm
 VMMR3_SOURCES.amd64 = \
         VMMSwitcher/AMD64ToPAE.asm

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -68 +68 @@
     NULL,   //&vmmR3Switcher32BitTo32Bit_Def,
     NULL,   //&vmmR3Switcher32BitToPAE_Def,
-    NULL,   //&vmmR3Switcher32BitToAMD64_Def,
+    &vmmR3Switcher32BitToAMD64_Def,
     NULL,   //&vmmR3SwitcherPAETo32Bit_Def,
     NULL,   //&vmmR3SwitcherPAEToPAE_Def,

trunk/src/VBox/VMM/VMMSwitcher/VMMSwitcher.mac

@@ -35 +35 @@
 %define VMMSWITCHER_AMD64_TO_PAE        7
 %define VMMSWITCHER_AMD64_TO_AMD64      8
+%define VMMSWITCHER_AMD64_TO_32         11
 %define VMMSWITCHER_HOST_TO_VMX         9
 %define VMMSWITCHER_HOST_TO_SVM         10
-%define VMMSWITCHER_MAX                 11
+%define VMMSWITCHER_MAX                 12
 ; }
 

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1909 +1909 @@
     {
         /* In 'normal' raw mode we don't have access to the hidden selector registers. */
-        if (pVM->rem.s.Env.segs[R_SS].selector != (uint16_t)pCtx->ss)
+        if (pVM->rem.s.Env.segs[R_SS].selector != pCtx->ss)
         {
             Log2(("REMR3State: SS changed from %04x to %04x!\n", pVM->rem.s.Env.segs[R_SS].selector, pCtx->ss));