From patchwork Sun Mar 31 22:35:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 232651 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5D5F72C00C9 for ; Mon, 1 Apr 2013 10:39:18 +1100 (EST) Received: from localhost ([::1]:41573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMQwk-0007o1-0e for incoming@patchwork.ozlabs.org; Sun, 31 Mar 2013 18:41:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMQr3-0000s5-69 for qemu-devel@nongnu.org; Sun, 31 Mar 2013 18:36:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UMQqz-0007th-4U for qemu-devel@nongnu.org; Sun, 31 Mar 2013 18:36:00 -0400 Received: from mail-da0-x22a.google.com ([2607:f8b0:400e:c00::22a]:59159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMQqy-0007tX-TZ for qemu-devel@nongnu.org; Sun, 31 Mar 2013 18:35:57 -0400 Received: by mail-da0-f42.google.com with SMTP id n15so826123dad.29 for ; Sun, 31 Mar 2013 15:35:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=amqzESKgj2FwQOvmMAEQY9Vr4Z62bpHFGK2PdLpX6lk=; b=qrIEstcq9BU1V2MjdKDHP8gw7GUKew9j1aKIMlPlwkeO3gOzaoDMMLa2ra9bcEZM88 wyjXssL5ML6pfPvWT71UXhq92nfxC6Kv6UG5ekY6B1dkmyZ4UKtlEVCAFrMDBcF4bEJw ZOUWPXu+8w8OCMRDomTzl3+zHRWyIBfpnyQrfhuLKbVwLieK3QU48uTmdUruBhDnC+/+ UZvV0xuJNlFgZo9a52AN49V9jSenuvd/8+JsMSowYQvi3K+X5t6CIVzUjU09Te9+WmJk ew6MhgtGlSadCMB11QmN/zHk4qOjPIbrpyzVjHQSSPjl1bDaB0jIDekIudY96EZNzgiW joeg== X-Received: by 10.66.227.228 with SMTP id sd4mr15861295pac.38.1364769356190; Sun, 31 Mar 2013 15:35:56 -0700 (PDT) Received: from fremont.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPS id ve7sm12586235pab.11.2013.03.31.15.35.53 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 31 Mar 2013 15:35:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 31 Mar 2013 15:35:05 -0700 Message-Id: <1364769305-3687-20-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364769305-3687-1-git-send-email-rth@twiddle.net> References: <1364769305-3687-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:c00::22a Cc: Aurelien Jarno Subject: [Qemu-devel] [PATCH v5 19/19] tcg-arm: Tidy exit_tb 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 Use tcg_out_movi32 when it's profitable, which is always for v7. Simplify the logic around tcg_out_goto, now that we're sure that it won't generate a multi-insn branch. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- tcg/arm/tcg-target.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index c27e4ee..eaade4a 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c @@ -1604,17 +1604,16 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, switch (opc) { case INDEX_op_exit_tb: - { - uint8_t *ld_ptr = s->code_ptr; - if (args[0] >> 8) - tcg_out_ld32_12(s, COND_AL, TCG_REG_R0, TCG_REG_PC, 0); - else - tcg_out_dat_imm(s, COND_AL, ARITH_MOV, TCG_REG_R0, 0, args[0]); + if (use_armv7_instructions || check_fit_imm(args[0])) { + tcg_out_movi32(s, COND_AL, TCG_REG_R0, args[0]); tcg_out_goto(s, COND_AL, (tcg_target_ulong) tb_ret_addr); - if (args[0] >> 8) { - *ld_ptr = (uint8_t) (s->code_ptr - ld_ptr) - 8; - tcg_out32(s, args[0]); - } + } else { + /* Lacking a real constant pool, use a pc-relative load. Since + tcg_out_goto will always emit 1 insn, we know without further + ado that 0 plus the standard 8 bias is right. */ + tcg_out_ld32_12(s, COND_AL, TCG_REG_R0, TCG_REG_PC, 0); + tcg_out_goto(s, COND_AL, (tcg_target_ulong) tb_ret_addr); + tcg_out32(s, args[0]); } break; case INDEX_op_goto_tb: