From nobody Thu Nov 6 01:12:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538296683783461.09459435353085; Sun, 30 Sep 2018 01:38:03 -0700 (PDT) Received: from localhost ([::1]:54340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6XEo-0007tm-FE for importer@patchew.org; Sun, 30 Sep 2018 04:38:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6WrY-0002Rs-6v for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6WrW-0000nJ-Uc for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:00 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:37380) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6WrW-0000lC-IZ for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:58 -0400 Received: by mail-wm1-x344.google.com with SMTP id 185-v6so249184wmt.2 for ; Sun, 30 Sep 2018 01:13:58 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.13.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=lIg/+GbERYtn7Pg6g1/6zUc5vjQxYdGtDhLLK+GGJN8=; b=BkgdUQsQjU+ycCxOvCMVhk6+a0iVIKOqfr9QZlDXtSmzFjL1aHwEGWlb+1HHSYn3L1 iw3K34Ah8EZ/lfw50K0UI3z6xhhzd52f5RUW5b6xDMt3ljQvi9574dZrKoEE1r4kkJtF p/cqD8vWWKgdMBZvz9vG70ZHUuteDCBh4PRMAjTOeAZwab/sLw6xNTE23zepPcCgHa1K fPrdj4hO2UzDepWaJhTxvZFkghMdt283Y6kgHNorYY9wsy97WJDyu3H0eTTVz2/RQXba z5mKH0XA+wnbd/7UteI4rpbIOetiJBf45c9pPf/+/ReN/pFstYmPzKoKKurqHMoaW0VL 8aYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=lIg/+GbERYtn7Pg6g1/6zUc5vjQxYdGtDhLLK+GGJN8=; b=cc1O+EQWRwoFx2SsCHhS4vydUzmlaJbt166NXNLhoKY5UAlEUj34LZFkM4ZmGn3KT4 w5T089SEc9SwvVf0jqrfNf/Op73ZZWVs52ED5KWHR2txf/BqU1LfbX66JV4fj1Tpjqgs 9NB5f5Cwej2mU05ihmpPBR7F/3Qvh+oEZhE1hiasb7wSu9T1kHi46kCHbQ6zGskrPafR MeJNFQaDQOuFfMQ1SOqBpTftm4sGOMMbnFXZBtIE8DkAeklw1iaTAxD6I8Mlmblmbmxe z2BPcv9CeEr9RjD5ljZNVLjskJoR/4GeyB6QseCi84fZAjdtdQs7YhBwFnCBKtYJ46eN KkDA== X-Gm-Message-State: ABuFfogCaydHUC8IIAUPJwxIcdW2XvfKzDyhrcyaJDZe8/D6PNdLZXBQ nFweHMWfq23E/Z9rpUyf1NNjYY7m X-Google-Smtp-Source: ACcGV609yZ2qmgezq7G5/Z3PZ9PSEZJu2dbEEja5c0SQDaOePg/2+B2hAus0Hg5RirT8WVZJC0QqCw== X-Received: by 2002:a1c:1f92:: with SMTP id f140-v6mr6011664wmf.87.1538295236769; Sun, 30 Sep 2018 01:13:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:32 +0200 Message-Id: <1538295197-23704-35-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PULL 34/79] target/i386: move cpu_tmp3_i32 to DisasContext X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Emilio G. Cota" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Emilio G. Cota" Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- target/i386/translate.c | 64 ++++++++++++++++++++++++---------------------= ---- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/target/i386/translate.c b/target/i386/translate.c index ec68f7d..cd880cc 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -79,7 +79,6 @@ static TCGv cpu_seg_base[6]; static TCGv_i64 cpu_bndl[4]; static TCGv_i64 cpu_bndu[4]; =20 -static TCGv_i32 cpu_tmp3_i32; static TCGv_i64 cpu_tmp1_i64; =20 #include "exec/gen-icount.h" @@ -143,6 +142,7 @@ typedef struct DisasContext { TCGv_ptr ptr0; TCGv_ptr ptr1; TCGv_i32 tmp2_i32; + TCGv_i32 tmp3_i32; =20 sigjmp_buf jmpbuf; } DisasContext; @@ -1159,8 +1159,8 @@ static inline void gen_outs(DisasContext *s, TCGMemOp= ot) =20 tcg_gen_trunc_tl_i32(s->tmp2_i32, cpu_regs[R_EDX]); tcg_gen_andi_i32(s->tmp2_i32, s->tmp2_i32, 0xffff); - tcg_gen_trunc_tl_i32(cpu_tmp3_i32, s->T0); - gen_helper_out_func(ot, s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_trunc_tl_i32(s->tmp3_i32, s->T0); + gen_helper_out_func(ot, s->tmp2_i32, s->tmp3_i32); gen_op_movl_T0_Dshift(s, ot); gen_op_add_reg_T0(s, s->aflag, R_ESI); gen_bpt_io(s, s->tmp2_i32, ot); @@ -1426,8 +1426,8 @@ static void gen_shift_flags(DisasContext *s, TCGMemOp= ot, TCGv result, if (s->cc_op =3D=3D CC_OP_DYNAMIC) { oldop =3D cpu_cc_op; } else { - tcg_gen_movi_i32(cpu_tmp3_i32, s->cc_op); - oldop =3D cpu_tmp3_i32; + tcg_gen_movi_i32(s->tmp3_i32, s->cc_op); + oldop =3D s->tmp3_i32; } =20 /* Conditionally store the CC_OP value. */ @@ -1546,11 +1546,11 @@ static void gen_rot_rm_T1(DisasContext *s, TCGMemOp= ot, int op1, int is_right) #ifdef TARGET_X86_64 case MO_32: tcg_gen_trunc_tl_i32(s->tmp2_i32, s->T0); - tcg_gen_trunc_tl_i32(cpu_tmp3_i32, s->T1); + tcg_gen_trunc_tl_i32(s->tmp3_i32, s->T1); if (is_right) { - tcg_gen_rotr_i32(s->tmp2_i32, s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_rotr_i32(s->tmp2_i32, s->tmp2_i32, s->tmp3_i32); } else { - tcg_gen_rotl_i32(s->tmp2_i32, s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_rotl_i32(s->tmp2_i32, s->tmp2_i32, s->tmp3_i32); } tcg_gen_extu_i32_tl(s->T0, s->tmp2_i32); break; @@ -1593,9 +1593,9 @@ static void gen_rot_rm_T1(DisasContext *s, TCGMemOp o= t, int op1, int is_right) t1 =3D tcg_temp_new_i32(); tcg_gen_trunc_tl_i32(t1, s->T1); tcg_gen_movi_i32(s->tmp2_i32, CC_OP_ADCOX); - tcg_gen_movi_i32(cpu_tmp3_i32, CC_OP_EFLAGS); + tcg_gen_movi_i32(s->tmp3_i32, CC_OP_EFLAGS); tcg_gen_movcond_i32(TCG_COND_NE, cpu_cc_op, t1, t0, - s->tmp2_i32, cpu_tmp3_i32); + s->tmp2_i32, s->tmp3_i32); tcg_temp_free_i32(t0); tcg_temp_free_i32(t1); =20 @@ -3912,11 +3912,11 @@ static void gen_sse(CPUX86State *env, DisasContext = *s, int b, switch (ot) { default: tcg_gen_trunc_tl_i32(s->tmp2_i32, s->T0); - tcg_gen_trunc_tl_i32(cpu_tmp3_i32, cpu_regs[R_EDX]); - tcg_gen_mulu2_i32(s->tmp2_i32, cpu_tmp3_i32, - s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_trunc_tl_i32(s->tmp3_i32, cpu_regs[R_EDX]); + tcg_gen_mulu2_i32(s->tmp2_i32, s->tmp3_i32, + s->tmp2_i32, s->tmp3_i32); tcg_gen_extu_i32_tl(cpu_regs[s->vex_v], s->tmp2_i32); - tcg_gen_extu_i32_tl(cpu_regs[reg], cpu_tmp3_i32); + tcg_gen_extu_i32_tl(cpu_regs[reg], s->tmp3_i32); break; #ifdef TARGET_X86_64 case MO_64: @@ -4882,11 +4882,11 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) default: case MO_32: tcg_gen_trunc_tl_i32(s->tmp2_i32, s->T0); - tcg_gen_trunc_tl_i32(cpu_tmp3_i32, cpu_regs[R_EAX]); - tcg_gen_mulu2_i32(s->tmp2_i32, cpu_tmp3_i32, - s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_trunc_tl_i32(s->tmp3_i32, cpu_regs[R_EAX]); + tcg_gen_mulu2_i32(s->tmp2_i32, s->tmp3_i32, + s->tmp2_i32, s->tmp3_i32); tcg_gen_extu_i32_tl(cpu_regs[R_EAX], s->tmp2_i32); - tcg_gen_extu_i32_tl(cpu_regs[R_EDX], cpu_tmp3_i32); + tcg_gen_extu_i32_tl(cpu_regs[R_EDX], s->tmp3_i32); tcg_gen_mov_tl(cpu_cc_dst, cpu_regs[R_EAX]); tcg_gen_mov_tl(cpu_cc_src, cpu_regs[R_EDX]); set_cc_op(s, CC_OP_MULL); @@ -4933,14 +4933,14 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) default: case MO_32: tcg_gen_trunc_tl_i32(s->tmp2_i32, s->T0); - tcg_gen_trunc_tl_i32(cpu_tmp3_i32, cpu_regs[R_EAX]); - tcg_gen_muls2_i32(s->tmp2_i32, cpu_tmp3_i32, - s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_trunc_tl_i32(s->tmp3_i32, cpu_regs[R_EAX]); + tcg_gen_muls2_i32(s->tmp2_i32, s->tmp3_i32, + s->tmp2_i32, s->tmp3_i32); tcg_gen_extu_i32_tl(cpu_regs[R_EAX], s->tmp2_i32); - tcg_gen_extu_i32_tl(cpu_regs[R_EDX], cpu_tmp3_i32); + tcg_gen_extu_i32_tl(cpu_regs[R_EDX], s->tmp3_i32); tcg_gen_sari_i32(s->tmp2_i32, s->tmp2_i32, 31); tcg_gen_mov_tl(cpu_cc_dst, cpu_regs[R_EAX]); - tcg_gen_sub_i32(s->tmp2_i32, s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_sub_i32(s->tmp2_i32, s->tmp2_i32, s->tmp3_i32); tcg_gen_extu_i32_tl(cpu_cc_src, s->tmp2_i32); set_cc_op(s, CC_OP_MULL); break; @@ -5210,13 +5210,13 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) #endif case MO_32: tcg_gen_trunc_tl_i32(s->tmp2_i32, s->T0); - tcg_gen_trunc_tl_i32(cpu_tmp3_i32, s->T1); - tcg_gen_muls2_i32(s->tmp2_i32, cpu_tmp3_i32, - s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_trunc_tl_i32(s->tmp3_i32, s->T1); + tcg_gen_muls2_i32(s->tmp2_i32, s->tmp3_i32, + s->tmp2_i32, s->tmp3_i32); tcg_gen_extu_i32_tl(cpu_regs[reg], s->tmp2_i32); tcg_gen_sari_i32(s->tmp2_i32, s->tmp2_i32, 31); tcg_gen_mov_tl(cpu_cc_dst, cpu_regs[reg]); - tcg_gen_sub_i32(s->tmp2_i32, s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_sub_i32(s->tmp2_i32, s->tmp2_i32, s->tmp3_i32); tcg_gen_extu_i32_tl(cpu_cc_src, s->tmp2_i32); break; default: @@ -6417,8 +6417,8 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_io_start(); } tcg_gen_movi_i32(s->tmp2_i32, val); - tcg_gen_trunc_tl_i32(cpu_tmp3_i32, s->T1); - gen_helper_out_func(ot, s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_trunc_tl_i32(s->tmp3_i32, s->T1); + gen_helper_out_func(ot, s->tmp2_i32, s->tmp3_i32); gen_bpt_io(s, s->tmp2_i32, ot); if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { gen_io_end(); @@ -6455,8 +6455,8 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_io_start(); } tcg_gen_trunc_tl_i32(s->tmp2_i32, s->T0); - tcg_gen_trunc_tl_i32(cpu_tmp3_i32, s->T1); - gen_helper_out_func(ot, s->tmp2_i32, cpu_tmp3_i32); + tcg_gen_trunc_tl_i32(s->tmp3_i32, s->T1); + gen_helper_out_func(ot, s->tmp2_i32, s->tmp3_i32); gen_bpt_io(s, s->tmp2_i32, ot); if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { gen_io_end(); @@ -8486,7 +8486,7 @@ static void i386_tr_init_disas_context(DisasContextBa= se *dcbase, CPUState *cpu) dc->tmp0 =3D tcg_temp_new(); cpu_tmp1_i64 =3D tcg_temp_new_i64(); dc->tmp2_i32 =3D tcg_temp_new_i32(); - cpu_tmp3_i32 =3D tcg_temp_new_i32(); + dc->tmp3_i32 =3D tcg_temp_new_i32(); dc->tmp4 =3D tcg_temp_new(); dc->ptr0 =3D tcg_temp_new_ptr(); dc->ptr1 =3D tcg_temp_new_ptr(); --=20 1.8.3.1