SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/ppc: cpu_init: Avoid nested SPR register functions

Browse Source 
Make sure that every register_*_sprs function only has calls to
spr_register* to register individual SPRs. Do not allow nesting. This
makes the code easier to follow and a look at init_proc_* should
suffice to know what SPRs a CPU has.

Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20220216162426.1885923-6-farosas@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Fabiano Rosas 2022-02-18 08:34:14 +01:00 committed by Cédric Le Goater
parent 024b40e0ae
commit 4ffb8c5e43
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/ppc/cpu_init.c
View File

@ -1128,8 +1128,6 @@ static void register_BookE206_sprs(CPUPPCState *env, uint32_t mas_mask,
break; break;
} }
#endif #endif
register_usprgh_sprs(env);
} }
/* SPR specific to PowerPC 440 implementation */ /* SPR specific to PowerPC 440 implementation */
@ -1427,7 +1425,6 @@ static void register_405_sprs(CPUPPCState *env)
SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,
spr_read_generic, &spr_write_generic, spr_read_generic, &spr_write_generic,
0x00000000); 0x00000000);
register_usprgh_sprs(env);
} }
@ -2318,6 +2315,7 @@ static void init_proc_405(CPUPPCState *env)
{ {
register_40x_sprs(env); register_40x_sprs(env);
register_405_sprs(env); register_405_sprs(env);
register_usprgh_sprs(env);
/* Bus access control */ /* Bus access control */
/* not emulated, as QEMU never does speculative access */ /* not emulated, as QEMU never does speculative access */
spr_register(env, SPR_40x_SGR, "SGR", spr_register(env, SPR_40x_SGR, "SGR",
@ -2947,6 +2945,7 @@ static void init_proc_e200(CPUPPCState *env)
0x00000000); 0x00000000);
/* Memory management */ /* Memory management */
register_BookE206_sprs(env, 0x0000005D, NULL, 0); register_BookE206_sprs(env, 0x0000005D, NULL, 0);
register_usprgh_sprs(env);
spr_register(env, SPR_HID0, "HID0", spr_register(env, SPR_HID0, "HID0",
SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,
@ -3294,6 +3293,7 @@ static void init_proc_e500(CPUPPCState *env, int version)
env->spr[SPR_PVR]); env->spr[SPR_PVR]);
} }
register_BookE206_sprs(env, 0x000000DF, tlbncfg, mmucfg); register_BookE206_sprs(env, 0x000000DF, tlbncfg, mmucfg);
register_usprgh_sprs(env);
spr_register(env, SPR_HID0, "HID0", spr_register(env, SPR_HID0, "HID0",
SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,