From patchwork Thu Nov 7 01:05:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 289150 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 2328C2C05DA for ; Thu, 7 Nov 2013 14:14:47 +1100 (EST) Received: from localhost ([::1]:37055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeELt-0005Dl-Vs for incoming@patchwork.ozlabs.org; Wed, 06 Nov 2013 20:25:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeE53-0000Tb-L9 for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VeE4x-0006W8-Ol for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:17 -0500 Received: from mail-pd0-x230.google.com ([2607:f8b0:400e:c02::230]:51947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeE4x-0006VT-Dp for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:11 -0500 Received: by mail-pd0-f176.google.com with SMTP id g10so309187pdj.21 for ; Wed, 06 Nov 2013 17:08:10 -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=F3TndsGWjkOphglwA8Fp3pZ0y9q9qhSr/iaW6rUwSr8=; b=G4bBerDIePV+xScpUCK8zQJNSbosVCvZVz0lmOvps9sIhL2d6SHQVSHNvDyA5IE4d1 YYVP8g76pRkZgKKxtD3MnxUs2jvBzWaQJ7GvVjmNowm1oe1V6EMKigSE9eSMGUGX9dVb htaD7G5AnxC0TYXmUom7cJdlQVEb9r8r3apMJ5lZbc858xKP9I14BO5ARjCrdzayLE6X rhLzw7x3ErWeBOU9mYDmGhLX3pDk5R13Ia1u2dqgmvS1z5Sxg4iSvJ4Hj8e4eLkwbPQI BcbxXghlNIKL7LhXCF8bgBi+XsPDHf7pc52+6kN2LaK1YGb/9laciu67n7j38JLTvbO5 +owQ== X-Received: by 10.68.143.231 with SMTP id sh7mr6151134pbb.35.1383786490477; Wed, 06 Nov 2013 17:08:10 -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.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2013 17:08:09 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Nov 2013 11:05:12 +1000 Message-Id: <1383786324-18415-50-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:c02::230 Subject: [Qemu-devel] [PATCH for-1.8 49/61] target-i386: Introduce mo_stacksize 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 Centralize computation of a MO_SIZE for the stack pointer. Signed-off-by: Richard Henderson --- target-i386/translate.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 529a122..99b8e9e 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -308,6 +308,12 @@ static inline TCGMemOp mo_pushpop(DisasContext *s, TCGMemOp ot) } } +/* Select the size of the stack pointer. */ +static inline TCGMemOp mo_stacksize(DisasContext *s) +{ + return CODE64(s) ? MO_64 : s->ss32 ? MO_32 : MO_16; +} + /* Select only size 64 else 32. Used for SSE operand sizes. */ static inline TCGMemOp mo_64_32(TCGMemOp ot) { @@ -2263,37 +2269,24 @@ gen_svm_check_intercept(DisasContext *s, target_ulong pc_start, uint64_t type) static inline void gen_stack_update(DisasContext *s, int addend) { -#ifdef TARGET_X86_64 - if (CODE64(s)) { - gen_op_add_reg_im(MO_64, R_ESP, addend); - } else -#endif - if (s->ss32) { - gen_op_add_reg_im(MO_32, R_ESP, addend); - } else { - gen_op_add_reg_im(MO_16, R_ESP, addend); - } + gen_op_add_reg_im(mo_stacksize(s), R_ESP, addend); } /* Generate a push. It depends on ss32, addseg and dflag. */ static void gen_push_v(DisasContext *s, TCGv val) { - TCGMemOp a_ot, d_ot = mo_pushpop(s, s->dflag); + TCGMemOp d_ot = mo_pushpop(s, s->dflag); + TCGMemOp a_ot = mo_stacksize(s); int size = 1 << d_ot; TCGv new_esp = cpu_A0; tcg_gen_subi_tl(cpu_A0, cpu_regs[R_ESP], size); - if (CODE64(s)) { - a_ot = MO_64; - } else { - a_ot = s->ss32 ? MO_32 : MO_16; - if (s->addseg) { - new_esp = cpu_tmp4; - tcg_gen_mov_tl(new_esp, cpu_A0); - } - gen_lea_v_seg(s, a_ot, cpu_A0, R_SS, -1); + if (s->addseg) { + new_esp = cpu_tmp4; + tcg_gen_mov_tl(new_esp, cpu_A0); } + gen_lea_v_seg(s, a_ot, cpu_A0, R_SS, -1); gen_op_st_v(s, d_ot, val, cpu_A0); gen_op_mov_reg_v(a_ot, R_ESP, new_esp); @@ -2308,7 +2301,7 @@ static TCGMemOp gen_pop_T0(DisasContext *s) if (CODE64(s)) { addr = cpu_regs[R_ESP]; } else { - gen_lea_v_seg(s, s->ss32 ? MO_32 : MO_16, cpu_regs[R_ESP], R_SS, -1); + gen_lea_v_seg(s, mo_stacksize(s), cpu_regs[R_ESP], R_SS, -1); addr = cpu_A0; } @@ -2323,12 +2316,12 @@ static inline void gen_pop_update(DisasContext *s, TCGMemOp ot) 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); + gen_lea_v_seg(s, mo_stacksize(s), cpu_regs[R_ESP], R_SS, -1); } static void gen_pusha(DisasContext *s) { - TCGMemOp s_ot = s->ss32 ? MO_32 : MO_16; + TCGMemOp s_ot = mo_stacksize(s); TCGMemOp d_ot = s->dflag; int size = 1 << d_ot; int i; @@ -2344,7 +2337,7 @@ static void gen_pusha(DisasContext *s) static void gen_popa(DisasContext *s) { - TCGMemOp s_ot = s->ss32 ? MO_32 : MO_16; + TCGMemOp s_ot = mo_stacksize(s); TCGMemOp d_ot = s->dflag; int size = 1 << d_ot; int i; @@ -2366,7 +2359,7 @@ static void gen_popa(DisasContext *s) static void gen_enter(DisasContext *s, int esp_addend, int level) { TCGMemOp d_ot = mo_pushpop(s, s->dflag); - TCGMemOp a_ot = CODE64(s) ? MO_64 : s->ss32 ? MO_32 : MO_16; + TCGMemOp a_ot = mo_stacksize(s); int size = 1 << d_ot; /* Push BP; compute FrameTemp into T1. */