Changeset 19288 in vbox for trunk/src

Timestamp:

May 1, 2009 1:09:18 PM (16 years ago)

Author:

vboxsync

Message:

DBGF,TRPM,HWACCM: Merged DBGFR0.cpp and DBGFGC.cpp into VMMRZ/DBGFRZ.cpp (new directory for things that are common to both R0 and RC).

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (4 diffs)
• VMMGC/TRPMGCHandlers.cpp (modified) (2 diffs)
• VMMR0/DBGFR0.cpp (deleted)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)
• VMMRZ (added)
• VMMRZ/DBGFRZ.cpp (moved) (moved from trunk/src/VBox/VMM/VMMGC/DBGFGC.cpp ) (8 diffs)
• VMMRZ/Makefile.kup (added)

trunk/src/VBox/VMM/Makefile.kmk

@@ -333 +333 @@
         VMMGC/CPUMGCA.asm \
         VMMGC/EMGCA.asm \
-        VMMGC/DBGFGC.cpp \
         VMMGC/IOMGC.cpp \
         VMMGC/MMRamGC.cpp \
@@ -345 +344 @@
         VMMGC/VMMGC.cpp \
         VMMGC/VMMGCA.asm \
+        VMMGC/HWACCMGCA.asm \
+        VMMRZ/DBGFRZ.cpp \
         VMMAll/CPUMAllRegs.cpp \
         VMMAll/CPUMAllA.asm \
         VMMAll/DBGFAll.cpp \
-        VMMGC/HWACCMGCA.asm \
         VMMAll/IOMAll.cpp \
         VMMAll/IOMAllMMIO.cpp \
@@ -427 +427 @@
         VMMR0/CPUMR0.cpp \
         VMMR0/CPUMR0A.asm \
-        VMMR0/DBGFR0.cpp \
         VMMR0/GMMR0.cpp \
         VMMR0/GVMMR0.cpp \
@@ -440 +439 @@
         VMMR0/VMMR0.cpp \
         VMMR0/VMMR0A.asm \
+        VMMRZ/DBGFRZ.cpp \
         VMMAll/CPUMAllA.asm \
         VMMAll/CPUMAllRegs.cpp \

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

@@ -284 +284 @@
      * Now leave the rest to the DBGF.
      */
-    int rc = DBGFGCTrap01Handler(pVM, pVCpu, pRegFrame, uDr6);
+    int rc = DBGFRZTrap01Handler(pVM, pVCpu, pRegFrame, uDr6);
     if (rc == VINF_EM_RAW_GUEST_TRAP)
         CPUMSetGuestDR6(pVCpu, uDr6);
@@ -346 +346 @@
         }
     }
-    rc = DBGFGCTrap03Handler(pVM, pVCpu, pRegFrame);
+    rc = DBGFRZTrap03Handler(pVM, pVCpu, pRegFrame);
 
     /* anything we should do with this? Schedule it in GC? */

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -1324 +1324 @@
             Assert(DBGFIsStepping(pVCpu));
 
-            rc = DBGFR0Trap01Handler(pVM, pVCpu, CPUMCTX2CORE(pCtx), pCtx->dr[6]);
+            rc = DBGFRZTrap01Handler(pVM, pVCpu, CPUMCTX2CORE(pCtx), pCtx->dr[6]);
             if (rc == VINF_EM_RAW_GUEST_TRAP)
             {

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -2470 +2470 @@
                 uDR6  = X86_DR6_INIT_VAL;
                 uDR6 |= (exitQualification & (X86_DR6_B0|X86_DR6_B1|X86_DR6_B2|X86_DR6_B3|X86_DR6_BD|X86_DR6_BS));
-                rc = DBGFR0Trap01Handler(pVM, pVCpu, CPUMCTX2CORE(pCtx), uDR6);
+                rc = DBGFRZTrap01Handler(pVM, pVCpu, CPUMCTX2CORE(pCtx), uDR6);
                 if (rc == VINF_EM_RAW_GUEST_TRAP)
                 {
@@ -2501 +2501 @@
             }
 
-#ifdef DEBUG /* till after branching, enable by default after that. */
             case X86_XCPT_BP:   /* Breakpoint. */
             {
-                rc = DBGFR0Trap03Handler(pVM, pVCpu, CPUMCTX2CORE(pCtx));
+                rc = DBGFRZTrap03Handler(pVM, pVCpu, CPUMCTX2CORE(pCtx));
                 if (rc == VINF_EM_RAW_GUEST_TRAP)
                 {
@@ -2517 +2516 @@
                 break;
             }
-#endif
 
             case X86_XCPT_GP:   /* General protection failure exception.*/

trunk/src/VBox/VMM/VMMRZ/DBGFRZ.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * DBGF - Debugger Facility, GC part.
- *
- * Almost identical to DBGFR0.cpp, except for the fInHyper stuff.
+ * DBGF - Debugger Facility, RZ part.
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -49 +47 @@
  * @param   uDr6        The DR6 register value.
  */
-VMMRCDECL(int) DBGFGCTrap01Handler(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCUINTREG uDr6)
+VMMRZDECL(int) DBGFRZTrap01Handler(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCUINTREG uDr6)
 {
+#ifdef IN_RC
     const bool fInHyper = !(pRegFrame->ss & X86_SEL_RPL) && !pRegFrame->eflags.Bits.u1VM;
+#else
+    const bool fInHyper = false;
+#endif
 
     /** @todo Intel docs say that X86_DR6_BS has the highest priority... */
@@ -67 +69 @@
                 pVCpu->dbgf.s.iActiveBp = pVM->dbgf.s.aHwBreakpoints[iBp].iBp;
                 pVCpu->dbgf.s.fSingleSteppingRaw = false;
-                LogFlow(("DBGFGCTrap03Handler: hit hw breakpoint %d at %04x:%08x\n",
-                         pVM->dbgf.s.aHwBreakpoints[iBp].iBp, pRegFrame->cs, pRegFrame->eip));
+                LogFlow(("DBGFRZTrap03Handler: hit hw breakpoint %d at %04x:%RGv\n",
+                         pVM->dbgf.s.aHwBreakpoints[iBp].iBp, pRegFrame->cs, pRegFrame->rip));
 
                 return fInHyper ? VINF_EM_DBG_HYPER_BREAKPOINT : VINF_EM_DBG_BREAKPOINT;
@@ -83 +85 @@
     {
         pVCpu->dbgf.s.fSingleSteppingRaw = false;
-        LogFlow(("DBGFGCTrap01Handler: single step at %04x:%08x\n", pRegFrame->cs, pRegFrame->eip));
+        LogFlow(("DBGFRZTrap01Handler: single step at %04x:%RGv\n", pRegFrame->cs, pRegFrame->rip));
         return fInHyper ? VINF_EM_DBG_HYPER_STEPPED : VINF_EM_DBG_STEPPED;
     }
@@ -91 +93 @@
      * so we'll bitch if this is not a BS event.
      */
-    AssertMsg(uDr6 & X86_DR6_BS, ("hey! we're not doing guest BPs yet! dr6=%RTreg %04x:%08x\n",
-                                  uDr6, pRegFrame->cs, pRegFrame->eip));
-    /** @todo virtualize DRx. */
-    LogFlow(("DBGFGCTrap01Handler: guest debug event %RTreg at %04x:%08x!\n", uDr6, pRegFrame->cs, pRegFrame->eip));
+    AssertMsg(uDr6 & X86_DR6_BS, ("hey! we're not doing guest BPs yet! dr6=%RTreg %04x:%RGv\n",
+                                  uDr6, pRegFrame->cs, pRegFrame->rip));
+
+    LogFlow(("DBGFRZTrap01Handler: guest debug event %RTreg at %04x:%RGv!\n", uDr6, pRegFrame->cs, pRegFrame->rip));
     return fInHyper ? VERR_INTERNAL_ERROR : VINF_EM_RAW_GUEST_TRAP;
 }
@@ -110 +112 @@
  * @param   pRegFrame   Pointer to the register frame for the trap.
  */
-VMMRCDECL(int) DBGFGCTrap03Handler(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame)
+VMMRZDECL(int) DBGFRZTrap03Handler(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame)
 {
+#ifdef IN_RC
+    const bool fInHyper = !(pRegFrame->ss & X86_SEL_RPL) && !pRegFrame->eflags.Bits.u1VM;
+#else
+    const bool fInHyper = false;
+#endif
+
     /*
      * Get the trap address and look it up in the breakpoint table.
@@ -120 +128 @@
         RTGCPTR pPc;
         int rc = SELMValidateAndConvertCSAddr(pVM, pRegFrame->eflags, pRegFrame->ss, pRegFrame->cs, &pRegFrame->csHid,
+#ifdef IN_RC
                                               (RTGCPTR)((RTGCUINTPTR)pRegFrame->eip - 1),
+#else
+                                              (RTGCPTR)pRegFrame->rip /* no -1 in R0 */,
+#endif
                                               &pPc);
         AssertRCReturn(rc, rc);
@@ -132 +144 @@
                 pVCpu->dbgf.s.iActiveBp = pVM->dbgf.s.aBreakpoints[iBp].iBp;
 
-                LogFlow(("DBGFGCTrap03Handler: hit breakpoint %d at %RGv (%04x:%08x) cHits=0x%RX64\n",
-                         pVM->dbgf.s.aBreakpoints[iBp].iBp, pPc, pRegFrame->cs, pRegFrame->eip,
+                LogFlow(("DBGFRZTrap03Handler: hit breakpoint %d at %RGv (%04x:%RGv) cHits=0x%RX64\n",
+                         pVM->dbgf.s.aBreakpoints[iBp].iBp, pPc, pRegFrame->cs, pRegFrame->rip,
                          pVM->dbgf.s.aBreakpoints[iBp].cHits));
-                return !(pRegFrame->ss & X86_SEL_RPL) && !pRegFrame->eflags.Bits.u1VM
-                    ? VINF_EM_DBG_HYPER_BREAKPOINT
-                    : VINF_EM_DBG_BREAKPOINT;
+                return fInHyper
+                     ? VINF_EM_DBG_HYPER_BREAKPOINT
+                     : VINF_EM_DBG_BREAKPOINT;
             }
         }
     }
 
-    return !(pRegFrame->ss & X86_SEL_RPL) && !pRegFrame->eflags.Bits.u1VM
-        ? VINF_EM_DBG_HYPER_ASSERTION
-        : VINF_EM_RAW_GUEST_TRAP;
+    return fInHyper
+         ? VINF_EM_DBG_HYPER_ASSERTION
+         : VINF_EM_RAW_GUEST_TRAP;
 }