Changeset 86098 in vbox for trunk/include/VBox

Timestamp:

Sep 13, 2020 7:17:19 AM (5 years ago)

Author:

vboxsync

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

140330

Message:

VMM/DBGF: Rework part 1 to make it work well with SMP VMs. bugref:9822

Location:

trunk/include/VBox

Files:

• dbg.h (modified) (2 diffs)
• err.h (modified) (2 diffs)
• vmm/dbgf.h (modified) (3 diffs)
• vmm/vm.h (modified) (2 diffs)
• vmm/vm.mac (modified) (1 diff)

trunk/include/VBox/dbg.h

@@ -682 +682 @@
     DECLCALLBACKMEMBER(CPUMMODE, pfnGetCpuMode,(PDBGCCMDHLP pCmdHlp));
 
+    /**
+     * Prints the register set of the given CPU.
+     *
+     * @returns VBox status code.
+     * @param   pCmdHlp     Pointer to the command callback structure.
+     * @param   idCpu       The CPU ID to print the register set of.
+     * @param   f64BitMode  True to dump 64-bit state, false to dump 32-bit state,
+     *                      -1 to use the current CPU mode.
+     * @param   fTerse      Flag to indicate whether to dump the complete register set.
+     */
+    DECLCALLBACKMEMBER(int, pfnRegPrintf, (PDBGCCMDHLP pCmdHlp, VMCPUID idCpu, int f64BitMode, bool fTerse));
+
     /** End marker (DBGCCMDHLP_MAGIC). */
     uint32_t                u32EndMarker;
@@ -982 +994 @@
 {
     return pCmdHlp->pfnGetCpuMode(pCmdHlp);
+}
+
+/**
+ * @copydoc DBGCCMDHLP::pfnRegPrintf
+ */
+DECLINLINE(int) DBGCCmdHlpRegPrintf(PDBGCCMDHLP pCmdHlp, VMCPUID idCpu, int f64BitMode, bool fTerse)
+{
+    return pCmdHlp->pfnRegPrintf(pCmdHlp, idCpu, f64BitMode, fTerse);
 }
 

trunk/include/VBox/err.h

@@ -276 +276 @@
  * debugger to the VM. */
 #define VERR_DBGF_ALREADY_ATTACHED          (-1201)
-/** Tried to halt a debugger which was already halted.
- * (This is a warning and not an error.) */
+/** Tried to halt a VM or CPU that was already halted. */
 #define VWRN_DBGF_ALREADY_HALTED            1202
 /** The DBGF has no more free breakpoint slots. */
@@ -323 +322 @@
 /** Internal processing error \#1 in the DBGF event tracing code. */
 #define VERR_DBGF_TRACER_IPE_1              (-1221)
+/** Tried to resume a VM or CPU that is already fully running. */
+#define VWRN_DBGF_ALREADY_RUNNING           (-1222)
 /** @} */
 

trunk/include/VBox/vmm/dbgf.h

@@ -490 +490 @@
     /** Context */
     DBGFEVENTCTX    enmCtx;
+    /** The vCPU/EMT which generated the event. */
+    VMCPUID         idCpu;
+    /** Reserved. */
+    uint32_t        uReserved;
     /** Type specific data. */
     union
@@ -534 +538 @@
             /** Number of arguments. */
             uint8_t                 cArgs;
-            /** Alignmnet padding. */
+            /** Alignment padding. */
             uint8_t                 uPadding[7];
             /** Arguments. */
-            uint64_t                auArgs[6];
+            uint64_t                auArgs[5];
         } Generic;
 
         /** Padding for ensuring that the structure is 8 byte aligned. */
-        uint64_t        au64Padding[7];
+        uint64_t        au64Padding[6];
     } u;
 } DBGFEVENT;
 AssertCompileSizeAlignment(DBGFEVENT, 8);
+AssertCompileSize(DBGFEVENT, 64);
 /** Pointer to VMM Debug Event. */
 typedef DBGFEVENT *PDBGFEVENT;
@@ -583 +588 @@
 VMMR3DECL(int)          DBGFR3Attach(PUVM pUVM);
 VMMR3DECL(int)          DBGFR3Detach(PUVM pUVM);
-VMMR3DECL(int)          DBGFR3EventWait(PUVM pUVM, RTMSINTERVAL cMillies, PCDBGFEVENT *ppEvent);
-VMMR3DECL(int)          DBGFR3Halt(PUVM pUVM);
-VMMR3DECL(bool)         DBGFR3IsHalted(PUVM pUVM);
+VMMR3DECL(int)          DBGFR3EventWait(PUVM pUVM, RTMSINTERVAL cMillies, PDBGFEVENT pEvent);
+VMMR3DECL(int)          DBGFR3Halt(PUVM pUVM, VMCPUID idCpu);
+VMMR3DECL(bool)         DBGFR3IsHalted(PUVM pUVM, VMCPUID idCpu);
 VMMR3DECL(int)          DBGFR3QueryWaitable(PUVM pUVM);
-VMMR3DECL(int)          DBGFR3Resume(PUVM pUVM);
+VMMR3DECL(int)          DBGFR3Resume(PUVM pUVM, VMCPUID idCpu);
 VMMR3DECL(int)          DBGFR3InjectNMI(PUVM pUVM, VMCPUID idCpu);
 VMMR3DECL(int)          DBGFR3Step(PUVM pUVM, VMCPUID idCpu);

trunk/include/VBox/vmm/vm.h

@@ -251 +251 @@
         struct DBGFCPU      s;
 #endif
-        uint8_t             padding[256];       /* multiple of 64 */
+        uint8_t             padding[512];       /* multiple of 64 */
     } dbgf;
 
@@ -285 +285 @@
 
     /** Align the following members on page boundary. */
-    uint8_t                 abAlignment2[3448];
+    uint8_t                 abAlignment2[3192];
 
     /** PGM part. */

trunk/include/VBox/vmm/vm.mac

@@ -69 +69 @@
     .pdm                    resb 256
     .iom                    resb 512
-    .dbgf                   resb 256
+    .dbgf                   resb 512
     .gim                    resb 512
     .apic                   resb 3840