iropt: Or/Eor/Add are sometimes equivalent

[libfirm] / ir / ir / irprog.c

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index 0beceda..e248d95 100644 (file)
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -85,9 +85,10 @@ static ir_prog *complete_ir_prog(ir_prog *irp, const char *module_name)
 #define IDENT(x)  new_id_from_chars(x, sizeof(x) - 1)
 
        irp->name = new_id_from_str(module_name);
-       irp->segment_types[IR_SEGMENT_GLOBAL] = new_type_class(IDENT("GlobalType"));
+       irp->segment_types[IR_SEGMENT_GLOBAL]
+               = new_type_class(IDENT("GlobalType"));
        irp->segment_types[IR_SEGMENT_THREAD_LOCAL]
-               = new_type_class(IDENT("ThreadLocal"));
+               = new_type_struct(IDENT("ThreadLocal"));
        irp->segment_types[IR_SEGMENT_CONSTRUCTORS]
                = new_type_class(IDENT("Constructors"));
        irp->segment_types[IR_SEGMENT_DESTRUCTORS]
@@ -110,9 +111,6 @@ static ir_prog *complete_ir_prog(ir_prog *irp, const char *module_name)
 
        irp->const_code_irg             = new_const_code_irg();
        irp->phase_state                = phase_building;
-       irp->outs_state                 = outs_none;
-       irp->ip_outedges                = NULL;
-       irp->trouts_state               = outs_none;
        irp->class_cast_state           = ir_class_casts_transitive;
        irp->globals_entity_usage_state = ir_entity_usage_not_computed;
 
@@ -236,25 +234,25 @@ void remove_irp_irg(ir_graph *irg)
        remove_irp_irg_from_list(irg);
 }
 
-int (get_irp_n_irgs)(void)
+size_t (get_irp_n_irgs)(void)
 {
        return _get_irp_n_irgs();
 }
 
-ir_graph *(get_irp_irg)(int pos)
+ir_graph *(get_irp_irg)(size_t pos)
 {
        return _get_irp_irg(pos);
 }
 
-int get_irp_last_idx(void)
+size_t get_irp_last_idx(void)
 {
        return irp->max_irg_idx;
 }
 
-void set_irp_irg(int pos, ir_graph *irg)
+void set_irp_irg(size_t pos, ir_graph *irg)
 {
        assert(irp && irg);
-       assert(pos < (ARR_LEN(irp->graphs)));
+       assert(pos < ARR_LEN(irp->graphs));
        irp->graphs[pos] = irg;
 }
 
@@ -284,31 +282,31 @@ void remove_irp_type(ir_type *typ)
        }
 }
 
-int (get_irp_n_types) (void)
+size_t (get_irp_n_types) (void)
 {
        return _get_irp_n_types();
 }
 
-ir_type *(get_irp_type) (int pos)
+ir_type *(get_irp_type) (size_t pos)
 {
        return _get_irp_type(pos);
 }
 
-void set_irp_type(int pos, ir_type *typ)
+void set_irp_type(size_t pos, ir_type *typ)
 {
        assert(irp && typ);
-       assert(pos < (ARR_LEN((irp)->types)));
+       assert(pos < ARR_LEN((irp)->types));
        irp->types[pos] = typ;
 }
 
 /* Returns the number of all modes in the irp. */
-int (get_irp_n_modes)(void)
+size_t (get_irp_n_modes)(void)
 {
        return _get_irp_n_modes();
 }
 
 /* Returns the mode at position pos in the irp. */
-ir_mode *(get_irp_mode)(int pos)
+ir_mode *(get_irp_mode)(size_t pos)
 {
        return _get_irp_mode(pos);
 }
@@ -347,30 +345,30 @@ void remove_irp_opcode(ir_op *opcode)
 }
 
 /* Returns the number of all opcodes in the irp. */
-int (get_irp_n_opcodes)(void)
+size_t (get_irp_n_opcodes)(void)
 {
        return _get_irp_n_opcodes();
 }
 
 /* Returns the opcode at position pos in the irp. */
-ir_op *(get_irp_opcode)(int pos)
+ir_op *(get_irp_opcode)(size_t pos)
 {
        return _get_irp_opcode(pos);
 }
 
 /* Sets the generic function pointer of all opcodes to NULL */
-void  clear_irp_opcodes_generic_func(void)
+void clear_irp_opcodes_generic_func(void)
 {
-       int i;
+       size_t i, n;
 
-       for (i = get_irp_n_opcodes() - 1; i >= 0; --i) {
+       for (i = 0, n = get_irp_n_opcodes(); i < n; ++i) {
                ir_op *op = get_irp_opcode(i);
                op->ops.generic = (op_func)NULL;
        }
 }
 
 /*- File name / executable name or the like -*/
-void   set_irp_prog_name(ident *name)
+void set_irp_prog_name(ident *name)
 {
        irp->name = name;
 }
@@ -415,12 +413,12 @@ static int set_irp_phase_state_wrapper(ir_prog *irp, void *context)
 {
        pass_t         *pass  = (pass_t *)context;
        irg_phase_state state = pass->state;
-       int             i;
+       size_t          i, n;
 
        (void)irp;
 
        /* set the phase of all graphs */
-       for (i = get_irp_n_irgs() - 1; i >= 0; --i)
+       for (i = 0, n = get_irp_n_irgs(); i < n; ++i)
                set_irg_phase_state(get_irp_irg(i), state);
 
        /* set the irp phase */
@@ -444,16 +442,6 @@ ir_prog_pass_t *set_irp_phase_state_pass(const char *name, irg_phase_state state
        return &pass->pass;
 }
 
-irg_outs_state get_irp_ip_outs_state(void)
-{
-       return irp->outs_state;
-}
-
-void set_irp_ip_outs_inconsistent(void)
-{
-       irp->outs_state = outs_inconsistent;
-}
-
 void set_irp_ip_outedges(ir_node ** ip_outedges)
 {
        irp->ip_outedges = ip_outedges;
@@ -493,33 +481,32 @@ void add_irp_asm(ident *asm_string)
 }
 
 /* Return the number of global asm includes. */
-int get_irp_n_asms(void)
+size_t get_irp_n_asms(void)
 {
        return ARR_LEN(irp->global_asms);
 }
 
 /* Return the global asm include at position pos. */
-ident *get_irp_asm(int pos)
+ident *get_irp_asm(size_t pos)
 {
-       assert(0 <= pos && pos < get_irp_n_asms());
+       assert(pos < get_irp_n_asms());
        return irp->global_asms[pos];
 }
 
 #ifndef NDEBUG
-void irp_reserve_resources(ir_prog *irp, ir_resources_t resources)
+void irp_reserve_resources(ir_prog *irp, irp_resources_t resources)
 {
-       assert((resources & ~IR_RESOURCE_GLOBAL_MASK) == 0);
        assert((irp->reserved_resources & resources) == 0);
        irp->reserved_resources |= resources;
 }
 
-void irp_free_resources(ir_prog *irp, ir_resources_t resources)
+void irp_free_resources(ir_prog *irp, irp_resources_t resources)
 {
        assert((irp->reserved_resources & resources) == resources);
        irp->reserved_resources &= ~resources;
 }
 
-ir_resources_t irp_resources_reserved(const ir_prog *irp)
+irp_resources_t irp_resources_reserved(const ir_prog *irp)
 {
        return irp->reserved_resources;
 }