Changeset 57429 in vbox for trunk/src/VBox/VMM/VMMSwitcher

Timestamp:

Aug 18, 2015 1:35:18 PM (10 years ago)

Author:

vboxsync

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

102194

Message:

VMM/HM: Start removing VBOX_WITH_HYBRID_32BIT_KERNEL code.

Location:

trunk/src/VBox/VMM/VMMSwitcher

Files:

• AMD64Stub.asm (modified) (1 diff)
• AMD64andLegacy.mac (modified) (2 diffs)

trunk/src/VBox/VMM/VMMSwitcher/AMD64Stub.asm

@@ -32 +32 @@
 GLOBALNAME Start
 
-%ifndef VBOX_WITH_HYBRID_32BIT_KERNEL
-BITS 64
-%else
 BITS 32
-%endif
+
 BEGINPROC vmmR0ToRawMode
     mov     eax, VERR_VMM_SWITCHER_STUB

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

@@ -47 +47 @@
 GLOBALNAME Start
 
-%ifndef VBOX_WITH_HYBRID_32BIT_KERNEL
 BITS 64
 
@@ -204 +203 @@
     ret
 ENDPROC vmmR0ToRawMode
-
-
-%else ; VBOX_WITH_HYBRID_32BIT_KERNEL
-
-
-BITS 32
-
-;;
-; The C interface.
-;
-BEGINPROC vmmR0ToRawMode
- %ifdef DEBUG_STUFF
-    COM32_S_NEWLINE
-    COM32_S_CHAR '^'
- %endif
-
- %ifdef VBOX_WITH_STATISTICS
-    ;
-    ; Switcher stats.
-    ;
-    FIXUP FIX_HC_VM_OFF, 1, VM.StatSwitcherToGC
-    mov     edx, 0ffffffffh
-    STAM_PROFILE_ADV_START edx
- %endif
-
-    ; Thunk to/from 64 bit when invoking the worker routine.
-    ;
-    FIXUP FIX_HC_VM_OFF, 1, VM.cpum
-    mov     edx, 0ffffffffh
-
-    push    0
-    push    cs
-    push    0
-    FIXUP FIX_HC_32BIT, 1, .vmmR0ToRawModeReturn - NAME(Start)
-    push    0ffffffffh
-
-    FIXUP FIX_HC_64BIT_CS, 1
-    push    0ffffh
-    FIXUP FIX_HC_32BIT, 1, NAME(vmmR0ToRawModeAsm) - NAME(Start)
-    push    0ffffffffh
-    retf
-.vmmR0ToRawModeReturn:
-
-    ;
-    ; This selector reloading is probably not necessary, but we do it anyway to be quite sure
-    ; the CPU has the right idea about the selectors.
-    ;
-    mov     edx, ds
-    mov     ds, edx
-    mov     ecx, es
-    mov     es, ecx
-    mov     edx, ss
-    mov     ss, edx
-
- %ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
- Missing implementation!
- %endif
-
-
- %ifdef VBOX_WITH_STATISTICS
-    ;
-    ; Switcher stats.
-    ;
-    FIXUP FIX_HC_VM_OFF, 1, VM.StatSwitcherToHC
-    mov     edx, 0ffffffffh
-    STAM_PROFILE_ADV_STOP edx
- %endif
-
-    ret
-ENDPROC vmmR0ToRawMode
-
-BITS 64
-%endif ;!VBOX_WITH_HYBRID_32BIT_KERNEL