fix more cparser warnings, cleanup some libcore code

[libfirm] / ir / ir / irprog_t.h

diff --git a/ir/ir/irprog_t.h b/ir/ir/irprog_t.h
index 6673c08..7eb4436 100644 (file)
--- 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++;