Integrate patch from Andrew Fish to make it run on OS X.

[mirror_edk2.git] / UnixPkg / Library / EdkUnixPeiPeCoffGetEntryPointLib / PeCoffGetEntryPoint.c

diff --git a/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c b/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
index be9cba831c93c4e6c991efb217f01d4fd74e86c6..ef0d6c17cb55f5712aff6364a2668e8c1c7bcafd 100644 (file)
--- a/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
+++ b/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
@@ -1,6 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation\r
+Copyright (c) 2006 - 2009, Intel Corporation\r
+Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.\r
 All rights reserved. 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
@@ -54,38 +55,24 @@ Returns:
 \r
 --*/\r
 {\r
+       PEI_UNIX_THUNK_PPI      *UnixThunkPpi;\r
   EFI_STATUS              Status;\r
-  EFI_PEI_PPI_DESCRIPTOR  *PpiDescriptor;\r
-  UNIX_PEI_LOAD_FILE_PPI *PeiUnixService;\r
-  EFI_PHYSICAL_ADDRESS    ImageAddress;\r
-  UINT64                  ImageSize;\r
-  EFI_PHYSICAL_ADDRESS    ImageEntryPoint;\r
-\r
-  ASSERT (Pe32Data   != NULL);\r
-  ASSERT (EntryPoint != NULL);\r
+  EFI_UNIX_THUNK_PROTOCOL *Unix;\r
 \r
+  //\r
+  // Locate Unix ThunkPpi for retrieving standard output handle\r
+  //\r
   Status = PeiServicesLocatePpi (\r
-             &gUnixPeiLoadFilePpiGuid,\r
+              &gPeiUnixThunkPpiGuid,\r
              0,\r
-             &PpiDescriptor,\r
-             (void **)&PeiUnixService\r
+              NULL,\r
+              (VOID **) &UnixThunkPpi\r
              );\r
-\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = PeiUnixService->PeiLoadFileService (\r
-                           Pe32Data,\r
-                           &ImageAddress,\r
-                           &ImageSize,\r
-                           &ImageEntryPoint\r
-                           );\r
-\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
+  Unix  = (EFI_UNIX_THUNK_PROTOCOL *)UnixThunkPpi->UnixThunk ();\r
 \r
-  *EntryPoint = (VOID*)(UINTN)ImageEntryPoint;\r
-  return Status;\r
+  return Unix->PeCoffGetEntryPoint (Pe32Data, EntryPoint);\r
 }\r
 \r
 /**\r
@@ -255,6 +242,8 @@ PeCoffLoaderGetPdbPointer (
           return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY));\r
         case CODEVIEW_SIGNATURE_RSDS:\r
           return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY));\r
+        case CODEVIEW_SIGNATURE_MTOC:\r
+          return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY));\r
         default:\r
           break;\r
         }\r