MdeModulePkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the MdeModulePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

1 files changed, 109 insertions, 89 deletions

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
index b65b01c9e5..fdeaaa39d8 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
@@ -11,43 +11,61 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "DxeIpl.h"

 #include "VirtualMemory.h"

 

-#define IDT_ENTRY_COUNT       32

+#define IDT_ENTRY_COUNT  32

 

 typedef struct _X64_IDT_TABLE {

   //

   // Reserved 4 bytes preceding PeiService and IdtTable,

   // since IDT base address should be 8-byte alignment.

   //

-  UINT32                   Reserved;

-  CONST EFI_PEI_SERVICES   **PeiService;

-  X64_IDT_GATE_DESCRIPTOR  IdtTable[IDT_ENTRY_COUNT];

+  UINT32                     Reserved;

+  CONST EFI_PEI_SERVICES     **PeiService;

+  X64_IDT_GATE_DESCRIPTOR    IdtTable[IDT_ENTRY_COUNT];

 } X64_IDT_TABLE;

 

 //

 // Global Descriptor Table (GDT)

 //

-GLOBAL_REMOVE_IF_UNREFERENCED IA32_GDT gGdtEntries[] = {

-/* selector { Global Segment Descriptor                              } */

-/* 0x00 */  {{0,      0,  0,  0,    0,  0,  0,  0,    0,  0, 0,  0,  0}}, //null descriptor

-/* 0x08 */  {{0xffff, 0,  0,  0x2,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //linear data segment descriptor

-/* 0x10 */  {{0xffff, 0,  0,  0xf,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //linear code segment descriptor

-/* 0x18 */  {{0xffff, 0,  0,  0x3,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //system data segment descriptor

-/* 0x20 */  {{0xffff, 0,  0,  0xa,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //system code segment descriptor

-/* 0x28 */  {{0,      0,  0,  0,    0,  0,  0,  0,    0,  0, 0,  0,  0}}, //spare segment descriptor

-/* 0x30 */  {{0xffff, 0,  0,  0x2,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //system data segment descriptor

-/* 0x38 */  {{0xffff, 0,  0,  0xa,  1,  0,  1,  0xf,  0,  1, 0,  1,  0}}, //system code segment descriptor

-/* 0x40 */  {{0,      0,  0,  0,    0,  0,  0,  0,    0,  0, 0,  0,  0}}, //spare segment descriptor

+GLOBAL_REMOVE_IF_UNREFERENCED IA32_GDT  gGdtEntries[] = {

+  /* selector { Global Segment Descriptor                              } */

+  /* 0x00 */ {

+    { 0,      0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0, 0 }

+  },                                                                      // null descriptor

+  /* 0x08 */ {

+    { 0xffff, 0, 0, 0x2, 1, 0, 1, 0xf, 0, 0, 1, 1, 0 }

+  },                                                                      // linear data segment descriptor

+  /* 0x10 */ {

+    { 0xffff, 0, 0, 0xf, 1, 0, 1, 0xf, 0, 0, 1, 1, 0 }

+  },                                                                      // linear code segment descriptor

+  /* 0x18 */ {

+    { 0xffff, 0, 0, 0x3, 1, 0, 1, 0xf, 0, 0, 1, 1, 0 }

+  },                                                                      // system data segment descriptor

+  /* 0x20 */ {

+    { 0xffff, 0, 0, 0xa, 1, 0, 1, 0xf, 0, 0, 1, 1, 0 }

+  },                                                                      // system code segment descriptor

+  /* 0x28 */ {

+    { 0,      0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0, 0 }

+  },                                                                      // spare segment descriptor

+  /* 0x30 */ {

+    { 0xffff, 0, 0, 0x2, 1, 0, 1, 0xf, 0, 0, 1, 1, 0 }

+  },                                                                      // system data segment descriptor

+  /* 0x38 */ {

+    { 0xffff, 0, 0, 0xa, 1, 0, 1, 0xf, 0, 1, 0, 1, 0 }

+  },                                                                      // system code segment descriptor

+  /* 0x40 */ {

+    { 0,      0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0, 0 }

+  },                                                                      // spare segment descriptor

 };

 

 //

 // IA32 Gdt register

 //

-GLOBAL_REMOVE_IF_UNREFERENCED CONST IA32_DESCRIPTOR gGdt = {

+GLOBAL_REMOVE_IF_UNREFERENCED CONST IA32_DESCRIPTOR  gGdt = {

   sizeof (gGdtEntries) - 1,

-  (UINTN) gGdtEntries

-  };

+  (UINTN)gGdtEntries

+};

 

-GLOBAL_REMOVE_IF_UNREFERENCED  IA32_DESCRIPTOR gLidtDescriptor = {

+GLOBAL_REMOVE_IF_UNREFERENCED  IA32_DESCRIPTOR  gLidtDescriptor = {

   sizeof (X64_IDT_GATE_DESCRIPTOR) * IDT_ENTRY_COUNT - 1,

   0

 };

@@ -64,21 +82,21 @@ GLOBAL_REMOVE_IF_UNREFERENCED  IA32_DESCRIPTOR gLidtDescriptor = {
 **/

 UINTN

 Create4GPageTablesIa32Pae (

-  IN EFI_PHYSICAL_ADDRESS   StackBase,

-  IN UINTN                  StackSize

+  IN EFI_PHYSICAL_ADDRESS  StackBase,

+  IN UINTN                 StackSize

   )

 {

-  UINT8                                         PhysicalAddressBits;

-  EFI_PHYSICAL_ADDRESS                          PhysicalAddress;

-  UINTN                                         IndexOfPdpEntries;

-  UINTN                                         IndexOfPageDirectoryEntries;

-  UINT32                                        NumberOfPdpEntriesNeeded;

-  PAGE_MAP_AND_DIRECTORY_POINTER                *PageMap;

-  PAGE_MAP_AND_DIRECTORY_POINTER                *PageDirectoryPointerEntry;

-  PAGE_TABLE_ENTRY                              *PageDirectoryEntry;

-  UINTN                                         TotalPagesNum;

-  UINTN                                         PageAddress;

-  UINT64                                        AddressEncMask;

+  UINT8                           PhysicalAddressBits;

+  EFI_PHYSICAL_ADDRESS            PhysicalAddress;

+  UINTN                           IndexOfPdpEntries;

+  UINTN                           IndexOfPageDirectoryEntries;

+  UINT32                          NumberOfPdpEntriesNeeded;

+  PAGE_MAP_AND_DIRECTORY_POINTER  *PageMap;

+  PAGE_MAP_AND_DIRECTORY_POINTER  *PageDirectoryPointerEntry;

+  PAGE_TABLE_ENTRY                *PageDirectoryEntry;

+  UINTN                           TotalPagesNum;

+  UINTN                           PageAddress;

+  UINT64                          AddressEncMask;

 

   //

   // Make sure AddressEncMask is contained to smallest supported address field

@@ -90,53 +108,54 @@ Create4GPageTablesIa32Pae (
   //

   // Calculate the table entries needed.

   //

-  NumberOfPdpEntriesNeeded = (UINT32) LShiftU64 (1, (PhysicalAddressBits - 30));

+  NumberOfPdpEntriesNeeded = (UINT32)LShiftU64 (1, (PhysicalAddressBits - 30));

 

   TotalPagesNum = NumberOfPdpEntriesNeeded + 1;

-  PageAddress = (UINTN) AllocatePageTableMemory (TotalPagesNum);

+  PageAddress   = (UINTN)AllocatePageTableMemory (TotalPagesNum);

   ASSERT (PageAddress != 0);

 

-  PageMap = (VOID *) PageAddress;

+  PageMap      = (VOID *)PageAddress;

   PageAddress += SIZE_4KB;

 

   PageDirectoryPointerEntry = PageMap;

-  PhysicalAddress = 0;

+  PhysicalAddress           = 0;

 

   for (IndexOfPdpEntries = 0; IndexOfPdpEntries < NumberOfPdpEntriesNeeded; IndexOfPdpEntries++, PageDirectoryPointerEntry++) {

     //

     // Each Directory Pointer entries points to a page of Page Directory entires.

     // So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.

     //

-    PageDirectoryEntry = (VOID *) PageAddress;

-    PageAddress += SIZE_4KB;

+    PageDirectoryEntry = (VOID *)PageAddress;

+    PageAddress       += SIZE_4KB;

 

     //

     // Fill in a Page Directory Pointer Entries

     //

-    PageDirectoryPointerEntry->Uint64 = (UINT64) (UINTN) PageDirectoryEntry | AddressEncMask;

+    PageDirectoryPointerEntry->Uint64       = (UINT64)(UINTN)PageDirectoryEntry | AddressEncMask;

     PageDirectoryPointerEntry->Bits.Present = 1;

 

     for (IndexOfPageDirectoryEntries = 0; IndexOfPageDirectoryEntries < 512; IndexOfPageDirectoryEntries++, PageDirectoryEntry++, PhysicalAddress += SIZE_2MB) {

-      if ((IsNullDetectionEnabled () && PhysicalAddress == 0)

-          || ((PhysicalAddress < StackBase + StackSize)

-              && ((PhysicalAddress + SIZE_2MB) > StackBase))) {

+      if (  (IsNullDetectionEnabled () && (PhysicalAddress == 0))

+         || (  (PhysicalAddress < StackBase + StackSize)

+            && ((PhysicalAddress + SIZE_2MB) > StackBase)))

+      {

         //

         // Need to split this 2M page that covers stack range.

         //

-        Split2MPageTo4K (PhysicalAddress, (UINT64 *) PageDirectoryEntry, StackBase, StackSize, 0, 0);

+        Split2MPageTo4K (PhysicalAddress, (UINT64 *)PageDirectoryEntry, StackBase, StackSize, 0, 0);

       } else {

         //

         // Fill in the Page Directory entries

         //

-        PageDirectoryEntry->Uint64 = (UINT64) PhysicalAddress | AddressEncMask;

+        PageDirectoryEntry->Uint64         = (UINT64)PhysicalAddress | AddressEncMask;

         PageDirectoryEntry->Bits.ReadWrite = 1;

-        PageDirectoryEntry->Bits.Present = 1;

-        PageDirectoryEntry->Bits.MustBe1 = 1;

+        PageDirectoryEntry->Bits.Present   = 1;

+        PageDirectoryEntry->Bits.MustBe1   = 1;

       }

     }

   }

 

-  for (; IndexOfPdpEntries < 512; IndexOfPdpEntries++, PageDirectoryPointerEntry++) {

+  for ( ; IndexOfPdpEntries < 512; IndexOfPdpEntries++, PageDirectoryPointerEntry++) {

     ZeroMem (

       PageDirectoryPointerEntry,

       sizeof (PAGE_MAP_AND_DIRECTORY_POINTER)

@@ -149,7 +168,7 @@ Create4GPageTablesIa32Pae (
   //

   EnablePageTableProtection ((UINTN)PageMap, FALSE);

 

-  return (UINTN) PageMap;

+  return (UINTN)PageMap;

 }

 

 /**

@@ -164,9 +183,9 @@ IsIa32PaeSupport (
   VOID

   )

 {

-  UINT32            RegEax;

-  UINT32            RegEdx;

-  BOOLEAN           Ia32PaeSupport;

+  UINT32   RegEax;

+  UINT32   RegEdx;

+  BOOLEAN  Ia32PaeSupport;

 

   Ia32PaeSupport = FALSE;

   AsmCpuid (0x0, &RegEax, NULL, NULL, NULL);

@@ -228,23 +247,23 @@ ToBuildPageTable (
 **/

 VOID

 HandOffToDxeCore (

-  IN EFI_PHYSICAL_ADDRESS   DxeCoreEntryPoint,

-  IN EFI_PEI_HOB_POINTERS   HobList

+  IN EFI_PHYSICAL_ADDRESS  DxeCoreEntryPoint,

+  IN EFI_PEI_HOB_POINTERS  HobList

   )

 {

-  EFI_STATUS                Status;

-  EFI_PHYSICAL_ADDRESS      BaseOfStack;

-  EFI_PHYSICAL_ADDRESS      TopOfStack;

-  UINTN                     PageTables;

-  X64_IDT_GATE_DESCRIPTOR   *IdtTable;

-  UINTN                     SizeOfTemplate;

-  VOID                      *TemplateBase;

-  EFI_PHYSICAL_ADDRESS      VectorAddress;

-  UINT32                    Index;

-  X64_IDT_TABLE             *IdtTableForX64;

-  EFI_VECTOR_HANDOFF_INFO   *VectorInfo;

-  EFI_PEI_VECTOR_HANDOFF_INFO_PPI *VectorHandoffInfoPpi;

-  BOOLEAN                   BuildPageTablesIa32Pae;

+  EFI_STATUS                       Status;

+  EFI_PHYSICAL_ADDRESS             BaseOfStack;

+  EFI_PHYSICAL_ADDRESS             TopOfStack;

+  UINTN                            PageTables;

+  X64_IDT_GATE_DESCRIPTOR          *IdtTable;

+  UINTN                            SizeOfTemplate;

+  VOID                             *TemplateBase;

+  EFI_PHYSICAL_ADDRESS             VectorAddress;

+  UINT32                           Index;

+  X64_IDT_TABLE                    *IdtTableForX64;

+  EFI_VECTOR_HANDOFF_INFO          *VectorInfo;

+  EFI_PEI_VECTOR_HANDOFF_INFO_PPI  *VectorHandoffInfoPpi;

+  BOOLEAN                          BuildPageTablesIa32Pae;

 

   //

   // Clear page 0 and mark it as allocated if NULL pointer detection is enabled.

@@ -257,7 +276,7 @@ HandOffToDxeCore (
   Status = PeiServicesAllocatePages (EfiBootServicesData, EFI_SIZE_TO_PAGES (STACK_SIZE), &BaseOfStack);

   ASSERT_EFI_ERROR (Status);

 

-  if (FeaturePcdGet(PcdDxeIplSwitchToLongMode)) {

+  if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {

     //

     // Compute the top of the stack we were allocated, which is used to load X64 dxe core.

     // Pre-allocate a 32 bytes which confroms to x64 calling convention.

@@ -272,7 +291,7 @@ HandOffToDxeCore (
     //

     //  x64 Calling Conventions requires that the stack must be aligned to 16 bytes

     //

-    TopOfStack = (EFI_PHYSICAL_ADDRESS) (UINTN) ALIGN_POINTER (TopOfStack, 16);

+    TopOfStack = (EFI_PHYSICAL_ADDRESS)(UINTN)ALIGN_POINTER (TopOfStack, 16);

 

     //

     // Load the GDT of Go64. Since the GDT of 32-bit Tiano locates in the BS_DATA

@@ -308,7 +327,7 @@ HandOffToDxeCore (
 

     Status = PeiServicesAllocatePages (

                EfiBootServicesData,

-               EFI_SIZE_TO_PAGES(sizeof (X64_IDT_TABLE) + SizeOfTemplate * IDT_ENTRY_COUNT),

+               EFI_SIZE_TO_PAGES (sizeof (X64_IDT_TABLE) + SizeOfTemplate * IDT_ENTRY_COUNT),

                &VectorAddress

                );

     ASSERT_EFI_ERROR (Status);

@@ -317,28 +336,28 @@ HandOffToDxeCore (
     // Store EFI_PEI_SERVICES** in the 4 bytes immediately preceding IDT to avoid that

     // it may not be gotten correctly after IDT register is re-written.

     //

-    IdtTableForX64 = (X64_IDT_TABLE *) (UINTN) VectorAddress;

+    IdtTableForX64             = (X64_IDT_TABLE *)(UINTN)VectorAddress;

     IdtTableForX64->PeiService = GetPeiServicesTablePointer ();

 

-    VectorAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) (IdtTableForX64 + 1);

+    VectorAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)(IdtTableForX64 + 1);

     IdtTable      = IdtTableForX64->IdtTable;

     for (Index = 0; Index < IDT_ENTRY_COUNT; Index++) {

-      IdtTable[Index].Ia32IdtEntry.Bits.GateType    =  0x8e;

-      IdtTable[Index].Ia32IdtEntry.Bits.Reserved_0  =  0;

-      IdtTable[Index].Ia32IdtEntry.Bits.Selector    =  SYS_CODE64_SEL;

+      IdtTable[Index].Ia32IdtEntry.Bits.GateType   =  0x8e;

+      IdtTable[Index].Ia32IdtEntry.Bits.Reserved_0 =  0;

+      IdtTable[Index].Ia32IdtEntry.Bits.Selector   =  SYS_CODE64_SEL;

 

-      IdtTable[Index].Ia32IdtEntry.Bits.OffsetLow   = (UINT16) VectorAddress;

-      IdtTable[Index].Ia32IdtEntry.Bits.OffsetHigh  = (UINT16) (RShiftU64 (VectorAddress, 16));

-      IdtTable[Index].Offset32To63                  = (UINT32) (RShiftU64 (VectorAddress, 32));

-      IdtTable[Index].Reserved                      = 0;

+      IdtTable[Index].Ia32IdtEntry.Bits.OffsetLow  = (UINT16)VectorAddress;

+      IdtTable[Index].Ia32IdtEntry.Bits.OffsetHigh = (UINT16)(RShiftU64 (VectorAddress, 16));

+      IdtTable[Index].Offset32To63                 = (UINT32)(RShiftU64 (VectorAddress, 32));

+      IdtTable[Index].Reserved                     = 0;

 

-      CopyMem ((VOID *) (UINTN) VectorAddress, TemplateBase, SizeOfTemplate);

-      AsmVectorFixup ((VOID *) (UINTN) VectorAddress, (UINT8) Index);

+      CopyMem ((VOID *)(UINTN)VectorAddress, TemplateBase, SizeOfTemplate);

+      AsmVectorFixup ((VOID *)(UINTN)VectorAddress, (UINT8)Index);

 

       VectorAddress += SizeOfTemplate;

     }

 

-    gLidtDescriptor.Base = (UINTN) IdtTable;

+    gLidtDescriptor.Base = (UINTN)IdtTable;

 

     //

     // Disable interrupt of Debug timer, since new IDT table cannot handle it.

@@ -380,11 +399,12 @@ HandOffToDxeCore (
     if (Status == EFI_SUCCESS) {

       DEBUG ((DEBUG_INFO, "Vector Hand-off Info PPI is gotten, GUIDed HOB is created!\n"));

       VectorInfo = VectorHandoffInfoPpi->Info;

-      Index = 1;

+      Index      = 1;

       while (VectorInfo->Attribute != EFI_VECTOR_HANDOFF_LAST_ENTRY) {

-        VectorInfo ++;

-        Index ++;

+        VectorInfo++;

+        Index++;

       }

+

       BuildGuidDataHob (

         &gEfiVectorHandoffInfoPpiGuid,

         VectorHandoffInfoPpi->Info,

@@ -397,14 +417,14 @@ HandOffToDxeCore (
     // for safety.

     //

     TopOfStack = BaseOfStack + EFI_SIZE_TO_PAGES (STACK_SIZE) * EFI_PAGE_SIZE - CPU_STACK_ALIGNMENT;

-    TopOfStack = (EFI_PHYSICAL_ADDRESS) (UINTN) ALIGN_POINTER (TopOfStack, CPU_STACK_ALIGNMENT);

+    TopOfStack = (EFI_PHYSICAL_ADDRESS)(UINTN)ALIGN_POINTER (TopOfStack, CPU_STACK_ALIGNMENT);

 

-    PageTables = 0;

+    PageTables             = 0;

     BuildPageTablesIa32Pae = ToBuildPageTable ();

     if (BuildPageTablesIa32Pae) {

       PageTables = Create4GPageTablesIa32Pae (BaseOfStack, STACK_SIZE);

       if (IsEnableNonExecNeeded ()) {

-        EnableExecuteDisableBit();

+        EnableExecuteDisableBit ();

       }

     }

 

@@ -450,14 +470,14 @@ HandOffToDxeCore (
         (SWITCH_STACK_ENTRY_POINT)(UINTN)DxeCoreEntryPoint,

         HobList.Raw,

         NULL,

-        (VOID *) (UINTN) TopOfStack

+        (VOID *)(UINTN)TopOfStack

         );

     } else {

       SwitchStack (

         (SWITCH_STACK_ENTRY_POINT)(UINTN)DxeCoreEntryPoint,

         HobList.Raw,

         NULL,

-        (VOID *) (UINTN) TopOfStack

+        (VOID *)(UINTN)TopOfStack

         );

     }

   }