tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg: Change complex DEBUG_CODE() to DEBUG_CODE_BEGIN/END() 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3767

Update use of DEBUG_CODE(Expression) if Expression is a complex code
block with if/while/for/case statements that use {}.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Michael D Kinney 2021-12-05 14:33:53 -08:00 committed by mergify[bot]
parent 4a9d411662
commit db52c7f755
17 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c
View File

@ -336,7 +336,7 @@ GetEfiSysPartitionFromBootOptionFilePath (
break;
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
CHAR16 *DevicePathStr;
DevicePathStr = ConvertDevicePathToText (CurFullPath, TRUE, TRUE);
@ -344,7 +344,7 @@ GetEfiSysPartitionFromBootOptionFilePath (
DEBUG ((DEBUG_INFO, "Full device path %s\n", DevicePathStr));
FreePool (DevicePathStr);
}
);
DEBUG_CODE_END ();
Status = GetEfiSysPartitionFromDevPath (CurFullPath, &FsFullPath, Fs);
} while (EFI_ERROR (Status));
@ -468,7 +468,7 @@ GetUpdateFileSystem (
continue;
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
CHAR16 *DevicePathStr;
DevicePathStr = ConvertDevicePathToText (DevicePath, TRUE, TRUE);
@ -478,7 +478,7 @@ GetUpdateFileSystem (
} else {
DEBUG ((DEBUG_INFO, "DevicePathToStr failed\n"));
}
);
DEBUG_CODE_END ();
Status = GetEfiSysPartitionFromBootOptionFilePath (DevicePath, &FullPath, Fs);
if (!EFI_ERROR (Status)) {

8
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
View File

@ -167,7 +167,7 @@ AddIoSpace (
}
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
//
// Make sure there are adjacent descriptors covering [Base, Base + Length).
// It is possible that they have not been merged; merging can be prevented
@ -184,7 +184,7 @@ AddIoSpace (
ASSERT_EFI_ERROR (CheckStatus);
ASSERT (Descriptor.GcdIoType == EfiGcdIoTypeIo);
}
);
DEBUG_CODE_END ();
FreeIoSpaceMap:
FreePool (IoSpaceMap);
@ -315,7 +315,7 @@ AddMemoryMappedIoSpace (
}
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
//
// Make sure there are adjacent descriptors covering [Base, Base + Length).
// It is possible that they have not been merged; merging can be prevented
@ -333,7 +333,7 @@ AddMemoryMappedIoSpace (
ASSERT (Descriptor.GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo);
ASSERT ((Descriptor.Capabilities & Capabilities) == Capabilities);
}
);
DEBUG_CODE_END ();
FreeMemorySpaceMap:
FreePool (MemorySpaceMap);

8
MdeModulePkg/Core/Dxe/Gcd/Gcd.c
View File

@ -141,7 +141,7 @@ CoreDumpGcdMemorySpaceMap (
BOOLEAN InitialMap
)
{
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
EFI_STATUS Status;
UINTN NumberOfDescriptors;
EFI_GCD_MEMORY_SPACE_DESCRIPTOR *MemorySpaceMap;
@ -167,7 +167,7 @@ CoreDumpGcdMemorySpaceMap (
}
DEBUG ((DEBUG_GCD, "\n"));
FreePool (MemorySpaceMap);
);
DEBUG_CODE_END ();
}
/**
@ -183,7 +183,7 @@ CoreDumpGcdIoSpaceMap (
BOOLEAN InitialMap
)
{
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
EFI_STATUS Status;
UINTN NumberOfDescriptors;
EFI_GCD_IO_SPACE_DESCRIPTOR *IoSpaceMap;
@ -208,7 +208,7 @@ CoreDumpGcdIoSpaceMap (
}
DEBUG ((DEBUG_GCD, "\n"));
FreePool (IoSpaceMap);
);
DEBUG_CODE_END ();
}
/**

4
MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
View File

@ -2734,12 +2734,12 @@ DumpSmramInfo (
VOID
)
{
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
if (IS_SMRAM_PROFILE_ENABLED) {
DumpSmramProfile ();
DumpFreePagesList ();
DumpFreePoolList ();
DumpSmramRange ();
}
);
DEBUG_CODE_END ();
}

16
MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
View File

@ -489,7 +489,7 @@ GetEfiSysPartitionFromActiveBootOption(
continue;
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
CHAR16 *DevicePathStr;
DevicePathStr = ConvertDevicePathToText(DevicePath, TRUE, TRUE);
@ -499,7 +499,7 @@ GetEfiSysPartitionFromActiveBootOption(
} else {
DEBUG((DEBUG_INFO, "DevicePathToStr failed\n"));
}
);
DEBUG_CODE_END ();
CurFullPath = NULL;
//
@ -521,7 +521,7 @@ GetEfiSysPartitionFromActiveBootOption(
break;
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
CHAR16 *DevicePathStr1;
DevicePathStr1 = ConvertDevicePathToText(CurFullPath, TRUE, TRUE);
@ -529,7 +529,7 @@ GetEfiSysPartitionFromActiveBootOption(
DEBUG((DEBUG_INFO, "Full device path %s\n", DevicePathStr1));
FreePool(DevicePathStr1);
}
);
DEBUG_CODE_END ();
//
// Make sure the boot option device path connected.
@ -587,7 +587,7 @@ GetEfiSysPartitionFromActiveBootOption(
Status = EFI_NOT_FOUND;
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
CHAR16 *DevicePathStr2;
if (*FsHandle != NULL) {
DevicePathStr2 = ConvertDevicePathToText(CurFullPath, TRUE, TRUE);
@ -598,7 +598,7 @@ GetEfiSysPartitionFromActiveBootOption(
} else {
DEBUG((DEBUG_INFO, "Failed to found Active EFI System Partion\n"));
}
);
DEBUG_CODE_END ();
if (CurFullPath != NULL) {
FreePool(CurFullPath);
@ -990,13 +990,13 @@ GetFileImageInAlphabetFromDir(
FileCount++;
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
for (Link = FileInfoList.ForwardLink; Link != &FileInfoList; Link = Link->ForwardLink) {
FileInfoEntry = CR (Link, FILE_INFO_ENTRY, Link, FILE_INFO_SIGNATURE);
FileInfo = FileInfoEntry->FileInfo;
DEBUG((DEBUG_INFO, "Successfully read capsule file %s from disk.\n", FileInfo->FileName));
}
);
DEBUG_CODE_END ();
EXIT:

4
MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
View File

@ -1387,7 +1387,7 @@ BmExpandLoadFile (
//
FileBuffer = AllocateReservedPages (EFI_SIZE_TO_PAGES (BufferSize));
if (FileBuffer == NULL) {
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
EFI_DEVICE_PATH *LoadFilePath;
CHAR16 *LoadFileText;
CHAR16 *FileText;
@ -1417,7 +1417,7 @@ BmExpandLoadFile (
if (LoadFileText != NULL) {
FreePool (LoadFileText);
}
);
DEBUG_CODE_END ();
return NULL;
}

4
MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
View File

@ -545,7 +545,7 @@ BmRepairAllControllers (
EfiBootManagerFreeDriverHealthInfo (DriverHealthInfo, Count);
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
CHAR16 *ControllerName;
DriverHealthInfo = EfiBootManagerGetDriverHealthInfo (&Count);
@ -567,7 +567,7 @@ BmRepairAllControllers (
}
}
EfiBootManagerFreeDriverHealthInfo (DriverHealthInfo, Count);
);
DEBUG_CODE_END ();
if (ReconnectRequired) {
if (ReconnectRepairCount < MAX_RECONNECT_REPAIR) {

4
MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
View File

@ -286,7 +286,7 @@ ParseFv (
);
ASSERT_EFI_ERROR (Status);
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *Fvb2;
EFI_PHYSICAL_ADDRESS FvAddress;
UINT64 FvSize;
@ -303,7 +303,7 @@ ParseFv (
FvSize = ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) FvAddress)->FvLength;
DEBUG ((DEBUG_INFO , "FvSize - 0x%08x\n", FvSize));
}
);
DEBUG_CODE_END ();
if (ScanAll) {
//

5
MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c
View File

@ -38,7 +38,7 @@ SetIdtEntry (
Status = InitializeCpuExceptionHandlers (NULL);
ASSERT_EFI_ERROR (Status);
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
//
// Update IDT entry INT3 if the instruction is valid in it
//
@ -51,6 +51,5 @@ SetIdtEntry (
IdtEntry->Bits.GateType = IA32_IDT_GATE_TYPE_INTERRUPT_32;
IdtEntry->Bits.OffsetHigh = (UINT16)(S3DebugBuffer >> 16);
}
);
DEBUG_CODE_END ();
}

4
MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
View File

@ -149,7 +149,7 @@ SetIdtEntry (
Status = InitializeCpuExceptionHandlers (NULL);
ASSERT_EFI_ERROR (Status);
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
//
// Update IDT entry INT3 if the instruction is valid in it
//
@ -164,7 +164,7 @@ SetIdtEntry (
IdtEntry->Bits.OffsetUpper = (UINT32)(S3DebugBuffer >> 32);
IdtEntry->Bits.Reserved_1 = 0;
}
);
DEBUG_CODE_END ();
//
// If both BIOS and OS wants long mode waking vector,

4
MdeModulePkg/Universal/BdsDxe/BdsEntry.c
View File

@ -941,7 +941,7 @@ BdsEntry (
OsIndication = 0;
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
EFI_BOOT_MANAGER_LOAD_OPTION_TYPE LoadOptionType;
DEBUG ((DEBUG_INFO, "[Bds]OsIndication: %016x\n", OsIndication));
DEBUG ((DEBUG_INFO, "[Bds]=============Begin Load Options Dumping ...=============\n"));
@ -963,7 +963,7 @@ BdsEntry (
EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount);
}
DEBUG ((DEBUG_INFO, "[Bds]=============End Load Options Dumping=============\n"));
);
DEBUG_CODE_END ();
//
// BootManagerMenu doesn't contain the correct information when return status is EFI_NOT_FOUND.

4
MdeModulePkg/Universal/CapsuleOnDiskLoadPei/CapsuleOnDiskLoadPei.c
View File

@ -282,7 +282,7 @@ InitializeCapsuleOnDiskLoad (
return EFI_ABORTED;
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
VOID *CapsuleOnDiskModePpi;
if (!IsCapsuleOnDiskMode()){
@ -302,7 +302,7 @@ InitializeCapsuleOnDiskLoad (
DEBUG((DEBUG_ERROR, "Locate CapsuleOnDiskModePpi error %x\n", Status));
return Status;
}
);
DEBUG_CODE_END ();
Status = PeiServicesInstallPpi (&mCapsuleOnDiskPpiList);
ASSERT_EFI_ERROR (Status);

4
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
View File

@ -335,12 +335,12 @@ InitializeGraphicsConsoleTextMode (
}
}
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
for (Index = 0; Index < ValidCount; Index++) {
DEBUG ((DEBUG_INFO, "Graphics - Mode %d, Column = %d, Row = %d\n",
Index, NewModeBuffer[Index].Columns, NewModeBuffer[Index].Rows));
}
);
DEBUG_CODE_END ();
//
// Return valid mode count and mode information buffer.

5
MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
View File

@ -327,13 +327,13 @@ InitializeTerminalConsoleTextMode (
}
*TextModeCount = ARRAY_SIZE (mTerminalConsoleModeData);
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
INT32 Index;
for (Index = 0; Index < *TextModeCount; Index++) {
DEBUG ((DEBUG_INFO, "Terminal - Mode %d, Column = %d, Row = %d\n",
Index, TextModeData[Index].Columns, TextModeData[Index].Rows));
}
);
DEBUG_CODE_END ();
return TextModeData;
}
@ -1380,4 +1380,3 @@ IsHotPlugDevice (
return FALSE;
}

4
MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c
View File

@ -330,7 +330,7 @@ Defer3rdPartyImageLoad (
ImageInfo = LookupImage (File, BootPolicy);
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
CHAR16 *DevicePathStr;
DevicePathStr = ConvertDevicePathToText (File, FALSE, FALSE);
DEBUG ((
@ -342,7 +342,7 @@ Defer3rdPartyImageLoad (
if (DevicePathStr != NULL) {
FreePool (DevicePathStr);
}
);
DEBUG_CODE_END ();
if (mEndOfDxe) {
mImageLoadedAfterEndOfDxe = TRUE;

4
MdeModulePkg/Universal/Variable/Pei/Variable.c
View File

@ -512,7 +512,7 @@ GetHobVariableStore (
//
// Make sure there is no more than one Variable HOB.
//
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
GuidHob = GetFirstGuidHob (&gEfiAuthenticatedVariableGuid);
if (GuidHob != NULL) {
if ((GetNextGuidHob (&gEfiAuthenticatedVariableGuid, GET_NEXT_HOB (GuidHob)) != NULL)) {
@ -531,7 +531,7 @@ GetHobVariableStore (
}
}
}
);
DEBUG_CODE_END ();
GuidHob = GetFirstGuidHob (&gEfiAuthenticatedVariableGuid);
if (GuidHob != NULL) {

8
MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
View File

@ -280,7 +280,7 @@ RecordVarErrorFlag (
VAR_ERROR_FLAG *VarErrFlag;
VAR_ERROR_FLAG TempFlag;
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
DEBUG ((DEBUG_ERROR, "RecordVarErrorFlag (0x%02x) %s:%g - 0x%08x - 0x%x\n", Flag, VariableName, VendorGuid, Attributes, VariableSize));
if (Flag == VAR_ERROR_FLAG_SYSTEM_ERROR) {
if (AtRuntime ()) {
@ -291,7 +291,7 @@ RecordVarErrorFlag (
} else {
DEBUG ((DEBUG_ERROR, "CommonMaxUserVariableSpace = 0x%x - CommonUserVariableTotalSize = 0x%x\n", mVariableModuleGlobal->CommonMaxUserVariableSpace, mVariableModuleGlobal->CommonUserVariableTotalSize));
}
);
DEBUG_CODE_END ();
if (!mEndOfDxe) {
//
@ -3498,7 +3498,7 @@ GetHobVariableStore (
//
// Make sure there is no more than one Variable HOB.
//
DEBUG_CODE (
DEBUG_CODE_BEGIN ();
GuidHob = GetFirstGuidHob (&gEfiAuthenticatedVariableGuid);
if (GuidHob != NULL) {
if ((GetNextGuidHob (&gEfiAuthenticatedVariableGuid, GET_NEXT_HOB (GuidHob)) != NULL)) {
@ -3517,7 +3517,7 @@ GetHobVariableStore (
}
}
}
);
DEBUG_CODE_END ();
//
// Combinations supported: