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

diff --git a/bucket.c b/bucket.c
index dd18e7949..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,6 +50,11 @@ pbqp_edge *edge_bucket_pop(pbqp_edge_bucket *bucket)
 	return edge;
 }
 
+void node_bucket_shrink(pbqp_node_bucket *bucket, unsigned len)
+{
+	ARR_SHRINKLEN(*bucket, (int)len);
+}
+
 int node_bucket_contains(pbqp_node_bucket bucket, pbqp_node *node)
 {
 	assert(node);
@@ -57,6 +63,26 @@ 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)
+{
+	unsigned src_index;
+	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]);
+	}
+}
+
+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];
+	}
+}
+
 void node_bucket_free(pbqp_node_bucket *bucket)
 {
 	DEL_ARR_F(*bucket);
@@ -79,19 +105,49 @@ void node_bucket_insert(pbqp_node_bucket *bucket, pbqp_node *node)
 	ARR_APP1(pbqp_node *, *bucket, node);
 }
 
+pbqp_node *node_bucket_pop(pbqp_node_bucket *bucket)
+{
+	unsigned   bucket_len = node_bucket_get_length(*bucket);
+	pbqp_node *node;
+
+	assert(bucket_len > 0);
+
+	node = (*bucket)[bucket_len - 1];
+	assert(node);
+
+	ARR_SHRINKLEN(*bucket, (int)bucket_len - 1);
+	node->bucket_index = UINT_MAX;
+
+	return node;
+}
+
 void node_bucket_remove(pbqp_node_bucket *bucket, pbqp_node *node)
 {
-	unsigned   last_bucket_index = node_bucket_get_length(*bucket) - 1;
+	unsigned   bucket_len = node_bucket_get_length(*bucket);
 	unsigned   node_index;
 	pbqp_node *other;
 
 	assert(node);
 	assert(node_bucket_contains(*bucket, node));
+	assert(bucket_len > 0);
 
-	node_index            = node->index;
-	other                 = (*bucket)[last_bucket_index];
+	node_index            = node->bucket_index;
+	other                 = (*bucket)[bucket_len - 1];
 	other->bucket_index   = node_index;
 	(*bucket)[node_index] = other;
 
-	ARR_SHRINKLEN(*bucket, last_bucket_index);
+	ARR_SHRINKLEN(*bucket, (int)bucket_len - 1);
+	node->bucket_index = UINT_MAX;
+}
+
+void node_bucket_deep_copy(pbqp *pbqp, pbqp_node_bucket *dst, pbqp_node_bucket src)
+{
+	unsigned          bucket_index;
+	unsigned          bucket_length;
+
+	bucket_length = node_bucket_get_length(src);
+
+	for (bucket_index = 0; bucket_index < bucket_length; ++bucket_index) {
+		node_bucket_insert(dst, pbqp_node_deep_copy(pbqp, *dst, src[bucket_index]));
+	}
 }