RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-01-18 16:03:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Recognize 0x0000 as a COFF file magic.

Browse Source 
Summary:
Some machine-type-neutral object files containing only undefined symbols
actually do exist in the Windows standard library. Need to recognize them
as COFF files.

Reviewers: Bigcheese

CC: llvm-commits

Differential Revision: http://llvm-reviews.chandlerc.com/D2164

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194734 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rui Ueyama 2013-11-14 22:09:08 +00:00
parent 6a1a5e94e2
commit b850a05f2c
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Support/Path.cpp
View File

@ -853,6 +853,9 @@ error_code has_magic(const Twine &path, const Twine &magic, bool &result) {
if (Magic.size() >= sizeof(Expected) &&
memcmp(Magic.data(), Expected, sizeof(Expected)) == 0)
return file_magic::windows_resource;
// 0x0000 = COFF unknown machine type
if (Magic[1] == 0)
return file_magic::coff_object;
break;
}
case 0xDE: // 0x0B17C0DE = BC wraper

BIN
test/tools/llvm-readobj/Inputs/magic.coff-unknown Normal file
View File

Binary file not shown.

16
test/tools/llvm-readobj/file-headers.test
View File

@ -8,6 +8,8 @@ RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-i386 \
RUN: | FileCheck %s -check-prefix ELF32
RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-x86-64 \
RUN: | FileCheck %s -check-prefix ELF64
RUN: llvm-readobj -h %p/Inputs/magic.coff-unknown \
RUN: | FileCheck %s -check-prefix COFF-UNKNOWN
COFF32: File: {{(.*[/\\])?}}trivial.obj.coff-i386
COFF32-NEXT: Format: COFF-i386
@ -183,3 +185,17 @@ PE32-NEXT: ReservedRVA: 0x0
PE32-NEXT: ReservedSize: 0x0
PE32-NEXT: }
PE32-NEXT: }
COFF-UNKNOWN: Format: COFF-<unknown arch>
COFF-UNKNOWN-NEXT: Arch: unknown
COFF-UNKNOWN-NEXT: AddressSize: 32bit
COFF-UNKNOWN-NEXT: ImageFileHeader {
COFF-UNKNOWN-NEXT: Machine: IMAGE_FILE_MACHINE_UNKNOWN (0x0)
COFF-UNKNOWN-NEXT: SectionCount: 3
COFF-UNKNOWN-NEXT: TimeDateStamp: 2013-11-14 21:19:28 (0x52853E60)
COFF-UNKNOWN-NEXT: PointerToSymbolTable: 0xF8
COFF-UNKNOWN-NEXT: SymbolCount: 11
COFF-UNKNOWN-NEXT: OptionalHeaderSize: 0
COFF-UNKNOWN-NEXT: Characteristics [ (0x0)
COFF-UNKNOWN-NEXT: ]
COFF-UNKNOWN-NEXT: }

2
unittests/Support/Path.cpp
View File

@ -418,6 +418,7 @@ TEST_F(FileSystemTest, DirectoryIteration) {
const char archive[] = "!<arch>\x0A";
const char bitcode[] = "\xde\xc0\x17\x0b";
const char coff_object[] = "\x00\x00......";
const char elf_relocatable[] = { 0x7f, 'E', 'L', 'F', 1, 2, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 1 };
const char macho_universal_binary[] = "\xca\xfe\xba\xbe...\0x00";
@ -445,6 +446,7 @@ TEST_F(FileSystemTest, Magic) {
{ #magic, magic, sizeof(magic), fs::file_magic::magic }
DEFINE(archive),
DEFINE(bitcode),
DEFINE(coff_object),
DEFINE(elf_relocatable),
DEFINE(macho_universal_binary),
DEFINE(macho_object),