EmulatorPkg: Enable CLANG9 tool chain

[mirror_edk2.git] / EmulatorPkg / Win / Host / WinHost.c

diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c
index 9c6acac2795265d1834234d49b6f19e973e8f0a2..62a89f7617afee3b0430c411c5e7098fc8338021 100644 (file)
--- a/EmulatorPkg/Win/Host/WinHost.c
+++ b/EmulatorPkg/Win/Host/WinHost.c
@@ -356,7 +356,7 @@ Returns:
 INTN\r
 EFIAPI\r
 main (\r
-  IN  INTN  Argc,\r
+  IN  INT  Argc,\r
   IN  CHAR8 **Argv,\r
   IN  CHAR8 **Envp\r
   )\r
@@ -391,8 +391,8 @@ Returns:
   VOID                  *SecFile;\r
   CHAR16                *MemorySizeStr;\r
   CHAR16                *FirmwareVolumesStr;\r
-  UINT32                ProcessAffinityMask;\r
-  UINT32                SystemAffinityMask;\r
+  UINTN                 ProcessAffinityMask;\r
+  UINTN                 SystemAffinityMask;\r
   INT32                 LowBit;\r
 \r
   //\r
@@ -408,13 +408,13 @@ Returns:
   MemorySizeStr      = (CHAR16 *) PcdGetPtr (PcdEmuMemorySize);\r
   FirmwareVolumesStr = (CHAR16 *) PcdGetPtr (PcdEmuFirmwareVolume);\r
 \r
-  SecPrint ("\nEDK II WIN Host Emulation Environment from http://www.tianocore.org/edk2/\n");\r
+  SecPrint ("\n\rEDK II WIN Host Emulation Environment from http://www.tianocore.org/edk2/\n\r");\r
 \r
   //\r
   // Determine the first thread available to this process.\r
   //\r
   if (GetProcessAffinityMask (GetCurrentProcess (), &ProcessAffinityMask, &SystemAffinityMask)) {\r
-    LowBit = (INT32)LowBitSet32 (ProcessAffinityMask);\r
+    LowBit = (INT32)LowBitSet32 ((UINT32)ProcessAffinityMask);\r
     if (LowBit != -1) {\r
       //\r
       // Force the system to bind the process to a single thread to work\r
@@ -450,7 +450,7 @@ Returns:
   gSystemMemoryCount  = CountSeparatorsInString (MemorySizeStr, '!') + 1;\r
   gSystemMemory       = calloc (gSystemMemoryCount, sizeof (NT_SYSTEM_MEMORY));\r
   if (gSystemMemory == NULL) {\r
-    SecPrint ("ERROR : Can not allocate memory for %S.  Exiting.\n", MemorySizeStr);\r
+    SecPrint ("ERROR : Can not allocate memory for %S.  Exiting.\n\r", MemorySizeStr);\r
     exit (1);\r
   }\r
 \r
@@ -460,13 +460,13 @@ Returns:
   gFdInfoCount  = CountSeparatorsInString (FirmwareVolumesStr, '!') + 1;\r
   gFdInfo       = calloc (gFdInfoCount, sizeof (NT_FD_INFO));\r
   if (gFdInfo == NULL) {\r
-    SecPrint ("ERROR : Can not allocate memory for %S.  Exiting.\n", FirmwareVolumesStr);\r
+    SecPrint ("ERROR : Can not allocate memory for %S.  Exiting.\n\r", FirmwareVolumesStr);\r
     exit (1);\r
   }\r
   //\r
   // Setup Boot Mode.\r
   //\r
-  SecPrint ("  BootMode 0x%02x\n", PcdGet32 (PcdEmuBootMode));\r
+  SecPrint ("  BootMode 0x%02x\n\r", PcdGet32 (PcdEmuBootMode));\r
 \r
   //\r
   //  Allocate 128K memory to emulate temp memory for PEI.\r
@@ -476,12 +476,12 @@ Returns:
   TemporaryRamSize = TEMPORARY_RAM_SIZE;\r
   TemporaryRam     = VirtualAlloc (NULL, (SIZE_T) (TemporaryRamSize), MEM_COMMIT, PAGE_EXECUTE_READWRITE);\r
   if (TemporaryRam == NULL) {\r
-    SecPrint ("ERROR : Can not allocate enough space for SecStack\n");\r
+    SecPrint ("ERROR : Can not allocate enough space for SecStack\n\r");\r
     exit (1);\r
   }\r
   SetMem32 (TemporaryRam, TemporaryRamSize, PcdGet32 (PcdInitValueInTempStack));\r
 \r
-  SecPrint ("  OS Emulator passing in %u KB of temp RAM at 0x%08lx to SEC\n",\r
+  SecPrint ("  OS Emulator passing in %u KB of temp RAM at 0x%08lx to SEC\n\r",\r
     TemporaryRamSize / SIZE_1KB,\r
     TemporaryRam\r
     );\r
@@ -503,7 +503,7 @@ Returns:
               &Size\r
               );\r
     if (EFI_ERROR (Status)) {\r
-      SecPrint ("ERROR : Could not allocate PeiServicesTablePage @ %p\n", EmuMagicPage);\r
+      SecPrint ("ERROR : Could not allocate PeiServicesTablePage @ %p\n\r", EmuMagicPage);\r
       return EFI_DEVICE_ERROR;\r
     }\r
   }\r
@@ -514,7 +514,7 @@ Returns:
   //\r
   FileNamePtr = AllocateCopyPool (StrSize (FirmwareVolumesStr), FirmwareVolumesStr);\r
   if (FileNamePtr == NULL) {\r
-    SecPrint ("ERROR : Can not allocate memory for firmware volume string\n");\r
+    SecPrint ("ERROR : Can not allocate memory for firmware volume string\n\r");\r
     exit (1);\r
   }\r
 \r
@@ -540,11 +540,11 @@ Returns:
               &gFdInfo[Index].Size\r
               );\r
     if (EFI_ERROR (Status)) {\r
-      SecPrint ("ERROR : Can not open Firmware Device File %S (0x%X).  Exiting.\n", FileName, Status);\r
+      SecPrint ("ERROR : Can not open Firmware Device File %S (0x%X).  Exiting.\n\r", FileName, Status);\r
       exit (1);\r
     }\r
 \r
-    SecPrint ("  FD loaded from %S\n", FileName);\r
+    SecPrint ("  FD loaded from %S", FileName);\r
 \r
     if (SecFile == NULL) {\r
       //\r
@@ -565,7 +565,7 @@ Returns:
       }\r
     }\r
 \r
-    SecPrint ("\n");\r
+    SecPrint ("\n\r");\r
   }\r
   //\r
   // Calculate memory regions and store the information in the gSystemMemory\r
@@ -590,7 +590,7 @@ Returns:
     MemorySizeStr = MemorySizeStr + Index1 + 1;\r
   }\r
 \r
-  SecPrint ("\n");\r
+  SecPrint ("\n\r");\r
 \r
   //\r
   // Hand off to SEC Core\r
@@ -601,7 +601,7 @@ Returns:
   // If we get here, then the SEC Core returned. This is an error as SEC should\r
   //  always hand off to PEI Core and then on to DXE Core.\r
   //\r
-  SecPrint ("ERROR : SEC returned\n");\r
+  SecPrint ("ERROR : SEC returned\n\r");\r
   exit (1);\r
 }\r
 \r