Changeset 61112 in vbox for trunk/src/VBox

Timestamp:

May 20, 2016 4:58:41 PM (9 years ago)

Author:

vboxsync

Message:

CPUMRZA.asm: Missed one pXStatR0.

File:

• trunk/src/VBox/VMM/VMMRZ/CPUMRZA.asm (modified) (1 diff)

trunk/src/VBox/VMM/VMMRZ/CPUMRZA.asm

@@ -212 +212 @@
         SEH64_SET_FRAME_xBP 0
 SEH64_END_PROLOGUE
+
 %ifndef VBOX_WITH_KERNEL_USING_XMM
-
         ;
         ; Load xCX with the guest pXStateR0.
         ;
- %ifdef RT_ARCH_AMD64
-  %ifdef ASM_CALL64_MSC
-        mov     xCX, [rcx + CPUMCPU.Guest.pXStateR0]
-  %else
-        mov     xCX, [rdi + CPUMCPU.Guest.pXStateR0]
-  %endif
- %else
-        mov     ecx, dword [ebp + 8]
-        mov     ecx, [ecx + CPUMCPU.Guest.pXStateR0]
+ %ifdef ASM_CALL64_GCC
+        mov     xCX, rdi
+ %elifdef RT_ARCH_X86
+        mov     xCX, dword [ebp + 8]
+ %endif
+ %ifdef IN_RING0
+        mov     xCX, [xCX + CPUMCPU.Guest.pXStateR0]
+ %elifdef IN_RC
+        mov     xCX, [xCX + CPUMCPU.Guest.pXStateRC]
+ %else
+  %error "Invalid context!"
  %endif