Make EDK Module Package pass Intel IPF compiler with /Ox switch.

[mirror_edk2.git] / EdkModulePkg / Universal / Ebc / Dxe / EbcExecute.c

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/EbcExecute.c b/EdkModulePkg/Universal/Ebc/Dxe/EbcExecute.c
index 13e2d7c08f3aefed8c71bd36a51912dd4d777e42..4b020cb6daa7ff4d6fe0126f3ba38c2094ca8c9f 100644 (file)
--- a/EdkModulePkg/Universal/Ebc/Dxe/EbcExecute.c
+++ b/EdkModulePkg/Universal/Ebc/Dxe/EbcExecute.c
@@ -134,20 +134,6 @@ VmWriteMem32 (
   IN UINT32     Data\r
   );\r
 \r
-EFI_STATUS\r
-VmWriteMemN (\r
-  IN VM_CONTEXT *VmPtr,\r
-  UINTN         Addr,\r
-  IN UINTN      Data\r
-  );\r
-\r
-EFI_STATUS\r
-VmWriteMem64 (\r
-  IN VM_CONTEXT *VmPtr,\r
-  UINTN         Addr,\r
-  IN UINT64     Data\r
-  );\r
-\r
 STATIC\r
 UINT16\r
 VmReadCode16 (\r
@@ -685,6 +671,7 @@ Returns:
   EFI_STATUS                        Status;\r
   EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL  *EbcSimpleDebugger;\r
 \r
+  mVmPtr            = VmPtr;\r
   EbcSimpleDebugger = NULL;\r
   Status            = EFI_SUCCESS;\r
   StackCorrupted    = 0;\r
@@ -779,6 +766,7 @@ Returns:
   }\r
 \r
 Done:\r
+  mVmPtr          = NULL;\r
   return Status;\r
 }\r
 \r
@@ -1096,7 +1084,6 @@ Returns:
   UINT8       Operands;\r
   VOID        *EbcEntryPoint;\r
   VOID        *Thunk;\r
-  EFI_STATUS  Status;\r
   UINT64      U64EbcEntryPoint;\r
   INT32       Offset;\r
 \r
@@ -1160,7 +1147,7 @@ Returns:
     //\r
     // Now create a new thunk\r
     //\r
-    Status = EbcCreateThunks (VmPtr->ImageHandle, EbcEntryPoint, &Thunk, 0);\r
+    EbcCreateThunks (VmPtr->ImageHandle, EbcEntryPoint, &Thunk, 0);\r
 \r
     //\r
     // Finally replace the EBC entry point memory with the thunk address\r
@@ -4554,7 +4541,7 @@ Returns:
 --*/\r
 {\r
   UINTN   Data;\r
-  UINT32  Size;\r
+  volatile UINT32  Size;\r
   UINT8   *FromPtr;\r
   UINT8   *ToPtr;\r
   //\r