From c6843df52be70708585dacee4a13df2c20fc583a Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 23 Nov 2001 07:09:48 +0000 Subject: [PATCH] * pdp11-dis.c (print_insn_pdp11): Handle illegal instructions. Also, break out of the loop as soon as an instruction has been printed. --- opcodes/ChangeLog | 6 ++++++ opcodes/pdp11-dis.c | 32 ++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 156ea1b77e3..ec8f1207717 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2001-11-23 Lars Brinkhoff + + * pdp11-dis.c (print_insn_pdp11): Handle illegal instructions. + Also, break out of the loop as soon as an instruction has been + printed. + 2001-11-17 matthew green * ppc-opc.c (mfvrsave, mtvrsave): New instructions. diff --git a/opcodes/pdp11-dis.c b/opcodes/pdp11-dis.c index 3c75c481614..850248e2fc0 100644 --- a/opcodes/pdp11-dis.c +++ b/opcodes/pdp11-dis.c @@ -216,12 +216,12 @@ print_insn_pdp11 (memaddr, info) { case PDP11_OPCODE_NO_OPS: FPRINTF (F, OP.name); - break; + goto done; case PDP11_OPCODE_REG: FPRINTF (F, OP.name); FPRINTF (F, AFTER_INSTRUCTION); print_reg (dst, info); - break; + goto done; case PDP11_OPCODE_OP: FPRINTF (F, OP.name); FPRINTF (F, AFTER_INSTRUCTION); @@ -229,7 +229,7 @@ print_insn_pdp11 (memaddr, info) dst |= JUMP; if (print_operand (&memaddr, dst, info) < 0) return -1; - break; + goto done; case PDP11_OPCODE_REG_OP: FPRINTF (F, OP.name); FPRINTF (F, AFTER_INSTRUCTION); @@ -239,7 +239,7 @@ print_insn_pdp11 (memaddr, info) dst |= JUMP; if (print_operand (&memaddr, dst, info) < 0) return -1; - break; + goto done; case PDP11_OPCODE_REG_OP_REV: FPRINTF (F, OP.name); FPRINTF (F, AFTER_INSTRUCTION); @@ -247,7 +247,7 @@ print_insn_pdp11 (memaddr, info) return -1; FPRINTF (F, OPERAND_SEPARATOR); print_reg (src, info); - break; + goto done; case PDP11_OPCODE_AC_OP: { int ac = (opcode & 0xe0) >> 6; @@ -257,7 +257,7 @@ print_insn_pdp11 (memaddr, info) FPRINTF (F, OPERAND_SEPARATOR); if (print_operand (&memaddr, dst, info) < 0) return -1; - break; + goto done; } case PDP11_OPCODE_OP_OP: FPRINTF (F, OP.name); @@ -267,7 +267,7 @@ print_insn_pdp11 (memaddr, info) FPRINTF (F, OPERAND_SEPARATOR); if (print_operand (&memaddr, dst, info) < 0) return -1; - break; + goto done; case PDP11_OPCODE_DISPL: { int displ = (opcode & 0xff) << 8; @@ -275,7 +275,7 @@ print_insn_pdp11 (memaddr, info) FPRINTF (F, OP.name); FPRINTF (F, AFTER_INSTRUCTION); (*info->print_address_func) (address, info); - break; + goto done; } case PDP11_OPCODE_REG_DISPL: { @@ -286,7 +286,7 @@ print_insn_pdp11 (memaddr, info) print_reg (src, info); FPRINTF (F, OPERAND_SEPARATOR); (*info->print_address_func) (address, info); - break; + goto done; } case PDP11_OPCODE_IMM8: { @@ -294,7 +294,7 @@ print_insn_pdp11 (memaddr, info) FPRINTF (F, OP.name); FPRINTF (F, AFTER_INSTRUCTION); FPRINTF (F, "%o", code); - break; + goto done; } case PDP11_OPCODE_IMM6: { @@ -302,7 +302,7 @@ print_insn_pdp11 (memaddr, info) FPRINTF (F, OP.name); FPRINTF (F, AFTER_INSTRUCTION); FPRINTF (F, "%o", code); - break; + goto done; } case PDP11_OPCODE_IMM3: { @@ -310,7 +310,14 @@ print_insn_pdp11 (memaddr, info) FPRINTF (F, OP.name); FPRINTF (F, AFTER_INSTRUCTION); FPRINTF (F, "%o", code); - break; + goto done; + } + case PDP11_OPCODE_ILLEGAL: + { + FPRINTF (F, ".word"); + FPRINTF (F, AFTER_INSTRUCTION); + FPRINTF (F, "%o", opcode); + goto done; } default: /* TODO: is this a proper way of signalling an error? */ @@ -319,6 +326,7 @@ print_insn_pdp11 (memaddr, info) } #undef OP } + done: return memaddr - start_memaddr; } -- 2.30.2