X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firloop.c;h=e257d1bb6ab0b9df6396fea53180ccdca84dc346;hb=1b4cac3471b02b63e9656cd8c876f067766fe482;hp=4f20357b174bff4cf02f24af9b2e6a0cd6512460;hpb=5da05531f4190e4bf3dccb416aaf1b3f5417073f;p=libfirm

diff --git a/ir/ana/irloop.c b/ir/ana/irloop.c
index 4f20357b1..e257d1bb6 100644
--- a/ir/ana/irloop.c
+++ b/ir/ana/irloop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,212 +22,136 @@
  * @brief    Loop datastructure and access functions -- private stuff.
  * @author   Goetz Lindenmaier
  * @date     7.2002
- * @version  $Id: irloop_t.h 17143 2008-01-02 20:56:33Z beck $
  */
-# include "config.h"
+#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>
 
 #include "irloop_t.h"
 #include "irprog_t.h"
+#include "error.h"
 
-void add_loop_son(ir_loop *loop, ir_loop *son) {
+void add_loop_son(ir_loop *loop, ir_loop *son)
+{
 	loop_element lson;
 	assert(loop && loop->kind == k_ir_loop);
 	assert(get_kind(son) == k_ir_loop);
 	lson.son = son;
 	ARR_APP1(loop_element, loop->children, lson);
-	++loop->n_sons;
 	loop->flags |= loop_outer_loop;
 }
 
-void add_loop_node(ir_loop *loop, ir_node *n) {
+void add_loop_node(ir_loop *loop, ir_node *n)
+{
 	loop_element ln;
 	ln.node = n;
 	assert(loop && loop->kind == k_ir_loop);
 	ARR_APP1(loop_element, loop->children, ln);
-	loop->n_nodes++;
 }
 
-void add_loop_irg(ir_loop *loop, ir_graph *irg) {
+void add_loop_irg(ir_loop *loop, ir_graph *irg)
+{
 	loop_element ln;
 	ln.irg = irg;
 	assert(loop && loop->kind == k_ir_loop);
 	ARR_APP1(loop_element, loop->children, ln);
-	loop->n_nodes++;
 }
 
-/**
- * Mature all loops by removing the flexible arrays of a loop.
- *
- * @param loop  the loop to mature
- * @param obst  an obstack, where the new arrays are allocated on
- */
-void mature_loops(ir_loop *loop, struct obstack *obst) {
+void mature_loops(ir_loop *loop, struct obstack *obst)
+{
+	size_t i;
+
 	loop_element *new_children = DUP_ARR_D(loop_element, obst, loop->children);
 	DEL_ARR_F(loop->children);
 	loop->children = new_children;
 
-	if (loop->n_sons > 0) {
-		/* we have child loops, mature them */
-		int i;
+	/* mature child loops */
+	for (i = ARR_LEN(new_children); i > 0;) {
+		loop_element child = new_children[--i];
 
-		for (i = ARR_LEN(new_children) - 1; i >= 0; --i) {
-			loop_element child = new_children[i];
-
-			if (*child.kind == k_ir_loop) {
-				mature_loops(child.son, obst);
-			}
+		if (*child.kind == k_ir_loop) {
+			mature_loops(child.son, obst);
 		}
 	}
 }
 
-/* Returns outer loop, itself if outermost. */
-ir_loop *(get_loop_outer_loop)(const ir_loop *loop) {
+ir_loop *(get_loop_outer_loop)(const ir_loop *loop)
+{
 	return _get_loop_outer_loop(loop);
 }
 
-/* Returns nesting depth of this loop */
-int (get_loop_depth)(const ir_loop *loop) {
+unsigned (get_loop_depth)(const ir_loop *loop)
+{
 	return _get_loop_depth(loop);
 }
 
-/* Returns the number of inner loops */
-int (get_loop_n_sons)(const ir_loop *loop) {
-	return _get_loop_n_sons(loop);
-}
-
-/* Returns the pos`th loop_node-child              *
- * TODO: This method isn`t very efficient !        *
- * Returns NULL if there isn`t a pos`th loop_node */
-ir_loop *get_loop_son(ir_loop *loop, int pos) {
-	int child_nr = 0, loop_nr = -1;
-
-	assert(loop && loop->kind == k_ir_loop);
-	while (child_nr < ARR_LEN(loop->children)) {
-		if (*(loop->children[child_nr].kind) == k_ir_loop)
-			loop_nr++;
-		if (loop_nr == pos)
-			return loop->children[child_nr].son;
-		child_nr++;
-	}
-	return NULL;
-}
-
-/* Returns the number of nodes in the loop */
-int get_loop_n_nodes(const ir_loop *loop) {
-	assert(loop); assert(loop->kind == k_ir_loop);
-	return loop->n_nodes;
-}
-
-/* Returns the pos'th ir_node-child                *
- * TODO: This method isn't very efficient !        *
- * Returns NULL if there isn't a pos'th ir_node   */
-ir_node *get_loop_node(const ir_loop *loop, int pos) {
-	int child_nr, node_nr = -1;
-
-	assert(loop && loop->kind == k_ir_loop);
-	assert(pos < get_loop_n_nodes(loop));
-
-	for (child_nr = 0; child_nr < ARR_LEN(loop->children); child_nr++) {
-		if (*(loop->children[child_nr].kind) == k_ir_node)
-			node_nr++;
-		if (node_nr == pos)
-			return loop -> children[child_nr].node;
-	}
-
-	assert(0 && "no child at pos found");
-	return NULL;
-}
-
-/* Returns the number of elements contained in loop.  */
-int get_loop_n_elements(const ir_loop *loop) {
+size_t get_loop_n_elements(const ir_loop *loop)
+{
 	assert(loop && loop->kind == k_ir_loop);
 	return(ARR_LEN(loop->children));
 }
 
-/*
-Returns the pos`th loop element.
-This may be a loop_node or a ir_node. The caller of this function has
-to check the *(loop_element.kind) field for "k_ir_node" or "k_ir_loop"
-and then select the appropriate "loop_element.node" or "loop_element.son".
-*/
-loop_element get_loop_element(const ir_loop *loop, int pos) {
+loop_element get_loop_element(const ir_loop *loop, size_t pos)
+{
 	assert(loop && loop->kind == k_ir_loop && pos < ARR_LEN(loop->children));
 	return(loop -> children[pos]);
 }
 
-int get_loop_element_pos(const ir_loop *loop, void *le) {
-	int i, n;
-	assert(loop && loop->kind == k_ir_loop);
-
-	n = get_loop_n_elements(loop);
-	for (i = 0; i < n; i++)
-		if (get_loop_element(loop, i).node == le)
-			return i;
-	return -1;
-}
-
-
-/**
- * Sets the loop for a node.
- */
-void set_irn_loop(ir_node *n, ir_loop *loop) {
+void set_irn_loop(ir_node *n, ir_loop *loop)
+{
 	n->loop = loop;
 }
 
-ir_loop *(get_irn_loop)(const ir_node *n) {
+ir_loop *(get_irn_loop)(const ir_node *n)
+{
 	return _get_irn_loop(n);
 }
 
-int get_loop_loop_nr(const ir_loop *loop) {
+long get_loop_loop_nr(const ir_loop *loop)
+{
 	assert(loop && loop->kind == k_ir_loop);
 #ifdef DEBUG_libfirm
 	return loop->loop_nr;
 #else
-	return (int)loop;
+	return (long)loop;
 #endif
 }
 
-/** A field to connect additional information to a loop.  Only valid
-    if libfirm_debug is set. */
-void set_loop_link(ir_loop *loop, void *link) {
+void set_loop_link(ir_loop *loop, void *link)
+{
 	assert(loop && loop->kind == k_ir_loop);
 	loop->link = link;
 }
-void *get_loop_link(const ir_loop *loop) {
+
+void *get_loop_link(const ir_loop *loop)
+{
 	assert(loop && loop->kind == k_ir_loop);
 	return loop->link;
 }
 
-int (is_ir_loop)(const void *thing) {
+int (is_ir_loop)(const void *thing)
+{
 	return _is_ir_loop(thing);
 }
 
-/* The outermost loop is remarked in the surrounding graph. */
-void (set_irg_loop)(ir_graph *irg, ir_loop *loop) {
+void (set_irg_loop)(ir_graph *irg, ir_loop *loop)
+{
 	_set_irg_loop(irg, loop);
 }
 
-/* Returns the root loop info (if exists) for an irg. */
-ir_loop *(get_irg_loop)(const ir_graph *irg) {
+ir_loop *(get_irg_loop)(const ir_graph *irg)
+{
 	return _get_irg_loop(irg);
 }
 
-/*
- * Allocates a new loop as son of father on the given obstack.
- * If father is equal NULL, a new root loop is created.
- */
-ir_loop *alloc_loop(ir_loop *father, struct obstack *obst) {
+ir_loop *alloc_loop(ir_loop *father, struct obstack *obst)
+{
 	ir_loop *son;
 
-	son = obstack_alloc(obst, sizeof(*son));
-	memset(son, 0, sizeof(*son));
+	son = OALLOCZ(obst, ir_loop);
 	son->kind     = k_ir_loop;
 	son->children = NEW_ARR_F(loop_element, 0);
-	son->n_nodes  = 0;
-	son->n_sons   = 0;
 	son->link     = NULL;
 	if (father) {
 		son->outer_loop = father;