Perfect the msa of the following modules, DiskIo, Partition, English and Ebc.

[mirror_edk2.git] / EdkModulePkg / Universal / Ebc / Dxe / x64 / EbcSupport.c

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/x64/EbcSupport.c b/EdkModulePkg/Universal/Ebc/Dxe/x64/EbcSupport.c
index d111f3c0bf9bb5e8678bbcf9a0d1e455159a3567..cad5c6a43bf27df296115631420d3c0511c6ae45 100644 (file)
--- a/EdkModulePkg/Universal/Ebc/Dxe/x64/EbcSupport.c
+++ b/EdkModulePkg/Universal/Ebc/Dxe/x64/EbcSupport.c
@@ -158,7 +158,7 @@ Returns:
   // The x64 does not do this so pad the stack accordingly.\r
   //\r
   PushU64 (&VmContext, (UINT64) 0);\r
-  PushU64 (&VmContext, (UINT64) 0x1234567887654321);\r
+  PushU64 (&VmContext, (UINT64) 0x1234567887654321ULL);\r
 \r
   //\r
   // For x64, this is where we say our return address is\r
@@ -276,7 +276,7 @@ Returns:
   // VM pushes 16-bytes for return address. Simulate that here.\r
   //\r
   PushU64 (&VmContext, (UINT64) 0);\r
-  PushU64 (&VmContext, (UINT64) 0x1234567887654321);\r
+  PushU64 (&VmContext, (UINT64) 0x1234567887654321ULL);\r
 \r
   //\r
   // For x64, this is where we say our return address is\r
@@ -331,7 +331,6 @@ Returns:
   UINT64      Addr;\r
   INT32       Size;\r
   INT32       ThunkSize;\r
-  EFI_STATUS  Status;\r
 \r
   //\r
   // Check alignment of pointer to EBC code\r
@@ -343,12 +342,9 @@ Returns:
   Size      = EBC_THUNK_SIZE;\r
   ThunkSize = Size;\r
 \r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  Size,\r
-                  (VOID *) &Ptr\r
-                  );\r
-  if (Status != EFI_SUCCESS) {\r
+  Ptr = AllocatePool (Size);\r
+\r
+  if (Ptr == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   //\r
@@ -373,7 +369,7 @@ Returns:
   *Ptr = 0xB8;\r
   Ptr++;\r
   Size--;\r
-  Addr = (UINT64) 0xCA112EBCCA112EBC;\r
+  Addr = (UINT64) 0xCA112EBCCA112EBCULL;\r
   for (I = 0; I < sizeof (Addr); I++) {\r
     *Ptr = (UINT8) (UINTN) Addr;\r
     Addr >>= 8;\r