Remove extra {} inside DEBUG_CODE() macro

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11244 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index ad8dbe46c30f5cae0a32c65f005b8efeb9e45afd..cc4f5b37d024690336edacbae7d6a994fdd2eedd 100644 (file)
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
@@ -1480,80 +1480,57 @@ MtrrDebugPrintAllMtrrs (
   )\r
 {\r
   DEBUG_CODE (\r
   )\r
 {\r
   DEBUG_CODE (\r

-    {\r
-      MTRR_SETTINGS  MtrrSettings;\r
-      UINTN          Index;\r
-      UINTN          Index1;\r
-      UINTN          VariableMtrrCount;\r
-      UINT64         Base;\r
-      UINT64         Limit;\r
-      UINT64         MtrrBase;\r
-      UINT64         MtrrLimit;\r
-      UINT64         RangeBase;\r
-      UINT64         RangeLimit;\r
-      UINT64         NoRangeBase;\r
-      UINT64         NoRangeLimit;\r
-      UINT32         RegEax;\r
-      UINTN          MemoryType;\r
-      UINTN          PreviousMemoryType;\r
-      BOOLEAN        Found;\r
-\r
-      if (!IsMtrrSupported ()) {\r
-        return;\r
-      }\r
-\r
-      DEBUG((DEBUG_CACHE, "MTRR Settings\n"));\r
-      DEBUG((DEBUG_CACHE, "=============\n"));\r
-      \r
-      MtrrGetAllMtrrs (&MtrrSettings);\r
-      DEBUG((DEBUG_CACHE, "MTRR Default Type: %016lx\n", MtrrSettings.MtrrDefType));\r
-      for (Index = 0; Index < MTRR_NUMBER_OF_FIXED_MTRR; Index++) {\r
-        DEBUG((DEBUG_CACHE, "Fixed MTRR[%02d]   : %016lx\n", Index, MtrrSettings.Fixed.Mtrr[Index]));\r
-      }\r
-\r
-      VariableMtrrCount = GetVariableMtrrCount ();\r
-      for (Index = 0; Index < VariableMtrrCount; Index++) {\r
-        DEBUG((DEBUG_CACHE, "Variable MTRR[%02d]: Base=%016lx Mask=%016lx\n",\r
-          Index,\r
-          MtrrSettings.Variables.Mtrr[Index].Base,\r
-          MtrrSettings.Variables.Mtrr[Index].Mask\r
-          ));\r
-      }\r
-      DEBUG((DEBUG_CACHE, "\n"));\r
-      DEBUG((DEBUG_CACHE, "MTRR Ranges\n"));\r
-      DEBUG((DEBUG_CACHE, "====================================\n"));\r
-\r
-      Base = 0;\r
-      PreviousMemoryType = MTRR_CACHE_INVALID_TYPE;\r
-      for (Index = 0; Index < MTRR_NUMBER_OF_FIXED_MTRR; Index++) {\r
-        Base = mMtrrLibFixedMtrrTable[Index].BaseAddress;\r
-        for (Index1 = 0; Index1 < 8; Index1++) {\r
-          MemoryType = (UINTN)RShiftU64 (MtrrSettings.Fixed.Mtrr[Index], Index1 * 8) & 0xff;\r
-          if (MemoryType > CacheWriteBack) {\r
-            MemoryType = MTRR_CACHE_INVALID_TYPE;\r
-          }            \r
-          if (MemoryType != PreviousMemoryType) {\r
-            if (PreviousMemoryType != MTRR_CACHE_INVALID_TYPE) {\r
-              DEBUG((DEBUG_CACHE, "%016lx\n", Base - 1));\r
-            }\r
-            PreviousMemoryType = MemoryType;\r
-            DEBUG((DEBUG_CACHE, "%a:%016lx-", mMtrrMemoryCacheTypeShortName[MemoryType], Base));\r
-          }\r
-          Base += mMtrrLibFixedMtrrTable[Index].Length;\r
-        }\r
-      }\r
-      DEBUG((DEBUG_CACHE, "%016lx\n", Base - 1));\r
+    MTRR_SETTINGS  MtrrSettings;\r
+    UINTN          Index;\r
+    UINTN          Index1;\r
+    UINTN          VariableMtrrCount;\r
+    UINT64         Base;\r
+    UINT64         Limit;\r
+    UINT64         MtrrBase;\r
+    UINT64         MtrrLimit;\r
+    UINT64         RangeBase;\r
+    UINT64         RangeLimit;\r
+    UINT64         NoRangeBase;\r
+    UINT64         NoRangeLimit;\r
+    UINT32         RegEax;\r
+    UINTN          MemoryType;\r
+    UINTN          PreviousMemoryType;\r
+    BOOLEAN        Found;\r
+\r
+    if (!IsMtrrSupported ()) {\r
+      return;\r
+    }\r

 \r
 \r

-      VariableMtrrCount = GetVariableMtrrCount ();\r
+    DEBUG((DEBUG_CACHE, "MTRR Settings\n"));\r
+    DEBUG((DEBUG_CACHE, "=============\n"));\r
+    \r
+    MtrrGetAllMtrrs (&MtrrSettings);\r
+    DEBUG((DEBUG_CACHE, "MTRR Default Type: %016lx\n", MtrrSettings.MtrrDefType));\r
+    for (Index = 0; Index < MTRR_NUMBER_OF_FIXED_MTRR; Index++) {\r
+      DEBUG((DEBUG_CACHE, "Fixed MTRR[%02d]   : %016lx\n", Index, MtrrSettings.Fixed.Mtrr[Index]));\r
+    }\r

 \r
 \r

-      Base = BASE_1MB;\r
-      PreviousMemoryType = MTRR_CACHE_INVALID_TYPE;\r
-      do {\r
-        MemoryType = MtrrGetMemoryAttribute (Base);\r
+    VariableMtrrCount = GetVariableMtrrCount ();\r
+    for (Index = 0; Index < VariableMtrrCount; Index++) {\r
+      DEBUG((DEBUG_CACHE, "Variable MTRR[%02d]: Base=%016lx Mask=%016lx\n",\r
+        Index,\r
+        MtrrSettings.Variables.Mtrr[Index].Base,\r
+        MtrrSettings.Variables.Mtrr[Index].Mask\r
+        ));\r
+    }\r
+    DEBUG((DEBUG_CACHE, "\n"));\r
+    DEBUG((DEBUG_CACHE, "MTRR Ranges\n"));\r
+    DEBUG((DEBUG_CACHE, "====================================\n"));\r
+\r
+    Base = 0;\r
+    PreviousMemoryType = MTRR_CACHE_INVALID_TYPE;\r
+    for (Index = 0; Index < MTRR_NUMBER_OF_FIXED_MTRR; Index++) {\r
+      Base = mMtrrLibFixedMtrrTable[Index].BaseAddress;\r
+      for (Index1 = 0; Index1 < 8; Index1++) {\r
+      MemoryType = (UINTN)(RShiftU64 (MtrrSettings.Fixed.Mtrr[Index], Index1 * 8) & 0xff);\r

         if (MemoryType > CacheWriteBack) {\r
           MemoryType = MTRR_CACHE_INVALID_TYPE;\r
         if (MemoryType > CacheWriteBack) {\r
           MemoryType = MTRR_CACHE_INVALID_TYPE;\r

-        }\r
-\r
+        }            \r

         if (MemoryType != PreviousMemoryType) {\r
           if (PreviousMemoryType != MTRR_CACHE_INVALID_TYPE) {\r
             DEBUG((DEBUG_CACHE, "%016lx\n", Base - 1));\r
         if (MemoryType != PreviousMemoryType) {\r
           if (PreviousMemoryType != MTRR_CACHE_INVALID_TYPE) {\r
             DEBUG((DEBUG_CACHE, "%016lx\n", Base - 1));\r


@@ -1561,61 +1538,82 @@ MtrrDebugPrintAllMtrrs (
           PreviousMemoryType = MemoryType;\r
           DEBUG((DEBUG_CACHE, "%a:%016lx-", mMtrrMemoryCacheTypeShortName[MemoryType], Base));\r
         }\r
           PreviousMemoryType = MemoryType;\r
           DEBUG((DEBUG_CACHE, "%a:%016lx-", mMtrrMemoryCacheTypeShortName[MemoryType], Base));\r
         }\r

-        \r
-        RangeBase    = BASE_1MB;        \r
-        NoRangeBase  = BASE_1MB;\r
-        Limit        = BIT36 - 1;\r
-        AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL);\r
-        if (RegEax >= 0x80000008) {\r
-          AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL);\r
-          Limit = LShiftU64 (1, RegEax & 0xff) - 1;\r
+        Base += mMtrrLibFixedMtrrTable[Index].Length;\r
+      }\r
+    }\r
+    DEBUG((DEBUG_CACHE, "%016lx\n", Base - 1));\r
+\r
+    VariableMtrrCount = GetVariableMtrrCount ();\r
+\r
+    Base = BASE_1MB;\r
+    PreviousMemoryType = MTRR_CACHE_INVALID_TYPE;\r
+    do {\r
+      MemoryType = MtrrGetMemoryAttribute (Base);\r
+      if (MemoryType > CacheWriteBack) {\r
+        MemoryType = MTRR_CACHE_INVALID_TYPE;\r
+      }\r
+\r
+      if (MemoryType != PreviousMemoryType) {\r
+        if (PreviousMemoryType != MTRR_CACHE_INVALID_TYPE) {\r
+          DEBUG((DEBUG_CACHE, "%016lx\n", Base - 1));\r

         }\r
         }\r

-        RangeLimit   = Limit;\r
-        NoRangeLimit = Limit;\r
-        \r
-        for (Index = 0, Found = FALSE; Index < VariableMtrrCount; Index++) {\r
-          if ((MtrrSettings.Variables.Mtrr[Index].Mask & BIT11) == 0) {\r
-            //\r
-            // If mask is not valid, then do not display range\r
-            //\r
-            continue;\r
-          }\r
-          MtrrBase  = (MtrrSettings.Variables.Mtrr[Index].Base & (~(SIZE_4KB - 1)));\r
-          MtrrLimit = MtrrBase + ((~(MtrrSettings.Variables.Mtrr[Index].Mask & (~(SIZE_4KB - 1)))) & Limit);\r
+        PreviousMemoryType = MemoryType;\r
+        DEBUG((DEBUG_CACHE, "%a:%016lx-", mMtrrMemoryCacheTypeShortName[MemoryType], Base));\r
+      }\r
+      \r
+      RangeBase    = BASE_1MB;        \r
+      NoRangeBase  = BASE_1MB;\r
+      Limit        = BIT36 - 1;\r
+      AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL);\r
+      if (RegEax >= 0x80000008) {\r
+        AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL);\r
+        Limit = LShiftU64 (1, RegEax & 0xff) - 1;\r
+      }\r
+      RangeLimit   = Limit;\r
+      NoRangeLimit = Limit;\r
+      \r
+      for (Index = 0, Found = FALSE; Index < VariableMtrrCount; Index++) {\r
+        if ((MtrrSettings.Variables.Mtrr[Index].Mask & BIT11) == 0) {\r
+          //\r
+          // If mask is not valid, then do not display range\r
+          //\r
+          continue;\r
+        }\r
+        MtrrBase  = (MtrrSettings.Variables.Mtrr[Index].Base & (~(SIZE_4KB - 1)));\r
+        MtrrLimit = MtrrBase + ((~(MtrrSettings.Variables.Mtrr[Index].Mask & (~(SIZE_4KB - 1)))) & Limit);\r

 \r
 \r

-          if (Base >= MtrrBase && Base < MtrrLimit) {\r
-            Found = TRUE;\r
-          }\r
-          \r
-          if (Base >= MtrrBase && MtrrBase > RangeBase) {\r
-            RangeBase = MtrrBase;\r
-          }\r
-          if (Base > MtrrLimit && MtrrLimit > RangeBase) {\r
-            RangeBase = MtrrLimit + 1;\r
-          }\r
-          if (Base < MtrrBase && MtrrBase < RangeLimit) {\r
-            RangeLimit = MtrrBase - 1;\r
-          }\r
-          if (Base < MtrrLimit && MtrrLimit <= RangeLimit) {\r
-            RangeLimit = MtrrLimit;\r
-          }\r
-          \r
-          if (Base > MtrrLimit && NoRangeBase < MtrrLimit) {\r
-            NoRangeBase = MtrrLimit + 1;\r
-          }\r
-          if (Base < MtrrBase && NoRangeLimit > MtrrBase) {\r
-            NoRangeLimit = MtrrBase - 1;\r
-          }\r
+        if (Base >= MtrrBase && Base < MtrrLimit) {\r
+          Found = TRUE;\r

         }\r
         \r
         }\r
         \r

-        if (Found) {\r
-          Base = RangeLimit + 1;\r
-        } else {\r
-          Base = NoRangeLimit + 1;\r
+        if (Base >= MtrrBase && MtrrBase > RangeBase) {\r
+          RangeBase = MtrrBase;\r

         }\r
         }\r

-      } while (Found);\r
-      DEBUG((DEBUG_CACHE, "%016lx\n\n", Base - 1));\r
-    }\r
+        if (Base > MtrrLimit && MtrrLimit > RangeBase) {\r
+          RangeBase = MtrrLimit + 1;\r
+        }\r
+        if (Base < MtrrBase && MtrrBase < RangeLimit) {\r
+          RangeLimit = MtrrBase - 1;\r
+        }\r
+        if (Base < MtrrLimit && MtrrLimit <= RangeLimit) {\r
+          RangeLimit = MtrrLimit;\r
+        }\r
+        \r
+        if (Base > MtrrLimit && NoRangeBase < MtrrLimit) {\r
+          NoRangeBase = MtrrLimit + 1;\r
+        }\r
+        if (Base < MtrrBase && NoRangeLimit > MtrrBase) {\r
+          NoRangeLimit = MtrrBase - 1;\r
+        }\r
+      }\r
+      \r
+      if (Found) {\r
+        Base = RangeLimit + 1;\r
+      } else {\r
+        Base = NoRangeLimit + 1;\r
+      }\r
+    } while (Found);\r
+    DEBUG((DEBUG_CACHE, "%016lx\n\n", Base - 1));\r

   );\r
 }\r
 \r
   );\r
 }\r
 \r