X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fir%2Firprog.c;h=f4ce08b868f73db7b2d2e587d7ad5a085c08db6f;hb=1f66492dac45f1a1cf49ac16ee43894814e2cbf0;hp=852c6fe6ec1f6a1084da1f4f386fe79d251fd0ee;hpb=11344bd09b754d61bd636a2358c82700aefa9314;p=libfirm diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c index 852c6fe6e..f4ce08b86 100644 --- a/ir/ir/irprog.c +++ b/ir/ir/irprog.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -31,7 +31,6 @@ #include "irprog_t.h" #include "irgraph_t.h" #include "irpass_t.h" -#include "pseudo_irg.h" #include "array.h" #include "error.h" #include "obst.h" @@ -44,6 +43,10 @@ /* A variable from where everything in the ir can be accessed. */ ir_prog *irp; ir_prog *get_irp(void) { return irp; } +void set_irp(ir_prog *new_irp) +{ + irp = new_irp; +} /** * Create a new incomplete ir_prog. @@ -54,7 +57,6 @@ static ir_prog *new_incomplete_ir_prog(void) res->kind = k_ir_prog; res->graphs = NEW_ARR_F(ir_graph *, 0); - res->pseudo_graphs = NEW_ARR_F(ir_graph *, 0); res->types = NEW_ARR_F(ir_type *, 0); res->modes = NEW_ARR_F(ir_mode *, 0); res->opcodes = NEW_ARR_F(ir_op *, 0); @@ -64,7 +66,7 @@ static ir_prog *new_incomplete_ir_prog(void) res->max_irg_idx = 0; res->max_node_nr = 0; #ifndef NDEBUG - res->reserved_resources = 0; + res->reserved_resources = IR_RESOURCE_NONE; #endif return res; @@ -83,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] @@ -114,23 +117,28 @@ static ir_prog *complete_ir_prog(ir_prog *irp, const char *module_name) irp->class_cast_state = ir_class_casts_transitive; irp->globals_entity_usage_state = ir_entity_usage_not_computed; + current_ir_graph = irp->const_code_irg; + return irp; #undef IDENT } /* initializes ir_prog. Constructs only the basic lists. */ -void init_irprog_1(void) { +void init_irprog_1(void) +{ irp = new_incomplete_ir_prog(); } /* Completes ir_prog. */ -void init_irprog_2(void) { +void init_irprog_2(void) +{ (void)complete_ir_prog(irp, INITAL_PROG_NAME); } /* Create a new ir prog. Automatically called by init_firm through init_irprog. */ -ir_prog *new_ir_prog(const char *name) { +ir_prog *new_ir_prog(const char *name) +{ return complete_ir_prog(new_incomplete_ir_prog(), name); } @@ -145,7 +153,6 @@ void free_ir_prog(void) free_ir_graph(irp->const_code_irg); DEL_ARR_F(irp->graphs); - DEL_ARR_F(irp->pseudo_graphs); DEL_ARR_F(irp->types); DEL_ARR_F(irp->modes); @@ -162,12 +169,14 @@ void free_ir_prog(void) /* Access the main routine of the compiled program. */ -ir_graph *get_irp_main_irg(void) { +ir_graph *get_irp_main_irg(void) +{ assert(irp); return irp->main_irg; } -void set_irp_main_irg(ir_graph *main_irg) { +void set_irp_main_irg(ir_graph *main_irg) +{ assert(irp); irp->main_irg = main_irg; } @@ -185,156 +194,144 @@ void set_segment_type(ir_segment_t segment, ir_type *new_type) remove_irp_type(new_type); } -ir_type *(get_glob_type)(void) { +ir_type *(get_glob_type)(void) +{ return _get_glob_type(); } -ir_type *(get_tls_type)(void) { +ir_type *(get_tls_type)(void) +{ return _get_tls_type(); } /* Adds irg to the list of ir graphs in irp. */ -void add_irp_irg(ir_graph *irg) { +void add_irp_irg(ir_graph *irg) +{ assert(irg != NULL); assert(irp && irp->graphs); ARR_APP1(ir_graph *, irp->graphs, irg); } /* Removes irg from the list or irgs, shrinks the list by one. */ -void remove_irp_irg_from_list(ir_graph *irg){ - int i, l, found = 0; +void remove_irp_irg_from_list(ir_graph *irg) +{ + size_t i, l; assert(irg); l = ARR_LEN(irp->graphs); - for (i = 0; i < l; i++) { + for (i = 0; i < l; ++i) { if (irp->graphs[i] == irg) { - found = 1; - for(; i < l - 1; i++) { + for (; i < l - 1; ++i) { irp->graphs[i] = irp->graphs[i+1]; } ARR_SETLEN(ir_graph*, irp->graphs, l - 1); break; } } - if (!found) { - l = ARR_LEN(irp->pseudo_graphs); - for (i = 0; i < l; i++) { - if (irp->pseudo_graphs[i] == irg) { - for(; i < l - 1; i++) { - irp->pseudo_graphs[i] = irp->pseudo_graphs[i+1]; - } - ARR_SETLEN(ir_graph*, irp->pseudo_graphs, l - 1); - break; - } - } - } } /* Removes irg from the list or irgs, shrinks the list by one. */ -void remove_irp_irg(ir_graph *irg){ +void remove_irp_irg(ir_graph *irg) +{ free_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; } -/* Gets the number of graphs _and_ pseudo graphs. */ -int get_irp_n_allirgs(void) { - /* We can not call get_irp_n_irgs, as we end up in a recursion ... */ - return ARR_LEN(irp->graphs) + get_irp_n_pseudo_irgs(); -} - -/* Returns the ir graph at position pos of all graphs (including - pseudo graphs). Visits first graphs, then pseudo graphs. */ -ir_graph *get_irp_allirg(int pos) { - int n_irgs = ARR_LEN(irp->graphs); - assert(0 <= pos); - if (pos < n_irgs) { - return irp->graphs[pos]; - } else { - return get_irp_pseudo_irg(pos-n_irgs); - } -} - /* Adds type to the list of types in irp. */ -void add_irp_type(ir_type *typ) { +void add_irp_type(ir_type *typ) +{ assert(typ != NULL); assert(irp); ARR_APP1(ir_type *, irp->types, typ); } /* Remove type from the list of types in irp. */ -void remove_irp_type(ir_type *typ) { - int i; +void remove_irp_type(ir_type *typ) +{ + size_t i, l; assert(typ); - for (i = ARR_LEN(irp->types) - 1; i >= 0; i--) { + l = ARR_LEN(irp->types); + for (i = 0; i < l; ++i) { if (irp->types[i] == typ) { - for(; i < (ARR_LEN(irp->types)) - 1; i++) { + for (; i < l - 1; ++i) { irp->types[i] = irp->types[i+1]; } - ARR_SETLEN(ir_type *, irp->types, (ARR_LEN(irp->types)) - 1); + ARR_SETLEN(ir_type *, irp->types, l - 1); break; } } } -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); } /* Adds mode to the list of modes in irp. */ -void add_irp_mode(ir_mode *mode) { +void add_irp_mode(ir_mode *mode) +{ assert(mode != NULL); assert(irp); ARR_APP1(ir_mode *, irp->modes, mode); } /* Adds opcode to the list of opcodes in irp. */ -void add_irp_opcode(ir_op *opcode) { - int len; +void add_irp_opcode(ir_op *opcode) +{ + size_t len; size_t code; assert(opcode != NULL); assert(irp); len = ARR_LEN(irp->opcodes); code = opcode->code; - if ((int) code >= len) { + if (code >= len) { ARR_RESIZE(ir_op*, irp->opcodes, code+1); memset(&irp->opcodes[len], 0, (code-len+1) * sizeof(irp->opcodes[0])); } @@ -344,75 +341,87 @@ void add_irp_opcode(ir_op *opcode) { } /* Removes opcode from the list of opcodes and shrinks the list by one. */ -void remove_irp_opcode(ir_op *opcode) { - assert((int) opcode->code < ARR_LEN(irp->opcodes)); +void remove_irp_opcode(ir_op *opcode) +{ + assert(opcode->code < ARR_LEN(irp->opcodes)); irp->opcodes[opcode->code] = NULL; } /* 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) { - int i; +void clear_irp_opcodes_generic_func(void) +{ + 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; } -int irp_prog_name_is_set(void) { +int irp_prog_name_is_set(void) +{ return irp->name != new_id_from_str(INITAL_PROG_NAME); } -ident *get_irp_ident(void) { +ident *get_irp_ident(void) +{ return irp->name; } -const char *get_irp_name(void) { +const char *get_irp_name(void) +{ return get_id_str(irp->name); } -ir_graph *(get_const_code_irg)(void) { +ir_graph *(get_const_code_irg)(void) +{ return _get_const_code_irg(); } -irg_phase_state get_irp_phase_state(void) { +irg_phase_state get_irp_phase_state(void) +{ return irp->phase_state; } -void set_irp_phase_state(irg_phase_state s) { +void set_irp_phase_state(irg_phase_state s) +{ irp->phase_state = s; } -struct pass_t { +typedef struct pass_t { ir_prog_pass_t pass; irg_phase_state state; -}; +} pass_t; /** * Wrapper for setting the state of a whole ir_prog. */ -static int set_irp_phase_state_wrapper(ir_prog *irp, void *context) { - struct pass_t *pass = context; +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 */ @@ -421,7 +430,8 @@ static int set_irp_phase_state_wrapper(ir_prog *irp, void *context) { return 0; } -ir_prog_pass_t *set_irp_phase_state_pass(const char *name, irg_phase_state state) { +ir_prog_pass_t *set_irp_phase_state_pass(const char *name, irg_phase_state state) +{ struct pass_t *pass = XMALLOCZ(struct pass_t); def_prog_pass_constructor( @@ -435,69 +445,82 @@ 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) { +irg_outs_state get_irp_ip_outs_state(void) +{ return irp->outs_state; } -void set_irp_ip_outs_inconsistent(void) { +void set_irp_ip_outs_inconsistent(void) +{ irp->outs_state = outs_inconsistent; } -void set_irp_ip_outedges(ir_node ** ip_outedges) { +void set_irp_ip_outedges(ir_node ** ip_outedges) +{ irp->ip_outedges = ip_outedges; } -ir_node** get_irp_ip_outedges(void) { +ir_node** get_irp_ip_outedges(void) +{ return irp->ip_outedges; } -irg_callee_info_state get_irp_callee_info_state(void) { +irg_callee_info_state get_irp_callee_info_state(void) +{ return irp->callee_info_state; } -void set_irp_callee_info_state(irg_callee_info_state s) { +void set_irp_callee_info_state(irg_callee_info_state s) +{ irp->callee_info_state = s; } /* Returns a new, unique exception region number. */ -ir_exc_region_t (get_irp_next_region_nr)(void) { +ir_exc_region_t (get_irp_next_region_nr)(void) +{ return _get_irp_next_region_nr(); } /* Returns a new, unique label number. */ -ir_label_t (get_irp_next_label_nr)(void) { +ir_label_t (get_irp_next_label_nr)(void) +{ return _get_irp_next_label_nr(); } /* Add a new global asm include */ -void add_irp_asm(ident *asm_string) { +void add_irp_asm(ident *asm_string) +{ ARR_APP1(ident *, irp->global_asms, 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) { - assert(0 <= pos && pos < get_irp_n_asms()); +ident *get_irp_asm(size_t pos) +{ + assert(pos < get_irp_n_asms()); return irp->global_asms[pos]; } #ifndef NDEBUG -void irp_reserve_resources(ir_prog *irp, ir_resources_t resources) { - assert((resources & ~IR_RESOURCE_GLOBAL_MASK) == 0); +void irp_reserve_resources(ir_prog *irp, irp_resources_t resources) +{ 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; } #endif