diff options
author | George Rimar <grimar@accesssoftek.com> | 2018-12-19 10:29:35 +0000 |
---|---|---|
committer | George Rimar <grimar@accesssoftek.com> | 2018-12-19 10:29:35 +0000 |
commit | ff5948bf6f871141d8d14957e4bf088851f2434e (patch) | |
tree | 2b02dfb5a6cdae27b51abc3a5739cc5ba22781da /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
parent | 6622d41e2c469a326aa1f15314b35c87531a8617 (diff) | |
download | llvm-ff5948bf6f871141d8d14957e4bf088851f2434e.zip llvm-ff5948bf6f871141d8d14957e4bf088851f2434e.tar.gz llvm-ff5948bf6f871141d8d14957e4bf088851f2434e.tar.bz2 |
[llvm-objdump] - Fix BB.
Move the helper method before the first incocation in the file.
llvm-svn: 349614
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
-rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index cca0dbc..503ef7f 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -456,6 +456,21 @@ bool llvm::RelocAddressLess(RelocationRef a, RelocationRef b) { return a.getOffset() < b.getOffset(); } +static std::string demangle(StringRef Name) { + char *Demangled = nullptr; + if (Name.startswith("_Z")) + Demangled = itaniumDemangle(Name.data(), Demangled, nullptr, nullptr); + else if (Name.startswith("?")) + Demangled = microsoftDemangle(Name.data(), Demangled, nullptr, nullptr); + + if (!Demangled) + return Name; + + std::string Ret = Demangled; + free(Demangled); + return Ret; +} + template <class ELFT> static std::error_code getRelocationValueString(const ELFObjectFile<ELFT> *Obj, const RelocationRef &RelRef, @@ -1280,22 +1295,6 @@ static void addPltEntries(const ObjectFile *Obj, } } -static std::string demangle(StringRef Name) { - char *Demangled = nullptr; - size_t Size = 0; - if (Name.startswith("_Z")) - Demangled = itaniumDemangle(Name.data(), Demangled, &Size, nullptr); - else if (Name.startswith("?")) - Demangled = microsoftDemangle(Name.data(), Demangled, &Size, nullptr); - - if (!Demangled) - return Name; - - std::string Ret = Demangled; - free(Demangled); - return Ret; -} - static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { if (StartAddress > StopAddress) error("Start address should be less than stop address"); |