EmulatorPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the EmulatorPkg 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: Ray Ni <ray.ni@intel.com>

1 files changed, 65 insertions, 70 deletions

diff --git a/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.c b/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.c
index fd756b5594..a9d28f48cf 100644
--- a/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.c
+++ b/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.c
@@ -15,8 +15,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Ppi/EmuThunk.h>

 #include <Protocol/EmuThunk.h>

 

-

-

 /**

   Retrieves and returns a pointer to the entry point to a PE/COFF image that has been loaded

   into system memory with the PE/COFF Loader Library functions.

@@ -41,22 +39,22 @@ PeCoffLoaderGetEntryPoint (
   IN OUT VOID  **EntryPoint

   )

 {

-  EMU_THUNK_PPI           *ThunkPpi;

-  EFI_STATUS              Status;

-  EMU_THUNK_PROTOCOL      *Thunk;

+  EMU_THUNK_PPI       *ThunkPpi;

+  EFI_STATUS          Status;

+  EMU_THUNK_PROTOCOL  *Thunk;

 

   //

   // Locate EmuThunkPpi for retrieving standard output handle

   //

   Status = PeiServicesLocatePpi (

-              &gEmuThunkPpiGuid,

-              0,

-              NULL,

-              (VOID **) &ThunkPpi

+             &gEmuThunkPpiGuid,

+             0,

+             NULL,

+             (VOID **)&ThunkPpi

              );

   ASSERT_EFI_ERROR (Status);

 

-  Thunk  = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();

+  Thunk = (EMU_THUNK_PROTOCOL *)ThunkPpi->Thunk ();

 

   return Thunk->PeCoffGetEntryPoint (Pe32Data, EntryPoint);

 }

@@ -86,15 +84,14 @@ PeCoffLoaderGetMachineType (
 

   DosHdr = (EFI_IMAGE_DOS_HEADER  *)Pe32Data;

   if (DosHdr->e_magic == EFI_IMAGE_DOS_SIGNATURE) {

-    Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN) Pe32Data + (UINTN) ((DosHdr->e_lfanew) & 0x0ffff));

-

+    Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data + (UINTN)((DosHdr->e_lfanew) & 0x0ffff));

   } else {

     Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)(Pe32Data);

   }

 

   if (Hdr.Te->Signature == EFI_TE_IMAGE_HEADER_SIGNATURE) {

     return Hdr.Te->Machine;

-  } else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE)  {

+  } else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE) {

     return Hdr.Pe32->FileHeader.Machine;

   }

 

@@ -126,15 +123,15 @@ PeCoffLoaderGetPdbPointer (
   IN VOID  *Pe32Data

   )

 {

-  EFI_IMAGE_DOS_HEADER                  *DosHdr;

-  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr;

-  EFI_IMAGE_DATA_DIRECTORY              *DirectoryEntry;

-  EFI_IMAGE_DEBUG_DIRECTORY_ENTRY       *DebugEntry;

-  UINTN                                 DirCount;

-  VOID                                  *CodeViewEntryPointer;

-  INTN                                  TEImageAdjust;

-  UINT32                                NumberOfRvaAndSizes;

-  UINT16                                Magic;

+  EFI_IMAGE_DOS_HEADER                 *DosHdr;

+  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION  Hdr;

+  EFI_IMAGE_DATA_DIRECTORY             *DirectoryEntry;

+  EFI_IMAGE_DEBUG_DIRECTORY_ENTRY      *DebugEntry;

+  UINTN                                DirCount;

+  VOID                                 *CodeViewEntryPointer;

+  INTN                                 TEImageAdjust;

+  UINT32                               NumberOfRvaAndSizes;

+  UINT16                               Magic;

 

   ASSERT (Pe32Data   != NULL);

 

@@ -148,7 +145,7 @@ PeCoffLoaderGetPdbPointer (
     //

     // DOS image header is present, so read the PE header after the DOS image header.

     //

-    Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN) Pe32Data + (UINTN) ((DosHdr->e_lfanew) & 0x0ffff));

+    Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data + (UINTN)((DosHdr->e_lfanew) & 0x0ffff));

   } else {

     //

     // DOS image header is not present, so PE header is at the image base.

@@ -158,11 +155,11 @@ PeCoffLoaderGetPdbPointer (
 

   if (Hdr.Te->Signature == EFI_TE_IMAGE_HEADER_SIGNATURE) {

     if (Hdr.Te->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress != 0) {

-      DirectoryEntry  = &Hdr.Te->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG];

-      TEImageAdjust   = sizeof (EFI_TE_IMAGE_HEADER) - Hdr.Te->StrippedSize;

-      DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)((UINTN) Hdr.Te +

-                    Hdr.Te->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress +

-                    TEImageAdjust);

+      DirectoryEntry = &Hdr.Te->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG];

+      TEImageAdjust  = sizeof (EFI_TE_IMAGE_HEADER) - Hdr.Te->StrippedSize;

+      DebugEntry     = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)((UINTN)Hdr.Te +

+                                                           Hdr.Te->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress +

+                                                           TEImageAdjust);

     }

   } else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE) {

     //

@@ -171,24 +168,24 @@ PeCoffLoaderGetPdbPointer (
     //       generate PE32+ image with PE32 Magic.

     //

     switch (Hdr.Pe32->FileHeader.Machine) {

-    case EFI_IMAGE_MACHINE_IA32:

-      //

-      // Assume PE32 image with IA32 Machine field.

-      //

-      Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;

-      break;

-    case EFI_IMAGE_MACHINE_X64:

-    case EFI_IMAGE_MACHINE_IA64:

-      //

-      // Assume PE32+ image with X64 or IA64 Machine field

-      //

-      Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;

-      break;

-    default:

-      //

-      // For unknow Machine field, use Magic in optional Header

-      //

-      Magic = Hdr.Pe32->OptionalHeader.Magic;

+      case EFI_IMAGE_MACHINE_IA32:

+        //

+        // Assume PE32 image with IA32 Machine field.

+        //

+        Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;

+        break;

+      case EFI_IMAGE_MACHINE_X64:

+      case EFI_IMAGE_MACHINE_IA64:

+        //

+        // Assume PE32+ image with X64 or IA64 Machine field

+        //

+        Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;

+        break;

+      default:

+        //

+        // For unknow Machine field, use Magic in optional Header

+        //

+        Magic = Hdr.Pe32->OptionalHeader.Magic;

     }

 

     if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

@@ -196,42 +193,42 @@ PeCoffLoaderGetPdbPointer (
       // Use PE32 offset get Debug Directory Entry

       //

       NumberOfRvaAndSizes = Hdr.Pe32->OptionalHeader.NumberOfRvaAndSizes;

-      DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)&(Hdr.Pe32->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);

-      DebugEntry     = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *) ((UINTN) Pe32Data + DirectoryEntry->VirtualAddress);

+      DirectoryEntry      = (EFI_IMAGE_DATA_DIRECTORY *)&(Hdr.Pe32->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);

+      DebugEntry          = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)((UINTN)Pe32Data + DirectoryEntry->VirtualAddress);

     } else if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {

       //

       // Use PE32+ offset get Debug Directory Entry

       //

       NumberOfRvaAndSizes = Hdr.Pe32Plus->OptionalHeader.NumberOfRvaAndSizes;

-      DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)&(Hdr.Pe32Plus->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);

-      DebugEntry     = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *) ((UINTN) Pe32Data + DirectoryEntry->VirtualAddress);

+      DirectoryEntry      = (EFI_IMAGE_DATA_DIRECTORY *)&(Hdr.Pe32Plus->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);

+      DebugEntry          = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)((UINTN)Pe32Data + DirectoryEntry->VirtualAddress);

     }

 

     if (NumberOfRvaAndSizes <= EFI_IMAGE_DIRECTORY_ENTRY_DEBUG) {

       DirectoryEntry = NULL;

-      DebugEntry = NULL;

+      DebugEntry     = NULL;

     }

   } else {

     return NULL;

   }

 

-  if (DebugEntry == NULL || DirectoryEntry == NULL) {

+  if ((DebugEntry == NULL) || (DirectoryEntry == NULL)) {

     return NULL;

   }

 

   for (DirCount = 0; DirCount < DirectoryEntry->Size; DirCount += sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY), DebugEntry++) {

     if (DebugEntry->Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {

       if (DebugEntry->SizeOfData > 0) {

-        CodeViewEntryPointer = (VOID *) ((UINTN) DebugEntry->RVA + ((UINTN)Pe32Data) + (UINTN)TEImageAdjust);

-        switch (* (UINT32 *) CodeViewEntryPointer) {

-        case CODEVIEW_SIGNATURE_NB10:

-          return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY));

-        case CODEVIEW_SIGNATURE_RSDS:

-          return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY));

-        case CODEVIEW_SIGNATURE_MTOC:

-          return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY));

-        default:

-          break;

+        CodeViewEntryPointer = (VOID *)((UINTN)DebugEntry->RVA + ((UINTN)Pe32Data) + (UINTN)TEImageAdjust);

+        switch (*(UINT32 *)CodeViewEntryPointer) {

+          case CODEVIEW_SIGNATURE_NB10:

+            return (VOID *)((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY));

+          case CODEVIEW_SIGNATURE_RSDS:

+            return (VOID *)((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY));

+          case CODEVIEW_SIGNATURE_MTOC:

+            return (VOID *)((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY));

+          default:

+            break;

         }

       }

     }

@@ -240,7 +237,6 @@ PeCoffLoaderGetPdbPointer (
   return NULL;

 }

 

-

 /**

   Returns the size of the PE/COFF headers

 

@@ -256,12 +252,12 @@ PeCoffLoaderGetPdbPointer (
 UINT32

 EFIAPI

 PeCoffGetSizeOfHeaders (

-  IN VOID     *Pe32Data

+  IN VOID  *Pe32Data

   )

 {

-  EFI_IMAGE_DOS_HEADER                  *DosHdr;

-  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr;

-  UINTN                                 SizeOfHeaders;

+  EFI_IMAGE_DOS_HEADER                 *DosHdr;

+  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION  Hdr;

+  UINTN                                SizeOfHeaders;

 

   ASSERT (Pe32Data   != NULL);

 

@@ -270,7 +266,7 @@ PeCoffGetSizeOfHeaders (
     //

     // DOS image header is present, so read the PE header after the DOS image header.

     //

-    Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN) Pe32Data + (UINTN) ((DosHdr->e_lfanew) & 0x0ffff));

+    Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data + (UINTN)((DosHdr->e_lfanew) & 0x0ffff));

   } else {

     //

     // DOS image header is not present, so PE header is at the image base.

@@ -286,6 +282,5 @@ PeCoffGetSizeOfHeaders (
     SizeOfHeaders = 0;

   }

 

-  return (UINT32) SizeOfHeaders;

+  return (UINT32)SizeOfHeaders;

 }

-