From 8e29ec9ec25c03e772f7b449530136bc6d7ed63c Mon Sep 17 00:00:00 2001 From: Kevin Enderby Date: Tue, 17 Mar 2015 22:26:11 +0000 Subject: [PATCH] Add the option -no-symbolic-operands to llvm-objdump used with -macho and -disassemble to not symbolic operands when disassembling. llvm-svn: 232558 --- .../tools/llvm-objdump/X86/macho-symbolized-disassembly.test | 9 +++++++++ llvm/tools/llvm-objdump/MachODump.cpp | 10 +++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test index 1e1080a..6f49b45 100644 --- a/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test +++ b/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test @@ -7,6 +7,9 @@ // RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-i386 | FileCheck %s -check-prefix=i386-OBJ // RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-i386 | FileCheck %s -check-prefix=i386-EXE +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -no-symbolic-operands %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=NO-SYM-OPS-OBJ +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -no-symbolic-operands %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=NO-SYM-OPS-EXE + OBJ: 0000000000000008 leaq L_.str(%rip), %rax ## literal pool for: "Hello world\n" OBJ: 0000000000000026 callq _printf @@ -36,3 +39,9 @@ CXX-EXE: 00000001000014cb callq __ZNSt3__116__pad_and_outputIcNS_11char_traitsIc i386-OBJ: 0000002f calll _printf i386-EXE: 00001f6f calll 0x1f84 ## symbol stub for: _printf + +NO-SYM-OPS-OBJ: 0000000000000008 leaq (%rip), %rax +NO-SYM-OPS-OBJ: 0000000000000026 callq 0x2b + +NO-SYM-OPS-EXE: 0000000100000f38 leaq 0x4f(%rip), %rax +NO-SYM-OPS-EXE: 0000000100000f56 callq 0x100000f6c diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index 2b0b268..3c8b9bc 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -66,7 +66,6 @@ static cl::opt FullLeadingAddr("full-leading-addr", static cl::opt NoLeadingAddr("no-leading-addr", cl::desc("Print no leading address")); - static cl::opt PrintImmHex("print-imm-hex", cl::desc("Use hex format for immediate values")); @@ -124,6 +123,11 @@ cl::opt llvm::DisSymName( "dis-symname", cl::desc("disassemble just this symbol's instructions (requires -macho")); +static cl::opt NoSymbolicOperands( + "no-symbolic-operands", + cl::desc("do not symbolic operands when disassembling (requires -macho)")); + + static cl::list ArchFlags("arch", cl::desc("architecture(s) from a Mach-O file to dump"), cl::ZeroOrMore); @@ -3209,7 +3213,7 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, return; } // Set up the block of info used by the Symbolizer call backs. - SymbolizerInfo.verbose = true; + SymbolizerInfo.verbose = !NoSymbolicOperands; SymbolizerInfo.O = MachOOF; SymbolizerInfo.S = Sections[SectIdx]; SymbolizerInfo.AddrMap = &AddrMap; @@ -3222,7 +3226,7 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, SymbolizerInfo.adrp_addr = 0; SymbolizerInfo.adrp_inst = 0; // Same for the ThumbSymbolizer - ThumbSymbolizerInfo.verbose = true; + ThumbSymbolizerInfo.verbose = !NoSymbolicOperands; ThumbSymbolizerInfo.O = MachOOF; ThumbSymbolizerInfo.S = Sections[SectIdx]; ThumbSymbolizerInfo.AddrMap = &AddrMap; -- 2.7.4