diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2021-12-05 14:34:05 -0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-12-07 17:24:28 +0000 |
| commit | 7c2a6033c149625482a18cd51b65513c8fb8fe15 (patch) | |
| tree | 700821377dd1211a98cd125daae378e5ca87e473 /UefiCpuPkg/Library | |
| parent | f9f4fb23290802cc43bb7a58325b9bfa8ed27da9 (diff) | |
| download | edk2-7c2a6033c149625482a18cd51b65513c8fb8fe15.tar.gz edk2-7c2a6033c149625482a18cd51b65513c8fb8fe15.tar.bz2 edk2-7c2a6033c149625482a18cd51b65513c8fb8fe15.zip | |
UefiCpuPkg: 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: Ray Ni <ray.ni@intel.com>
Diffstat (limited to 'UefiCpuPkg/Library')
| -rw-r--r-- | UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c | 4 | ||||
| -rw-r--r-- | UefiCpuPkg/Library/MpInitLib/MpLib.c | 4 | ||||
| -rw-r--r-- | UefiCpuPkg/Library/MtrrLib/MtrrLib.c | 8 | ||||
| -rw-r--r-- | UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 5 |
4 files changed, 10 insertions, 11 deletions
diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c index 52bd90d334..7b4e730f98 100644 --- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c +++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c @@ -243,7 +243,7 @@ GetApicMode ( VOID
)
{
- DEBUG_CODE (
+ DEBUG_CODE_BEGIN ();
{
MSR_IA32_APIC_BASE_REGISTER ApicBaseMsr;
@@ -259,7 +259,7 @@ GetApicMode ( ASSERT (ApicBaseMsr.Bits.EXTD == 0);
}
}
- );
+ DEBUG_CODE_END ();
return LOCAL_APIC_MODE_XAPIC;
}
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c index 84c9438992..b390c558d4 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -2155,7 +2155,7 @@ MpInitLibInitialize ( //
// Dump the microcode revision for each core.
//
- DEBUG_CODE (
+ DEBUG_CODE_BEGIN ();
UINT32 ThreadId;
UINT32 ExpectedMicrocodeRevision;
CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;
@@ -2176,7 +2176,7 @@ MpInitLibInitialize ( ));
}
}
- );
+ DEBUG_CODE_END ();
//
// Initialize global data for MP support
//
diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c index 2021f0c4f9..805a2f8d21 100644 --- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c +++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c @@ -2186,7 +2186,7 @@ MtrrSetMemoryAttributesInMtrrSettings ( //
// 0. Dump the requests.
//
- DEBUG_CODE (
+ DEBUG_CODE_BEGIN ();
DEBUG ((DEBUG_CACHE, "Mtrr: Set Mem Attribute to %a, ScratchSize = %x%a",
(MtrrSetting == NULL) ? "Hardware" : "Buffer", *ScratchSize,
(RangeCount <= 1) ? "," : "\n"
@@ -2197,7 +2197,7 @@ MtrrSetMemoryAttributesInMtrrSettings ( Ranges[Index].BaseAddress, Ranges[Index].BaseAddress + Ranges[Index].Length
));
}
- );
+ DEBUG_CODE_END ();
//
// 1. Validate the parameters.
@@ -2715,7 +2715,7 @@ MtrrDebugPrintAllMtrrsWorker ( IN MTRR_SETTINGS *MtrrSetting
)
{
- DEBUG_CODE (
+ DEBUG_CODE_BEGIN ();
MTRR_SETTINGS LocalMtrrs;
MTRR_SETTINGS *Mtrrs;
UINTN Index;
@@ -2799,7 +2799,7 @@ MtrrDebugPrintAllMtrrsWorker ( Ranges[Index].BaseAddress, Ranges[Index].BaseAddress + Ranges[Index].Length - 1
));
}
- );
+ DEBUG_CODE_END ();
}
/**
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c index a6534436a7..2f77ab3aeb 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c @@ -636,7 +636,7 @@ AnalysisProcessorFeatures ( //
// Dump the last CPU feature list
//
- DEBUG_CODE (
+ DEBUG_CODE_BEGIN ();
DEBUG ((DEBUG_INFO, "Last CPU features list...\n"));
Entry = GetFirstNode (&CpuFeaturesData->FeatureList);
while (!IsNull (&CpuFeaturesData->FeatureList, Entry)) {
@@ -659,7 +659,7 @@ AnalysisProcessorFeatures ( DumpCpuFeatureMask (PcdGetPtr (PcdCpuFeaturesSetting), CpuFeaturesData->BitMaskSize);
DEBUG ((DEBUG_INFO, "Final PcdCpuFeaturesSetting:\n"));
DumpCpuFeatureMask (CpuFeaturesData->SettingPcd, CpuFeaturesData->BitMaskSize);
- );
+ DEBUG_CODE_END ();
//
// Save PCDs and display CPU PCDs
@@ -1190,4 +1190,3 @@ CpuFeaturesDetect ( AnalysisProcessorFeatures (CpuFeaturesData->NumberOfCpus);
}
-
|