Armkg: Fix EDK2 coding style

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

1 files changed, 46 insertions, 46 deletions

diff --git a/ArmPkg/Drivers/CpuDxe/Exception.c b/ArmPkg/Drivers/CpuDxe/Exception.c
index 7c59af7fef..17e463f97b 100644
--- a/ArmPkg/Drivers/CpuDxe/Exception.c
+++ b/ArmPkg/Drivers/CpuDxe/Exception.c
@@ -144,60 +144,60 @@ InitializeExceptions (
   ArmDisableFiq ();

 

   if (FeaturePcdGet(PcdRelocateVectorTable) == TRUE) {

-      //

-      // Copy an implementation of the ARM exception vectors to PcdCpuVectorBaseAddress.

-      //

-      Length = (UINTN)ExceptionHandlersEnd - (UINTN)ExceptionHandlersStart;

-    

-      //

-      // Reserve space for the exception handlers

-      //

-      Base = (EFI_PHYSICAL_ADDRESS)PcdGet32 (PcdCpuVectorBaseAddress);

-      VectorBase = (UINT32 *)(UINTN)Base;

-      Status = gBS->AllocatePages (AllocateAddress, EfiBootServicesCode, EFI_SIZE_TO_PAGES (Length), &Base);

-      // If the request was for memory that's not in the memory map (which is often the case for 0x00000000

-      // on embedded systems, for example, we don't want to hang up.  So we'll check here for a status of 

-      // EFI_NOT_FOUND, and continue in that case.

-      if (EFI_ERROR(Status) && (Status != EFI_NOT_FOUND)) {

-        ASSERT_EFI_ERROR (Status);

-      }

-    

+    //

+    // Copy an implementation of the ARM exception vectors to PcdCpuVectorBaseAddress.

+    //

+    Length = (UINTN)ExceptionHandlersEnd - (UINTN)ExceptionHandlersStart;

+

+    //

+    // Reserve space for the exception handlers

+    //

+    Base = (EFI_PHYSICAL_ADDRESS)PcdGet32 (PcdCpuVectorBaseAddress);

+    VectorBase = (UINT32 *)(UINTN)Base;

+    Status = gBS->AllocatePages (AllocateAddress, EfiBootServicesCode, EFI_SIZE_TO_PAGES (Length), &Base);

+    // If the request was for memory that's not in the memory map (which is often the case for 0x00000000

+    // on embedded systems, for example, we don't want to hang up.  So we'll check here for a status of

+    // EFI_NOT_FOUND, and continue in that case.

+    if (EFI_ERROR(Status) && (Status != EFI_NOT_FOUND)) {

+      ASSERT_EFI_ERROR (Status);

+    }

+

     if (FeaturePcdGet(PcdDebuggerExceptionSupport) == TRUE) {

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

       CopyMem ((VOID *)gDebuggerExceptionHandlers, (VOID *)VectorBase, sizeof (gDebuggerExceptionHandlers));

     }

-    

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

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

-    

-      //

-      // Patch in the common Assembly exception handler

-      //

-      Offset = (UINTN)CommonExceptionEntry - (UINTN)ExceptionHandlersStart;

-      *(UINTN *) ((UINT8 *)(UINTN)PcdGet32 (PcdCpuVectorBaseAddress) + Offset) = (UINTN)AsmCommonExceptionEntry;

-    

-      //

-      // Initialize the C entry points for interrupts

-      //

-      for (Index = 0; Index <= MAX_ARM_EXCEPTION; Index++) {

+

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

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

+

+    //

+    // Patch in the common Assembly exception handler

+    //

+    Offset = (UINTN)CommonExceptionEntry - (UINTN)ExceptionHandlersStart;

+    *(UINTN *) ((UINT8 *)(UINTN)PcdGet32 (PcdCpuVectorBaseAddress) + Offset) = (UINTN)AsmCommonExceptionEntry;

+

+    //

+    // Initialize the C entry points for interrupts

+    //

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

       if (!FeaturePcdGet(PcdDebuggerExceptionSupport) ||

           (gDebuggerExceptionHandlers[Index] == 0) || (gDebuggerExceptionHandlers[Index] == (VOID *)(UINTN)0xEAFFFFFE)) {

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

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

-          Status = RegisterInterruptHandler (Index, NULL);

-          ASSERT_EFI_ERROR (Status);

-        } else {

-          // If the debugger has alread hooked put its vector back

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

-        }

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

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

+        Status = RegisterInterruptHandler (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 *)PcdGet32(PcdCpuVectorBaseAddress), Length);

+    }

+

+    // Flush Caches since we updated executable stuff

+    InvalidateInstructionCacheRange ((VOID *)PcdGet32(PcdCpuVectorBaseAddress), Length);

 

-      //Note: On ARM processor with the Security Extension, the Vector Table can be located anywhere in the memory.

-      //      The Vector Base Address Register defines the location

-      ArmWriteVBar(PcdGet32(PcdCpuVectorBaseAddress));

+    //Note: On ARM processor with the Security Extension, the Vector Table can be located anywhere in the memory.

+    //      The Vector Base Address Register defines the location

+    ArmWriteVBar(PcdGet32(PcdCpuVectorBaseAddress));

   } else {

     // We do not copy the Exception Table at PcdGet32(PcdCpuVectorBaseAddress). We just set Vector Base Address to point into CpuDxe code.

     ArmWriteVBar((UINT32)ExceptionHandlersStart);