From 153431d6b1197e76ef2a6908034260aa56bc411f Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Fri, 12 Sep 2003 22:05:22 +0000 Subject: 2003-09-12 Dave Brolley * registers.c (frv_check_spr_read_access): Check for access to ACC4-ACC63 and ACCG4-ACCG63. * profile.h (frv-desc.h): #include it. (spr_busy): New member of FRV_PROFILE_STATE. (spr_latency): Ditto. (GNER_FOR_GR): New macro. (FNER_FOR_FR): New maccro. (update_SPR_latency): New function. (vliw_wait_for_SPR): New function. * profile.c (profile-fr550.h): #include it. (update_latencies): Update SPR latencies. (update_target_latencies): Ditto. (update_SPR_latency): New function. (vliw_wait_for_SPR): New function. * profile-fr500.c (frvbf_model_fr500_u_idiv): Record GNER latency. (frvbf_model_fr500_u_trap): Removed unused variable, ps. (frvbf_model_fr500_u_check): Ditto. (frvbf_model_fr500_u_clrgr): New unit modeller for fr500. (frvbf_model_fr500_u_clrfr): Ditto. (frvbf_model_fr500_u_spr2gr): Wait for SPR. (frvbf_model_fr500_u_gr2spr): Ditto. * frv-sim.h (H_SPR_ACC4): New macro. (H_SPR_ACCG4): New macro; (H_SPR_ACC0): Removed. (H_SPR_ACCG0): Removed. * arch.h,model.c,sem[ch],decode.[ch]: Regenerated. --- sim/frv/registers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sim/frv/registers.c') diff --git a/sim/frv/registers.c b/sim/frv/registers.c index 9ed8112..2b76630 100644 --- a/sim/frv/registers.c +++ b/sim/frv/registers.c @@ -1,5 +1,5 @@ /* frv simulator support code - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. Contributed by Red Hat. This file is part of the GNU simulators. @@ -4278,8 +4278,8 @@ frv_check_spr_read_access (SIM_CPU *current_cpu, UINT spr) /* On the fr400: if this is an unimplemented accumulator, then generate an illegal_instruction_interrupt, otherwise no interrupt. */ - if (spr >= H_SPR_ACC0 && spr <= H_SPR_ACC63 - || spr >= H_SPR_ACCG0 && spr <= H_SPR_ACCG63) + if (spr >= H_SPR_ACC4 && spr <= H_SPR_ACC63 + || spr >= H_SPR_ACCG4 && spr <= H_SPR_ACCG63) frv_queue_program_interrupt (current_cpu, FRV_ILLEGAL_INSTRUCTION); } else -- cgit v1.1