static ir_type *ir_type_const_char;
static ir_type *ir_type_void;
static ir_type *ir_type_int;
-static ir_type *ir_type_void_ptr;
static type_t *type_const_char;
static type_t *type_void;
ir_type_const_char = get_ir_type(type_const_char);
ir_type_void = get_ir_type(type_int); /* we don't have a real void
type in firm */
- ir_type_void_ptr = new_type_pointer(new_id_from_str("void_ptr"),
- ir_type_void, mode_P_data);
- type_void->firm_type = ir_type_void;
+ type_void->base.firm_type = ir_type_void;
symbol_alloca = symbol_table_insert("__builtin_alloca");
}
static unsigned get_compound_type_size(compound_type_t *type)
{
- ir_type *irtype = get_ir_type(&type->type);
+ ir_type *irtype = get_ir_type((type_t*) type);
return get_type_size_bytes(irtype);
}
switch(type->type) {
case TYPE_ATOMIC:
- return get_atomic_type_size((const atomic_type_t*) type);
+ return get_atomic_type_size(&type->atomic);
case TYPE_ENUM:
return get_mode_size_bytes(mode_Is);
case TYPE_COMPOUND_UNION:
case TYPE_COMPOUND_STRUCT:
- return get_compound_type_size((compound_type_t*) type);
+ return get_compound_type_size(&type->compound);
case TYPE_FUNCTION:
/* just a pointer to the function */
return get_mode_size_bytes(mode_P_code);
case TYPE_POINTER:
return get_mode_size_bytes(mode_P_data);
case TYPE_ARRAY:
- return get_array_type_size((array_type_t*) type);
+ return get_array_type_size(&type->array);
case TYPE_BUILTIN:
case TYPE_TYPEDEF:
case TYPE_TYPEOF:
type = skip_typeref(type);
- if(type->firm_type != NULL) {
- assert(type->firm_type != INVALID_TYPE);
- return type->firm_type;
+ if(type->base.firm_type != NULL) {
+ assert(type->base.firm_type != INVALID_TYPE);
+ return type->base.firm_type;
}
ir_type *firm_type = NULL;
switch(type->type) {
case TYPE_ATOMIC:
- firm_type = create_atomic_type((atomic_type_t*) type);
+ firm_type = create_atomic_type(&type->atomic);
break;
case TYPE_FUNCTION:
- firm_type = create_method_type((function_type_t*) type);
+ firm_type = create_method_type(&type->function);
break;
case TYPE_POINTER:
- firm_type = create_pointer_type((pointer_type_t*) type);
+ firm_type = create_pointer_type(&type->pointer);
break;
case TYPE_ARRAY:
- firm_type = create_array_type((array_type_t*) type);
+ firm_type = create_array_type(&type->array);
break;
case TYPE_COMPOUND_STRUCT:
- firm_type = create_struct_type((compound_type_t*) type);
+ firm_type = create_struct_type(&type->compound);
break;
case TYPE_COMPOUND_UNION:
- firm_type = create_union_type((compound_type_t*) type);
+ firm_type = create_union_type(&type->compound);
break;
case TYPE_ENUM:
- firm_type = create_enum_type((enum_type_t*) type);
+ firm_type = create_enum_type(&type->enumt);
break;
case TYPE_BUILTIN:
case TYPE_TYPEOF:
if(firm_type == NULL)
panic("unknown type found");
- type->firm_type = firm_type;
+ type->base.firm_type = firm_type;
return firm_type;
}
return (dbg_info*) pos;
}
-static ir_node *const_to_firm(const const_t *cnst)
+static ir_node *const_to_firm(const const_expression_t *cnst)
{
dbg_info *dbgi = get_dbg_info(&cnst->expression.source_position);
ir_mode *mode = get_ir_mode(cnst->expression.datatype);
if(mode_is_signed(mode)) {
len = snprintf(buf, sizeof(buf), "%lld", cnst->v.int_value);
} else {
- len = snprintf(buf, sizeof(buf), "%llu", cnst->v.int_value);
+ len = snprintf(buf, sizeof(buf), "%llu",
+ (unsigned long long) cnst->v.int_value);
}
tv = new_tarval_from_str(buf, len, mode);
}
return create_symconst(dbgi, entity);
}
-static ir_node *string_literal_to_firm(const string_literal_t* literal)
+static ir_node *string_literal_to_firm(
+ const string_literal_expression_t* literal)
{
return string_to_firm(&literal->expression.source_position, "Lstr",
literal->value);
return load_res;
}
+static ir_node *get_global_var_address(dbg_info *const dbgi,
+ const declaration_t *const decl)
+{
+ assert(decl->declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE);
+
+ ir_entity *const entity = decl->v.entity;
+ switch ((storage_class_tag_t)decl->storage_class) {
+ case STORAGE_CLASS_THREAD:
+ case STORAGE_CLASS_THREAD_EXTERN:
+ case STORAGE_CLASS_THREAD_STATIC: {
+ ir_node *const no_mem = new_NoMem();
+ ir_node *const tls = get_irg_tls(current_ir_graph);
+ return new_d_simpleSel(dbgi, no_mem, tls, entity);
+ }
+
+ default:
+ return create_symconst(dbgi, entity);
+ }
+}
+
static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
{
dbg_info *dbgi = get_dbg_info(&ref->expression.source_position);
return create_symconst(dbgi, declaration->v.entity);
}
case DECLARATION_TYPE_GLOBAL_VARIABLE: {
- ir_entity *entity = declaration->v.entity;
- ir_node *symconst = create_symconst(dbgi, entity);
- ir_type *irtype = get_entity_type(entity);
- return deref_address(irtype, symconst, dbgi);
+ ir_node *const addr = get_global_var_address(dbgi, declaration);
+ ir_type *const irtype = get_entity_type(declaration->v.entity);
+ return deref_address(irtype, addr, dbgi);
}
+
case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY: {
ir_entity *entity = declaration->v.entity;
ir_node *frame = get_irg_frame(current_ir_graph);
return create_symconst(dbgi, declaration->v.entity);
}
case DECLARATION_TYPE_GLOBAL_VARIABLE: {
- ir_entity *entity = declaration->v.entity;
- ir_node *symconst = create_symconst(dbgi, entity);
- return symconst;
+ ir_node *const addr = get_global_var_address(dbgi, declaration);
+ return addr;
}
case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY: {
ir_entity *entity = declaration->v.entity;
{
assert(get_cur_block() != NULL);
- expression_t *function = call->function;
+ expression_t *function = call->function;
if(function->type == EXPR_BUILTIN_SYMBOL) {
return process_builtin_call(call);
}
- ir_node *callee = expression_to_firm(function);
+ ir_node *callee = expression_to_firm(function);
- function_type_t *function_type;
- if (function->datatype->type == TYPE_POINTER) {
- pointer_type_t *const ptr_type = (pointer_type_t*)function->datatype;
- assert(ptr_type->points_to->type == TYPE_FUNCTION);
- function_type = (function_type_t*)ptr_type->points_to;
- } else {
- assert(function->datatype->type == TYPE_FUNCTION);
- function_type = (function_type_t*)function->datatype;
- }
+ type_t *type = function->base.datatype;
+ assert(type->type == TYPE_POINTER);
+ pointer_type_t *const ptr_type = &type->pointer;
+ assert(ptr_type->points_to->type == TYPE_FUNCTION);
+ function_type_t *function_type = &ptr_type->points_to->function;
int n_parameters = 0;
call_argument_t *argument = call->arguments;
in[n] = arg_node;
if(new_method_type != NULL) {
- ir_type *irtype = get_ir_type(expression->datatype);
+ ir_type *irtype = get_ir_type(expression->base.datatype);
set_method_param_type(new_method_type, n, irtype);
}
ir_node *mem = new_d_Proj(dbgi, node, mode_M, pn_Call_M_regular);
set_store(mem);
- type_t *result_type = function_type->result_type;
+ type_t *result_type = skip_typeref(function_type->result_type);
ir_node *result = NULL;
- if(result_type != type_void) {
- ir_mode *mode = get_ir_mode(result_type);
+
+ if(!is_type_atomic(result_type, ATOMIC_TYPE_VOID)) {
+ ir_mode *mode;
+ if(is_type_scalar(result_type)) {
+ mode = get_ir_mode(result_type);
+ } else {
+ mode = mode_P_data;
+ }
ir_node *resproj = new_d_Proj(dbgi, node, mode_T, pn_Call_T_result);
result = new_d_Proj(dbgi, resproj, mode, 0);
}
}
}
- dbg_info *dbgi = get_dbg_info(&expression->source_position);
- ir_node *addr = expression_to_addr(expression);
- assert(get_irn_mode(value) == get_ir_mode(expression->datatype));
- 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);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+ ir_node *addr = expression_to_addr(expression);
+ ir_node *memory = get_store();
+
+ type_t *type = skip_typeref(expression->base.datatype);
+ if(is_type_scalar(type)) {
+ 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 {
+ ir_type *irtype = get_ir_type(type);
+ ir_node *copyb = new_d_CopyB(dbgi, memory, addr, value, irtype);
+ ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
+ set_store(copyb_mem);
+ }
}
static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
ir_node *offset;
if(type->type == TYPE_POINTER) {
- pointer_type_t *pointer_type = (pointer_type_t*) type;
+ pointer_type_t *pointer_type = &type->pointer;
unsigned elem_size = get_type_size(pointer_type->points_to);
offset = new_Const_long(mode_Is, elem_size);
} else {
dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
ir_node *left = expression_to_firm(expression->left);
ir_node *right = expression_to_firm(expression->right);
- type_t *type = expression->right->datatype;
+ type_t *type = expression->right->base.datatype;
/* be careful with the modes, because in arithmetic assign nodes only
* the right operand has the mode of the arithmetic already */
ir_mode *mode = get_ir_mode(type);
expression_t *expr_left = expression->left;
expression_t *expr_right = expression->right;
- type_t *type_left = skip_typeref(expr_left->datatype);
- type_t *type_right = skip_typeref(expr_right->datatype);
+ type_t *type_left = skip_typeref(expr_left->base.datatype);
+ type_t *type_right = skip_typeref(expr_right->base.datatype);
if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
ir_mode *const mode = get_ir_mode(type);
ir_node *const left = expression_to_firm(expr_left);
ir_node *const right = expression_to_firm(expr_right);
type_t *const type = expression->expression.datatype;
- type_t *const type_left = skip_typeref(expr_left->datatype);
- type_t *const type_right = skip_typeref(expr_right->datatype);
+ type_t *const type_left = skip_typeref(expr_left->base.datatype);
+ type_t *const type_right = skip_typeref(expr_right->base.datatype);
if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
ir_mode *const mode = get_ir_mode(type);
return new_d_Sub(dbgi, left, right, mode);
- } else if (type_left->type == TYPE_POINTER && type_right->type == TYPE_POINTER) {
- const pointer_type_t *const ptr_type = (const pointer_type_t*)type_left;
+ } else if (type_left->type == TYPE_POINTER
+ && type_right->type == TYPE_POINTER) {
+ const pointer_type_t *const ptr_type = &type_left->pointer;
const unsigned elem_size = get_type_size(ptr_type->points_to);
ir_mode *const mode = get_ir_mode(type);
ir_node *const sub = new_d_Sub(dbgi, left, right, mode);
case BINEXPR_SHIFTRIGHT_ASSIGN:
case BINEXPR_SHIFTRIGHT: {
expression_t *expr_left = expression->left;
- type_t *type_left = skip_typeref(expr_left->datatype);
+ type_t *type_left = skip_typeref(expr_left->base.datatype);
if(is_type_signed(type_left)) {
res = new_d_Shrs(dbgi, left, right, mode);
ir_node *pin = new_Pin(new_NoMem());
/* be careful with the modes, because in arithmetic assign nodes only
* the right operand has the mode of the arithmetic already */
- type_t *type = expression->right->datatype;
+ type_t *type = expression->right->base.datatype;
ir_mode *mode = get_ir_mode(type);
left = create_conv(dbgi, left, mode);
ir_node *op;
case BINEXPR_ASSIGN: {
ir_node *right = expression_to_firm(expression->right);
set_value_for_expression(expression->left, right);
+
return right;
}
case BINEXPR_ADD:
static ir_node *array_access_addr(const array_access_expression_t *expression)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
- ir_node *base_addr;
- ir_node *offset;
+ dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+ ir_node *base_addr = expression_to_firm(expression->array_ref);
+ ir_node *offset = expression_to_firm(expression->index);
+ offset = create_conv(dbgi, offset, mode_Iu);
- type_t *type_left = skip_typeref(expression->array_ref->datatype);
- type_t *type_right = skip_typeref(expression->index->datatype);
+ type_t *ref_type = skip_typeref(expression->array_ref->base.datatype);
+ assert(is_type_pointer(ref_type));
+ pointer_type_t *pointer_type = (pointer_type_t*) ref_type;
- if(type_left->type == TYPE_POINTER || type_left->type == TYPE_ARRAY) {
- base_addr = expression_to_firm(expression->array_ref);
- offset = expression_to_firm(expression->index);
- } else {
- assert(type_right->type == TYPE_POINTER
- || type_right->type == TYPE_ARRAY);
- base_addr = expression_to_firm(expression->index);
- offset = expression_to_firm(expression->array_ref);
- }
- offset = create_conv(dbgi, offset, mode_Iu);
-
- unsigned elem_size = get_type_size(expression->expression.datatype);
+ unsigned elem_size = get_type_size(pointer_type->points_to);
ir_node *elem_size_const = new_Const_long(mode_Iu, elem_size);
ir_node *real_offset = new_d_Mul(dbgi, offset, elem_size_const,
mode_Iu);
{
type_t *type = expression->type;
if(type == NULL) {
- type = expression->size_expression->datatype;
+ type = expression->size_expression->base.datatype;
assert(type != NULL);
}
static ir_node *classify_type_to_firm(const classify_type_expression_t *const expr)
{
- const type_t *const type = expr->type_expression->datatype;
+ const type_t *const type = expr->type_expression->base.datatype;
gcc_type_class tc;
switch (type->type)
{
case TYPE_ATOMIC: {
- const atomic_type_t *const atomic_type = (const atomic_type_t*)type;
+ const atomic_type_t *const atomic_type = &type->atomic;
switch (atomic_type->atype) {
// should not be reached
case ATOMIC_TYPE_INVALID:
return new_d_Const(dbgi, mode, tv);
}
-static ir_node *function_name_to_firm(const string_literal_t *const expr)
+static ir_node *function_name_to_firm(
+ const string_literal_expression_t *const expr)
{
if (current_function_name == NULL) {
const source_position_t *const src_pos =
{
switch(expression->type) {
case EXPR_REFERENCE:
- return reference_addr((const reference_expression_t*) expression);
+ return reference_addr(&expression->reference);
case EXPR_ARRAY_ACCESS:
- return array_access_addr((const array_access_expression_t*) expression);
+ return array_access_addr(&expression->array_access);
case EXPR_SELECT:
- return select_addr((const select_expression_t*) expression);
+ return select_addr(&expression->select);
+ case EXPR_CALL:
+ return call_expression_to_firm(&expression->call);
case EXPR_UNARY: {
- const unary_expression_t *const unary_expr =
- (const unary_expression_t*)expression;
+ const unary_expression_t *const unary_expr = &expression->unary;
if (unary_expr->type == UNEXPR_DEREFERENCE) {
return dereference_addr(unary_expr);
}
{
switch(expression->type) {
case EXPR_CONST:
- return const_to_firm((const const_t*) expression);
+ return const_to_firm(&expression->conste);
case EXPR_STRING_LITERAL:
- return string_literal_to_firm((const string_literal_t*) expression);
+ return string_literal_to_firm(&expression->string);
case EXPR_REFERENCE:
- return reference_expression_to_firm(
- (const reference_expression_t*) expression);
+ return reference_expression_to_firm(&expression->reference);
case EXPR_CALL:
- return call_expression_to_firm((const call_expression_t*) expression);
+ return call_expression_to_firm(&expression->call);
case EXPR_UNARY:
- return unary_expression_to_firm((const unary_expression_t*) expression);
+ return unary_expression_to_firm(&expression->unary);
case EXPR_BINARY:
- return binary_expression_to_firm(
- (const binary_expression_t*) expression);
+ return binary_expression_to_firm(&expression->binary);
case EXPR_ARRAY_ACCESS:
- return array_access_to_firm(
- (const array_access_expression_t*) expression);
+ return array_access_to_firm(&expression->array_access);
case EXPR_SIZEOF:
- return sizeof_to_firm((const sizeof_expression_t*) expression);
+ return sizeof_to_firm(&expression->sizeofe);
case EXPR_CONDITIONAL:
- return conditional_to_firm((const conditional_expression_t*)expression);
+ return conditional_to_firm(&expression->conditional);
case EXPR_SELECT:
- return select_to_firm((const select_expression_t*) expression);
+ return select_to_firm(&expression->select);
case EXPR_CLASSIFY_TYPE:
- return classify_type_to_firm((const classify_type_expression_t*)expression);
+ return classify_type_to_firm(&expression->classify_type);
case EXPR_FUNCTION:
case EXPR_PRETTY_FUNCTION:
- return function_name_to_firm((const string_literal_t*)expression);
+ return function_name_to_firm(&expression->string);
case EXPR_STATEMENT:
- return statement_expression_to_firm(
- (const statement_expression_t*) expression);
+ return statement_expression_to_firm(&expression->statement);
case EXPR_OFFSETOF:
case EXPR_VA_ARG:
case EXPR_BUILTIN_SYMBOL:
ir_node *res = _expression_to_firm(expression);
if(res != NULL && get_irn_mode(res) == mode_b) {
- ir_mode *mode = get_ir_mode(expression->datatype);
+ ir_mode *mode = get_ir_mode(expression->base.datatype);
res = create_conv(NULL, res, mode);
}
break;
}
- dbg_info *dbgi = get_dbg_info(&expression->source_position);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
ir_node *condition = expression_to_modeb(expression);
ir_node *cond = new_d_Cond(dbgi, condition);
ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
if(get_cur_block() == NULL)
return;
-
ir_type *func_irtype = get_ir_type(current_function_decl->type);
- ir_node *value = NULL;
- if(statement->return_value != NULL) {
- value = expression_to_firm(statement->return_value);
- }
+ dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
ir_node *in[1];
int in_len;
if(get_method_n_ress(func_irtype) > 0) {
- if(value == NULL) {
- ir_type *res_type = get_method_res_type(func_irtype, 0);
- ir_mode *mode = get_type_mode(res_type);
- value = new_Unknown(mode);
- }
+ ir_type *res_type = get_method_res_type(func_irtype, 0);
+
+ if(is_compound_type(res_type)) {
+ ir_entity *entity = get_method_value_res_ent(func_irtype, 0);
- in[0] = value;
- in_len = 1;
+ ir_node *frame = get_irg_frame(current_ir_graph);
+ ir_node *nomem = new_NoMem();
+ ir_node *source_addr = expression_to_addr(statement->return_value);
+ ir_node *dest_addr = new_simpleSel(nomem, frame, entity);
+
+ ir_node *store = get_store();
+ ir_node *copyb = new_d_CopyB(dbgi, store, dest_addr, source_addr,
+ res_type);
+
+ ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
+ set_store(copyb_mem);
+
+ in[0] = dest_addr;
+ in_len = 1;
+ } else {
+ in_len = 1;
+ if(statement->return_value != NULL) {
+ in[0] = expression_to_firm(statement->return_value);
+ } else {
+ ir_mode *mode = get_type_mode(res_type);
+ in[0] = new_Unknown(mode);
+ }
+ }
} else {
+ /* build return_value for its side effects */
+ if(statement->return_value != NULL) {
+ expression_to_firm(statement->return_value);
+ }
in_len = 0;
}
- dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
ir_node *store = get_store();
ir_node *ret = new_d_Return(dbgi, store, in_len, in);
{
ir_node *result = NULL;
statement_t *statement = compound->statements;
- for( ; statement != NULL; statement = statement->next) {
+ for( ; statement != NULL; statement = statement->base.next) {
//context2firm(&statement->context);
- if(statement->next == NULL && statement->type == STATEMENT_EXPRESSION) {
+ if(statement->base.next == NULL
+ && statement->type == STATEMENT_EXPRESSION) {
result = expression_statement_to_firm(
(expression_statement_t*) statement);
break;
break_label = old_break_label;
if(get_cur_block() != NULL) {
- ir_node *jmp = new_Jmp();
+ jmp = new_Jmp();
add_immBlock_pred(header_block, jmp);
}
} else {
break_label = old_break_label;
if (get_cur_block() != NULL) {
- ir_node *const jmp = new_Jmp();
+ jmp = new_Jmp();
add_immBlock_pred(step_block, jmp);
}
} else {
false_block);
} else {
keep_alive(header_block);
- ir_node *jmp = new_Jmp();
+ jmp = new_Jmp();
add_immBlock_pred(body_block, jmp);
}
ir_entity *entity = new_entity(parent_type, id, irtype);
set_entity_ld_ident(entity, id);
- declaration->declaration_type = declaration_type;
+ declaration->declaration_type = (unsigned char) declaration_type;
declaration->v.entity = entity;
set_entity_variability(entity, variability_uninitialized);
/* TODO: visibility? */
create_initializer_value(&sub_initializer->value,
entity, &entry, len);
} else {
- type_t *type = skip_typeref(compound_entry->type);
- create_initializer_object(sub_initializer, type, entity, &entry,
- len);
+ type_t *entry_type = skip_typeref(compound_entry->type);
+ create_initializer_object(sub_initializer, entry_type, entity,
+ &entry, len);
}
++i;
}
#if 0
- /* TODO: initializer rest... */
+ /* TODO: initialize rest... */
if(type->size_expression != NULL) {
size_t array_len = fold_constant(type->size_expression);
for( ; i < array_len; ++i) {
ir_entity *entity, compound_graph_path_entry_t *entry, int len)
{
if(type->type == TYPE_ARRAY) {
- array_type_t *array_type = (array_type_t*) type;
+ array_type_t *array_type = &type->array;
if(initializer->type == INITIALIZER_STRING) {
initializer_string_t *string = &initializer->string;
assert(type->type == TYPE_COMPOUND_STRUCT
|| type->type == TYPE_COMPOUND_UNION);
- compound_type_t *compound_type = (compound_type_t*) type;
+ compound_type_t *compound_type = &type->compound;
create_initializer_compound(list, compound_type, entity, entry, len);
}
}
if(initializer == NULL)
return;
- declaration_type_t declaration_type = (declaration_type_t)declaration->declaration_type;
+ 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;
set_atomic_ent_value(entity, value);
}
} else {
- 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);
for( ; declaration != end; declaration = declaration->next) {
type_t *type = declaration->type;
- switch(declaration->storage_class) {
+ switch ((storage_class_tag_t)declaration->storage_class) {
case STORAGE_CLASS_TYPEDEF:
continue;
case STORAGE_CLASS_STATIC:
create_local_variable(declaration);
}
continue;
+ case STORAGE_CLASS_THREAD:
+ case STORAGE_CLASS_THREAD_EXTERN:
+ case STORAGE_CLASS_THREAD_STATIC:
+ break;
}
panic("invalid storage class found");
}
if(get_cur_block() == NULL)
return;
- dbg_info *dbgi = get_dbg_info(&statement->source_position);
+ dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
ir_node *jump = new_d_Jmp(dbgi);
add_immBlock_pred(target_block, jump);
case TYPE_ATOMIC:
case TYPE_ENUM:
case TYPE_POINTER:
- if (!decl->address_taken) ++count;
+ if (!decl->address_taken)
+ ++count;
break;
default: break;
static int count_decls_in_stmts(const statement_t *stmt)
{
int count = 0;
- for (; stmt != NULL; stmt = stmt->next) {
+ for (; stmt != NULL; stmt = stmt->base.next) {
switch (stmt->type) {
case STATEMENT_DECLARATION: {
const declaration_statement_t *const decl_stmt =
static void create_function(declaration_t *declaration)
{
- ir_entity *entity = get_function_entity(declaration);
+ ir_entity *function_entity = get_function_entity(declaration);
if(declaration->init.statement == NULL)
return;
imature_blocks = NEW_ARR_F(ir_node*, 0);
int n_local_vars = get_function_n_local_vars(declaration);
- ir_graph *irg = new_ir_graph(entity, n_local_vars);
+ ir_graph *irg = new_ir_graph(function_entity, n_local_vars);
ir_node *first_block = get_cur_block();
next_value_number_function = 0;
/* do we have a return statement yet? */
if(get_cur_block() != NULL) {
assert(declaration->type->type == TYPE_FUNCTION);
- const function_type_t* const func_type
- = (const function_type_t*) declaration->type;
+ const function_type_t* const func_type = &declaration->type->function;
+
ir_node *ret;
if (func_type->result_type == type_void) {
ret = new_Return(get_store(), 0, NULL);
static void create_global_variable(declaration_t *declaration)
{
- ir_type *global_type = get_glob_type();
- create_declaration_entity(declaration, DECLARATION_TYPE_GLOBAL_VARIABLE,
- global_type);
+ ir_visibility vis;
+ ir_type *var_type;
+ switch ((storage_class_tag_t)declaration->storage_class) {
+ case STORAGE_CLASS_STATIC:
+ vis = visibility_local;
+ goto global_var;
- ir_entity *entity = declaration->v.entity;
- if(declaration->storage_class == STORAGE_CLASS_STATIC) {
- set_entity_visibility(entity, visibility_local);
- } else if(declaration->storage_class == STORAGE_CLASS_EXTERN) {
- set_entity_visibility(entity, visibility_external_allocated);
- } else {
- set_entity_visibility(entity, visibility_external_visible);
+ case STORAGE_CLASS_EXTERN:
+ vis = visibility_external_allocated;
+ goto global_var;
+
+ case STORAGE_CLASS_NONE:
+ vis = visibility_external_visible;
+ goto global_var;
+
+ case STORAGE_CLASS_THREAD:
+ vis = visibility_external_visible;
+ goto tls_var;
+
+ case STORAGE_CLASS_THREAD_EXTERN:
+ vis = visibility_external_allocated;
+ goto tls_var;
+
+ case STORAGE_CLASS_THREAD_STATIC:
+ vis = visibility_local;
+ goto tls_var;
+
+tls_var:
+ var_type = get_tls_type();
+ goto create_var;
+
+global_var:
+ var_type = get_glob_type();
+ goto create_var;
+
+create_var:
+ create_declaration_entity(declaration, DECLARATION_TYPE_GLOBAL_VARIABLE,
+ var_type);
+ set_entity_visibility(declaration->v.entity, vis);
+
+ current_ir_graph = get_const_code_irg();
+ create_initializer(declaration);
+ return;
+
+ case STORAGE_CLASS_TYPEDEF:
+ case STORAGE_CLASS_AUTO:
+ case STORAGE_CLASS_REGISTER:
+ case STORAGE_CLASS_ENUM_ENTRY:
+ break;
}
- current_ir_graph = get_const_code_irg();
- create_initializer(declaration);
+ panic("Invalid storage class for global variable");
}
static void context_to_firm(context_t *context)
projects / cparser / blobdiff