[llvm-objdump] Printing hex instead of dec by default

Differential Revision: http://reviews.llvm.org/D18770

llvm-svn: 265817

10 files changed, 29 insertions, 29 deletions

diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/AArch64/macho-symbolized-disassembly.test
index 311ff51fbac..888a904a3b5 100644
--- a/llvm/test/tools/llvm-objdump/AArch64/macho-symbolized-disassembly.test
+++ b/llvm/test/tools/llvm-objdump/AArch64/macho-symbolized-disassembly.test
@@ -1,7 +1,7 @@
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-aarch64 | FileCheck %s -check-prefix=OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-aarch64 | FileCheck %s -check-prefix=EXE
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.obj.macho-aarch64 | FileCheck %s -check-prefix=ObjC-OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.exe.macho-aarch64 | FileCheck %s -check-prefix=ObjC-EXE
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.obj.macho-aarch64 | FileCheck %s -check-prefix=OBJ
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.exe.macho-aarch64 | FileCheck %s -check-prefix=EXE
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/ObjC.obj.macho-aarch64 | FileCheck %s -check-prefix=ObjC-OBJ
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/ObjC.exe.macho-aarch64 | FileCheck %s -check-prefix=ObjC-EXE
 
 OBJ: 000000000000001c	adrp	x0, L_.str@PAGE
 OBJ: 0000000000000020	add	x0, x0, L_.str@PAGEOFF
diff --git a/llvm/test/tools/llvm-objdump/ARM/macho-symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/ARM/macho-symbolized-disassembly.test
index eeeab526cf8..9dc7ecc9ba0 100644
--- a/llvm/test/tools/llvm-objdump/ARM/macho-symbolized-disassembly.test
+++ b/llvm/test/tools/llvm-objdump/ARM/macho-symbolized-disassembly.test
@@ -1,5 +1,5 @@
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-arm | FileCheck %s -check-prefix=OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-arm | FileCheck %s -check-prefix=EXE
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.obj.macho-arm | FileCheck %s -check-prefix=OBJ
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.exe.macho-arm | FileCheck %s -check-prefix=EXE
 
 OBJ: 00000006	movw	r3, :lower16:((54-14)-4)
 OBJ: 0000000a	movt	r3, :upper16:((54-14)-4)
diff --git a/llvm/test/tools/llvm-objdump/X86/coff-disassemble-export.test b/llvm/test/tools/llvm-objdump/X86/coff-disassemble-export.test
index 2f0b211815c..c920bab1b8a 100644
--- a/llvm/test/tools/llvm-objdump/X86/coff-disassemble-export.test
+++ b/llvm/test/tools/llvm-objdump/X86/coff-disassemble-export.test
@@ -1,4 +1,4 @@
-// RUN: llvm-objdump -d %p/Inputs/disassemble.dll.coff-i386 | \
+// RUN: llvm-objdump --print-imm-hex=false -d %p/Inputs/disassemble.dll.coff-i386 | \
 // RUN:   FileCheck %s
 
 // CHECK-LABEL: g:
diff --git a/llvm/test/tools/llvm-objdump/X86/hex-displacement.test b/llvm/test/tools/llvm-objdump/X86/hex-displacement.test
index dd2332e572f..e906c1c506a 100644
--- a/llvm/test/tools/llvm-objdump/X86/hex-displacement.test
+++ b/llvm/test/tools/llvm-objdump/X86/hex-displacement.test
@@ -1,6 +1,6 @@
 # Check that target displacement has '0x' prefix
 # to accent hex format of the number.
 
-# RUN: llvm-objdump -d %p/Inputs/hello.exe.macho-i386 | FileCheck %s
+# RUN: llvm-objdump --print-imm-hex=false -d %p/Inputs/hello.exe.macho-i386 | FileCheck %s
 
 # CHECK: 1f47:   e8 00 00 00 00  calll   0 <_main+0xC>
diff --git a/llvm/test/tools/llvm-objdump/X86/macho-dis-no-leading-addr.test b/llvm/test/tools/llvm-objdump/X86/macho-dis-no-leading-addr.test
index df4618dc468..3cec27e48d0 100644
--- a/llvm/test/tools/llvm-objdump/X86/macho-dis-no-leading-addr.test
+++ b/llvm/test/tools/llvm-objdump/X86/macho-dis-no-leading-addr.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -m -d %p/Inputs/hello.obj.macho-x86_64 -no-show-raw-insn -print-imm-hex -no-leading-addr | FileCheck %s
+# RUN: llvm-objdump -m -d %p/Inputs/hello.obj.macho-x86_64 -no-show-raw-insn -no-leading-addr | FileCheck %s
 
 # CHECK: (__TEXT,__text) section
 # CHECK: _main:
diff --git a/llvm/test/tools/llvm-objdump/X86/macho-dis-symname.test b/llvm/test/tools/llvm-objdump/X86/macho-dis-symname.test
index 39d16ecba6f..71ba0230eb2 100644
--- a/llvm/test/tools/llvm-objdump/X86/macho-dis-symname.test
+++ b/llvm/test/tools/llvm-objdump/X86/macho-dis-symname.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -m -d %p/Inputs/exeThread.macho-x86_64 -dis-symname start -no-show-raw-insn -full-leading-addr -print-imm-hex | FileCheck %s
+# RUN: llvm-objdump -m -d %p/Inputs/exeThread.macho-x86_64 -dis-symname start -no-show-raw-insn -full-leading-addr | FileCheck %s
 
 # CHECK: (__TEXT,__text) section
 # CHECK: start:
diff --git a/llvm/test/tools/llvm-objdump/X86/macho-nontext-disasm.test b/llvm/test/tools/llvm-objdump/X86/macho-nontext-disasm.test
index 27b7bb44152..ef55f75e7a7 100644
--- a/llvm/test/tools/llvm-objdump/X86/macho-nontext-disasm.test
+++ b/llvm/test/tools/llvm-objdump/X86/macho-nontext-disasm.test
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __FOO,__bar -full-leading-addr -print-imm-hex -no-show-raw-insn - | FileCheck %s
+# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __FOO,__bar -full-leading-addr -no-show-raw-insn - | FileCheck %s
 
 .section __FOO, __bar
 _foo:
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 6f49b456227..a5af6190a54 100644
--- a/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test
+++ b/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test
@@ -1,14 +1,14 @@
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=EXE
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.obj.macho-x86_64 | FileCheck %s -check-prefix=ObjC-OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.exe.macho-x86_64 | FileCheck %s -check-prefix=ObjC-EXE
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello_cpp.exe.macho-x86_64 | FileCheck %s -check-prefix=CXX-EXE
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=OBJ
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=EXE
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/ObjC.obj.macho-x86_64 | FileCheck %s -check-prefix=ObjC-OBJ
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/ObjC.exe.macho-x86_64 | FileCheck %s -check-prefix=ObjC-EXE
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello_cpp.exe.macho-x86_64 | FileCheck %s -check-prefix=CXX-EXE
 
-// 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 %p/Inputs/hello.obj.macho-i386 | FileCheck %s -check-prefix=i386-OBJ
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %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
+// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -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 -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
diff --git a/llvm/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test b/llvm/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test
index 260e9aa341e..c0a3d2ebe93 100644
--- a/llvm/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test
+++ b/llvm/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test
@@ -1,6 +1,6 @@
-RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -arch all \
+RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -arch all \
 RUN: | FileCheck %s -check-prefix UEXE-all
-RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -arch i386 \
+RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -arch i386 \
 RUN: | FileCheck %s -check-prefix UArchive-i386
 RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -universal-headers -m \
 RUN: | FileCheck %s -check-prefix FAT
diff --git a/llvm/test/tools/llvm-objdump/X86/malformed-machos.test b/llvm/test/tools/llvm-objdump/X86/malformed-machos.test
index a47e43443c5..3abf4f7227a 100644
--- a/llvm/test/tools/llvm-objdump/X86/malformed-machos.test
+++ b/llvm/test/tools/llvm-objdump/X86/malformed-machos.test
@@ -1,40 +1,40 @@
 // These test checks that llvm-objdump will not crash with malformed Mach-O
 // files.  So the check line is not all that important but the bug fixes to
 // make sure llvm-objdump is robust is what matters.
-# RUN: llvm-objdump -macho -objc-meta-data \
+# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \
 # RUN:   %p/Inputs/malformed-machos/mem-crup-0001.macho \
 # RUN:   | FileCheck -check-prefix=m0001 %s 
 
 # m0001: (method_t extends past the end of the section)
 
-# RUN: llvm-objdump -macho -objc-meta-data \
+# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \
 # RUN:   %p/Inputs/malformed-machos/mem-crup-0006.macho \
 # RUN:   | FileCheck -check-prefix=m0006 %s 
 
 # m0006: ivarLayout 0x8
 
-# RUN: llvm-objdump -macho -objc-meta-data \
+# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \
 # RUN:   %p/Inputs/malformed-machos/mem-crup-0006.macho \
 # RUN:   | FileCheck -check-prefix=m0010 %s 
 
 # m0010: 00000000000010e0 0x10e8 _OBJC_CLASS_
 
-# RUN: llvm-objdump -macho -objc-meta-data \
+# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \
 # RUN:   %p/Inputs/malformed-machos/mem-crup-0040.macho \
 # RUN:   | FileCheck -check-prefix=m0040 %s 
 
 # m0040: 00000000000010a0 0xf39 -[tiny_dylib init]
 
-# RUN: llvm-objdump -macho -objc-meta-data \
+# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \
 # RUN:   %p/Inputs/malformed-machos/mem-crup-0080.macho \
 # RUN:   | FileCheck -check-prefix=m0080 %s 
 
 # m0080: data 0xf960000 (struct class_ro_t *)
 
-# RUN: llvm-objdump -macho -objc-meta-data \
+# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \
 # RUN:   %p/Inputs/malformed-machos/mem-crup-0261.macho
 
-# RUN: llvm-objdump -macho -disassemble \
+# RUN: llvm-objdump --print-imm-hex=false -macho -disassemble \
 # RUN:   %p/Inputs/malformed-machos/mem-crup-0337.macho \
 # RUN:   | FileCheck -check-prefix=m0337 %s