From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwpFY-0006yb-9o for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TwpFX-0006f6-5E for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:28 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45278 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwpFW-0006ey-PF for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:26 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Jan 2013 08:22:45 +0100 Message-Id: <1358666571-1737-23-git-send-email-afaerber@suse.de> In-Reply-To: <1358666571-1737-1-git-send-email-afaerber@suse.de> References: <1358666571-1737-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC qom-cpu v2 22/28] target-mips: Move TCG initialization to MIPSCPU initfn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Make mips_tcg_init() non-static and add tcg_enabled() check to suppress it for qtest. Signed-off-by: Andreas F=C3=A4rber --- target-mips/cpu.c | 4 ++++ target-mips/cpu.h | 1 + target-mips/translate.c | 3 +-- 3 Dateien ge=C3=A4ndert, 6 Zeilen hinzugef=C3=BCgt(+), 2 Zeilen entfernt= (-) diff --git a/target-mips/cpu.c b/target-mips/cpu.c index 18895da..09d6172 100644 --- a/target-mips/cpu.c +++ b/target-mips/cpu.c @@ -59,6 +59,10 @@ static void mips_cpu_initfn(Object *obj) CPUMIPSState *env =3D &cpu->env; =20 cpu_exec_init(env); + + if (tcg_enabled()) { + mips_tcg_init(); + } } =20 static void mips_cpu_class_init(ObjectClass *c, void *data) diff --git a/target-mips/cpu.h b/target-mips/cpu.h index 5963d62..0e198b1 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -629,6 +629,7 @@ enum { #define CPU_INTERRUPT_WAKE CPU_INTERRUPT_TGT_INT_0 =20 int cpu_mips_exec(CPUMIPSState *s); +void mips_tcg_init(void); MIPSCPU *cpu_mips_init(const char *cpu_model); int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc); =20 diff --git a/target-mips/translate.c b/target-mips/translate.c index 9ea9354..373cfa7 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -15791,7 +15791,7 @@ void cpu_dump_state (CPUMIPSState *env, FILE *f, = fprintf_function cpu_fprintf, #endif } =20 -static void mips_tcg_init(void) +void mips_tcg_init(void) { int i; static int inited; @@ -15870,7 +15870,6 @@ MIPSCPU *cpu_mips_init(const char *cpu_model) #endif fpu_init(env, def); mvp_init(env, def); - mips_tcg_init(); =20 object_property_set_bool(OBJECT(cpu), true, "realized", NULL); =20 --=20 1.7.10.4