UefiExt: Minor fixes and improvements (#7)

Fixes advlog command for rust and moves a few monitor
based command to re-use the monitor command

Author: cfernald

UefiDbgExt/memory.cpp

@@ -322,9 +322,9 @@ advlog (
         goto Exit;
       }
     } else if (gUefiEnv == RUST) {
-      InfoAddress = GetExpression ("adv_logger::logger::DBG_ADV_LOG_BUFFER");
+      InfoAddress = GetExpression ("patina_adv_logger::logger::DBG_ADV_LOG_BUFFER");
       if (InfoAddress == NULL) {
-        dprintf ("Failed to find adv_logger::logger::DBG_ADV_LOG_BUFFER!\n");
+        dprintf ("Failed to find patina_adv_logger::logger::DBG_ADV_LOG_BUFFER!\n");
         Result = ERROR_NOT_FOUND;
         goto Exit;
       }

UefiDbgExt/swdebug.cpp

@@ -17,51 +17,67 @@ Module Name:
 #include "uefiext.h"
 
 HRESULT CALLBACK
-info (
+monitor (
   PDEBUG_CLIENT4  Client,
   PCSTR           args
   )
 {
+  PSTR         Response;
+  ULONG        Len;
+  const CHAR   *TruncateTag   = "#T#";
+  const ULONG  TruncateTagLen = sizeof ("#T#") - 1; // Exclude the null terminator.
+  ULONG        Offset;
+
   INIT_API ();
 
-  g_ExtControl->Execute (
-                  DEBUG_OUTCTL_ALL_CLIENTS,
-                  ".exdicmd target:0:?",
-                  DEBUG_EXECUTE_DEFAULT
-                  );
+  Offset = 0;
+
+  // Loop on the command until the entire response is received.
+  while (TRUE) {
+    Response = MonitorCommandWithOutput (Client, args, Offset);
+
+    // Strip of the trailing newline character if it exists since this in injected
+    // by windbg and is not part of the response.
+    Len = (ULONG)strlen (Response);
+    if ((Len > 0) && (Response[Len - 1] == '\n')) {
+      Len--;
+    }
+
+    if (Len > TruncateTagLen) {
+      if (strncmp (Response + Len - TruncateTagLen, TruncateTag, TruncateTagLen) == 0) {
+        // The response was truncated, so we need to read more.
+        Response[Len - TruncateTagLen] = 0; // Remove the truncate tag.
+        dprintf ("%s", Response);
+        Offset += Len - TruncateTagLen;
+        continue;
+      }
+    }
+
+    break;
+  }
+
+  dprintf ("%s\n", Response);
 
   EXIT_API ();
   return S_OK;
 }
 
 HRESULT CALLBACK
-modulebreak (
+info (
   PDEBUG_CLIENT4  Client,
   PCSTR           args
   )
 {
-  CHAR  Command[512];
-
   INIT_API ();
 
-  if (RUST == gUefiEnv) {
-    sprintf_s (Command, sizeof (Command), ".exdicmd target:0:mod break %s", args);
-  } else {
-    sprintf_s (Command, sizeof (Command), ".exdicmd target:0:b%s", args);
-  }
-
-  g_ExtControl->Execute (
-                  DEBUG_OUTCTL_ALL_CLIENTS,
-                  Command,
-                  DEBUG_EXECUTE_DEFAULT
-                  );
+  monitor (Client, "?");
 
   EXIT_API ();
   return S_OK;
 }
 
 HRESULT CALLBACK
-readmsr (
+modulebreak (
   PDEBUG_CLIENT4  Client,
   PCSTR           args
   )
@@ -70,23 +86,20 @@ readmsr (
 
   INIT_API ();
 
-  if (strlen (args) == 0) {
-    dprintf ("Must provide MSR index in HEX!");
+  if (RUST == gUefiEnv) {
+    sprintf_s (Command, sizeof (Command), "mod break %s", args);
+  } else {
+    sprintf_s (Command, sizeof (Command), "b%s", args);
   }
 
-  sprintf_s (Command, sizeof (Command), ".exdicmd target:0:m%s", args);
-  g_ExtControl->Execute (
-                  DEBUG_OUTCTL_ALL_CLIENTS,
-                  Command,
-                  DEBUG_EXECUTE_DEFAULT
-                  );
+  monitor (Client, Command);
 
   EXIT_API ();
   return S_OK;
 }
 
 HRESULT CALLBACK
-readvar (
+readmsr (
   PDEBUG_CLIENT4  Client,
   PCSTR           args
   )
@@ -96,15 +109,11 @@ readvar (
   INIT_API ();
 
   if (strlen (args) == 0) {
-    dprintf ("Must provide variable name!");
+    dprintf ("Must provide MSR index in HEX! E.g. 0x1234\n");
   }
 
-  sprintf_s (Command, sizeof (Command), ".exdicmd target:0:v%s", args);
-  g_ExtControl->Execute (
-                  DEBUG_OUTCTL_ALL_CLIENTS,
-                  Command,
-                  DEBUG_EXECUTE_DEFAULT
-                  );
+  sprintf_s (Command, sizeof (Command), "m%s", args);
+  monitor (Client, Command);
 
   EXIT_API ();
   return S_OK;
@@ -143,49 +152,3 @@ reboot (
   EXIT_API ();
   return S_OK;
 }
-
-HRESULT CALLBACK
-monitor (
-  PDEBUG_CLIENT4  Client,
-  PCSTR           args
-  )
-{
-  PSTR         Response;
-  ULONG        Len;
-  const CHAR   *TruncateTag   = "#T#";
-  const ULONG  TruncateTagLen = sizeof ("#T#") - 1; // Exclude the null terminator.
-  ULONG        Offset;
-
-  INIT_API ();
-
-  Offset = 0;
-
-  // Loop on the command until the entire response is received.
-  while (TRUE) {
-    Response = MonitorCommandWithOutput (Client, args, Offset);
-
-    // Strip of the trailing newline character if it exists since this in injected
-    // by windbg and is not part of the response.
-    Len = (ULONG)strlen (Response);
-    if ((Len > 0) && (Response[Len - 1] == '\n')) {
-      Len--;
-    }
-
-    if (Len > TruncateTagLen) {
-      if (strncmp (Response + Len - TruncateTagLen, TruncateTag, TruncateTagLen) == 0) {
-        // The response was truncated, so we need to read more.
-        Response[Len - TruncateTagLen] = 0; // Remove the truncate tag.
-        dprintf ("%s", Response);
-        Offset += Len - TruncateTagLen;
-        continue;
-      }
-    }
-
-    break;
-  }
-
-  dprintf ("%s\n", Response);
-
-  EXIT_API ();
-  return S_OK;
-}

UefiDbgExt/uefiext.cpp

@@ -169,7 +169,6 @@ help (
     "  monitor             - Sends direct monitor commands\n"
     "  modulebreak         - Sets a break on load for the provided module. e.g. 'shell'\n"
     "  readmsr             - Reads a MSR value (x86 only)\n"
-    "  readvar             - Reads a UEFI variable\n"
     "  reboot              - Reboots the system\n"
     );
 

UefiDbgExt/uefiext.def

@@ -27,7 +27,6 @@ EXPORTS
     pt
     protocols
     readmsr
-    readvar
     reboot
     setenv