Re: [Qemu-devel] [PATCH 5/9] unicore32-softmmu: initialize ucv2 cpu

[Andreas Färber]

Am 25.05.2012 13:29, schrieb Guan Xuetao:
> Signed-off-by: Guan Xuetao <address@hidden>
> ---
>  target-unicore32/cpu.c |   17 +++++++++++++----
>  target-unicore32/cpu.h |    2 +-
>  2 files changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c
> index de63f58..62c0a22 100644
> --- a/target-unicore32/cpu.c
> +++ b/target-unicore32/cpu.c
> @@ -32,13 +32,16 @@ static void unicore_ii_cpu_initfn(Object *obj)
>      UniCore32CPU *cpu = UNICORE32_CPU(obj);
>      CPUUniCore32State *env = &cpu->env;
>  
> -    env->cp0.c0_cpuid = 0x40010863;
> +    env->cp0.c0_cpuid = UC32_CPUID_UCV2;

Please don't revert this change. I'll send you the patch to drop the
CPUID #defines instead.

Andreas

> diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h
> index 66c42f5..8af3649 100644
> --- a/target-unicore32/cpu.h
> +++ b/target-unicore32/cpu.h
> @@ -123,7 +123,7 @@ void cpu_asr_write(CPUUniCore32State *env1, target_ulong 
> val, target_ulong mask)
>  #define UC32_HWCAP_UCF64                8 /* 1 << 3 */
>  
>  #define UC32_CPUID(env)                 (env->cp0.c0_cpuid)
> -#define UC32_CPUID_UCV2                 0x40010863
> +#define UC32_CPUID_UCV2                 0x4d000863
>  #define UC32_CPUID_ANY                  0xffffffff
>  
>  #define cpu_init                        uc32_cpu_init

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