Remove unneeded space in sym output to make sure the output is RVD compatible.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10149 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c b/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c
index e637071df009723362798569c89980f8a4422486..2141c159b500e6ef962ca3f0b15790d7c3e112f5 100644 (file)
--- a/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c
+++ b/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c
@@ -63,7 +63,8 @@ EblSymbolTable (
   BOOLEAN                           Elf;\r
   \r
   // Need to add lots of error checking on the passed in string\r
   BOOLEAN                           Elf;\r
   \r
   // Need to add lots of error checking on the passed in string\r

-  Format = (Argc > 1) ? Argv[1] : "load /a /ni /np %a & 0x%x";\r
+  // Default string is for RealView debugger\r
+  Format = (Argc > 1) ? Argv[1] : "load /a /ni /np %a &0x%x";\r

   Elf = (Argc > 2) ? FALSE : TRUE;\r
   \r
   Status = EfiGetSystemConfigurationTable (&gEfiDebugImageInfoTableGuid, (VOID **)&DebugImageTableHeader);\r
   Elf = (Argc > 2) ? FALSE : TRUE;\r
   \r
   Status = EfiGetSystemConfigurationTable (&gEfiDebugImageInfoTableGuid, (VOID **)&DebugImageTableHeader);\r


@@ -82,12 +83,15 @@ EblSymbolTable (
         ImageBase = (UINT32)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;\r
         PeCoffSizeOfHeaders = PeCoffGetSizeOfHeaders ((VOID *)(UINTN)ImageBase);\r
         Pdb = PeCoffLoaderGetPdbPointer (DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase);\r
         ImageBase = (UINT32)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;\r
         PeCoffSizeOfHeaders = PeCoffGetSizeOfHeaders ((VOID *)(UINTN)ImageBase);\r
         Pdb = PeCoffLoaderGetPdbPointer (DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase);\r

-        if (Elf) {\r
-          // ELF and Mach-O images don't include the header so the linked address does not include header\r
-          ImageBase += PeCoffSizeOfHeaders;\r
-        } \r
-        AsciiPrint (Format, Pdb, ImageBase);\r
-        AsciiPrint ("\n");\r
+        if (Pdb != NULL) {\r
+          if (Elf) {\r
+            // ELF and Mach-O images don't include the header so the linked address does not include header\r
+            ImageBase += PeCoffSizeOfHeaders;\r
+          } \r
+          AsciiPrint (Format, Pdb, ImageBase);\r
+          AsciiPrint ("\n");\r
+        } else {\r
+        }\r

       }\r
     }  \r
   }\r
       }\r
     }  \r
   }\r


@@ -151,7 +155,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mLibCmdTemplate[] =
     EblDisassembler\r
   },\r
   {\r
     EblDisassembler\r
   },\r
   {\r

-    "symboltable [\"format string\"] [TRUE]",\r
+    "symboltable [\"format string\"] [PECOFF]",\r

     " show symbol table commands for debugger",\r
     NULL,\r
     EblSymbolTable\r
     " show symbol table commands for debugger",\r
     NULL,\r
     EblSymbolTable\r