Changeset 18723 in vbox for trunk/src

Timestamp:

Apr 5, 2009 5:33:22 PM (16 years ago)

Author:

vboxsync

Message:

TRPMGCHandlers.cpp: Logging and a couple of todos.

File:

• trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp (modified) (19 diffs)

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -144 +144 @@
 #ifdef VBOX_HIGH_RES_TIMERS_HACK
     /*
-     * Occationally we should poll timers.
+     * We should poll the timers occationally.
      * We must *NOT* do this too frequently as it adds a significant overhead
      * and it'll kill us if the trap load is high. (See #1354.)
@@ -259 +259 @@
     RTGCUINTREG uDr6 = ASMGetAndClearDR6();
     PVM pVM = TRPM2VM(pTrpm);
-    LogFlow(("TRPMGCTrap01Handler: cs:eip=%04x:%08x uDr6=%RTreg\n", pRegFrame->cs, pRegFrame->eip, uDr6));
+    LogFlow(("TRPMGC01: cs:eip=%04x:%08x uDr6=%RTreg\n", pRegFrame->cs, pRegFrame->eip, uDr6));
 
     /*
@@ -281 +281 @@
         CPUMSetGuestDR6(pVM, uDr6);
 
-    return trpmGCExitTrap(pVM, rc, pRegFrame);
+    rc = trpmGCExitTrap(pVM, rc, pRegFrame);
+    Log6(("TRPMGC01: %Rrc (%04x:%08x %RTreg)\n", rc, pRegFrame->cs, pRegFrame->eip, uDr6));
+    return rc;
 }
 
@@ -318 +320 @@
 DECLASM(int) TRPMGCTrap03Handler(PTRPM pTrpm, PCPUMCTXCORE pRegFrame)
 {
-    LogFlow(("TRPMGCTrap03Handler: cs:eip=%04x:%08x\n", pRegFrame->cs, pRegFrame->eip));
+    LogFlow(("TRPMGC03: %04x:%08x\n", pRegFrame->cs, pRegFrame->eip));
     PVM pVM = TRPM2VM(pTrpm);
     int rc;
@@ -330 +332 @@
         rc = PATMHandleInt3PatchTrap(pVM, pRegFrame);
         if (rc == VINF_SUCCESS || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_PATM_PATCH_INT3 || rc == VINF_PATM_DUPLICATE_FUNCTION)
-            return trpmGCExitTrap(pVM, rc, pRegFrame);
+        {
+            rc = trpmGCExitTrap(pVM, rc, pRegFrame);
+            Log6(("TRPMGC03: %Rrc (%04x:%08x) (PATM)\n", rc, pRegFrame->cs, pRegFrame->eip));
+            return rc;
+        }
     }
     rc = DBGFGCTrap03Handler(pVM, pRegFrame);
+
     /* anything we should do with this? Schedule it in GC? */
-    return trpmGCExitTrap(pVM, rc, pRegFrame);
+    rc = trpmGCExitTrap(pVM, rc, pRegFrame);
+    Log6(("TRPMGC03: %Rrc (%04x:%08x)\n", rc, pRegFrame->cs, pRegFrame->eip));
+    return rc;
 }
 
@@ -351 +360 @@
 DECLASM(int) TRPMGCTrap06Handler(PTRPM pTrpm, PCPUMCTXCORE pRegFrame)
 {
+    LogFlow(("TRPMGC06: %04x:%08x efl=%x\n", pRegFrame->cs, pRegFrame->eip, pRegFrame->eflags.u32));
     PVM pVM = TRPM2VM(pTrpm);
     int rc;
-
-    LogFlow(("TRPMGCTrap06Handler %08RX32 eflags=%x\n", pRegFrame->eip, pRegFrame->eflags.u32));
 
     if (CPUMGetGuestCPL(pVM, pRegFrame) == 0)
@@ -366 +374 @@
         {
             Log(("TRPMGCTrap06Handler: Failed to convert %RTsel:%RX32 (cpl=%d) - rc=%Rrc !!\n", pRegFrame->cs, pRegFrame->eip, pRegFrame->ss & X86_SEL_RPL, rc));
-            return trpmGCExitTrap(pVM, VINF_EM_RAW_GUEST_TRAP, pRegFrame);
+            rc = trpmGCExitTrap(pVM, VINF_EM_RAW_GUEST_TRAP, pRegFrame);
+            Log6(("TRPMGC06: %Rrc (%04x:%08x) (SELM)\n", rc, pRegFrame->cs, pRegFrame->eip));
+            return rc;
         }
 
@@ -373 +383 @@
         rc = EMInterpretDisasOneEx(pVM, (RTGCUINTPTR)PC, pRegFrame, &Cpu, &cbOp);
         if (RT_FAILURE(rc))
-            return trpmGCExitTrap(pVM, VINF_EM_RAW_EMULATE_INSTR, pRegFrame);
+        {
+            rc = trpmGCExitTrap(pVM, VINF_EM_RAW_EMULATE_INSTR, pRegFrame);
+            Log6(("TRPMGC06: %Rrc (%04x:%08x) (EM)\n", rc, pRegFrame->cs, pRegFrame->eip));
+            return rc;
+        }
 
         /*
@@ -382 +396 @@
         {
             rc = PATMGCHandleIllegalInstrTrap(pVM, pRegFrame);
+            /** @todo  These tests are completely unnecessary, should just follow the
+             *         flow and return at the end of the function. */
             if (    rc == VINF_SUCCESS
                 ||  rc == VINF_EM_RAW_EMULATE_INSTR
@@ -387 +403 @@
                 ||  rc == VINF_PATM_PENDING_IRQ_AFTER_IRET
                 ||  rc == VINF_EM_RESCHEDULE)
-                return trpmGCExitTrap(pVM, rc, pRegFrame);
+            {
+                rc = trpmGCExitTrap(pVM, rc, pRegFrame);
+                Log6(("TRPMGC06: %Rrc (%04x:%08x) (PATM)\n", rc, pRegFrame->cs, pRegFrame->eip));
+                return rc;
+            }
         }
         /*
@@ -423 +443 @@
     }
 
-    return trpmGCExitTrap(pVM, rc, pRegFrame);
+    rc = trpmGCExitTrap(pVM, rc, pRegFrame);
+    Log6(("TRPMGC06: %Rrc (%04x:%08x)\n", rc, pRegFrame->cs, pRegFrame->eip));
+    return rc;
 }
 
@@ -442 +464 @@
 DECLASM(int) TRPMGCTrap07Handler(PTRPM pTrpm, PCPUMCTXCORE pRegFrame)
 {
+    LogFlow(("TRPMGC07: %04x:%08x\n", pRegFrame->cs, pRegFrame->eip));
     PVM pVM = TRPM2VM(pTrpm);
 
-    LogFlow(("TRPMTrap07HandlerGC: eip=%08RX32\n", pRegFrame->eip));
-    return CPUMHandleLazyFPU(pVM, VMMGetCpu(pVM));
+    int rc = CPUMHandleLazyFPU(pVM, VMMGetCpu(pVM));
+    Log6(("TRPMGC07: %Rrc (%04x:%08x)\n", rc, pRegFrame->cs, pRegFrame->eip));
+    return rc; /** @todo call trpmGCExitTrap! (after 2.2.0) */
 }
 
@@ -462 +486 @@
 DECLASM(int) TRPMGCTrap0bHandler(PTRPM pTrpm, PCPUMCTXCORE pRegFrame)
 {
-    LogFlow(("TRPMGCTrap0bHandler: eip=%08RX32\n", pRegFrame->eip));
+    LogFlow(("TRPMGC0b: %04x:%08x\n", pRegFrame->cs, pRegFrame->eip));
     PVM pVM = TRPM2VM(pTrpm);
 
@@ -534 +558 @@
              */
             pTrpm->uActiveVector = ~0;
+            Log6(("TRPMGC0b: %Rrc (%04x:%08x) (CG)\n", VINF_EM_RAW_RING_SWITCH, pRegFrame->cs, pRegFrame->eip));
             return VINF_EM_RAW_RING_SWITCH;
         }
@@ -541 +566 @@
      * Pass trap 0b as is to the recompiler in all other cases.
      */
+    Log6(("TRPMGC0b: %Rrc (%04x:%08x)\n", VINF_EM_RAW_GUEST_TRAP, pRegFrame->cs, pRegFrame->eip));
     return VINF_EM_RAW_GUEST_TRAP;
 }
@@ -885 +911 @@
 DECLASM(int) TRPMGCTrap0dHandler(PTRPM pTrpm, PCPUMCTXCORE pRegFrame)
 {
-    LogFlow(("TRPMGCTrap0dHandler: eip=%08RX32\n", pRegFrame->eip));
+    LogFlow(("TRPMGC0d: %04x:%08x err=%x\n", pRegFrame->cs, pRegFrame->eip, (uint32_t)pTrpm->uActiveErrorCode));
     PVM pVM = TRPM2VM(pTrpm);
 
@@ -920 +946 @@
             break;
         }
+    Log6(("TRPMGC0d: %Rrc (%04x:%08x)\n", rc, pRegFrame->cs, pRegFrame->eip));
     return rc;
 }
@@ -940 +967 @@
 DECLASM(int) TRPMGCTrap0eHandler(PTRPM pTrpm, PCPUMCTXCORE pRegFrame)
 {
-    LogBird(("TRPMGCTrap0eHandler: eip=%08RX32\n", pRegFrame->eip));
+    LogFlow(("TRPMGC0e: %04x:%08x err=%x cr2=%08x\n", pRegFrame->cs, pRegFrame->eip, (uint32_t)pTrpm->uActiveErrorCode, (uint32_t)pTrpm->uActiveCR2));
     PVM pVM = TRPM2VM(pTrpm);
 
+
     /*
      * This is all PGM stuff.
      */
     int rc = PGMTrap0eHandler(pVM, pTrpm->uActiveErrorCode, pRegFrame, (RTGCPTR)pTrpm->uActiveCR2);
-
     switch (rc)
     {
@@ -989 +1016 @@
             break;
     }
-    return trpmGCExitTrap(pVM, rc, pRegFrame);
+    rc = trpmGCExitTrap(pVM, rc, pRegFrame);
+    Log6(("TRPMGC0e: %Rrc (%04x:%08x)\n", rc, pRegFrame->cs, pRegFrame->eip));
+    return rc;
 }