From patchwork Tue Jan 7 21:00:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 307783 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6F7D82C00C9 for ; Wed, 8 Jan 2014 08:36:43 +1100 (EST) Received: from localhost ([::1]:43078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0e2y-0001ZC-EH for incoming@patchwork.ozlabs.org; Tue, 07 Jan 2014 16:18:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0dnA-0004XX-BL for qemu-devel@nongnu.org; Tue, 07 Jan 2014 16:02:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0dn5-0003lb-Jo for qemu-devel@nongnu.org; Tue, 07 Jan 2014 16:02:28 -0500 Received: from mail-qa0-x22a.google.com ([2607:f8b0:400d:c00::22a]:49776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0dn5-0003lP-A1 for qemu-devel@nongnu.org; Tue, 07 Jan 2014 16:02:23 -0500 Received: by mail-qa0-f42.google.com with SMTP id ii20so1102275qab.1 for ; Tue, 07 Jan 2014 13:02:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ulDgP73j5F6njdG6tnrhpQHopOGk3+rfZURSu8oA6+Y=; b=D/hgPbejJw1xq95lhK+NaPCALDB8HBVDf4G9DwFuP8yFaKgKGW+xJjPkUBMvg0W0LQ Hqw9o06E2aVYuXv6512su8ximfYd1v+9zGthspVpC8vASBt4h8Cu67uRO7nh7cBt12IK XuJ2RmprEwBTz7QoTUBkOnhqYMRshbyiQD1h2C2rlPFetEpoQDeY+b8SPvqSs6o9sn0i Om0+N9dW5DPiIdBSRJLq7B8782UIlz8kDbEGaNX3LdkreCUyqHi98hZg22D+AOsVX/Qd /TOVfbD3HWgEQSxwwaoHLlYQzhmbEy4Absha0VNjopyu7wCqz+e8Jfa1UW0ezTCH8P4C Zfyw== X-Received: by 10.224.103.129 with SMTP id k1mr194051926qao.77.1389128542529; Tue, 07 Jan 2014 13:02:22 -0800 (PST) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id d7sm22444571qam.5.2014.01.07.13.02.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jan 2014 13:02:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 7 Jan 2014 13:00:30 -0800 Message-Id: <1389128439-10067-41-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1389128439-10067-1-git-send-email-rth@twiddle.net> References: <1389128439-10067-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::22a Cc: aliguori@amazon.com Subject: [Qemu-devel] [PULL 40/49] target_i386: Clean up gen_pop_T0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Reduce ifdefs, share more code between paths, reduce the number of TCG ops generated. Avoid re-computing the size of the operation across gen_pop_T0 and gen_pop_update. Add forgotten zero-extension in the TARGET_X86_64, !CODE64, ss32 case. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target-i386/translate.c | 84 ++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 47 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 589c90c..9baeffa 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -2417,30 +2417,30 @@ static void gen_push_v(DisasContext *s, TCGv val) } /* two step pop is necessary for precise exceptions */ -static void gen_pop_T0(DisasContext *s) +static TCGMemOp gen_pop_T0(DisasContext *s) { -#ifdef TARGET_X86_64 + TCGMemOp d_ot = mo_pushpop(s, s->dflag); + TCGv addr = cpu_A0; + if (CODE64(s)) { - gen_op_movq_A0_reg(R_ESP); - gen_op_ld_v(s, mo_pushpop(s, s->dflag), cpu_T[0], cpu_A0); - } else -#endif - { - gen_op_movl_A0_reg(R_ESP); - if (s->ss32) { - if (s->addseg) - gen_op_addl_A0_seg(s, R_SS); - } else { - tcg_gen_ext16u_tl(cpu_A0, cpu_A0); - gen_op_addl_A0_seg(s, R_SS); - } - gen_op_ld_v(s, s->dflag, cpu_T[0], cpu_A0); + addr = cpu_regs[R_ESP]; + } else if (!s->ss32) { + tcg_gen_ext16u_tl(cpu_A0, cpu_regs[R_ESP]); + gen_op_addl_A0_seg(s, R_SS); + } else if (s->addseg) { + tcg_gen_mov_tl(cpu_A0, cpu_regs[R_ESP]); + gen_op_addl_A0_seg(s, R_SS); + } else { + tcg_gen_ext32u_tl(cpu_A0, cpu_regs[R_ESP]); } + + gen_op_ld_v(s, d_ot, cpu_T[0], addr); + return d_ot; } -static void gen_pop_update(DisasContext *s) +static void gen_pop_update(DisasContext *s, TCGMemOp ot) { - gen_stack_update(s, 1 << mo_pushpop(s, s->dflag)); + gen_stack_update(s, 1 << ot); } static void gen_stack_A0(DisasContext *s) @@ -5237,10 +5237,9 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, gen_push_v(s, cpu_T[0]); break; case 0x58 ... 0x5f: /* pop */ - ot = mo_pushpop(s, dflag); - gen_pop_T0(s); + ot = gen_pop_T0(s); /* NOTE: order is important for pop %sp */ - gen_pop_update(s); + gen_pop_update(s, ot); gen_op_mov_reg_T0(ot, (b & 7) | REX_B(s)); break; case 0x60: /* pusha */ @@ -5264,13 +5263,12 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, gen_push_v(s, cpu_T[0]); break; case 0x8f: /* pop Ev */ - ot = mo_pushpop(s, dflag); modrm = cpu_ldub_code(env, s->pc++); mod = (modrm >> 6) & 3; - gen_pop_T0(s); + ot = gen_pop_T0(s); if (mod == 3) { /* NOTE: order is important for pop %sp */ - gen_pop_update(s); + gen_pop_update(s, ot); rm = (modrm & 7) | REX_B(s); gen_op_mov_reg_T0(ot, rm); } else { @@ -5278,7 +5276,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, s->popl_esp_hack = 1 << ot; gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1); s->popl_esp_hack = 0; - gen_pop_update(s); + gen_pop_update(s, ot); } break; case 0xc8: /* enter */ @@ -5302,10 +5300,9 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, gen_op_mov_TN_reg(MO_16, 0, R_EBP); gen_op_mov_reg_T0(MO_16, R_ESP); } - gen_pop_T0(s); - ot = mo_pushpop(s, dflag); + ot = gen_pop_T0(s); gen_op_mov_reg_T0(ot, R_EBP); - gen_pop_update(s); + gen_pop_update(s, ot); break; case 0x06: /* push es */ case 0x0e: /* push cs */ @@ -5327,9 +5324,9 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, if (CODE64(s)) goto illegal_op; reg = b >> 3; - gen_pop_T0(s); + ot = gen_pop_T0(s); gen_movl_seg_T0(s, reg, pc_start - s->cs_base); - gen_pop_update(s); + gen_pop_update(s, ot); if (reg == R_SS) { /* if reg == SS, inhibit interrupts/trace. */ /* If several instructions disable interrupts, only the @@ -5345,9 +5342,9 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, break; case 0x1a1: /* pop fs */ case 0x1a9: /* pop gs */ - gen_pop_T0(s); + ot = gen_pop_T0(s); gen_movl_seg_T0(s, (b >> 3) & 7, pc_start - s->cs_base); - gen_pop_update(s); + gen_pop_update(s, ot); if (s->is_jmp) { gen_jmp_im(s->pc - s->cs_base); gen_eob(s); @@ -6383,23 +6380,16 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, case 0xc2: /* ret im */ val = cpu_ldsw_code(env, s->pc); s->pc += 2; - gen_pop_T0(s); - if (CODE64(s) && dflag != MO_16) { - dflag = MO_64; - } - gen_stack_update(s, val + (1 << dflag)); - if (dflag == MO_16) { - tcg_gen_ext16u_tl(cpu_T[0], cpu_T[0]); - } + ot = gen_pop_T0(s); + gen_stack_update(s, val + (1 << ot)); + /* Note that gen_pop_T0 uses a zero-extending load. */ gen_op_jmp_T0(); gen_eob(s); break; case 0xc3: /* ret */ - gen_pop_T0(s); - gen_pop_update(s); - if (dflag == MO_16) { - tcg_gen_ext16u_tl(cpu_T[0], cpu_T[0]); - } + ot = gen_pop_T0(s); + gen_pop_update(s, ot); + /* Note that gen_pop_T0 uses a zero-extending load. */ gen_op_jmp_T0(); gen_eob(s); break; @@ -6572,7 +6562,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, if (s->vm86 && s->iopl != 3) { gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); } else { - gen_pop_T0(s); + ot = gen_pop_T0(s); if (s->cpl == 0) { if (dflag != MO_16) { gen_helper_write_eflags(cpu_env, cpu_T[0], @@ -6618,7 +6608,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, } } } - gen_pop_update(s); + gen_pop_update(s, ot); set_cc_op(s, CC_OP_EFLAGS); /* abort translation because TF/AC flag may change */ gen_jmp_im(s->pc - s->cs_base);