Changeset 14987 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 4, 2008 2:32:53 PM (16 years ago)

Author:

vboxsync

Message:

Fully functional switcher

Location:

trunk/src/VBox/VMM

Files:

• CPUMInternal.mac (modified) (2 diffs)
• VMMSwitcher/LegacyandAMD64.mac (modified) (1 diff)

trunk/src/VBox/VMM/CPUMInternal.mac

@@ -415 +415 @@
 ; @param   %1   register name
 %macro CPUMCPU_FROM_CPUM 1
-    add     %1, [%1 + CPUM.ulOffCPUMCPU]
+    add     %1, dword [%1 + CPUM.ulOffCPUMCPU]
 %endmacro
 
@@ -422 +422 @@
 ; @param   %1   register name
 %macro CPUM_FROM_CPUMCPU 1
-    sub     %1, [%1 + CPUMCPU.ulOffCPUM]
+    sub     %1, dword [%1 + CPUMCPU.ulOffCPUM]
 %endmacro

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

@@ -242 +242 @@
    
     ; Setup stack; use the lss_esp, ss pair for lss
-;;    DEBUG_CHAR('7')
-;;    mov     rsp, 0
-;;    mov     eax, [rdx + CPUM.Hyper.esp]
-;;    mov     [rdx + CPUM.Hyper.lss_esp], eax
-;;    lss     esp, [rdx + CPUM.Hyper.lss_esp]
+    DEBUG_CHAR('7')
+    mov     rsp, 0
+    mov     eax, [rdx + CPUM.Hyper.esp]
+    mov     [rdx + CPUM.Hyper.lss_esp], eax
+    lss     esp, [rdx + CPUM.Hyper.lss_esp]
 
     ; call the hypervisor function with rdx=pCpumCpu
-;;    mov     eax, [rdx + r8 + CPUM.Hyper.eip]
-;;    CPUMCPU_FROM_CPUM(rdx)    
-;;    call    rax
+    mov     eax, [rdx + CPUM.Hyper.eip]
+    CPUMCPU_FROM_CPUM(edx)
+    call    rax
     
     ; Load CPUM pointer into rdx
     mov     rdx, [NAME(pCpumIC) wrt rip]
-;;    CPUMCPU_FROM_CPUM(rdx)
+    CPUMCPU_FROM_CPUM(edx)
     
     ; Save the return code
-;;    mov     [rdx + CPUMCPU.u32RetCode], eax
+    mov     [rdx + CPUMCPU.u32RetCode], eax
     
     ; now let's switch back