This is an archive of the discontinued LLVM Phabricator instance.

Differential D8773

llvm-readobj: teach it to handle MachO Universal Archive correctly
ClosedPublic

Authored by chilledheart on Apr 1 2015, 8:28 AM.

Details

Reviewers
kledzik
friss
• rafael
Commits
rG29ac43c3617a: llvm-readobj: teach it to handle MachO Universal Archive correctly
rL234758: llvm-readobj: teach it to handle MachO Universal Archive correctly

Diff Detail

Event Timeline

chilledheart updated this revision to Diff 23058.Apr 1 2015, 8:28 AM
chilledheart retitled this revision from to llvm-readobj: teach it to handle MachO Universal Archive correctly.
chilledheart updated this object.
chilledheart edited the test plan for this revision. (Show Details)
chilledheart added reviewers: • rafael, friss, kledzik.
chilledheart added a subscriber: Unknown Object (MLST).
• rafael accepted this revision.Apr 1 2015, 8:56 AM
• rafael edited edge metadata.

LGTM

This revision is now accepted and ready to land.Apr 1 2015, 8:56 AM
chilledheart added a comment.Apr 13 2015, 5:58 AM

Hi rafael:

I don't have commit right yet. Could you submit it for me?

Thank you.

dblaikie added a subscriber: dblaikie.Apr 13 2015, 9:08 AM

Committed in r234758

Closed by commit rL234758: llvm-readobj: teach it to handle MachO Universal Archive correctly (authored by dblaikie). · Explain WhyApr 13 2015, 9:08 AM
This revision was automatically updated to reflect the committed changes.
chilledheart added a comment.Apr 13 2015, 9:09 AM

Thank you, dblaikie.

Revision Contents

PathSize
test/
tools/
llvm-readobj/
Inputs/
156 lines
tools/
llvm-readobj/
13 lines

Diff 23058

test/tools/llvm-readobj/Inputs/macho-universal-archive.x86_64.i386

  • This binary file was added.
PropertyOld ValueNew Value
MIME Typenullapplication/x-java-applet
File Size0 B1 KB

test/tools/llvm-readobj/macho-universal-x86_64.i386.test

RUN: llvm-readobj -h %p/Inputs/macho-universal.x86_64.i386 \ RUN: llvm-readobj -h %p/Inputs/macho-universal.x86_64.i386 \
RUN: | FileCheck %s -check-prefix MULTIHEADER RUN: | FileCheck %s -check-prefix MULTIHEADER
RUN: llvm-readobj -sections %p/Inputs/macho-universal.x86_64.i386 \ RUN: llvm-readobj -sections %p/Inputs/macho-universal.x86_64.i386 \
RUN: | FileCheck %s -check-prefix MULTISECTIONS RUN: | FileCheck %s -check-prefix MULTISECTIONS
RUN: llvm-readobj -h %p/Inputs/macho-universal-archive.x86_64.i386 \
RUN: | FileCheck %s -check-prefix MULTIHEADER-ARCHIVE
RUN: llvm-readobj -sections %p/Inputs/macho-universal-archive.x86_64.i386 \
RUN: | FileCheck %s -check-prefix MULTISECTIONS-ARCHIVE
MULTIHEADER: Format: Mach-O 64-bit x86-64 MULTIHEADER: Format: Mach-O 64-bit x86-64
MULTIHEADER: Arch: x86_64 MULTIHEADER: Arch: x86_64
MULTIHEADER: AddressSize: 64bit MULTIHEADER: AddressSize: 64bit
MULTIHEADER: MachHeader { MULTIHEADER: MachHeader {
MULTIHEADER: Magic: Magic64 (0xFEEDFACF) MULTIHEADER: Magic: Magic64 (0xFEEDFACF)
MULTIHEADER: CpuType: X86-64 (0x1000007) MULTIHEADER: CpuType: X86-64 (0x1000007)
MULTIHEADER: CpuSubType: CPU_SUBTYPE_X86_64_ALL (0x3) MULTIHEADER: CpuSubType: CPU_SUBTYPE_X86_64_ALL (0x3)
MULTIHEADER: FileType: Executable (0x2) MULTIHEADER: FileType: Executable (0x2)
▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Lines
MULTISECTIONS: RelocationCount: 0 MULTISECTIONS: RelocationCount: 0
MULTISECTIONS: Type: 0x0 MULTISECTIONS: Type: 0x0
MULTISECTIONS: Attributes [ (0x0) MULTISECTIONS: Attributes [ (0x0)
MULTISECTIONS: ] MULTISECTIONS: ]
MULTISECTIONS: Reserved1: 0x0 MULTISECTIONS: Reserved1: 0x0
MULTISECTIONS: Reserved2: 0x0 MULTISECTIONS: Reserved2: 0x0
MULTISECTIONS: } MULTISECTIONS: }
MULTISECTIONS: ] MULTISECTIONS: ]
MULTIHEADER-ARCHIVE: File: hello.o
MULTIHEADER-ARCHIVE: Format: Mach-O 64-bit x86-64
MULTIHEADER-ARCHIVE: Arch: x86_64
MULTIHEADER-ARCHIVE: AddressSize: 64bit
MULTIHEADER-ARCHIVE: MachHeader {
MULTIHEADER-ARCHIVE: Magic: Magic64 (0xFEEDFACF)
MULTIHEADER-ARCHIVE: CpuType: X86-64 (0x1000007)
MULTIHEADER-ARCHIVE: CpuSubType: CPU_SUBTYPE_X86_64_ALL (0x3)
MULTIHEADER-ARCHIVE: FileType: Relocatable (0x1)
MULTIHEADER-ARCHIVE: NumOfLoadCommands: 3
MULTIHEADER-ARCHIVE: SizeOfLoadCommands: 496
MULTIHEADER-ARCHIVE: Flags [ (0x2000)
MULTIHEADER-ARCHIVE: MH_SUBSECTIONS_VIA_SYMBOLS (0x2000)
MULTIHEADER-ARCHIVE: ]
MULTIHEADER-ARCHIVE: Reserved: 0x0
MULTIHEADER-ARCHIVE: }
MULTIHEADER-ARCHIVE: File: foo.o
MULTIHEADER-ARCHIVE: Format: Mach-O 32-bit i386
MULTIHEADER-ARCHIVE: Arch: i386
MULTIHEADER-ARCHIVE: AddressSize: 32bit
MULTIHEADER-ARCHIVE: MachHeader {
MULTIHEADER-ARCHIVE: Magic: Magic (0xFEEDFACE)
MULTIHEADER-ARCHIVE: CpuType: X86 (0x7)
MULTIHEADER-ARCHIVE: CpuSubType: CPU_SUBTYPE_I386_ALL (0x3)
MULTIHEADER-ARCHIVE: FileType: Relocatable (0x1)
MULTIHEADER-ARCHIVE: NumOfLoadCommands: 3
MULTIHEADER-ARCHIVE: SizeOfLoadCommands: 296
MULTIHEADER-ARCHIVE: Flags [ (0x2000)
MULTIHEADER-ARCHIVE: MH_SUBSECTIONS_VIA_SYMBOLS (0x2000)
MULTIHEADER-ARCHIVE: ]
MULTIHEADER-ARCHIVE: }
MULTISECTIONS-ARCHIVE: File: hello.o
MULTISECTIONS-ARCHIVE: Format: Mach-O 64-bit x86-64
MULTISECTIONS-ARCHIVE: Arch: x86_64
MULTISECTIONS-ARCHIVE: AddressSize: 64bit
MULTISECTIONS-ARCHIVE: Sections [
MULTISECTIONS-ARCHIVE: Section {
MULTISECTIONS-ARCHIVE: Index: 0
MULTISECTIONS-ARCHIVE: Name: __text (5F 5F 74 65 78 74 00 00 00 00 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Segment: __TEXT (5F 5F 54 45 58 54 00 00 00 00 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Address: 0x0
MULTISECTIONS-ARCHIVE: Size: 0x3B
MULTISECTIONS-ARCHIVE: Offset: 528
MULTISECTIONS-ARCHIVE: Alignment: 4
MULTISECTIONS-ARCHIVE: RelocationOffset: 0x2B8
MULTISECTIONS-ARCHIVE: RelocationCount: 2
MULTISECTIONS-ARCHIVE: Type: 0x0
MULTISECTIONS-ARCHIVE: Attributes [ (0x800004)
MULTISECTIONS-ARCHIVE: PureInstructions (0x800000)
MULTISECTIONS-ARCHIVE: SomeInstructions (0x4)
MULTISECTIONS-ARCHIVE: ]
MULTISECTIONS-ARCHIVE: Reserved1: 0x0
MULTISECTIONS-ARCHIVE: Reserved2: 0x0
MULTISECTIONS-ARCHIVE: }
MULTISECTIONS-ARCHIVE: Section {
MULTISECTIONS-ARCHIVE: Index: 1
MULTISECTIONS-ARCHIVE: Name: __cstring (5F 5F 63 73 74 72 69 6E 67 00 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Segment: __TEXT (5F 5F 54 45 58 54 00 00 00 00 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Address: 0x3B
MULTISECTIONS-ARCHIVE: Size: 0xD
MULTISECTIONS-ARCHIVE: Offset: 587
MULTISECTIONS-ARCHIVE: Alignment: 0
MULTISECTIONS-ARCHIVE: RelocationOffset: 0x0
MULTISECTIONS-ARCHIVE: RelocationCount: 0
MULTISECTIONS-ARCHIVE: Type: ExtReloc (0x2)
MULTISECTIONS-ARCHIVE: Attributes [ (0x0)
MULTISECTIONS-ARCHIVE: ]
MULTISECTIONS-ARCHIVE: Reserved1: 0x0
MULTISECTIONS-ARCHIVE: Reserved2: 0x0
MULTISECTIONS-ARCHIVE: }
MULTISECTIONS-ARCHIVE: Section {
MULTISECTIONS-ARCHIVE: Index: 2
MULTISECTIONS-ARCHIVE: Name: __compact_unwind (5F 5F 63 6F 6D 70 61 63 74 5F 75 6E 77 69 6E 64)
MULTISECTIONS-ARCHIVE: Segment: __LD (5F 5F 4C 44 00 00 00 00 00 00 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Address: 0x48
MULTISECTIONS-ARCHIVE: Size: 0x20
MULTISECTIONS-ARCHIVE: Offset: 600
MULTISECTIONS-ARCHIVE: Alignment: 3
MULTISECTIONS-ARCHIVE: RelocationOffset: 0x2C8
MULTISECTIONS-ARCHIVE: RelocationCount: 1
MULTISECTIONS-ARCHIVE: Type: 0x0
MULTISECTIONS-ARCHIVE: Attributes [ (0x20000)
MULTISECTIONS-ARCHIVE: Debug (0x20000)
MULTISECTIONS-ARCHIVE: ]
MULTISECTIONS-ARCHIVE: Reserved1: 0x0
MULTISECTIONS-ARCHIVE: Reserved2: 0x0
MULTISECTIONS-ARCHIVE: }
MULTISECTIONS-ARCHIVE: Section {
MULTISECTIONS-ARCHIVE: Index: 3
MULTISECTIONS-ARCHIVE: Name: __eh_frame (5F 5F 65 68 5F 66 72 61 6D 65 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Segment: __TEXT (5F 5F 54 45 58 54 00 00 00 00 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Address: 0x68
MULTISECTIONS-ARCHIVE: Size: 0x40
MULTISECTIONS-ARCHIVE: Offset: 632
MULTISECTIONS-ARCHIVE: Alignment: 3
MULTISECTIONS-ARCHIVE: RelocationOffset: 0x0
MULTISECTIONS-ARCHIVE: RelocationCount: 0
MULTISECTIONS-ARCHIVE: Type: 0xB
MULTISECTIONS-ARCHIVE: Attributes [ (0x680000)
MULTISECTIONS-ARCHIVE: LiveSupport (0x80000)
MULTISECTIONS-ARCHIVE: NoTOC (0x400000)
MULTISECTIONS-ARCHIVE: StripStaticSyms (0x200000)
MULTISECTIONS-ARCHIVE: ]
MULTISECTIONS-ARCHIVE: Reserved1: 0x0
MULTISECTIONS-ARCHIVE: Reserved2: 0x0
MULTISECTIONS-ARCHIVE: }
MULTISECTIONS-ARCHIVE: ]
MULTISECTIONS-ARCHIVE: File: foo.o
MULTISECTIONS-ARCHIVE: Format: Mach-O 32-bit i386
MULTISECTIONS-ARCHIVE: Arch: i386
MULTISECTIONS-ARCHIVE: AddressSize: 32bit
MULTISECTIONS-ARCHIVE: Sections [
MULTISECTIONS-ARCHIVE: Section {
MULTISECTIONS-ARCHIVE: Index: 0
MULTISECTIONS-ARCHIVE: Name: __text (5F 5F 74 65 78 74 00 00 00 00 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Segment: __TEXT (5F 5F 54 45 58 54 00 00 00 00 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Address: 0x0
MULTISECTIONS-ARCHIVE: Size: 0x5
MULTISECTIONS-ARCHIVE: Offset: 324
MULTISECTIONS-ARCHIVE: Alignment: 4
MULTISECTIONS-ARCHIVE: RelocationOffset: 0x0
MULTISECTIONS-ARCHIVE: RelocationCount: 0
MULTISECTIONS-ARCHIVE: Type: 0x0
MULTISECTIONS-ARCHIVE: Attributes [ (0x800004)
MULTISECTIONS-ARCHIVE: PureInstructions (0x800000)
MULTISECTIONS-ARCHIVE: SomeInstructions (0x4)
MULTISECTIONS-ARCHIVE: ]
MULTISECTIONS-ARCHIVE: Reserved1: 0x0
MULTISECTIONS-ARCHIVE: Reserved2: 0x0
MULTISECTIONS-ARCHIVE: }
MULTISECTIONS-ARCHIVE: Section {
MULTISECTIONS-ARCHIVE: Index: 1
MULTISECTIONS-ARCHIVE: Name: __data (5F 5F 64 61 74 61 00 00 00 00 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Segment: __DATA (5F 5F 44 41 54 41 00 00 00 00 00 00 00 00 00 00)
MULTISECTIONS-ARCHIVE: Address: 0x8
MULTISECTIONS-ARCHIVE: Size: 0x4
MULTISECTIONS-ARCHIVE: Offset: 332
MULTISECTIONS-ARCHIVE: Alignment: 2
MULTISECTIONS-ARCHIVE: RelocationOffset: 0x0
MULTISECTIONS-ARCHIVE: RelocationCount: 0
MULTISECTIONS-ARCHIVE: Type: 0x0
MULTISECTIONS-ARCHIVE: Attributes [ (0x0)
MULTISECTIONS-ARCHIVE: ]
MULTISECTIONS-ARCHIVE: Reserved1: 0x0
MULTISECTIONS-ARCHIVE: Reserved2: 0x0
MULTISECTIONS-ARCHIVE: }
MULTISECTIONS-ARCHIVE: ]

tools/llvm-readobj/llvm-readobj.cpp

Show First 20 Lines • Show All 319 Lines • ▼ Show 20 Lines else
reportError(Arc->getFileName(), readobj_error::unrecognized_file_format); reportError(Arc->getFileName(), readobj_error::unrecognized_file_format);
} }
} }
/// @brief Dumps each object file in \a MachO Universal Binary; /// @brief Dumps each object file in \a MachO Universal Binary;
static void dumpMachOUniversalBinary(const MachOUniversalBinary *UBinary) { static void dumpMachOUniversalBinary(const MachOUniversalBinary *UBinary) {
for (const MachOUniversalBinary::ObjectForArch &Obj : UBinary->objects()) { for (const MachOUniversalBinary::ObjectForArch &Obj : UBinary->objects()) {
ErrorOr<std::unique_ptr<MachOObjectFile>> ObjOrErr = Obj.getAsObjectFile(); ErrorOr<std::unique_ptr<MachOObjectFile>> ObjOrErr = Obj.getAsObjectFile();
if (std::error_code EC = ObjOrErr.getError()) { if (ObjOrErr)
reportError(UBinary->getFileName(), EC.message()); dumpObject(&*ObjOrErr.get());
continue; else if (ErrorOr<std::unique_ptr<Archive>> AOrErr = Obj.getAsArchive())
} dumpArchive(&*AOrErr.get());
else
if (MachOObjectFile *MachOObj = ObjOrErr.get().get()) reportError(UBinary->getFileName(), ObjOrErr.getError().message());
dumpObject(MachOObj);
} }
} }
/// @brief Opens \a File and dumps it. /// @brief Opens \a File and dumps it.
static void dumpInput(StringRef File) { static void dumpInput(StringRef File) {
// If file isn't stdin, check that it exists. // If file isn't stdin, check that it exists.
if (File != "-" && !sys::fs::exists(File)) { if (File != "-" && !sys::fs::exists(File)) {
reportError(File, readobj_error::file_not_found); reportError(File, readobj_error::file_not_found);
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines