Changeset 20673 in vbox for trunk/src/VBox/VMM/VMMGC

Timestamp:

Jun 17, 2009 4:00:46 PM (16 years ago)

Author:

vboxsync

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

48772

Message:

VMM: don't clobber pTRPMCPU

File:

• trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm (modified) (3 diffs)

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm

@@ -548 +548 @@
 
     ; tell cpum about the context core.
-    xchg    esi, eax                    ; save pTRPM - @todo reallocate this variable to esi, edi, or ebx
+    xchg    esi, eax                    ; save pTRPMCPU - @todo reallocate this variable to esi, edi, or ebx
     push    esp                         ; Param 2 - The new CPUMCTXCORE pointer.
     mov     eax, IMP(g_VM)              ; Param 1 - Pointer to the VMCPU.
@@ -555 +555 @@
     call    NAME(CPUMHyperSetCtxCore)
     add     esp, byte 8                 ; stack cleanup (cdecl)
-    xchg    eax, esi                    ; restore pTRPM
+    xchg    eax, esi                    ; restore pTRPMCPU
 
     ; check for temporary handler.
     movzx   ebx, byte [eax + TRPMCPU.uActiveVector]
-    mov     eax, IMP(g_TRPM)
+    mov     esi, IMP(g_TRPM)            ; keep eax == pTRPMCPU
     xor     ecx, ecx
-    xchg    ecx, [eax + TRPM.aTmpTrapHandlers + ebx * 4]    ; ecx = Temp handler pointer or 0
+    xchg    ecx, [esi + TRPM.aTmpTrapHandlers + ebx * 4]    ; ecx = Temp handler pointer or 0
     or      ecx, ecx
     jnz short gt_Hyper_HaveTemporaryHandler
@@ -592 +592 @@
 gt_Hyper_HaveStaticHandler:
     push    esp                         ; Param 2 - Pointer to CPUMCTXCORE.
-    push    eax                         ; Param 1 - Pointer to TRPM
+    push    eax                         ; Param 1 - Pointer to TRPMCPU
     call    ecx
     add     esp, byte 8                 ; cleanup stack (cdecl)