From 4bdcefbd3dfb0413123683a126e068622ff0164a Mon Sep 17 00:00:00 2001 From: aoliva Date: Thu, 20 Apr 2000 22:15:32 +0000 Subject: [PATCH] * m10300-dis.c (HAVE_AM30, HAVE_AM33): Define. (disassemble): Use them. --- opcodes/ChangeLog | 5 +++++ opcodes/m10300-dis.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index f8b5b3d656..8c529a84a9 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2000-04-20 Alexandre Oliva + + * m10300-dis.c (HAVE_AM30, HAVE_AM33): Define. + (disassemble): Use them. + 2000-04-14 Alan Modra * sysdep.h: Include "ansidecl.h" not diff --git a/opcodes/m10300-dis.c b/opcodes/m10300-dis.c index 1346b697e3..554d3280a6 100644 --- a/opcodes/m10300-dis.c +++ b/opcodes/m10300-dis.c @@ -26,6 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ static void disassemble PARAMS ((bfd_vma, struct disassemble_info *, unsigned long insn, unsigned int)); +#define HAVE_AM33 (info->mach == AM33) +#define HAVE_AM30 (info->mach == AM30) + int print_insn_mn10300 (memaddr, info) bfd_vma memaddr; @@ -250,7 +253,8 @@ disassemble (memaddr, info, insn, size) if ((op->mask & insn) == op->opcode && size == (unsigned int) mysize && (op->machine == 0 - || op->machine == info->mach)) + || (op->machine == AM33 && HAVE_AM33) + || (op->machine == AM30 && HAVE_AM30))) { const unsigned char *opindex_ptr; unsigned int nocomma; -- 2.11.0