From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 15 Jan 2007 11:24:23 +0000 (+0000)
Subject: Correct TeImage Header based on PeiCis spec.
X-Git-Tag: edk2-stable201903~23627
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=582c7220f83e9e37778cd2ef5a34cd79d1494538;hp=5b664244561a6d697d1814e7c525cc6013863caf

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 f16ea90ffa..cce9a82520 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -299,7 +299,7 @@ PeCoffLoaderGetImageInfo (
       ImageContext->ImageAddress = Hdr.Pe32Plus->OptionalHeader.ImageBase;
     }
   } else {
-    ImageContext->ImageAddress = (PHYSICAL_ADDRESS)(Hdr.Te->ImageBase + sizeof (EFI_TE_IMAGE_HEADER) - Hdr.Te->StrippedSize);
+    ImageContext->ImageAddress = (PHYSICAL_ADDRESS)(Hdr.Te->ImageBase + Hdr.Te->StrippedSize - sizeof (EFI_TE_IMAGE_HEADER));
   }
 
   //
diff --git a/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c b/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c
index f2053b7e38..72df90f389 100644
--- a/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c
+++ b/Tools/CCode/Source/PeCoffLoader/BasePeCoff.c
@@ -260,7 +260,7 @@ Returns:
   if (!(ImageContext->IsTeImage)) {
     ImageContext->ImageAddress = PeHdr.OptionalHeader.ImageBase;
   } else {
-    ImageContext->ImageAddress = (PHYSICAL_ADDRESS) (TeHdr.ImageBase + sizeof (EFI_TE_IMAGE_HEADER) - TeHdr.StrippedSize);
+    ImageContext->ImageAddress = (PHYSICAL_ADDRESS) (TeHdr.ImageBase + TeHdr.StrippedSize - sizeof (EFI_TE_IMAGE_HEADER));
   }
   //
   // Initialize the alternate destination address to 0 indicating that it