Changeset 14134
- Timestamp:
- 11/12/08 18:22:40 (2 months ago)
- Files:
-
- trunk/src/VBox/VMM/Makefile.kmk (modified) (1 diff)
- trunk/src/VBox/VMM/VMMSwitcher.cpp (modified) (1 diff)
- trunk/src/VBox/VMM/VMMSwitcher/VMMSwitcher.mac (modified) (1 diff)
- trunk/src/recompiler_new/VBoxRecompiler.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/VBox/VMM/Makefile.kmk
r14116 r14134 138 138 VMMSwitcher/32BitToPAE.asm \ 139 139 VMMSwitcher/PAETo32Bit.asm \ 140 VMMSwitcher/PAEToPAE.asm 140 VMMSwitcher/PAEToPAE.asm \ 141 VMMSwitcher/32BitToAMD64.asm 141 142 VMMR3_SOURCES.amd64 = \ 142 143 VMMSwitcher/AMD64ToPAE.asm trunk/src/VBox/VMM/VMMSwitcher.cpp
r13830 r14134 68 68 NULL, //&vmmR3Switcher32BitTo32Bit_Def, 69 69 NULL, //&vmmR3Switcher32BitToPAE_Def, 70 NULL, //&vmmR3Switcher32BitToAMD64_Def,70 &vmmR3Switcher32BitToAMD64_Def, 71 71 NULL, //&vmmR3SwitcherPAETo32Bit_Def, 72 72 NULL, //&vmmR3SwitcherPAEToPAE_Def, trunk/src/VBox/VMM/VMMSwitcher/VMMSwitcher.mac
r13813 r14134 35 35 %define VMMSWITCHER_AMD64_TO_PAE 7 36 36 %define VMMSWITCHER_AMD64_TO_AMD64 8 37 %define VMMSWITCHER_AMD64_TO_32 11 37 38 %define VMMSWITCHER_HOST_TO_VMX 9 38 39 %define VMMSWITCHER_HOST_TO_SVM 10 39 %define VMMSWITCHER_MAX 1 140 %define VMMSWITCHER_MAX 12 40 41 ; } 41 42 trunk/src/recompiler_new/VBoxRecompiler.c
r13968 r14134 1909 1909 { 1910 1910 /* In 'normal' raw mode we don't have access to the hidden selector registers. */ 1911 if (pVM->rem.s.Env.segs[R_SS].selector != (uint16_t)pCtx->ss)1911 if (pVM->rem.s.Env.segs[R_SS].selector != pCtx->ss) 1912 1912 { 1913 1913 Log2(("REMR3State: SS changed from %04x to %04x!\n", pVM->rem.s.Env.segs[R_SS].selector, pCtx->ss));
