From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 4 Apr 2007 05:57:31 +0000 (+0000)
Subject: Fix the unalignment issue for RODATA section when converting ELF image to PE image.
X-Git-Tag: edk2-stable201903~23366
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=189985640da8be75d1c4ca46690e8e2b8f38f7b1;hp=265bfe7cd4afbaae1f5af255daedf8b1c77d6a78

Fix the unalignment issue for RODATA section when converting ELF image to PE image.

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

diff --git a/Tools/CCode/Source/FwImage/fwimage.c b/Tools/CCode/Source/FwImage/fwimage.c
index beddd8ee08..a4ae10c4c2 100644
--- a/Tools/CCode/Source/FwImage/fwimage.c
+++ b/Tools/CCode/Source/FwImage/fwimage.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
+Copyright (c) 2004 - 2007, Intel Corporation                                                         
 All rights reserved. This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -240,7 +240,7 @@ INTN
 CheckElfHeader(
   VOID
   )
-{
+{
   //
   // Note: Magic has already been tested.
   //
@@ -254,11 +254,15 @@ CheckElfHeader(
     return 0;
   if (Ehdr->e_version != EV_CURRENT)
     return 0;
-  
+
+  //
+  // Find the section header table
+  // 
   ShdrBase = (Elf_Shdr *)((UINT8 *)Ehdr + Ehdr->e_shoff);
 
-  CoffSectionsOffset = (UINT32 *)malloc(Ehdr->e_shnum * sizeof (UINT32));
-  memset(CoffSectionsOffset, 0, Ehdr->e_shnum * sizeof(UINT32));
+  CoffSectionsOffset = (UINT32 *)malloc(Ehdr->e_shnum * sizeof (UINT32));
+
+  memset(CoffSectionsOffset, 0, Ehdr->e_shnum * sizeof(UINT32));
   return 1;
 }
 
@@ -269,7 +273,7 @@ IsTextShdr(
 {
   return (Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == SHF_ALLOC;
 }
-
+
 int
 IsDataShdr(
   Elf_Shdr *Shdr
@@ -331,18 +335,22 @@ ScanSections(
   TextOffset = CoffOffset;
   for (i = 0; i < Ehdr->e_shnum; i++) {
     Elf_Shdr *shdr = GetShdrByIndex(i);
-    if (IsTextShdr(shdr)) {
+    if (IsTextShdr(shdr)) {
+      //
+      // Align the coff offset
+      // 
+      CoffOffset = (CoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1);
       /* Relocate entry.  */
-      if (Ehdr->e_entry >= shdr->sh_addr
-	  && Ehdr->e_entry < shdr->sh_addr + shdr->sh_size) {
-	CoffEntry = CoffOffset + Ehdr->e_entry - shdr->sh_addr;
+      if ((Ehdr->e_entry >= shdr->sh_addr) && 
+          (Ehdr->e_entry < shdr->sh_addr + shdr->sh_size)) {
+        CoffEntry = CoffOffset + Ehdr->e_entry - shdr->sh_addr;
       }
-      CoffSectionsOffset[i] = CoffOffset;
+      CoffSectionsOffset[i] = CoffOffset;
       CoffOffset += shdr->sh_size;
-    }
-  }
+    }
+  }
   CoffOffset = CoffAlign(CoffOffset);
-		       
+
   //
   //  Then data sections.
   //