From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWphT-0001JS-3n for qemu-devel@nongnu.org; Mon, 29 Apr 2013 11:09:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWphM-00084u-8O for qemu-devel@nongnu.org; Mon, 29 Apr 2013 11:09:07 -0400 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:49453) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWphM-00084Z-1t for qemu-devel@nongnu.org; Mon, 29 Apr 2013 11:09:00 -0400 Received: by mail-wi0-f176.google.com with SMTP id hi8so619517wib.9 for ; Mon, 29 Apr 2013 08:08:59 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Mon, 29 Apr 2013 08:08:23 -0700 Message-Id: <1367248103-1492-3-git-send-email-rth@twiddle.net> In-Reply-To: <1367248103-1492-1-git-send-email-rth@twiddle.net> References: <1367248103-1492-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH for-1.5 2/2] tcg-arm: Use movi32 in exit_tb List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, aurelien@aurel32.net Avoid the mini constant pool for armv7, and avoid replicating the test for pre-v7. Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index 12edad4..3d43412 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c @@ -1611,17 +1611,15 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, switch (opc) { case INDEX_op_exit_tb: - { + 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); + } else { 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]); + 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); - if (args[0] >> 8) { - *ld_ptr = (uint8_t) (s->code_ptr - ld_ptr) - 8; - tcg_out32(s, args[0]); - } + *ld_ptr = (uint8_t) (s->code_ptr - ld_ptr) - 8; + tcg_out32(s, args[0]); } break; case INDEX_op_goto_tb: -- 1.8.1.4