From patchwork Thu Nov 7 01:05:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 289117 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 73DED2C032D for ; Thu, 7 Nov 2013 13:02:59 +1100 (EST) Received: from localhost ([::1]:37247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeEvx-0006L5-IE for incoming@patchwork.ozlabs.org; Wed, 06 Nov 2013 21:02:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeE4y-0000Ng-JO for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VeE4s-0006Ug-PO for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:12 -0500 Received: from mail-pb0-x229.google.com ([2607:f8b0:400e:c01::229]:48154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeE4s-0006UV-HY for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:06 -0500 Received: by mail-pb0-f41.google.com with SMTP id wy17so312109pbc.28 for ; Wed, 06 Nov 2013 17:08:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=RtE/xtd+sh7Q+j2IDuoRwUetShtmQynZMJmyBydoCFs=; b=MC+3fMmwO3XHZ646/s2HxLjpfas4xE18eqBS2kLJby1pbAbGy/Rv0egWyf8ZxGeuNF Sj+F7B0jDNt8NczPoMNY0DEtoGhwhXW1t/IIiF1GRQuUhsUrszHwv1Lrkfno5l8ebQHL EayHj34agAPkNhbDXcdniBPOlI1KdJuG8YQGqwgStkcyTRx1hkBqZtoyGZqTgpWw6F+l kanojGO89XslnM5tKXFCXpT5a2jWl7WziNCFlc45OHMpE/aA0uXt5pvd2D/0aKjBz9+/ NlAqD25p7iXtCbDE8BK2MN9sZugj16LGpmaaK/ztIjhSN6FLzrJPCdQwYdZG4oWFCzrP vvFQ== X-Received: by 10.68.108.228 with SMTP id hn4mr6200173pbb.174.1383786485523; Wed, 06 Nov 2013 17:08:05 -0800 (PST) Received: from pebble.com (CPE-138-130-249-46.lnse4.cha.bigpond.net.au. [138.130.249.46]) by mx.google.com with ESMTPSA id xs1sm1726198pac.7.2013.11.06.17.08.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2013 17:08:04 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Nov 2013 11:05:10 +1000 Message-Id: <1383786324-18415-48-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1383786324-18415-1-git-send-email-rth@twiddle.net> References: <1383786324-18415-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:400e:c01::229 Subject: [Qemu-devel] [PATCH for-1.8 47/61] target-i386: Use gen_lea_v_seg in pusha/popa 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 More centralization of handling of segment bases. Also fixes the note about 16-bit wrap around not fully handled. Signed-off-by: Richard Henderson --- target-i386/translate.c | 50 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 3bb77eb..2a20189 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -2337,45 +2337,41 @@ static inline void gen_stack_A0(DisasContext *s) gen_lea_v_seg(s, s->ss32 ? MO_32 : MO_16, cpu_regs[R_ESP], R_SS, -1); } -/* NOTE: wrap around in 16 bit not fully handled */ static void gen_pusha(DisasContext *s) { + TCGMemOp s_ot = s->ss32 ? MO_32 : MO_16; + TCGMemOp d_ot = s->dflag; + int size = 1 << d_ot; int i; - gen_op_movl_A0_reg(R_ESP); - gen_op_addl_A0_im(-8 << s->dflag); - if (!s->ss32) - tcg_gen_ext16u_tl(cpu_A0, cpu_A0); - tcg_gen_mov_tl(cpu_T[1], cpu_A0); - if (s->addseg) - gen_op_addl_A0_seg(s, R_SS); - for(i = 0;i < 8; i++) { - gen_op_mov_TN_reg(MO_32, 0, 7 - i); - gen_op_st_v(s, s->dflag, cpu_T[0], cpu_A0); - gen_op_addl_A0_im(1 << s->dflag); + + for (i = 0; i < 8; i++) { + tcg_gen_addi_tl(cpu_A0, cpu_regs[R_ESP], (i - 8) * size); + gen_lea_v_seg(s, s_ot, cpu_A0, R_SS, -1); + gen_op_st_v(s, d_ot, cpu_regs[7 - i], cpu_A0); } - gen_op_mov_reg_T1(MO_16 + s->ss32, R_ESP); + + gen_stack_update(s, -8 * size); } -/* NOTE: wrap around in 16 bit not fully handled */ static void gen_popa(DisasContext *s) { + TCGMemOp s_ot = s->ss32 ? MO_32 : MO_16; + TCGMemOp d_ot = s->dflag; + int size = 1 << d_ot; int i; - gen_op_movl_A0_reg(R_ESP); - if (!s->ss32) - tcg_gen_ext16u_tl(cpu_A0, cpu_A0); - tcg_gen_mov_tl(cpu_T[1], cpu_A0); - tcg_gen_addi_tl(cpu_T[1], cpu_T[1], 8 << s->dflag); - if (s->addseg) - gen_op_addl_A0_seg(s, R_SS); - for(i = 0;i < 8; i++) { + + for (i = 0; i < 8; i++) { /* ESP is not reloaded */ - if (i != 3) { - gen_op_ld_v(s, s->dflag, cpu_T[0], cpu_A0); - gen_op_mov_reg_T0(s->dflag, 7 - i); + if (7 - i == R_ESP) { + continue; } - gen_op_addl_A0_im(1 << s->dflag); + tcg_gen_addi_tl(cpu_A0, cpu_regs[R_ESP], i * size); + gen_lea_v_seg(s, s_ot, cpu_A0, R_SS, -1); + gen_op_ld_v(s, d_ot, cpu_T[0], cpu_A0); + gen_op_mov_reg_T0(d_ot, 7 - i); } - gen_op_mov_reg_T1(MO_16 + s->ss32, R_ESP); + + gen_stack_update(s, 8 * size); } static void gen_enter(DisasContext *s, int esp_addend, int level)