vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-ppc: Refactor PPC970 

This splits one init_proc_970() into a set of small helpers. Later
init_proc_970() will be generalized and will call different set of helpers
depending on the current CPU class.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Tom Musta <tommusta@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
master
Alexey Kardashevskiy 2014-06-04 22:50:38 +10:00 committed by Alexander Graf
parent bbc01ca7f2
commit 42382f6244
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
target-ppc/translate_init.c
View File

@ -7275,36 +7275,34 @@ static int check_pow_970 (CPUPPCState *env)
return 0; return 0;
} }
static void init_proc_970 (CPUPPCState *env) static void gen_spr_970_hid(CPUPPCState *env)
{ {
gen_spr_ne_601(env);
gen_spr_7xx(env);
/* Time base */
gen_tbl(env);
/* Hardware implementation registers */ /* Hardware implementation registers */
/* XXX : not implemented */ /* XXX : not implemented */
spr_register(env, SPR_HID0, "HID0", spr_register(env, SPR_HID0, "HID0",
SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,
&spr_read_generic, &spr_write_clear, &spr_read_generic, &spr_write_clear,
0x60000000); 0x60000000);
/* XXX : not implemented */
spr_register(env, SPR_HID1, "HID1", spr_register(env, SPR_HID1, "HID1",
SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,
&spr_read_generic, &spr_write_generic, &spr_read_generic, &spr_write_generic,
0x00000000); 0x00000000);
/* XXX : not implemented */
spr_register(env, SPR_970_HID5, "HID5", spr_register(env, SPR_970_HID5, "HID5",
SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,
&spr_read_generic, &spr_write_generic, &spr_read_generic, &spr_write_generic,
POWERPC970_HID5_INIT); POWERPC970_HID5_INIT);
/* Memory management */ }
/* XXX: not correct */
gen_low_BATs(env); static void gen_spr_970_hior(CPUPPCState *env)
{
spr_register(env, SPR_HIOR, "SPR_HIOR", spr_register(env, SPR_HIOR, "SPR_HIOR",
SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,
&spr_read_hior, &spr_write_hior, &spr_read_hior, &spr_write_hior,
0x00000000); 0x00000000);
}
static void gen_spr_book3s_common(CPUPPCState *env)
{
spr_register(env, SPR_CTRL, "SPR_CTRL", spr_register(env, SPR_CTRL, "SPR_CTRL",
SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,
SPR_NOACCESS, &spr_write_generic, SPR_NOACCESS, &spr_write_generic,
@ -7313,10 +7311,34 @@ static void init_proc_970 (CPUPPCState *env)
SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,
&spr_read_generic, SPR_NOACCESS, &spr_read_generic, SPR_NOACCESS,
0x00000000); 0x00000000);
}
static void gen_spr_book3s_altivec(CPUPPCState *env)
{
if (!(env->insns_flags & PPC_ALTIVEC)) {
return;
}
spr_register(env, SPR_VRSAVE, "SPR_VRSAVE", spr_register(env, SPR_VRSAVE, "SPR_VRSAVE",
&spr_read_generic, &spr_write_generic, &spr_read_generic, &spr_write_generic,
&spr_read_generic, &spr_write_generic, &spr_read_generic, &spr_write_generic,
0x00000000); 0x00000000);
/* Can't find information on what this should be on reset. This
* value is the one used by 74xx processors. */
vscr_init(env, 0x00010000);
}
static void init_proc_970 (CPUPPCState *env)
{
gen_spr_ne_601(env);
gen_spr_7xx(env);
gen_tbl(env);
gen_spr_book3s_altivec(env);
gen_spr_970_hid(env);
gen_spr_970_hior(env);
gen_low_BATs(env);
gen_spr_book3s_common(env);
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->slb_nr = 64; env->slb_nr = 64;
#endif #endif
@ -7325,9 +7347,6 @@ static void init_proc_970 (CPUPPCState *env)
env->icache_line_size = 128; env->icache_line_size = 128;
/* Allocate hardware IRQ controller */ /* Allocate hardware IRQ controller */
ppc970_irq_init(env); ppc970_irq_init(env);
/* Can't find information on what this should be on reset. This
* value is the one used by 74xx processors. */
vscr_init(env, 0x00010000);
} }
POWERPC_FAMILY(970)(ObjectClass *oc, void *data) POWERPC_FAMILY(970)(ObjectClass *oc, void *data)