Correct TeImage file format and Clean up PeiRebase tool to remove unused code and...

Move two EFI_DEP_REPLACE_TRUE and DEPEX_STACK_SIZE_INCREMENT macros from MdePkg to EdkModule/DxeMain module, because these two macros are specific implementation, not defined in spec.

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

diff --git a/EdkModulePkg/Core/Dxe/DxeMain.h b/EdkModulePkg/Core/Dxe/DxeMain.h
index 28c805703ae813a5be73e31496e91bfbfe3b4bca..b38ba8e7f9ef1385190b386df7ff13b066524a25 100644 (file)
--- a/EdkModulePkg/Core/Dxe/DxeMain.h
+++ b/EdkModulePkg/Core/Dxe/DxeMain.h
@@ -33,6 +33,18 @@ Revision History
 #include "Exec.h"\r
 #include "hand.h"\r
 \r
 #include "Exec.h"\r
 #include "hand.h"\r
 \r

+///\r
+/// EFI_DEP_REPLACE_TRUE - Used to dynamically patch the dependecy expression\r
+///                        to save time.  A EFI_DEP_PUSH is evauated one an\r
+///                        replaced with EFI_DEP_REPLACE_TRUE\r
+///\r
+#define EFI_DEP_REPLACE_TRUE  0xff\r
+\r
+///\r
+/// Define the initial size of the dependency expression evaluation stack\r
+///\r
+#define DEPEX_STACK_SIZE_INCREMENT  0x1000\r
+\r

 typedef struct {\r
   EFI_GUID                    *ProtocolGuid;\r
   VOID                        **Protocol;\r
 typedef struct {\r
   EFI_GUID                    *ProtocolGuid;\r
   VOID                        **Protocol;\r

diff --git a/EdkModulePkg/Core/Pei/Image/Image.c b/EdkModulePkg/Core/Pei/Image/Image.c
index 377a0d918d32604a071891f8c521a9e3cab5c270..dfe4668c1b5ec6fa5e6d677f2f31a1b488bd3412 100644 (file)
--- a/EdkModulePkg/Core/Pei/Image/Image.c
+++ b/EdkModulePkg/Core/Pei/Image/Image.c
@@ -208,7 +208,7 @@ Returns:
     }\r
 \r
     if (DebugEntry != NULL && DirectoryEntry != NULL) {\r
     }\r
 \r
     if (DebugEntry != NULL && DirectoryEntry != NULL) {\r

-      for (DirCount = 0; DirCount < DirectoryEntry->Size; DirCount++, DebugEntry++) {\r
+      for (DirCount = 0; DirCount < DirectoryEntry->Size; DirCount += sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY), DebugEntry++) {\r

         if (DebugEntry->Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {\r
           if (DebugEntry->SizeOfData > 0) {\r
             CodeViewEntryPointer = (VOID *) ((UINTN) DebugEntry->RVA + (UINTN) ImageAddress + (UINTN)TEImageAdjust);\r
         if (DebugEntry->Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {\r
           if (DebugEntry->SizeOfData > 0) {\r
             CodeViewEntryPointer = (VOID *) ((UINTN) DebugEntry->RVA + (UINTN) ImageAddress + (UINTN)TEImageAdjust);\r

diff --git a/MdePkg/Include/Common/Dependency.h b/MdePkg/Include/Common/Dependency.h
index d82cefd958d55f6255b5a4f31967fea51a01d64e..b38dcd5477c69262a5e02d9cede93ccf5d0bdab2 100644 (file)
--- a/MdePkg/Include/Common/Dependency.h
+++ b/MdePkg/Include/Common/Dependency.h
@@ -12,6 +12,9 @@
 \r
   Module Name:  Dependency.h\r
 \r
 \r
   Module Name:  Dependency.h\r
 \r

+  @par Revision Reference:\r
+  These definitions are from DxeCis 0.91 spec.\r
+\r

 **/\r
 \r
 #ifndef __DEPENDENCY_H__\r
 **/\r
 \r
 #ifndef __DEPENDENCY_H__\r


@@ -34,16 +37,4 @@
 /// EFI_DEP_SOR          - If present, this must be the first opcode\r
 #define EFI_DEP_SOR           0x09\r
 \r
 /// EFI_DEP_SOR          - If present, this must be the first opcode\r
 #define EFI_DEP_SOR           0x09\r
 \r

-///\r
-/// EFI_DEP_REPLACE_TRUE - Used to dynamically patch the dependecy expression\r
-///                        to save time.  A EFI_DEP_PUSH is evauated one an\r
-///                        replaced with EFI_DEP_REPLACE_TRUE\r
-///\r
-#define EFI_DEP_REPLACE_TRUE  0xff\r
-\r
-///\r
-/// Define the initial size of the dependency expression evaluation stack\r
-///\r
-#define DEPEX_STACK_SIZE_INCREMENT  0x1000\r
-\r

 #endif\r
 #endif\r

diff --git a/MdePkg/Include/Common/FirmwareFileSystem.h b/MdePkg/Include/Common/FirmwareFileSystem.h
index 5678a95524502717aacddcbe6baaca0b7e7697a2..00ce8faff12a90a85a89ad5b5597539c73e29e67 100644 (file)
--- a/MdePkg/Include/Common/FirmwareFileSystem.h
+++ b/MdePkg/Include/Common/FirmwareFileSystem.h
@@ -60,13 +60,6 @@
                                  EFI_FILE_HEADER_INVALID \\r
           )\r
 \r
                                  EFI_FILE_HEADER_INVALID \\r
           )\r
 \r

-#define EFI_TEST_FFS_ATTRIBUTES_BIT(FvbAttributes, TestAttributes, Bit) \\r
-    ( \\r
-      (BOOLEAN) ( \\r
-          (FvbAttributes & EFI_FVB_ERASE_POLARITY) ? (((~TestAttributes) & Bit) == Bit) : ((TestAttributes & Bit) == Bit) \\r
-        ) \\r
-    )\r
-\r

 typedef UINT16  EFI_FFS_FILE_TAIL;\r
 \r
 ///\r
 typedef UINT16  EFI_FFS_FILE_TAIL;\r
 \r
 ///\r

diff --git a/MdePkg/Include/Common/FirmwareVolumeHeader.h b/MdePkg/Include/Common/FirmwareVolumeHeader.h
index 038dce6f7f1b7f19638697c0635991c9b199a146..c2bbddf3e98c2c84e3e9ec96a81595062c4922ae 100644 (file)
--- a/MdePkg/Include/Common/FirmwareVolumeHeader.h
+++ b/MdePkg/Include/Common/FirmwareVolumeHeader.h
@@ -70,6 +70,13 @@ typedef UINT32  EFI_FVB_ATTRIBUTES;
                               EFI_FVB_LOCK_CAP \\r
                               )\r
 \r
                               EFI_FVB_LOCK_CAP \\r
                               )\r
 \r

+#define EFI_TEST_FFS_ATTRIBUTES_BIT(FvbAttributes, TestAttributes, Bit) \\r
+    ( \\r
+      (BOOLEAN) ( \\r
+          (FvbAttributes & EFI_FVB_ERASE_POLARITY) ? (((~TestAttributes) & Bit) == Bit) : ((TestAttributes & Bit) == Bit) \\r
+        ) \\r
+    )\r
+\r

 #define EFI_FVB_STATUS    (EFI_FVB_READ_STATUS | EFI_FVB_WRITE_STATUS | EFI_FVB_LOCK_STATUS)\r
 \r
 ///\r
 #define EFI_FVB_STATUS    (EFI_FVB_READ_STATUS | EFI_FVB_WRITE_STATUS | EFI_FVB_LOCK_STATUS)\r
 \r
 ///\r

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index ad9c6277270642e04aca2fa1c0f78b796c1d0402..f16ea90ffa1d8e3abb585e132f33504c2aa432b3 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -299,7 +299,7 @@ PeCoffLoaderGetImageInfo (
       ImageContext->ImageAddress = Hdr.Pe32Plus->OptionalHeader.ImageBase;\r
     }\r
   } else {\r
       ImageContext->ImageAddress = Hdr.Pe32Plus->OptionalHeader.ImageBase;\r
     }\r
   } else {\r

-    ImageContext->ImageAddress = (PHYSICAL_ADDRESS)(Hdr.Te->ImageBase);\r
+    ImageContext->ImageAddress = (PHYSICAL_ADDRESS)(Hdr.Te->ImageBase + sizeof (EFI_TE_IMAGE_HEADER) - Hdr.Te->StrippedSize);\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -598,8 +598,11 @@ PeCoffLoaderRelocateImage (
   //\r
   if (ImageContext->DestinationAddress != 0) {\r
     BaseAddress = ImageContext->DestinationAddress;\r
   //\r
   if (ImageContext->DestinationAddress != 0) {\r
     BaseAddress = ImageContext->DestinationAddress;\r

-  } else {\r
+  } else if (!(ImageContext->IsTeImage)) {\r

     BaseAddress = ImageContext->ImageAddress;\r
     BaseAddress = ImageContext->ImageAddress;\r

+  } else {\r
+    Hdr.Te      = (EFI_TE_IMAGE_HEADER *)(UINTN)(ImageContext->ImageAddress);\r
+    BaseAddress = ImageContext->ImageAddress + sizeof (EFI_TE_IMAGE_HEADER) - Hdr.Te->StrippedSize; \r

   }\r
 \r
   if (!(ImageContext->IsTeImage)) {\r
   }\r
 \r
   if (!(ImageContext->IsTeImage)) {\r

diff --git a/Tools/CCode/Source/GenTEImage/GenTEImage.c b/Tools/CCode/Source/GenTEImage/GenTEImage.c
index 39b83326e2fb09f865a296ce50262001eeadd704..665498ac2c8099f9abc7f8128cce7d5c3c2d1533 100644 (file)
--- a/Tools/CCode/Source/GenTEImage/GenTEImage.c
+++ b/Tools/CCode/Source/GenTEImage/GenTEImage.c
@@ -272,6 +272,7 @@ Returns:
   //\r
   // Double-check the file to make sure it's what we expect it to be\r
   //\r
   //\r
   // Double-check the file to make sure it's what we expect it to be\r
   //\r

+\r

   if (CheckPE32File (InFileName, InFptr, &MachineType, &SubSystem) != STATUS_SUCCESS) {\r
     goto Finish;\r
   }\r
   if (CheckPE32File (InFileName, InFptr, &MachineType, &SubSystem) != STATUS_SUCCESS) {\r
     goto Finish;\r
   }\r


@@ -372,7 +373,7 @@ Returns:
 \r
     TEImageHeader.Subsystem   = (UINT8) OptionalHeader32.Subsystem;\r
     TEImageHeader.BaseOfCode  = OptionalHeader32.BaseOfCode;\r
 \r
     TEImageHeader.Subsystem   = (UINT8) OptionalHeader32.Subsystem;\r
     TEImageHeader.BaseOfCode  = OptionalHeader32.BaseOfCode;\r

-    TEImageHeader.ImageBase = (UINT64) (OptionalHeader32.ImageBase + TEImageHeader.StrippedSize - sizeof (EFI_TE_IMAGE_HEADER));\r
+    TEImageHeader.ImageBase   = (UINT64) (OptionalHeader32.ImageBase);\r

     if (OptionalHeader32.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {\r
       TEImageHeader.DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = OptionalHeader32.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;\r
       TEImageHeader.DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = OptionalHeader32.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;\r
     if (OptionalHeader32.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {\r
       TEImageHeader.DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = OptionalHeader32.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;\r
       TEImageHeader.DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = OptionalHeader32.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;\r


@@ -413,7 +414,7 @@ Returns:
 \r
     TEImageHeader.Subsystem   = (UINT8) OptionalHeader64.Subsystem;\r
     TEImageHeader.BaseOfCode  = OptionalHeader32.BaseOfCode;\r
 \r
     TEImageHeader.Subsystem   = (UINT8) OptionalHeader64.Subsystem;\r
     TEImageHeader.BaseOfCode  = OptionalHeader32.BaseOfCode;\r

-    TEImageHeader.ImageBase = (UINT64) (OptionalHeader64.ImageBase + TEImageHeader.StrippedSize - sizeof (EFI_TE_IMAGE_HEADER));\r
+    TEImageHeader.ImageBase = (UINT64) (OptionalHeader64.ImageBase);\r

     if (OptionalHeader64.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {\r
       TEImageHeader.DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = OptionalHeader64.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;\r
       TEImageHeader.DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = OptionalHeader64.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;\r
     if (OptionalHeader64.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {\r
       TEImageHeader.DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = OptionalHeader64.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;\r
       TEImageHeader.DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = OptionalHeader64.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;\r


@@ -620,6 +621,17 @@ Returns:
     goto Finish;\r
   }\r
 \r
     goto Finish;\r
   }\r
 \r

+  //\r
+  // Check FileAlginment and SectionAlignment match or not\r
+  // Because TeImage header doesn't record filealginment and sectionalignment info, \r
+  // TeImage is used for PEIM and PeiCore XIP module. \r
+  // So, check alignment match before generate TeImage to check.\r
+  //\r
+  if (OptionalHdr.SectionAlignment != OptionalHdr.FileAlignment) {\r
+    Error (NULL, 0, 0, FileName, "Section-Alignment and File-Alignment does not match");\r
+    goto Finish;\r
+  }\r
+\r

   *SubSystem = OptionalHdr.Subsystem;\r
   if (mOptions.Verbose) {\r
     fprintf (stdout, "  Got subsystem = 0x%X from image\n", (int) *SubSystem);\r
   *SubSystem = OptionalHdr.Subsystem;\r
   if (mOptions.Verbose) {\r
     fprintf (stdout, "  Got subsystem = 0x%X from image\n", (int) *SubSystem);\r

diff --git a/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c b/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c
index 9c25e1f4b8f1162f7b60ae5b85efb606eed657b9..f2053b7e382ea1bc2b106b1a10cdfd70ed4a42a7 100644 (file)
--- a/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c
+++ b/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c
@@ -260,7 +260,7 @@ Returns:
   if (!(ImageContext->IsTeImage)) {\r
     ImageContext->ImageAddress = PeHdr.OptionalHeader.ImageBase;\r
   } else {\r
   if (!(ImageContext->IsTeImage)) {\r
     ImageContext->ImageAddress = PeHdr.OptionalHeader.ImageBase;\r
   } else {\r

-    ImageContext->ImageAddress = (PHYSICAL_ADDRESS) (TeHdr.ImageBase);\r
+    ImageContext->ImageAddress = (PHYSICAL_ADDRESS) (TeHdr.ImageBase + sizeof (EFI_TE_IMAGE_HEADER) - TeHdr.StrippedSize);\r

   }\r
   //\r
   // Initialize the alternate destination address to 0 indicating that it\r
   }\r
   //\r
   // Initialize the alternate destination address to 0 indicating that it\r


@@ -345,12 +345,12 @@ Returns:
         SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);\r
       }\r
 \r
         SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);\r
       }\r
 \r

-      if (DebugDirectoryEntryFileOffset != 0) {\r
-        for (Index = 0; Index < DebugDirectoryEntry->Size; Index++) {\r
+      if (DebugDirectoryEntryFileOffset != 0) {    \r
+        for (Index = 0; Index < (DebugDirectoryEntry->Size); Index += Size) {\r

           //\r
           // Read next debug directory entry\r
           //\r
           //\r
           // Read next debug directory entry\r
           //\r

-          Size = sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);\r
+          Size = sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);    \r

           Status = ImageContext->ImageRead (\r
                                    ImageContext->Handle,\r
                                    DebugDirectoryEntryFileOffset,\r
           Status = ImageContext->ImageRead (\r
                                    ImageContext->Handle,\r
                                    DebugDirectoryEntryFileOffset,\r


@@ -363,7 +363,7 @@ Returns:
           }\r
 \r
           if (DebugEntry.Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {\r
           }\r
 \r
           if (DebugEntry.Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {\r

-            ImageContext->DebugDirectoryEntryRva = (UINT32) (DebugDirectoryEntryRva + Index * sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY));\r
+            ImageContext->DebugDirectoryEntryRva = (UINT32) (DebugDirectoryEntryRva + Index);\r

             if (DebugEntry.RVA == 0 && DebugEntry.FileOffset != 0) {\r
               ImageContext->ImageSize += DebugEntry.SizeOfData;\r
             }\r
             if (DebugEntry.RVA == 0 && DebugEntry.FileOffset != 0) {\r
               ImageContext->ImageSize += DebugEntry.SizeOfData;\r
             }\r


@@ -438,7 +438,7 @@ Returns:
     }\r
 \r
     if (DebugDirectoryEntryFileOffset != 0) {\r
     }\r
 \r
     if (DebugDirectoryEntryFileOffset != 0) {\r

-      for (Index = 0; Index < DebugDirectoryEntry->Size; Index++) {\r
+      for (Index = 0; Index < (DebugDirectoryEntry->Size); Index += Size) {\r

         //\r
         // Read next debug directory entry\r
         //\r
         //\r
         // Read next debug directory entry\r
         //\r


@@ -455,7 +455,7 @@ Returns:
         }\r
 \r
         if (DebugEntry.Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {\r
         }\r
 \r
         if (DebugEntry.Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {\r

-          ImageContext->DebugDirectoryEntryRva = (UINT32) (DebugDirectoryEntryRva + Index * sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY));\r
+          ImageContext->DebugDirectoryEntryRva = (UINT32) (DebugDirectoryEntryRva + Index);\r

           return RETURN_SUCCESS;\r
         }\r
       }\r
           return RETURN_SUCCESS;\r
         }\r
       }\r

diff --git a/Tools/CCode/Source/PeiRebase/PeiRebaseExe.c b/Tools/CCode/Source/PeiRebase/PeiRebaseExe.c
index c234ccffaaed3173a04d676418a0a07893638953..93acb635f5c2c217a7299a15a82b928c684bd8e1 100644 (file)
--- a/Tools/CCode/Source/PeiRebase/PeiRebaseExe.c
+++ b/Tools/CCode/Source/PeiRebase/PeiRebaseExe.c
@@ -279,6 +279,7 @@ Returns:
       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r

+\r

   //\r
   // Open the file containing the FV\r
   //\r
   //\r
   // Open the file containing the FV\r
   //\r


@@ -553,14 +554,18 @@ Returns:
   Version();\r
   \r
   printf (\r
   Version();\r
   \r
   printf (\r

-    "\nUsage: %s -I InputFileName -O OutputFileName -B BaseAddress\n",\r
+    "Usage: %s -I InputFileName -O OutputFileName -B BaseAddress [-F InputFvInfName]\n",\r

     UTILITY_NAME\r
     );\r
     UTILITY_NAME\r
     );\r

+  printf ("  [-D BootDriverBaseAddress] [-R RuntimeDriverBaseAddress]\n");\r

   printf ("  Where:\n");\r
   printf ("  Where:\n");\r

-  printf ("     InputFileName is the name of the EFI FV file to rebase.\n");\r
-  printf ("     OutputFileName is the desired output file name.\n");\r
-  printf ("     BaseAddress is the FV base address to rebase agains.\n");\r
-  printf ("  Argument pair may be in any order.\n");\r
+  printf ("      InputFileName is the name of the EFI FV file to rebase.\n");\r
+  printf ("      OutputFileName is the desired output file name.\n");\r
+  printf ("      BaseAddress is the rebase address for all drivers run in Flash.\n");\r
+  printf ("      InputFvInfName is the Fv.inf file that contains this FV base address to rebase against.\n");\r
+  printf ("      BootDriverBaseAddress is the rebase address for all boot drivers in this fv image.\n");\r
+  printf ("      RuntimeDriverBaseAddress is the rebase address for all runtime drivers in this fv image.\n");\r
+  printf ("  Argument pair may be in any order.\n\n");\r

 }\r
 \r
 EFI_STATUS\r
 }\r
 \r
 EFI_STATUS\r


@@ -596,27 +601,18 @@ Returns:
 {\r
   EFI_STATUS                            Status;\r
   PE_COFF_LOADER_IMAGE_CONTEXT          ImageContext;\r
 {\r
   EFI_STATUS                            Status;\r
   PE_COFF_LOADER_IMAGE_CONTEXT          ImageContext;\r

-  UINTN                                 MemoryImagePointer;\r
-  UINTN                                 MemoryImagePointerAligned;\r
-  EFI_PHYSICAL_ADDRESS                  ImageAddress;\r
-  UINT64                                ImageSize;\r
-  EFI_PHYSICAL_ADDRESS                  EntryPoint;\r
-  UINT32                                Pe32ImageSize;\r

   EFI_PHYSICAL_ADDRESS                  NewPe32BaseAddress;\r
   UINTN                                 Index;\r
   EFI_FILE_SECTION_POINTER              CurrentPe32Section;\r
   EFI_FFS_FILE_STATE                    SavedState;\r
   EFI_IMAGE_NT_HEADERS32                *PeHdr;\r
   EFI_PHYSICAL_ADDRESS                  NewPe32BaseAddress;\r
   UINTN                                 Index;\r
   EFI_FILE_SECTION_POINTER              CurrentPe32Section;\r
   EFI_FFS_FILE_STATE                    SavedState;\r
   EFI_IMAGE_NT_HEADERS32                *PeHdr;\r

-  EFI_IMAGE_NT_HEADERS64                *PePlusHdr;\r
-  UINT32                                *PeHdrSizeOfImage;\r
-  UINT32                                *PeHdrChecksum;\r

   EFI_TE_IMAGE_HEADER                   *TEImageHeader;\r
   EFI_TE_IMAGE_HEADER                   *TEImageHeader;\r

-  UINT8                                 *TEBuffer;\r
-  EFI_IMAGE_DOS_HEADER                  *DosHeader;\r

   UINT8                                 FileGuidString[80];\r
   UINT32                                TailSize;\r
   EFI_FFS_FILE_TAIL                     TailValue;\r
   EFI_PHYSICAL_ADDRESS                  *BaseToUpdate;\r
   UINT8                                 FileGuidString[80];\r
   UINT32                                TailSize;\r
   EFI_FFS_FILE_TAIL                     TailValue;\r
   EFI_PHYSICAL_ADDRESS                  *BaseToUpdate;\r

+  EFI_IMAGE_DEBUG_DIRECTORY_ENTRY       *DebugEntry;\r
+  \r

 \r
   //\r
   // Verify input parameters\r
 \r
   //\r
   // Verify input parameters\r


@@ -668,7 +664,6 @@ Returns:
       break;\r
     }\r
 \r
       break;\r
     }\r
 \r

-\r

     //\r
     // Initialize context\r
     //\r
     //\r
     // Initialize context\r
     //\r


@@ -681,6 +676,50 @@ Returns:
       return Status;\r
     }\r
 \r
       return Status;\r
     }\r
 \r

+    //\r
+    // Don't Load PeImage, only to relocate current image.\r
+    //\r
+    ImageContext.ImageAddress = (UINTN) CurrentPe32Section.Pe32Section + sizeof (EFI_PE32_SECTION);\r
+\r
+    //\r
+    // Check if section-alignment and file-alignment match or not\r
+    //\r
+    PeHdr = (EFI_IMAGE_NT_HEADERS *)((UINTN)ImageContext.ImageAddress + ImageContext.PeCoffHeaderOffset);\r
+    if (PeHdr->OptionalHeader.SectionAlignment != PeHdr->OptionalHeader.FileAlignment) {\r
+      //\r
+      // Nor XIP module can be ignored. \r
+      //\r
+      if ((Flags & 1) == 0) {\r
+        continue;\r
+      }\r
+      Error (NULL, 0, 0, "Section-Alignment and File-Alignment does not match", FileGuidString);\r
+      return EFI_ABORTED;\r
+    } \r
+\r
+    //\r
+    // Update CodeView and PdbPointer in ImageContext\r
+    //\r
+    DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(\r
+                    ImageContext.ImageAddress +\r
+                    ImageContext.DebugDirectoryEntryRva\r
+                    );\r
+    ImageContext.CodeView = (VOID *)(UINTN)( \r
+                              ImageContext.ImageAddress + \r
+                              DebugEntry->RVA\r
+                              );\r
+    switch (*(UINT32 *) ImageContext.CodeView) {\r
+    case CODEVIEW_SIGNATURE_NB10:\r
+      ImageContext.PdbPointer = (CHAR8 *) ImageContext.CodeView + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY);\r
+      break;\r
+\r
+    case CODEVIEW_SIGNATURE_RSDS:\r
+      ImageContext.PdbPointer = (CHAR8 *) ImageContext.CodeView + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY);\r
+      break;\r
+\r
+    default:\r
+      break;\r
+    }\r
+\r

     //\r
     // Calculate the PE32 base address, based on file type\r
     //\r
     //\r
     // Calculate the PE32 base address, based on file type\r
     //\r


@@ -697,19 +736,12 @@ Returns:
         }\r
 \r
         NewPe32BaseAddress =\r
         }\r
 \r
         NewPe32BaseAddress =\r

-          XipBase +\r
-          (UINTN)CurrentPe32Section.Pe32Section +\r
-          sizeof (EFI_COMMON_SECTION_HEADER) -\r
-          (UINTN)FfsFile;\r
+          XipBase + (UINTN)ImageContext.ImageAddress - (UINTN)FfsFile;\r

         BaseToUpdate = &XipBase;\r
         break;\r
 \r
       case EFI_FV_FILETYPE_DRIVER:\r
         BaseToUpdate = &XipBase;\r
         break;\r
 \r
       case EFI_FV_FILETYPE_DRIVER:\r

-        PeHdr = (EFI_IMAGE_NT_HEADERS32*)(\r
-          (UINTN)CurrentPe32Section.Pe32Section +\r
-          sizeof (EFI_COMMON_SECTION_HEADER) +\r
-          ImageContext.PeCoffHeaderOffset\r
-          );\r
+        PeHdr = (EFI_IMAGE_NT_HEADERS32*)(ImageContext.ImageAddress + ImageContext.PeCoffHeaderOffset);\r

         switch (PeHdr->OptionalHeader.Subsystem) {\r
           case EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:\r
             if ((Flags & 4) == 0) {\r
         switch (PeHdr->OptionalHeader.Subsystem) {\r
           case EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:\r
             if ((Flags & 4) == 0) {\r


@@ -759,72 +791,13 @@ Returns:
         return EFI_SUCCESS;\r
     }\r
 \r
         return EFI_SUCCESS;\r
     }\r
 \r

-    //\r
-    // Allocate a buffer for the image to be loaded into.\r
-    //\r
-    Pe32ImageSize       = GetLength (CurrentPe32Section.Pe32Section->CommonHeader.Size) - sizeof (EFI_PE32_SECTION);\r
-    MemoryImagePointer  = (UINTN) (malloc (Pe32ImageSize + 0x100000));\r
-    if (MemoryImagePointer == 0) {\r
-      Error (NULL, 0, 0, "memory allocation failure", NULL);\r
-      return EFI_OUT_OF_RESOURCES;\r
-    }\r
-    memset ((void *) MemoryImagePointer, 0, Pe32ImageSize + 0x100000);\r
-    MemoryImagePointerAligned = (MemoryImagePointer + 0x0FFFF) & (-1 << 16);\r
-\r
-    ImageContext.ImageAddress = MemoryImagePointerAligned;\r
-\r
-    Status                    = PeCoffLoaderLoadImage (&ImageContext);\r
-    if (EFI_ERROR (Status)) {\r
-      Error (NULL, 0, 0, "LoadImage() call failed on rebase", FileGuidString);\r
-      free ((VOID *) MemoryImagePointer);\r
-      return Status;\r
-    }\r
-    \r
-    //\r
-    // Check if section-alignment and file-alignment match or not\r
-    //\r
-    if (!(ImageContext.IsTeImage)) {\r
-      PeHdr = (EFI_IMAGE_NT_HEADERS *)((UINTN)ImageContext.ImageAddress + \r
-                                              ImageContext.PeCoffHeaderOffset);\r
-      if (PeHdr->OptionalHeader.SectionAlignment != PeHdr->OptionalHeader.FileAlignment) {\r
-        Error (NULL, 0, 0, "Section-Alignment and File-Alignment does not match", FileGuidString);\r
-        free ((VOID *) MemoryImagePointer);\r
-        return EFI_ABORTED;\r
-      }\r
-    }\r
-    else {\r
-      //\r
-      // BUGBUG: TE Image Header lack section-alignment and file-alignment info\r
-      //\r
-    }\r
-\r

     ImageContext.DestinationAddress = NewPe32BaseAddress;\r
     Status                          = PeCoffLoaderRelocateImage (&ImageContext);\r
     if (EFI_ERROR (Status)) {\r
       Error (NULL, 0, 0, "RelocateImage() call failed on rebase", FileGuidString);\r
     ImageContext.DestinationAddress = NewPe32BaseAddress;\r
     Status                          = PeCoffLoaderRelocateImage (&ImageContext);\r
     if (EFI_ERROR (Status)) {\r
       Error (NULL, 0, 0, "RelocateImage() call failed on rebase", FileGuidString);\r

-      free ((VOID *) MemoryImagePointer);\r

       return Status;\r
     }\r
 \r
       return Status;\r
     }\r
 \r

-    ImageAddress  = ImageContext.ImageAddress;\r
-    ImageSize     = ImageContext.ImageSize;\r
-    EntryPoint    = ImageContext.EntryPoint;\r
-\r
-    if (ImageSize > Pe32ImageSize) {\r
-      Error (\r
-        NULL,\r
-        0,\r
-        0,\r
-        "rebased image is larger than original PE32 image",\r
-        "0x%X > 0x%X, file %s",\r
-        ImageSize,\r
-        Pe32ImageSize,\r
-        FileGuidString\r
-        );\r
-      free ((VOID *) MemoryImagePointer);\r
-      return EFI_ABORTED;\r
-    }\r
-\r

     //\r
     // Update BASE address\r
     //\r
     //\r
     // Update BASE address\r
     //\r


@@ -837,47 +810,6 @@ Returns:
       );\r
     *BaseToUpdate += EFI_SIZE_TO_PAGES (ImageContext.ImageSize) * EFI_PAGE_SIZE;\r
 \r
       );\r
     *BaseToUpdate += EFI_SIZE_TO_PAGES (ImageContext.ImageSize) * EFI_PAGE_SIZE;\r
 \r

-    //\r
-    // Since we may have updated the Codeview RVA, we need to insure the PE\r
-    // header indicates the image is large enough to contain the Codeview data\r
-    // so it will be loaded properly later if the PEIM is reloaded into memory...\r
-    //\r
-    PeHdr = (VOID *) ((UINTN) ImageAddress + ImageContext.PeCoffHeaderOffset);\r
-    PePlusHdr = (EFI_IMAGE_NT_HEADERS64*)PeHdr;\r
-    if (PeHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_IA32) {\r
-      PeHdrSizeOfImage  = (UINT32 *) (&(PeHdr->OptionalHeader).SizeOfImage);\r
-      PeHdrChecksum     = (UINT32 *) (&(PeHdr->OptionalHeader).CheckSum);\r
-    } else if (PeHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_IA64) {\r
-      PeHdrSizeOfImage  = (UINT32 *) (&(PePlusHdr->OptionalHeader).SizeOfImage);\r
-      PeHdrChecksum     = (UINT32 *) (&(PePlusHdr->OptionalHeader).CheckSum);\r
-    } else if (PeHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_X64) {\r
-      PeHdrSizeOfImage  = (UINT32 *) (&(PePlusHdr->OptionalHeader).SizeOfImage);\r
-      PeHdrChecksum     = (UINT32 *) (&(PePlusHdr->OptionalHeader).CheckSum);\r
-    } else {\r
-      Error (\r
-        NULL,\r
-        0,\r
-        0,\r
-        "unknown machine type in PE32 image",\r
-        "machine type=0x%X, file=%s",\r
-        (UINT32) PeHdr->FileHeader.Machine,\r
-        FileGuidString\r
-        );\r
-      free ((VOID *) MemoryImagePointer);\r
-      return EFI_ABORTED;\r
-    }\r
-\r
-    if (*PeHdrSizeOfImage != ImageContext.ImageSize) {\r
-      *PeHdrSizeOfImage = (UINT32) ImageContext.ImageSize;\r
-      if (*PeHdrChecksum) {\r
-        *PeHdrChecksum = 0;\r
-      }\r
-    }\r
-\r
-    memcpy (CurrentPe32Section.Pe32Section + 1, (VOID *) MemoryImagePointerAligned, (UINT32) ImageSize);\r
-\r
-    free ((VOID *) MemoryImagePointer);\r
-\r

     //\r
     // Now update file checksum\r
     //\r
     //\r
     // Now update file checksum\r
     //\r


@@ -923,7 +855,7 @@ Returns:
     //\r
     return EFI_SUCCESS;\r
   }\r
     //\r
     return EFI_SUCCESS;\r
   }\r

-\r
+  \r

   //\r
   // Now process TE sections\r
   //\r
   //\r
   // Now process TE sections\r
   //\r


@@ -939,235 +871,65 @@ Returns:
     //\r
     TEImageHeader = (EFI_TE_IMAGE_HEADER *) ((UINT8 *) CurrentPe32Section.Pe32Section + sizeof (EFI_COMMON_SECTION_HEADER));\r
 \r
     //\r
     TEImageHeader = (EFI_TE_IMAGE_HEADER *) ((UINT8 *) CurrentPe32Section.Pe32Section + sizeof (EFI_COMMON_SECTION_HEADER));\r
 \r

-    NewPe32BaseAddress = ((UINT32) XipBase) +\r
-      (\r
-        (UINTN) CurrentPe32Section.Pe32Section +\r
-        sizeof (EFI_COMMON_SECTION_HEADER) +\r
-        sizeof (EFI_TE_IMAGE_HEADER) -\r
-        TEImageHeader->StrippedSize -\r
-        (UINTN) FfsFile\r
-      );\r
-\r
-    //\r
-    // Allocate a buffer to unshrink the image into.\r
-    //\r
-    Pe32ImageSize = GetLength (CurrentPe32Section.Pe32Section->CommonHeader.Size) - sizeof (EFI_PE32_SECTION) -\r
-    sizeof (EFI_TE_IMAGE_HEADER);\r
-    Pe32ImageSize += TEImageHeader->StrippedSize;\r
-    TEBuffer = (UINT8 *) malloc (Pe32ImageSize);\r
-    if (TEBuffer == NULL) {\r
-      Error (NULL, 0, 0, "failed to allocate memory", NULL);\r
-      return EFI_OUT_OF_RESOURCES;\r
-    }\r
-    //\r
-    // Expand the image into our buffer and fill in critical fields in the DOS header\r
-    // Fill in fields required by the loader.\r
-    // At offset 0x3C is the offset to the PE signature. We'll put it immediately following the offset value\r
-    // itself.\r
-    //\r
-    memset (TEBuffer, 0, Pe32ImageSize);\r
-    DosHeader = (EFI_IMAGE_DOS_HEADER *) TEBuffer;\r
-    DosHeader->e_magic = EFI_IMAGE_DOS_SIGNATURE;\r
-    *(UINT32 *) (TEBuffer + 0x3C) = 0x40;\r
-    PeHdr = (EFI_IMAGE_NT_HEADERS *) (TEBuffer + 0x40);\r
-    PePlusHdr = (EFI_IMAGE_NT_HEADERS64*)PeHdr;\r
-    PeHdr->Signature = EFI_IMAGE_NT_SIGNATURE;\r
-    PeHdr->FileHeader.Machine = TEImageHeader->Machine;\r
-    PeHdr->FileHeader.NumberOfSections = TEImageHeader->NumberOfSections;\r
-\r

     //\r
     //\r

-    // Say the size of the optional header is the total we stripped off less the size of a PE file header and PE signature and\r
-    // the 0x40 bytes for our DOS header.\r
-    //\r
-    PeHdr->FileHeader.SizeOfOptionalHeader = (UINT16) (TEImageHeader->StrippedSize - 0x40 - sizeof (UINT32) - sizeof (EFI_IMAGE_FILE_HEADER));\r
-    if (TEImageHeader->Machine == EFI_IMAGE_MACHINE_IA32) {\r
-      PeHdr->OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;\r
-    } else if (TEImageHeader->Machine == EFI_IMAGE_MACHINE_IA64) {\r
-      PePlusHdr->OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;\r
-    } else if (TEImageHeader->Machine == EFI_IMAGE_MACHINE_X64) {\r
-      PePlusHdr->OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;\r
-    } else {\r
-      Error (\r
-        NULL,\r
-        0,\r
-        0,\r
-        "unknown machine type in TE image",\r
-        "machine type=0x%X, file=%s",\r
-        (UINT32) TEImageHeader->Machine,\r
-        FileGuidString\r
-        );\r
-      free (TEBuffer);\r
-      return EFI_ABORTED;\r
-    }\r
-\r
-    if (PeHdr->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {\r
-      PeHdr->OptionalHeader.ImageBase     = (UINTN) (TEImageHeader->ImageBase - TEImageHeader->StrippedSize + sizeof (EFI_TE_IMAGE_HEADER));\r
-      PeHdr->OptionalHeader.SizeOfImage   = Pe32ImageSize;\r
-      PeHdr->OptionalHeader.Subsystem     = TEImageHeader->Subsystem;\r
-      PeHdr->OptionalHeader.SizeOfHeaders = TEImageHeader->StrippedSize + TEImageHeader->NumberOfSections *\r
-                                            sizeof (EFI_IMAGE_SECTION_HEADER) - 12;\r
-\r
-      //\r
-      // Set NumberOfRvaAndSizes in the optional header to what we had available in the original image\r
-      //\r
-      if ((TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress != 0) ||\r
-          (TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size != 0)\r
-          ) {\r
-        PeHdr->OptionalHeader.NumberOfRvaAndSizes = EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC + 1;\r
-        PeHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;\r
-        PeHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;\r
-      }\r
-\r
-      if ((TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress != 0) ||\r
-          (TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].Size != 0)\r
-          ) {\r
-        PeHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress = TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;\r
-        PeHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].Size = TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].Size;\r
-        if (PeHdr->OptionalHeader.NumberOfRvaAndSizes < EFI_IMAGE_DIRECTORY_ENTRY_DEBUG + 1) {\r
-          PeHdr->OptionalHeader.NumberOfRvaAndSizes = EFI_IMAGE_DIRECTORY_ENTRY_DEBUG + 1;\r
-        }\r
-      }\r
-      //\r
-      // NOTE: These values are defaults, and should be verified to be correct in the GenTE utility\r
-      //\r
-      PeHdr->OptionalHeader.SectionAlignment = 0x10;\r
-    } else {\r
-      PePlusHdr->OptionalHeader.ImageBase     = (UINTN) (TEImageHeader->ImageBase - TEImageHeader->StrippedSize + sizeof (EFI_TE_IMAGE_HEADER));\r
-      PePlusHdr->OptionalHeader.SizeOfImage   = Pe32ImageSize;\r
-      PePlusHdr->OptionalHeader.Subsystem     = TEImageHeader->Subsystem;\r
-      PePlusHdr->OptionalHeader.SizeOfHeaders = TEImageHeader->StrippedSize + TEImageHeader->NumberOfSections *\r
-                                                sizeof (EFI_IMAGE_SECTION_HEADER) - 12;\r
-\r
-      //\r
-      // Set NumberOfRvaAndSizes in the optional header to what we had available in the original image\r
-      //\r
-      if ((TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress != 0) ||\r
-          (TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size != 0)\r
-          ) {\r
-        PePlusHdr->OptionalHeader.NumberOfRvaAndSizes = EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC + 1;\r
-        PePlusHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;\r
-        PePlusHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;\r
-      }\r
-\r
-      if ((TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress != 0) ||\r
-          (TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].Size != 0)\r
-          ) {\r
-        PePlusHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress = TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;\r
-        PePlusHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].Size = TEImageHeader->DataDirectory[EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG].Size;\r
-        if (PePlusHdr->OptionalHeader.NumberOfRvaAndSizes < EFI_IMAGE_DIRECTORY_ENTRY_DEBUG + 1) {\r
-          PePlusHdr->OptionalHeader.NumberOfRvaAndSizes = EFI_IMAGE_DIRECTORY_ENTRY_DEBUG + 1;\r
-        }\r
-      }\r
-      //\r
-      // NOTE: These values are defaults, and should be verified to be correct in the GenTE utility\r
-      //\r
-      PePlusHdr->OptionalHeader.SectionAlignment = 0x10;\r
-    }\r
-\r
-    //\r
-    // Copy the rest of the image to its original offset\r
-    //\r
-    memcpy (\r
-      TEBuffer + TEImageHeader->StrippedSize,\r
-      (UINT8 *) CurrentPe32Section.Pe32Section + sizeof (EFI_PE32_SECTION) + sizeof (EFI_TE_IMAGE_HEADER),\r
-      GetLength (CurrentPe32Section.Pe32Section->CommonHeader.Size) - sizeof (EFI_PE32_SECTION) -\r
-      sizeof (EFI_TE_IMAGE_HEADER)\r
-      );\r
-\r
-    //\r
-    // Initialize context\r
+    // Initialize context, load image info.\r

     //\r
     memset (&ImageContext, 0, sizeof (ImageContext));\r
     //\r
     memset (&ImageContext, 0, sizeof (ImageContext));\r

-    ImageContext.Handle     = (VOID *) TEBuffer;\r
+    ImageContext.Handle     = (VOID *) TEImageHeader;\r

     ImageContext.ImageRead  = (PE_COFF_LOADER_READ_FILE) FfsRebaseImageRead;\r
 \r
     Status                  = PeCoffLoaderGetImageInfo (&ImageContext);\r
 \r
     if (EFI_ERROR (Status)) {\r
       Error (NULL, 0, 0, "GetImageInfo() call failed on rebase of TE image", FileGuidString);\r
     ImageContext.ImageRead  = (PE_COFF_LOADER_READ_FILE) FfsRebaseImageRead;\r
 \r
     Status                  = PeCoffLoaderGetImageInfo (&ImageContext);\r
 \r
     if (EFI_ERROR (Status)) {\r
       Error (NULL, 0, 0, "GetImageInfo() call failed on rebase of TE image", FileGuidString);\r

-      free (TEBuffer);\r

       return Status;\r
     }\r
     //\r
       return Status;\r
     }\r
     //\r

-    // Allocate a buffer for the image to be loaded into.\r
+    // Don't reload TeImage\r

     //\r
     //\r

-    MemoryImagePointer = (UINTN) (malloc (Pe32ImageSize + 0x100000));\r
-    if (MemoryImagePointer == 0) {\r
-      Error (NULL, 0, 0, "memory allocation error on rebase of TE image", FileGuidString);\r
-      free (TEBuffer);\r
-      return EFI_OUT_OF_RESOURCES;\r
-    }\r
-    memset ((void *) MemoryImagePointer, 0, Pe32ImageSize + 0x100000);\r
-    MemoryImagePointerAligned = (MemoryImagePointer + 0x0FFFF) & (-1 << 16);\r
-    \r
+    ImageContext.ImageAddress = (UINTN) TEImageHeader;\r

 \r
 \r

-    ImageContext.ImageAddress = MemoryImagePointerAligned;\r
-    Status                    = PeCoffLoaderLoadImage (&ImageContext);\r
-    if (EFI_ERROR (Status)) {\r
-      Error (NULL, 0, 0, "LoadImage() call failed on rebase of TE image", FileGuidString);\r
-      free (TEBuffer);\r
-      free ((VOID *) MemoryImagePointer);\r
-      return Status;\r
+    //\r
+    // Update CodeView and PdbPointer in ImageContext\r
+    //\r
+    DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(\r
+                   ImageContext.ImageAddress +\r
+                   ImageContext.DebugDirectoryEntryRva +\r
+                   sizeof(EFI_TE_IMAGE_HEADER) -\r
+                   TEImageHeader->StrippedSize\r
+                   );\r
+\r
+    ImageContext.CodeView = (VOID *)(UINTN)(\r
+                              ImageContext.ImageAddress +\r
+                              DebugEntry->RVA +\r
+                              sizeof(EFI_TE_IMAGE_HEADER) -\r
+                              TEImageHeader->StrippedSize\r
+                              );\r
+\r
+    switch (*(UINT32 *) ImageContext.CodeView) {\r
+    case CODEVIEW_SIGNATURE_NB10:\r
+      ImageContext.PdbPointer = (CHAR8 *) ImageContext.CodeView + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY);\r
+      break;\r
+\r
+    case CODEVIEW_SIGNATURE_RSDS:\r
+      ImageContext.PdbPointer = (CHAR8 *) ImageContext.CodeView + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY);\r
+      break;\r
+\r
+    default:\r
+      break;\r

     }\r
 \r
     }\r
 \r

-    ImageContext.DestinationAddress = NewPe32BaseAddress;\r
+    //\r
+    // Reloacate TeImage\r
+    // \r
+    ImageContext.DestinationAddress = XipBase + (UINTN) TEImageHeader + sizeof (EFI_TE_IMAGE_HEADER) \\r
+                                      - TEImageHeader->StrippedSize - (UINTN) FfsFile;\r

     Status                          = PeCoffLoaderRelocateImage (&ImageContext);\r
     if (EFI_ERROR (Status)) {\r
       Error (NULL, 0, 0, "RelocateImage() call failed on rebase of TE image", FileGuidString);\r
     Status                          = PeCoffLoaderRelocateImage (&ImageContext);\r
     if (EFI_ERROR (Status)) {\r
       Error (NULL, 0, 0, "RelocateImage() call failed on rebase of TE image", FileGuidString);\r

-      free ((VOID *) MemoryImagePointer);\r
-      free (TEBuffer);\r

       return Status;\r
     }\r
 \r
       return Status;\r
     }\r
 \r

-    ImageAddress  = ImageContext.ImageAddress;\r
-    ImageSize     = ImageContext.ImageSize;\r
-    EntryPoint    = ImageContext.EntryPoint;\r
-\r
-    //\r
-    // Since we may have updated the Codeview RVA, we need to insure the PE\r
-    // header indicates the image is large enough to contain the Codeview data\r
-    // so it will be loaded properly later if the PEIM is reloaded into memory...\r
-    //\r
-    PeHdr = (VOID *) ((UINTN) ImageAddress + ImageContext.PeCoffHeaderOffset);\r
-    PePlusHdr = (EFI_IMAGE_NT_HEADERS64*)PeHdr;\r
-    if (PeHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_IA32) {\r
-      PeHdrSizeOfImage  = (UINT32 *) (&(PeHdr->OptionalHeader).SizeOfImage);\r
-      PeHdrChecksum     = (UINT32 *) (&(PeHdr->OptionalHeader).CheckSum);\r
-    } else if (PeHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_IA64) {\r
-      PeHdrSizeOfImage  = (UINT32 *) (&(PePlusHdr->OptionalHeader).SizeOfImage);\r
-      PeHdrChecksum     = (UINT32 *) (&(PePlusHdr->OptionalHeader).CheckSum);\r
-    } else if (PeHdr->FileHeader.Machine == EFI_IMAGE_MACHINE_X64) {\r
-      PeHdrSizeOfImage  = (UINT32 *) (&(PePlusHdr->OptionalHeader).SizeOfImage);\r
-      PeHdrChecksum     = (UINT32 *) (&(PePlusHdr->OptionalHeader).CheckSum);\r
-    } else {\r
-      Error (\r
-        NULL,\r
-        0,\r
-        0,\r
-        "unknown machine type in TE image",\r
-        "machine type=0x%X, file=%s",\r
-        (UINT32) PeHdr->FileHeader.Machine,\r
-        FileGuidString\r
-        );\r
-      free ((VOID *) MemoryImagePointer);\r
-      free (TEBuffer);\r
-      return EFI_ABORTED;\r
-    }\r
-\r
-    if (*PeHdrSizeOfImage != ImageContext.ImageSize) {\r
-      *PeHdrSizeOfImage = (UINT32) ImageContext.ImageSize;\r
-      if (*PeHdrChecksum) {\r
-        *PeHdrChecksum = 0;\r
-      }\r
-    }\r
-\r
-    TEImageHeader->ImageBase = (UINT64) (NewPe32BaseAddress + TEImageHeader->StrippedSize - sizeof (EFI_TE_IMAGE_HEADER));\r
-    memcpy (\r
-      (UINT8 *) (CurrentPe32Section.Pe32Section + 1) + sizeof (EFI_TE_IMAGE_HEADER),\r
-      (VOID *) ((UINT8 *) MemoryImagePointerAligned + TEImageHeader->StrippedSize),\r
-      GetLength (CurrentPe32Section.Pe32Section->CommonHeader.Size) - sizeof (EFI_PE32_SECTION) -\r
-      sizeof (EFI_TE_IMAGE_HEADER)\r
-      );\r

     if (FfsFile->Attributes & FFS_ATTRIB_TAIL_PRESENT) {\r
       TailSize = sizeof (EFI_FFS_FILE_TAIL);\r
     } else {\r
     if (FfsFile->Attributes & FFS_ATTRIB_TAIL_PRESENT) {\r
       TailSize = sizeof (EFI_FFS_FILE_TAIL);\r
     } else {\r


@@ -1206,14 +968,8 @@ Returns:
       ImageContext.DestinationAddress,\r
       ImageContext.PdbPointer == NULL ? "*" : ImageContext.PdbPointer\r
       );\r
       ImageContext.DestinationAddress,\r
       ImageContext.PdbPointer == NULL ? "*" : ImageContext.PdbPointer\r
       );\r

-\r
-    //\r
-    // Free buffers\r
-    //\r
-    free ((VOID *) MemoryImagePointer);\r
-    free (TEBuffer);\r

   }\r
   }\r

-\r
+ \r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r