diff options
author | Michael J. Spencer <bigcheesegs@gmail.com> | 2011-09-27 19:37:18 +0000 |
---|---|---|
committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2011-09-27 19:37:18 +0000 |
commit | 9142ae2cf802dbcd1c622154ac9b5305fb26c38f (patch) | |
tree | c085b7a921c53777b0bac88a594cc44a930a6425 | |
parent | a51d7d97b0b8187ed68d4cbad2374f514d2cd168 (diff) | |
download | llvm-9142ae2cf802dbcd1c622154ac9b5305fb26c38f.tar.gz llvm-9142ae2cf802dbcd1c622154ac9b5305fb26c38f.tar.bz2 llvm-9142ae2cf802dbcd1c622154ac9b5305fb26c38f.tar.xz |
Add binary archive support to llvm-nm.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@140627 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | test/Object/TestObjectFiles/archive-test.a-bitcode | bin | 0 -> 790 bytes | |||
-rw-r--r-- | test/Object/TestObjectFiles/archive-test.a-coff-i386 | bin | 0 -> 658 bytes | |||
-rw-r--r-- | test/Object/nm-archive.test | 17 | ||||
-rw-r--r-- | tools/llvm-nm/llvm-nm.cpp | 37 |
4 files changed, 44 insertions, 10 deletions
diff --git a/test/Object/TestObjectFiles/archive-test.a-bitcode b/test/Object/TestObjectFiles/archive-test.a-bitcode Binary files differnew file mode 100644 index 0000000000..3aeb34fa33 --- /dev/null +++ b/test/Object/TestObjectFiles/archive-test.a-bitcode diff --git a/test/Object/TestObjectFiles/archive-test.a-coff-i386 b/test/Object/TestObjectFiles/archive-test.a-coff-i386 Binary files differnew file mode 100644 index 0000000000..846cd636f1 --- /dev/null +++ b/test/Object/TestObjectFiles/archive-test.a-coff-i386 diff --git a/test/Object/nm-archive.test b/test/Object/nm-archive.test new file mode 100644 index 0000000000..da6144ee71 --- /dev/null +++ b/test/Object/nm-archive.test @@ -0,0 +1,17 @@ +RUN: llvm-nm %p/TestObjectFiles/archive-test.a-coff-i386 \ +RUN: | FileCheck %s -check-prefix COFF +RUN: llvm-nm %p/TestObjectFiles/archive-test.a-bitcode \ +RUN: | FileCheck %s -check-prefix BITCODE + + +COFF: trivial-object-test.coff-i386: +COFF-NEXT: 00000000 d .data +COFF-NEXT: 00000000 t .text +COFF-NEXT: 00000000 d L_.str +COFF-NEXT: U _SomeOtherFunction +COFF-NEXT: 00000000 T _main +COFF-NEXT: U _puts + +BITCODE: U SomeOtherFunction +BITCODE-NEXT: T main +BITCODE-NEXT: U puts diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp index 71c02d130f..b8ede8c035 100644 --- a/tools/llvm-nm/llvm-nm.cpp +++ b/tools/llvm-nm/llvm-nm.cpp @@ -20,6 +20,7 @@ #include "llvm/Module.h" #include "llvm/Bitcode/ReaderWriter.h" #include "llvm/Bitcode/Archive.h" +#include "llvm/Object/Archive.h" #include "llvm/Object/ObjectFile.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileSystem.h" @@ -318,18 +319,34 @@ static void DumpSymbolNamesFromFile(std::string &Filename) { errs() << ToolName << ": " << Filename << ": " << ErrorMessage << "\n"; } else if (aPath.isArchive()) { - std::string ErrMsg; - Archive* archive = Archive::OpenAndLoad(sys::Path(Filename), Context, - &ErrorMessage); - if (!archive) - errs() << ToolName << ": " << Filename << ": " << ErrorMessage << "\n"; - std::vector<Module *> Modules; - if (archive->getAllModules(Modules, &ErrorMessage)) { - errs() << ToolName << ": " << Filename << ": " << ErrorMessage << "\n"; + OwningPtr<Binary> arch; + if (error_code ec = object::createBinary(aPath.str(), arch)) { + errs() << ToolName << ": " << Filename << ": " << ec.message() << ".\n"; return; } - MultipleFiles = true; - std::for_each (Modules.begin(), Modules.end(), DumpSymbolNamesFromModule); + if (object::Archive *a = dyn_cast<object::Archive>(arch.get())) { + for (object::Archive::child_iterator i = a->begin_children(), + e = a->end_children(); i != e; ++i) { + OwningPtr<Binary> child; + if (error_code ec = i->getAsBinary(child)) { + // Try opening it as a bitcode file. + MemoryBuffer *buff = i->getBuffer(); + Module *Result = 0; + if (buff) + Result = ParseBitcodeFile(buff, Context, &ErrorMessage); + + if (Result) { + DumpSymbolNamesFromModule(Result); + delete Result; + } + continue; + } + if (object::ObjectFile *o = dyn_cast<ObjectFile>(child.get())) { + outs() << o->getFileName() << ":\n"; + DumpSymbolNamesFromObject(o); + } + } + } } else if (aPath.isObjectFile()) { OwningPtr<Binary> obj; if (error_code ec = object::createBinary(aPath.str(), obj)) { |