fixed some warnings
[cparser] / ast2firm.c
index 112b0eb..11f3bd7 100644 (file)
@@ -895,7 +895,6 @@ static ir_node *create_incdec(const unary_expression_t *expression)
                offset = new_Const(mode, get_mode_one(mode));
        }
 
-       ir_node *new_value;
        switch(expression->type) {
        case UNEXPR_POSTFIX_INCREMENT: {
                ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode);
@@ -919,15 +918,14 @@ static ir_node *create_incdec(const unary_expression_t *expression)
        }
        default:
                panic("no incdec expr in create_incdec");
+               return NULL;
        }
-
-       return new_value;
 }
 
 static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
 {
        dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
-       type_t   *type = expression->expression.datatype;
+       type_t   *type = skip_typeref(expression->expression.datatype);
 
        if(expression->type == UNEXPR_TAKE_ADDRESS)
                return expression_to_addr(expression->value);
@@ -2020,19 +2018,12 @@ struct compound_graph_path_entry_t {
        compound_graph_path_entry_t *prev;
 };
 
-static void create_initializer_list(initializer_list_t *initializer,
-                                    type_t *type, ir_entity *entity,
-                                    compound_graph_path_entry_t *entry,
-                                    int len);
+static void create_initializer_object(initializer_t *initializer, type_t *type,
+               ir_entity *entity, compound_graph_path_entry_t *entry, int len);
 
-static void create_initializer_value(initializer_value_t *initializer,
-                                     ir_entity *entity,
-                                     compound_graph_path_entry_t *entry,
-                                     int len)
+static compound_graph_path *create_compound_path(ir_type *type,
+               compound_graph_path_entry_t *entry, int len)
 {
-       ir_node *node = expression_to_firm(initializer->value);
-
-       ir_type *type = get_entity_type(entity);
        compound_graph_path *path = new_compound_graph_path(type, len);
 
        int i = len - 1;
@@ -2047,6 +2038,17 @@ static void create_initializer_value(initializer_value_t *initializer,
        }
        assert(i == -1);
 
+       return path;
+}
+
+static void create_initializer_value(initializer_value_t *initializer,
+                                     ir_entity *entity,
+                                     compound_graph_path_entry_t *entry,
+                                     int len)
+{
+       ir_node             *node = expression_to_firm(initializer->value);
+       ir_type             *type = get_entity_type(entity);
+       compound_graph_path *path = create_compound_path(type, entry, len);
        add_compound_ent_value_w_path(entity, node, path);
 }
 
@@ -2087,10 +2089,9 @@ static void create_initializer_compound(initializer_list_t *initializer,
                        create_initializer_value((initializer_value_t*) sub_initializer,
                                                 entity, &entry, len);
                } else {
-                       assert(sub_initializer->type == INITIALIZER_LIST);
                        type_t *type = skip_typeref(compound_entry->type);
-                       create_initializer_list((initializer_list_t*) sub_initializer,
-                                               type, entity, &entry, len);
+                       create_initializer_object(sub_initializer, type, entity, &entry,
+                                                 len);
                }
 
                ++i;
@@ -2120,51 +2121,133 @@ static void create_initializer_array(initializer_list_t *initializer,
                                                 entity, &entry, len);
                } else {
                        assert(sub_initializer->type == INITIALIZER_LIST);
-                       create_initializer_list((initializer_list_t*) sub_initializer,
-                                               element_type, entity, &entry, len);
+                       create_initializer_object(sub_initializer, element_type, entity,
+                                                 &entry, len);
                }
        }
 }
 
-static void create_initializer_list(initializer_list_t *initializer,
-                                    type_t *type, ir_entity *entity,
-                                    compound_graph_path_entry_t *entry, int len)
+static void create_initializer_string(initializer_string_t *initializer,
+                                      array_type_t *type, ir_entity *entity,
+                                      compound_graph_path_entry_t *last_entry,
+                                      int len)
+{
+       type_t *element_type = type->element_type;
+       element_type         = skip_typeref(element_type);
+
+       compound_graph_path_entry_t entry;
+       entry.type = COMPOUND_GRAPH_ENTRY_ARRAY;
+       entry.prev = last_entry;
+       ++len;
+
+       ir_type    *irtype  = get_entity_type(entity);
+       size_t      arr_len = get_array_type_size(type);
+       const char *p       = initializer->string;
+       size_t      i       = 0;
+       for(i = 0; i < arr_len; ++i, ++p) {
+               entry.v.array_index = i;
+
+               ir_node             *node = new_Const_long(mode_Bs, *p);
+               compound_graph_path *path = create_compound_path(irtype, &entry, len);
+               add_compound_ent_value_w_path(entity, node, path);
+
+               if(*p == '\0')
+                       break;
+       }
+}
+
+static void create_initializer_object(initializer_t *initializer, type_t *type,
+               ir_entity *entity, compound_graph_path_entry_t *entry, int len)
 {
        if(type->type == TYPE_ARRAY) {
-               create_initializer_array(initializer, (array_type_t*) type,
-                                        entity, entry, len);
+               array_type_t *array_type = (array_type_t*) type;
+
+               if(initializer->type == INITIALIZER_STRING) {
+                       initializer_string_t *string = (initializer_string_t*) initializer;
+                       create_initializer_string(string, array_type, entity, entry, len);
+               } else {
+                       assert(initializer->type == INITIALIZER_LIST);
+                       initializer_list_t *list = (initializer_list_t*) initializer;
+                       create_initializer_array(list, array_type, entity, entry, len);
+               }
        } else {
+               assert(initializer->type == INITIALIZER_LIST);
+               initializer_list_t *list = (initializer_list_t*) initializer;
+
                assert(type->type == TYPE_COMPOUND_STRUCT
                                || type->type == TYPE_COMPOUND_UNION);
-               create_initializer_compound(initializer, (compound_type_t*) type,
-                                           entity, entry, len);
+               compound_type_t *compound_type = (compound_type_t*) type;
+               create_initializer_compound(list, compound_type, entity, entry, len);
        }
 }
 
+static void create_initializer_local_variable_entity(declaration_t *declaration)
+{
+       initializer_t *initializer = declaration->init.initializer;
+       dbg_info      *dbgi        = get_dbg_info(&declaration->source_position);
+       ir_entity     *entity      = declaration->v.entity;
+       ir_node       *memory      = get_store();
+       ir_node       *nomem       = new_NoMem();
+       ir_node       *frame       = get_irg_frame(current_ir_graph);
+       ir_node       *addr        = new_d_simpleSel(dbgi, nomem, frame, entity);
+
+       if(is_atomic_entity(entity)) {
+               assert(initializer->type == INITIALIZER_VALUE);
+               initializer_value_t *initializer_value
+                       = (initializer_value_t*) initializer;
+
+               ir_node *value     = expression_to_firm(initializer_value->value);
+               ir_node *store     = new_d_Store(dbgi, memory, addr, value);
+               ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
+               set_store(store_mem);
+               return;
+       }
+
+       /* create a "template" entity which is copied to the entity on the stack */
+       ident     *id          = unique_ident("initializer");
+       ir_type   *irtype      = get_ir_type(declaration->type);
+       ir_type   *global_type = get_glob_type();
+       ir_entity *init_entity = new_entity(global_type, id, irtype);
+       set_entity_ld_ident(init_entity, id);
+
+       set_entity_variability(init_entity, variability_initialized);
+       set_entity_visibility(init_entity, visibility_local);
+
+       ir_graph *old_current_ir_graph = current_ir_graph;
+       current_ir_graph = get_const_code_irg();
+
+       type_t *type = skip_typeref(declaration->type);
+       create_initializer_object(initializer, type, init_entity, NULL, 0);
+
+       assert(current_ir_graph == get_const_code_irg());
+       current_ir_graph = old_current_ir_graph;
+
+       ir_node *src_addr  = create_symconst(dbgi, init_entity);
+       ir_node *copyb     = new_d_CopyB(dbgi, memory, addr, src_addr, irtype);
+
+       ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
+       set_store(copyb_mem);
+}
+
 static void create_initializer(declaration_t *declaration)
 {
        initializer_t *initializer = declaration->init.initializer;
        if(initializer == NULL)
                return;
 
+       declaration_type_t declaration_type = (declaration_type_t)declaration->declaration_type;
+       if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY) {
+               create_initializer_local_variable_entity(declaration);
+               return;
+       }
+
        if(initializer->type == INITIALIZER_VALUE) {
                initializer_value_t *initializer_value
                        = (initializer_value_t*) initializer;
                ir_node *value = expression_to_firm(initializer_value->value);
 
-               declaration_type_t declaration_type = declaration->declaration_type;
                if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) {
                        set_value(declaration->v.value_number, value);
-               } else if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY) {
-                       ir_entity *entity    = declaration->v.entity;
-                       dbg_info  *dbgi      = get_dbg_info(&declaration->source_position);
-                       ir_node   *frame     = get_irg_frame(current_ir_graph);
-                       ir_node   *addr      = new_d_simpleSel(dbgi, new_NoMem(), frame,
-                                              entity);
-                       ir_node   *memory    = get_store();
-                       ir_node   *store     = new_d_Store(dbgi, memory, addr, value);
-                       ir_node   *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
-                       set_store(store_mem);
                } else {
                        assert(declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE);
 
@@ -2174,10 +2257,7 @@ static void create_initializer(declaration_t *declaration)
                        set_atomic_ent_value(entity, value);
                }
        } else {
-               assert(initializer->type == INITIALIZER_LIST);
-               initializer_list_t *list = (initializer_list_t*) initializer;
-
-               declaration_type_t declaration_type = declaration->declaration_type;
+               declaration_type_t declaration_type = (declaration_type_t)declaration->declaration_type;
                assert(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY
                                || declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE);
 
@@ -2185,7 +2265,7 @@ static void create_initializer(declaration_t *declaration)
                set_entity_variability(entity, variability_initialized);
 
                type_t *type = skip_typeref(declaration->type);
-               create_initializer_list(list, type, entity, NULL, 0);
+               create_initializer_object(initializer, type, entity, NULL, 0);
        }
 }
 
@@ -2232,7 +2312,13 @@ static void create_local_static_variable(declaration_t *declaration)
        set_entity_variability(entity, variability_uninitialized);
        set_entity_visibility(entity, visibility_local);
 
+       ir_graph *old_current_ir_graph = current_ir_graph;
+       current_ir_graph = get_const_code_irg();
+
        create_initializer(declaration);
+
+       assert(current_ir_graph == get_const_code_irg());
+       current_ir_graph = old_current_ir_graph;
 }
 
 static void declaration_statement_to_firm(declaration_statement_t *statement)