From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYdZy-0002RX-8w for qemu-devel@nongnu.org; Fri, 11 Apr 2014 11:41:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYdZr-0004B5-Hj for qemu-devel@nongnu.org; Fri, 11 Apr 2014 11:41:22 -0400 Received: from mail-qg0-x233.google.com ([2607:f8b0:400d:c04::233]:61646) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYdZr-0004Ae-Dl for qemu-devel@nongnu.org; Fri, 11 Apr 2014 11:41:15 -0400 Received: by mail-qg0-f51.google.com with SMTP id q108so5525256qgd.24 for ; Fri, 11 Apr 2014 08:41:14 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Fri, 11 Apr 2014 08:40:11 -0700 Message-Id: <1397230827-24222-10-git-send-email-rth@twiddle.net> In-Reply-To: <1397230827-24222-1-git-send-email-rth@twiddle.net> References: <1397230827-24222-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v4 09/25] tcg-aarch64: Create tcg_out_brcond List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: claudio.fontana@huawei.com Rearrange code to put the compare and branch in the same place. Reviewed-by: Claudio Fontana Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c index 8b15d3b..5889a98 100644 --- a/tcg/aarch64/tcg-target.c +++ b/tcg/aarch64/tcg-target.c @@ -865,18 +865,6 @@ static inline void tcg_out_goto_cond_noaddr(TCGContext *s, TCGCond c) tcg_out_insn(s, 3202, B_C, c, old); } -static inline void tcg_out_goto_cond(TCGContext *s, TCGCond c, intptr_t target) -{ - intptr_t offset = (target - (intptr_t)s->code_ptr) / 4; - - if (offset < -0x40000 || offset >= 0x40000) { - /* out of 19bit range */ - tcg_abort(); - } - - tcg_out_insn(s, 3202, B_C, c, offset); -} - static inline void tcg_out_callr(TCGContext *s, TCGReg reg) { tcg_out_insn(s, 3207, BLR, reg); @@ -920,17 +908,24 @@ static inline void tcg_out_goto_label(TCGContext *s, int label_index) } } -static inline void tcg_out_goto_label_cond(TCGContext *s, - TCGCond c, int label_index) +static void tcg_out_brcond(TCGContext *s, TCGMemOp ext, TCGCond c, TCGArg a, + TCGArg b, bool b_const, int label) { - TCGLabel *l = &s->labels[label_index]; + TCGLabel *l = &s->labels[label]; + intptr_t offset; + + tcg_out_cmp(s, ext, a, b, b_const); if (!l->has_value) { - tcg_out_reloc(s, s->code_ptr, R_AARCH64_CONDBR19, label_index, 0); - tcg_out_goto_cond_noaddr(s, c); + tcg_out_reloc(s, s->code_ptr, R_AARCH64_CONDBR19, label, 0); + offset = tcg_in32(s) >> 5; } else { - tcg_out_goto_cond(s, c, l->u.value); + offset = l->u.value - (uintptr_t)s->code_ptr; + offset >>= 2; + assert(offset >= -0x40000 && offset < 0x40000); } + + tcg_out_insn(s, 3202, B_C, c, offset); } static inline void tcg_out_rev(TCGContext *s, TCGType ext, @@ -1571,8 +1566,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, a1 = (int32_t)a1; /* FALLTHRU */ case INDEX_op_brcond_i64: - tcg_out_cmp(s, ext, a0, a1, const_args[1]); - tcg_out_goto_label_cond(s, a2, args[3]); + tcg_out_brcond(s, ext, a2, a0, a1, const_args[1], args[3]); break; case INDEX_op_setcond_i32: -- 1.9.0