[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] 答复: [RFC qom-cpu v2 27/28] target-unicore32: Move TCG init
From: |
Guan Xuetao |
Subject: |
[Qemu-devel] 答复: [RFC qom-cpu v2 27/28] target-unicore32: Move TCG initialization to UniCore3 2CPU initfn |
Date: |
Thu, 24 Jan 2013 09:49:53 +0800 |
> -----邮件原件-----
> 发件人: Andreas Färber [mailto:address@hidden
> 发送时间: Sunday, January 20, 2013 15:23
> 收件人: address@hidden
> 抄送: Andreas Färber; Guan Xuetao (maintainer:UniCore32)
> 主题: [RFC qom-cpu v2 27/28] target-unicore32: Move TCG initialization to
> UniCore32CPU initfn
>
> Normalize the "inited" logic and add a tcg_enabled() check to suppress it for
> qtest.
>
> Ensures that a QOM-created UniCore32CPU is usable.
>
> Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Guan Xuetao <address@hidden>
> ---
> target-unicore32/cpu.c | 6 ++++++
> target-unicore32/helper.c | 6 ------
> 2 Dateien geändert, 6 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-)
>
> diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c index
> bf33326..7f8dc15 100644
> --- a/target-unicore32/cpu.c
> +++ b/target-unicore32/cpu.c
> @@ -75,6 +75,7 @@ static void uc32_cpu_initfn(Object *obj) {
> UniCore32CPU *cpu = UNICORE32_CPU(obj);
> CPUUniCore32State *env = &cpu->env;
> + static bool inited;
>
> cpu_exec_init(env);
> env->cpu_model_str = object_get_typename(obj); @@ -88,6 +89,11 @@
> static void uc32_cpu_initfn(Object *obj) #endif
>
> tlb_flush(env, 1);
> +
> + if (tcg_enabled() && !inited) {
> + inited = true;
> + uc32_translate_init();
> + }
> }
>
> static void uc32_cpu_class_init(ObjectClass *oc, void *data) diff --git
> a/target-unicore32/helper.c b/target-unicore32/helper.c index
> 173579a..357cc8b 100644
> --- a/target-unicore32/helper.c
> +++ b/target-unicore32/helper.c
> @@ -29,7 +29,6 @@ CPUUniCore32State *uc32_cpu_init(const char
> *cpu_model) {
> UniCore32CPU *cpu;
> CPUUniCore32State *env;
> - static int inited = 1;
>
> if (object_class_by_name(cpu_model) == NULL) {
> return NULL;
> @@ -37,11 +36,6 @@ CPUUniCore32State *uc32_cpu_init(const char
> *cpu_model)
> cpu = UNICORE32_CPU(object_new(cpu_model));
> env = &cpu->env;
>
> - if (inited) {
> - inited = 0;
> - uc32_translate_init();
> - }
> -
> object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
>
> return env;
> --
> 1.7.10.4
- [Qemu-devel] [RFC qom-cpu v2 05/28] target-openrisc: Update OpenRISCCPU to QOM realizefn, (continued)
- [Qemu-devel] [RFC qom-cpu v2 05/28] target-openrisc: Update OpenRISCCPU to QOM realizefn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 14/28] target-sparc: Introduce QOM realizefn for SPARCCPU, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 17/28] target-arm: Move TCG initialization to ARMCPU initfn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 23/28] target-ppc: Move TCG initialization to PowerPCCPU initfn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 20/28] target-m68k: Move TCG initialization to M68kCPU initfn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 19/28] target-lm32: Move TCG initialization to LM32CPU initfn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 21/28] target-microblaze: Move TCG initialization to MicroBlazeCPU initfn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 22/28] target-mips: Move TCG initialization to MIPSCPU initfn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 26/28] target-sparc: Move TCG initialization to SPARCCPU initfn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 27/28] target-unicore32: Move TCG initialization to UniCore32CPU initfn, Andreas Färber, 2013/01/20
- [Qemu-devel] 答复: [RFC qom-cpu v2 27/28] target-unicore32: Move TCG initialization to UniCore3 2CPU initfn,
Guan Xuetao <=
- [Qemu-devel] [RFC qom-cpu v2 24/28] target-s390x: Move TCG initialization to S390CPU initfn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 25/28] target-sh4: Move TCG initialization to SuperHCPU initfn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 28/28] target-xtensa: Move TCG initialization to XtensaCPU initfn, Andreas Färber, 2013/01/20
- Re: [Qemu-devel] [RFC qom-cpu v2 00/28] CPUState QOM realizefn support, Andreas Färber, 2013/01/28