tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

1. Set the EFI_DEBUG_IMAGE_INFO_TABLE_MODIFIED bit on insertion/deletion of entries in DebugImageInfo Table.

Browse Source 
2. Change field EFI_DEBUG_IMAGE_INFO_TABLE_HEADER.TableSize to be the number of valid entries. Apply another global variable mMaxTableEntries to track the maximum of the allocated entires.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6051 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8 2008-09-27 08:02:57 +00:00
parent 71bd74cbf2
commit 2f2a277df4
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
View File

@ -22,6 +22,8 @@ EFI_DEBUG_IMAGE_INFO_TABLE_HEADER mDebugInfoTableHeader = {
NULL // EFI_DEBUG_IMAGE_INFO *EfiDebugImageInfoTable; NULL // EFI_DEBUG_IMAGE_INFO *EfiDebugImageInfoTable;
}; };
UINTN mMaxTableEntries = 0;
EFI_SYSTEM_TABLE_POINTER *mDebugTable = NULL; EFI_SYSTEM_TABLE_POINTER *mDebugTable = NULL;
#define FOUR_MEG_ALIGNMENT 0x400000 #define FOUR_MEG_ALIGNMENT 0x400000
@ -93,7 +95,6 @@ CoreNewDebugImageInfoEntry (
EFI_DEBUG_IMAGE_INFO *Table; EFI_DEBUG_IMAGE_INFO *Table;
EFI_DEBUG_IMAGE_INFO *NewTable; EFI_DEBUG_IMAGE_INFO *NewTable;
UINTN Index; UINTN Index;
UINTN MaxTableIndex;
UINTN TableSize; UINTN TableSize;
// //
@ -102,21 +103,24 @@ CoreNewDebugImageInfoEntry (
mDebugInfoTableHeader.UpdateStatus |= EFI_DEBUG_IMAGE_INFO_UPDATE_IN_PROGRESS; mDebugInfoTableHeader.UpdateStatus |= EFI_DEBUG_IMAGE_INFO_UPDATE_IN_PROGRESS;
Table = mDebugInfoTableHeader.EfiDebugImageInfoTable; Table = mDebugInfoTableHeader.EfiDebugImageInfoTable;
MaxTableIndex = mDebugInfoTableHeader.TableSize;
if (mDebugInfoTableHeader.TableSize < mMaxTableEntries) {
for (Index = 0; Index < MaxTableIndex; Index++) { //
if (Table[Index].NormalImage == NULL) { // We still have empty entires in the Table, find the first empty entry.
// //
// We have found a free entry so exit the loop Index = 0;
// while (Table[Index].NormalImage != NULL) {
break; Index++;
} }
} //
if (Index == MaxTableIndex) { // There must be an empty entry in the in the table.
//
ASSERT (Index < mMaxTableEntries);
} else {
// //
// Table is full, so re-allocate another page for a larger table... // Table is full, so re-allocate another page for a larger table...
// //
TableSize = MaxTableIndex * EFI_DEBUG_TABLE_ENTRY_SIZE; TableSize = mMaxTableEntries * EFI_DEBUG_TABLE_ENTRY_SIZE;
NewTable = AllocateZeroPool (TableSize + EFI_PAGE_SIZE); NewTable = AllocateZeroPool (TableSize + EFI_PAGE_SIZE);
if (NewTable == NULL) { if (NewTable == NULL) {
mDebugInfoTableHeader.UpdateStatus &= ~EFI_DEBUG_IMAGE_INFO_UPDATE_IN_PROGRESS; mDebugInfoTableHeader.UpdateStatus &= ~EFI_DEBUG_IMAGE_INFO_UPDATE_IN_PROGRESS;
@ -135,8 +139,14 @@ CoreNewDebugImageInfoEntry (
// //
Table = NewTable; Table = NewTable;
mDebugInfoTableHeader.EfiDebugImageInfoTable = NewTable; mDebugInfoTableHeader.EfiDebugImageInfoTable = NewTable;
mDebugInfoTableHeader.TableSize += EFI_PAGE_SIZE / EFI_DEBUG_TABLE_ENTRY_SIZE; //
// Enlarge the max table entries and set the first empty entry index to
// be the original max table entries.
//
Index = mMaxTableEntries;
mMaxTableEntries += EFI_PAGE_SIZE / EFI_DEBUG_TABLE_ENTRY_SIZE;
} }
// //
// Allocate data for new entry // Allocate data for new entry
// //
@ -148,6 +158,11 @@ CoreNewDebugImageInfoEntry (
Table[Index].NormalImage->ImageInfoType = (UINT32) ImageInfoType; Table[Index].NormalImage->ImageInfoType = (UINT32) ImageInfoType;
Table[Index].NormalImage->LoadedImageProtocolInstance = LoadedImage; Table[Index].NormalImage->LoadedImageProtocolInstance = LoadedImage;
Table[Index].NormalImage->ImageHandle = ImageHandle; Table[Index].NormalImage->ImageHandle = ImageHandle;
//
// Increase the number of EFI_DEBUG_IMAGE_INFO elements and set the mDebugInfoTable in modified status.
//
mDebugInfoTableHeader.TableSize++;
mDebugInfoTableHeader.UpdateStatus |= EFI_DEBUG_IMAGE_INFO_TABLE_MODIFIED;
} }
mDebugInfoTableHeader.UpdateStatus &= ~EFI_DEBUG_IMAGE_INFO_UPDATE_IN_PROGRESS; mDebugInfoTableHeader.UpdateStatus &= ~EFI_DEBUG_IMAGE_INFO_UPDATE_IN_PROGRESS;
} }
@ -172,7 +187,7 @@ CoreRemoveDebugImageInfoEntry (
Table = mDebugInfoTableHeader.EfiDebugImageInfoTable; Table = mDebugInfoTableHeader.EfiDebugImageInfoTable;
for (Index = 0; Index < mDebugInfoTableHeader.TableSize; Index++) { for (Index = 0; Index < mMaxTableEntries; Index++) {
if (Table[Index].NormalImage != NULL && Table[Index].NormalImage->ImageHandle == ImageHandle) { if (Table[Index].NormalImage != NULL && Table[Index].NormalImage->ImageHandle == ImageHandle) {
// //
// Found a match. Free up the record, then NULL the pointer to indicate the slot // Found a match. Free up the record, then NULL the pointer to indicate the slot
@ -180,6 +195,11 @@ CoreRemoveDebugImageInfoEntry (
// //
CoreFreePool (Table[Index].NormalImage); CoreFreePool (Table[Index].NormalImage);
Table[Index].NormalImage = NULL; Table[Index].NormalImage = NULL;
//
// Decrease the number of EFI_DEBUG_IMAGE_INFO elements and set the mDebugInfoTable in modified status.
//
mDebugInfoTableHeader.TableSize--;
mDebugInfoTableHeader.UpdateStatus |= EFI_DEBUG_IMAGE_INFO_TABLE_MODIFIED;
break; break;
} }
} }