From 8b2440b731b16cd8b0a75ab42576d5bb38ed9a25 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 21 May 2002 20:28:26 +0000 Subject: [PATCH] Simulate XScale BCUMOD register --- sim/arm/ChangeLog | 6 ++++++ sim/arm/armcopro.c | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index f0639fe3c5..b6d8266289 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,9 @@ +2002-05-21 Nick Clifton + + * armcopro.c (check_cp13_access): Allow access to register 1 when + CRm is 1. + (write_cp13_reg): Allow bit 0 of reg 1 of CRm 1 to be written to. + 2002-05-20 Nick Clifton * Makefile.in (SWI_TARGET_SWITCHES): Define. diff --git a/sim/arm/armcopro.c b/sim/arm/armcopro.c index 75c6bfca62..da409f0672 100644 --- a/sim/arm/armcopro.c +++ b/sim/arm/armcopro.c @@ -587,7 +587,7 @@ check_cp13_access (ARMul_State * state, unsigned opcode_1, unsigned opcode_2) { - /* Do not allow access to these register in USER mode. */ + /* Do not allow access to these registers in USER mode. */ if (state->Mode == USER26MODE || state->Mode == USER32MODE) return ARMul_CANT; @@ -601,7 +601,7 @@ check_cp13_access (ARMul_State * state, return ARMul_CANT; /* Registers 0, 4 and 8 are defined when CRm == 0. - Registers 0, 4, 5, 6, 7, 8 are defined when CRm == 1. + Registers 0, 1, 4, 5, 6, 7, 8 are defined when CRm == 1. For all other CRm values undefined behaviour results. */ if (CRm == 0) { @@ -610,7 +610,7 @@ check_cp13_access (ARMul_State * state, } else if (CRm == 1) { - if (reg == 0 || (reg >= 4 && reg <= 8)) + if (reg == 0 || reg == 1 || (reg >= 4 && reg <= 8)) return ARMul_DONE; } @@ -659,6 +659,12 @@ write_cp13_reg (unsigned reg, unsigned CRm, ARMword value) value |= XScale_cp13_CR1_Regs[0] & (1UL << 31); break; + case 1: /* BCUMOD */ + /* Only bit 0 is accecssible. */ + value &= 1; + value |= XScale_cp13_CR1_Regs[1] & ~ 1; + break; + case 4: /* ELOG0 */ case 5: /* ELOG1 */ case 6: /* ECAR0 */