From patchwork Fri May 21 16:03:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 53190 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D7951B7D30 for ; Sat, 22 May 2010 02:57:53 +1000 (EST) Received: from localhost ([127.0.0.1]:34724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFVDa-0007fW-DW for incoming@patchwork.ozlabs.org; Fri, 21 May 2010 12:37:02 -0400 Received: from [140.186.70.92] (port=57366 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFUgz-0008Mq-Cg for qemu-devel@nongnu.org; Fri, 21 May 2010 12:03:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OFUgv-00008k-OU for qemu-devel@nongnu.org; Fri, 21 May 2010 12:03:19 -0400 Received: from are.twiddle.net ([75.149.56.221]:40541) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFUgu-00008C-NN for qemu-devel@nongnu.org; Fri, 21 May 2010 12:03:17 -0400 Received: from anchor.twiddle.home (anchor.twiddle.home [172.31.0.4]) by are.twiddle.net (Postfix) with ESMTPS id 29ADD263; Fri, 21 May 2010 09:03:16 -0700 (PDT) Received: from anchor.twiddle.home (anchor.twiddle.home [127.0.0.1]) by anchor.twiddle.home (8.14.4/8.14.4) with ESMTP id o4LG3F26022471; Fri, 21 May 2010 09:03:15 -0700 Received: (from rth@localhost) by anchor.twiddle.home (8.14.4/8.14.4/Submit) id o4LG3FtB022470; Fri, 21 May 2010 09:03:15 -0700 From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 21 May 2010 09:03:04 -0700 Message-Id: <1274457790-22396-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.0.1 In-Reply-To: <1274457790-22396-1-git-send-email-rth@twiddle.net> References: <1274457790-22396-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 5/5] tcg-i386: Remove some ifdefs in qemu_ld/st. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Tidy some code by replacing ifdefs by C ifs. Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.c | 85 ++++++++++++++++++++++--------------------------- 1 files changed, 38 insertions(+), 47 deletions(-) diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c index cf621da..8a9122c 100644 --- a/tcg/i386/tcg-target.c +++ b/tcg/i386/tcg-target.c @@ -842,7 +842,7 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int data_reg, data_reg2 = 0; int addrlo_idx; #if defined(CONFIG_SOFTMMU) - int mem_index, s_bits; + int mem_index, s_bits, arg_idx; uint8_t *label_ptr[3]; #endif @@ -877,12 +877,14 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, } /* XXX: move that code at the end of the TB */ -#if TARGET_LONG_BITS == 32 - tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_EDX, mem_index); -#else - tcg_out_mov(s, TCG_REG_EDX, args[addrlo_idx + 1]); - tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_ECX, mem_index); -#endif + /* EAX is already loaded. */ + arg_idx = 1; + if (TARGET_LONG_BITS == 64) { + tcg_out_mov(s, tcg_target_call_iarg_regs[arg_idx++], + args[addrlo_idx + 1]); + } + tcg_out_movi(s, TCG_TYPE_I32, tcg_target_call_iarg_regs[arg_idx], + mem_index); tcg_out_calli(s, (tcg_target_long)qemu_ld_helpers[s_bits]); switch(opc) { @@ -1018,51 +1020,40 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, } /* XXX: move that code at the end of the TB */ -#if TARGET_LONG_BITS == 32 - if (opc == 3) { + if (TARGET_LONG_BITS == 32) { tcg_out_mov(s, TCG_REG_EDX, data_reg); - tcg_out_mov(s, TCG_REG_ECX, data_reg2); - tcg_out_pushi(s, mem_index); - stack_adjust = 4; - } else { - switch(opc) { - case 0: - tcg_out_ext8u(s, TCG_REG_EDX, data_reg); - break; - case 1: - tcg_out_ext16u(s, TCG_REG_EDX, data_reg); - break; - case 2: - tcg_out_mov(s, TCG_REG_EDX, data_reg); - break; + if (opc == 3) { + tcg_out_mov(s, TCG_REG_ECX, data_reg2); + tcg_out_pushi(s, mem_index); + stack_adjust = 4; + } else { + tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_ECX, mem_index); + stack_adjust = 0; } - tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_ECX, mem_index); - stack_adjust = 0; - } -#else - if (opc == 3) { - tcg_out_mov(s, TCG_REG_EDX, args[addrlo_idx + 1]); - tcg_out_pushi(s, mem_index); - tcg_out_push(s, data_reg2); - tcg_out_push(s, data_reg); - stack_adjust = 12; } else { - tcg_out_mov(s, TCG_REG_EDX, args[addrlo_idx + 1]); - switch(opc) { - case 0: - tcg_out_ext8u(s, TCG_REG_ECX, data_reg); - break; - case 1: - tcg_out_ext16u(s, TCG_REG_ECX, data_reg); - break; - case 2: - tcg_out_mov(s, TCG_REG_ECX, data_reg); - break; + if (opc == 3) { + tcg_out_mov(s, TCG_REG_EDX, args[addrlo_idx + 1]); + tcg_out_pushi(s, mem_index); + tcg_out_push(s, data_reg2); + tcg_out_push(s, data_reg); + stack_adjust = 12; + } else { + tcg_out_mov(s, TCG_REG_EDX, args[addrlo_idx + 1]); + switch(opc) { + case 0: + tcg_out_ext8u(s, TCG_REG_ECX, data_reg); + break; + case 1: + tcg_out_ext16u(s, TCG_REG_ECX, data_reg); + break; + case 2: + tcg_out_mov(s, TCG_REG_ECX, data_reg); + break; + } + tcg_out_pushi(s, mem_index); + stack_adjust = 4; } - tcg_out_pushi(s, mem_index); - stack_adjust = 4; } -#endif tcg_out_calli(s, (tcg_target_long)qemu_st_helpers[s_bits]);