Changeset 140 in vbox

Timestamp:

Jan 18, 2007 3:28:16 PM (18 years ago)

Author:

vboxsync

Message:

64-bit.

Location:

trunk/src/VBox/VMM

Files:

• CPUMInternal.h (modified) (2 diffs)
• VMMInternal.h (modified) (2 diffs)
• VMMInternal.mac (modified) (2 diffs)
• VMMR0/VMMR0.cpp (modified) (1 diff)
• VMMR0/VMMR0A.asm (modified) (5 diffs)

trunk/src/VBox/VMM/CPUMInternal.h

@@ -153 +153 @@
     uint8_t         auPadding[24];
 
-#else  /* 64-bit */
+#elif HC_ARCH_BITS == 64
     /** General purpose register ++
      * { */
@@ -234 +234 @@
     /* padding to get 32byte aligned size */
     uint8_t         auPadding[8];
-#endif /* 64-bit */
+#else
+# error HC_ARCH_BITS not defined
+#endif 
 } CPUMHOSTCTX, *PCPUMHOSTCTX;
 

trunk/src/VBox/VMM/VMMInternal.h

@@ -102 +102 @@
     /** Tranditional jmp_buf stuff
      * @{ */
+#if HC_ARCH_BITS == 32
     uint32_t    ebx;
     uint32_t    esi;
@@ -108 +109 @@
     uint32_t    esp;
     uint32_t    eip;
+#endif 
+#if HC_ARCH_BITS == 64
+    uint64_t    rbx;
+# ifdef __WIN__
+    uint64_t    rsi;            
+    uint64_t    rdi;            
+# endif
+    uint64_t    rbp;
+    uint64_t    r12;
+    uint64_t    r13;
+    uint64_t    r14;
+    uint64_t    r15;
+    uint64_t    rsp;
+    uint64_t    rip;
+#endif 
     /** @} */
 
     /** Flag that indicates that we've done a ring-3 call. */
     bool        fInRing3Call;
+    /** The number of bytes we've saved. */
+    uint32_t    cbSavedStack;
     /** Pointer to the buffer used to save the stack.
      * This is assumed to be 8KB. */
     void       *pvSavedStack;
-    /** The number of bytes we've saved. */
-    uint32_t    cbSavedStack;
     /** Esp we we match against esp on resume to make sure the stack wasn't relocated. */
-    uint32_t    espCheck;
+    RTHCUINTREG SpCheck;
     /** The esp we should resume execution with after the restore. */
-    uint32_t    espResume;
+    RTHCUINTREG SpResume;
 } VMMR0JMPBUF, *PVMMR0JMPBUF;
 

trunk/src/VBox/VMM/VMMInternal.mac

@@ -34 +34 @@
     ; additional state and stack info.
     .fInRing3Call   resd 1
+    .cbSavedStack   resd 1
     .pvSavedStack   resd 1
-    .cbSavedStack   resd 1
-    .espCheck       resd 1
-    .espResume      resd 1
+    .SpCheck        resd 1
+    .SpResume       resd 1
 %endif
 %ifdef __AMD64__
@@ -58 +58 @@
     .cbSavedStack   resd 1
     .pvSavedStack   resq 1
-    .rspCheck       resq 1
-    .rspResume      resq 1
+    .SpCheck        resq 1
+    .SpResume       resq 1
 %endif
 endstruc

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -657 +657 @@
      * Check that the jump buffer is armed.
      */
+#ifdef __X86__
     if (!pVM->vmm.s.CallHostR0JmpBuf.eip)
+#else
+    if (!pVM->vmm.s.CallHostR0JmpBuf.rip)
+#endif
     {
         LogCom(("vmmR0LoggerFlush: Jump buffer isn't armed!\n"));

trunk/src/VBox/VMM/VMMR0/VMMR0A.asm

@@ -83 +83 @@
 .resume:
     ; Sanity checks.
-    cmp     ecx, [edx + VMMR0JMPBUF.espCheck]
+    cmp     ecx, [edx + VMMR0JMPBUF.SpCheck]
     je      .espCheck_ok
 .bad:
@@ -100 +100 @@
     jnz     .bad
     mov     edi, [edx + VMMR0JMPBUF.esp]
-    sub     edi, [edx + VMMR0JMPBUF.espResume]
+    sub     edi, [edx + VMMR0JMPBUF.SpResume]
     cmp     ecx, edi
     jne     .bad
@@ -111 +111 @@
     shr     ecx, 2
     mov     esi, [edx + VMMR0JMPBUF.pvSavedStack]
-    mov     edi, [edx + VMMR0JMPBUF.espResume]
+    mov     edi, [edx + VMMR0JMPBUF.SpResume]
     mov     esp, edi
     rep movsd
@@ -168 +168 @@
     ;
     mov     edi, [edx + VMMR0JMPBUF.pvSavedStack]
-    mov     [edx + VMMR0JMPBUF.espResume], esp
+    mov     [edx + VMMR0JMPBUF.SpResume], esp
     mov     esi, esp
     mov     ecx, [edx + VMMR0JMPBUF.esp]
@@ -193 +193 @@
     ; store the last pieces of info.
     mov     ecx, [edx + VMMR0JMPBUF.esp]
-    mov     [edx + VMMR0JMPBUF.espCheck], ecx
+    mov     [edx + VMMR0JMPBUF.SpCheck], ecx
     mov     byte [edx + VMMR0JMPBUF.fInRing3Call], 1