remove d30v sanitization

[deliverable/binutils-gdb.git] / opcodes / m10300-dis.c

diff --git a/opcodes/m10300-dis.c b/opcodes/m10300-dis.c
index ab2fed96512c94212601a6b8a1a653323d9edad2..cdba83bd1cadda04a954e0b668a6bf8f2e112b15 100644 (file)
--- a/opcodes/m10300-dis.c
+++ b/opcodes/m10300-dis.c
@@ -145,6 +145,9 @@ print_insn_mn10300 (memaddr, info)
 
   /* These are four byte insns.  */
   else if ((insn & 0xff) == 0xfa
+           /* start-sanitize-am33 */
+          || (insn & 0xff) == 0xf7
+           /* end-sanitize-am33 */
           || (insn & 0xff) == 0xfb)
     {
       status = (*info->read_memory_func) (memaddr, buffer, 4, info);
@@ -251,7 +254,9 @@ disassemble (memaddr, info, insn, size)
        mysize = 7;
        
       if ((op->mask & insn) == op->opcode
-         && size == (unsigned int) mysize)
+         && size == (unsigned int) mysize
+         && (op->machine == 0
+             || op->machine == info->mach))
        {
          const unsigned char *opindex_ptr;
          unsigned int nocomma;
@@ -312,7 +317,8 @@ disassemble (memaddr, info, insn, size)
            }
          /* start-sanitize-am33 */
          else if (size == 4
-                  && op->format == FMT_D7)
+                  && (op->format == FMT_D7
+                      || op->format == FMT_D10))
            {
              extension = 0;
            }