yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-08 12:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-arm: make CSSELR banked

Browse source 
Rename CSSELR (cache size selection register) and add secure
instance (AArch32).

Backports commit b85a1fd61c4d72c7928cd9b70f9f59fb2895936d from qemu
This commit is contained in:
Fabian Aggeler 2018-02-11 19:34:40 -05:00 committed by Lioncash
parent 44fc779c6a
commit 673cb7d93e
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qemu/target-arm/cpu.h
View file

@ -179,7 +179,15 @@ typedef struct CPUARMState {
/* System control coprocessor (cp15) */ /* System control coprocessor (cp15) */
struct { struct {
uint32_t c0_cpuid; uint32_t c0_cpuid;
uint64_t c0_cssel; /* Cache size selection. */ union { /* Cache size selection */
struct {
uint64_t _unused_csselr0;
uint64_t csselr_ns;
uint64_t _unused_csselr1;
uint64_t csselr_s;
};
uint64_t csselr_el[4];
};
union { /* System control register. */ union { /* System control register. */
struct { struct {
uint64_t _unused_sctlr; uint64_t _unused_sctlr;

12
qemu/target-arm/helper.c
View file

@ -660,7 +660,14 @@ static void scr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
static uint64_t ccsidr_read(CPUARMState *env, const ARMCPRegInfo *ri) static uint64_t ccsidr_read(CPUARMState *env, const ARMCPRegInfo *ri)
{ {
ARMCPU *cpu = arm_env_get_cpu(env); ARMCPU *cpu = arm_env_get_cpu(env);
return cpu->ccsidr[env->cp15.c0_cssel];
/* Acquire the CSSELR index from the bank corresponding to the CCSIDR
* bank
*/
uint32_t index = A32_BANKED_REG_GET(env, csselr,
ri->secure & ARM_CP_SECSTATE_S);
return cpu->ccsidr[index];
} }
static void csselr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void csselr_write(CPUARMState *env, const ARMCPRegInfo *ri,
@ -755,7 +762,8 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
ARM_CP_NO_MIGRATE, PL1_R, 0, NULL, 0, 0, {0, 0}, ARM_CP_NO_MIGRATE, PL1_R, 0, NULL, 0, 0, {0, 0},
NULL, ccsidr_read, }, NULL, ccsidr_read, },
{ "CSSELR", 0,0,0, 3,2,0, ARM_CP_STATE_BOTH, { "CSSELR", 0,0,0, 3,2,0, ARM_CP_STATE_BOTH,
0, PL1_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.c0_cssel), {0, 0}, 0, PL1_RW, 0, NULL, 0, 0,
{ offsetof(CPUARMState, cp15.csselr_s), offsetof(CPUARMState, cp15.csselr_ns) },
NULL, NULL, csselr_write, }, NULL, NULL, csselr_write, },
/* Auxiliary ID register: this actually has an IMPDEF value but for now /* Auxiliary ID register: this actually has an IMPDEF value but for now
* just RAZ for all cores: * just RAZ for all cores: