Correct TeImage Header based on PeiCis spec.

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

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index f16ea90ffa1d8e3abb585e132f33504c2aa432b3..cce9a825205249d52ca0e56c78b5c62187245282 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 + sizeof (EFI_TE_IMAGE_HEADER) - Hdr.Te->StrippedSize);\r
+    ImageContext->ImageAddress = (PHYSICAL_ADDRESS)(Hdr.Te->ImageBase + Hdr.Te->StrippedSize - sizeof (EFI_TE_IMAGE_HEADER));\r

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

diff --git a/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c b/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c
index f2053b7e382ea1bc2b106b1a10cdfd70ed4a42a7..72df90f389be21ec50ec48dfea3ad45fd645b869 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 + sizeof (EFI_TE_IMAGE_HEADER) - TeHdr.StrippedSize);\r
+    ImageContext->ImageAddress = (PHYSICAL_ADDRESS) (TeHdr.ImageBase + TeHdr.StrippedSize - sizeof (EFI_TE_IMAGE_HEADER));\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