Changeset 107166 in vbox

Timestamp:

Nov 27, 2024 1:25:02 PM (7 weeks ago)

Author:

vboxsync

Message:

Debugger/GDB: Add some basic arm64 support for the GDB remote stub, bugref:10393

File:

• trunk/src/VBox/Debugger/DBGCGdbRemoteStub.cpp (modified) (9 diffs)

trunk/src/VBox/Debugger/DBGCGdbRemoteStub.cpp

@@ -1027 +1027 @@
  * amd64 GDB register set.
  */
-static const GDBREGDESC g_aGdbRegs64[] =
+static const GDBREGDESC g_aGdbRegsAmd64[] =
 {
     DBGREG_DESC_INIT_INT64(     "rax",    DBGFREG_RAX),
@@ -1077 +1077 @@
  * i386 GDB register set.
  */
-static const GDBREGDESC g_aGdbRegs32[] =
+static const GDBREGDESC g_aGdbRegsX86[] =
 {
     DBGREG_DESC_INIT_INT32(     "eax",    DBGFREG_EAX),
@@ -1115 +1115 @@
 };
 
+
+/**
+ * arm64 GDB register set.
+ */
+static const GDBREGDESC g_aGdbRegsArm64[] =
+{
+    DBGREG_DESC_INIT_INT64(     "x0",     DBGFREG_ARMV8_GREG_X0),
+    DBGREG_DESC_INIT_INT64(     "x1",     DBGFREG_ARMV8_GREG_X1),
+    DBGREG_DESC_INIT_INT64(     "x2",     DBGFREG_ARMV8_GREG_X2),
+    DBGREG_DESC_INIT_INT64(     "x3",     DBGFREG_ARMV8_GREG_X3),
+    DBGREG_DESC_INIT_INT64(     "x4",     DBGFREG_ARMV8_GREG_X4),
+    DBGREG_DESC_INIT_INT64(     "x5",     DBGFREG_ARMV8_GREG_X5),
+    DBGREG_DESC_INIT_INT64(     "x6",     DBGFREG_ARMV8_GREG_X6),
+    DBGREG_DESC_INIT_INT64(     "x7",     DBGFREG_ARMV8_GREG_X7),
+    DBGREG_DESC_INIT_INT64(     "x8",     DBGFREG_ARMV8_GREG_X8),
+    DBGREG_DESC_INIT_INT64(     "x9",     DBGFREG_ARMV8_GREG_X9),
+    DBGREG_DESC_INIT_INT64(     "x10",    DBGFREG_ARMV8_GREG_X10),
+    DBGREG_DESC_INIT_INT64(     "x11",    DBGFREG_ARMV8_GREG_X11),
+    DBGREG_DESC_INIT_INT64(     "x12",    DBGFREG_ARMV8_GREG_X12),
+    DBGREG_DESC_INIT_INT64(     "x13",    DBGFREG_ARMV8_GREG_X13),
+    DBGREG_DESC_INIT_INT64(     "x14",    DBGFREG_ARMV8_GREG_X14),
+    DBGREG_DESC_INIT_INT64(     "x15",    DBGFREG_ARMV8_GREG_X15),
+    DBGREG_DESC_INIT_INT64(     "x16",    DBGFREG_ARMV8_GREG_X16),
+    DBGREG_DESC_INIT_INT64(     "x17",    DBGFREG_ARMV8_GREG_X17),
+    DBGREG_DESC_INIT_INT64(     "x18",    DBGFREG_ARMV8_GREG_X18),
+    DBGREG_DESC_INIT_INT64(     "x19",    DBGFREG_ARMV8_GREG_X19),
+    DBGREG_DESC_INIT_INT64(     "x20",    DBGFREG_ARMV8_GREG_X20),
+    DBGREG_DESC_INIT_INT64(     "x21",    DBGFREG_ARMV8_GREG_X21),
+    DBGREG_DESC_INIT_INT64(     "x22",    DBGFREG_ARMV8_GREG_X22),
+    DBGREG_DESC_INIT_INT64(     "x23",    DBGFREG_ARMV8_GREG_X23),
+    DBGREG_DESC_INIT_INT64(     "x24",    DBGFREG_ARMV8_GREG_X24),
+    DBGREG_DESC_INIT_INT64(     "x25",    DBGFREG_ARMV8_GREG_X25),
+    DBGREG_DESC_INIT_INT64(     "x26",    DBGFREG_ARMV8_GREG_X26),
+    DBGREG_DESC_INIT_INT64(     "x27",    DBGFREG_ARMV8_GREG_X27),
+    DBGREG_DESC_INIT_INT64(     "x28",    DBGFREG_ARMV8_GREG_X28),
+    DBGREG_DESC_INIT_INT64(     "x29",    DBGFREG_ARMV8_GREG_X29),
+    DBGREG_DESC_INIT_CODE_PTR64("x30",    DBGFREG_ARMV8_GREG_LR),
+
+    DBGREG_DESC_INIT_DATA_PTR64("sp",     DBGFREG_ARMV8_SP_EL1), /** @todo EL0 */
+    DBGREG_DESC_INIT_CODE_PTR64("pc",     DBGFREG_ARMV8_PC),
+
+    DBGREG_DESC_INIT_INT32(     "cpsr",   DBGFREG_ARMV8_PSTATE),
+};
+
+
 #undef DBGREG_DESC_INIT_CODE_PTR64
 #undef DBGREG_DESC_INIT_DATA_PTR64
@@ -1133 +1178 @@
 static int dbgcGdbStubCtxTgtXmlDescCreate(PGDBSTUBCTX pThis)
 {
-    static const char s_szXmlTgtHdr64[] =
+    static const char s_szXmlTgtHdrAmd64[] =
         "<?xml version=\"1.0\"?>\n"
         "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">\n"
@@ -1139 +1184 @@
         "    <architecture>i386:x86-64</architecture>\n"
         "    <feature name=\"org.gnu.gdb.i386.core\">\n";
-    static const char s_szXmlTgtHdr32[] =
+    static const char s_szXmlTgtHdrX86[] =
         "<?xml version=\"1.0\"?>\n"
         "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">\n"
@@ -1145 +1190 @@
         "    <architecture>i386</architecture>\n"
         "    <feature name=\"org.gnu.gdb.i386.core\">\n";
+    static const char s_szXmlTgtHdrArm64[] =
+        "<?xml version=\"1.0\"?>\n"
+        "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">\n"
+        "<target version=\"1.0\">\n"
+        "    <architecture>aarch64</architecture>\n"
+        "    <feature name=\"org.gnu.gdb.aarch64.core\">\n";
     static const char s_szXmlTgtFooter[] =
         "    </feature>\n"
@@ -1158 +1209 @@
         pThis->cbTgtXmlDesc = cbLeft;
 
-        rc = RTStrCatP(&pachXmlCur, &cbLeft, pThis->paRegs == &g_aGdbRegs64[0] ? &s_szXmlTgtHdr64[0] : &s_szXmlTgtHdr32[0]);
+        const char *pszHdr = NULL;
+        if (pThis->paRegs == &g_aGdbRegsAmd64[0])
+            pszHdr = &s_szXmlTgtHdrAmd64[0];
+        else if (pThis->paRegs == &g_aGdbRegsX86[0])
+            pszHdr = &s_szXmlTgtHdrX86[0];
+        else if (pThis->paRegs == &g_aGdbRegsArm64[0])
+            pszHdr = &s_szXmlTgtHdrArm64[0];
+        else
+            return VERR_INVALID_STATE;
+
+        rc = RTStrCatP(&pachXmlCur, &cbLeft, pszHdr);
         if (RT_SUCCESS(rc))
         {
@@ -1759 +1820 @@
                 uint32_t idxRegMax = 0;
                 size_t cbRegs = 0;
-                for (;;)
+                for (uint32_t i = 0; i < pThis->cRegs; i++)
                 {
                     const GDBREGDESC *pReg = &pThis->paRegs[idxRegMax++];
                     cbRegs += pReg->cBits / 8;
-                    if (pReg->enmReg == DBGFREG_SS) /* Up to this seems to belong to the general register set. */
+                    if (pReg->enmReg == DBGFREG_SS) /* Up to this seems to belong to the general register set on x86/amd64. */
                         break;
                 }
@@ -2567 +2628 @@
     {
         case CPUMMODE_PROTECTED:
-            pThis->paRegs = &g_aGdbRegs32[0];
-            pThis->cRegs  = RT_ELEMENTS(g_aGdbRegs32);
+            pThis->paRegs = &g_aGdbRegsX86[0];
+            pThis->cRegs  = RT_ELEMENTS(g_aGdbRegsX86);
             break;
         case CPUMMODE_LONG:
-            pThis->paRegs = &g_aGdbRegs64[0];
-            pThis->cRegs  = RT_ELEMENTS(g_aGdbRegs64);
+            pThis->paRegs = &g_aGdbRegsAmd64[0];
+            pThis->cRegs  = RT_ELEMENTS(g_aGdbRegsAmd64);
+            break;
+        case CPUMMODE_ARMV8_AARCH64:
+            pThis->paRegs = &g_aGdbRegsArm64[0];
+            pThis->cRegs  = RT_ELEMENTS(g_aGdbRegsArm64);
             break;
         case CPUMMODE_REAL: