From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1p92-0001UD-UU for qemu-devel@nongnu.org; Thu, 18 Dec 2014 23:26:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1p8u-0002PQ-EV for qemu-devel@nongnu.org; Thu, 18 Dec 2014 23:26:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1p8u-0002Ox-7I for qemu-devel@nongnu.org; Thu, 18 Dec 2014 23:26:20 -0500 From: Eduardo Habkost Date: Fri, 19 Dec 2014 02:26:05 -0200 Message-Id: <1418963165-498-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1418963165-498-1-git-send-email-ehabkost@redhat.com> References: <1418963165-498-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] target-i386: Implement tcg_arch_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , rth@twiddle.net With tcg_arch_init(), we can finally remove the "inited" variable from x86_cpu_initfn(). Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 7 ------- target-i386/translate.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index b81ac5c..dee112d 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2885,7 +2885,6 @@ static void x86_cpu_initfn(Object *obj) X86CPU *cpu = X86_CPU(obj); X86CPUClass *xcc = X86_CPU_GET_CLASS(obj); CPUX86State *env = &cpu->env; - static int inited; cs->env_ptr = env; cpu_exec_init(env); @@ -2928,12 +2927,6 @@ static void x86_cpu_initfn(Object *obj) env->cpuid_apic_id = x86_cpu_apic_id_from_index(cs->cpu_index); x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort); - - /* init various static tables used in TCG mode */ - if (tcg_enabled() && !inited) { - inited = 1; - optimize_flags_init(); - } } static int64_t x86_cpu_get_arch_id(CPUState *cs) diff --git a/target-i386/translate.c b/target-i386/translate.c index fc75da7..10b9cc2 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -7841,7 +7841,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, return s->pc; } -void optimize_flags_init(void) +void tcg_arch_init(void) { static const char reg_names[CPU_NB_REGS][4] = { #ifdef TARGET_X86_64 -- 1.9.3