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