fix bug in last checkin

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index bc3262042100ebc1b076185efcca34f417482c6e..3b12484764dc33cd66ee3c4cdc66b0647447c501 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -15,9 +15,13 @@ Thu Nov 16 09:52:26 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
        (model_c_insn): Use max_model_fields_len to size fields.
        (insn_table_insert_insn): Set max_model_fields_len.
        (model_table_insert): Ditto.
+       (gen_model_{c,h}): Model_issue is now called with a processor
+       argument.
 
        * debug.c (trace_description): Add support for trace_tbd.
 
+       * mon.c (mon_issue): Pass processor argument to model_issue.
+
 Wed Nov 15 17:32:13 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
 
        * cpu.h (cpu_model): Add declaration.

diff --git a/sim/ppc/igen.c b/sim/ppc/igen.c
index e28f8003e4f9bbf6dd1726970a1c117fd4a4fe1f..818c16faf7efb761c970620c47ea4877f8ad119d 100644 (file)
--- a/sim/ppc/igen.c
+++ b/sim/ppc/igen.c
@@ -3055,6 +3055,7 @@ gen_model_h(insn_table *table, lf *file)
   if (!model_issue_p) {
     lf_printf(file, "INLINE_MODEL void model_issue\n");
     lf_printf(file, "(itable_index index,\n");
+    lf_printf(file, " cpu *processor,\n");
     lf_printf(file, " model_data *model_ptr,\n");
     lf_printf(file, " unsigned_word cia);\n");
     lf_printf(file, "\n");
@@ -3226,6 +3227,7 @@ gen_model_c(insn_table *table, lf *file)
 
   if (!model_issue_p) {
     lf_printf(file, "INLINE_MODEL void model_issue(itable_index index,\n");
+    lf_printf(file, "                              cpu *processor,\n");
     lf_printf(file, "                              model_data *model_ptr,\n");
     lf_printf(file, "                              unsigned_word cia);\n");
     lf_printf(file, "{\n");

diff --git a/sim/ppc/mon.c b/sim/ppc/mon.c
index c6a6e9532217b201145a51909dd4c5a112449d48..33d6b7ef8543c580035fc7e296afec6664b18809 100644 (file)
--- a/sim/ppc/mon.c
+++ b/sim/ppc/mon.c
@@ -107,7 +107,7 @@ mon_issue(itable_index index,
   cpu_mon *monitor = cpu_monitor(processor);
   ASSERT(index <= nr_itable_entries);
   monitor->issue_count[index] += 1;
-  model_issue(index, cpu_model(processor), cia);
+  model_issue(index, processor, cpu_model(processor), cia);
 }
 
 

diff --git a/sim/ppc/ppc-instructions b/sim/ppc/ppc-instructions
index ca34a0e89c9a5151a36af77149348cd7f6240a17..05709e05a9febc857931b7759b9303c57b6fbb6f 100644 (file)
--- a/sim/ppc/ppc-instructions
+++ b/sim/ppc/ppc-instructions
@@ -138,7 +138,7 @@ void::model-function::model_init:cpu *processor, model_data *model_ptr
 
 void::model-function::model_halt:cpu *processor, model_data *model_ptr
 
-void::model-function::model_issue:itable_index index, model_data *model_ptr, unsigned_word cia
+void::model-function::model_issue:itable_index index, cpu *processor, model_data *model_ptr, unsigned_word cia
        if (model_ptr->old_program_counter+4 != cia)
          model_ptr->nr_branches++;