Message ID | 1401787684-31895-11-git-send-email-aik@ozlabs.ru |
---|---|
State | New |
Headers | show |
On 6/3/2014 4:27 AM, Alexey Kardashevskiy wrote: > After merging 970s into one class, check_pow_970() is used for all of them. > Since POWER5+ is no different in the matter of supported power modes, > let's use the same check_pow() callback for POWER5+ too, > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > target-ppc/translate_init.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c > index 301f5ff..b372a64 100644 > --- a/target-ppc/translate_init.c > +++ b/target-ppc/translate_init.c > @@ -7584,14 +7584,6 @@ POWERPC_FAMILY(970)(ObjectClass *oc, void *data) > pcc->l1_icache_size = 0x10000; > } > > -static int check_pow_970FX (CPUPPCState *env) > -{ > - if (env->spr[SPR_HID0] & 0x00600000) > - return 1; > - > - return 0; > -} > - > static void init_proc_power5plus(CPUPPCState *env) > { > init_proc_book3s_64(env, BOOK3S_CPU_POWER5PLUS); > @@ -7605,7 +7597,7 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data) > dc->fw_name = "PowerPC,POWER5"; > dc->desc = "POWER5+"; > pcc->init_proc = init_proc_power5plus; > - pcc->check_pow = check_pow_970FX; > + pcc->check_pow = check_pow_970; > pcc->insns_flags = PPC_INSNS_BASE | PPC_STRING | PPC_MFTB | > PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | > PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | > Reviewed-by: Tom Musta <tommusta@gmail.com>
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 301f5ff..b372a64 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7584,14 +7584,6 @@ POWERPC_FAMILY(970)(ObjectClass *oc, void *data) pcc->l1_icache_size = 0x10000; } -static int check_pow_970FX (CPUPPCState *env) -{ - if (env->spr[SPR_HID0] & 0x00600000) - return 1; - - return 0; -} - static void init_proc_power5plus(CPUPPCState *env) { init_proc_book3s_64(env, BOOK3S_CPU_POWER5PLUS); @@ -7605,7 +7597,7 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data) dc->fw_name = "PowerPC,POWER5"; dc->desc = "POWER5+"; pcc->init_proc = init_proc_power5plus; - pcc->check_pow = check_pow_970FX; + pcc->check_pow = check_pow_970; pcc->insns_flags = PPC_INSNS_BASE | PPC_STRING | PPC_MFTB | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
After merging 970s into one class, check_pow_970() is used for all of them. Since POWER5+ is no different in the matter of supported power modes, let's use the same check_pow() callback for POWER5+ too, Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- target-ppc/translate_init.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)