This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Display system registers by their names when disassembling RL78 instructions.
- From: Nick Clifton <nickc at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 27 Oct 2015 14:50:12 -0000
- Subject: [binutils-gdb] Display system registers by their names when disassembling RL78 instructions.
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4666280441d1a8d3479d45f1ec5b67cf83d58f35
commit 4666280441d1a8d3479d45f1ec5b67cf83d58f35
Author: Vinay Kumar <vinay.g@kpit.com>
Date: Tue Oct 27 14:49:02 2015 +0000
Display system registers by their names when disassembling RL78 instructions.
PR binutils/19158
opcodes * rl78-decode.opc: Add 's' print operator to instructions that
access system registers.
* rl78-decode.c: Regenerate.
* rl78-dis.c (print_insn_rl78_common): Decode all system
registers.
tests * gas/rl78/pr19158.s: New test source file.
* gas/rl78/pr19158.d: New test case.
* gas/rl78/rl78.exp: Run the new test.
Diff:
---
gas/testsuite/ChangeLog | 7 +++++++
gas/testsuite/gas/rl78/pr19158.d | 19 +++++++++++++++++++
gas/testsuite/gas/rl78/pr19158.s | 20 ++++++++++++++++++++
gas/testsuite/gas/rl78/rl78.exp | 1 +
opcodes/ChangeLog | 9 +++++++++
opcodes/rl78-decode.c | 18 +++++++++---------
opcodes/rl78-decode.opc | 8 ++++----
opcodes/rl78-dis.c | 12 ++++++++++++
8 files changed, 81 insertions(+), 13 deletions(-)
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index df44690..08303ee 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,12 @@
2015-10-27 Nick Clifton <nickc@redhat.com>
+ PR binutils/19158
+ * gas/rl78/pr19158.s: New test source file.
+ * gas/rl78/pr19158.d: New test case.
+ * gas/rl78/rl78.exp: Run the new test.
+
+2015-10-27 Nick Clifton <nickc@redhat.com>
+
PR binutils/19157
* gas/rl78: New directory.
* gas/rl78/rl78.exp: New test driver.
diff --git a/gas/testsuite/gas/rl78/pr19158.d b/gas/testsuite/gas/rl78/pr19158.d
new file mode 100644
index 0000000..9e1bfe4
--- /dev/null
+++ b/gas/testsuite/gas/rl78/pr19158.d
@@ -0,0 +1,19 @@
+#objdump: -d --prefix-addresses --show-raw-insn
+#name: PR19158: RL78: Show the system registers in disassembly
+
+.*: +file format .*rl78.*
+
+Disassembly of section .text:
+0+000 <.*> 8e f8[ ]+mov[ ]+a, spl
+0+002 <.*> 9e f8[ ]+mov[ ]+spl, a
+0+004 <.*> ce f8 7b[ ]+mov[ ]+spl, #123
+0+007 <.*> 61 ab f8[ ]+xch[ ]+a, spl
+0+00a <.*> ae f8[ ]+movw[ ]+ax, sp
+0+00c <.*> be f8[ ]+movw[ ]+sp, ax
+0+00e <.*> cb f8 34 12[ ]+movw[ ]+sp, #0x1234
+0+012 <.*> 61 ab fa[ ]+xch[ ]+a, psw
+0+015 <.*> 61 ab f9[ ]+xch[ ]+a, sph
+0+018 <.*> 61 ab fc[ ]+xch[ ]+a, cs
+0+01b <.*> 61 ab fd[ ]+xch[ ]+a, es
+0+01e <.*> 61 ab fe[ ]+xch[ ]+a, pmc
+0+021 <.*> 61 ab ff[ ]+xch[ ]+a, mem
diff --git a/gas/testsuite/gas/rl78/pr19158.s b/gas/testsuite/gas/rl78/pr19158.s
new file mode 100644
index 0000000..f4a3312
--- /dev/null
+++ b/gas/testsuite/gas/rl78/pr19158.s
@@ -0,0 +1,20 @@
+ .text
+.set sfr, 0xffff8
+ mov a, sfr
+ mov sfr, a
+ mov sfr, #123
+ xch a, sfr
+
+.set sfrp, 0xffff8
+ movw ax, sfrp
+ movw sfrp, ax
+ movw sfrp, #0x1234
+
+ xch a, 0xffffa
+ xch a, 0xffff9
+ xch a, 0xffffc
+ xch a, 0xffffd
+ xch a, 0xffffe
+ xch a, 0xfffff
+
+
\ No newline at end of file
diff --git a/gas/testsuite/gas/rl78/rl78.exp b/gas/testsuite/gas/rl78/rl78.exp
index 9341981..2ec0209 100644
--- a/gas/testsuite/gas/rl78/rl78.exp
+++ b/gas/testsuite/gas/rl78/rl78.exp
@@ -20,4 +20,5 @@
if [expr [istarget "rl78-*-*"]] then {
run_dump_test "pr19157"
+ run_dump_test "pr19158"
}
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index a2a9cd4..dc285c1 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,14 @@
2015-10-27 Vinay Kumar <vinay.g@kpit.com>
+ PR binutils/19158
+ * rl78-decode.opc: Add 's' print operator to instructions that
+ access system registers.
+ * rl78-decode.c: Regenerate.
+ * rl78-dis.c (print_insn_rl78_common): Decode all system
+ registers.
+
+2015-10-27 Vinay Kumar <vinay.g@kpit.com>
+
PR binutils/19157
* rl78-decode.opc: Add 'a' print operator to mov instructions
using stack pointer plus index addressing.
diff --git a/opcodes/rl78-decode.c b/opcodes/rl78-decode.c
index be78c6a..902e5fb 100644
--- a/opcodes/rl78-decode.c
+++ b/opcodes/rl78-decode.c
@@ -2477,14 +2477,14 @@ rl78_decode_opcode (unsigned long pc AU,
break;
case 0xab:
{
- /** 0110 0001 1010 1011 xch %0, %1 */
+ /** 0110 0001 1010 1011 xch %0, %s1 */
if (trace)
{
printf ("\033[33m%s\033[0m %02x %02x\n",
"/** 0110 0001 1010 1011 xch %0, %1 */",
op[0], op[1]);
}
- SYNTAX("xch %0, %1");
+ SYNTAX("xch %0, %s1");
#line 1232 "rl78-decode.opc"
ID(xch); DR(A); SM(None, SFR);
@@ -4566,14 +4566,14 @@ rl78_decode_opcode (unsigned long pc AU,
break;
case 0x9e:
{
- /** 1001 1110 mov %0, %1 */
+ /** 1001 1110 mov %s0, %1 */
if (trace)
{
printf ("\033[33m%s\033[0m %02x\n",
"/** 1001 1110 mov %0, %1 */",
op[0]);
}
- SYNTAX("mov %0, %1");
+ SYNTAX("mov %s0, %1");
#line 780 "rl78-decode.opc"
ID(mov); DM(None, SFR); SR(A);
@@ -4979,14 +4979,14 @@ rl78_decode_opcode (unsigned long pc AU,
break;
case 0xbe:
{
- /** 1011 1110 movw %0, %1 */
+ /** 1011 1110 movw %s0, %1 */
if (trace)
{
printf ("\033[33m%s\033[0m %02x\n",
- "/** 1011 1110 movw %0, %1 */",
+ "/** 1011 1110 movw %s0, %1 */",
op[0]);
}
- SYNTAX("movw %0, %1");
+ SYNTAX("movw %s0, %1");
#line 901 "rl78-decode.opc"
ID(mov); W(); DM(None, SFR); SR(AX);
@@ -5098,14 +5098,14 @@ rl78_decode_opcode (unsigned long pc AU,
break;
case 0xcb:
{
- /** 1100 1011 movw %0, #%1 */
+ /** 1100 1011 movw %s0, #%1 */
if (trace)
{
printf ("\033[33m%s\033[0m %02x\n",
"/** 1100 1011 movw %0, #%1 */",
op[0]);
}
- SYNTAX("movw %0, #%1");
+ SYNTAX("movw %s0, #%1");
#line 898 "rl78-decode.opc"
ID(mov); W(); DM(None, SFR); SC(IMMU(2));
diff --git a/opcodes/rl78-decode.opc b/opcodes/rl78-decode.opc
index 8bb8d09..28362c1 100644
--- a/opcodes/rl78-decode.opc
+++ b/opcodes/rl78-decode.opc
@@ -776,7 +776,7 @@ rl78_decode_opcode (unsigned long pc AU,
break;
}
-/** 1001 1110 mov %0, %1 */
+/** 1001 1110 mov %s0, %1 */
ID(mov); DM(None, SFR); SR(A);
/*----------------------------------------------------------------------*/
@@ -894,10 +894,10 @@ rl78_decode_opcode (unsigned long pc AU,
/** 1011 1101 movw %0, %1 */
ID(mov); W(); DM(None, SADDR); SR(AX);
-/** 1100 1011 movw %0, #%1 */
+/** 1100 1011 movw %s0, #%1 */
ID(mov); W(); DM(None, SFR); SC(IMMU(2));
-/** 1011 1110 movw %0, %1 */
+/** 1011 1110 movw %s0, %1 */
ID(mov); W(); DM(None, SFR); SR(AX);
/*----------------------------------------------------------------------*/
@@ -1228,7 +1228,7 @@ rl78_decode_opcode (unsigned long pc AU,
/** 0110 0001 1010 1000 xch %0, %1 */
ID(xch); DR(A); SM(None, SADDR);
-/** 0110 0001 1010 1011 xch %0, %1 */
+/** 0110 0001 1010 1011 xch %0, %s1 */
ID(xch); DR(A); SM(None, SFR);
/** 0000 1000 xch a, x */
diff --git a/opcodes/rl78-dis.c b/opcodes/rl78-dis.c
index 0d98d00..631ac25 100644
--- a/opcodes/rl78-dis.c
+++ b/opcodes/rl78-dis.c
@@ -265,6 +265,18 @@ print_insn_rl78_common (bfd_vma addr, disassemble_info * dis, RL78_Dis_Isa isa)
PR (PS, "psw");
else if (oper->addend == 0xffff8 && do_sfr && opcode.size == RL78_Word)
PR (PS, "sp");
+ else if (oper->addend == 0xffff8 && do_sfr && opcode.size == RL78_Byte)
+ PR (PS, "spl");
+ else if (oper->addend == 0xffff9 && do_sfr && opcode.size == RL78_Byte)
+ PR (PS, "sph");
+ else if (oper->addend == 0xffffc && do_sfr && opcode.size == RL78_Byte)
+ PR (PS, "cs");
+ else if (oper->addend == 0xffffd && do_sfr && opcode.size == RL78_Byte)
+ PR (PS, "es");
+ else if (oper->addend == 0xffffe && do_sfr && opcode.size == RL78_Byte)
+ PR (PS, "pmc");
+ else if (oper->addend == 0xfffff && do_sfr && opcode.size == RL78_Byte)
+ PR (PS, "mem");
else if (oper->addend >= 0xffe20)
PR (PS, "%#x", oper->addend);
else