#include "type_t.h"
#include "ast_t.h"
#include "parser.h"
+#include "diagnostic.h"
#include "lang_features.h"
#include "driver/firm_opt.h"
#include "driver/firm_cmdline.h"
ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
{
- (void) pos;
-#if 0
- const declaration_t *declaration = & value_numbers[pos]->declaration;
+ const declaration_t *declaration = get_irg_loc_description(irg, pos);
- print_warning_prefix(declaration->source_position);
- fprintf(stderr, "variable '%s' might be used uninitialized\n",
- declaration->symbol->string);
-#endif
- fprintf(stderr, "Some variable might be used uninitialized\n");
+ warningf(declaration->source_position, "variable '%#T' might be used uninitialized",
+ declaration->type, declaration->symbol);
return new_r_Unknown(irg, mode);
}
static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type)
{
ir_mode *res = NULL;
- if ((unsigned)atomic_type->atype < (unsigned)ATOMIC_TYPE_LAST)
- res = _atomic_modes[(unsigned)atomic_type->atype];
+ if ((unsigned)atomic_type->akind < (unsigned)ATOMIC_TYPE_LAST)
+ res = _atomic_modes[(unsigned)atomic_type->akind];
if (res == NULL)
panic("Encountered unknown atomic type");
return res;
static unsigned get_atomic_type_size(const atomic_type_t *type)
{
- switch(type->atype) {
+ switch(type->akind) {
case ATOMIC_TYPE_CHAR:
case ATOMIC_TYPE_SCHAR:
case ATOMIC_TYPE_UCHAR:
type = skip_typeref(type);
switch(type->kind) {
+ case TYPE_ERROR:
+ panic("error type occured");
case TYPE_ATOMIC:
return get_atomic_type_size(&type->atomic);
case TYPE_ENUM:
static ir_type *create_atomic_type(const atomic_type_t *type)
{
+ dbg_info *dbgi = get_dbg_info(&type->type.source_position);
ir_mode *mode = get_atomic_mode(type);
ident *id = get_mode_ident(mode);
- ir_type *irtype = new_type_primitive(id, mode);
+ ir_type *irtype = new_d_type_primitive(id, mode, dbgi);
- if(type->atype == ATOMIC_TYPE_LONG_DOUBLE) {
+ if(type->akind == ATOMIC_TYPE_LONG_DOUBLE
+ || type->akind == ATOMIC_TYPE_DOUBLE) {
set_type_alignment_bytes(irtype, 4);
}
ident *id = unique_ident("functiontype");
int n_parameters = count_parameters(function_type);
int n_results = return_type == type_void ? 0 : 1;
- ir_type *irtype = new_type_method(id, n_parameters, n_results);
+ dbg_info *dbgi = get_dbg_info(&function_type->type.source_position);
+ ir_type *irtype = new_d_type_method(id, n_parameters, n_results, dbgi);
if(return_type != type_void) {
ir_type *restype = get_ir_type(return_type);
* again (might be a struct). We therefore first create a void* pointer
* and then set the real points_to type
*/
- ir_type *ir_type = new_type_pointer(unique_ident("pointer"),
- ir_type_void, mode_P_data);
+ dbg_info *dbgi = get_dbg_info(&type->type.source_position);
+ ir_type *ir_type = new_d_type_pointer(unique_ident("pointer"),
+ ir_type_void, mode_P_data, dbgi);
type->type.firm_type = ir_type;
ir_points_to = get_ir_type(points_to);
ir_type *ir_element_type = get_ir_type(element_type);
ident *id = unique_ident("array");
- ir_type *ir_type = new_type_array(id, 1, ir_element_type);
+ dbg_info *dbgi = get_dbg_info(&type->type.source_position);
+ ir_type *ir_type = new_d_type_array(id, 1, ir_element_type, dbgi);
+
+ const int align = get_type_alignment_bytes(ir_element_type);
+ set_type_alignment_bytes(ir_type, align);
if(type->size != NULL) {
int n_elements = fold_constant(type->size);
set_array_bounds_int(ir_type, 0, 0, n_elements);
size_t elemsize = get_type_size_bytes(ir_element_type);
- int align = get_type_alignment_bytes(ir_element_type);
if(elemsize % align > 0) {
elemsize += align - (elemsize % align);
}
set_type_size_bytes(ir_type, n_elements * elemsize);
- set_type_alignment_bytes(ir_type, align);
- set_type_state(ir_type, layout_fixed);
} else {
set_array_lower_bound_int(ir_type, 0, 0);
}
+ set_type_state(ir_type, layout_fixed);
return ir_type;
}
-#define INVALID_TYPE ((ir_type_ptr)-1)
+/**
+ * Return the signed integer type of size bits.
+ *
+ * @param size the size
+ */
+static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp,
+ unsigned size)
+{
+ static ir_mode *s_modes[64 + 1] = {NULL, };
+ ir_type *res;
+ ir_mode *mode;
+
+ if (size <= 0 || size > 64)
+ return NULL;
+
+ mode = s_modes[size];
+ if (mode == NULL) {
+ char name[32];
+
+ snprintf(name, sizeof(name), "bf_I%u", size);
+ mode = new_ir_mode(name, irms_int_number, size, 1, irma_twos_complement,
+ size <= 32 ? 32 : size );
+ s_modes[size] = mode;
+ }
+
+ char name[32];
+ snprintf(name, sizeof(name), "I%u", size);
+ ident *id = new_id_from_str(name);
+ dbg_info *dbgi = get_dbg_info(&builtin_source_position);
+ res = new_d_type_primitive(mangle_u(get_type_ident(base_tp), id), mode, dbgi);
+ set_primitive_base_type(res, base_tp);
+
+ return res;
+}
-static ir_type *create_struct_type(compound_type_t *type)
+/**
+ * Return the unsigned integer type of size bits.
+ *
+ * @param size the size
+ */
+static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp,
+ unsigned size)
{
- symbol_t *symbol = type->declaration->symbol;
- ident *id;
- if(symbol != NULL) {
- id = unique_ident(symbol->string);
+ static ir_mode *u_modes[64 + 1] = {NULL, };
+ ir_type *res;
+ ir_mode *mode;
+
+ if (size <= 0 || size > 64)
+ return NULL;
+
+ mode = u_modes[size];
+ if (mode == NULL) {
+ char name[32];
+
+ snprintf(name, sizeof(name), "bf_U%u", size);
+ mode = new_ir_mode(name, irms_int_number, size, 0, irma_twos_complement,
+ size <= 32 ? 32 : size );
+ u_modes[size] = mode;
+ }
+
+ char name[32];
+
+ snprintf(name, sizeof(name), "U%u", size);
+ ident *id = new_id_from_str(name);
+ dbg_info *dbgi = get_dbg_info(&builtin_source_position);
+ res = new_d_type_primitive(mangle_u(get_type_ident(base_tp), id), mode, dbgi);
+ set_primitive_base_type(res, base_tp);
+
+ return res;
+}
+
+static ir_type *create_bitfield_type(bitfield_type_t *const type)
+{
+ type_t *base = skip_typeref(type->base);
+ assert(base->kind == TYPE_ATOMIC);
+ ir_type *irbase = get_ir_type(base);
+
+ unsigned size = fold_constant(type->size);
+
+ assert(!is_type_float(base));
+ if(is_type_signed(base)) {
+ return get_signed_int_type_for_bit_size(irbase, size);
} else {
- id = unique_ident("__anonymous_struct");
+ return get_unsigned_int_type_for_bit_size(irbase, size);
}
- ir_type *irtype = new_type_struct(id);
+}
- type->type.firm_type = irtype;
+#define INVALID_TYPE ((ir_type_ptr)-1)
+
+static ir_type *create_union_type(compound_type_t *type, ir_type *irtype,
+ size_t *outer_offset, size_t *outer_align);
+
+static ir_type *create_struct_type(compound_type_t *type, ir_type *irtype,
+ size_t *outer_offset, size_t *outer_align)
+{
+ declaration_t *declaration = type->declaration;
+ if(declaration->v.irtype != NULL) {
+ return declaration->v.irtype;
+ }
size_t align_all = 1;
size_t offset = 0;
size_t bit_offset = 0;
- declaration_t *entry = type->declaration->context.declarations;
+ if(irtype == NULL) {
+ symbol_t *symbol = declaration->symbol;
+ ident *id;
+ if(symbol != NULL) {
+ id = unique_ident(symbol->string);
+ } else {
+ id = unique_ident("__anonymous_struct");
+ }
+ dbg_info *dbgi = get_dbg_info(&type->type.source_position);
+
+ irtype = new_d_type_struct(id, dbgi);
+
+ declaration->v.irtype = irtype;
+ type->type.firm_type = irtype;
+ } else {
+ offset = *outer_offset;
+ align_all = *outer_align;
+ }
+
+ declaration_t *entry = declaration->scope.declarations;
for( ; entry != NULL; entry = entry->next) {
if(entry->namespc != NAMESPACE_NORMAL)
continue;
- type_t *entry_type = skip_typeref(entry->type);
+ symbol_t *symbol = entry->symbol;
+ type_t *entry_type = skip_typeref(entry->type);
+ dbg_info *dbgi = get_dbg_info(&entry->source_position);
+ ident *ident;
+ if(symbol != NULL) {
+ ident = new_id_from_str(symbol->string);
+ } else {
+ if(entry_type->kind == TYPE_COMPOUND_STRUCT) {
+ create_struct_type(&entry_type->compound, irtype, &offset,
+ &align_all);
+ continue;
+ } else if(entry_type->kind == TYPE_COMPOUND_UNION) {
+ create_union_type(&entry_type->compound, irtype, &offset,
+ &align_all);
+ continue;
+ } else {
+ assert(entry_type->kind == TYPE_BITFIELD);
+ }
+ ident = unique_ident("anon");
+ }
ir_type *base_irtype;
if(entry_type->kind == TYPE_BITFIELD) {
size_t entry_alignment = get_type_alignment_bytes(base_irtype);
size_t misalign = offset % entry_alignment;
- dbg_info *dbgi = get_dbg_info(&entry->source_position);
- ir_entity *entity = NULL;
- if(entry->symbol != NULL) {
- ident *ident = new_id_from_str(entry->symbol->string);
- ir_type *entry_irtype = get_ir_type(entry_type);
-
- entity = new_d_entity(irtype, ident, entry_irtype, dbgi);
- } else {
- /* only bitfields are allowed to be anonymous */
- assert(entry_type->kind == TYPE_BITFIELD);
- }
+ 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;
bit_offset = bit_offset + (size_bits % 8);
} else {
size_t entry_size = get_type_size_bytes(base_irtype);
- if(misalign > 0)
- offset += entry_size - misalign;
+ if(misalign > 0 || bit_offset > 0)
+ offset += entry_alignment - misalign;
base = offset;
bits_remainder = 0;
align_all = entry_alignment;
}
- if(entity != NULL) {
- set_entity_offset(entity, base);
- set_entity_offset_bits_remainder(entity,
- (unsigned char) bits_remainder);
- add_struct_member(irtype, entity);
- entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER;
- entry->v.entity = entity;
- }
+ set_entity_offset(entity, base);
+ set_entity_offset_bits_remainder(entity,
+ (unsigned char) bits_remainder);
+ //add_struct_member(irtype, entity);
+ entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER;
+ assert(entry->v.entity == NULL);
+ entry->v.entity = entity;
}
size_t misalign = offset % align_all;
- if(misalign > 0) {
+ if(misalign > 0 || bit_offset > 0) {
offset += align_all - misalign;
}
- set_type_alignment_bytes(irtype, align_all);
- set_type_size_bytes(irtype, offset);
- set_type_state(irtype, layout_fixed);
+
+ if(outer_offset != NULL) {
+ *outer_offset = offset;
+ *outer_align = align_all;
+ } else {
+ set_type_alignment_bytes(irtype, align_all);
+ set_type_size_bytes(irtype, offset);
+ set_type_state(irtype, layout_fixed);
+ }
return irtype;
}
-static ir_type *create_union_type(compound_type_t *type)
+static ir_type *create_union_type(compound_type_t *type, ir_type *irtype,
+ size_t *outer_offset, size_t *outer_align)
{
declaration_t *declaration = type->declaration;
- symbol_t *symbol = declaration->symbol;
- ident *id;
- if(symbol != NULL) {
- id = unique_ident(symbol->string);
+ if(declaration->v.irtype != NULL) {
+ return declaration->v.irtype;
+ }
+
+ size_t offset = 0;
+ size_t align_all = 1;
+ size_t size = 0;
+
+ if(irtype == NULL) {
+ symbol_t *symbol = declaration->symbol;
+ ident *id;
+ if(symbol != NULL) {
+ id = unique_ident(symbol->string);
+ } else {
+ id = unique_ident("__anonymous_union");
+ }
+ dbg_info *dbgi = get_dbg_info(&type->type.source_position);
+
+ irtype = new_d_type_union(id, dbgi);
} else {
- id = unique_ident("__anonymous_union");
+ offset = *outer_offset;
+ align_all = *outer_align;
}
- ir_type *irtype = new_type_union(id);
type->type.firm_type = irtype;
- int align_all = 1;
- int size = 0;
- declaration_t *entry = declaration->context.declarations;
+ declaration_t *entry = declaration->scope.declarations;
for( ; entry != NULL; entry = entry->next) {
if(entry->namespc != NAMESPACE_NORMAL)
continue;
- ident *ident = new_id_from_str(entry->symbol->string);
- ir_type *entry_ir_type = get_ir_type(entry->type);
+ type_t *entry_type = skip_typeref(entry->type);
+ ir_type *entry_ir_type = get_ir_type(entry_type);
- int entry_size = get_type_size_bytes(entry_ir_type);
- int entry_alignment = get_type_alignment_bytes(entry_ir_type);
+ ident *ident;
+ if(entry->symbol != NULL) {
+ ident = new_id_from_str(entry->symbol->string);
+ } else {
+ size_t offs = offset;
+ if(entry_type->kind == TYPE_COMPOUND_STRUCT) {
+ create_struct_type(&entry_type->compound, irtype, &offs,
+ &align_all);
+ continue;
+ } else if(entry_type->kind == TYPE_COMPOUND_UNION) {
+ create_union_type(&entry_type->compound, irtype, &offs,
+ &align_all);
+ continue;
+ } else {
+ panic("anonymous union member must be struct or union");
+ }
+ size_t entry_size = offs - offset;
+ if(entry_size > size) {
+ size = entry_size;
+ }
+ ident = unique_ident("anon");
+ }
+
+ size_t entry_size = get_type_size_bytes(entry_ir_type);
+ size_t entry_alignment = get_type_alignment_bytes(entry_ir_type);
dbg_info *const dbgi = get_dbg_info(&entry->source_position);
ir_entity *const entity = new_d_entity(irtype, ident, entry_ir_type,
dbgi);
- add_union_member(irtype, entity);
+ //add_union_member(irtype, entity);
set_entity_offset(entity, 0);
entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER;
+ assert(entry->v.entity == NULL);
entry->v.entity = entity;
if(entry_size > size) {
}
}
- set_type_alignment_bytes(irtype, align_all);
- set_type_size_bytes(irtype, size);
- set_type_state(irtype, layout_fixed);
+ if(outer_offset != NULL) {
+ assert(*outer_offset == offset);
+
+ size_t misalign = offset % align_all;
+ if (misalign != 0)
+ size += align_all - misalign;
+ *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);
+ declaration->v.irtype = irtype;
+ }
return irtype;
}
return ir_type_int;
}
-/**
- * Return the signed integer type of size bits.
- *
- * @param size the size
- */
-static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp,
- unsigned size)
-{
- static ir_mode *s_modes[64 + 1] = {NULL, };
- ir_type *res;
- ir_mode *mode;
-
- if (size <= 0 || size > 64)
- return NULL;
-
- mode = s_modes[size];
- if (mode == NULL) {
- char name[32];
-
- snprintf(name, sizeof(name), "bf_I%u", size);
- mode = new_ir_mode(name, irms_int_number, size, 1, irma_twos_complement,
- size <= 32 ? 32 : size );
- s_modes[size] = mode;
- }
-
- char name[32];
- snprintf(name, sizeof(name), "I%u", size);
- ident *id = new_id_from_str(name);
- res = new_type_primitive(mangle_u(get_type_ident(base_tp), id), mode);
- set_primitive_base_type(res, base_tp);
-
- return res;
-}
-
-/**
- * Return the unsigned integer type of size bits.
- *
- * @param size the size
- */
-static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp,
- unsigned size)
-{
- static ir_mode *u_modes[64 + 1] = {NULL, };
- ir_type *res;
- ir_mode *mode;
-
- if (size <= 0 || size > 64)
- return NULL;
-
- mode = u_modes[size];
- if (mode == NULL) {
- char name[32];
-
- snprintf(name, sizeof(name), "bf_U%u", size);
- mode = new_ir_mode(name, irms_int_number, size, 0, irma_twos_complement,
- size <= 32 ? 32 : size );
- u_modes[size] = mode;
- }
-
- char name[32];
-
- snprintf(name, sizeof(name), "U%u", size);
- ident *id = new_id_from_str(name);
- res = new_type_primitive(mangle_u(get_type_ident(base_tp), id), mode);
- set_primitive_base_type(res, base_tp);
-
- return res;
-}
-
-static ir_type *create_bitfield_type(bitfield_type_t *const type)
-{
- type_t *base = skip_typeref(type->base);
- assert(base->kind == TYPE_ATOMIC);
-
- ir_type *irbase = get_ir_type(base);
-
- unsigned size = fold_constant(type->size);
-
- assert(!is_type_floating(base));
- if(is_type_signed(base)) {
- return get_signed_int_type_for_bit_size(irbase, size);
- } else {
- return get_unsigned_int_type_for_bit_size(irbase, size);
- }
-}
-
static ir_type *get_ir_type(type_t *type)
{
assert(type != NULL);
ir_type *firm_type = NULL;
switch(type->kind) {
+ case TYPE_ERROR:
+ panic("error type occured");
case TYPE_ATOMIC:
firm_type = create_atomic_type(&type->atomic);
break;
firm_type = create_array_type(&type->array);
break;
case TYPE_COMPOUND_STRUCT:
- firm_type = create_struct_type(&type->compound);
+ firm_type = create_struct_type(&type->compound, NULL, NULL, NULL);
break;
case TYPE_COMPOUND_UNION:
- firm_type = create_union_type(&type->compound);
+ firm_type = create_union_type(&type->compound, NULL, NULL, NULL);
break;
case TYPE_ENUM:
firm_type = create_enum_type(&type->enumt);
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);
+ dbg_info *dbgi = get_dbg_info(&cnst->base.source_position);
+ ir_mode *mode = get_ir_mode(cnst->base.type);
char buf[128];
tarval *tv;
return new_d_Const(dbgi, mode, tv);
}
+static ir_node *char_const_to_firm(const const_expression_t *cnst)
+{
+ dbg_info *dbgi = get_dbg_info(&cnst->base.source_position);
+ ir_mode *mode = get_ir_mode(cnst->base.type);
+
+ long long int v = 0;
+ for (size_t i = 0; i < cnst->v.chars.size; ++i) {
+ v = (v << 8) | ((unsigned char)cnst->v.chars.begin[i]);
+ }
+ char buf[128];
+ size_t len = snprintf(buf, sizeof(buf), "%lld", v);
+ tarval *tv = new_tarval_from_str(buf, len, mode);
+
+ return new_d_Const(dbgi, mode, tv);
+}
+
static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode,
ir_entity *entity)
{
static ir_node *string_to_firm(const source_position_t *const src_pos,
const char *const id_prefix,
- const char *const string)
+ const string_t *const value)
{
ir_type *const global_type = get_glob_type();
- ir_type *const type = new_type_array(unique_ident("strtype"), 1,
- ir_type_const_char);
+ dbg_info *const dbgi = get_dbg_info(src_pos);
+ ir_type *const type = new_d_type_array(unique_ident("strtype"), 1,
+ ir_type_const_char, dbgi);
ident *const id = unique_ident(id_prefix);
- dbg_info *const dbgi = get_dbg_info(src_pos);
ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
set_entity_ld_ident(entity, id);
set_entity_variability(entity, variability_constant);
ir_type *const elem_type = ir_type_const_char;
ir_mode *const mode = get_type_mode(elem_type);
- const size_t slen = strlen(string) + 1;
+ const char* const string = value->begin;
+ const size_t slen = value->size;
set_array_lower_bound_int(type, 0, 0);
set_array_upper_bound_int(type, 0, slen);
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 string_to_firm(&literal->base.source_position, "Lstr",
+ &literal->value);
}
static ir_node *wide_string_literal_to_firm(
{
ir_type *const global_type = get_glob_type();
ir_type *const elem_type = ir_type_wchar_t;
- ir_type *const type = new_type_array(unique_ident("strtype"), 1,
- elem_type);
+ dbg_info *const dbgi = get_dbg_info(&literal->base.source_position);
+ ir_type *const type = new_d_type_array(unique_ident("strtype"), 1,
+ elem_type, dbgi);
ident *const id = unique_ident("Lstr");
- dbg_info *const dbgi = get_dbg_info(&literal->expression.source_position);
ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
set_entity_ld_ident(entity, id);
set_entity_variability(entity, variability_constant);
static ir_node *deref_address(ir_type *const irtype, ir_node *const addr,
dbg_info *const dbgi)
{
- if(is_compound_type(irtype) || is_Array_type(irtype)) {
+ if (is_compound_type(irtype) ||
+ is_Method_type(irtype) ||
+ is_Array_type(irtype)) {
return addr;
}
static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
{
- dbg_info *dbgi = get_dbg_info(&ref->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&ref->base.source_position);
declaration_t *declaration = ref->declaration;
type_t *type = skip_typeref(declaration->type);
static ir_node *reference_addr(const reference_expression_t *ref)
{
- dbg_info *dbgi = get_dbg_info(&ref->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&ref->base.source_position);
declaration_t *declaration = ref->declaration;
switch((declaration_kind_t) declaration->declaration_kind) {
case DECLARATION_KIND_LOCAL_VARIABLE:
panic("local variable without entity has no address");
case DECLARATION_KIND_FUNCTION: {
- type_t *const type = skip_typeref(ref->expression.datatype);
+ type_t *const type = skip_typeref(ref->base.type);
ir_mode *const mode = get_ir_mode(type);
return create_symconst(dbgi, mode, declaration->v.entity);
}
static ir_node *process_builtin_call(const call_expression_t *call)
{
- dbg_info *dbgi = get_dbg_info(&call->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&call->base.source_position);
assert(call->function->kind == EXPR_BUILTIN_SYMBOL);
builtin_symbol_expression_t *builtin = &call->function->builtin_symbol;
- type_t *type = skip_typeref(builtin->expression.datatype);
+ type_t *type = skip_typeref(builtin->base.type);
assert(is_type_pointer(type));
type_t *function_type = skip_typeref(type->pointer.points_to);
}
ir_node *callee = expression_to_firm(function);
- type_t *type = skip_typeref(function->base.datatype);
+ type_t *type = skip_typeref(function->base.type);
assert(is_type_pointer(type));
pointer_type_t *pointer_type = &type->pointer;
type_t *points_to = skip_typeref(pointer_type->points_to);
++n_parameters;
}
- dbg_info *dbgi = get_dbg_info(&call->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&call->base.source_position);
ir_type *ir_method_type = get_ir_type((type_t*) function_type);
ir_type *new_method_type = NULL;
/* we need to construct a new method type matching the call
* arguments... */
int n_res = get_method_n_ress(ir_method_type);
- new_method_type = new_type_method(unique_ident("calltype"),
- n_parameters, n_res);
+ dbg_info *dbgi = get_dbg_info(&call->base.source_position);
+ new_method_type = new_d_type_method(unique_ident("calltype"),
+ n_parameters, n_res, dbgi);
set_method_calling_convention(new_method_type,
get_method_calling_convention(ir_method_type));
set_method_additional_properties(new_method_type,
in[n] = arg_node;
if(new_method_type != NULL) {
- ir_type *irtype = get_ir_type(expression->base.datatype);
+ ir_type *irtype = get_ir_type(expression->base.type);
set_method_param_type(new_method_type, n, irtype);
}
{
value = do_strict_conv(dbgi, value);
- ir_node *memory = get_store();
+ ir_node *memory = get_store();
if(is_type_scalar(type)) {
ir_node *store = new_d_Store(dbgi, memory, addr, value);
}
}
+static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size)
+{
+ tarval *all_one = get_mode_all_one(mode);
+ int mode_size = get_mode_size_bits(mode);
+
+ assert(offset >= 0 && size >= 0);
+ assert(offset + size <= mode_size);
+ if(size == mode_size) {
+ return all_one;
+ }
+
+ long shiftr = get_mode_size_bits(mode) - size;
+ long shiftl = offset;
+ tarval *tv_shiftr = new_tarval_from_long(shiftr, mode_uint);
+ tarval *tv_shiftl = new_tarval_from_long(shiftl, mode_uint);
+ tarval *mask0 = tarval_shr(all_one, tv_shiftr);
+ tarval *mask1 = tarval_shl(mask0, tv_shiftl);
+
+ return mask1;
+}
+
+static void bitfield_store_to_firm(const unary_expression_t *expression,
+ ir_node *value)
+{
+ expression_t *select = expression->value;
+ assert(select->kind == EXPR_SELECT);
+ type_t *type = select->base.type;
+ assert(type->kind == TYPE_BITFIELD);
+ ir_mode *mode = get_ir_mode(type->bitfield.base);
+ ir_node *addr = expression_to_addr(select);
+
+ assert(get_irn_mode(value) == mode);
+
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+
+ /* kill upper bits of value and shift to right position */
+ ir_entity *entity = select->select.compound_entry->v.entity;
+ int bitoffset = get_entity_offset_bits_remainder(entity);
+ ir_type *entity_type = get_entity_type(entity);
+ int bitsize = get_mode_size_bits(get_type_mode(entity_type));
+
+ tarval *mask = create_bitfield_mask(mode, 0, bitsize);
+ ir_node *mask_node = new_d_Const(dbgi, mode, mask);
+ ir_node *value_masked = new_d_And(dbgi, value, mask_node, mode);
+ tarval *shiftl = new_tarval_from_long(bitoffset, mode_uint);
+ ir_node *shiftcount = new_d_Const(dbgi, mode_uint, shiftl);
+ ir_node *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode);
+
+ /* load current value */
+ ir_node *mem = get_store();
+ ir_node *load = new_d_Load(dbgi, mem, addr, mode);
+ ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
+ ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res);
+ tarval *shift_mask = create_bitfield_mask(mode, bitoffset, bitsize);
+ tarval *inv_mask = tarval_not(shift_mask);
+ ir_node *inv_mask_node = new_d_Const(dbgi, mode, inv_mask);
+ ir_node *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode);
+
+ /* construct new value and store */
+ ir_node *new_val = new_d_Or(dbgi, load_res_masked, value_maskshift, mode);
+ ir_node *store = new_d_Store(dbgi, load_mem, addr, new_val);
+ ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
+ set_store(store_mem);
+}
+
static void set_value_for_expression(const expression_t *expression,
ir_node *value)
{
}
}
+ if(expression->kind == EXPR_UNARY_BITFIELD_EXTRACT) {
+ bitfield_store_to_firm(&expression->unary, value);
+ return;
+ }
+
ir_node *addr = expression_to_addr(expression);
- type_t *type = skip_typeref(expression->base.datatype);
+ type_t *type = skip_typeref(expression->base.type);
assign_value(dbgi, addr, type, value);
}
static ir_node *create_incdec(const unary_expression_t *expression)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
- type_t *type = skip_typeref(expression->expression.datatype);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+ type_t *type = skip_typeref(expression->base.type);
ir_mode *mode = get_ir_mode(type);
expression_t *value = expression->value;
offset = new_Const(mode, get_mode_one(mode));
}
- switch(expression->expression.kind) {
+ switch(expression->base.kind) {
case EXPR_UNARY_POSTFIX_INCREMENT: {
ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode);
set_value_for_expression(value, new_value);
return declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE;
}
-static pn_Cmp get_pnc(const expression_kind_t kind)
+static pn_Cmp get_pnc(const expression_kind_t kind, type_t *const type)
{
switch(kind) {
case EXPR_BINARY_EQUAL: return pn_Cmp_Eq;
case EXPR_BINARY_ISLESSGREATER: return pn_Cmp_Lg;
- case EXPR_BINARY_NOTEQUAL: return pn_Cmp_Ne;
+ case EXPR_BINARY_NOTEQUAL:
+ return is_type_float(skip_typeref(type)) ? pn_Cmp_Ne : pn_Cmp_Lg;
case EXPR_BINARY_ISLESS:
case EXPR_BINARY_LESS: return pn_Cmp_Lt;
case EXPR_BINARY_ISLESSEQUAL:
ir_node *res = NULL;
pn_Cmp cmp_val;
- cmp_val = get_pnc(expression->expression.kind);
+ cmp_val = get_pnc(expression->base.kind, op1->base.type);
if (is_local_variable(op1) && is_local_variable(op2)) {
var = op1->reference.declaration;
}
}
+static ir_node *bitfield_extract_to_firm(const unary_expression_t *expression)
+{
+ expression_t *select = expression->value;
+ assert(select->kind == EXPR_SELECT);
+
+ type_t *type = select->base.type;
+ assert(type->kind == TYPE_BITFIELD);
+ ir_mode *mode = get_ir_mode(type->bitfield.base);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+ ir_node *addr = expression_to_addr(select);
+ ir_node *mem = get_store();
+ ir_node *load = new_d_Load(dbgi, mem, addr, mode);
+ ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
+ ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res);
+
+ load_res = create_conv(dbgi, load_res, mode_int);
+
+ set_store(load_mem);
+
+ /* kill upper bits */
+ ir_entity *entity = select->select.compound_entry->v.entity;
+ int bitoffset = get_entity_offset_bits_remainder(entity);
+ ir_type *entity_type = get_entity_type(entity);
+ int bitsize = get_mode_size_bits(get_type_mode(entity_type));
+ long shift_bitsl = machine_size - bitoffset - bitsize;
+ assert(shift_bitsl >= 0);
+ tarval *tvl = new_tarval_from_long(shift_bitsl, mode_uint);
+ ir_node *countl = new_d_Const(dbgi, mode_uint, tvl);
+ ir_node *shiftl = new_d_Shl(dbgi, load_res, countl, mode_int);
+
+ long shift_bitsr = bitoffset + shift_bitsl;
+ assert(shift_bitsr <= (long) machine_size);
+ tarval *tvr = new_tarval_from_long(shift_bitsr, mode_uint);
+ ir_node *countr = new_d_Const(dbgi, mode_uint, tvr);
+ ir_node *shiftr;
+ if(mode_is_signed(mode)) {
+ shiftr = new_d_Shrs(dbgi, shiftl, countr, mode_int);
+ } else {
+ shiftr = new_d_Shr(dbgi, shiftl, countr, mode_int);
+ }
+
+ return create_conv(dbgi, shiftr, mode);
+}
+
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 = skip_typeref(expression->expression.datatype);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+ type_t *type = skip_typeref(expression->base.type);
- if(expression->expression.kind == EXPR_UNARY_TAKE_ADDRESS)
+ if(expression->base.kind == EXPR_UNARY_TAKE_ADDRESS)
return expression_to_addr(expression->value);
const expression_t *value = expression->value;
- switch(expression->expression.kind) {
+ switch(expression->base.kind) {
case EXPR_UNARY_NEGATE: {
ir_node *value_node = expression_to_firm(value);
ir_mode *mode = get_ir_mode(type);
}
case EXPR_UNARY_DEREFERENCE: {
ir_node *value_node = expression_to_firm(value);
- type_t *value_type = skip_typeref(value->base.datatype);
+ type_t *value_type = skip_typeref(value->base.type);
ir_type *irtype = get_ir_type(value_type);
assert(is_Pointer_type(irtype));
ir_type *points_to = get_pointer_points_to_type(irtype);
return create_incdec(expression);
case EXPR_UNARY_CAST: {
ir_node *value_node = expression_to_firm(value);
- ir_mode *mode = get_ir_mode(type);
- ir_node *node = create_conv(dbgi, value_node, mode);
- node = do_strict_conv(dbgi, node);
- return node;
+ if(is_type_scalar(type)) {
+ ir_mode *mode = get_ir_mode(type);
+ ir_node *node = create_conv(dbgi, value_node, mode);
+ node = do_strict_conv(dbgi, node);
+ return node;
+ } else {
+ return value_node;
+ }
}
case EXPR_UNARY_CAST_IMPLICIT: {
ir_node *value_node = expression_to_firm(value);
- ir_mode *mode = get_ir_mode(type);
- return create_conv(dbgi, value_node, mode);
+ if(is_type_scalar(type)) {
+ ir_mode *mode = get_ir_mode(type);
+ return create_conv(dbgi, value_node, mode);
+ } else {
+ return value_node;
+ }
}
case EXPR_UNARY_ASSUME:
if(firm_opt.confirm)
return handle_assume(dbgi, value);
else
return NULL;
+ case EXPR_UNARY_BITFIELD_EXTRACT:
+ return bitfield_extract_to_firm(expression);
default:
break;
static ir_node *create_lazy_op(const binary_expression_t *expression)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
- type_t *type = expression->expression.datatype;
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+ type_t *type = expression->base.type;
ir_mode *mode = get_ir_mode(type);
if(is_constant_expression(expression->left)) {
long val = fold_constant(expression->left);
- expression_kind_t ekind = expression->expression.kind;
+ expression_kind_t ekind = expression->base.kind;
if((ekind == EXPR_BINARY_LOGICAL_AND && val != 0)
|| (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) {
return expression_to_firm(expression->right);
static ir_node *create_arithmetic_binop(const binary_expression_t *expression,
create_arithmetic_func func)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
ir_node *left = expression_to_firm(expression->left);
ir_node *right = expression_to_firm(expression->right);
- type_t *type = expression->right->base.datatype;
+ type_t *type = expression->right->base.type;
/* 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);
static ir_node *create_arithmetic_assign_binop(
const binary_expression_t *expression, create_arithmetic_func func)
{
- dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position);
- type_t *const type = skip_typeref(expression->expression.datatype);
+ dbg_info *const dbgi = get_dbg_info(&expression->base.source_position);
+ type_t *const type = skip_typeref(expression->base.type);
ir_node *value;
if (is_type_pointer(type)) {
static ir_node *create_add(const binary_expression_t *expression)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
ir_node *left = expression_to_firm(expression->left);
ir_node *right = expression_to_firm(expression->right);
- type_t *type = expression->expression.datatype;
+ type_t *type = expression->base.type;
expression_t *expr_left = expression->left;
expression_t *expr_right = expression->right;
- type_t *type_left = skip_typeref(expr_left->base.datatype);
- type_t *type_right = skip_typeref(expr_right->base.datatype);
+ type_t *type_left = skip_typeref(expr_left->base.type);
+ type_t *type_right = skip_typeref(expr_right->base.type);
if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
ir_mode *const mode = get_ir_mode(type);
static ir_node *create_sub(const binary_expression_t *expression)
{
- dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *const dbgi = get_dbg_info(&expression->base.source_position);
expression_t *const expr_left = expression->left;
expression_t *const expr_right = expression->right;
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->base.datatype);
- type_t *const type_right = skip_typeref(expr_right->base.datatype);
+ type_t *const type = expression->base.type;
+ type_t *const type_left = skip_typeref(expr_left->base.type);
+ type_t *const type_right = skip_typeref(expr_right->base.type);
if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
ir_mode *const mode = get_ir_mode(type);
static ir_node *create_shift(const binary_expression_t *expression)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
ir_node *left = expression_to_firm(expression->left);
ir_node *right = expression_to_firm(expression->right);
- type_t *type = expression->expression.datatype;
+ type_t *type = expression->base.type;
ir_mode *mode = get_ir_mode(type);
/* firm always wants the shift count to be unsigned */
ir_node *res;
- switch(expression->expression.kind) {
+ switch(expression->base.kind) {
case EXPR_BINARY_SHIFTLEFT_ASSIGN:
case EXPR_BINARY_SHIFTLEFT:
res = new_d_Shl(dbgi, left, right, mode);
case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
case EXPR_BINARY_SHIFTRIGHT: {
expression_t *expr_left = expression->left;
- type_t *type_left = skip_typeref(expr_left->base.datatype);
+ type_t *type_left = skip_typeref(expr_left->base.type);
if(is_type_signed(type_left)) {
res = new_d_Shrs(dbgi, left, right, mode);
static ir_node *create_divmod(const binary_expression_t *expression)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
ir_node *left = expression_to_firm(expression->left);
ir_node *right = expression_to_firm(expression->right);
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->base.datatype;
+ type_t *type = expression->right->base.type;
ir_mode *mode = get_ir_mode(type);
left = create_conv(dbgi, left, mode);
ir_node *op;
ir_node *res;
- switch (expression->expression.kind) {
+ switch (expression->base.kind) {
case EXPR_BINARY_DIV:
case EXPR_BINARY_DIV_ASSIGN:
if(mode_is_float(mode)) {
const binary_expression_t *expression)
{
ir_node * value = create_divmod(expression);
- dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position);
- type_t *const type = expression->expression.datatype;
+ dbg_info *const dbgi = get_dbg_info(&expression->base.source_position);
+ type_t *const type = expression->base.type;
ir_mode *const mode = get_ir_mode(type);
assert(type->kind != TYPE_POINTER);
const binary_expression_t *expression)
{
ir_node * value = create_shift(expression);
- dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position);
- type_t *const type = expression->expression.datatype;
+ dbg_info *const dbgi = get_dbg_info(&expression->base.source_position);
+ type_t *const type = expression->base.type;
ir_mode *const mode = get_ir_mode(type);
value = create_conv(dbgi, value, mode);
static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
{
- expression_kind_t kind = expression->expression.kind;
+ expression_kind_t kind = expression->base.kind;
switch(kind) {
case EXPR_BINARY_EQUAL:
case EXPR_BINARY_ISLESSEQUAL:
case EXPR_BINARY_ISLESSGREATER:
case EXPR_BINARY_ISUNORDERED: {
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
ir_node *left = expression_to_firm(expression->left);
ir_node *right = expression_to_firm(expression->right);
ir_node *cmp = new_d_Cmp(dbgi, left, right);
- long pnc = get_pnc(kind);
+ long pnc = get_pnc(kind, expression->left->base.type);
ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pnc);
return proj;
}
return create_arithmetic_assign_binop(expression, new_d_Sub);
case EXPR_BINARY_MUL_ASSIGN:
return create_arithmetic_assign_binop(expression, new_d_Mul);
+ case EXPR_BINARY_MOD_ASSIGN:
case EXPR_BINARY_DIV_ASSIGN:
return create_arithmetic_assign_divmod(expression);
case EXPR_BINARY_BITWISE_AND_ASSIGN:
static ir_node *array_access_addr(const array_access_expression_t *expression)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&expression->base.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_uint);
- type_t *ref_type = skip_typeref(expression->array_ref->base.datatype);
+ type_t *ref_type = skip_typeref(expression->array_ref->base.type);
assert(is_type_pointer(ref_type));
pointer_type_t *pointer_type = &ref_type->pointer;
static ir_node *array_access_to_firm(
const array_access_expression_t *expression)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
ir_node *addr = array_access_addr(expression);
type_t *type = revert_automatic_type_conversion(
(const expression_t*) expression);
return deref_address(irtype, addr, dbgi);
}
-static ir_node *sizeof_to_firm(const sizeof_expression_t *expression)
+/**
+ * Transform a sizeof expression into Firm code.
+ */
+static ir_node *sizeof_to_firm(const typeprop_expression_t *expression)
{
type_t *type = expression->type;
if(type == NULL) {
- type = expression->size_expression->base.datatype;
+ type = expression->tp_expression->base.type;
assert(type != NULL);
}
- ir_mode *const mode = get_ir_mode(expression->expression.datatype);
+ ir_mode *const mode = get_ir_mode(expression->base.type);
symconst_symbol sym;
sym.type_p = get_ir_type(type);
return new_SymConst(mode, sym, symconst_type_size);
}
-static ir_node *alignof_to_firm(const alignof_expression_t *expression)
+/**
+ * Transform an alignof expression into Firm code.
+ */
+static ir_node *alignof_to_firm(const typeprop_expression_t *expression)
{
- type_t *const type = expression->type;
- ir_mode *const mode = get_ir_mode(expression->expression.datatype);
+ type_t *type = expression->type;
+ if(type == NULL) {
+ /* beware: if expression is a variable reference, return the
+ alignment of the variable. */
+ const expression_t *tp_expression = expression->tp_expression;
+ const declaration_t *declaration = expr_is_variable(tp_expression);
+ if (declaration != NULL) {
+ /* TODO: get the alignment of this variable. */
+ }
+ type = tp_expression->base.type;
+ assert(type != NULL);
+ }
+
+ ir_mode *const mode = get_ir_mode(expression->base.type);
symconst_symbol sym;
sym.type_p = get_ir_type(type);
return new_SymConst(mode, sym, symconst_type_align);
static ir_node *conditional_to_firm(const conditional_expression_t *expression)
{
- dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *const dbgi = get_dbg_info(&expression->base.source_position);
/* first try to fold a constant condition */
if(is_constant_expression(expression->condition)) {
static ir_node *select_addr(const select_expression_t *expression)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
ir_node *compound_addr = expression_to_firm(expression->compound);
static ir_node *select_to_firm(const select_expression_t *expression)
{
- dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+ dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
ir_node *addr = select_addr(expression);
type_t *type = revert_automatic_type_conversion(
(const expression_t*) expression);
static ir_node *classify_type_to_firm(const classify_type_expression_t *const expr)
{
- const type_t *const type = expr->type_expression->base.datatype;
+ const type_t *const type = expr->type_expression->base.type;
gcc_type_class tc;
switch (type->kind)
{
case TYPE_ATOMIC: {
const atomic_type_t *const atomic_type = &type->atomic;
- switch (atomic_type->atype) {
+ switch (atomic_type->akind) {
/* should not be reached */
case ATOMIC_TYPE_INVALID:
tc = no_type_class;
panic("Unimplemented case in classify_type_to_firm().");
}
- dbg_info *const dbgi = get_dbg_info(&expr->expression.source_position);
+ dbg_info *const dbgi = get_dbg_info(&expr->base.source_position);
ir_mode *const mode = mode_int;
tarval *const tv = new_tarval_from_long(tc, mode);
return new_d_Const(dbgi, mode, tv);
const string_literal_expression_t *const expr)
{
if (current_function_name == NULL) {
- const source_position_t *const src_pos =
- &expr->expression.source_position;
+ const source_position_t *const src_pos = &expr->base.source_position;
const char *const name = current_function_decl->symbol->string;
- current_function_name = string_to_firm(src_pos, "__func__", name);
+ const string_t string = { name, strlen(name) + 1 };
+ current_function_name = string_to_firm(src_pos, "__func__", &string);
}
return current_function_name;
int const n = get_method_n_params(method_type) - 1;
ir_entity *const parm_ent = get_method_value_param_ent(method_type, n);
ir_node *const arg_base = get_irg_value_param_base(current_ir_graph);
- dbg_info *const dbgi =
- get_dbg_info(&expr->expression.source_position);
+ dbg_info *const dbgi = get_dbg_info(&expr->base.source_position);
ir_node *const no_mem = new_NoMem();
ir_node *const arg_sel =
new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent);
static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr)
{
- ir_type *const irtype = get_ir_type(expr->expression.datatype);
+ ir_type *const irtype = get_ir_type(expr->base.type);
ir_node *const ap = expression_to_firm(expr->ap);
- dbg_info *const dbgi = get_dbg_info(&expr->expression.source_position);
+ dbg_info *const dbgi = get_dbg_info(&expr->base.source_position);
ir_node *const res = deref_address(irtype, ap, dbgi);
- size_t const parm_size = get_type_size(expr->expression.datatype);
+ size_t const parm_size = get_type_size(expr->base.type);
ir_node *const cnst = new_Const_long(mode_uint, parm_size);
ir_node *const add = new_d_Add(dbgi, ap, cnst, mode_P_data);
set_value_for_expression(expr->ap, add);
static ir_node *dereference_addr(const unary_expression_t *const expression)
{
- assert(expression->expression.kind == EXPR_UNARY_DEREFERENCE);
+ assert(expression->base.kind == EXPR_UNARY_DEREFERENCE);
return expression_to_firm(expression->value);
}
panic("trying to get address of non-lvalue");
}
-static ir_node *builtin_constant_to_firm(const builtin_constant_expression_t *expression)
+static ir_node *builtin_constant_to_firm(
+ const builtin_constant_expression_t *expression)
{
- ir_mode *mode = get_ir_mode(expression->expression.datatype);
+ ir_mode *mode = get_ir_mode(expression->base.type);
long v;
if (is_constant_expression(expression->value)) {
return new_Const_long(mode, v);
}
-static ir_node *builtin_prefetch_to_firm(const builtin_prefetch_expression_t *expression)
+static ir_node *builtin_prefetch_to_firm(
+ const builtin_prefetch_expression_t *expression)
{
ir_node *adr = expression_to_firm(expression->adr);
/* no Firm support for prefetch yet */
static ir_node *_expression_to_firm(const expression_t *expression)
{
switch(expression->kind) {
+ case EXPR_CHAR_CONST:
+ return char_const_to_firm(&expression->conste);
case EXPR_CONST:
return const_to_firm(&expression->conste);
case EXPR_STRING_LITERAL:
case EXPR_ARRAY_ACCESS:
return array_access_to_firm(&expression->array_access);
case EXPR_SIZEOF:
- return sizeof_to_firm(&expression->sizeofe);
+ return sizeof_to_firm(&expression->typeprop);
case EXPR_ALIGNOF:
- return alignof_to_firm(&expression->alignofe);
+ return alignof_to_firm(&expression->typeprop);
case EXPR_CONDITIONAL:
return conditional_to_firm(&expression->conditional);
case EXPR_SELECT:
ir_node *res = _expression_to_firm(expression);
if(res != NULL && get_irn_mode(res) == mode_b) {
- ir_mode *mode = get_ir_mode(expression->base.datatype);
+ ir_mode *mode = get_ir_mode(expression->base.type);
res = create_conv(NULL, res, mode);
}
{
declaration_t *compound_declaration = type->declaration;
- declaration_t *compound_entry = compound_declaration->context.declarations;
+ declaration_t *compound_entry = compound_declaration->scope.declarations;
compound_graph_path_entry_t entry;
entry.type = COMPOUND_GRAPH_ENTRY_COMPOUND;
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) {
+ ir_type *const irtype = get_entity_type(entity);
+ size_t arr_len = get_array_type_size(type);
+ const char *const p = initializer->string.begin;
+ if (initializer->string.size < arr_len) {
+ arr_len = initializer->string.size;
+ }
+ for (size_t i = 0; i < arr_len; ++i) {
entry.v.array_index = i;
- ir_node *node = new_Const_long(mode_Bs, *p);
+ ir_node *node = new_Const_long(mode_Bs, p[i]);
compound_graph_path *path = create_compound_path(irtype, &entry, len);
add_compound_ent_value_w_path(entity, node, path);
-
- if(*p == '\0')
- break;
}
}
}
}
+/**
+ * Creates a Firm local variable from a declaration.
+ */
static void create_local_variable(declaration_t *declaration)
{
assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN);
} else {
declaration->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE;
declaration->v.value_number = next_value_number_function;
+ set_irg_loc_description(current_ir_graph, next_value_number_function, declaration);
++next_value_number_function;
}
if(get_cur_block() == NULL)
return;
- ir_type *func_irtype = get_ir_type(current_function_decl->type);
+ dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
+ ir_type *func_irtype = get_ir_type(current_function_decl->type);
- 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) {
ir_type *res_type = get_method_res_type(func_irtype, 0);
- if(statement->return_value != NULL) {
- ir_node *node = expression_to_firm(statement->return_value);
+ if(statement->value != NULL) {
+ ir_node *node = expression_to_firm(statement->value);
node = do_strict_conv(dbgi, node);
in[0] = node;
} else {
in_len = 1;
} else {
/* build return_value for its side effects */
- if(statement->return_value != NULL) {
- expression_to_firm(statement->return_value);
+ if(statement->value != NULL) {
+ expression_to_firm(statement->value);
}
in_len = 0;
}
ir_node *result = NULL;
statement_t *statement = compound->statements;
for( ; statement != NULL; statement = statement->base.next) {
- //context2firm(&statement->context);
+ //context2firm(&statement->scope);
if(statement->base.next == NULL
&& statement->kind == STATEMENT_EXPRESSION) {
return result;
}
+static void create_global_variable(declaration_t *declaration)
+{
+ 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;
+
+ 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_KIND_GLOBAL_VARIABLE,
+ var_type);
+ set_entity_visibility(declaration->v.entity, vis);
+
+ return;
+
+ case STORAGE_CLASS_TYPEDEF:
+ case STORAGE_CLASS_AUTO:
+ case STORAGE_CLASS_REGISTER:
+ case STORAGE_CLASS_ENUM_ENTRY:
+ break;
+ }
+ panic("Invalid storage class for global variable");
+}
+
static void create_local_declaration(declaration_t *declaration)
{
+ if(declaration->symbol == NULL)
+ return;
+
type_t *type = skip_typeref(declaration->type);
switch ((storage_class_tag_t) declaration->storage_class) {
case STORAGE_CLASS_ENUM_ENTRY:
panic("enum entry declaration in local block found");
case STORAGE_CLASS_EXTERN:
- panic("extern declaration in local block found");
+ create_global_variable(declaration);
+ create_initializer(declaration);
+ return;
case STORAGE_CLASS_NONE:
case STORAGE_CLASS_AUTO:
case STORAGE_CLASS_REGISTER:
if(is_type_function(type)) {
- panic("nested functions not supported yet");
+ if(declaration->init.statement != NULL) {
+ panic("nested functions not supported yet");
+ } else {
+ get_function_entity(declaration);
+ }
} else {
create_local_variable(declaration);
}
declaration_t *declaration = statement->declarations_begin;
declaration_t *end = statement->declarations_end->next;
for( ; declaration != end; declaration = declaration->next) {
- create_local_variable(declaration);
+ if(declaration->namespc != NAMESPACE_NORMAL)
+ continue;
+ create_local_declaration(declaration);
}
}
}
/* create declarations */
- declaration_t *declaration = statement->context.declarations;
+ declaration_t *declaration = statement->scope.declarations;
for( ; declaration != NULL; declaration = declaration->next) {
create_local_declaration(declaration);
}
static void switch_statement_to_firm(const switch_statement_t *statement)
{
- dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
+ dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
ir_node *expression = expression_to_firm(statement->expression);
ir_node *cond = new_d_Cond(dbgi, expression);
current_switch_cond = cond;
break_label = break_block;
- statement_to_firm(statement->body);
+ if (statement->body != NULL) {
+ statement_to_firm(statement->body);
+ }
if(get_cur_block() != NULL) {
ir_node *jmp = new_Jmp();
static void case_label_to_firm(const case_label_statement_t *statement)
{
- dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
+ dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp());
/* let's create a node and hope firm constant folding creates a Const
* node... */
ir_node *proj;
- set_cur_block(get_nodes_block(current_switch_cond));
- if(statement->expression) {
- long pn = fold_constant(statement->expression);
- if(pn == MAGIC_DEFAULT_PN_NUMBER) {
- /* oops someone detected our cheating... */
- panic("magic default pn used");
+ ir_node *old_block = get_nodes_block(current_switch_cond);
+ ir_node *block = new_immBlock();
+
+ set_cur_block(old_block);
+ if(statement->expression != NULL) {
+ long start_pn = fold_constant(statement->expression);
+ long end_pn = start_pn;
+ if (statement->end_range != NULL) {
+ end_pn = fold_constant(statement->end_range);
+ }
+ assert(start_pn <= end_pn);
+ /* create jumps for all cases in the given range */
+ for (long pn = start_pn; pn <= end_pn; ++pn) {
+ if(pn == MAGIC_DEFAULT_PN_NUMBER) {
+ /* oops someone detected our cheating... */
+ panic("magic default pn used");
+ }
+ proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn);
+ add_immBlock_pred(block, proj);
}
- proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn);
} else {
saw_default_label = true;
proj = new_d_defaultProj(dbgi, current_switch_cond,
MAGIC_DEFAULT_PN_NUMBER);
+
+ add_immBlock_pred(block, proj);
}
- ir_node *block = new_immBlock();
if (fallthrough != NULL) {
add_immBlock_pred(block, fallthrough);
}
- add_immBlock_pred(block, proj);
mature_immBlock(block);
+ set_cur_block(block);
- if(statement->label_statement != NULL) {
- statement_to_firm(statement->label_statement);
+ if(statement->statement != NULL) {
+ statement_to_firm(statement->statement);
}
}
set_cur_block(block);
keep_alive(block);
- if(statement->label_statement != NULL) {
- statement_to_firm(statement->label_statement);
+ if(statement->statement != NULL) {
+ statement_to_firm(statement->statement);
}
}
ASM_MODIFIER_EARLYCLOBBER = 1 << 3,
} modifier_t;
-#if 0
static void asm_statement_to_firm(const asm_statement_t *statement)
{
+ (void) statement;
+ fprintf(stderr, "WARNING asm not implemented yet!\n");
+#if 0
bool needs_memory = false;
size_t n_clobbers = 0;
}
}
-
-}
#endif
+}
static void statement_to_firm(statement_t *statement)
{
goto_to_firm(&statement->gotos);
return;
case STATEMENT_ASM:
- //asm_statement_to_firm(&statement->asms);
- //return;
- break;
+ asm_statement_to_firm(&statement->asms);
+ return;
}
panic("Statement not implemented\n");
}
{
int count = 0;
for (; decl != end; decl = decl->next) {
+ if(decl->namespc != NAMESPACE_NORMAL)
+ continue;
const type_t *type = skip_typeref(decl->type);
- switch (type->kind) {
- case TYPE_ATOMIC:
- case TYPE_ENUM:
- case TYPE_POINTER:
- if (!decl->address_taken)
- ++count;
- break;
-
- default: break;
- }
+ if (!decl->address_taken && is_type_scalar(type))
+ ++count;
const initializer_t *initializer = decl->init.initializer;
/* FIXME: should walk initializer hierarchies... */
if(initializer != NULL && initializer->kind == INITIALIZER_VALUE) {
}
EXPR_UNARY_CASES
return count_decls_in_expression(expression->unary.value);
+ case EXPR_CALL: {
+ int count = 0;
+ call_argument_t *argument = expression->call.arguments;
+ for( ; argument != NULL; argument = argument->next) {
+ count += count_decls_in_expression(argument->expression);
+ }
+ return count;
+ }
default:
break;
case STATEMENT_LABEL: {
const label_statement_t *const label_stmt = &stmt->label;
- count += count_decls_in_stmts(label_stmt->label_statement);
+ if(label_stmt->statement != NULL) {
+ count += count_decls_in_stmts(label_stmt->statement);
+ }
break;
}
case STATEMENT_FOR: {
const for_statement_t *const for_stmt = &stmt->fors;
- count += count_local_declarations(for_stmt->context.declarations, NULL);
+ count += count_local_declarations(for_stmt->scope.declarations, NULL);
count += count_decls_in_expression(for_stmt->initialisation);
count += count_decls_in_expression(for_stmt->condition);
count += count_decls_in_expression(for_stmt->step);
case STATEMENT_CASE_LABEL: {
const case_label_statement_t *label = &stmt->case_label;
count += count_decls_in_expression(label->expression);
- count += count_decls_in_stmts(label->label_statement);
+ if(label->statement != NULL) {
+ count += count_decls_in_stmts(label->statement);
+ }
break;
}
case STATEMENT_RETURN: {
const return_statement_t *ret_stmt = &stmt->returns;
- count += count_decls_in_expression(ret_stmt->return_value);
+ count += count_decls_in_expression(ret_stmt->value);
break;
}
}
int count = 0;
/* count parameters */
- count += count_local_declarations(declaration->context.declarations, NULL);
+ count += count_local_declarations(declaration->scope.declarations, NULL);
/* count local variables declared in body */
count += count_decls_in_stmts(declaration->init.statement);
ir_type *function_irtype = get_ir_type(declaration->type);
int n = 0;
- declaration_t *parameter = declaration->context.declarations;
+ declaration_t *parameter = declaration->scope.declarations;
for( ; parameter != NULL; parameter = parameter->next, ++n) {
assert(parameter->declaration_kind == DECLARATION_KIND_UNKNOWN);
type_t *type = skip_typeref(parameter->type);
parameter->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE;
parameter->v.value_number = next_value_number_function;
+ set_irg_loc_description(current_ir_graph, next_value_number_function, parameter);
++next_value_number_function;
set_value(parameter->v.value_number, proj);
irg_vrfy(irg);
}
-static void create_global_variable(declaration_t *declaration)
-{
- 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;
-
- 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_KIND_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;
- }
- panic("Invalid storage class for global variable");
-}
-
-static void context_to_firm(context_t *context)
+static void scope_to_firm(scope_t *scope)
{
/* first pass: create declarations */
- declaration_t *declaration = context->declarations;
+ declaration_t *declaration = scope->declarations;
for( ; declaration != NULL; declaration = declaration->next) {
if(declaration->namespc != NAMESPACE_NORMAL)
continue;
}
}
- /* second pass: create code */
- declaration = context->declarations;
+ /* second pass: create code/initializers */
+ declaration = scope->declarations;
for( ; declaration != NULL; declaration = declaration->next) {
if(declaration->namespc != NAMESPACE_NORMAL)
continue;
continue;
type_t *type = declaration->type;
- if(type->kind != TYPE_FUNCTION)
- continue;
-
- create_function(declaration);
+ if(type->kind == TYPE_FUNCTION) {
+ create_function(declaration);
+ } else {
+ assert(declaration->declaration_kind
+ == DECLARATION_KIND_GLOBAL_VARIABLE);
+ current_ir_graph = get_const_code_irg();
+ create_initializer(declaration);
+ }
}
}
break_label = NULL;
current_switch_cond = NULL;
- context_to_firm(&unit->context);
+ scope_to_firm(&unit->scope);
}
projects / cparser / blobdiff