From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UM2db-0004Mk-75 for qemu-devel@nongnu.org; Sat, 30 Mar 2013 16:44:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UM2dY-0005xE-2z for qemu-devel@nongnu.org; Sat, 30 Mar 2013 16:44:31 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:57252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UM2dX-0005x1-Sp for qemu-devel@nongnu.org; Sat, 30 Mar 2013 16:44:28 -0400 Received: by mail-pd0-f181.google.com with SMTP id q10so690570pdj.12 for ; Sat, 30 Mar 2013 13:44:27 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Sat, 30 Mar 2013 13:43:27 -0700 Message-Id: <1364676207-21516-19-git-send-email-rth@twiddle.net> In-Reply-To: <1364676207-21516-1-git-send-email-rth@twiddle.net> References: <1364676207-21516-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v4 18/18] tcg-arm: Tidy exit_tb List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Aurelien Jarno 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 --- 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 844f1cf..077f0ae 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: -- 1.8.1.4