X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=bucket.c;h=b094f7e30d036381629fbd390f7cfacb51ad1458;hb=a01a95d5b7cd41d456ff1360192f0f015167647b;hp=bee2f2c6c422364189eed7350b1e8ebbf1a2e437;hpb=f92bf8726c90eb50ec8c696e8caf25b4b2f7ebe9;p=libfirm

diff --git a/bucket.c b/bucket.c
index bee2f2c6c..b094f7e30 100644
--- a/bucket.c
+++ b/bucket.c
@@ -2,6 +2,7 @@
 
 #include "bucket.h"
 #include "pbqp_edge_t.h"
+#include "pbqp_node.h"
 #include "pbqp_node_t.h"
 
 int edge_bucket_contains(pbqp_edge_bucket bucket, pbqp_edge *edge)
@@ -49,9 +50,9 @@ pbqp_edge *edge_bucket_pop(pbqp_edge_bucket *bucket)
 	return edge;
 }
 
-void node_bucket_clear(pbqp_node_bucket *bucket)
+void node_bucket_shrink(pbqp_node_bucket *bucket, unsigned len)
 {
-	ARR_SHRINKLEN(*bucket, 0);
+	ARR_SHRINKLEN(*bucket, (int)len);
 }
 
 int node_bucket_contains(pbqp_node_bucket bucket, pbqp_node *node)
@@ -62,13 +63,23 @@ int node_bucket_contains(pbqp_node_bucket bucket, pbqp_node *node)
 			&& bucket[node->bucket_index] == node;
 }
 
-void node_bucket_copy(pbqp_node_bucket *dst, pbqp_node_bucket *src)
+void node_bucket_copy(pbqp_node_bucket *dst, pbqp_node_bucket src)
 {
 	unsigned src_index;
-	unsigned src_length = node_bucket_get_length(*src);
+	unsigned src_length = node_bucket_get_length(src);
 
 	for (src_index = 0; src_index < src_length; ++src_index) {
-		node_bucket_insert(dst, (*src)[src_index]);
+		node_bucket_insert(dst, src[src_index]);
+	}
+}
+
+void node_bucket_update(pbqp *pbqp, pbqp_node_bucket bucket)
+{
+	unsigned index;
+	unsigned length = node_bucket_get_length(bucket);
+
+	for (index = 0; index < length; ++index) {
+		pbqp->nodes[bucket[index]->index] = bucket[index];
 	}
 }
 
@@ -129,18 +140,14 @@ void node_bucket_remove(pbqp_node_bucket *bucket, pbqp_node *node)
 	node->bucket_index = UINT_MAX;
 }
 
-pbqp_node_bucket *node_bucket_deep_copy(pbqp_node_bucket bucket)
+void node_bucket_deep_copy(pbqp *pbqp, pbqp_node_bucket *dst, pbqp_node_bucket src)
 {
-	pbqp_node_bucket *copy;
 	unsigned          bucket_index;
 	unsigned          bucket_length;
 
-	node_bucket_init(copy);
-	bucket_length = node_bucket_get_length(bucket);
+	bucket_length = node_bucket_get_length(src);
 
 	for (bucket_index = 0; bucket_index < bucket_length; ++bucket_index) {
-		node_bucket_insert(copy, pbqp_node_deep_copy(bucket[bucket_index]));
+		node_bucket_insert(dst, pbqp_node_deep_copy(pbqp, *dst, src[bucket_index]));
 	}
-
-	return copy;
 }