From 3e96531186ba574b0c25a4be62d24b8b7d752c9f Mon Sep 17 00:00:00 2001 From: Jim Grosbach Date: Fri, 18 May 2012 19:12:01 +0000 Subject: Refactor data-in-code annotations. Use a dedicated MachO load command to annotate data-in-code regions. This is the same format the linker produces for final executable images, allowing consistency of representation and use of introspection tools for both object and executable files. Data-in-code regions are annotated via ".data_region"/".end_data_region" directive pairs, with an optional region type. data_region_directive := ".data_region" { region_type } region_type := "jt8" | "jt16" | "jt32" | "jta32" end_data_region_directive := ".end_data_region" The previous handling of ARM-style "$d.*" labels was broken and has been removed. Specifically, it didn't handle ARM vs. Thumb mode when marking the end of the section. rdar://11459456 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157062 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/macho-dump/macho-dump.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'tools') diff --git a/tools/macho-dump/macho-dump.cpp b/tools/macho-dump/macho-dump.cpp index f65c79595a9..20deda9a0cb 100644 --- a/tools/macho-dump/macho-dump.cpp +++ b/tools/macho-dump/macho-dump.cpp @@ -332,6 +332,35 @@ static int DumpLinkeditDataCommand(MachOObject &Obj, return 0; } +static int DumpDataInCodeDataCommand(MachOObject &Obj, + const MachOObject::LoadCommandInfo &LCI) { + InMemoryStruct LLC; + Obj.ReadLinkeditDataLoadCommand(LCI, LLC); + if (!LLC) + return Error("unable to read segment load command"); + + outs() << " ('dataoff', " << LLC->DataOffset << ")\n" + << " ('datasize', " << LLC->DataSize << ")\n" + << " ('_data_regions', [\n"; + + + unsigned NumRegions = LLC->DataSize / 8; + for (unsigned i = 0; i < NumRegions; ++i) { + InMemoryStruct DICE; + Obj.ReadDataInCodeTableEntry(LLC->DataOffset, i, DICE); + if (!DICE) + return Error("unable to read DataInCodeTableEntry"); + outs() << " # DICE " << i << "\n" + << " ('offset', " << DICE->Offset << ")\n" + << " ('length', " << DICE->Length << ")\n" + << " ('kind', " << DICE->Kind << ")\n"; + } + + outs() <<" ])\n"; + + return 0; +} + static int DumpLoadCommand(MachOObject &Obj, unsigned Index) { const MachOObject::LoadCommandInfo &LCI = Obj.getLoadCommandInfo(Index); @@ -358,6 +387,9 @@ static int DumpLoadCommand(MachOObject &Obj, unsigned Index) { case macho::LCT_FunctionStarts: Res = DumpLinkeditDataCommand(Obj, LCI); break; + case macho::LCT_DataInCode: + Res = DumpDataInCodeDataCommand(Obj, LCI); + break; default: Warning("unknown load command: " + Twine(LCI.Command.Type)); break; -- cgit v1.2.3