ArmPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the ArmPkg 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: Andrew Fish <afish@apple.com>

3 files changed, 84 insertions, 90 deletions

diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
index fcf3dd1..ef6a132 100644
--- a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
+++ b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
@@ -14,39 +14,39 @@
 #include <Library/MemoryAllocationLib.h>

 #include <Protocol/DebugSupport.h> // for MAX_AARCH64_EXCEPTION

 

-UINTN                   gMaxExceptionNumber = MAX_AARCH64_EXCEPTION;

-EFI_EXCEPTION_CALLBACK  gExceptionHandlers[MAX_AARCH64_EXCEPTION + 1] = { 0 };

+UINTN                   gMaxExceptionNumber                                   = MAX_AARCH64_EXCEPTION;

+EFI_EXCEPTION_CALLBACK  gExceptionHandlers[MAX_AARCH64_EXCEPTION + 1]         = { 0 };

 EFI_EXCEPTION_CALLBACK  gDebuggerExceptionHandlers[MAX_AARCH64_EXCEPTION + 1] = { 0 };

-PHYSICAL_ADDRESS        gExceptionVectorAlignmentMask = ARM_VECTOR_TABLE_ALIGNMENT;

-UINTN                   gDebuggerNoHandlerValue = 0; // todo: define for AArch64

+PHYSICAL_ADDRESS        gExceptionVectorAlignmentMask                         = ARM_VECTOR_TABLE_ALIGNMENT;

+UINTN                   gDebuggerNoHandlerValue                               = 0; // todo: define for AArch64

 

 #define EL0_STACK_SIZE  EFI_PAGES_TO_SIZE(2)

-STATIC UINTN mNewStackBase[EL0_STACK_SIZE / sizeof (UINTN)];

+STATIC UINTN  mNewStackBase[EL0_STACK_SIZE / sizeof (UINTN)];

 

 VOID

 RegisterEl0Stack (

-  IN  VOID    *Stack

+  IN  VOID  *Stack

   );

 

 RETURN_STATUS

 ArchVectorConfig (

-  IN  UINTN       VectorBaseAddress

+  IN  UINTN  VectorBaseAddress

   )

 {

-  UINTN             HcrReg;

+  UINTN  HcrReg;

 

   // Round down sp by 16 bytes alignment

   RegisterEl0Stack (

     (VOID *)(((UINTN)mNewStackBase + EL0_STACK_SIZE) & ~0xFUL)

     );

 

-  if (ArmReadCurrentEL() == AARCH64_EL2) {

-    HcrReg = ArmReadHcr();

+  if (ArmReadCurrentEL () == AARCH64_EL2) {

+    HcrReg = ArmReadHcr ();

 

     // Trap General Exceptions. All exceptions that would be routed to EL1 are routed to EL2

     HcrReg |= ARM_HCR_TGE;

 

-    ArmWriteHcr(HcrReg);

+    ArmWriteHcr (HcrReg);

   }

 

   return RETURN_SUCCESS;

diff --git a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c b/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c
index 40857c7..fc411b8 100644
--- a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c
+++ b/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c
@@ -17,28 +17,27 @@
 

 #include <Protocol/DebugSupport.h> // for MAX_ARM_EXCEPTION

 

-UINTN                   gMaxExceptionNumber = MAX_ARM_EXCEPTION;

-EFI_EXCEPTION_CALLBACK  gExceptionHandlers[MAX_ARM_EXCEPTION + 1] = { 0 };

+UINTN                   gMaxExceptionNumber                               = MAX_ARM_EXCEPTION;

+EFI_EXCEPTION_CALLBACK  gExceptionHandlers[MAX_ARM_EXCEPTION + 1]         = { 0 };

 EFI_EXCEPTION_CALLBACK  gDebuggerExceptionHandlers[MAX_ARM_EXCEPTION + 1] = { 0 };

-PHYSICAL_ADDRESS        gExceptionVectorAlignmentMask = ARM_VECTOR_TABLE_ALIGNMENT;

+PHYSICAL_ADDRESS        gExceptionVectorAlignmentMask                     = ARM_VECTOR_TABLE_ALIGNMENT;

 

 // Exception handler contains branch to vector location (jmp $) so no handler

 // NOTE: This code assumes vectors are ARM and not Thumb code

-UINTN                   gDebuggerNoHandlerValue = 0xEAFFFFFE;

+UINTN  gDebuggerNoHandlerValue = 0xEAFFFFFE;

 

 RETURN_STATUS

 ArchVectorConfig (

-  IN  UINTN       VectorBaseAddress

+  IN  UINTN  VectorBaseAddress

   )

 {

   // if the vector address corresponds to high vectors

   if (VectorBaseAddress == 0xFFFF0000) {

     // set SCTLR.V to enable high vectors

-    ArmSetHighVectors();

-  }

-  else {

+    ArmSetHighVectors ();

+  } else {

     // Set SCTLR.V to 0 to enable VBAR to be used

-    ArmSetLowVectors();

+    ArmSetLowVectors ();

   }

 

   return RETURN_SUCCESS;

diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c
index 245e848..1904816 100644
--- a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c
+++ b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c
@@ -22,37 +22,38 @@
 

 STATIC

 RETURN_STATUS

-CopyExceptionHandlers(

-  IN  PHYSICAL_ADDRESS        BaseAddress

+CopyExceptionHandlers (

+  IN  PHYSICAL_ADDRESS  BaseAddress

   );

 

 EFI_STATUS

 EFIAPI

-RegisterExceptionHandler(

-  IN EFI_EXCEPTION_TYPE            ExceptionType,

-  IN EFI_CPU_INTERRUPT_HANDLER     InterruptHandler

+RegisterExceptionHandler (

+  IN EFI_EXCEPTION_TYPE         ExceptionType,

+  IN EFI_CPU_INTERRUPT_HANDLER  InterruptHandler

   );

 

 VOID

-ExceptionHandlersStart(

+ExceptionHandlersStart (

   VOID

   );

 

 VOID

-ExceptionHandlersEnd(

+ExceptionHandlersEnd (

   VOID

   );

 

-RETURN_STATUS ArchVectorConfig(

-  IN  UINTN       VectorBaseAddress

+RETURN_STATUS

+ArchVectorConfig (

+  IN  UINTN  VectorBaseAddress

   );

 

 // these globals are provided by the architecture specific source (Arm or AArch64)

-extern UINTN                    gMaxExceptionNumber;

-extern EFI_EXCEPTION_CALLBACK   gExceptionHandlers[];

-extern EFI_EXCEPTION_CALLBACK   gDebuggerExceptionHandlers[];

-extern PHYSICAL_ADDRESS         gExceptionVectorAlignmentMask;

-extern UINTN                    gDebuggerNoHandlerValue;

+extern UINTN                   gMaxExceptionNumber;

+extern EFI_EXCEPTION_CALLBACK  gExceptionHandlers[];

+extern EFI_EXCEPTION_CALLBACK  gDebuggerExceptionHandlers[];

+extern PHYSICAL_ADDRESS        gExceptionVectorAlignmentMask;

+extern UINTN                   gDebuggerNoHandlerValue;

 

 // A compiler flag adjusts the compilation of this library to a variant where

 // the vectors are relocated (copied) to another location versus using the

@@ -60,13 +61,12 @@ extern UINTN                    gDebuggerNoHandlerValue;
 // address this at library build time.  Since this affects the build of the

 // library we cannot represent this in a PCD since PCDs are evaluated on

 // a per-module basis.

-#if defined(ARM_RELOCATE_VECTORS)

-STATIC CONST BOOLEAN gArmRelocateVectorTable = TRUE;

+#if defined (ARM_RELOCATE_VECTORS)

+STATIC CONST BOOLEAN  gArmRelocateVectorTable = TRUE;

 #else

-STATIC CONST BOOLEAN gArmRelocateVectorTable = FALSE;

+STATIC CONST BOOLEAN  gArmRelocateVectorTable = FALSE;

 #endif

 

-

 /**

 Initializes all CPU exceptions entries and provides the default exception handlers.

 

@@ -85,23 +85,21 @@ with default exception handlers.
 **/

 EFI_STATUS

 EFIAPI

-InitializeCpuExceptionHandlers(

-  IN EFI_VECTOR_HANDOFF_INFO       *VectorInfo OPTIONAL

+InitializeCpuExceptionHandlers (

+  IN EFI_VECTOR_HANDOFF_INFO  *VectorInfo OPTIONAL

   )

 {

-  RETURN_STATUS     Status;

-  UINTN             VectorBase;

+  RETURN_STATUS  Status;

+  UINTN          VectorBase;

 

   Status = EFI_SUCCESS;

 

   // if we are requested to copy exception handlers to another location

   if (gArmRelocateVectorTable) {

-

-    VectorBase = PcdGet64(PcdCpuVectorBaseAddress);

-    Status = CopyExceptionHandlers(VectorBase);

-

-  }

-  else { // use VBAR to point to where our exception handlers are

+    VectorBase = PcdGet64 (PcdCpuVectorBaseAddress);

+    Status     = CopyExceptionHandlers (VectorBase);

+  } else {

+    // use VBAR to point to where our exception handlers are

 

     // The vector table must be aligned for the architecture.  If this

     // assertion fails ensure the appropriate FFS alignment is in effect,

@@ -110,7 +108,7 @@ InitializeCpuExceptionHandlers(
     // for AArch64 Align=4K is required.  Align=Auto can be used but this

     // is known to cause an issue with populating the reset vector area

     // for encapsulated FVs.

-    ASSERT(((UINTN)ExceptionHandlersStart & gExceptionVectorAlignmentMask) == 0);

+    ASSERT (((UINTN)ExceptionHandlersStart & gExceptionVectorAlignmentMask) == 0);

 

     // We do not copy the Exception Table at PcdGet64(PcdCpuVectorBaseAddress). We just set Vector

     // Base Address to point into CpuDxe code.

@@ -119,12 +117,12 @@ InitializeCpuExceptionHandlers(
     Status = RETURN_SUCCESS;

   }

 

-  if (!RETURN_ERROR(Status)) {

+  if (!RETURN_ERROR (Status)) {

     // call the architecture-specific routine to prepare for the new vector

     // configuration to take effect

-    ArchVectorConfig(VectorBase);

+    ArchVectorConfig (VectorBase);

 

-    ArmWriteVBar(VectorBase);

+    ArmWriteVBar (VectorBase);

   }

 

   return RETURN_SUCCESS;

@@ -148,14 +146,14 @@ with default exception handlers.
 **/

 STATIC

 RETURN_STATUS

-CopyExceptionHandlers(

-  IN  PHYSICAL_ADDRESS        BaseAddress

+CopyExceptionHandlers (

+  IN  PHYSICAL_ADDRESS  BaseAddress

   )

 {

-  RETURN_STATUS        Status;

-  UINTN                Length;

-  UINTN                Index;

-  UINT32               *VectorBase;

+  RETURN_STATUS  Status;

+  UINTN          Length;

+  UINTN          Index;

+  UINT32         *VectorBase;

 

   // ensure that the destination value specifies an address meeting the vector alignment requirements

   ASSERT ((BaseAddress & gExceptionVectorAlignmentMask) == 0);

@@ -167,37 +165,35 @@ CopyExceptionHandlers(
 

   VectorBase = (UINT32 *)(UINTN)BaseAddress;

 

-  if (FeaturePcdGet(PcdDebuggerExceptionSupport) == TRUE) {

+  if (FeaturePcdGet (PcdDebuggerExceptionSupport) == TRUE) {

     // Save existing vector table, in case debugger is already hooked in

-    CopyMem((VOID *)gDebuggerExceptionHandlers, (VOID *)VectorBase, sizeof (EFI_EXCEPTION_CALLBACK)* (gMaxExceptionNumber+1));

+    CopyMem ((VOID *)gDebuggerExceptionHandlers, (VOID *)VectorBase, sizeof (EFI_EXCEPTION_CALLBACK)* (gMaxExceptionNumber+1));

   }

 

   // Copy our assembly code into the page that contains the exception vectors.

-  CopyMem((VOID *)VectorBase, (VOID *)ExceptionHandlersStart, Length);

+  CopyMem ((VOID *)VectorBase, (VOID *)ExceptionHandlersStart, Length);

 

   //

   // Initialize the C entry points for interrupts

   //

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

-    if (!FeaturePcdGet(PcdDebuggerExceptionSupport) ||

-      (gDebuggerExceptionHandlers[Index] == 0) || (gDebuggerExceptionHandlers[Index] == (VOID *)gDebuggerNoHandlerValue)) {

-

-      Status = RegisterExceptionHandler(Index, NULL);

-      ASSERT_EFI_ERROR(Status);

-    }

-    else {

+    if (!FeaturePcdGet (PcdDebuggerExceptionSupport) ||

+        (gDebuggerExceptionHandlers[Index] == 0) || (gDebuggerExceptionHandlers[Index] == (VOID *)gDebuggerNoHandlerValue))

+    {

+      Status = RegisterExceptionHandler (Index, NULL);

+      ASSERT_EFI_ERROR (Status);

+    } else {

       // If the debugger has already hooked put its vector back

       VectorBase[Index] = (UINT32)(UINTN)gDebuggerExceptionHandlers[Index];

     }

   }

 

   // Flush Caches since we updated executable stuff

-  InvalidateInstructionCacheRange((VOID *)(UINTN)BaseAddress, Length);

+  InvalidateInstructionCacheRange ((VOID *)(UINTN)BaseAddress, Length);

 

   return RETURN_SUCCESS;

 }

 

-

 /**

 Initializes all CPU interrupt/exceptions entries and provides the default interrupt/exception handlers.

 

@@ -216,9 +212,9 @@ with default interrupt/exception handlers.
 **/

 EFI_STATUS

 EFIAPI

-InitializeCpuInterruptHandlers(

-IN EFI_VECTOR_HANDOFF_INFO       *VectorInfo OPTIONAL

-)

+InitializeCpuInterruptHandlers (

+  IN EFI_VECTOR_HANDOFF_INFO  *VectorInfo OPTIONAL

+  )

 {

   // not needed, this is what the CPU driver is for

   return EFI_UNSUPPORTED;

@@ -250,9 +246,9 @@ previously installed.
 or this function is not supported.

 **/

 RETURN_STATUS

-RegisterCpuInterruptHandler(

-  IN EFI_EXCEPTION_TYPE             ExceptionType,

-  IN EFI_CPU_INTERRUPT_HANDLER      ExceptionHandler

+RegisterCpuInterruptHandler (

+  IN EFI_EXCEPTION_TYPE         ExceptionType,

+  IN EFI_CPU_INTERRUPT_HANDLER  ExceptionHandler

   )

 {

   if (ExceptionType > gMaxExceptionNumber) {

@@ -287,19 +283,19 @@ If this parameter is NULL, then the handler will be uninstalled.
 **/

 EFI_STATUS

 EFIAPI

-RegisterExceptionHandler(

-  IN EFI_EXCEPTION_TYPE            ExceptionType,

-  IN EFI_CPU_INTERRUPT_HANDLER     InterruptHandler

+RegisterExceptionHandler (

+  IN EFI_EXCEPTION_TYPE         ExceptionType,

+  IN EFI_CPU_INTERRUPT_HANDLER  InterruptHandler

   )

 {

-  return RegisterCpuInterruptHandler(ExceptionType, InterruptHandler);

+  return RegisterCpuInterruptHandler (ExceptionType, InterruptHandler);

 }

 

 VOID

 EFIAPI

-CommonCExceptionHandler(

-  IN     EFI_EXCEPTION_TYPE           ExceptionType,

-  IN OUT EFI_SYSTEM_CONTEXT           SystemContext

+CommonCExceptionHandler (

+  IN     EFI_EXCEPTION_TYPE  ExceptionType,

+  IN OUT EFI_SYSTEM_CONTEXT  SystemContext

   )

 {

   if (ExceptionType <= gMaxExceptionNumber) {

@@ -307,13 +303,12 @@ CommonCExceptionHandler(
       gExceptionHandlers[ExceptionType](ExceptionType, SystemContext);

       return;

     }

-  }

-  else {

-    DEBUG((DEBUG_ERROR, "Unknown exception type %d\n", ExceptionType));

-    ASSERT(FALSE);

+  } else {

+    DEBUG ((DEBUG_ERROR, "Unknown exception type %d\n", ExceptionType));

+    ASSERT (FALSE);

   }

 

-  DefaultExceptionHandler(ExceptionType, SystemContext);

+  DefaultExceptionHandler (ExceptionType, SystemContext);

 }

 

 /**

@@ -341,8 +336,8 @@ CommonCExceptionHandler(
 EFI_STATUS

 EFIAPI

 InitializeCpuExceptionHandlersEx (

-  IN EFI_VECTOR_HANDOFF_INFO            *VectorInfo OPTIONAL,

-  IN CPU_EXCEPTION_INIT_DATA            *InitData OPTIONAL

+  IN EFI_VECTOR_HANDOFF_INFO  *VectorInfo OPTIONAL,

+  IN CPU_EXCEPTION_INIT_DATA  *InitData OPTIONAL

   )

 {

   return InitializeCpuExceptionHandlers (VectorInfo);