Re: [Qemu-ppc] [Qemu-devel] [PATCH ppc-next v2 44/52] target-ppc: Set instruction flags on CPU family classes

[Andreas Färber]

Am 22.02.2013 17:37, schrieb Alexander Graf:
> 
> On 22.02.2013, at 17:33, Andreas Färber wrote:
> 
>> Am 22.02.2013 15:34, schrieb Alexander Graf:
>>>
>>> On 18.02.2013, at 10:16, Andreas Färber wrote:
>>>
>>>> Signed-off-by: Andreas Färber <address@hidden>
>>>> ---
>>>> target-ppc/translate_init.c |  994 
>>>> ++++++++++++++++++++++---------------------
>>>> 1 Datei geändert, 499 Zeilen hinzugefügt(+), 495 Zeilen entfernt(-)
>>>>
>>>> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
>>>> index 6043cf9..9fb9d1a 100644
>>>> --- a/target-ppc/translate_init.c
>>>> +++ b/target-ppc/translate_init.c
>>>> @@ -3275,13 +3275,6 @@ static int check_pow_hid0_74xx (CPUPPCState *env)
>>>>    static void glue(glue(ppc_, _name), _cpu_family_class_init)
>>>>
>>>> /* PowerPC 401                                                             
>>>>   */
>>>> -#define POWERPC_INSNS_401    (PPC_INSNS_BASE | PPC_STRING |               
>>>>     \
>>>> -                              PPC_WRTEE | PPC_DCR |                       
>>>>     \
>>>> -                              PPC_CACHE | PPC_CACHE_ICBI | PPC_40x_ICBT | 
>>>>     \
>>>> -                              PPC_CACHE_DCBZ |                            
>>>>     \
>>>> -                              PPC_MEM_SYNC | PPC_MEM_EIEIO |              
>>>>     \
>>>> -                              PPC_4xx_COMMON | PPC_40x_EXCP)
>>>> -#define POWERPC_INSNS2_401   (PPC_NONE)
>>>> #define POWERPC_MSRM_401     (0x00000000000FD201ULL)
>>>> #define POWERPC_MMU_401      (POWERPC_MMU_REAL)
>>>> #define POWERPC_EXCP_401     (POWERPC_EXCP_40x)
>>>> @@ -3311,17 +3304,16 @@ POWERPC_FAMILY(401)(ObjectClass *oc, void *data)
>>>>
>>>>    pcc->init_proc = init_proc_401;
>>>>    pcc->check_pow = check_pow_nocheck;
>>>> +    pcc->insns_flags = PPC_INSNS_BASE | PPC_STRING |
>>>> +                       PPC_WRTEE | PPC_DCR |
>>>> +                       PPC_CACHE | PPC_CACHE_ICBI | PPC_40x_ICBT |
>>>> +                       PPC_CACHE_DCBZ |
>>>> +                       PPC_MEM_SYNC | PPC_MEM_EIEIO |
>>>> +                       PPC_4xx_COMMON | PPC_40x_EXCP;
>>>> +    pcc->insns_flags2 = PPC_NONE;
>>>
>>> The class is 0-initialized by default, right?
>>
>> Correct.
>>
>>> So we can drop the insn_flags2 = PPC_NONE bits. They were only here to make 
>>> assignments happy.
>>
>> I admit I didn't check on their values, just mechanically moved them.
>>
>>> This can easily be a follow-up patch though.
>>
>> Any suggestion how deleting lines with "PPC_NONE" could be scripted? :)
> 
> grep -v PPC_NONE <file>? :)

Done: http://patchwork.ozlabs.org/patch/222584/

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg