From fdddd2900f39584e7d6cee27127593fba2cb0cf2 Mon Sep 17 00:00:00 2001 From: claziss Date: Fri, 3 Nov 2017 15:36:42 +0100 Subject: [PATCH] [ARC] Force the disassam to use the hexadecimal number for printing Force printing of the short/signed values using hexadecimal representation via disassembler option. opcode/ 2017-11-03 Claudiu Zissulescu * arc-dis.c (print_hex): New variable. (parse_option): Check for hex option. (print_insn_arc): Use hexadecimal representation for short immediate values when requested. (print_arc_disassembler_options): Add hex option to the list. binutils/ 2017-11-03 Claudiu Zissulescu * doc/binutils.texi (ARC): Update disassembler options. * testsuite/binutils-all/arc/hexprint.s: New file. * testsuite/binutils-all/arc/objdump.exp: Test hex printing feature. --- binutils/ChangeLog | 7 +++++++ binutils/doc/binutils.texi | 4 ++++ binutils/testsuite/binutils-all/arc/hexprint.s | 2 ++ binutils/testsuite/binutils-all/arc/objdump.exp | 7 ++++++- opcodes/ChangeLog | 8 ++++++++ opcodes/arc-dis.c | 14 +++++++++++++- 6 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 binutils/testsuite/binutils-all/arc/hexprint.s diff --git a/binutils/ChangeLog b/binutils/ChangeLog index aa76e27cf66..ede61022f61 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2017-11-03 Claudiu Zissulescu + + * doc/binutils.texi (ARC): Update disassembler options. + * testsuite/binutils-all/arc/hexprint.s: New file. + * testsuite/binutils-all/arc/objdump.exp: Test hex printing + feature. + 2017-11-03 Mingi Cho Nick Clifton diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi index ad924d81629..03706dbd64f 100644 --- a/binutils/doc/binutils.texi +++ b/binutils/doc/binutils.texi @@ -2313,6 +2313,10 @@ special QuarkSE-EM instructions, @option{fpuda} selects the printing of double precision assist instructions, @option{fpus} selects the printing of FPU single precision FP instructions, while @option{fpud} selects the printing of FPU souble precision FP instructions. +Additionally, one can choose to have all the immediates printed in +hexadecimal using @option{hex}. By default, the short immediates are +printed using the decimal representation, while the long immediate +values are printed as hexadecimal. @option{cpu=...} allows to enforce a particular ISA when disassembling instructions, overriding the @option{-m} value or whatever is in the ELF file. diff --git a/binutils/testsuite/binutils-all/arc/hexprint.s b/binutils/testsuite/binutils-all/arc/hexprint.s new file mode 100644 index 00000000000..bdc61b087ab --- /dev/null +++ b/binutils/testsuite/binutils-all/arc/hexprint.s @@ -0,0 +1,2 @@ + .cpu EM + st r0,[r1,-9] diff --git a/binutils/testsuite/binutils-all/arc/objdump.exp b/binutils/testsuite/binutils-all/arc/objdump.exp index 2037b2b4833..669d57ace75 100644 --- a/binutils/testsuite/binutils-all/arc/objdump.exp +++ b/binutils/testsuite/binutils-all/arc/objdump.exp @@ -91,4 +91,9 @@ check_assembly "arc double_store -Mcpu=em,fpus" $objfile \ # Make sure that the last cpu= value is used. check_assembly "arc double_store -Mcpu=hs,cpu=em" $objfile \ $double_store_em_expected "-Mcpu=hs,cpu=em" - +# Check the hex printing for short immediates. +set thexobj [do_objfile hexprint.s] +check_assembly "arc hex printing" $thexobj \ + {st\s*r0,\[r1,0xfffffff7\]} "-Mhex" +check_assembly "arc normal printing" $thexobj \ + {st\s*r0,\[r1,-9\]} diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index b5366b5cc75..ecf548d0baf 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,11 @@ +2017-11-03 Claudiu Zissulescu + + * arc-dis.c (print_hex): New variable. + (parse_option): Check for hex option. + (print_insn_arc): Use hexadecimal representation for short + immediate values when requested. + (print_arc_disassembler_options): Add hex option to the list. + 2017-11-03 Claudiu Zissulescu * arc-tbl.h (abss, abssh, adc, adcs, adds, aslacc, asls, aslsacc) diff --git a/opcodes/arc-dis.c b/opcodes/arc-dis.c index 9bfcaee1645..7541b74d230 100644 --- a/opcodes/arc-dis.c +++ b/opcodes/arc-dis.c @@ -122,6 +122,9 @@ static linkclass decodelist = NULL; static unsigned enforced_isa_mask = ARC_OPCODE_NONE; +/* True if we want to print using only hex numbers. */ +static bfd_boolean print_hex = FALSE; + /* Macros section. */ #ifdef DEBUG @@ -772,6 +775,8 @@ parse_option (const char *option) add_to_decodelist (FLOAT, DP); add_to_decodelist (FLOAT, CVT); } + else if (CONST_STRNEQ (option, "hex")) + print_hex = TRUE; else fprintf (stderr, _("Unrecognised disassembler option: %s\n"), option); } @@ -1257,7 +1262,12 @@ print_insn_arc (bfd_vma memaddr, if (rname && open_braket) (*info->fprintf_func) (info->stream, "%s", rname); else - (*info->fprintf_func) (info->stream, "%d", value); + { + if (print_hex) + (*info->fprintf_func) (info->stream, "%#x", value); + else + (*info->fprintf_func) (info->stream, "%d", value); + } } else if (operand->flags & ARC_OPERAND_ADDRTYPE) { @@ -1368,6 +1378,8 @@ with -M switch (multiple options should be separated by commas):\n")); fpus Recognize single precision FPU instructions.\n")); fprintf (stream, _("\ fpud Recognize double precision FPU instructions.\n")); + fprintf (stream, _("\ + hex Use only hexadecimal number to print immediates.\n")); } void arc_insn_decode (bfd_vma addr, -- 2.30.2