X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FCore%2FPei%2FImage%2FImage.c;fp=EdkModulePkg%2FCore%2FPei%2FImage%2FImage.c;h=202936869b62eb4b2f9417f4b5dc6562d76f934c;hp=dfe4668c1b5ec6fa5e6d677f2f31a1b488bd3412;hb=a8b194b97cd4d0cd46ce9880293c4500bd841fc1;hpb=03a053669fdbd4bc49f336a8d29d059ec181db35

diff --git a/EdkModulePkg/Core/Pei/Image/Image.c b/EdkModulePkg/Core/Pei/Image/Image.c
index dfe4668c1b..202936869b 100644
--- a/EdkModulePkg/Core/Pei/Image/Image.c
+++ b/EdkModulePkg/Core/Pei/Image/Image.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+Copyright (c) 2006 - 2007, Intel Corporation                                                         
 All rights reserved. This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -56,6 +56,7 @@ Returns:
   UINT64                      ImageSize;
   EFI_PHYSICAL_ADDRESS        ImageEntryPoint;
   EFI_TE_IMAGE_HEADER         *TEImageHeader;
+  UINT16                      Machine;
 
   *EntryPoint   = NULL;
   TEImageHeader = NULL;
@@ -114,7 +115,7 @@ Returns:
       // Retrieve the entry point from the TE image header
       //
       ImageAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) TEImageHeader;
-      *EntryPoint = (VOID *)((UINTN) TEImageHeader + sizeof (EFI_TE_IMAGE_HEADER) +
+      *EntryPoint  = (VOID *)((UINTN) TEImageHeader + sizeof (EFI_TE_IMAGE_HEADER) +
                     TEImageHeader->AddressOfEntryPoint - TEImageHeader->StrippedSize);
     }
   } else {
@@ -128,6 +129,17 @@ Returns:
     }
   }
 
+  if (((EFI_TE_IMAGE_HEADER *) (UINTN) ImageAddress)->Signature == EFI_TE_IMAGE_HEADER_SIGNATURE) {
+    TEImageHeader = (EFI_TE_IMAGE_HEADER *) (UINTN) ImageAddress;
+    Machine = TEImageHeader->Machine;
+  } else {
+    Machine = PeCoffLoaderGetMachineType (Pe32Data);
+  } 
+  
+  if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Machine)) {
+    return EFI_UNSUPPORTED;  
+  }
+
   //
   // Print debug message: Loading PEIM at 0x12345678 EntryPoint=0x12345688 Driver.efi
   //