Add a PcdEmulatorLazyLoadSymbols that allows non-lazy symbol loading. The problem with lazy symbol loading is it only happens after you hit a breakpoint. This means you can't add breakpoints from the GUI and have them hit, this requires symbols being loaded as modules load so the breakpoints can get resolved.

Added arguments to SecGdbScriptBreak() to enable lldb python symbol load/unload script. 

signed-off-by:andrewfish



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12879 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish 2011-12-15 22:26:15 +00:00
parent 947a14a0a8
commit dd6f7d02a1
3 changed files with 83 additions and 27 deletions

View File

@ -48,6 +48,10 @@
gEmuVirtualDisksGuid = { 0xf2ba331a, 0x8985, 0x11db, { 0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }
gEmuPhysicalDisksGuid = { 0xf2bdcc96, 0x8985, 0x11db, { 0x87, 0x19, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }
[PcdsFeatureFlag]
## If TRUE, if symbols only load on breakpoints and gdb entry
gEmulatorPkgTokenSpaceGuid.PcdEmulatorLazyLoadSymbols|TRUE|BOOLEAN|0x00020000
[PcdsFixedAtBuild]
gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase|0x0|UINT64|0x00001014
gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase|0x0|UINT64|0x00001015

View File

@ -1113,6 +1113,18 @@ DlLoadImage (
}
VOID
SecGdbScriptBreak (
char *FileName,
int FileNameLength,
long unsigned int LoadAddress,
int AddSymbolFlag
)
{
return;
}
/**
Adds the image to a gdb script so it's symbols can be loaded.
The AddFirmwareSymbolFile helper macro is used.
@ -1130,6 +1142,7 @@ GdbScriptAddImage (
if (ImageContext->PdbPointer != NULL && !IsPdbFile (ImageContext->PdbPointer)) {
FILE *GdbTempFile;
if (FeaturePcdGet (PcdEmulatorLazyLoadSymbols)) {
GdbTempFile = fopen (gGdbWorkingFileName, "a");
if (GdbTempFile != NULL) {
long unsigned int SymbolsAddr = (long unsigned int)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders);
@ -1145,6 +1158,26 @@ GdbScriptAddImage (
} else {
ASSERT (FALSE);
}
} else {
GdbTempFile = fopen (gGdbWorkingFileName, "w");
if (GdbTempFile != NULL) {
fprintf (
GdbTempFile,
"add-symbol-file %s 0x%08lx\n",
ImageContext->PdbPointer,
(long unsigned int)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders)
);
fclose (GdbTempFile);
//
// Target for gdb breakpoint in a script that uses gGdbWorkingFileName to set a breakpoint.
// Hey what can you say scripting in gdb is not that great....
//
SecGdbScriptBreak (ImageContext->PdbPointer, strlen (ImageContext->PdbPointer), (long unsigned int)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders), 1);
} else {
ASSERT (FALSE);
}
}
}
}
@ -1182,6 +1215,7 @@ GdbScriptRemoveImage (
return;
}
if (FeaturePcdGet (PcdEmulatorLazyLoadSymbols)) {
//
// Write the file we need for the gdb script
//
@ -1198,6 +1232,21 @@ GdbScriptRemoveImage (
} else {
ASSERT (FALSE);
}
} else {
GdbTempFile = fopen (gGdbWorkingFileName, "w");
if (GdbTempFile != NULL) {
fprintf (GdbTempFile, "remove-symbol-file %s\n", ImageContext->PdbPointer);
fclose (GdbTempFile);
//
// Target for gdb breakpoint in a script that uses gGdbWorkingFileName to set a breakpoint.
// Hey what can you say scripting in gdb is not that great....
//
SecGdbScriptBreak (ImageContext->PdbPointer, strlen (ImageContext->PdbPointer), 0, 0);
} else {
ASSERT (FALSE);
}
}
}

View File

@ -111,6 +111,9 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage
[FeaturePcd]
gEmulatorPkgTokenSpaceGuid.PcdEmulatorLazyLoadSymbols
[BuildOptions]
GCC:*_*_IA32_DLINK_FLAGS == -o $(BIN_DIR)/Host -m elf_i386 -dynamic-linker $(HOST_DLINK_PATHS) -L/usr/X11R6/lib -lXext -lX11