/**
* Return a node representing the size of a type.
*/
-static ir_node *get_type_size(type_t *type)
+static ir_node *get_type_size_node(type_t *type)
{
type = skip_typeref(type);
if (is_type_array(type) && type->array.is_vla) {
ir_node *size_node = get_vla_size(&type->array);
- ir_node *elem_size = get_type_size(type->array.element_type);
+ ir_node *elem_size = get_type_size_node(type->array.element_type);
ir_mode *mode = get_irn_mode(size_node);
ir_node *real_size = new_d_Mul(NULL, size_node, elem_size, mode);
return real_size;
return count;
}
-static type_t *get_aligned_type(type_t *type, int alignment)
-{
- if (alignment == 0)
- return type;
-
- type = skip_typeref(type);
- if (alignment > type->base.alignment) {
- type_t *copy = duplicate_type(type);
- copy->base.alignment = alignment;
- type = identify_new_type(copy);
- }
- return type;
-}
-
/**
* Creates a Firm type for an atomic type
*/
-static ir_type *create_atomic_type(atomic_type_kind_t akind, int alignment)
+static ir_type *create_atomic_type(atomic_type_kind_t akind)
{
- ir_mode *mode = atomic_modes[akind];
- ident *id = get_mode_ident(mode);
- ir_type *irtype = new_type_primitive(id, mode);
+ ir_mode *mode = atomic_modes[akind];
+ ident *id = get_mode_ident(mode);
+ ir_type *irtype = new_type_primitive(id, mode);
+ il_alignment_t alignment = get_atomic_type_alignment(akind);
set_type_alignment_bytes(irtype, alignment);
ir_mode *mode = atomic_modes[kind];
ident *id = get_mode_ident(mode);
ir_type *irtype = new_type_primitive(id, mode);
+ il_alignment_t alignment = get_type_alignment((const type_t*) type);
- set_type_alignment_bytes(irtype, type->base.alignment);
+ set_type_alignment_bytes(irtype, alignment);
return irtype;
}
* return type of a parameter (and take transparent union gnu extension into
* account)
*/
-static type_t *get_parameter_type(type_t *type)
+static type_t *get_parameter_type(type_t *orig_type)
{
- type = skip_typeref(type);
- if (type->base.modifiers & TYPE_MODIFIER_TRANSPARENT_UNION) {
+ type_t *type = skip_typeref(orig_type);
+ if (is_type_union(type)
+ && get_type_modifiers(orig_type) & DM_TRANSPARENT_UNION) {
compound_t *compound = type->compound.compound;
type = compound->members.entities->declaration.type;
}
/**
* Construct firm type from ast struct type.
- *
- * As anonymous inner structs get flattened to a single firm type, we might get
- * irtype, outer_offset and out_align passed (they represent the position of
- * the anonymous inner struct inside the resulting firm struct)
*/
-static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
- size_t *outer_offset, size_t *outer_align,
+static ir_type *create_compound_type(compound_type_t *type,
bool incomplete, bool is_union)
{
compound_t *compound = type->compound;
return compound->irtype;
}
- size_t align_all = 1;
- size_t offset = 0;
- size_t bit_offset = 0;
- size_t size = 0;
-
- if (irtype == NULL) {
- symbol_t *symbol = compound->base.symbol;
- ident *id;
- if (symbol != NULL) {
- id = new_id_from_str(symbol->string);
- } else {
- if (is_union) {
- id = id_unique("__anonymous_union.%u");
- } else {
- id = id_unique("__anonymous_struct.%u");
- }
- }
- dbg_info *dbgi = get_dbg_info(&compound->base.source_position);
-
+ symbol_t *symbol = compound->base.symbol;
+ ident *id;
+ if (symbol != NULL) {
+ id = new_id_from_str(symbol->string);
+ } else {
if (is_union) {
- irtype = new_d_type_union(id, dbgi);
+ id = id_unique("__anonymous_union.%u");
} else {
- irtype = new_d_type_struct(id, dbgi);
+ id = id_unique("__anonymous_struct.%u");
}
+ }
+ dbg_info *dbgi = get_dbg_info(&compound->base.source_position);
- compound->irtype_complete = false;
- compound->irtype = irtype;
+ ir_type *irtype;
+ if (is_union) {
+ irtype = new_d_type_union(id, dbgi);
} else {
- offset = *outer_offset;
- align_all = *outer_align;
+ irtype = new_d_type_struct(id, dbgi);
}
+ compound->irtype_complete = false;
+ compound->irtype = irtype;
+
if (incomplete)
return irtype;
if (entry->kind != ENTITY_COMPOUND_MEMBER)
continue;
- size_t prev_offset = offset;
-
symbol_t *symbol = entry->base.symbol;
- type_t *entry_type = skip_typeref(entry->declaration.type);
- entry_type
- = get_aligned_type(entry_type, entry->compound_member.alignment);
- dbg_info *dbgi = get_dbg_info(&entry->base.source_position);
-
+ type_t *entry_type = entry->declaration.type;
ident *ident;
- if (symbol != NULL) {
- ident = new_id_from_str(symbol->string);
- } else {
- if (entry_type->kind == TYPE_COMPOUND_STRUCT) {
- create_compound_type(&entry_type->compound, irtype, &offset,
- &align_all, false, COMPOUND_IS_STRUCT);
- goto finished_member;
- } else if (entry_type->kind == TYPE_COMPOUND_UNION) {
- create_compound_type(&entry_type->compound, irtype, &offset,
- &align_all, false, COMPOUND_IS_UNION);
- goto finished_member;
- } else {
- assert(entry_type->kind == TYPE_BITFIELD);
- }
+ if (symbol == NULL) {
+ /* anonymous bitfield member, skip */
+ if (entry_type->kind == TYPE_BITFIELD)
+ continue;
+ assert(entry_type->kind == TYPE_COMPOUND_STRUCT
+ || entry_type->kind == TYPE_COMPOUND_UNION);
ident = id_unique("anon.%u");
- }
-
- ir_type *base_irtype;
- if (entry_type->kind == TYPE_BITFIELD) {
- base_irtype = get_ir_type(entry_type->bitfield.base_type);
} else {
- base_irtype = get_ir_type(entry_type);
+ ident = new_id_from_str(symbol->string);
}
- size_t entry_alignment = get_type_alignment_bytes(base_irtype);
- size_t misalign = offset % entry_alignment;
+ dbg_info *dbgi = get_dbg_info(&entry->base.source_position);
ir_type *entry_irtype = get_ir_type(entry_type);
ir_entity *entity = new_d_entity(irtype, ident, entry_irtype, dbgi);
- size_t base;
- size_t bits_remainder;
- if (entry_type->kind == TYPE_BITFIELD) {
- size_t size_bits = entry_type->bitfield.bit_size;
- size_t rest_size_bits = (entry_alignment - misalign)*8 - bit_offset;
-
- if (size_bits > rest_size_bits) {
- /* start a new bucket */
- offset += entry_alignment - misalign;
- bit_offset = 0;
-
- base = offset;
- bits_remainder = 0;
- } else {
- /* put into current bucket */
- base = offset - misalign;
- bits_remainder = misalign * 8 + bit_offset;
- }
-
- offset += size_bits / 8;
- bit_offset = bit_offset + (size_bits % 8);
- } else {
- size_t entry_size = get_type_size_bytes(base_irtype);
- if (misalign > 0 || bit_offset > 0)
- offset += entry_alignment - misalign;
-
- base = offset;
- bits_remainder = 0;
- offset += entry_size;
- bit_offset = 0;
- }
-
- if (entry_alignment > align_all) {
- if (entry_alignment % align_all != 0) {
- panic("uneven alignments not supported yet");
- }
- align_all = entry_alignment;
- }
-
- set_entity_offset(entity, base);
+ set_entity_offset(entity, entry->compound_member.offset);
set_entity_offset_bits_remainder(entity,
- (unsigned char) bits_remainder);
- //add_struct_member(irtype, entity);
- entry->declaration.kind = DECLARATION_KIND_COMPOUND_MEMBER;
- assert(entry->compound_member.entity == NULL);
- entry->compound_member.entity = entity;
+ entry->compound_member.bit_offset);
-finished_member:
- if (is_union) {
- size_t entry_size = offset - prev_offset;
- if (entry_size > size) {
- size = entry_size;
- }
- offset = 0;
- bit_offset = 0;
- }
- }
-
- if (!is_union) {
- size = offset;
- }
-
- size_t misalign = offset % align_all;
- if (misalign > 0 || bit_offset > 0) {
- size += align_all - misalign;
+ assert(entry->declaration.kind == DECLARATION_KIND_UNKNOWN);
+ entry->declaration.kind = DECLARATION_KIND_COMPOUND_MEMBER;
+ entry->compound_member.entity = entity;
}
- if (outer_offset != NULL) {
- if (!is_union) {
- *outer_offset = offset;
- } else {
- *outer_offset += size;
- }
-
- if (align_all > *outer_align) {
- if (align_all % *outer_align != 0) {
- panic("uneven alignments not supported yet");
- }
- *outer_align = align_all;
- }
- } else {
- set_type_alignment_bytes(irtype, align_all);
- set_type_size_bytes(irtype, size);
- set_type_state(irtype, layout_fixed);
- }
+ set_type_alignment_bytes(irtype, compound->alignment);
+ set_type_size_bytes(irtype, compound->size);
+ set_type_state(irtype, layout_fixed);
return irtype;
}
constant_folding = constant_folding_old;
- return create_atomic_type(type->akind, type->base.alignment);
+ return create_atomic_type(type->akind);
}
static ir_type *get_ir_type_incomplete(type_t *type)
switch (type->kind) {
case TYPE_COMPOUND_STRUCT:
- return create_compound_type(&type->compound, NULL, NULL, NULL,
- true, COMPOUND_IS_STRUCT);
+ return create_compound_type(&type->compound, true, COMPOUND_IS_STRUCT);
case TYPE_COMPOUND_UNION:
- return create_compound_type(&type->compound, NULL, NULL, NULL,
- true, COMPOUND_IS_UNION);
+ return create_compound_type(&type->compound, true, COMPOUND_IS_UNION);
default:
return get_ir_type(type);
}
switch (type->kind) {
case TYPE_ERROR:
/* Happens while constant folding, when there was an error */
- return create_atomic_type(ATOMIC_TYPE_VOID, 0);
+ return create_atomic_type(ATOMIC_TYPE_VOID);
case TYPE_ATOMIC:
- firm_type = create_atomic_type(type->atomic.akind,
- type->base.alignment);
+ firm_type = create_atomic_type(type->atomic.akind);
break;
case TYPE_COMPLEX:
firm_type = create_complex_type(&type->complex);
firm_type = create_array_type(&type->array);
break;
case TYPE_COMPOUND_STRUCT:
- firm_type = create_compound_type(&type->compound, NULL, NULL, NULL,
- false, COMPOUND_IS_STRUCT);
+ firm_type = create_compound_type(&type->compound, false, COMPOUND_IS_STRUCT);
break;
case TYPE_COMPOUND_UNION:
- firm_type = create_compound_type(&type->compound, NULL, NULL, NULL,
- false, COMPOUND_IS_UNION);
+ firm_type = create_compound_type(&type->compound, false, COMPOUND_IS_UNION);
break;
case TYPE_ENUM:
firm_type = create_enum_type(&type->enumt);
* @param ent the entity
* @param decl the routine declaration
*/
-static void handle_gnu_attributes_ent(ir_entity *irentity, entity_t *entity)
+static void handle_decl_modifiers(ir_entity *irentity, entity_t *entity)
{
assert(is_declaration(entity));
decl_modifiers_t modifiers = entity->declaration.modifiers;
ld_id = create_ld_ident(entity);
set_entity_ld_ident(irentity, ld_id);
- handle_gnu_attributes_ent(irentity, entity);
+ handle_decl_modifiers(irentity, entity);
if (! nested_function) {
/* static inline => local
return NULL;
case bk_gnu_builtin_frame_address: {
expression_t *const expression = call->arguments->expression;
- long val = fold_constant(expression);
- if (val == 0) {
+ bool val = fold_constant_to_bool(expression);
+ if (!val) {
/* the nice case */
return get_irg_frame(current_ir_graph);
} else {
ir_node *offset;
if (is_type_pointer(type)) {
pointer_type_t *pointer_type = &type->pointer;
- offset = get_type_size(pointer_type->points_to);
+ offset = get_type_size_node(pointer_type->points_to);
} else {
assert(is_type_arithmetic(type));
offset = new_Const(get_mode_one(mode));
assert(is_type_pointer(type));
pointer_type_t *const pointer_type = &type->pointer;
type_t *const points_to = skip_typeref(pointer_type->points_to);
- ir_node * elem_size = get_type_size(points_to);
+ ir_node * elem_size = get_type_size_node(points_to);
elem_size = create_conv(dbgi, elem_size, mode);
value = create_conv(dbgi, value, mode);
ir_node *const mul = new_d_Mul(dbgi, value, elem_size, mode);
const pointer_type_t *const ptr_type = &type_left->pointer;
mode = get_ir_mode_arithmetic(expression->base.type);
- ir_node *const elem_size = get_type_size(ptr_type->points_to);
+ ir_node *const elem_size = get_type_size_node(ptr_type->points_to);
ir_node *const conv_size = new_d_Conv(dbgi, elem_size, mode);
ir_node *const sub = new_d_Sub(dbgi, left, right, mode);
ir_node *const no_mem = new_NoMem();
ir_mode *mode = get_ir_mode_arithmetic(type);
if (is_constant_expression(expression->left)) {
- long val = fold_constant(expression->left);
+ bool val = fold_constant_to_bool(expression->left);
expression_kind_t ekind = expression->base.kind;
assert(ekind == EXPR_BINARY_LOGICAL_AND || ekind == EXPR_BINARY_LOGICAL_OR);
if (ekind == EXPR_BINARY_LOGICAL_AND) {
- if (val == 0) {
+ if (!val) {
return new_Const(get_mode_null(mode));
}
} else {
- if (val != 0) {
+ if (val) {
return new_Const(get_mode_one(mode));
}
}
if (is_constant_expression(expression->right)) {
- long const valr = fold_constant(expression->right);
- return valr != 0 ?
+ bool valr = fold_constant_to_bool(expression->right);
+ return valr ?
new_Const(get_mode_one(mode)) :
new_Const(get_mode_null(mode));
}
assert(designator->array_index != NULL);
assert(is_type_array(type));
- long index = fold_constant(array_index);
+ long index = fold_constant_to_int(array_index);
ir_type *arr_type = get_ir_type(type);
ir_type *elem_type = get_array_element_type(arr_type);
long elem_size = get_type_size_bytes(elem_type);
expression_to_firm(expression->tp_expression);
}
- return get_type_size(type);
+ return get_type_size_node(type);
}
static entity_t *get_expression_entity(const expression_t *expression)
return expression->reference.entity;
}
+static unsigned get_cparser_entity_alignment(const entity_t *entity)
+{
+ switch(entity->kind) {
+ DECLARATION_KIND_CASES
+ return entity->declaration.alignment;
+ case ENTITY_STRUCT:
+ case ENTITY_UNION:
+ return entity->compound.alignment;
+ case ENTITY_TYPEDEF:
+ return entity->typedefe.alignment;
+ default:
+ break;
+ }
+ return 0;
+}
+
/**
* Transform an alignof expression into Firm code.
*/
static ir_node *alignof_to_firm(const typeprop_expression_t *expression)
{
- ir_entity *irentity = NULL;
+ unsigned alignment = 0;
const expression_t *tp_expression = expression->tp_expression;
if (tp_expression != NULL) {
entity_t *entity = get_expression_entity(tp_expression);
- if (entity != NULL && is_declaration(entity)) {
- switch (entity->declaration.kind) {
- case DECLARATION_KIND_UNKNOWN:
- panic("unknown entity reference found");
- case DECLARATION_KIND_COMPOUND_MEMBER:
- irentity = entity->compound_member.entity;
- break;
- case DECLARATION_KIND_GLOBAL_VARIABLE:
- case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY:
- irentity = entity->variable.v.entity;
- break;
- case DECLARATION_KIND_PARAMETER_ENTITY:
- irentity = entity->parameter.v.entity;
- break;
- case DECLARATION_KIND_FUNCTION:
- case DECLARATION_KIND_INNER_FUNCTION:
- irentity = entity->function.entity;
- break;
- case DECLARATION_KIND_PARAMETER:
- case DECLARATION_KIND_LOCAL_VARIABLE:
- case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY:
- break;
- }
+ if (entity != NULL) {
+ alignment = get_cparser_entity_alignment(entity);
}
}
- ir_type *irtype;
- if (irentity != NULL) {
- irtype = get_entity_type(irentity);
- } else {
+ if (alignment == 0) {
type_t *type = expression->type;
- irtype = get_ir_type(type);
+ alignment = get_type_alignment(type);
}
- ir_mode *const mode = get_ir_mode_arithmetic(expression->base.type);
- symconst_symbol sym;
- sym.type_p = irtype;
- return new_SymConst(mode, sym, symconst_type_align);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+ ir_mode *mode = get_ir_mode_arithmetic(expression->base.type);
+ tarval *tv = new_tarval_from_long(alignment, mode);
+ return new_d_Const(dbgi, tv);
}
static void init_ir_types(void);
-long fold_constant(const expression_t *expression)
+static tarval *fold_constant_to_tarval(const expression_t *expression)
{
assert(is_type_valid(skip_typeref(expression->base.type)));
panic("couldn't fold constant");
}
+ constant_folding = constant_folding_old;
+
tarval *tv = get_Const_tarval(cnst);
+ return tv;
+}
+
+long fold_constant_to_int(const expression_t *expression)
+{
+ if (expression->kind == EXPR_INVALID)
+ return 0;
+
+ tarval *tv = fold_constant_to_tarval(expression);
if (!tarval_is_long(tv)) {
panic("result of constant folding is not integer");
}
- constant_folding = constant_folding_old;
-
return get_tarval_long(tv);
}
+bool fold_constant_to_bool(const expression_t *expression)
+{
+ if (expression->kind == EXPR_INVALID)
+ return false;
+ tarval *tv = fold_constant_to_tarval(expression);
+ return !tarval_is_null(tv);
+}
+
static ir_node *conditional_to_firm(const conditional_expression_t *expression)
{
dbg_info *const dbgi = get_dbg_info(&expression->base.source_position);
/* first try to fold a constant condition */
if (is_constant_expression(expression->condition)) {
- long val = fold_constant(expression->condition);
+ bool val = fold_constant_to_bool(expression->condition);
if (val) {
expression_t *true_expression = expression->true_expression;
if (true_expression == NULL)
ir_node *const arg_sel =
new_d_simpleSel(dbgi, no_mem, frame, parm_ent);
- ir_node *const cnst = get_type_size(expr->parameter->base.type);
+ type_t *const param_type = expr->parameter->base.type;
+ ir_node *const cnst = get_type_size_node(param_type);
ir_mode *const mode = get_irn_mode(cnst);
ir_node *const c1 = new_Const_long(mode, stack_param_align - 1);
ir_node *const c2 = new_d_Add(dbgi, cnst, c1, mode);
dbg_info *const dbgi = get_dbg_info(&expr->base.source_position);
ir_node *const res = deref_address(dbgi, type, ap);
- ir_node *const cnst = get_type_size(expr->base.type);
+ ir_node *const cnst = get_type_size_node(expr->base.type);
ir_mode *const mode = get_irn_mode(cnst);
ir_node *const c1 = new_Const_long(mode, stack_param_align - 1);
ir_node *const c2 = new_d_Add(dbgi, cnst, c1, mode);
if (is_builtin_expect(expression) && is_Cond(cond)) {
call_argument_t *argument = expression->call.arguments->next;
if (is_constant_expression(argument->expression)) {
- long cnst = fold_constant(argument->expression);
+ bool cnst = fold_constant_to_bool(argument->expression);
cond_jmp_predicate pred;
- if (cnst == 0) {
+ if (cnst == false) {
pred = COND_JMP_PRED_FALSE;
} else {
pred = COND_JMP_PRED_TRUE;
return cond_expr;
}
-
static void create_variable_entity(entity_t *variable,
declaration_kind_t declaration_kind,
ir_type *parent_type)
{
assert(variable->kind == ENTITY_VARIABLE);
type_t *type = skip_typeref(variable->declaration.type);
- type = get_aligned_type(type, variable->variable.alignment);
- ident *const id = new_id_from_str(variable->base.symbol->string);
- ir_type *const irtype = get_ir_type(type);
- dbg_info *const dbgi = get_dbg_info(&variable->base.source_position);
+ ident *const id = new_id_from_str(variable->base.symbol->string);
+ ir_type *const irtype = get_ir_type(type);
+ dbg_info *const dbgi = get_dbg_info(&variable->base.source_position);
+ ir_entity *const irentity = new_d_entity(parent_type, id, irtype, dbgi);
+ unsigned alignment = variable->declaration.alignment;
- ir_entity *const irentity = new_d_entity(parent_type, id, irtype, dbgi);
+ set_entity_alignment(irentity, alignment);
- handle_gnu_attributes_ent(irentity, variable);
+ handle_decl_modifiers(irentity, variable);
variable->declaration.kind = (unsigned char) declaration_kind;
variable->variable.v.entity = irentity;
assert(designator->array_index != NULL);
assert(is_type_array(type));
- long index = fold_constant(array_index);
+ long index = fold_constant_to_int(array_index);
assert(index >= 0);
#ifndef NDEBUG
if (type->array.size_constant) {
ir_entity *irentity = entity->variable.v.entity;
type_t *type = entity->declaration.type;
- type = get_aligned_type(type, entity->variable.alignment);
create_local_initializer(initializer, dbgi, irentity, type);
}
ir_type *el_type = get_ir_type(type->array.element_type);
/* make sure size_node is calculated */
- get_type_size(type);
+ get_type_size_node(type);
ir_node *elems = type->array.size_node;
ir_node *mem = get_store();
ir_node *alloc = new_d_Alloc(dbgi, mem, elems, el_type, stack_alloc);
assert(entity->kind == ENTITY_VARIABLE);
assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN);
- type_t *type = skip_typeref(entity->declaration.type);
- type = get_aligned_type(type, entity->variable.alignment);
-
- ir_type *const var_type = entity->variable.thread_local ?
+ type_t *type = skip_typeref(entity->declaration.type);
+ ir_type *const var_type = entity->variable.thread_local ?
get_tls_type() : get_glob_type();
- ir_type *const irtype = get_ir_type(type);
- dbg_info *const dbgi = get_dbg_info(&entity->base.source_position);
+ ir_type *const irtype = get_ir_type(type);
+ dbg_info *const dbgi = get_dbg_info(&entity->base.source_position);
size_t l = strlen(entity->base.symbol->string);
char buf[l + sizeof(".%u")];
if (entity->base.symbol == NULL)
return;
+ // no need to emit code in dead blocks
+ if (entity->declaration.storage_class != STORAGE_CLASS_STATIC
+ && get_cur_block() == NULL)
+ return;
+
switch ((declaration_kind_t) entity->declaration.kind) {
case DECLARATION_KIND_LOCAL_VARIABLE:
case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY:
/* shortcut for while(true) */
if (is_constant_expression(statement->condition)
- && fold_constant(statement->condition) != 0) {
+ && fold_constant_to_bool(statement->condition) != 0) {
set_cur_block(header_block);
ir_node *header_jmp = new_Jmp();
add_immBlock_pred(body_block, header_jmp);
* @param irg the IR-graph
* @param dec_modifiers additional modifiers
*/
-static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_modifiers)
+static void handle_decl_modifier_irg(ir_graph_ptr irg,
+ decl_modifiers_t decl_modifiers)
{
if (decl_modifiers & DM_RETURNS_TWICE) {
/* TRUE if the declaration includes __attribute__((returns_twice)) */
projects / cparser / blobdiff