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

diff --git a/EdkModulePkg/Core/Pei/Image/Image.c b/EdkModulePkg/Core/Pei/Image/Image.c
index 5edc8479eb..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        
@@ -21,6 +21,8 @@ Abstract:
 
 #include <PeiMain.h>
 
+
+
 EFI_STATUS
 PeiLoadImage (
   IN EFI_PEI_SERVICES         **PeiServices,
@@ -54,6 +56,7 @@ Returns:
   UINT64                      ImageSize;
   EFI_PHYSICAL_ADDRESS        ImageEntryPoint;
   EFI_TE_IMAGE_HEADER         *TEImageHeader;
+  UINT16                      Machine;
 
   *EntryPoint   = NULL;
   TEImageHeader = NULL;
@@ -103,16 +106,16 @@ Returns:
       }
 
       //
-      // Got the entry point from ImageEntryPoint
+      // Got the entry point from ImageEntryPoint and ImageStartAddress
       //
+      Pe32Data    = (VOID *) ((UINTN) ImageAddress);
       *EntryPoint = (VOID *) ((UINTN) ImageEntryPoint);
-      return EFI_SUCCESS;
     } else {
       //
       // 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 {
@@ -126,40 +129,49 @@ 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
   //
-  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Loading PEIM at 0x%08x EntryPoint=0x%08x ", Pe32Data, *EntryPoint));
-  DEBUG_CODE (
-    EFI_IMAGE_DATA_DIRECTORY * DirectoryEntry;
-    EFI_IMAGE_DEBUG_DIRECTORY_ENTRY * DebugEntry;
-    UINTN DirCount;
-    UINTN Index;
-    UINTN Index1;
-    BOOLEAN FileNameFound;
-    CHAR8 *AsciiString;
-    CHAR8 AsciiBuffer[512];
-    VOID *CodeViewEntryPointer;
-    INTN TEImageAdjust;
-    EFI_IMAGE_DOS_HEADER  *DosHeader;
-    EFI_IMAGE_NT_HEADERS  *PeHeader;
+  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Loading PEIM at 0x%08x EntryPoint=0x%08x ", (UINTN) ImageAddress, *EntryPoint));
+  DEBUG_CODE_BEGIN ();
+    EFI_IMAGE_DATA_DIRECTORY            *DirectoryEntry;
+    EFI_IMAGE_DEBUG_DIRECTORY_ENTRY     *DebugEntry;
+    UINTN                               DirCount;
+    UINTN                               Index;
+    UINTN                               Index1;
+    BOOLEAN                             FileNameFound;
+    CHAR8                               *AsciiString;
+    CHAR8                               AsciiBuffer[512];
+    VOID                                *CodeViewEntryPointer;
+    INTN                                TEImageAdjust;
+    EFI_IMAGE_DOS_HEADER                *DosHeader;
+    EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr;
+    UINT32                              NumberOfRvaAndSizes;
 
-    //
-    // Pe32Data is NULL when load TE image 
-    //    
-    PeHeader = NULL;
+    Hdr.Pe32 = NULL;
     if (TEImageHeader == NULL) {
       DosHeader = (EFI_IMAGE_DOS_HEADER *)Pe32Data;
       if (DosHeader->e_magic == EFI_IMAGE_DOS_SIGNATURE) {
         //
         // DOS image header is present, so read the PE header after the DOS image header
         //
-        PeHeader = (EFI_IMAGE_NT_HEADERS *) ((UINTN) Pe32Data + (UINTN) ((DosHeader->e_lfanew) & 0x0ffff));
+        Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data + (UINTN)((DosHeader->e_lfanew) & 0x0ffff));
       } else {
         //
         // DOS image header is not present, so PE header is at the image base
         //
-        PeHeader = (EFI_IMAGE_NT_HEADERS *) Pe32Data;
+        Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)Pe32Data;
       }
     }
 
@@ -171,13 +183,31 @@ Returns:
     // is present in the image. You have to check the NumberOfRvaAndSizes in
     // the optional header to verify a desired directory entry is there.
     //
-    DebugEntry      = NULL;
-    DirectoryEntry  = NULL;
-    TEImageAdjust   = 0;
+    DebugEntry          = NULL;
+    DirectoryEntry      = NULL;
+    NumberOfRvaAndSizes = 0;
+    TEImageAdjust       = 0;
+    
     if (TEImageHeader == NULL) {
-      if (PeHeader->OptionalHeader.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_DEBUG) {
-        DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *) &(PeHeader->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);
-        DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *) ((UINTN) ImageAddress + DirectoryEntry->VirtualAddress);
+      if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
+        //     
+        // Use PE32 offset get Debug Directory Entry
+        //
+        NumberOfRvaAndSizes = Hdr.Pe32->OptionalHeader.NumberOfRvaAndSizes;
+        DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)&(Hdr.Pe32->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);
+        DebugEntry     = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *) ((UINTN) Pe32Data + DirectoryEntry->VirtualAddress);
+      } else if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
+        //     
+        // Use PE32+ offset get Debug Directory Entry
+        //
+        NumberOfRvaAndSizes = Hdr.Pe32Plus->OptionalHeader.NumberOfRvaAndSizes;
+        DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)&(Hdr.Pe32Plus->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);
+        DebugEntry     = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *) ((UINTN) Pe32Data + DirectoryEntry->VirtualAddress);
+      }
+
+      if (NumberOfRvaAndSizes <= EFI_IMAGE_DIRECTORY_ENTRY_DEBUG) {
+        DirectoryEntry = NULL;
+        DebugEntry = NULL;
       }
     } else {
       if (TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress != 0) {
@@ -190,17 +220,17 @@ Returns:
     }
 
     if (DebugEntry != NULL && DirectoryEntry != NULL) {
-      for (DirCount = 0; DirCount < DirectoryEntry->Size; DirCount++, DebugEntry++) {
+      for (DirCount = 0; DirCount < DirectoryEntry->Size; DirCount += sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY), DebugEntry++) {
         if (DebugEntry->Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {
           if (DebugEntry->SizeOfData > 0) {
             CodeViewEntryPointer = (VOID *) ((UINTN) DebugEntry->RVA + (UINTN) ImageAddress + (UINTN)TEImageAdjust);
             switch (* (UINT32 *) CodeViewEntryPointer) {
               case CODEVIEW_SIGNATURE_NB10:
-                AsciiString = (CHAR8 *) CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY);
+                AsciiString = (CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY);
                 break;
 
               case CODEVIEW_SIGNATURE_RSDS:
-                AsciiString = (CHAR8 *) CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY);
+                AsciiString = (CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY);
                 break;
 
               default:
@@ -209,7 +239,7 @@ Returns:
             }
             if (AsciiString != NULL) {
               FileNameFound = FALSE;
-              for (Index = 0, Index1 = 0; AsciiString[Index] != 0; Index++) {
+              for (Index = 0, Index1 = 0; AsciiString[Index] != '\0'; Index++) {
                 if (AsciiString[Index] == '\\') {
                   Index1 = Index;
                   FileNameFound = TRUE;
@@ -229,7 +259,7 @@ Returns:
         }
       }
     }
-  );
+  DEBUG_CODE_END ();
 
   DEBUG ((EFI_D_INFO | EFI_D_LOAD, "\n"));