1 files changed, 26 insertions, 10 deletions

diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index a735c09..f5b8523 100644
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -4163,6 +4163,20 @@ riscv_gnu_triplet_regexp (struct gdbarch *gdbarch)
   return "riscv(32|64)?";
 }
 
+/* Implement the "print_insn" gdbarch method.  */
+
+static int
+riscv_print_insn (bfd_vma addr, struct disassemble_info *info)
+{
+  /* Initialize the BFD section to enable ISA string detection depending on the
+     object in scope.  */
+  struct obj_section *s = find_pc_section (addr);
+  if (s != nullptr)
+    info->section = s->the_bfd_section;
+
+  return default_print_insn (addr, info);
+}
+
 /* Implementation of `gdbarch_stap_is_single_operand', as defined in
    gdbarch.h.  */
 
@@ -4429,6 +4443,9 @@ riscv_gdbarch_init (struct gdbarch_info info,
 					  disassembler_options_riscv ());
   set_gdbarch_disassembler_options (gdbarch, &riscv_disassembler_options);
 
+  /* Disassembler print_insn.  */
+  set_gdbarch_print_insn (gdbarch, riscv_print_insn);
+
   /* SystemTap Support.  */
   set_gdbarch_stap_is_single_operand (gdbarch, riscv_stap_is_single_operand);
   set_gdbarch_stap_register_indirection_prefixes
@@ -4778,9 +4795,7 @@ riscv_supply_regset (const struct regset *regset,
     }
 }
 
-void _initialize_riscv_tdep ();
-void
-_initialize_riscv_tdep ()
+INIT_GDB_FILE (riscv_tdep)
 {
   riscv_init_reggroups ();
 
@@ -4884,7 +4899,7 @@ try_read (struct regcache *regcache, int regnum, ULONGEST &addr)
   if (regcache->raw_read (regnum, &addr)
       != register_status::REG_VALID)
     {
-      warning (_("Can not read at address %lx"), addr);
+      warning (_("Can not read at address %s"), hex_string (addr));
       return false;
     }
   return true;
@@ -5158,7 +5173,7 @@ private:
   {
     return (is_csrrw_insn (ival) || is_csrrs_insn (ival) || is_csrrc_insn (ival)
 	   || is_csrrwi_insn (ival) || is_csrrsi_insn (ival)
-	   || is_csrrc_insn (ival));
+	   || is_csrrci_insn (ival));
   }
 
   /* Returns true if instruction is classified.  This function can set
@@ -5270,8 +5285,8 @@ private:
 	|| try_save_pc_rd_mem (ival, regcache))
       return !has_error ();
 
-    warning (_("Currently this instruction with len 4(%lx) is unsupported"),
-	     ival);
+    warning (_("Currently this instruction with len 4(%s) is unsupported"),
+	     hex_string (ival));
     return false;
   }
 
@@ -5380,8 +5395,8 @@ private:
 	       || !save_mem (addr + offset, 4) || set_ordinary_record_type ());
       }
 
-    warning (_("Currently this instruction with len 2(%lx) is unsupported"),
-	     ival);
+    warning (_("Currently this instruction with len 2(%s) is unsupported"),
+	     hex_string (ival));
     return false;
   }
 
@@ -5415,7 +5430,8 @@ public:
        are not defined yet, so just ignore it.  */
     gdb_assert (m_length > 0 && m_length % 2 == 0);
 
-    warning (_("Can not record unknown instruction (opcode = %lx)"), ival);
+    warning (_("Can not record unknown instruction (opcode = %s)"),
+	     hex_string (ival));
     return false;
   }