X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog_t.h;h=7eb4436cafc9f60af6f128918ec37720d84f6c42;hb=7d070c58e7bef1ed875fac066b57f29de449724b;hp=6673c08015dc0918aa2bf55b75e052f3efa69cdc;hpb=1140301fc5c11fef75f583bc4d94082cfd450fbc;p=libfirm

diff --git a/ir/ir/irprog_t.h b/ir/ir/irprog_t.h
index 6673c0801..7eb4436ca 100644
--- a/ir/ir/irprog_t.h
+++ b/ir/ir/irprog_t.h
@@ -29,7 +29,6 @@
 
 #include "irprog.h"
 #include "irtypes.h"
-#include "ircgcons.h"
 #include "irtypeinfo.h"
 #include "irmemory.h"
 
@@ -59,50 +58,51 @@ static inline ir_type *_get_tls_type(void)
 	return _get_segment_type(IR_SEGMENT_THREAD_LOCAL);
 }
 
-static inline int _get_irp_n_irgs(void)
+static inline size_t _get_irp_n_irgs(void)
 {
 	assert(irp && irp->graphs);
 	return ARR_LEN(irp->graphs);
 }
 
-static inline ir_graph *_get_irp_irg(int pos)
+static inline ir_graph *_get_irp_irg(size_t pos)
 {
-	assert(0 <= pos && pos <= ARR_LEN(irp->graphs));
+	assert(pos < ARR_LEN(irp->graphs));
 	return irp->graphs[pos];
 }
 
-static inline int _get_irp_n_types(void)
+static inline size_t _get_irp_n_types(void)
 {
 	assert(irp && irp->types);
 	return ARR_LEN(irp->types);
 }
 
-static inline ir_type *_get_irp_type(int pos)
+static inline ir_type *_get_irp_type(size_t pos)
 {
 	assert(irp->types);
+	assert(pos < ARR_LEN(irp->types));
 	/* Don't set the skip_tid result so that no double entries are generated. */
 	return irp->types[pos];
 }
 
-static inline int _get_irp_n_modes(void)
+static inline size_t _get_irp_n_modes(void)
 {
 	assert(irp->modes);
 	return ARR_LEN(irp->modes);
 }
 
-static inline ir_mode *_get_irp_mode(int pos)
+static inline ir_mode *_get_irp_mode(size_t pos)
 {
 	assert(irp && irp->modes);
 	return irp->modes[pos];
 }
 
-static inline int _get_irp_n_opcodes(void)
+static inline size_t _get_irp_n_opcodes(void)
 {
 	assert(irp && irp->opcodes);
 	return ARR_LEN(irp->opcodes);
 }
 
-static inline ir_op *_get_irp_opcode(int pos)
+static inline ir_op *_get_irp_opcode(size_t pos)
 {
 	assert(irp && irp->opcodes);
 	return irp->opcodes[pos];
@@ -115,7 +115,7 @@ static inline long get_irp_new_node_nr(void)
 	return irp->max_node_nr++;
 }
 
-static inline int get_irp_new_irg_idx(void)
+static inline size_t get_irp_new_irg_idx(void)
 {
 	assert(irp);
 	return irp->max_irg_idx++;