Fix issue with ARM port. Image.c shadow code is not ANSI C and crashes on ARM. So...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10636 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index 5b2a6d0a7246e43a7ed9bfa1a817d88d98cdbd1f..0130d7734200c4483de7020f3737992757964460 100644 (file)
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -117,7 +117,12 @@ GetImageReadFunction (
 \r
   Private = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
 \r
-  if (!Private->PeiMemoryInstalled || (Private->HobList.HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME) || EFI_IMAGE_MACHINE_TYPE_SUPPORTED(EFI_IMAGE_MACHINE_IA64)) {\r
+  if (!Private->PeiMemoryInstalled || (Private->HobList.HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME) || \r
+      EFI_IMAGE_MACHINE_TYPE_SUPPORTED(EFI_IMAGE_MACHINE_IA64) || EFI_IMAGE_MACHINE_TYPE_SUPPORTED(EFI_IMAGE_MACHINE_ARMTHUMB_MIXED)) {\r
+    //\r
+    // Point to ROM version if memory is not installed, we are in an S3.\r
+    // The shadow code is not ANSI C so skip on IA64 and ARM architectures. \r
+    //\r
     ImageContext->ImageRead = PeiImageRead;\r
   } else {\r
     if (Private->ShadowedImageRead == NULL) {\r