Fix disassembly of RISC-V CSR instructions under -Mno-aliases

[binutils-gdb.git] / opcodes / rx-dis.c

diff --git a/opcodes/rx-dis.c b/opcodes/rx-dis.c
index 6d4c41a845b640d7bd655599696fdb4a90aafd67..5f2bf352ff57a4b3f4e56c6dc1d9f04d6cf4544e 100644 (file)
--- a/opcodes/rx-dis.c
+++ b/opcodes/rx-dis.c
@@ -1,5 +1,5 @@
 /* Disassembler code for Renesas RX.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Contributed by Red Hat.
    Written by DJ Delorie.
 
@@ -27,22 +27,38 @@
 #include "dis-asm.h"
 #include "opcode/rx.h"
 
+#include <setjmp.h>
+
 typedef struct
 {
   bfd_vma pc;
   disassemble_info * dis;
 } RX_Data;
 
+struct private
+{
+  OPCODES_SIGJMP_BUF bailout;
+};
+
 static int
 rx_get_byte (void * vdata)
 {
   bfd_byte buf[1];
   RX_Data *rx_data = (RX_Data *) vdata;
+  int status;
+
+  status = rx_data->dis->read_memory_func (rx_data->pc,
+                                          buf,
+                                          1,
+                                          rx_data->dis);
+  if (status != 0)
+    {
+      struct private *priv = (struct private *) rx_data->dis->private_data;
 
-  rx_data->dis->read_memory_func (rx_data->pc,
-                                 buf,
-                                 1,
-                                 rx_data->dis);
+      rx_data->dis->memory_error_func (status, rx_data->pc,
+                                      rx_data->dis);
+       OPCODES_SIGLONGJMP (priv->bailout, 1);
+    }
 
   rx_data->pc ++;
   return buf[0];
@@ -65,16 +81,16 @@ static char const * register_names[] =
   "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15",
   /* control register */
   "psw", "pc", "usp", "fpsw", NULL, NULL, NULL, NULL,
-  "bpsw", "bpc", "isp", "fintv", "intb", NULL, NULL, NULL,
+  "bpsw", "bpc", "isp", "fintv", "intb", "extb", NULL, NULL,
+  "a0", "a1", NULL, NULL, NULL, NULL, NULL, NULL,
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
 static char const * condition_names[] =
 {
   /* condition codes */
   "eq", "ne", "c", "nc", "gtu", "leu", "pz", "n",
-  "ge", "lt", "gt", "le", "o", "no", "always", "never"
+  "ge", "lt", "gt", "le", "o", "no", "<invalid>", "<invalid>"
 };
 
 static const char * flag_names[] =
@@ -92,10 +108,18 @@ print_insn_rx (bfd_vma addr, disassemble_info * dis)
   RX_Data rx_data;
   RX_Opcode_Decoded opcode;
   const char * s;
+  struct private priv;
 
+  dis->private_data = (PTR) &priv;
   rx_data.pc = addr;
   rx_data.dis = dis;
 
+  if (OPCODES_SIGSETJMP (priv.bailout) != 0)
+    {
+      /* Error return.  */
+      return -1;
+    }
+
   rv = rx_decode_opcode (addr, &opcode, rx_get_byte, &rx_data);
 
   dis->bytes_per_line = 10;