* m10300-dis.c (HAVE_AM30, HAVE_AM33): Define.

(disassemble): Use them.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index f8b5b3d65639fa282483af695f0f4219ecc51254..8c529a84a995f165b795569277c3a6a75f3bb86f 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-20  Alexandre Oliva  <aoliva@cygnus.com>
+
+       * m10300-dis.c (HAVE_AM30, HAVE_AM33): Define.
+       (disassemble): Use them.
+
 2000-04-14  Alan Modra  <alan@linuxcare.com.au>
 
        * sysdep.h: Include "ansidecl.h" not <ansidecl.h>

diff --git a/opcodes/m10300-dis.c b/opcodes/m10300-dis.c
index 1346b697e39d4f8555de10b1b34d4778ba3dbf51..554d3280a6bab9486c4e170bae9eb09b76dd00b0 100644 (file)
--- 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;