commit 51e3972c41598adc91fe3f4767057f5198dcc15c
author Richard Henderson <rth@twiddle.net> Fri Feb 13 18:51:05 2015 -0800
committer Richard Henderson <rth@twiddle.net> Fri Mar 13 12:28:18 2015 -0700
tree bb1e33739384cf31f98979006d020a52d57a4aaf
parent bec1631100323fac0900aea71043d5c4e22fc2fa

tcg: Use tcg_malloc to allocate TCGLabel

Pre-allocating 512 of them per TB is a waste.

Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Signed-off-by: Richard Henderson <rth@twiddle.net>

tcg/tcg.c

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 @@
 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 @@
                 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");