From e85f8431862297d852d628625c3d2e95b8c50362 Mon Sep 17 00:00:00 2001 From: bje Date: Fri, 22 Jun 2001 07:07:39 +0000 Subject: [PATCH] 2001-06-22 Ben Elliston * arm7f.cxx (arm7f_cpu::memory_trap): Ignore bus::delayed. --- sid/component/cgen-cpu/arm7t/ChangeLog | 4 ++++ sid/component/cgen-cpu/arm7t/arm7f.cxx | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sid/component/cgen-cpu/arm7t/ChangeLog b/sid/component/cgen-cpu/arm7t/ChangeLog index da2431498a..0bd7b10f6c 100644 --- a/sid/component/cgen-cpu/arm7t/ChangeLog +++ b/sid/component/cgen-cpu/arm7t/ChangeLog @@ -1,3 +1,7 @@ +2001-06-22 Ben Elliston + + * arm7f.cxx (arm7f_cpu::memory_trap): Ignore bus::delayed. + 2001-03-21 Ben Elliston * Makefile.in: Regenerate. diff --git a/sid/component/cgen-cpu/arm7t/arm7f.cxx b/sid/component/cgen-cpu/arm7t/arm7f.cxx index c3776f14d6..6497f99856 100644 --- a/sid/component/cgen-cpu/arm7t/arm7f.cxx +++ b/sid/component/cgen-cpu/arm7t/arm7f.cxx @@ -827,9 +827,6 @@ arm7f_cpu::memory_trap (const cpu_memory_fault& t) this->h_gr_set (H_GR_PC, t.pc); this->h_pc_set (t.pc); - if (t.status == bus::delayed) - return; - if (this->debug_exec_p) cerr << "MEMORY TRAP " << " operation=" << t.operation -- 2.11.0