Clean up DEC files:

[mirror_edk2.git] / MdeModulePkg / Core / Pei / Image / Image.c

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index 284bf5130b1ffb6fe292b987116b506f37fe6c85..0906548edecef3effe3388d699bfc2b44179007f 100644 (file)
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -1,8 +1,8 @@
 /** @file\r
   Pei Core Load Image Support\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -82,9 +82,9 @@ PeiImageReadForShadow (
   OUT    VOID    *Buffer\r
   )\r
 {\r
-  CHAR8 *Destination8;\r
-  CHAR8 *Source8;\r
-  UINTN Length;\r
+  volatile CHAR8  *Destination8;\r
+  CHAR8           *Source8;\r
+  UINTN           Length;\r
 \r
   Destination8  = Buffer;\r
   Source8       = (CHAR8 *) ((UINTN) FileHandle + FileOffset);\r
@@ -116,10 +116,13 @@ GetImageReadFunction (
   VOID*  MemoryBuffer;\r
 \r
   Private = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
-\r
-  if (!Private->PeiMemoryInstalled || (Private->HobList.HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME)) {\r
-    ImageContext->ImageRead = PeiImageRead;\r
-  } else {\r
+  \r
+  if ((Private->PeiMemoryInstalled  && !(Private->HobList.HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME))  &&\r
+      (EFI_IMAGE_MACHINE_TYPE_SUPPORTED(EFI_IMAGE_MACHINE_X64) || EFI_IMAGE_MACHINE_TYPE_SUPPORTED(EFI_IMAGE_MACHINE_IA32))) {\r
+    // \r
+    // Shadow algorithm makes lots of non ANSI C assumptions and only works for IA32 and X64 \r
+    //  compilers that have been tested\r
+    //\r
     if (Private->ShadowedImageRead == NULL) {\r
       MemoryBuffer = AllocatePages (0x400 / EFI_PAGE_SIZE + 1);\r
       ASSERT (MemoryBuffer != NULL);\r
@@ -128,6 +131,8 @@ GetImageReadFunction (
     }\r
 \r
     ImageContext->ImageRead = Private->ShadowedImageRead;\r
+  } else {\r
+    ImageContext->ImageRead = PeiImageRead;\r
   }\r
 \r
   return EFI_SUCCESS;\r