Changeset 41150 in vbox

Timestamp:

May 3, 2012 8:39:26 PM (13 years ago)

Author:

vboxsync

Message:

Fixes.

Location:

trunk/src/VBox/VMM

Files:

• VMMRC/VMMRCA.asm (modified) (1 diff)
• include/VMMInternal.mac (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (1 diff)

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

@@ -242 +242 @@
         ;
         mov     edx, IMP(g_VM)
-        add     edx, [ecx + VM.offVMCPU]
-        cmp     dword [edx + VMMCPU.cCallRing3Disabled], 0
+        add     edx, [edx + VM.offVMCPU]
+        cmp     dword [edx + VMCPU.vmm + VMMCPU.cCallRing3Disabled], 0
         jnz     .return
-        add     edx, [VMCPU.vmm + VMMCPU.TracerCtx]
+        add     edx, VMCPU.vmm + VMMCPU.TracerCtx
 
         ;

trunk/src/VBox/VMM/include/VMMInternal.mac

@@ -111 +111 @@
         .fInRendezvous          resb 1
 %if HC_ARCH_BITS == 32
+        .afPadding              resb 3
+%else
         .afPadding              resb 7
-%else
-        .afPadding              resb 3
 %endif
 
@@ -119 +119 @@
         .TracerCtx              resb SUPDRVTRACERUSRCTX64_size
 
+        .u32Padding1            resd 1
 
         .cCallRing3Disabled     resd 1

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -90 +90 @@
         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run \
-        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run \
         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.h \
         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.o \