works with less than base ISA qemu-system-riscv32 -M virt -bios none -kernel output...

[qemu.git] / disas / sh4.c

diff --git a/disas/sh4.c b/disas/sh4.c
index 8b0415dfe9b538fe5e61c77954444819e51abb15..dcdbdf26d8e2175befdc37030c06998848d1ab78 100644 (file)
--- a/disas/sh4.c
+++ b/disas/sh4.c
@@ -16,7 +16,7 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "qemu/osdep.h"
-#include "disas/bfd.h"
+#include "disas/dis-asm.h"
 
 #define DEFINE_TABLE
 
@@ -264,12 +264,6 @@ sh_dsp_reg_nums;
    be some confusion between DSP and FPU etc.  */
 #define SH_ARCH_UNKNOWN_ARCH 0xffffffff
 
-/* These are defined in bfd/cpu-sh.c .  */
-unsigned int sh_get_arch_from_bfd_mach (unsigned long mach);
-unsigned int sh_get_arch_up_from_bfd_mach (unsigned long mach);
-unsigned long sh_get_bfd_mach_from_arch_set (unsigned int arch_set);
-/* bfd_boolean sh_merge_bfd_arch (bfd *ibfd, bfd *obfd); */
-
 /* Below are the 'architecture sets'.
    They describe the following inheritance graph:
 
@@ -1969,6 +1963,7 @@ print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)
                  fprintf_fn (stream, "xd%d", rn & ~1);
                  break;
                }
+             /* fallthrough */
            case D_REG_N:
              fprintf_fn (stream, "dr%d", rn);
              break;
@@ -1978,6 +1973,7 @@ print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)
                  fprintf_fn (stream, "xd%d", rm & ~1);
                  break;
                }
+             /* fallthrough */
            case D_REG_M:
              fprintf_fn (stream, "dr%d", rm);
              break;