Add a PE/COFF extra action lib that DEBUG prints the debugger command to load symbols. Turn off DXE Core DEBUG print on load and use this new library in its place.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10373 6f19259b-4bc3-4df7-8a09-765794883524
2010-04-14 21:52:26 +00:00
parent 9e4f210c32
commit 5b792f1abf
6 changed files with 187 additions and 109 deletions
--- a/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.c
+++ b/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.c
@@ -0,0 +1,122 @@
+/**@file
+
+Copyright (c) 2006 - 2009, Intel Corporation
+Portions copyright (c) 2008-2010 Apple Inc. All rights reserved.
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include <PiDxe.h>
+#include <Library/PeCoffLib.h>
+
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/PeCoffExtraActionLib.h>
+#include <Library/PrintLib.h>
+
+
+/**
+  If the build is done on cygwin the paths are cygpaths. 
+  /cygdrive/c/tmp.txt vs c:\tmp.txt so we need to convert
+  them to work with RVD commands
+
+  @param  Name  Path to convert if needed
+
+**/
+CHAR8 *
+DeCygwinPathIfNeeded (
+  IN  CHAR8   *Name
+  )
+{
+  CHAR8   *Ptr;
+  UINTN   Index;
+  UINTN   Len;
+  
+  Ptr = AsciiStrStr (Name, "/cygdrive/");
+  if (Ptr == NULL) {
+    return Name;
+  }
+  
+  Len = AsciiStrLen (Ptr);
+  
+  // convert "/cygdrive" to spaces
+  for (Index = 0; Index < 9; Index++) {
+    Ptr[Index] = ' ';
+  }
+
+  // convert /c to c:
+  Ptr[9]  = Ptr[10];
+  Ptr[10] = ':';
+  
+  // switch path seperators
+  for (Index = 11; Index < Len; Index++) {
+    if (Ptr[Index] == '/') {
+      Ptr[Index] = '\\' ;
+    }
+  }
+
+  return Name;
+}
+
+
+/**
+  Performs additional actions after a PE/COFF image has been loaded and relocated.
+
+  If ImageContext is NULL, then ASSERT().
+
+  @param  ImageContext  Pointer to the image context structure that describes the
+                        PE/COFF image that has already been loaded and relocated.
+
+**/
+VOID
+EFIAPI
+PeCoffLoaderRelocateImageExtraAction (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
+  )
+{
+#ifdef __CC_ARM
+  // Print out the command for the RVD debugger to load symbols for this image
+  DEBUG ((EFI_D_ERROR, "load /a /ni /np %a &0x%08x\n", DeCygwinPathIfNeeded (ImageContext->PdbPointer), (UINTN)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders)));
+#elif __GNUC__
+  // This may not work correctly if you generate PE/COFF directlyas then the Offset would not be required
+  DEBUG ((EFI_D_ERROR, "add-symbol-file %a 0x%08x\n", DeCygwinPathIfNeeded (ImageContext->PdbPointer), (UINTN)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders)));
+#else
+  DEBUG ((EFI_D_ERROR, "Loading driver at 0x%11p EntryPoint=0x%11p ", (VOID *)(UINTN) ImageContext->ImageAddress, FUNCTION_ENTRY_POINT (ImageContext->EntryPoint)));
+#endif
+}
+
+
+
+/**
+  Performs additional actions just before a PE/COFF image is unloaded.  Any resources
+  that were allocated by PeCoffLoaderRelocateImageExtraAction() must be freed.
+  
+  If ImageContext is NULL, then ASSERT().
+  
+  @param  ImageContext  Pointer to the image context structure that describes the
+                        PE/COFF image that is being unloaded.
+
+**/
+VOID
+EFIAPI
+PeCoffLoaderUnloadImageExtraAction (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
+  )
+{
+#ifdef __CC_ARM
+  // Print out the command for the RVD debugger to load symbols for this image
+  DEBUG ((EFI_D_ERROR, "unload symbols_only %a", DeCygwinPathIfNeeded (ImageContext->PdbPointer)));
+#elif __GNUC__
+  // This may not work correctly if you generate PE/COFF directlyas then the Offset would not be required
+  DEBUG ((EFI_D_ERROR, "remove-symbol-file %a 0x%08x\n", DeCygwinPathIfNeeded (ImageContext->PdbPointer), (UINTN)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders)));
+#else
+  DEBUG ((EFI_D_ERROR, "Unloading %a", ImageContext->PdbPointer));
+#endif
+}