Merge branch of PI tree to main trunk

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

Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c

@@ -21,35 +21,30 @@ Abstract:
 --*/
 
 #include <PiPei.h>
+#include <Library/DebugLib.h>
 #include <Guid/PeiPeCoffLoader.h>
-#include <Library/PeCoffLoaderLib.h>
+#include <Library/PeCoffLoaderLib.h>  
+#include <Library/PeiServicesLib.h>
 
 
-EFI_PEI_PE_COFF_LOADER_PROTOCOL  *mPeiEfiPeiPeCoffLoader;
+EFI_PEI_PE_COFF_LOADER_PROTOCOL  *mPeiEfiPeiPeCoffLoader = NULL;
 
-EFI_STATUS
-EFIAPI
-PeCoffLoaderConstructor (
-  IN EFI_FFS_FILE_HEADER      *FfsHeader,
-  IN EFI_PEI_SERVICES          **PeiServices
-  )
-{
-  EFI_STATUS  Status;
-
-  Status = (*PeiServices)->LocatePpi (
-                            PeiServices,
-                            &gEfiPeiPeCoffLoaderGuid,
-                            0,
-                            NULL,
-                            &mPeiEfiPeiPeCoffLoader
-                            );
-  return Status;
-}
 
 EFI_PEI_PE_COFF_LOADER_PROTOCOL *
 EFIAPI
 GetPeCoffLoaderProtocol (
   )
 {
+  EFI_STATUS Status;
+  
+  if (mPeiEfiPeiPeCoffLoader == NULL) {
+    Status = PeiServicesLocatePpi(
+                              &gEfiPeiPeCoffLoaderGuid,
+                              0,
+                              NULL,
+                              (VOID **) &mPeiEfiPeiPeCoffLoader
+                              );
+    ASSERT_EFI_ERROR (Status);
+   }
   return mPeiEfiPeiPeCoffLoader;
 }

Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf

@@ -24,8 +24,6 @@
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
-  CONSTRUCTOR                    = PeCoffLoaderConstructor
-
 #
 # The following information is for reference only and not required by the build tools.
 #