Changeset 86180 in vbox

Timestamp:

Sep 20, 2020 9:33:40 AM (4 years ago)

Author:

vboxsync

Message:

Debugger/DBGCRemoteKd: Implement support for the DEBUG_IO packets to send strings to the remotes console

File:

• trunk/src/VBox/Debugger/DBGCRemoteKd.cpp (modified) (13 diffs)

trunk/src/VBox/Debugger/DBGCRemoteKd.cpp

@@ -631 +631 @@
 /** Maximum state change type (exclusive). */
 #define KD_PACKET_STATE_CHANGE_MAX                  UINT32_C(0x00003033)
+/** @} */
+
+
+/**
+ * Debug I/O payload.
+ */
+typedef struct KDPACKETDEBUGIO
+{
+    /** Debug I/O payload type (KD_PACKET_DEBUG_IO_STRING). */
+    uint32_t                    u32Type;
+    /** The processor level. */
+    uint16_t                    u16CpuLvl;
+    /** The processor ID generating this packet. */
+    uint16_t                    idCpu;
+    /** Type dependent data. */
+    union
+    {
+        /** Debug string sent. */
+        struct
+        {
+            /* Length of the string following in bytes. */
+            uint32_t            cbStr;
+            /** Some padding it looks like. */
+            uint32_t            u32Pad;
+        } Str;
+    } u;
+} KDPACKETDEBUGIO;
+AssertCompileSize(KDPACKETDEBUGIO, 16);
+/** Pointer to a Debug I/O payload. */
+typedef KDPACKETDEBUGIO *PKDPACKETDEBUGIO;
+/** Pointer to a const Debug I/O payload. */
+typedef const KDPACKETDEBUGIO *PCKDPACKETDEBUGIO;
+
+
+/** @name Debug I/O types.
+ * @{ */
+/** Debug string output (usually DbgPrint() and friends). */
+#define KD_PACKET_DEBUG_IO_STRING                   UINT32_C(0x00003230)
 /** @} */
 
@@ -2085 +2123 @@
 
 /**
+ * Sends a Debug I/O string packet.
+ *
+ * @returns VBox status code.
+ * @param   pThis               The KD context data.
+ * @param   idCpu               The CPU ID generating this packet.
+ * @param   pachChars           The characters to send (ASCII).
+ * @param   cbChars             Number of characters to send.
+ */
+static int dbgcKdCtxDebugIoStrSend(PKDCTX pThis, VMCPUID idCpu, const char *pachChars, size_t cbChars)
+{
+    KDPACKETDEBUGIO DebugIo;
+    RT_ZERO(DebugIo);
+
+    /* Fix your damn log strings if this exceeds 4GB... */
+    if (cbChars != (uint32_t)cbChars)
+        return VERR_BUFFER_OVERFLOW;
+
+    DebugIo.u32Type     = KD_PACKET_DEBUG_IO_STRING;
+    DebugIo.u16CpuLvl   = 0x6;
+    DebugIo.idCpu       = (uint16_t)idCpu;
+    DebugIo.u.Str.cbStr = (uint32_t)cbChars;
+
+    RTSGSEG aRespSegs[2];
+
+    aRespSegs[0].pvSeg = &DebugIo;
+    aRespSegs[0].cbSeg = sizeof(DebugIo);
+    aRespSegs[1].pvSeg = (void *)pachChars;
+    aRespSegs[1].cbSeg = cbChars;
+
+    return dbgcKdCtxPktSendSg(pThis, KD_PACKET_HDR_SIGNATURE_DATA, KD_PACKET_HDR_SUB_TYPE_DEBUG_IO,
+                              &aRespSegs[0], RT_ELEMENTS(aRespSegs), true /*fAck*/);
+}
+
+
+/**
  * Sends a state change event packet.
  *
  * @returns VBox status code.
- * @param   pThis   The KD context data.
- * @param   enmType The event type.
+ * @param   pThis               The KD context data.
+ * @param   enmType             The event type.
  */
 static int dbgcKdCtxStateChangeSend(PKDCTX pThis, DBGFEVENTTYPE enmType)
@@ -2363 +2436 @@
     else if (DBGFR3IsHalted(pThis->Dbgc.pUVM, VMCPUID_ALL))
         rc = DBGFR3Resume(pThis->Dbgc.pUVM, VMCPUID_ALL);
+
+    pThis->Dbgc.CmdHlp.pfnPrintf(&pThis->Dbgc.CmdHlp, NULL, "TestTestTest\n");
 
     return rc;
@@ -3038 +3113 @@
      * Process the event.
      */
-    //PDBGC pDbgc = &pThis->Dbgc;
+    PDBGC pDbgc = &pThis->Dbgc;
     pThis->Dbgc.pszScratch = &pThis->Dbgc.achInput[0];
     pThis->Dbgc.iArg       = 0;
     int rc = VINF_SUCCESS;
+    VMCPUID idCpuOld = pDbgc->idCpu;
+    pDbgc->idCpu = pEvent->idCpu;
     switch (pEvent->enmType)
     {
@@ -3056 +3133 @@
          * The second part is events which can occur at any time.
          */
-#if 0
         case DBGFEVENT_FATAL_ERROR:
         {
@@ -3065 +3141 @@
             break;
         }
-#endif
 
         case DBGFEVENT_BREAKPOINT:
@@ -3071 +3146 @@
         case DBGFEVENT_BREAKPOINT_MMIO:
         case DBGFEVENT_BREAKPOINT_HYPER:
+        {
+            rc = dbgcBpExec(pDbgc, pEvent->u.Bp.iBp);
+            switch (rc)
+            {
+                case VERR_DBGC_BP_NOT_FOUND:
+                    rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: Unknown breakpoint %u! (%s)\n",
+                                                 pEvent->u.Bp.iBp, dbgcGetEventCtx(pEvent->enmCtx));
+                    break;
+
+                case VINF_DBGC_BP_NO_COMMAND:
+                    rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: Breakpoint %u! (%s)\n",
+                                                 pEvent->u.Bp.iBp, dbgcGetEventCtx(pEvent->enmCtx));
+                    break;
+
+                case VINF_BUFFER_OVERFLOW:
+                    rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: Breakpoint %u! Command too long to execute! (%s)\n",
+                                                 pEvent->u.Bp.iBp, dbgcGetEventCtx(pEvent->enmCtx));
+                    break;
+
+                default:
+                    break;
+            }
+            if (RT_SUCCESS(rc) && DBGFR3IsHalted(pDbgc->pUVM, VMCPUID_ALL))
+            {
+                rc = pDbgc->CmdHlp.pfnExec(&pDbgc->CmdHlp, "r");
+
+                /* Set the resume flag to ignore the breakpoint when resuming execution. */
+                if (   RT_SUCCESS(rc)
+                    && pEvent->enmType == DBGFEVENT_BREAKPOINT)
+                    rc = pDbgc->CmdHlp.pfnExec(&pDbgc->CmdHlp, "r eflags.rf = 1");
+            }
+
+            rc = dbgcKdCtxStateChangeSend(pThis, pEvent->enmType);
+            break;
+        }
+
         case DBGFEVENT_STEPPED:
         case DBGFEVENT_STEPPED_HYPER:
@@ -3078 +3189 @@
         }
 
-#if 0
         case DBGFEVENT_ASSERTION_HYPER:
         {
@@ -3121 +3231 @@
             break;
         }
-#endif
 
         case DBGFEVENT_POWERING_OFF:
@@ -3131 +3240 @@
         }
 
-#if 0
         default:
         {
@@ -3190 +3298 @@
             break;
         }
-#else
-        default:
-            rc = VERR_NOT_IMPLEMENTED;
-            break;
-#endif
-    }
-
+    }
+
+    pDbgc->idCpu = idCpuOld;
     return rc;
 }
@@ -3230 +3334 @@
     LogFlowFunc(("rc=%Rrc\n", rc));
     return rc;
+}
+
+
+/**
+ * @copydoc DBGC::pfnOutput
+ */
+static DECLCALLBACK(int) dbgcKdOutput(void *pvUser, const char *pachChars, size_t cbChars)
+{
+    PKDCTX pThis = (PKDCTX)pvUser;
+
+    return dbgcKdCtxDebugIoStrSend(pThis, pThis->Dbgc.idCpu, pachChars, cbChars);
 }
 
@@ -3339 +3454 @@
      */
     pThis->Dbgc.pBack            = pBack;
-    /*pThis->Dbgc.pfnOutput        = dbgcOutputGdb;*/
+    pThis->Dbgc.pfnOutput        = dbgcKdOutput;
     pThis->Dbgc.pvOutputUser     = pThis;
     pThis->Dbgc.pVM              = NULL;