Add hashtable/set_empty to go with _reset, which removes all items from the

table but doesn't free the bucket array or reset the size --- saves an
allocation when reusing the hashtable.

diff --git a/mach/proto/mcg/pass_livevreganalysis.c b/mach/proto/mcg/pass_livevreganalysis.c
index 5481c65..7e361b9 100644 (file)
--- a/mach/proto/mcg/pass_livevreganalysis.c
+++ b/mach/proto/mcg/pass_livevreganalysis.c
@@ -23,32 +23,63 @@ static void preload_blocks(void)
     }
 }
 
+static bool add_set_to_array(struct set* set, void* arrayp)
+{
+    bool nochange = true;
+    struct array* array = arrayp;
+    struct set_iterator sit = {};
+
+    while (set_next(set, &sit))
+        nochange &= array_appendu(array, sit.item);
+
+    return nochange;
+}
+
+static void add_array_to_set(void* arrayp, struct set* set)
+{
+    struct array* array = arrayp;
+    int i;
+
+    for (i=0; i<array->count; i++)
+        set_add(set, array->item[i]);
+}
+
+static void remove_array_from_set(void* arrayp, struct set* set)
+{
+    struct array* array = arrayp;
+    int i;
+
+    for (i=0; i<array->count; i++)
+        set_remove(set, array->item[i]);
+}
+
 static void propagate_liveness(struct basicblock* bb)
 {
-       static ARRAYOF(struct vreg) current;
-       int i;
+    static struct set current;
+       int i, j;
 
-       current.count = 0;
-       array_appendall(&current, &bb->liveouts);
+    set_empty(&current);
+
+    add_array_to_set(&bb->liveouts, &current);
 
        for (i=bb->hops.count-1; i>=0; i--)
        {
                struct hop* hop = bb->hops.item[i];
 
-               array_removeall(&current, &hop->outs);
-               finished &= array_appendallu(&hop->throughs, &current);
-               array_appendallu(&current, &hop->ins);
+        remove_array_from_set(&hop->outs, &current);
+        finished &= add_set_to_array(&current, &hop->throughs);
+        add_array_to_set(&hop->ins, &current);
        }
 
     for (i=0; i<bb->phis.count; i++)
-        array_remove(&current, bb->phis.item[i].left);
+        set_remove(&current, bb->phis.item[i].left);
 
-       finished &= array_appendallu(&bb->liveins, &current);
+    finished &= add_set_to_array(&current, &bb->liveins);
 
        for (i=0; i<bb->prevs.count; i++)
        {
                struct basicblock* prev = bb->prevs.item[i];
-               finished &= array_appendallu(&prev->liveouts, &current);
+        finished &= add_set_to_array(&current, &prev->liveouts);
        }
 }
 
@@ -67,8 +98,6 @@ void pass_live_vreg_analysis(void)
                        propagate_liveness(dominance.postorder.item[i]);
        }
        while (!finished);
-
-    //assert(cfg.entry->liveins.count == 0);
 }
 
 /* vim: set sw=4 ts=4 expandtab : */

diff --git a/mach/proto/mcg/pass_nonlocalphis.c b/mach/proto/mcg/pass_nonlocalphis.c
index 55dfed2..8f0fdc7 100644 (file)
--- a/mach/proto/mcg/pass_nonlocalphis.c
+++ b/mach/proto/mcg/pass_nonlocalphis.c
@@ -121,8 +121,8 @@ static void import_ir(struct ir* phi)
 {
     int i;
 
-    set_reset(&confirmed);
-    set_reset(&pending);
+    set_empty(&confirmed);
+    set_empty(&pending);
 
     recursively_add_children_to_pending(current_dest);
     set_add(&confirmed, current_dest);

diff --git a/mach/proto/mcg/pass_removedeadphis.c b/mach/proto/mcg/pass_removedeadphis.c
index 8d46b80..fb53f75 100644 (file)
--- a/mach/proto/mcg/pass_removedeadphis.c
+++ b/mach/proto/mcg/pass_removedeadphis.c
@@ -70,7 +70,7 @@ void pass_remove_dead_phis(void)
     {
         changed = false;
 
-        set_reset(&phis);
+        set_empty(&phis);
         for (i=0; i<cfg.preorder.count; i++)
             collect_phis(cfg.preorder.item[i]);
 

diff --git a/mach/proto/mcg/pass_typeinference.c b/mach/proto/mcg/pass_typeinference.c
index 5bc12ac..ae45468 100644 (file)
--- a/mach/proto/mcg/pass_typeinference.c
+++ b/mach/proto/mcg/pass_typeinference.c
@@ -18,7 +18,7 @@ static void collect_irs(void)
 {
     int i;
     
-    set_reset(&irs);
+    set_empty(&irs);
        for (i=0; i<cfg.preorder.count; i++)
     {
         struct basicblock* bb = cfg.preorder.item[i];

diff --git a/mach/proto/mcg/pass_vregusage.c b/mach/proto/mcg/pass_vregusage.c
index 8681844..e8d400f 100644 (file)
--- a/mach/proto/mcg/pass_vregusage.c
+++ b/mach/proto/mcg/pass_vregusage.c
@@ -36,7 +36,7 @@ void pass_determine_vreg_usage(void)
 {
     int i, j;
 
-    set_reset(&vregs);
+    set_empty(&vregs);
     hop_walk(assign_uses_cb, NULL);
 
     for (i=0; i<dominance.preorder.count; i++)

diff --git a/modules/src/data/hashtable.c b/modules/src/data/hashtable.c
index d4dba61..35dfe5a 100644 (file)
--- a/modules/src/data/hashtable.c
+++ b/modules/src/data/hashtable.c
@@ -37,11 +37,15 @@ static void lazy_init(struct hashtable* ht)
         ht->buckets = calloc(ht->num_buckets, sizeof(struct hashnode*));
 }
 
-void hashtable_reset(struct hashtable* ht)
+void hashtable_empty(struct hashtable* ht)
 {
     while (ht->size)
         hashtable_pop(ht);
+}
 
+void hashtable_reset(struct hashtable* ht)
+{
+       hashtable_empty(ht);
     free(ht->buckets);
     ht->buckets = NULL;
 }

diff --git a/modules/src/data/hashtable.h b/modules/src/data/hashtable.h
index e89a052..2838d81 100644 (file)
--- a/modules/src/data/hashtable.h
+++ b/modules/src/data/hashtable.h
@@ -29,6 +29,7 @@ struct hashtable_iterator
     struct hashnode* node;
 };
 
+extern void hashtable_empty(struct hashtable* ht);
 extern void hashtable_reset(struct hashtable* ht);
 extern void hashtable_rebucket(struct hashtable* ht, unsigned int num_buckets);
 

diff --git a/modules/src/data/set.c b/modules/src/data/set.c
index 4a437d8..fd0ab9a 100644 (file)
--- a/modules/src/data/set.c
+++ b/modules/src/data/set.c
@@ -3,6 +3,11 @@
 #include <stdbool.h>
 #include "set.h"
 
+void set_empty(struct set* s)
+{
+       hashtable_empty(&s->table);
+}
+
 void set_reset(struct set* s)
 {
        hashtable_reset(&s->table);

diff --git a/modules/src/data/set.h b/modules/src/data/set.h
index 7cce54f..9795681 100644 (file)
--- a/modules/src/data/set.h
+++ b/modules/src/data/set.h
@@ -10,6 +10,7 @@ struct set
        struct hashtable table;
 };
 
+extern void set_empty(struct set* s);
 extern void set_reset(struct set* s);
 
 extern bool set_add(struct set* s, void* item);