From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWWKp-0005Ol-Ty for qemu-devel@nongnu.org; Fri, 13 Mar 2015 16:37:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YWW7g-0003EC-GB for qemu-devel@nongnu.org; Fri, 13 Mar 2015 16:24:00 -0400 Received: from mail-qc0-x22d.google.com ([2607:f8b0:400d:c01::22d]:33575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWW7g-0003E6-C5 for qemu-devel@nongnu.org; Fri, 13 Mar 2015 16:23:56 -0400 Received: by qcvx3 with SMTP id x3so29561693qcv.0 for ; Fri, 13 Mar 2015 13:23:56 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Fri, 13 Mar 2015 13:23:12 -0700 Message-Id: <1426278193-15317-6-git-send-email-rth@twiddle.net> In-Reply-To: <1426278193-15317-1-git-send-email-rth@twiddle.net> References: <1426278193-15317-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 5/6] tcg: Use tcg_malloc to allocate TCGLabel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Pre-allocating 512 of them per TB is a waste. Reviewed-by: Bastian Koppelmann Signed-off-by: Richard Henderson --- tcg/tcg.c | 31 ++++++++++++++++++------------- tcg/tcg.h | 16 +++++----------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 97aa512..f1558b7 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -246,15 +246,11 @@ static void tcg_out_label(TCGContext *s, TCGLabel *l, tcg_insn_unit *ptr) TCGLabel *gen_new_label(void) { TCGContext *s = &tcg_ctx; - int idx; - TCGLabel *l; + TCGLabel *l = tcg_malloc(sizeof(TCGLabel)); - if (s->nb_labels >= TCG_MAX_LABELS) - tcg_abort(); - idx = s->nb_labels++; - l = &s->labels[idx]; - l->has_value = 0; - l->u.first_reloc = NULL; + *l = (TCGLabel){ + .id = s->nb_labels++ + }; return l; } @@ -1086,11 +1082,20 @@ void tcg_dump_ops(TCGContext *s) i = 0; break; } - for (; i < nb_cargs; i++) { - if (k != 0) { - qemu_log(","); - } - qemu_log("$0x%" TCG_PRIlx, args[k++]); + switch (c) { + case INDEX_op_set_label: + case INDEX_op_br: + case INDEX_op_brcond_i32: + case INDEX_op_brcond_i64: + case INDEX_op_brcond2_i32: + qemu_log("%s$L%d", k ? "," : "", arg_label(args[k])->id); + i++, k++; + break; + default: + break; + } + for (; i < nb_cargs; i++, k++) { + qemu_log("%s$0x%" TCG_PRIlx, k ? "," : "", args[k]); } } qemu_log("\n"); diff --git a/tcg/tcg.h b/tcg/tcg.h index 1987d24..add7f75 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -167,7 +167,8 @@ typedef struct TCGRelocation { } TCGRelocation; typedef struct TCGLabel { - int has_value; + unsigned has_value : 1; + unsigned id : 31; union { uintptr_t value; tcg_insn_unit *value_ptr; @@ -183,8 +184,6 @@ typedef struct TCGPool { #define TCG_POOL_CHUNK_SIZE 32768 -#define TCG_MAX_LABELS 512 - #define TCG_MAX_TEMPS 512 /* when the size of the arguments of a called function is smaller than @@ -556,8 +555,6 @@ struct TCGContext { target_ulong gen_opc_pc[OPC_BUF_SIZE]; uint16_t gen_opc_icount[OPC_BUF_SIZE]; uint8_t gen_opc_instr_start[OPC_BUF_SIZE]; - - TCGLabel labels[TCG_MAX_LABELS]; }; extern TCGContext tcg_ctx; @@ -766,9 +763,7 @@ TCGLabel *gen_new_label(void); static inline TCGArg label_arg(TCGLabel *l) { - ptrdiff_t idx = l - tcg_ctx.labels; - tcg_debug_assert(idx >= 0 && idx < tcg_ctx.nb_labels); - return idx; + return (uintptr_t)l; } /** @@ -779,10 +774,9 @@ static inline TCGArg label_arg(TCGLabel *l) * encoding of the TCG opcode stream. */ -static inline TCGLabel *arg_label(TCGArg idx) +static inline TCGLabel *arg_label(TCGArg i) { - tcg_debug_assert(idx < tcg_ctx.nb_labels); - return &tcg_ctx.labels[idx]; + return (TCGLabel *)(uintptr_t)i; } /** -- 2.1.0