Change decode_compound_collector to use std::vector

[deliverable/binutils-gdb.git] / sim / moxie / interp.c

diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index 6de1aa01e4a30daac8dfdb8110c951c824128bd6..0a502b87fbf21a31618783ae571cede0348906c9 100644 (file)
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -1,5 +1,5 @@
 /* Simulator for the moxie processor
-   Copyright (C) 2008-2016 Free Software Foundation, Inc.
+   Copyright (C) 2008-2018 Free Software Foundation, Inc.
    Contributed by Anthony Green
 
 This file is part of GDB, the GNU debugger.
@@ -343,7 +343,7 @@ sim_engine_run (SIM_DESC sd,
                default:
                  {
                    MOXIE_TRACE_INSN ("SIGILL3");
-                   sim_engine_halt (sd, NULL, NULL, pc, sim_stopped, SIM_SIGILL);
+                   sim_engine_halt (sd, scpu, NULL, pc, sim_stopped, SIM_SIGILL);
                    break;
                  }
                }
@@ -394,7 +394,7 @@ sim_engine_run (SIM_DESC sd,
                  break;
                default:
                  MOXIE_TRACE_INSN ("SIGILL2");
-                 sim_engine_halt (sd, NULL, NULL, pc, sim_stopped, SIM_SIGILL);
+                 sim_engine_halt (sd, scpu, NULL, pc, sim_stopped, SIM_SIGILL);
                  break;
                }
            }
@@ -408,7 +408,7 @@ sim_engine_run (SIM_DESC sd,
            case 0x00: /* bad */
              opc = opcode;
              MOXIE_TRACE_INSN ("SIGILL0");
-             sim_engine_halt (sd, NULL, NULL, pc, sim_stopped, SIM_SIGILL);
+             sim_engine_halt (sd, scpu, NULL, pc, sim_stopped, SIM_SIGILL);
              break;
            case 0x01: /* ldi.l (immediate) */
              {
@@ -666,7 +666,7 @@ sim_engine_run (SIM_DESC sd,
              {
                opc = opcode;
                MOXIE_TRACE_INSN ("SIGILL0");
-               sim_engine_halt (sd, NULL, NULL, pc, sim_stopped, SIM_SIGILL);
+               sim_engine_halt (sd, scpu, NULL, pc, sim_stopped, SIM_SIGILL);
                break;
              }
            case 0x19: /* jsr */
@@ -933,7 +933,7 @@ sim_engine_run (SIM_DESC sd,
                  {
                  case 0x1: /* SYS_exit */
                    {
-                     sim_engine_halt (sd, NULL, NULL, pc, sim_exited,
+                     sim_engine_halt (sd, scpu, NULL, pc, sim_exited,
                                       cpu.asregs.regs[2]);
                      break;
                    }
@@ -1046,7 +1046,7 @@ sim_engine_run (SIM_DESC sd,
              break;
            case 0x35: /* brk */
              MOXIE_TRACE_INSN ("brk");
-             sim_engine_halt (sd, NULL, NULL, pc, sim_stopped, SIM_SIGTRAP);
+             sim_engine_halt (sd, scpu, NULL, pc, sim_stopped, SIM_SIGTRAP);
              pc -= 2; /* Adjust pc */
              break;
            case 0x36: /* ldo.b */
@@ -1100,7 +1100,7 @@ sim_engine_run (SIM_DESC sd,
            default:
              opc = opcode;
              MOXIE_TRACE_INSN ("SIGILL1");
-             sim_engine_halt (sd, NULL, NULL, pc, sim_stopped, SIM_SIGILL);
+             sim_engine_halt (sd, scpu, NULL, pc, sim_stopped, SIM_SIGILL);
              break;
            }
        }
@@ -1108,6 +1108,10 @@ sim_engine_run (SIM_DESC sd,
       cpu.asregs.insts++;
       pc += 2;
       cpu.asregs.regs[PC_REGNO] = pc;
+
+      if (sim_events_tick (sd))
+       sim_events_process (sd);
+
     } while (1);
 }