Changeset 744 in vbox

Timestamp:

Feb 7, 2007 11:17:44 AM (18 years ago)

Author:

vboxsync

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

18396

Message:

Logging update

Location:

trunk/src/VBox/VMM/PATM

Files:

• PATMA.asm (modified) (5 diffs)
• VMMAll/PATMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PATM/PATMA.asm

@@ -1684 +1684 @@
     push    eax
     push    ecx
+    push    edx
+    lea     edx, [esp + 12 - 4]                 ; stack address to store return address
     lock    or dword [ss:PATM_PENDINGACTION], PATM_ACTION_LOG_CALL
     mov     eax, PATM_ACTION_LOG_CALL
     mov     ecx, PATM_ACTION_MAGIC
     db      0fh, 0bh        ; illegal instr (hardcoded assumption in PATMHandleIllegalInstrTrap)
+    pop     edx
     pop     ecx
     pop     eax
@@ -2131 +2134 @@
 %ifdef PATM_LOG_PATCHINSTR
     push    eax
+    push    ebx
     push    ecx
     push    edx
     mov     edx, eax                            ; return address
+    lea     ebx, [esp+16+12+16]                 ; stack address containing the return address
     lock    or dword [ss:PATM_PENDINGACTION], PATM_ACTION_LOG_RET
     mov     eax, PATM_ACTION_LOG_RET
@@ -2140 +2145 @@
     pop     edx
     pop     ecx
+    pop     ebx
     pop     eax
 %endif
@@ -2190 +2196 @@
 %ifdef PATM_LOG_PATCHINSTR
     push    eax
+    push    ebx
     push    ecx
     push    edx
     mov     edx, eax                            ; return address
+    lea     ebx, [esp+16+12+16]                 ; stack address containing the return address
     lock    or dword [ss:PATM_PENDINGACTION], PATM_ACTION_LOG_RET
     mov     eax, PATM_ACTION_LOG_RET
@@ -2199 +2207 @@
     pop     edx
     pop     ecx
+    pop     ebx
     pop     eax
 %endif

trunk/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp

@@ -637 +637 @@
 
             case PATM_ACTION_LOG_RET:
-                Log(("PATMGC: RET to %VGv iopl=%d\n", pRegFrame->edx, X86_EFL_GET_IOPL(pVM->patm.s.CTXSUFF(pGCState)->uVMFlags)));
+                Log(("PATMGC: RET to %VGv ESP=%VGv iopl=%d\n", pRegFrame->edx, pRegFrame->ebx, X86_EFL_GET_IOPL(pVM->patm.s.CTXSUFF(pGCState)->uVMFlags)));
                 pRegFrame->eip += PATM_ILLEGAL_INSTR_SIZE;
                 return VINF_SUCCESS;
 
             case PATM_ACTION_LOG_CALL:
-                Log(("PATMGC: CALL to %VGv return addr %VGv iopl=%d\n", pVM->patm.s.CTXSUFF(pGCState)->GCCallPatchTargetAddr, pVM->patm.s.CTXSUFF(pGCState)->GCCallReturnAddr, X86_EFL_GET_IOPL(pVM->patm.s.CTXSUFF(pGCState)->uVMFlags)));
+                Log(("PATMGC: CALL to %VGv return addr %VGv ESP=%VGv iopl=%d\n", pVM->patm.s.CTXSUFF(pGCState)->GCCallPatchTargetAddr, pVM->patm.s.CTXSUFF(pGCState)->GCCallReturnAddr, pRegFrame->edx, X86_EFL_GET_IOPL(pVM->patm.s.CTXSUFF(pGCState)->uVMFlags)));
                 pRegFrame->eip += PATM_ILLEGAL_INSTR_SIZE;
                 return VINF_SUCCESS;