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>

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.c b/UefiCpuPkg/CpuDxe/CpuDxe.c
index 52cc26eaafb3d496fc671719f482e9a630c6f4da..efa0bc33084e62ff6cf082b93b75d828e3726e81 100644 (file)
--- a/UefiCpuPkg/CpuDxe/CpuDxe.c
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.c
@@ -1071,7 +1071,7 @@ AddMemoryMappedIoSpace (
     }\r
   }\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     //\r
     // Make sure there are adjacent descriptors covering [Base, Base + Length).\r
     // It is possible that they have not been merged; merging can be prevented\r
@@ -1089,7 +1089,7 @@ AddMemoryMappedIoSpace (
       ASSERT (Descriptor.GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo);\r
       ASSERT ((Descriptor.Capabilities & Capabilities) == Capabilities);\r
     }\r
-    );\r
+  DEBUG_CODE_END ();\r
 \r
 FreeMemorySpaceMap:\r
   FreePool (MemorySpaceMap);\r
@@ -1212,4 +1212,3 @@ InitializeCpu (
 \r
   return Status;\r
 }\r
-\r

diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
index 52bd90d33428e9776524660e40facb9ae5cb2cef..7b4e730f984f443c2efd043df62174e925c80451 100644 (file)
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
+++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
@@ -243,7 +243,7 @@ GetApicMode (
   VOID\r
   )\r
 {\r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     {\r
       MSR_IA32_APIC_BASE_REGISTER  ApicBaseMsr;\r
 \r
@@ -259,7 +259,7 @@ GetApicMode (
         ASSERT (ApicBaseMsr.Bits.EXTD == 0);\r
       }\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
   return LOCAL_APIC_MODE_XAPIC;\r
 }\r
 \r

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index 84c9438992b501f886bf628d2c2cfbce6bd44e61..b390c558d4bd51f158e4a5ade038be42223af10c 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -2155,7 +2155,7 @@ MpInitLibInitialize (
   //\r
   // Dump the microcode revision for each core.\r
   //\r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     UINT32 ThreadId;\r
     UINT32 ExpectedMicrocodeRevision;\r
     CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
@@ -2176,7 +2176,7 @@ MpInitLibInitialize (
           ));\r
       }\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
   //\r
   // Initialize global data for MP support\r
   //\r

diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index 2021f0c4f925ee7f9b87d41b4f3395e50fd732eb..805a2f8d2145135e74fc5008d3cfd9a9f4864a6b 100644 (file)
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
@@ -2186,7 +2186,7 @@ MtrrSetMemoryAttributesInMtrrSettings (
   //\r
   // 0. Dump the requests.\r
   //\r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     DEBUG ((DEBUG_CACHE, "Mtrr: Set Mem Attribute to %a, ScratchSize = %x%a",\r
             (MtrrSetting == NULL) ? "Hardware" : "Buffer", *ScratchSize,\r
             (RangeCount <= 1) ? "," : "\n"\r
@@ -2197,7 +2197,7 @@ MtrrSetMemoryAttributesInMtrrSettings (
               Ranges[Index].BaseAddress, Ranges[Index].BaseAddress + Ranges[Index].Length\r
               ));\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   //\r
   // 1. Validate the parameters.\r
@@ -2715,7 +2715,7 @@ MtrrDebugPrintAllMtrrsWorker (
   IN MTRR_SETTINGS    *MtrrSetting\r
   )\r
 {\r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     MTRR_SETTINGS     LocalMtrrs;\r
     MTRR_SETTINGS     *Mtrrs;\r
     UINTN             Index;\r
@@ -2799,7 +2799,7 @@ MtrrDebugPrintAllMtrrsWorker (
         Ranges[Index].BaseAddress, Ranges[Index].BaseAddress + Ranges[Index].Length - 1\r
         ));\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 }\r
 \r
 /**\r

diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index a6534436a78304a07605391f2cf68b679aa048e1..2f77ab3aeb559b1f6a3565dcf06470e7e19b395a 100644 (file)
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
@@ -636,7 +636,7 @@ AnalysisProcessorFeatures (
   //\r
   // Dump the last CPU feature list\r
   //\r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     DEBUG ((DEBUG_INFO, "Last CPU features list...\n"));\r
     Entry = GetFirstNode (&CpuFeaturesData->FeatureList);\r
     while (!IsNull (&CpuFeaturesData->FeatureList, Entry)) {\r
@@ -659,7 +659,7 @@ AnalysisProcessorFeatures (
     DumpCpuFeatureMask (PcdGetPtr (PcdCpuFeaturesSetting), CpuFeaturesData->BitMaskSize);\r
     DEBUG ((DEBUG_INFO, "Final PcdCpuFeaturesSetting:\n"));\r
     DumpCpuFeatureMask (CpuFeaturesData->SettingPcd, CpuFeaturesData->BitMaskSize);\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   //\r
   // Save PCDs and display CPU PCDs\r
@@ -1190,4 +1190,3 @@ CpuFeaturesDetect (
 \r
   AnalysisProcessorFeatures (CpuFeaturesData->NumberOfCpus);\r
 }\r
-\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
index c8eacbbecfbb9ec7449f03ac899a38d6ddd02f66..fbf45d652565c489c52aff87aa4e56bfc8ed2ec6 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
@@ -597,12 +597,12 @@ PiCpuSmmEntry (
   // If support CPU hot plug, PcdCpuSmmEnableBspElection should be set to TRUE.\r
   // A constant BSP index makes no sense because it may be hot removed.\r
   //\r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     if (FeaturePcdGet (PcdCpuHotPlugSupport)) {\r
 \r
       ASSERT (FeaturePcdGet (PcdCpuSmmEnableBspElection));\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   //\r
   // Save the PcdCpuSmmCodeAccessCheckEnable value into a global variable.\r