Changeset 156 in vbox

Timestamp:

Jan 18, 2007 5:42:04 PM (18 years ago)

Author:

vboxsync

Message:

More iret logging

Location:

trunk/src/VBox/VMM/PATM

Files:

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

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

@@ -1083 +1083 @@
     push    ecx
     push    edx
-    mov     edx, dword [ss:esp+12+4]        ;3 pushes + pushed flags -> iret eip
+    lea     edx, dword [ss:esp+12+4]        ;3 pushes + pushed flags -> iret eip
     mov     eax, PATM_ACTION_LOG_IRET
     lock    or dword [ss:PATM_PENDINGACTION], eax

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

@@ -31 +31 @@
 #include <VBox/err.h>
 #include <VBox/selm.h>
+#include <VBox/mm.h>
 #include "PATMInternal.h"
 #include <VBox/vm.h>
@@ -586 +587 @@
 
             case PATM_ACTION_LOG_IRET:
+            {
+#ifdef IN_GC
+                char    *pIretFrame = (char *)pRegFrame->edx;
+                uint32_t eip, selCS, uEFlags;
+
+                rc  = MMGCRamRead(pVM, &eip,     pIretFrame, 3);
+                rc |= MMGCRamRead(pVM, &selCS,   pIretFrame + 4, 4);
+                rc |= MMGCRamRead(pVM, &uEFlags, pIretFrame + 8, 4);
+                if (rc == VINF_SUCCESS)
+                {
+                    Log(("PATMGC: IRET stack frame: return address %04X:%VGv eflags=%08x\n", selCS, eip, uEFlags));
+                }
+#endif
                 Log(("PATMGC: IRET from %VGv (IF->1) to %VGv new eflags=%x\n", pRegFrame->eip, pRegFrame->edx, pVM->patm.s.CTXSUFF(pGCState)->uVMFlags));
                 pRegFrame->eip += PATM_ILLEGAL_INSTR_SIZE;
                 return VINF_SUCCESS;
+            }
 
             case PATM_ACTION_LOG_RET: