RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-02 10:21:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

yaml2obj, COFF: Correctly calculate SizeOfImage and SizeOfHeaders

Browse Source 
SizeOfHeaders must be aligned to the FileAlignment.
SizeOfImage must be at least the SizeOfHeaders aligned to the
SectionAlignment.

llvm-svn: 222030
This commit is contained in:
David Majnemer 2014-11-14 19:35:59 +00:00
parent 582964b38a
commit ffee2f8eba
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/yaml2obj/yaml2coff.cpp
View File

@ -144,10 +144,11 @@ struct COFFParser {
static bool layoutOptionalHeader(COFFParser &CP) { static bool layoutOptionalHeader(COFFParser &CP) {
if (!CP.isPE()) if (!CP.isPE())
return true; return true;
unsigned PEHeaderSize = CP.is64Bit() ? sizeof(object::pe32plus_header)
: sizeof(object::pe32_header);
CP.Obj.Header.SizeOfOptionalHeader = CP.Obj.Header.SizeOfOptionalHeader =
(CP.is64Bit() ? sizeof(object::pe32plus_header) PEHeaderSize +
: sizeof(object::pe32_header)) + sizeof(object::data_directory) * (COFF::NUM_DATA_DIRECTORIES + 1);
(sizeof(object::data_directory) * (COFF::NUM_DATA_DIRECTORIES + 1));
return true; return true;
} }
@ -281,15 +282,18 @@ num_zeros_impl num_zeros(size_t N) {
} }
template <typename T> template <typename T>
static void initializeOptionalHeader(COFFParser &CP, uint16_t Magic, T Header) { static uint32_t initializeOptionalHeader(COFFParser &CP, uint16_t Magic, T Header) {
memset(Header, 0, sizeof(*Header)); memset(Header, 0, sizeof(*Header));
Header->Magic = Magic; Header->Magic = Magic;
Header->SectionAlignment = CP.Obj.OptionalHeader->Header.SectionAlignment; Header->SectionAlignment = CP.Obj.OptionalHeader->Header.SectionAlignment;
Header->FileAlignment = CP.Obj.OptionalHeader->Header.FileAlignment;
uint32_t SizeOfCode = 0, SizeOfInitializedData = 0, uint32_t SizeOfCode = 0, SizeOfInitializedData = 0,
SizeOfUninitializedData = 0; SizeOfUninitializedData = 0;
uint32_t SizeOfHeaders = RoundUpToAlignment( uint32_t SizeOfHeaders = RoundUpToAlignment(
CP.SectionTableStart + CP.SectionTableSize, Header->SectionAlignment); CP.SectionTableStart + CP.SectionTableSize, Header->FileAlignment);
uint32_t SizeOfImage = SizeOfHeaders; uint32_t SizeOfImage =
RoundUpToAlignment(SizeOfHeaders, Header->SectionAlignment);
uint32_t BaseOfData = 0;
for (const COFFYAML::Section &S : CP.Obj.Sections) { for (const COFFYAML::Section &S : CP.Obj.Sections) {
if (S.Header.Characteristics & COFF::IMAGE_SCN_CNT_CODE) if (S.Header.Characteristics & COFF::IMAGE_SCN_CNT_CODE)
SizeOfCode += S.Header.SizeOfRawData; SizeOfCode += S.Header.SizeOfRawData;
@ -299,6 +303,8 @@ static void initializeOptionalHeader(COFFParser &CP, uint16_t Magic, T Header) {
SizeOfUninitializedData += S.Header.SizeOfRawData; SizeOfUninitializedData += S.Header.SizeOfRawData;
if (S.Name.equals(".text")) if (S.Name.equals(".text"))
Header->BaseOfCode = S.Header.VirtualAddress; // RVA Header->BaseOfCode = S.Header.VirtualAddress; // RVA
else if (S.Name.equals(".data"))
BaseOfData = S.Header.VirtualAddress; // RVA
if (S.Header.VirtualAddress) if (S.Header.VirtualAddress)
SizeOfImage += SizeOfImage +=
RoundUpToAlignment(S.Header.VirtualSize, Header->SectionAlignment); RoundUpToAlignment(S.Header.VirtualSize, Header->SectionAlignment);
@ -309,7 +315,6 @@ static void initializeOptionalHeader(COFFParser &CP, uint16_t Magic, T Header) {
Header->AddressOfEntryPoint = Header->AddressOfEntryPoint =
CP.Obj.OptionalHeader->Header.AddressOfEntryPoint; // RVA CP.Obj.OptionalHeader->Header.AddressOfEntryPoint; // RVA
Header->ImageBase = CP.Obj.OptionalHeader->Header.ImageBase; Header->ImageBase = CP.Obj.OptionalHeader->Header.ImageBase;
Header->FileAlignment = CP.Obj.OptionalHeader->Header.FileAlignment;
Header->MajorOperatingSystemVersion = Header->MajorOperatingSystemVersion =
CP.Obj.OptionalHeader->Header.MajorOperatingSystemVersion; CP.Obj.OptionalHeader->Header.MajorOperatingSystemVersion;
Header->MinorOperatingSystemVersion = Header->MinorOperatingSystemVersion =
@ -331,6 +336,7 @@ static void initializeOptionalHeader(COFFParser &CP, uint16_t Magic, T Header) {
Header->SizeOfHeapReserve = CP.Obj.OptionalHeader->Header.SizeOfHeapReserve; Header->SizeOfHeapReserve = CP.Obj.OptionalHeader->Header.SizeOfHeapReserve;
Header->SizeOfHeapCommit = CP.Obj.OptionalHeader->Header.SizeOfHeapCommit; Header->SizeOfHeapCommit = CP.Obj.OptionalHeader->Header.SizeOfHeapCommit;
Header->NumberOfRvaAndSize = COFF::NUM_DATA_DIRECTORIES + 1; Header->NumberOfRvaAndSize = COFF::NUM_DATA_DIRECTORIES + 1;
return BaseOfData;
} }
static bool writeCOFF(COFFParser &CP, raw_ostream &OS) { static bool writeCOFF(COFFParser &CP, raw_ostream &OS) {
@ -387,7 +393,8 @@ static bool writeCOFF(COFFParser &CP, raw_ostream &OS) {
OS.write(reinterpret_cast<char *>(&PEH), sizeof(PEH)); OS.write(reinterpret_cast<char *>(&PEH), sizeof(PEH));
} else { } else {
object::pe32_header PEH; object::pe32_header PEH;
initializeOptionalHeader(CP, COFF::PE32Header::PE32, &PEH); uint32_t BaseOfData = initializeOptionalHeader(CP, COFF::PE32Header::PE32, &PEH);
PEH.BaseOfData = BaseOfData;
OS.write(reinterpret_cast<char *>(&PEH), sizeof(PEH)); OS.write(reinterpret_cast<char *>(&PEH), sizeof(PEH));
} }
for (const Optional<COFF::DataDirectory> &DD : for (const Optional<COFF::DataDirectory> &DD :