From patchwork Thu Nov 7 01:05:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 289093 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 9A4482C014B for ; Thu, 7 Nov 2013 12:32:47 +1100 (EST) Received: from localhost ([::1]:37150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeESj-0004by-PJ for incoming@patchwork.ozlabs.org; Wed, 06 Nov 2013 20:32:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeE5M-0000cr-OE for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VeE5G-0006av-Ts for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:36 -0500 Received: from mail-pb0-x22c.google.com ([2607:f8b0:400e:c01::22c]:40040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeE5G-0006ai-MY for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:30 -0500 Received: by mail-pb0-f44.google.com with SMTP id rp8so310695pbb.17 for ; Wed, 06 Nov 2013 17:08:29 -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=jfUyiAOggHiIgnP9qExxwvl7qWATdUQe3Szy2bUI+4E=; b=zCoeAH9utHjf6mNEqg+sDbPbLyOyOuMLpTaTdOVm8q0CatzQ07dT/nIFYFi2Um/A4u C5sxIEESdZqb2SNZKiQFbXOJ2esj4Jx8/UN7Fch1cZIUok0qIViwW0hDbZFnZUcXanot p3S82N5e0JscL3vh0s5HREDHZ8zP+g7CImHLczn4VOFoGNsE399jTzDf8KjAcHAckCim fToQLBDzkHZBf7mKFZEmLwhdVoMMWyv+Y5rRXwRH4vIYlNN7L0fg2mzQZBXvaw3PWE01 U54PA3i7S+hq/pjM9TwLiREY3OZ0TFiXykyXwSsbfluR3JVyz2WxlNDDmyMCbGwpsu+P 5jFQ== X-Received: by 10.66.25.6 with SMTP id y6mr228598paf.180.1383786509709; Wed, 06 Nov 2013 17:08:29 -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.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2013 17:08:29 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Nov 2013 11:05:20 +1000 Message-Id: <1383786324-18415-58-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::22c Subject: [Qemu-devel] [PATCH for-1.8 57/61] target-i386: Tidy gen_add_A0_im 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 Merge gen_op_addl_A0_im and gen_op_addq_A0_im into gen_add_A0_im and clean up the ifdef. Replace the one remaining user of gen_op_addl_A0_im with gen_add_A0_im. Signed-off-by: Richard Henderson --- target-i386/translate.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 0b49a35..f8290b3 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -376,29 +376,12 @@ static inline void gen_op_mov_v_reg(TCGMemOp ot, TCGv t0, int reg) } } -static inline void gen_op_addl_A0_im(int32_t val) -{ - tcg_gen_addi_tl(cpu_A0, cpu_A0, val); -#ifdef TARGET_X86_64 - tcg_gen_andi_tl(cpu_A0, cpu_A0, 0xffffffff); -#endif -} - -#ifdef TARGET_X86_64 -static inline void gen_op_addq_A0_im(int64_t val) -{ - tcg_gen_addi_tl(cpu_A0, cpu_A0, val); -} -#endif - static void gen_add_A0_im(DisasContext *s, int val) { -#ifdef TARGET_X86_64 - if (CODE64(s)) - gen_op_addq_A0_im(val); - else -#endif - gen_op_addl_A0_im(val); + tcg_gen_addi_tl(cpu_A0, cpu_A0, val); + if (!CODE64(s)) { + tcg_gen_ext32u_tl(cpu_A0, cpu_A0); + } } static inline void gen_op_jmp_T0(void) @@ -6233,7 +6216,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, exception */ gen_op_jmp_T0(); /* pop selector */ - gen_op_addl_A0_im(1 << dflag); + gen_add_A0_im(s, 1 << dflag); gen_op_ld_v(s, dflag, cpu_T[0], cpu_A0); gen_op_movl_seg_T0_vm(R_CS); /* add stack offset */