MdeModulePkg SmiHandlerProfile: Fix no PDB case handling incorrectly
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=569 The PdbStringOffset should be set to 0 for no PDB case, then SmiHandlerProfileInfo can use it to know whether there is PCD info or not. Cc: Jiewen Yao <jiewen.yao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <star.zeng@intel.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
parent
d727614c91
commit
8ced192d5c
|
@ -266,8 +266,8 @@ GetDriverNameString (
|
||||||
//
|
//
|
||||||
// Method 1: Get the name string from image PDB
|
// Method 1: Get the name string from image PDB
|
||||||
//
|
//
|
||||||
if (ImageStruct->Header.Length > sizeof (SMM_CORE_IMAGE_DATABASE_STRUCTURE)) {
|
if (ImageStruct->PdbStringOffset != 0) {
|
||||||
GetShortPdbFileName ((CHAR8 *) (ImageStruct + 1), mNameString);
|
GetShortPdbFileName ((CHAR8 *) ((UINTN) ImageStruct + ImageStruct->PdbStringOffset), mNameString);
|
||||||
return mNameString;
|
return mNameString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -355,8 +355,10 @@ DumpSmmLoadedImage(
|
||||||
Print(L" FvFile=\"%g\"", &ImageStruct->FileGuid);
|
Print(L" FvFile=\"%g\"", &ImageStruct->FileGuid);
|
||||||
Print(L" RefId=\"0x%x\"", ImageStruct->ImageRef);
|
Print(L" RefId=\"0x%x\"", ImageStruct->ImageRef);
|
||||||
Print(L">\n");
|
Print(L">\n");
|
||||||
|
if (ImageStruct->PdbStringOffset != 0) {
|
||||||
PdbString = (CHAR8 *)((UINTN)ImageStruct + ImageStruct->PdbStringOffset);
|
PdbString = (CHAR8 *)((UINTN)ImageStruct + ImageStruct->PdbStringOffset);
|
||||||
Print(L" <Pdb>%a</Pdb>\n", PdbString);
|
Print(L" <Pdb>%a</Pdb>\n", PdbString);
|
||||||
|
}
|
||||||
Print(L" </Image>\n");
|
Print(L" </Image>\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -651,8 +651,12 @@ GetSmmImageDatabaseData (
|
||||||
ImageStruct->EntryPoint = mImageStruct[Index].EntryPoint;
|
ImageStruct->EntryPoint = mImageStruct[Index].EntryPoint;
|
||||||
ImageStruct->ImageBase = mImageStruct[Index].ImageBase;
|
ImageStruct->ImageBase = mImageStruct[Index].ImageBase;
|
||||||
ImageStruct->ImageSize = mImageStruct[Index].ImageSize;
|
ImageStruct->ImageSize = mImageStruct[Index].ImageSize;
|
||||||
|
if (mImageStruct[Index].PdbStringSize != 0) {
|
||||||
ImageStruct->PdbStringOffset = sizeof(SMM_CORE_IMAGE_DATABASE_STRUCTURE);
|
ImageStruct->PdbStringOffset = sizeof(SMM_CORE_IMAGE_DATABASE_STRUCTURE);
|
||||||
CopyMem ((VOID *)((UINTN)ImageStruct + ImageStruct->PdbStringOffset), mImageStruct[Index].PdbString, mImageStruct[Index].PdbStringSize);
|
CopyMem ((VOID *)((UINTN)ImageStruct + ImageStruct->PdbStringOffset), mImageStruct[Index].PdbString, mImageStruct[Index].PdbStringSize);
|
||||||
|
} else {
|
||||||
|
ImageStruct->PdbStringOffset = 0;
|
||||||
|
}
|
||||||
ImageStruct = (SMM_CORE_IMAGE_DATABASE_STRUCTURE *)((UINTN)ImageStruct + ImageStruct->Header.Length);
|
ImageStruct = (SMM_CORE_IMAGE_DATABASE_STRUCTURE *)((UINTN)ImageStruct + ImageStruct->Header.Length);
|
||||||
Size += sizeof(SMM_CORE_IMAGE_DATABASE_STRUCTURE) + mImageStruct[Index].PdbStringSize;
|
Size += sizeof(SMM_CORE_IMAGE_DATABASE_STRUCTURE) + mImageStruct[Index].PdbStringSize;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue