Sync EDKII BaseTools to BaseTools project r1971

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

1 files changed, 29 insertions, 911 deletions

diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/GenFw.c
index ee02f85120..e41fe6e82b 100644
--- a/BaseTools/Source/C/GenFw/GenFw.c
+++ b/BaseTools/Source/C/GenFw/GenFw.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2010, Intel Corporation

-All rights reserved. This program and the accompanying materials

+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+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

 http://opensource.org/licenses/bsd-license.php

@@ -51,10 +51,7 @@ Abstract:
 #include "ParseInf.h"

 #include "EfiUtilityMsgs.h"

 

-#include "elf_common.h"

-#include "elf32.h"

-#include "elf64.h"

-

+#include "GenFw.h"

 

 //

 // Version of this utility

@@ -68,22 +65,22 @@ Abstract:
 //

 // Action for this tool.

 //

-#define FW_DUMMY_IMAGE       0

-#define FW_EFI_IMAGE         1

-#define FW_TE_IMAGE          2

-#define FW_ACPI_IMAGE        3

-#define FW_BIN_IMAGE         4

-#define FW_ZERO_DEBUG_IMAGE  5

-#define FW_SET_STAMP_IMAGE   6

-#define FW_MCI_IMAGE         7

-#define FW_MERGE_IMAGE       8

-#define FW_RELOC_STRIPEED_IMAGE 9

-#define FW_HII_PACKAGE_LIST_RCIMAGE 10

-#define FW_HII_PACKAGE_LIST_BINIMAGE 11

-#define FW_REBASE_IMAGE      12

-#define FW_SET_ADDRESS_IMAGE 13

-

-#define DUMP_TE_HEADER       0x11

+#define FW_DUMMY_IMAGE                0

+#define FW_EFI_IMAGE                  1

+#define FW_TE_IMAGE                   2

+#define FW_ACPI_IMAGE                 3

+#define FW_BIN_IMAGE                  4

+#define FW_ZERO_DEBUG_IMAGE           5

+#define FW_SET_STAMP_IMAGE            6

+#define FW_MCI_IMAGE                  7

+#define FW_MERGE_IMAGE                8

+#define FW_RELOC_STRIPEED_IMAGE       9

+#define FW_HII_PACKAGE_LIST_RCIMAGE   10

+#define FW_HII_PACKAGE_LIST_BINIMAGE  11

+#define FW_REBASE_IMAGE               12

+#define FW_SET_ADDRESS_IMAGE          13

+

+#define DUMP_TE_HEADER  0x11

 

 #define DEFAULT_MC_PAD_BYTE_VALUE  0xFF

 #define DEFAULT_MC_ALIGNMENT       16

@@ -92,7 +89,7 @@ Abstract:
 #define _MAX_PATH 500

 #endif

 

-#define STATUS_IGNORE        0xA

+#define STATUS_IGNORE 0xA

 //

 // Structure definition for a microcode header

 //

@@ -118,13 +115,13 @@ static const char *gHiiPackageRCFileHeader[] = {
   NULL

 };

 

-STATIC CHAR8 *mInImageName;

-

 //

 // Module image information

 //

-STATIC UINT32 mImageTimeStamp = 0;

-STATIC UINT32 mImageSize = 0;

+CHAR8  *mInImageName;

+UINT32 mImageTimeStamp = 0;

+UINT32 mImageSize = 0;

+

 

 STATIC

 EFI_STATUS

@@ -472,186 +469,6 @@ Returns:
   return STATUS_SUCCESS;

 }

 

-

-INTN

-IsElfHeader(

-  UINT8  *FileBuffer

-)

-{

-  return (FileBuffer[EI_MAG0] == ELFMAG0

-    && FileBuffer[EI_MAG1] == ELFMAG1

-    && FileBuffer[EI_MAG2] == ELFMAG2

-    && FileBuffer[EI_MAG3] == ELFMAG3);

-}

-

-typedef Elf32_Shdr Elf_Shdr;

-typedef Elf32_Ehdr Elf_Ehdr;

-typedef Elf32_Rel Elf_Rel;

-typedef Elf32_Sym Elf_Sym;

-typedef Elf32_Phdr Elf_Phdr;

-typedef Elf32_Dyn Elf_Dyn;

-

-#define ELFCLASS ELFCLASS32

-#define ELF_R_TYPE(r) ELF32_R_TYPE(r)

-#define ELF_R_SYM(r) ELF32_R_SYM(r)

-#define ELF_HII_SECTION_NAME ".hii"

-//

-// Well known ELF structures.

-//

-Elf_Ehdr *Ehdr;

-Elf_Shdr *ShdrBase;

-Elf_Phdr *gPhdrBase;

-

-//

-// PE section alignment.

-//

-const UINT32 CoffAlignment = 0x20;

-const UINT16 CoffNbrSections = 5;

-

-//

-// Current offset in coff file.

-//

-UINT32 CoffOffset;

-

-//

-// Result Coff file in memory.

-//

-UINT8 *CoffFile = NULL;

-//

-// ELF sections to offset in Coff file.

-//

-UINT32 *CoffSectionsOffset = NULL;

-

-//

-// Offset in Coff file of headers and sections.

-//

-UINT32 NtHdrOffset;

-UINT32 TableOffset;

-UINT32 TextOffset;

-UINT32 DataOffset;

-UINT32 HiiRsrcOffset;

-UINT32 RelocOffset;

-

-EFI_IMAGE_BASE_RELOCATION *CoffBaseRel;

-UINT16 *CoffEntryRel;

-

-UINT32

-CoffAlign(

-  UINT32 Offset

-  )

-{

-  return (Offset + CoffAlignment - 1) & ~(CoffAlignment - 1);

-}

-

-Elf_Shdr *

-GetShdrByIndex(

-  UINT32 Num

-  )

-{

-  if (Num >= Ehdr->e_shnum)

-    return NULL;

-  return (Elf_Shdr*)((UINT8*)ShdrBase + Num * Ehdr->e_shentsize);

-}

-

-INTN

-CheckElfHeader(

-  VOID

-  )

-{

-  //

-  // Note: Magic has already been tested.

-  //

-  if (Ehdr->e_ident[EI_CLASS] != ELFCLASS) {

-    Error (NULL, 0, 3000, "Unsupported", "%s needs to be ported for 64-bit ELF.", mInImageName);

-    return 0;

-  }

-  if (Ehdr->e_ident[EI_DATA] != ELFDATA2LSB) {

-    Error (NULL, 0, 3000, "Unsupported", "ELF EI_DATA not ELFDATA2LSB");

-    return 0;

-  }

-  if ((Ehdr->e_type != ET_EXEC) && (Ehdr->e_type != ET_DYN)) {

-    Error (NULL, 0, 3000, "Unsupported", "ELF e_type not ET_EXEC or ET_DYN");

-    return 0;

-  }

-  if (!((Ehdr->e_machine == EM_386) || (Ehdr->e_machine == EM_ARM))) { 

-    Error (NULL, 0, 3000, "Unsupported", "ELF e_machine not EM_386 or EM_ARM");

-    return 0;

-  }

-  if (Ehdr->e_version != EV_CURRENT) {

-    Error (NULL, 0, 3000, "Unsupported", "ELF e_version (%u) not EV_CURRENT (%d)", (unsigned) Ehdr->e_version, EV_CURRENT);

-    return 0;

-  }

-

-  //

-  // Find the section header table

-  //

-  ShdrBase  = (Elf_Shdr *)((UINT8 *)Ehdr + Ehdr->e_shoff);

-  gPhdrBase = (Elf_Phdr *)((UINT8 *)Ehdr + Ehdr->e_phoff);

-

-  CoffSectionsOffset = (UINT32 *)malloc(Ehdr->e_shnum * sizeof (UINT32));

-

-  memset(CoffSectionsOffset, 0, Ehdr->e_shnum * sizeof(UINT32));

-  return 1;

-}

-

-int

-IsTextShdr(

-  Elf_Shdr *Shdr

-  )

-{

-  return (Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == SHF_ALLOC;

-}

-

-int

-IsHiiRsrcShdr(

-  Elf_Shdr *Shdr

-  )

-{

-  Elf_Shdr *Namedr = GetShdrByIndex(Ehdr->e_shstrndx);

-

-  if (strcmp((CHAR8*)Ehdr + Namedr->sh_offset + Shdr->sh_name, ELF_HII_SECTION_NAME) == 0) {

-    return 1;

-  }

-

-  return 0;

-}

-

-int

-IsDataShdr(

-  Elf_Shdr *Shdr

-  )

-{

-  if (IsHiiRsrcShdr(Shdr)) {

-    return 0;

-  }

-  return (Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == (SHF_ALLOC | SHF_WRITE);

-}

-

-VOID

-CreateSectionHeader(

-  const CHAR8 *Name,

-  UINT32      Offset,

-  UINT32      Size,

-  UINT32      Flags

-  )

-{

-  EFI_IMAGE_SECTION_HEADER *Hdr;

-  Hdr = (EFI_IMAGE_SECTION_HEADER*)(CoffFile + TableOffset);

-

-  strcpy((char *)Hdr->Name, Name);

-  Hdr->Misc.VirtualSize = Size;

-  Hdr->VirtualAddress = Offset;

-  Hdr->SizeOfRawData = Size;

-  Hdr->PointerToRawData = Offset;

-  Hdr->PointerToRelocations = 0;

-  Hdr->PointerToLinenumbers = 0;

-  Hdr->NumberOfRelocations = 0;

-  Hdr->NumberOfLinenumbers = 0;

-  Hdr->Characteristics = Flags;

-

-  TableOffset += sizeof (EFI_IMAGE_SECTION_HEADER);

-}

-

 VOID

 SetHiiResourceHeader (

   UINT8   *HiiBinData,

@@ -712,708 +529,6 @@ SetHiiResourceHeader (
   return;

 }

 

-VOID

-ScanSections(

-  VOID

-  )

-{

-  UINT32                          i;

-  EFI_IMAGE_DOS_HEADER            *DosHdr;

-  EFI_IMAGE_OPTIONAL_HEADER_UNION *NtHdr;

-  UINT32                          CoffEntry;

-

-  CoffEntry = 0;

-  CoffOffset = 0;

-

-  //

-  // Coff file start with a DOS header.

-  //

-  CoffOffset = sizeof(EFI_IMAGE_DOS_HEADER) + 0x40;

-  NtHdrOffset = CoffOffset;

-  switch (Ehdr->e_machine) {

-  case EM_386:

-  case EM_ARM:

-    CoffOffset += sizeof (EFI_IMAGE_NT_HEADERS32);

-	break;

-  case EM_X86_64:

-  case EM_IA_64:

-    CoffOffset += sizeof (EFI_IMAGE_NT_HEADERS64);

-	break;

-  default:

-    VerboseMsg ("%s unknown e_machine type. Assume IA-32", (UINTN)Ehdr->e_machine);

-    CoffOffset += sizeof (EFI_IMAGE_NT_HEADERS32);

-	break;

-  }

-

-  TableOffset = CoffOffset;

-  CoffOffset += CoffNbrSections * sizeof(EFI_IMAGE_SECTION_HEADER);

-

-  //

-  // First text sections.

-  //

-  CoffOffset = CoffAlign(CoffOffset);

-  TextOffset = CoffOffset;

-  for (i = 0; i < Ehdr->e_shnum; i++) {

-    Elf_Shdr *shdr = GetShdrByIndex(i);

-    if (IsTextShdr(shdr)) {

-      if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {

-        // the alignment field is valid

-        if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {

-          // if the section address is aligned we must align PE/COFF 

-          CoffOffset = (CoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1);

-        } else if ((shdr->sh_addr % shdr->sh_addralign) != (CoffOffset % shdr->sh_addralign)) {

-          // ARM RVCT tools have behavior outside of the ELF specification to try 

-          // and make images smaller.  If sh_addr is not aligned to sh_addralign 

-          // then the section needs to preserve sh_addr MOD sh_addralign. 

-          // Normally doing nothing here works great.

-          Error (NULL, 0, 3000, "Invalid", "Unsupported section alignment.");

-        }

-      }

-      

-      /* 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;

-      }

-      CoffSectionsOffset[i] = CoffOffset;

-      CoffOffset += shdr->sh_size;

-    }

-  }

-

-  if (Ehdr->e_machine != EM_ARM) {

-    CoffOffset = CoffAlign(CoffOffset);

-  }

-

-  //

-  //  Then data sections.

-  //

-  DataOffset = CoffOffset;

-  for (i = 0; i < Ehdr->e_shnum; i++) {

-    Elf_Shdr *shdr = GetShdrByIndex(i);

-    if (IsDataShdr(shdr)) {

-      if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {

-        // the alignment field is valid

-        if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {

-          // if the section address is aligned we must align PE/COFF 

-          CoffOffset = (CoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1);

-        } else if ((shdr->sh_addr % shdr->sh_addralign) != (CoffOffset % shdr->sh_addralign)) {

-          // ARM RVCT tools have behavior outside of the ELF specification to try 

-          // and make images smaller.  If sh_addr is not aligned to sh_addralign 

-          // then the section needs to preserve sh_addr MOD sh_addralign. 

-          // Normally doing nothing here works great.

-          Error (NULL, 0, 3000, "Invalid", "Unsupported section alignment.");

-        }

-      }

-      CoffSectionsOffset[i] = CoffOffset;

-      CoffOffset += shdr->sh_size;

-    }

-  }

-  CoffOffset = CoffAlign(CoffOffset);

-

-  //

-  //  The HII resource sections.

-  //

-  HiiRsrcOffset = CoffOffset;

-  for (i = 0; i < Ehdr->e_shnum; i++) {

-    Elf_Shdr *shdr = GetShdrByIndex(i);

-    if (IsHiiRsrcShdr(shdr)) {

-      if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {

-        // the alignment field is valid

-        if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {

-          // if the section address is aligned we must align PE/COFF 

-          CoffOffset = (CoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1);

-        } else if ((shdr->sh_addr % shdr->sh_addralign) != (CoffOffset % shdr->sh_addralign)) {

-          // ARM RVCT tools have behavior outside of the ELF specification to try 

-          // and make images smaller.  If sh_addr is not aligned to sh_addralign 

-          // then the section needs to preserve sh_addr MOD sh_addralign. 

-          // Normally doing nothing here works great.

-          Error (NULL, 0, 3000, "Invalid", "Unsupported section alignment.");

-        }

-      }

-      if (shdr->sh_size != 0) {

-        CoffSectionsOffset[i] = CoffOffset;

-        CoffOffset += shdr->sh_size;

-        CoffOffset = CoffAlign(CoffOffset);

-        SetHiiResourceHeader ((UINT8*) Ehdr + shdr->sh_offset, HiiRsrcOffset);

-      }

-      break;

-    }

-  }

-

-  RelocOffset = CoffOffset;

-

-  //

-  // Allocate base Coff file.  Will be expanded later for relocations.

-  //

-  CoffFile = (UINT8 *)malloc(CoffOffset);

-  memset(CoffFile, 0, CoffOffset);

-

-  //

-  // Fill headers.

-  //

-  DosHdr = (EFI_IMAGE_DOS_HEADER *)CoffFile;

-  DosHdr->e_magic = EFI_IMAGE_DOS_SIGNATURE;

-  DosHdr->e_lfanew = NtHdrOffset;

-

-  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION*)(CoffFile + NtHdrOffset);

-

-  NtHdr->Pe32.Signature = EFI_IMAGE_NT_SIGNATURE;

-

-  switch (Ehdr->e_machine) {

-  case EM_386:

-    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_IA32;

-    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;

-    break;

-  case EM_X86_64:

-    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_X64;

-    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;

-    break;

-  case EM_IA_64:

-    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_IPF;

-    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;

-    break;

-  case EM_ARM:

-    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_ARMT;

-    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;

-    break;

-  default:

-    VerboseMsg ("%s unknown e_machine type. Assume IA-32", (UINTN)Ehdr->e_machine);

-    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_IA32;

-    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;

-  }

-

-  NtHdr->Pe32.FileHeader.NumberOfSections = CoffNbrSections;

-  NtHdr->Pe32.FileHeader.TimeDateStamp = (UINT32) time(NULL);

-  mImageTimeStamp = NtHdr->Pe32.FileHeader.TimeDateStamp;

-  NtHdr->Pe32.FileHeader.PointerToSymbolTable = 0;

-  NtHdr->Pe32.FileHeader.NumberOfSymbols = 0;

-  NtHdr->Pe32.FileHeader.SizeOfOptionalHeader = sizeof(NtHdr->Pe32.OptionalHeader);

-  NtHdr->Pe32.FileHeader.Characteristics = EFI_IMAGE_FILE_EXECUTABLE_IMAGE

-    | EFI_IMAGE_FILE_LINE_NUMS_STRIPPED

-    | EFI_IMAGE_FILE_LOCAL_SYMS_STRIPPED

-    | EFI_IMAGE_FILE_32BIT_MACHINE;

-

-  NtHdr->Pe32.OptionalHeader.SizeOfCode = DataOffset - TextOffset;

-  NtHdr->Pe32.OptionalHeader.SizeOfInitializedData = RelocOffset - DataOffset;

-  NtHdr->Pe32.OptionalHeader.SizeOfUninitializedData = 0;

-  NtHdr->Pe32.OptionalHeader.AddressOfEntryPoint = CoffEntry;

-

-  NtHdr->Pe32.OptionalHeader.BaseOfCode = TextOffset;

-

-  NtHdr->Pe32.OptionalHeader.BaseOfData = DataOffset;

-  NtHdr->Pe32.OptionalHeader.ImageBase = 0;

-  NtHdr->Pe32.OptionalHeader.SectionAlignment = CoffAlignment;

-  NtHdr->Pe32.OptionalHeader.FileAlignment = CoffAlignment;

-  NtHdr->Pe32.OptionalHeader.SizeOfImage = 0;

-

-  NtHdr->Pe32.OptionalHeader.SizeOfHeaders = TextOffset;

-  NtHdr->Pe32.OptionalHeader.NumberOfRvaAndSizes = EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES;

-

-  //

-  // Section headers.

-  //

-  if ((DataOffset - TextOffset) > 0) {

-    CreateSectionHeader (".text", TextOffset, DataOffset - TextOffset,

-            EFI_IMAGE_SCN_CNT_CODE

-            | EFI_IMAGE_SCN_MEM_EXECUTE

-            | EFI_IMAGE_SCN_MEM_READ);

-  } else {

-    // Don't make a section of size 0. 

-    NtHdr->Pe32.FileHeader.NumberOfSections--;

-  }

-

-  if ((HiiRsrcOffset - DataOffset) > 0) {

-    CreateSectionHeader (".data", DataOffset, HiiRsrcOffset - DataOffset,

-            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA

-            | EFI_IMAGE_SCN_MEM_WRITE

-            | EFI_IMAGE_SCN_MEM_READ);

-  } else {

-    // Don't make a section of size 0. 

-    NtHdr->Pe32.FileHeader.NumberOfSections--;

-  }

-

-  if ((RelocOffset - HiiRsrcOffset) > 0) {

-    CreateSectionHeader (".rsrc", HiiRsrcOffset, RelocOffset - HiiRsrcOffset,

-            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA

-            | EFI_IMAGE_SCN_MEM_READ);

-

-    NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = RelocOffset - HiiRsrcOffset;

-    NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = HiiRsrcOffset;

-  } else {

-    // Don't make a section of size 0. 

-    NtHdr->Pe32.FileHeader.NumberOfSections--;

-  }

-

-}

-

-VOID

-WriteSections(

-  int   (*Filter)(Elf_Shdr *)

-  )

-{

-  UINT32      Idx;

-  Elf_Shdr  *SecShdr;

-  UINT32      SecOffset;

-

-  //

-  // First: copy sections.

-  //

-  for (Idx = 0; Idx < Ehdr->e_shnum; Idx++) {

-    Elf_Shdr *Shdr = GetShdrByIndex(Idx);

-    if ((*Filter)(Shdr)) {

-      switch (Shdr->sh_type) {

-      case SHT_PROGBITS:

-        /* Copy.  */

-        memcpy(CoffFile + CoffSectionsOffset[Idx],

-              (UINT8*)Ehdr + Shdr->sh_offset,

-              Shdr->sh_size);

-        break;

-      

-      case SHT_NOBITS:

-        memset(CoffFile + CoffSectionsOffset[Idx], 0, Shdr->sh_size);

-        break;

-      

-      default:

-        //

-        //  Ignore for unkown section type.

-        //

-        VerboseMsg ("%s unknown section type %x. We directly copy this section into Coff file", mInImageName, (unsigned)Shdr->sh_type);

-        break;

-      }

-    }

-  }

-

-  //

-  // Second: apply relocations.

-  //

-  for (Idx = 0; Idx < Ehdr->e_shnum; Idx++) {

-    Elf_Shdr *RelShdr = GetShdrByIndex(Idx);

-    if (RelShdr->sh_type != SHT_REL)

-      continue;

-    SecShdr = GetShdrByIndex(RelShdr->sh_info);

-    SecOffset = CoffSectionsOffset[RelShdr->sh_info];

-    if (RelShdr->sh_type == SHT_REL && (*Filter)(SecShdr)) {

-      UINT32 RelIdx;

-      Elf_Shdr *SymtabShdr = GetShdrByIndex(RelShdr->sh_link);

-      UINT8 *Symtab = (UINT8*)Ehdr + SymtabShdr->sh_offset;

-

-      for (RelIdx = 0; RelIdx < RelShdr->sh_size; RelIdx += RelShdr->sh_entsize) {

-        Elf_Rel *Rel = (Elf_Rel *)((UINT8*)Ehdr + RelShdr->sh_offset + RelIdx);

-        Elf_Sym *Sym = (Elf_Sym *)(Symtab + ELF_R_SYM(Rel->r_info) * SymtabShdr->sh_entsize);

-        Elf_Shdr *SymShdr;

-        UINT8 *Targ;

-

-        if (Sym->st_shndx == SHN_UNDEF

-            || Sym->st_shndx == SHN_ABS

-            || Sym->st_shndx > Ehdr->e_shnum) {

-          Error (NULL, 0, 3000, "Invalid", "%s bad symbol definition.", mInImageName);

-        }

-        SymShdr = GetShdrByIndex(Sym->st_shndx);

-

-        //

-        // Note: r_offset in a memory address.

-        //  Convert it to a pointer in the coff file.

-        //

-        Targ = CoffFile + SecOffset + (Rel->r_offset - SecShdr->sh_addr);

-

-        if (Ehdr->e_machine == EM_386) {

-          switch (ELF_R_TYPE(Rel->r_info)) {

-          case R_386_NONE:

-            break;

-          case R_386_32:

-            //

-            // Absolute relocation.

-            //

-            *(UINT32 *)Targ = *(UINT32 *)Targ - SymShdr->sh_addr

-              + CoffSectionsOffset[Sym->st_shndx];

-            break;

-          case R_386_PC32:

-            //

-            // Relative relocation: Symbol - Ip + Addend

-            //

-            *(UINT32 *)Targ = *(UINT32 *)Targ

-              + (CoffSectionsOffset[Sym->st_shndx] - SymShdr->sh_addr)

-              - (SecOffset - SecShdr->sh_addr);

-            break;

-          default:

-            Error (NULL, 0, 3000, "Invalid", "%s unsupported ELF EM_386 relocation 0x%x.", mInImageName, (unsigned) ELF_R_TYPE(Rel->r_info));

-          }

-        } else if (Ehdr->e_machine == EM_ARM) {

-          switch (ELF32_R_TYPE(Rel->r_info)) {

-          case R_ARM_RBASE:   // No relocation - no action required

-          

-          // Thease are all PC-relative relocations and don't require modification

-          case R_ARM_PC24:    

-          case R_ARM_XPC25:   

-          case R_ARM_THM_PC22:

-          case R_ARM_THM_JUMP19:

-          case R_ARM_CALL:

-            break;

-

-          case R_ARM_ABS32:

-          case R_ARM_RABS32:

-            //

-            // Absolute relocation.

-            //

-            *(UINT32 *)Targ = *(UINT32 *)Targ - SymShdr->sh_addr + CoffSectionsOffset[Sym->st_shndx];

-            break;

-          default:

-            Error (NULL, 0, 3000, "Invalid", "WriteSections (): %s unsupported ELF EM_ARM relocation 0x%x.", mInImageName, (unsigned) ELF32_R_TYPE(Rel->r_info));

-          }

-        }

-      }

-    }

-  }

-}

-

-VOID

-CoffAddFixupEntry(

-  UINT16 Val

-  )

-{

-  *CoffEntryRel = Val;

-  CoffEntryRel++;

-  CoffBaseRel->SizeOfBlock += 2;

-  CoffOffset += 2;

-}

-

-VOID

-CoffAddFixup(

-  UINT32 Offset,

-  UINT8  Type

-  )

-{

-  if (CoffBaseRel == NULL

-      || CoffBaseRel->VirtualAddress != (Offset & ~0xfff)) {

-    if (CoffBaseRel != NULL) {

-      //

-      // Add a null entry (is it required ?)

-      //

-      CoffAddFixupEntry (0);

-      //

-      // Pad for alignment.

-      //

-      if (CoffOffset % 4 != 0)

-        CoffAddFixupEntry (0);

-    }

-

-    CoffFile = realloc

-      (CoffFile,

-       CoffOffset + sizeof(EFI_IMAGE_BASE_RELOCATION) + 2*0x1000);

-    memset(CoffFile + CoffOffset, 0,

-     sizeof(EFI_IMAGE_BASE_RELOCATION) + 2*0x1000);

-

-    CoffBaseRel = (EFI_IMAGE_BASE_RELOCATION*)(CoffFile + CoffOffset);

-    CoffBaseRel->VirtualAddress = Offset & ~0xfff;

-    CoffBaseRel->SizeOfBlock = sizeof(EFI_IMAGE_BASE_RELOCATION);

-

-    CoffEntryRel = (UINT16 *)(CoffBaseRel + 1);

-    CoffOffset += sizeof(EFI_IMAGE_BASE_RELOCATION);

-  }

-

-  //

-  // Fill the entry.

-  //

-  CoffAddFixupEntry((UINT16) ((Type << 12) | (Offset & 0xfff)));

-}

-

-

-Elf_Phdr *

-GetPhdrByIndex (

-  UINT32 num

-  )

-{

-  if (num >= Ehdr->e_phnum) {

-    return NULL;

-  }

-  

-  return (Elf32_Phdr *)((UINT8*)gPhdrBase + num * Ehdr->e_phentsize);

-}

-

-

-VOID

-WriteRelocations (

-  VOID

-  )

-{

-  UINT32                           Index;

-  EFI_IMAGE_OPTIONAL_HEADER_UNION  *NtHdr;

-  EFI_IMAGE_DATA_DIRECTORY         *Dir;

-  BOOLEAN                          FoundRelocations;

-  Elf_Dyn                          *Dyn;

-  Elf_Rel                          *Rel;

-  UINTN                            RelElementSize;

-  UINTN                            RelSize;

-  UINTN                            RelOffset;

-  UINTN                            K;

-  UINT8                            *Targ;

-  Elf32_Phdr                       *DynamicSegment;

-  Elf32_Phdr                       *TargetSegment;

-

-  for (Index = 0, FoundRelocations = FALSE; Index < Ehdr->e_shnum; Index++) {

-    Elf_Shdr *RelShdr = GetShdrByIndex(Index);

-    if (RelShdr->sh_type == SHT_REL) {

-      Elf_Shdr *SecShdr = GetShdrByIndex(RelShdr->sh_info);

-      if (IsTextShdr(SecShdr) || IsDataShdr(SecShdr)) {

-        UINT32 RelIdx;

-        FoundRelocations = TRUE;

-        for (RelIdx = 0; RelIdx < RelShdr->sh_size; RelIdx += RelShdr->sh_entsize) {

-          Elf_Rel *Rel = (Elf_Rel *)

-            ((UINT8*)Ehdr + RelShdr->sh_offset + RelIdx);

-          

-          if (Ehdr->e_machine == EM_386) { 

-            switch (ELF_R_TYPE(Rel->r_info)) {

-            case R_386_NONE:

-            case R_386_PC32:

-              break;

-            case R_386_32:

-              CoffAddFixup(CoffSectionsOffset[RelShdr->sh_info]

-              + (Rel->r_offset - SecShdr->sh_addr),

-              EFI_IMAGE_REL_BASED_HIGHLOW);

-              break;

-            default:

-              Error (NULL, 0, 3000, "Invalid", "%s unsupported ELF EM_386 relocation 0x%x.", mInImageName, (unsigned) ELF_R_TYPE(Rel->r_info));

-            }

-          } else if (Ehdr->e_machine == EM_ARM) {

-            switch (ELF32_R_TYPE(Rel->r_info)) {

-            case R_ARM_RBASE: // No relocation - no action required

-          

-            // Thease are all PC-relative relocations and don't require modification

-            case R_ARM_PC24:

-            case R_ARM_XPC25:

-            case R_ARM_THM_PC22:

-            case R_ARM_THM_JUMP19:

-            case R_ARM_CALL:

-              break;

-            case R_ARM_ABS32:

-            case R_ARM_RABS32:

-              CoffAddFixup (

-                CoffSectionsOffset[RelShdr->sh_info]

-                + (Rel->r_offset - SecShdr->sh_addr),

-                EFI_IMAGE_REL_BASED_HIGHLOW

-                );

-              break;

-

-           default:

-              Error (NULL, 0, 3000, "Invalid", "WriteRelocations(): %s unsupported ELF EM_ARM relocation 0x%x.", mInImageName, (unsigned) ELF32_R_TYPE(Rel->r_info));

-            }

-          } else {

-            Error (NULL, 0, 3000, "Not Supported", "This tool does not support relocations for ELF with e_machine %u (processor type).", (unsigned) Ehdr->e_machine);

-          }

-        }

-      }

-    }

-  }

-

-  if (!FoundRelocations && (Ehdr->e_machine == EM_ARM)) {

-    /* Try again, but look for PT_DYNAMIC instead of SHT_REL */

-

-    for (Index = 0; Index < Ehdr->e_phnum; Index++) {

-      RelElementSize = 0;

-      RelSize = 0;

-      RelOffset = 0;

-

-      DynamicSegment = GetPhdrByIndex (Index);

-

-      if (DynamicSegment->p_type == PT_DYNAMIC) {

-        Dyn = (Elf32_Dyn *) ((UINT8 *)Ehdr + DynamicSegment->p_offset);

-

-        while (Dyn->d_tag != DT_NULL) {

-          switch (Dyn->d_tag) {

-            case  DT_REL:

-              RelOffset = Dyn->d_un.d_val;

-              break;

-

-            case  DT_RELSZ:

-              RelSize = Dyn->d_un.d_val;

-              break;

-

-            case  DT_RELENT:

-              RelElementSize = Dyn->d_un.d_val;

-              break;

-

-            default:

-              break;

-          }

-          Dyn++;

-        }

-        if (( RelOffset == 0 ) || ( RelSize == 0 ) || ( RelElementSize == 0 )) {

-          Error (NULL, 0, 3000, "Invalid", "%s bad ARM dynamic relocations.", mInImageName);

-        }

-

-        for (K = 0; K < RelSize; K += RelElementSize) {

-

-          if (DynamicSegment->p_paddr == 0) {

-            // This seems to be how it works on armcc???? Have the email in to find out?

-            Rel = (Elf32_Rel *) ((UINT8 *) Ehdr + DynamicSegment->p_offset + RelOffset + K);

-          } else {

-            // This is how it reads in the ELF specification

-            Rel = (Elf32_Rel *) ((UINT8 *) Ehdr + RelOffset + K);

-          }

-

-          switch (ELF32_R_TYPE (Rel->r_info)) {

-          case  R_ARM_RBASE:

-            break;

-          case  R_ARM_RABS32:

-            TargetSegment = GetPhdrByIndex (ELF32_R_SYM (Rel->r_info) - 1);

-

-            // Note: r_offset in a memory address.  Convert it to a pointer in the coff file.

-            Targ = CoffFile + CoffSectionsOffset[ ELF32_R_SYM( Rel->r_info ) ] + Rel->r_offset - TargetSegment->p_vaddr;

-

-            *(UINT32 *)Targ = *(UINT32 *)Targ + CoffSectionsOffset [ELF32_R_SYM( Rel->r_info )];

-

-            CoffAddFixup (CoffSectionsOffset[ELF32_R_SYM (Rel->r_info)] + (Rel->r_offset - TargetSegment->p_vaddr), EFI_IMAGE_REL_BASED_HIGHLOW);

-            break;

-          default:

-            Error (NULL, 0, 3000, "Invalid", "%s bad ARM dynamic relocations, unkown type %d.", mInImageName, ELF32_R_TYPE (Rel->r_info));

-            break;

-          }

-        }

-        break;

-      }

-    }

-  }

-

-  //

-  // Pad by adding empty entries.

-  //

-  while (CoffOffset & (CoffAlignment - 1)) {

-    CoffAddFixupEntry(0);

-  }

-

-

-  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(CoffFile + NtHdrOffset);

-  Dir = &NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC];

-  Dir->Size = CoffOffset - RelocOffset;

-  if (Dir->Size == 0) {

-    // If no relocations, null out the directory entry and don't add the .reloc section

-    Dir->VirtualAddress = 0;

-    NtHdr->Pe32.FileHeader.NumberOfSections--;

-  } else {

-    Dir->VirtualAddress = RelocOffset;

-    CreateSectionHeader (".reloc", RelocOffset, CoffOffset - RelocOffset,

-            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA

-            | EFI_IMAGE_SCN_MEM_DISCARDABLE

-            | EFI_IMAGE_SCN_MEM_READ);

-  }

-

-}

-

-VOID

-WriteDebug(

-  VOID

-  )

-{

-  UINT32                              Len;

-  UINT32                              DebugOffset;

-  EFI_IMAGE_OPTIONAL_HEADER_UNION     *NtHdr;

-  EFI_IMAGE_DATA_DIRECTORY            *DataDir;

-  EFI_IMAGE_DEBUG_DIRECTORY_ENTRY     *Dir;

-  EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10;

-

-  Len = strlen(mInImageName) + 1;

-  DebugOffset = CoffOffset;

-

-  CoffOffset += sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY)

-    + sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY)

-    + Len;

-  CoffOffset = CoffAlign(CoffOffset);

-

-  CoffFile = realloc(CoffFile, CoffOffset);

-  memset(CoffFile + DebugOffset, 0, CoffOffset - DebugOffset);

-

-  Dir = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY*)(CoffFile + DebugOffset);

-  Dir->Type = EFI_IMAGE_DEBUG_TYPE_CODEVIEW;

-  Dir->SizeOfData = sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) + Len;

-  Dir->RVA = DebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);

-  Dir->FileOffset = DebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);

-

-  Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1);

-  Nb10->Signature = CODEVIEW_SIGNATURE_NB10;

-  strcpy ((char *)(Nb10 + 1), mInImageName);

-

-

-  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(CoffFile + NtHdrOffset);

-  DataDir = &NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG];

-  DataDir->VirtualAddress = DebugOffset;

-  DataDir->Size = CoffOffset - DebugOffset;

-  if (DataDir->Size == 0) {

-    // If no debug, null out the directory entry and don't add the .debug section

-    DataDir->VirtualAddress = 0;

-    NtHdr->Pe32.FileHeader.NumberOfSections--;

-  } else {

-    DataDir->VirtualAddress = DebugOffset;

-    CreateSectionHeader (".debug", DebugOffset, CoffOffset - DebugOffset,

-            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA

-            | EFI_IMAGE_SCN_MEM_DISCARDABLE

-            | EFI_IMAGE_SCN_MEM_READ);

-

-  }

-}

-

-VOID

-ConvertElf (

-  UINT8  **FileBuffer,

-  UINT32 *FileLength

-  )

-{

-  EFI_IMAGE_OPTIONAL_HEADER_UNION *NtHdr;

-

-  //

-  // Check header, read section table.

-  //

-  Ehdr = (Elf32_Ehdr*)*FileBuffer;

-  if (!CheckElfHeader())

-    return;

-

-  VerboseMsg ("Check Efl Image Header");

-  //

-  // Compute sections new address.

-  //

-  

-  ScanSections();

-

-  VerboseMsg ("Compute sections new address.");

-

-  //

-  // Write and relocate sections.

-  //

-  WriteSections(IsTextShdr);

-  WriteSections(IsDataShdr);

-  WriteSections(IsHiiRsrcShdr);

-  VerboseMsg ("Write and relocate sections.");

-

-  //

-  // Translate and write relocations.

-  //

-  WriteRelocations();

-  VerboseMsg ("Translate and write relocations.");

-

-  //

-  // Write debug info.

-  //

-  WriteDebug();

-  VerboseMsg ("Write debug info.");

-

-  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(CoffFile + NtHdrOffset);

-  NtHdr->Pe32.OptionalHeader.SizeOfImage = CoffOffset;

-

-  //

-  // Replace.

-  //

-  free(*FileBuffer);

-  *FileBuffer = CoffFile;

-  *FileLength = CoffOffset;

-

-  //

-  // Free memory space

-  //

-  if (CoffSectionsOffset != NULL) {

-    free (CoffSectionsOffset);

-  }

-}

-

-

 EFI_IMAGE_OPTIONAL_HEADER_UNION *

 GetPeCoffHeader (

   void *Data

@@ -2935,8 +2050,11 @@ Returns:
   // Convert EFL image to PeImage

   //

   if (IsElfHeader(FileBuffer)) {

-    VerboseMsg ("Convert the input ELF Image to Pe Image");

-    ConvertElf(&FileBuffer, &FileLength);

+    VerboseMsg ("Convert %s from ELF to PE/COFF.", mInImageName);

+    if (!ConvertElf(&FileBuffer, &FileLength)) {

+      Error (NULL, 0, 3000, "Invalid", "Unable to convert %s from ELF to PE/COFF.", mInImageName);

+      goto Finish;

+    }

   }

 

   //