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

Timestamp:

Nov 28, 2008 3:11:20 PM (16 years ago)

Author:

vboxsync

Message:

More switcher updates

Location:

trunk/src/VBox/VMM

Files:

• CPUMInternal.h (modified) (1 diff)
• CPUMInternal.mac (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• VMMGC/VMMGC.def (modified) (1 diff)
• VMMSwitcher/LegacyandAMD64.mac (modified) (2 diffs)

trunk/src/VBox/VMM/CPUMInternal.h

@@ -361 +361 @@
     uint32_t                ulOffCPUM;
 
-    /* Round to 16 byte size. */
+    /* Temporary storage for the return code of the function called in the 32-64 switcher. */
+    uint32_t                u32RetCode;
+
+    /* Round to 16 byte size.
     uint32_t                uPadding;
+     */
 } CPUMCPU, *PCPUMCPU;
 /** Pointer to the CPUMCPU instance data residing in the shared VMCPU structure. */

trunk/src/VBox/VMM/CPUMInternal.mac

@@ -407 +407 @@
     .fChanged             resd    1
     .ulOffCPUM            resd    1
-    .uPadding             resd    1    
+    .u32RetCode           resd    1    
 endstruc
 

trunk/src/VBox/VMM/Makefile.kmk

@@ -336 +336 @@
         VMMAll/CPUMAllA.asm \
         VMMAll/DBGFAll.cpp \
+        VMMGC/HWACCMGCA.asm \
         VMMAll/IOMAll.cpp \
         VMMAll/IOMAllMMIO.cpp \

trunk/src/VBox/VMM/VMMGC/VMMGC.def

@@ -63 +63 @@
     VMSetError
     VMSetErrorV
+    VMXGCStartVM64
+    SVMGCVMRun64
 
     ; runtime

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

@@ -232 +232 @@
 ALIGNCODE(16)
 GLOBALNAME ICEnterTarget     
-    ; at this moment we're in 64-bit mode. let's write something to CPUM
     ; Load CPUM pointer into rdx
     mov     rdx, [NAME(pCpumIC) wrt rip]
-    ; Load the CPUMCPU offset.
-    mov     r8, [rdx + CPUM.ulOffCPUMCPU]
-        
-    mov rsi, 012345678h
-    mov [rdx + r8 + CPUMCPU.uPadding], rsi
-
+    
+    mov     rax, cs
+    mov     ds, rax
+    mov     es, rax
+    mov     fs, rax
+    mov     gs, rax
+    
+    ; 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]
+
+    ; call the hypervisor function with rdx=pCpumCpu
+    mov     eax, [rdx + r8 + CPUM.Hyper.eip]
+    CPUMCPU_FROM_CPUM(rdx)    
+    call    rax
+    
+    ; Load CPUM pointer into rdx
+    mov     rdx, [NAME(pCpumIC) wrt rip]
+    CPUMCPU_FROM_CPUM(rdx)
+    
+    ; Save the return code
+    mov     [rdx + CPUMCPU.u32RetCode], eax
+    
     ; now let's switch back
-    mov     rax,  0666h
     jmp     NAME(VMMGCGuestToHostAsm)   ; rax = returncode.
 
@@ -439 +457 @@
 
     ; restore general registers.
-    mov     eax, edi                    ; restore return code. eax = return code !!
     mov     edi, [edx + CPUMCPU.Host.edi]
     mov     esi, [edx + CPUMCPU.Host.esi]
     mov     ebx, [edx + CPUMCPU.Host.ebx]
     mov     ebp, [edx + CPUMCPU.Host.ebp]
+
+    ; store the return code in eax    
+    mov     eax, [edx + CPUMCPU.u32RetCode]
+    
     push    dword [edx + CPUMCPU.Host.eflags]
     popfd
 
-%ifdef DEBUG_STUFF
-;    COM_S_CHAR '4'
-%endif
     retf