Changeset 84690 in vbox for trunk/src/VBox/Debugger

Timestamp:

Jun 5, 2020 10:54:19 AM (5 years ago)

Author:

vboxsync

Message:

Debugger/GdbRemoteStub: Implement detach request and fix querying registers

File:

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

trunk/src/VBox/Debugger/DBGCGdbRemoteStub.cpp

@@ -984 +984 @@
                    cchStr = RTStrPrintf2(pachXmlCur, cbLeft,
                                          "<reg name=\"%s\" bitsize=\"%u\" regnum=\"%u\" type=\"%s\" group=\"%s\"/>\n",
-                                         pReg->pszName, pReg->cBits, pReg->enmReg, pReg->pszType, pReg->pszGroup);
+                                         pReg->pszName, pReg->cBits, i, pReg->pszType, pReg->pszGroup);
                 else
                    cchStr = RTStrPrintf2(pachXmlCur, cbLeft,
                                          "<reg name=\"%s\" bitsize=\"%u\" regnum=\"%u\" type=\"%s\"/>\n",
-                                         pReg->pszName, pReg->cBits, pReg->enmReg, pReg->pszType);
+                                         pReg->pszName, pReg->cBits, i, pReg->pszType);
 
                 if (cchStr > 0)
@@ -1018 +1018 @@
  * @param   enmReg              The register to look for.
  */
-static const GDBREGDESC *dbgcGdbStubRegGet(DBGFREG enmReg)
-{
-    for (uint32_t i = 0; i < RT_ELEMENTS(g_aGdbRegs); i++)
-    {
-        const struct GDBREGDESC *pReg = &g_aGdbRegs[i];
-
-        if (pReg->enmReg == enmReg)
-            return pReg;
-    }
+static const GDBREGDESC *dbgcGdbStubRegGet(uint32_t idxReg)
+{
+    if (RT_LIKELY(idxReg < RT_ELEMENTS(g_aGdbRegs)))
+        return &g_aGdbRegs[idxReg];
 
     return NULL;
@@ -1496 +1491 @@
                     DBGFREGVAL RegVal;
                     DBGFREGVALTYPE enmType;
-                    DBGFREG enmReg = (DBGFREG)uReg;
-                    const GDBREGDESC *pReg = dbgcGdbStubRegGet(enmReg);
+                    const GDBREGDESC *pReg = dbgcGdbStubRegGet(uReg);
                     if (RT_LIKELY(pReg))
                     {
@@ -1537 +1531 @@
                 if (RT_SUCCESS(rc))
                 {
-                    DBGFREG enmReg = (DBGFREG)uReg;
-                    const GDBREGDESC *pReg = dbgcGdbStubRegGet(enmReg);
+                    const GDBREGDESC *pReg = dbgcGdbStubRegGet(uReg);
 
                     if (pReg)
@@ -1673 +1666 @@
                 for (;;)
                     exit(126);
+                break;
+            }
+            case 'D': /* Detach */
+            {
+                rc = dbgcGdbStubCtxReplySendOk(pThis);
+                if (RT_SUCCESS(rc))
+                    rc = VERR_DBGC_QUIT;
                 break;
             }