From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwpFU-0006nK-F1 for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TwpFT-0006ds-5S for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:24 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45258 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwpFS-0006dh-TD for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:23 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Jan 2013 08:22:41 +0100 Message-Id: <1358666571-1737-19-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 18/28] target-cris: Move TCG initialization to CRISCPU initfn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Split out TCG initialization from cpu_cris_init(). Avoid CPUCRISState dependency for v10-specific initialization and for non-v10 by inlining the decision into the initfn as well. Signed-off-by: Andreas F=C3=A4rber --- target-cris/cpu.c | 10 ++++++++++ target-cris/cpu.h | 3 +++ target-cris/translate.c | 19 +++++-------------- target-cris/translate_v10.c | 5 +---- 4 Dateien ge=C3=A4ndert, 19 Zeilen hinzugef=C3=BCgt(+), 18 Zeilen entfer= nt(-) diff --git a/target-cris/cpu.c b/target-cris/cpu.c index 34c4f75..fedf641 100644 --- a/target-cris/cpu.c +++ b/target-cris/cpu.c @@ -70,8 +70,18 @@ static void cris_cpu_initfn(Object *obj) { CRISCPU *cpu =3D CRIS_CPU(obj); CPUCRISState *env =3D &cpu->env; + static bool tcg_initialized; =20 cpu_exec_init(env); + + if (tcg_enabled() && !tcg_initialized) { + tcg_initialized =3D true; + if (env->pregs[PR_VR] < 32) { + cris_initialize_crisv10_tcg(); + } else { + cris_initialize_tcg(); + } + } } =20 static void cris_cpu_class_init(ObjectClass *oc, void *data) diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 257cb52..ebf2d40 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -182,6 +182,9 @@ void do_interrupt(CPUCRISState *env); int cpu_cris_signal_handler(int host_signum, void *pinfo, void *puc); =20 +void cris_initialize_tcg(void); +void cris_initialize_crisv10_tcg(void); + enum { CC_OP_DYNAMIC, /* Use env->cc_op */ CC_OP_FLAGS, diff --git a/target-cris/translate.c b/target-cris/translate.c index 25ff490..25a43fa 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3550,8 +3550,6 @@ CRISCPU *cpu_cris_init(const char *cpu_model) { CRISCPU *cpu; CPUCRISState *env; - static int tcg_initialized =3D 0; - int i; =20 cpu =3D CRIS_CPU(object_new(TYPE_CRIS_CPU)); env =3D &cpu->env; @@ -3560,21 +3558,16 @@ CRISCPU *cpu_cris_init(const char *cpu_model) =20 object_property_set_bool(OBJECT(cpu), true, "realized", NULL); =20 - if (tcg_initialized) { - return cpu; - } + return cpu; +} =20 - tcg_initialized =3D 1; +void cris_initialize_tcg(void) +{ + int i; =20 #define GEN_HELPER 2 #include "helper.h" =20 - if (env->pregs[PR_VR] < 32) { - cpu_crisv10_init(env); - return cpu; - } - - cpu_env =3D tcg_global_reg_new_ptr(TCG_AREG0, "env"); cc_x =3D tcg_global_mem_new(TCG_AREG0, offsetof(CPUCRISState, cc_x), "cc_x"); @@ -3614,8 +3607,6 @@ CRISCPU *cpu_cris_init(const char *cpu_model) offsetof(CPUCRISState, pregs[i]), pregnames[i]); } - - return cpu; } =20 void restore_state_to_opc(CPUCRISState *env, TranslationBlock *tb, int p= c_pos) diff --git a/target-cris/translate_v10.c b/target-cris/translate_v10.c index d2cca89..d6ef084 100644 --- a/target-cris/translate_v10.c +++ b/target-cris/translate_v10.c @@ -1257,7 +1257,7 @@ static unsigned int crisv10_decoder(CPUCRISState *e= nv, DisasContext *dc) return insn_len; } =20 -static CPUCRISState *cpu_crisv10_init (CPUCRISState *env) +void cris_initialize_crisv10_tcg(void) { int i; =20 @@ -1300,7 +1300,4 @@ static CPUCRISState *cpu_crisv10_init (CPUCRISState= *env) offsetof(CPUCRISState, pregs[i]), pregnames_v10[i]); } - - return env; } - --=20 1.7.10.4