Changeset 106362 in vbox for trunk/include/VBox/vmm/dbgf.h

Timestamp:

Oct 16, 2024 1:08:09 PM (4 months ago)

Author:

vboxsync

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

165175

Message:

VMM/DBGF: Prepare DBGF to support ARMv8/A64 style breakpoints for the VMM debugger. This converts the x86 centric int3 naming to software breakpoint, bugref:10393

File:

• trunk/include/VBox/vmm/dbgf.h (modified) (5 diffs)

trunk/include/VBox/vmm/dbgf.h

@@ -829 +829 @@
     /** Debug register. */
     DBGFBPTYPE_REG,
-    /** INT 3 instruction. */
-    DBGFBPTYPE_INT3,
+    /** Software breakpoint (INT 3 on x86, bkpt on AArch64). */
+    DBGFBPTYPE_SOFTWARE,
     /** Port I/O breakpoint. */
     DBGFBPTYPE_PORT_IO,
@@ -920 +920 @@
         } Reg;
 
-        /** INT3 breakpoint data. */
-        struct DBGFBPINT3
+        /** Software breakpoint data. */
+        struct DBGFBPSW
         {
             /** The flat GC address of the breakpoint. */
@@ -927 +927 @@
             /** The physical address of the breakpoint. */
             RTGCPHYS        PhysAddr;
-            /** The byte value we replaced by the INT 3 instruction. */
-            uint8_t         bOrg;
-        } Int3;
+
+            /** Architecture specific breakpoint data. */
+            union
+            {
+                /** BKPT breakpoint data. */
+                struct
+                {
+                    /** The original instruction being replaced by the breakpoint. */
+                    uint32_t        u32Org;
+                } armv8;
+                /** Int 3 data. */
+                struct
+                {
+                    /** The byte value we replaced by the INT 3 instruction. */
+                    uint8_t         bOrg;
+                } x86;
+            } Arch;
+        } Sw;
 
         /** I/O port breakpoint data.   */
@@ -959 +974 @@
 AssertCompileSize(DBGFBPPUB, 64 - 8);
 AssertCompileMembersAtSameOffset(DBGFBPPUB, u.GCPtr, DBGFBPPUB, u.Reg.GCPtr);
-AssertCompileMembersAtSameOffset(DBGFBPPUB, u.GCPtr, DBGFBPPUB, u.Int3.GCPtr);
+AssertCompileMembersAtSameOffset(DBGFBPPUB, u.GCPtr, DBGFBPPUB, u.Sw.GCPtr);
 
 /** Pointer to the visible breakpoint state. */
@@ -2047 +2062 @@
     DBGFREG_ARMV8_FIRST,
     /** General purpose registers. */
-    DBGFREG_ARMV8_GREG_X0,
+    DBGFREG_ARMV8_GREG_X0 = DBGFREG_ARMV8_FIRST,
     DBGFREG_ARMV8_GREG_W0 = DBGFREG_ARMV8_GREG_X0,
     DBGFREG_ARMV8_GREG_X1,