X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkNt32Pkg%2FLibrary%2FEdkNt32PeiPeCoffGetEntryPointLib%2FPeCoffGetEntryPoint.c;h=da2f8e94eb222c1624d7421c85fe406ad2de381a;hp=ed64158df7987ec9b20468a69e976b5de33b30d4;hb=9471ecb798ad67b8e53e6b2bcaf56ef5d83162e6;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4;ds=sidebyside

diff --git a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
index ed64158df7..da2f8e94eb 100644
--- a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
+++ b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.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
@@ -32,7 +32,9 @@ PeCoffLoaderGetEntryPoint (
 
 Routine Description:
 
-  Loads a PE/COFF image into memory
+  Loads a PE/COFF image into memory, this is not follow the original purpose of 
+  PeCoffGetEntryPoint library class.  But it's ok that Unix package not run on a real 
+  platform and this is for source level debug.
 
 Arguments:
 
@@ -54,7 +56,7 @@ Returns:
   UINT64                  ImageSize;
   EFI_PHYSICAL_ADDRESS    ImageEntryPoint;
 
-  Status = PeiCoreLocatePpi (
+  Status = PeiServicesLocatePpi (
              &gNtPeiLoadFilePpiGuid,
              0,
              &PpiDescriptor,
@@ -72,4 +74,40 @@ Returns:
                            );
   *EntryPoint = (VOID*)(UINTN)ImageEntryPoint;
   return Status;
-}
\ No newline at end of file
+}
+
+/**
+  Returns the machine type of PE/COFF image. 
+  This is copied from MDE BasePeCoffGetEntryPointLib, the code should be sync with it.
+  The reason is NT32 package needs to load the image to memory to support source
+  level debug.
+   
+
+  @param  Image   Pointer to a PE/COFF header
+
+  @return         Machine type or zero if not a valid iamge
+
+**/
+UINT16
+EFIAPI
+PeCoffLoaderGetMachineType (
+  IN  VOID  *Pe32Data
+  )
+{  
+  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION  Hdr;
+  EFI_IMAGE_DOS_HEADER                 *DosHdr;
+
+  DosHdr = (EFI_IMAGE_DOS_HEADER  *)Pe32Data;
+  if (DosHdr->e_magic == EFI_IMAGE_DOS_SIGNATURE) {
+    Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data + DosHdr->e_lfanew);
+  } else {
+    Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data);
+  }
+
+  if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE)  {
+    return Hdr.Pe32->FileHeader.Machine;
+  }
+
+  return 0x0000;
+}
+