Fix nop insn for moxie

diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 00af8db69d83b69910189771da4dbe49d1455bce..c2c1c659fd42ead5575dd4b4c5b7f440cd3c6e55 100644 (file)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-03  Anthony Green  <green@moxielogic.com>
+
+       * interp.c (sim_resume): nop is 0x0f, and 0x00 is an illegal
+       instruction.
+
 2010-01-13  Anthony Green  <green@moxielogic.com>
 
        * interp.c (sim_open): Add period to end of sentence in comment.

diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index cd1bbeb73bb6a43f719fd2b78c344276497fabef..a608416eb4adc73e59efb4c4a4017c0ee34d1565 100644 (file)
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -414,7 +414,10 @@ sim_resume (sd, step, siggnal)
          int opcode = inst >> 8;
          switch (opcode)
            {
-           case 0x00: /* nop */
+           case 0x00: /* bad */
+             opc = opcode;
+             TRACE("SIGILL0");
+             cpu.asregs.exception = SIGILL;
              break;
            case 0x01: /* ldi.l (immediate) */
              {
@@ -587,16 +590,17 @@ sim_resume (sd, step, siggnal)
                cpu.asregs.cc = cc;
              }
              break;
-           case 0x0f:
-           case 0x10:
-           case 0x11:
-           case 0x12:
-           case 0x13:
-           case 0x14:
-           case 0x15:
-           case 0x16:
-           case 0x17:
-           case 0x18:
+           case 0x0f: /* nop */
+             break;
+           case 0x10: /* bad */
+           case 0x11: /* bad */
+           case 0x12: /* bad */
+           case 0x13: /* bad */
+           case 0x14: /* bad */
+           case 0x15: /* bad */
+           case 0x16: /* bad */
+           case 0x17: /* bad */
+           case 0x18: /* bad */
              {
                opc = opcode;
                TRACE("SIGILL0");