diff options
| author | Michael Meissner <gnu@the-meissners.org> | 1995-11-16 19:25:47 +0000 |
|---|---|---|
| committer | Michael Meissner <gnu@the-meissners.org> | 1995-11-16 19:25:47 +0000 |
| commit | 867b71685a815ac87fc9c0937e2a6c14dc8ec692 (patch) | |
| tree | b2ff0b3fe2ae6f23d5a9d84cd9b45d7ed91c7ecc | |
| parent | 71a164f70a0b08a1e27c05084c1a2ca173cda2cc (diff) | |
| download | gdb-867b71685a815ac87fc9c0937e2a6c14dc8ec692.zip gdb-867b71685a815ac87fc9c0937e2a6c14dc8ec692.tar.gz gdb-867b71685a815ac87fc9c0937e2a6c14dc8ec692.tar.bz2 | |
fix bug in last checkin
| -rw-r--r-- | sim/ppc/ChangeLog | 4 | ||||
| -rw-r--r-- | sim/ppc/igen.c | 2 | ||||
| -rw-r--r-- | sim/ppc/mon.c | 2 | ||||
| -rw-r--r-- | sim/ppc/ppc-instructions | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index bc32620..3b12484 100644 --- 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 e28f800..818c16f 100644 --- 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 c6a6e95..33d6b7e 100644 --- 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 ca34a0e..05709e0 100644 --- 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++; |