Changeset 55059 in vbox

Timestamp:

Mar 31, 2015 11:05:42 PM (10 years ago)

Author:

vboxsync

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

99348

Message:

CPUMR[0C]A.asm: Fixed 32-bit breakage. Forgot to update the pCpumCpu parameter location.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/CPUMR0A.asm (modified) (13 diffs)
• VMMRC/CPUMRCA.asm (modified) (2 diffs)

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

@@ -1 @@
-; $Id$
+ ; $Id$
 ;; @file
 ; CPUM - Ring-0 Assembly Routines (supporting HM and IEM).
@@ -189 +189 @@
 ;
 ; @returns  0
-; @param    pCpumCpu  x86:[esp+4] gcc:rdi msc:rcx     CPUMCPU pointer
+; @param    pCpumCpu  x86:[ebp+8] gcc:rdi msc:rcx     CPUMCPU pointer
 ;
 align 16
@@ -205 +205 @@
  %define pXState    r10
 %else
+        push    ebp
+        mov     ebp, esp
         push    ebx
         push    esi
-        mov     ebx, dword [esp + 4]
+        mov     ebx, dword [ebp + 8]
  %define pCpumCpu ebx
  %define pXState  esi
@@ -271 +273 @@
         pop     esi
         pop     ebx
+        leave
 %endif
         xor     eax, eax
@@ -306 +309 @@
 ;
 ; @returns  VINF_SUCCESS (0) in EAX
-; @param    pCpumCpu  x86:[esp+4] gcc:rdi msc:rcx     CPUMCPU pointer
+; @param    pCpumCpu  x86:[ebp+8] gcc:rdi msc:rcx     CPUMCPU pointer
 ;
 align 16
@@ -322 +325 @@
  %define pXState    r10
 %else
+        push    ebp
+        mov     ebp, esp
         push    ebx
         push    esi
-        mov     ebx, dword [esp + 4]
+        mov     ebx, dword [ebp + 8]
  %define pCpumCpu ebx
  %define pXState  esi
@@ -360 +365 @@
         pop     esi
         pop     ebx
+        leave
 %endif
         xor     eax, eax
@@ -387 +393 @@
 ;
 ; @returns  VINF_SUCCESS (0) in eax.
-; @param    pCpumCpu  x86:[esp+4] gcc:rdi msc:rcx     CPUMCPU pointer
+; @param    pCpumCpu  x86:[ebp+8] gcc:rdi msc:rcx     CPUMCPU pointer
 ;
 align 16
@@ -403 +409 @@
  %define pXState    r10
 %else
+        push    ebp
+        mov     ebp, esp
         push    ebx
         push    esi
-        mov     ebx, dword [esp + 4]
+        mov     ebx, dword [ebp + 8]
  %define pCpumCpu ebx
  %define pXState  esi
@@ -457 +465 @@
         pop     esi
         pop     ebx
+        leave
 %endif
         xor     eax, eax
@@ -490 +499 @@
 ;
 ; @returns  0
-; @param    pCpumCpu  x86:[esp+4] gcc:rdi msc:rcx     CPUMCPU pointer
+; @param    pCpumCpu  x86:[ebp+8] gcc:rdi msc:rcx     CPUMCPU pointer
 ;
 align 16
@@ -506 +515 @@
  %define pXState    r10
 %else
+        push    ebp
+        mov     ebp, esp
         push    ebx
         push    esi
-        mov     ebx, dword [esp + 4]
+        mov     ebx, dword [ebp + 8]
  %define pCpumCpu ebx
  %define pXState  esi
@@ -548 +559 @@
         pop     esi
         pop     ebx
+        leave
 %endif
         xor     eax, eax

trunk/src/VBox/VMM/VMMRC/CPUMRCA.asm

@@ -58 +58 @@
 ; @returns  0 if caller should continue execution.
 ; @returns  VINF_EM_RAW_GUEST_TRAP if a guest trap should be generated.
-; @param    pCPUMCPU  x86:[esp+4] gcc:rdi msc:rcx     CPUMCPU pointer
+; @param    pCpumCpu    [ebp+8]     Pointer to the CPUMCPU.
 ;
 align 16
 BEGINPROC   cpumHandleLazyFPUAsm
+        push    ebp
+        mov     ebp, esp
         push    ebx
         push    esi
-        mov     ebx, [esp + 4]
+        mov     ebx, [ebp + 8]
 %define pCpumCpu ebx
 %define pXState  esi
@@ -168 +170 @@
         pop     ebx
         mov     eax, VINF_EM_RAW_GUEST_TRAP
+        leave
         ret
 ENDPROC     cpumHandleLazyFPUAsm