X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeifg_clique.c;h=1976273e3ce7f82f5b1e58af944f0f74d58337ac;hb=7f0a53a0ab98e5c4123bb7937170e89df5d61eb8;hp=edd0de22a3ab7cf78332caec27537898ee817635;hpb=294764ce7bb590e7714ef1378d7eda9608dbef6e;p=libfirm

diff --git a/ir/be/beifg_clique.c b/ir/be/beifg_clique.c
index edd0de22a..1976273e3 100644
--- a/ir/be/beifg_clique.c
+++ b/ir/be/beifg_clique.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -24,9 +24,7 @@
  * @date        18.11.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -38,7 +36,7 @@
 #include "irgwalk.h"
 #include "irbitset.h"
 
-#include "bearch_t.h"
+#include "bearch.h"
 #include "be_t.h"
 #include "beintlive_t.h"
 #include "beifg_t.h"
@@ -81,18 +79,18 @@ static cli_head_t *get_new_cli_head(ifg_clique_t *ifg)
 
 	if (ifg->cli_root == NULL)
 	{
-		new_cli_head = obstack_alloc(&ifg->obst, sizeof(*new_cli_head));
+		new_cli_head = OALLOC(&ifg->obst, cli_head_t);
 		INIT_LIST_HEAD(&new_cli_head->list);
 		ifg->cli_root = new_cli_head;
 	}
 	else
 	{
 		cli_head = ifg->cli_root;
-		while(!(cli_head->next_cli_head == NULL))
+		while (!(cli_head->next_cli_head == NULL))
 		{
 			cli_head = cli_head->next_cli_head;
 		}
-		new_cli_head = obstack_alloc(&ifg->obst, sizeof(*new_cli_head));
+		new_cli_head = OALLOC(&ifg->obst, cli_head_t);
 		INIT_LIST_HEAD(&new_cli_head->list);
 		cli_head->next_cli_head = new_cli_head;
 	}
@@ -109,7 +107,7 @@ static cli_element_t *get_new_cli_element(ifg_clique_t *ifg)
 {
 	cli_element_t *cli_element;
 
-	cli_element = obstack_alloc(&ifg->obst, sizeof(*cli_element));
+	cli_element = OALLOC(&ifg->obst, cli_element_t);
 	INIT_LIST_HEAD(&cli_element->list);
 
 	return cli_element;
@@ -152,7 +150,7 @@ static void write_clique(ir_nodeset_t *live_set, ifg_clique_t *ifg)
 		}
 
 		list_for_each_entry(cli_element_t, element, &cli_head->list, list){
-			if(element->irn == live_irn){
+			if (element->irn == live_irn){
 				is_element = 1;
 				break;
 			}
@@ -270,8 +268,6 @@ static void find_nodes(const ifg_clique_t *ifg, cli_iter_t *it)
 		element = list_entry(cli_head->list.next, cli_element_t, list);
 		it->curr_cli_element = element;
 	}
-
-	return;
 }
 
 static ir_node *get_next_node(cli_iter_t *it)
@@ -342,7 +338,7 @@ static void find_neighbour_walker(ir_node *bl, void *data)
 		if (b->is_def) /* b is a new node */
 		{
 			ir_nodeset_insert(&live, irn);
-			if(b->is_real)
+			if (b->is_real)
 			{
 				was_def = 1;
 			}
@@ -393,7 +389,7 @@ static void find_first_neighbour(const ifg_clique_t *ifg, cli_iter_t *it, const
 			}
 		}
 	}
-	if(!is_in_clique)
+	if (!is_in_clique)
 	{
 		cli_head = get_next_cli_head(irn, it);
 		element = get_next_element(irn, it);
@@ -401,8 +397,6 @@ static void find_first_neighbour(const ifg_clique_t *ifg, cli_iter_t *it, const
 
 	it->curr_cli_element = element;
 	it->curr_irn = irn;
-
-	return;
 }
 
 static ir_node *get_next_neighbour(cli_iter_t *it)
@@ -484,8 +478,6 @@ static void ifg_clique_neighbours_break(const void *self, void *iter)
 	(void) self;
 
 	bitset_free(it->visited_neighbours);
-
-	return;
 }
 
 static ir_node *ifg_clique_nodes_begin(const void *self, void *iter)
@@ -506,8 +498,6 @@ static void ifg_clique_nodes_break(const void *self, void *iter)
 	(void) self;
 
 	bitset_free(it->visited_nodes);
-
-	return;
 }
 
 static int ifg_clique_degree(const void *self, const ir_node *irn)
@@ -547,7 +537,7 @@ static const be_ifg_impl_t ifg_clique_impl = {
 
 be_ifg_t *be_ifg_clique_new(const be_chordal_env_t *env)
 {
-	ifg_clique_t *ifg	= xmalloc(sizeof(*ifg));
+	ifg_clique_t *ifg	= XMALLOC(ifg_clique_t);
 
 	ifg->impl     		= &ifg_clique_impl;
 	ifg->env			= env;