X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenumb_t.h;h=5164cb29bf507f3e5063136601c37f1109ac1c51;hb=1161999117f5c0f56b3af2dc9bb7150e03761905;hp=0c9dd488d65bb12f15a92ef91376ad5bf4f62d5c;hpb=9b060a71a2667ced8d103023eda0ff710e799867;p=libfirm

diff --git a/ir/be/benumb_t.h b/ir/be/benumb_t.h
index 0c9dd488d..5164cb29b 100644
--- a/ir/be/benumb_t.h
+++ b/ir/be/benumb_t.h
@@ -4,10 +4,11 @@
  * @date 8.11.2004
  */
 
-#ifndef __BENUMB_T_H
-#define __BENUMB_T_H
+#ifndef _BENUMB_T_H
+#define _BENUMB_T_H
 
 #include "firm_config.h"
+#include "irnode.h"
 
 #include "benumb.h"
 
@@ -25,62 +26,62 @@ typedef struct _irg_numbering_t {
 extern int numbering_irn_data_offset;
 extern int numbering_irg_data_offset;
 
-#define _get_irn_numbering(mod,irn) get_irn_data(irn, mod numbering_t, numbering_irn_data_offset)
-#define _get_irg_numbering(mod,irg) get_irg_data(irg, mod irg_numbering_t, numbering_irg_data_offset)
+#define _get_irn_numbering(type,irn) get_irn_data(irn, type, numbering_irn_data_offset)
+#define _get_irg_numbering(type,irg) get_irg_data(irg, type, numbering_irg_data_offset)
 
-#define get_irn_numbering_const(irn) _get_irn_numbering(const, irn)
-#define get_irg_numbering_const(irg) _get_irg_numbering(const, irg)
+#define get_irn_numbering_const(irn) _get_irn_numbering(const numbering_t, irn)
+#define get_irg_numbering_const(irg) _get_irg_numbering(const irg_numbering_t, irg)
 
-#define get_irn_numbering(irn) _get_irn_numbering( , irn)
-#define get_irg_numbering(irg) _get_irg_numbering( , irg)
+#define get_irn_numbering(irn) _get_irn_numbering(numbering_t, irn)
+#define get_irg_numbering(irg) _get_irg_numbering(irg_numbering_t, irg)
 
-static INLINE int __get_irn_graph_nr(const ir_node *irn)
+static INLINE int _get_irn_graph_nr(const ir_node *irn)
 {
 	assert(!is_Block(irn) && "No block expected here");
 	return get_irn_numbering_const(irn)->global_nr;
 }
 
-static INLINE int __get_irn_block_nr(const ir_node *irn)
+static INLINE int _get_irn_block_nr(const ir_node *irn)
 {
 	assert(!is_Block(irn) && "No block expected here");
 	return get_irn_numbering_const(irn)->local_nr;
 }
 
-static INLINE int __get_block_graph_nr(const ir_node *irn)
+static INLINE int _get_block_graph_nr(const ir_node *irn)
 {
 	assert(is_Block(irn) && "Block expected here");
 	return get_irn_numbering_const(irn)->global_nr;
 }
 
-static INLINE int __get_block_node_count(const ir_node *irn)
+static INLINE int _get_block_node_count(const ir_node *irn)
 {
 	assert(is_Block(irn) && "Block expected here");
 	return get_irn_numbering_const(irn)->local_nr;
 }
 
-static INLINE int __get_graph_block_count(const ir_graph *irg)
+static INLINE int _get_graph_block_count(const ir_graph *irg)
 {
 	return get_irg_numbering_const(irg)->local_nr;
 }
 
-static INLINE int __get_graph_node_count(const ir_graph *irg)
+static INLINE int _get_graph_node_count(const ir_graph *irg)
 {
 	return get_irg_numbering_const(irg)->global_nr;
 }
 
-static INLINE ir_node *__get_irn_for_graph_nr(const ir_graph *irg, int nr)
+static INLINE ir_node *_get_irn_for_graph_nr(const ir_graph *irg, int nr)
 {
 	ir_node **map = get_irg_numbering_const(irg)->reverse_map;
-	assert(nr >= 0 && nr < __get_graph_node_count(irg) && map[nr] != NULL);
+	assert(nr >= 0 && nr <= _get_graph_node_count(irg) && map[nr] != NULL);
 	return map[nr];
 }
 
-#define get_irn_graph_nr(irn) 				__get_irn_graph_nr(irn)
-#define get_irn_block_nr(irn) 				__get_irn_block_nr(irn)
-#define get_block_graph_nr(irn) 			__get_block_graph_nr(irn)
-#define get_block_node_count(irn) 		__get_block_node_count(irn)
-#define get_graph_block_count(irg) 		__get_graph_block_count(irg)
-#define get_graph_node_count(irg) 		__get_graph_node_count(irg)
-#define get_irn_for_graph_nr(irg,nr)	__get_irn_for_graph_nr(irg,nr)
+#define get_irn_graph_nr(irn) 				_get_irn_graph_nr(irn)
+#define get_irn_block_nr(irn) 				_get_irn_block_nr(irn)
+#define get_block_graph_nr(irn) 			_get_block_graph_nr(irn)
+#define get_block_node_count(irn) 		_get_block_node_count(irn)
+#define get_graph_block_count(irg) 		_get_graph_block_count(irg)
+#define get_graph_node_count(irg) 		_get_graph_node_count(irg)
+#define get_irn_for_graph_nr(irg,nr)	_get_irn_for_graph_nr(irg,nr)
 
 #endif