static ir_type *ir_type_void;
static ir_type *ir_type_int;
+/* architecture specific floating point arithmetic mode (if any) */
+static ir_mode *mode_float_arithmetic;
+
static int next_value_number_function;
static ir_node *continue_label;
static ir_node *break_label;
DECLARATION_KIND_INNER_FUNCTION
} declaration_kind_t;
-static ir_mode *get_ir_mode(type_t *type);
+static ir_mode *get_ir_mode_storage(type_t *type);
+/*
+ * get arithmetic mode for a type. This is different from get_ir_mode_storage,
+ * int that it returns bigger modes for floating point on some platforms
+ * (x87 internally does arithemtic with 80bits)
+ */
+static ir_mode *get_ir_mode_arithmetic(type_t *type);
+
static ir_type *get_ir_type_incomplete(type_t *type);
static void enqueue_inner_function(entity_t *entity)
mode_uint = atomic_modes[ATOMIC_TYPE_UINT];
/* there's no real void type in firm */
- atomic_modes[ATOMIC_TYPE_VOID] = mode_int;
+ atomic_modes[ATOMIC_TYPE_VOID] = atomic_modes[ATOMIC_TYPE_CHAR];
/* initialize pointer modes */
char name[64];
case TYPE_IMAGINARY:
return get_atomic_type_size(type->imaginary.akind);
case TYPE_ENUM:
- return get_mode_size_bytes(mode_int);
+ return get_atomic_type_size(type->enumt.akind);
case TYPE_COMPOUND_UNION:
case TYPE_COMPOUND_STRUCT:
return get_compound_type_size(&type->compound);
panic("Trying to determine size of invalid type");
}
+static ir_node *get_vla_size(array_type_t *const type)
+{
+ ir_node *size_node = type->size_node;
+ if (size_node == NULL) {
+ size_node = expression_to_firm(type->size_expression);
+ type->size_node = size_node;
+ }
+ return size_node;
+}
+
static ir_node *get_type_size(type_t *type)
{
type = skip_typeref(type);
if (is_type_array(type) && type->array.is_vla) {
- ir_node *size_node = type->array.size_node;
- if (size_node == NULL) {
- size_node = expression_to_firm(type->array.size_expression);
- type->array.size_node = size_node;
- }
-
+ ir_node *size_node = get_vla_size(&type->array);
ir_node *elem_size = get_type_size(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;
}
- ir_mode *mode = get_ir_mode(type_size_t);
+ ir_mode *mode = get_ir_mode_storage(type_size_t);
symconst_symbol sym;
sym.type_p = get_ir_type(type);
return new_SymConst(mode, sym, symconst_type_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 = typehash_insert(copy);
+ if (type != copy) {
+ obstack_free(type_obst, copy);
+ }
+ }
+ return type;
+}
+
/**
* Creates a Firm type for an atomic type
*/
-static ir_type *create_atomic_type(const atomic_type_t *type)
+static ir_type *create_atomic_type(atomic_type_kind_t akind, int alignment)
{
- atomic_type_kind_t kind = type->akind;
- ir_mode *mode = atomic_modes[kind];
+ ir_mode *mode = atomic_modes[akind];
ident *id = get_mode_ident(mode);
ir_type *irtype = new_type_primitive(id, mode);
- set_type_alignment_bytes(irtype, type->base.alignment);
+ set_type_alignment_bytes(irtype, alignment);
return irtype;
}
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);
ident *ident;
constant_folding = constant_folding_old;
- return ir_type_int;
+ return create_atomic_type(type->akind, type->base.alignment);
}
static ir_type *get_ir_type_incomplete(type_t *type)
switch (type->kind) {
case TYPE_ERROR:
/* Happens while constant folding, when there was an error */
- return create_atomic_type(&type_void->atomic);
+ return create_atomic_type(ATOMIC_TYPE_VOID, 0);
case TYPE_ATOMIC:
- firm_type = create_atomic_type(&type->atomic);
+ firm_type = create_atomic_type(type->atomic.akind,
+ type->base.alignment);
break;
case TYPE_COMPLEX:
firm_type = create_complex_type(&type->complex);
return firm_type;
}
-ir_mode *get_ir_mode(type_t *type)
+static ir_mode *get_ir_mode_storage(type_t *type)
{
ir_type *irtype = get_ir_type(type);
return mode;
}
+static ir_mode *get_ir_mode_arithmetic(type_t *type)
+{
+ ir_mode *mode = get_ir_mode_storage(type);
+ if (mode_is_float(mode) && mode_float_arithmetic != NULL) {
+ return mode_float_arithmetic;
+ }
+
+ return mode;
+}
+
/** Names of the runtime functions. */
static const struct {
int id; /**< the rts id */
return irentity;
}
+static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
+{
+ ir_mode *value_mode = get_irn_mode(value);
+
+ if (value_mode == dest_mode || is_Bad(value))
+ return value;
+
+ if (dest_mode == mode_b) {
+ ir_node *zero = new_Const(get_mode_null(value_mode));
+ ir_node *cmp = new_d_Cmp(dbgi, value, zero);
+ ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg);
+ return proj;
+ }
+
+ return new_d_Conv(dbgi, value, dest_mode);
+}
+
/**
* Creates a Const node representing a constant.
*/
static ir_node *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);
+ type_t *type = skip_typeref(cnst->base.type);
+ ir_mode *mode = get_ir_mode_storage(type);
char buf[128];
tarval *tv;
tv = new_tarval_from_str(buf, len, mode);
}
- return new_d_Const(dbgi, tv);
+ ir_node *res = new_d_Const(dbgi, tv);
+ ir_mode *mode_arith = get_ir_mode_arithmetic(type);
+ return create_conv(dbgi, res, mode_arith);
}
/**
static ir_node *character_constant_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);
+ ir_mode *mode = get_ir_mode_arithmetic(cnst->base.type);
long long int v = 0;
for (size_t i = 0; i < cnst->v.character.size; ++i) {
static ir_node *wide_character_constant_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);
+ ir_mode *mode = get_ir_mode_arithmetic(cnst->base.type);
long long int v = cnst->v.wide_character.begin[0];
return addr;
}
+ cons_flags flags = type->base.qualifiers & TYPE_QUALIFIER_VOLATILE
+ ? cons_volatile : 0;
ir_mode *const mode = get_type_mode(irtype);
ir_node *const memory = get_store();
- ir_node *const load = new_d_Load(dbgi, memory, addr, mode);
+ ir_node *const load = new_d_Load(dbgi, memory, addr, mode, flags);
ir_node *const load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
ir_node *const load_res = new_d_Proj(dbgi, load, mode, pn_Load_res);
- if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE && !is_Bad(load)) {
- set_Load_volatility(load, volatility_is_volatile);
- }
-
set_store(load_mem);
- return load_res;
+
+ ir_mode *const mode_arithmetic = get_ir_mode_arithmetic(type);
+ return create_conv(dbgi, load_res, mode_arithmetic);
}
/**
}
}
-static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
-{
- ir_mode *value_mode = get_irn_mode(value);
-
- if (value_mode == dest_mode || is_Bad(value))
- return value;
-
- if (dest_mode == mode_b) {
- ir_node *zero = new_Const(get_mode_null(value_mode));
- ir_node *cmp = new_d_Cmp(dbgi, value, zero);
- ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg);
- return proj;
- }
-
- return new_d_Conv(dbgi, value, dest_mode);
-}
-
/**
* Keep all memory edges of the given block.
*/
break;
case DECLARATION_KIND_LOCAL_VARIABLE: {
- ir_mode *const mode = get_ir_mode(type);
- return get_value(entity->variable.v.value_number, mode);
+ ir_mode *const mode = get_ir_mode_storage(type);
+ ir_node *const value = get_value(entity->variable.v.value_number, mode);
+ return create_conv(NULL, value, get_ir_mode_arithmetic(type));
}
case DECLARATION_KIND_PARAMETER: {
- ir_mode *const mode = get_ir_mode(type);
- return get_value(entity->parameter.v.value_number, mode);
+ ir_mode *const mode = get_ir_mode_storage(type);
+ ir_node *const value = get_value(entity->parameter.v.value_number,mode);
+ return create_conv(NULL, value, get_ir_mode_arithmetic(type));
}
case DECLARATION_KIND_FUNCTION: {
- ir_mode *const mode = get_ir_mode(type);
+ ir_mode *const mode = get_ir_mode_storage(type);
return create_symconst(dbgi, mode, entity->function.entity);
}
case DECLARATION_KIND_INNER_FUNCTION: {
- ir_mode *const mode = get_ir_mode(type);
+ ir_mode *const mode = get_ir_mode_storage(type);
if (!entity->function.goto_to_outer && !entity->function.need_closure) {
/* inner function not using the closure */
return create_symconst(dbgi, mode, entity->function.entity);
case DECLARATION_KIND_FUNCTION: {
type_t *const type = skip_typeref(entity->declaration.type);
- ir_mode *const mode = get_ir_mode(type);
+ ir_mode *const mode = get_ir_mode_storage(type);
return create_symconst(dbgi, mode, entity->function.entity);
}
case T___builtin_inf:
case T___builtin_inff:
case T___builtin_infl: {
- ir_mode *mode = get_ir_mode(function_type->function.return_type);
+ type_t *type = function_type->function.return_type;
+ ir_mode *mode = get_ir_mode_arithmetic(type);
tarval *tv = get_mode_infinite(mode);
ir_node *res = new_d_Const(dbgi, tv);
return res;
case T___builtin_nanl: {
/* Ignore string for now... */
assert(is_type_function(function_type));
- ir_mode *mode = get_ir_mode(function_type->function.return_type);
+ type_t *type = function_type->function.return_type;
+ ir_mode *mode = get_ir_mode_arithmetic(type);
tarval *tv = get_mode_NAN(mode);
ir_node *res = new_d_Const(dbgi, tv);
return res;
_expression_to_firm(call->arguments->expression);
return NULL;
default:
- panic("Unsupported builtin found\n");
+ panic("unsupported builtin found");
}
}
/* handle alloca() call */
expression_t *argument = call->arguments->expression;
ir_node *size = expression_to_firm(argument);
+ ir_mode *mode = get_ir_mode_arithmetic(type_size_t);
- size = create_conv(dbgi, size, get_ir_mode(type_size_t));
+ size = create_conv(dbgi, size, mode);
ir_node *store = get_store();
dbg_info *dbgi = get_dbg_info(&call->base.source_position);
expression_t *expression = argument->expression;
ir_node *arg_node = expression_to_firm(expression);
- arg_node = do_strict_conv(dbgi, arg_node);
+ type_t *type = skip_typeref(expression->base.type);
+ if (!is_type_compound(type)) {
+ ir_mode *mode = get_ir_mode_storage(expression->base.type);
+ arg_node = create_conv(dbgi, arg_node, mode);
+ arg_node = do_strict_conv(dbgi, arg_node);
+ }
in[n] = arg_node;
ir_node *result = NULL;
if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
- ir_mode *mode;
+ ir_node *resproj = new_d_Proj(dbgi, node, mode_T, pn_Call_T_result);
+
if (is_type_scalar(return_type)) {
- mode = get_ir_mode(return_type);
+ ir_mode *mode = get_ir_mode_storage(return_type);
+ result = new_d_Proj(dbgi, resproj, mode, 0);
+ ir_mode *mode_arith = get_ir_mode_arithmetic(return_type);
+ result = create_conv(NULL, result, mode_arith);
} else {
- mode = mode_P_data;
+ ir_mode *mode = mode_P_data;
+ result = new_d_Proj(dbgi, resproj, mode, 0);
}
- ir_node *resproj = new_d_Proj(dbgi, node, mode_T, pn_Call_T_result);
- result = new_d_Proj(dbgi, resproj, mode, 0);
}
if (function->kind == EXPR_REFERENCE &&
static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type,
ir_node *value)
{
- value = do_strict_conv(dbgi, value);
+ if (!is_type_compound(type)) {
+ ir_mode *mode = get_ir_mode_storage(type);
+ value = create_conv(dbgi, value, mode);
+ value = do_strict_conv(dbgi, value);
+ }
ir_node *memory = get_store();
if (is_type_scalar(type)) {
- ir_node *store = new_d_Store(dbgi, memory, addr, value);
+ cons_flags flags = type->base.qualifiers & TYPE_QUALIFIER_VOLATILE
+ ? cons_volatile : 0;
+ ir_node *store = new_d_Store(dbgi, memory, addr, value, flags);
ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
- if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE && !is_Bad(store))
- set_Store_volatility(store, volatility_is_volatile);
set_store(store_mem);
} else {
ir_type *irtype = get_ir_type(type);
return mask1;
}
-static void bitfield_store_to_firm(dbg_info *dbgi,
+static ir_node *bitfield_store_to_firm(dbg_info *dbgi,
ir_entity *entity, ir_node *addr, ir_node *value, bool set_volatile)
{
ir_type *entity_type = get_entity_type(entity);
/* load current value */
ir_node *mem = get_store();
- ir_node *load = new_d_Load(dbgi, mem, addr, mode);
+ ir_node *load = new_d_Load(dbgi, mem, addr, mode,
+ set_volatile ? cons_volatile : 0);
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);
/* 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 = new_d_Store(dbgi, load_mem, addr, new_val,
+ set_volatile ? cons_volatile : 0);
ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
set_store(store_mem);
- if (set_volatile) {
- if (!is_Bad(load))
- set_Load_volatility(load, volatility_is_volatile);
- if (!is_Bad(store))
- set_Store_volatility(store, volatility_is_volatile);
- }
+ return value_masked;
}
static ir_node *bitfield_extract_to_firm(const select_expression_t *expression,
{
dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
type_t *type = expression->base.type;
- ir_mode *mode = get_ir_mode(type);
+ ir_mode *mode = get_ir_mode_storage(type);
ir_node *mem = get_store();
- ir_node *load = new_d_Load(dbgi, mem, addr, mode);
+ ir_node *load = new_d_Load(dbgi, mem, addr, mode, 0);
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);
(void) get_ir_type(type);
}
-static void set_value_for_expression_addr(const expression_t *expression,
- ir_node *value, ir_node *addr)
+static ir_node *set_value_for_expression_addr(const expression_t *expression,
+ ir_node *value, ir_node *addr)
{
dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
- value = do_strict_conv(dbgi, value);
+ type_t *type = skip_typeref(expression->base.type);
+
+ if (!is_type_compound(type)) {
+ ir_mode *mode = get_ir_mode_storage(type);
+ value = create_conv(dbgi, value, mode);
+ value = do_strict_conv(dbgi, value);
+ }
if (expression->kind == EXPR_REFERENCE) {
const reference_expression_t *ref = &expression->reference;
assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN);
if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) {
set_value(entity->variable.v.value_number, value);
- return;
+ return value;
} else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) {
set_value(entity->parameter.v.value_number, value);
- return;
+ return value;
}
}
addr = expression_to_addr(expression);
assert(addr != NULL);
- type_t *type = skip_typeref(expression->base.type);
-
if (expression->kind == EXPR_SELECT) {
const select_expression_t *select = &expression->select;
ir_entity *irentity = entity->compound_member.entity;
bool set_volatile
= select->base.type->base.qualifiers & TYPE_QUALIFIER_VOLATILE;
- bitfield_store_to_firm(dbgi, irentity, addr, value, set_volatile);
- return;
+ value = bitfield_store_to_firm(dbgi, irentity, addr, value,
+ set_volatile);
+ return value;
}
}
assign_value(dbgi, addr, type, value);
+ return value;
}
static void set_value_for_expression(const expression_t *expression,
assert(entity->kind == ENTITY_VARIABLE
|| entity->kind == ENTITY_PARAMETER);
assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN);
+ int value_number;
if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) {
+ value_number = entity->variable.v.value_number;
assert(addr == NULL);
- ir_mode *mode = get_ir_mode(expression->base.type);
- return get_value(entity->variable.v.value_number, mode);
+ type_t *type = skip_typeref(expression->base.type);
+ ir_mode *mode = get_ir_mode_storage(type);
+ ir_node *res = get_value(value_number, mode);
+ return create_conv(NULL, res, get_ir_mode_arithmetic(type));
} else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) {
+ value_number = entity->parameter.v.value_number;
assert(addr == NULL);
- ir_mode *mode = get_ir_mode(expression->base.type);
- return get_value(entity->parameter.v.value_number, mode);
+ type_t *type = skip_typeref(expression->base.type);
+ ir_mode *mode = get_ir_mode_storage(type);
+ ir_node *res = get_value(value_number, mode);
+ return create_conv(NULL, res, get_ir_mode_arithmetic(type));
}
}
ir_node *value = get_value_from_lvalue(value_expr, addr);
type_t *type = skip_typeref(expression->base.type);
- ir_mode *mode = get_ir_mode(expression->base.type);
+ ir_mode *mode = get_ir_mode_arithmetic(expression->base.type);
ir_node *offset;
if (is_type_pointer(type)) {
var2 = op2->reference.entity;
type_t *const type = skip_typeref(var->declaration.type);
- ir_mode *const mode = get_ir_mode(type);
+ ir_mode *const mode = get_ir_mode_storage(type);
ir_node *const irn1 = get_value(var->variable.v.value_number, mode);
ir_node *const irn2 = get_value(var2->variable.v.value_number, mode);
if (var != NULL) {
type_t *const type = skip_typeref(var->declaration.type);
- ir_mode *const mode = get_ir_mode(type);
+ ir_mode *const mode = get_ir_mode_storage(type);
res = get_value(var->variable.v.value_number, mode);
res = new_d_Confirm(dbi, res, expression_to_firm(con), cmp_val);
switch(expression->base.kind) {
case EXPR_UNARY_NEGATE: {
ir_node *value_node = expression_to_firm(value);
- ir_mode *mode = get_ir_mode(type);
+ ir_mode *mode = get_ir_mode_arithmetic(type);
return new_d_Minus(dbgi, value_node, mode);
}
case EXPR_UNARY_PLUS:
return expression_to_firm(value);
case EXPR_UNARY_BITWISE_NEGATE: {
ir_node *value_node = expression_to_firm(value);
- ir_mode *mode = get_ir_mode(type);
+ ir_mode *mode = get_ir_mode_arithmetic(type);
return new_d_Not(dbgi, value_node, mode);
}
case EXPR_UNARY_NOT: {
case EXPR_UNARY_CAST: {
ir_node *value_node = expression_to_firm(value);
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);
+ ir_mode *mode = get_ir_mode_storage(type);
+ ir_node *node = create_conv(dbgi, value_node, mode);
+ node = do_strict_conv(dbgi, node);
+ ir_mode *mode_arith = get_ir_mode_arithmetic(type);
+ node = create_conv(dbgi, node, mode_arith);
return node;
} else {
/* make sure firm type is constructed */
case EXPR_UNARY_CAST_IMPLICIT: {
ir_node *value_node = expression_to_firm(value);
if (is_type_scalar(type)) {
- ir_mode *mode = get_ir_mode(type);
- return create_conv(dbgi, value_node, mode);
+ ir_mode *mode = get_ir_mode_storage(type);
+ ir_node *res = create_conv(dbgi, value_node, mode);
+ ir_mode *mode_arith = get_ir_mode_arithmetic(type);
+ res = create_conv(dbgi, res, mode_arith);
+ return res;
} else {
return value_node;
}
ir_node *cur_block = get_cur_block();
ir_node *one_block = new_immBlock();
+ set_cur_block(one_block);
ir_node *one = new_Const(get_mode_one(mode));
ir_node *jmp_one = new_d_Jmp(dbgi);
ir_node *zero_block = new_immBlock();
+ set_cur_block(zero_block);
ir_node *zero = new_Const(get_mode_null(mode));
ir_node *jmp_zero = new_d_Jmp(dbgi);
static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi,
ir_node *value, type_t *type)
{
- ir_mode *const mode = get_ir_mode(type_ptrdiff_t);
+ ir_mode *const mode = get_ir_mode_arithmetic(type_ptrdiff_t);
assert(is_type_pointer(type));
pointer_type_t *const pointer_type = &type->pointer;
type_t *const points_to = skip_typeref(pointer_type->points_to);
if (is_type_pointer(type_left) && is_type_pointer(type_right)) {
const pointer_type_t *const ptr_type = &type_left->pointer;
- mode = get_ir_mode(expression->base.type);
+ mode = get_ir_mode_arithmetic(expression->base.type);
ir_node *const elem_size = get_type_size(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);
case EXPR_BINARY_SUB_ASSIGN:
if (is_type_pointer(type_left)) {
right = adjust_for_pointer_arithmetic(dbgi, right, type_left);
- mode = get_ir_mode(type_left);
+ mode = get_ir_mode_arithmetic(type_left);
break;
}
goto normal_node;
case EXPR_BINARY_ADD_ASSIGN:
if (is_type_pointer(type_left)) {
right = adjust_for_pointer_arithmetic(dbgi, right, type_left);
- mode = get_ir_mode(type_left);
+ mode = get_ir_mode_arithmetic(type_left);
break;
} else if (is_type_pointer(type_right)) {
left = adjust_for_pointer_arithmetic(dbgi, left, type_right);
- mode = get_ir_mode(type_right);
+ mode = get_ir_mode_arithmetic(type_right);
break;
}
goto normal_node;
default:
normal_node:
- mode = get_ir_mode(type_right);
+ mode = get_ir_mode_arithmetic(type_right);
left = create_conv(dbgi, left, mode);
break;
}
static ir_node *create_lazy_op(const binary_expression_t *expression)
{
dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
- type_t *type = expression->base.type;
- ir_mode *mode = get_ir_mode(type);
+ type_t *type = skip_typeref(expression->base.type);
+ ir_mode *mode = get_ir_mode_arithmetic(type);
if (is_constant_expression(expression->left)) {
long val = fold_constant(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 && val != 0) ||
- (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) {
- return produce_condition_result(expression->right, mode, dbgi);
+ if (ekind == EXPR_BINARY_LOGICAL_AND) {
+ if (val == 0) {
+ return new_Const(get_mode_null(mode));
+ }
} else {
- return new_Const(get_mode_one(mode));
+ if (val != 0) {
+ return new_Const(get_mode_one(mode));
+ }
+ }
+
+ if (is_constant_expression(expression->right)) {
+ long const valr = fold_constant(expression->right);
+ return valr != 0 ?
+ new_Const(get_mode_one(mode)) :
+ new_Const(get_mode_null(mode));
}
+
+ return produce_condition_result(expression->right, mode, dbgi);
}
return produce_condition_result((const expression_t*) expression, mode,
{
dbg_info *const dbgi = get_dbg_info(&expression->base.source_position);
const expression_t *left_expr = expression->left;
- ir_mode *left_mode = get_ir_mode(left_expr->base.type);
+ type_t *type = skip_typeref(left_expr->base.type);
+ ir_mode *left_mode = get_ir_mode_storage(type);
ir_node *right = expression_to_firm(expression->right);
ir_node *left_addr = expression_to_addr(left_expr);
ir_node *left = get_value_from_lvalue(left_expr, left_addr);
result = create_conv(dbgi, result, left_mode);
result = do_strict_conv(dbgi, result);
- set_value_for_expression_addr(left_expr, result, left_addr);
+ result = set_value_for_expression_addr(left_expr, result, left_addr);
+ if (!is_type_compound(type)) {
+ ir_mode *mode_arithmetic = get_ir_mode_arithmetic(type);
+ result = create_conv(dbgi, result, mode_arithmetic);
+ }
return result;
}
case EXPR_BINARY_ASSIGN: {
ir_node *addr = expression_to_addr(expression->left);
ir_node *right = expression_to_firm(expression->right);
- set_value_for_expression_addr(expression->left, right, addr);
+ ir_node *res
+ = set_value_for_expression_addr(expression->left, right, addr);
- return right;
+ type_t *type = skip_typeref(expression->base.type);
+ if (!is_type_compound(type)) {
+ ir_mode *mode_arithmetic = get_ir_mode_arithmetic(type);
+ res = create_conv(NULL, res, mode_arithmetic);
+ }
+ return res;
}
case EXPR_BINARY_ADD:
case EXPR_BINARY_SUB:
static ir_node *offsetof_to_firm(const offsetof_expression_t *expression)
{
- ir_mode *mode = get_ir_mode(expression->base.type);
+ ir_mode *mode = get_ir_mode_arithmetic(expression->base.type);
long offset = get_offsetof_offset(expression);
tarval *tv = new_tarval_from_long(offset, mode);
dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
assert(type != NULL);
}
- ir_mode *const mode = get_ir_mode(expression->base.type);
+ ir_mode *const mode = get_ir_mode_arithmetic(expression->base.type);
symconst_symbol sym;
sym.type_p = get_ir_type(type);
return new_SymConst(mode, sym, symconst_type_align);
current_ir_graph = old_current_ir_graph;
if (!is_Const(cnst)) {
- panic("couldn't fold constant\n");
+ panic("couldn't fold constant");
}
tarval *tv = get_Const_tarval(cnst);
if (!tarval_is_long(tv)) {
- panic("result of constant folding is not integer\n");
+ panic("result of constant folding is not integer");
}
constant_folding = constant_folding_old;
/* create the true block */
ir_node *true_block = new_immBlock();
+ set_cur_block(true_block);
ir_node *true_val = expression->true_expression != NULL ?
expression_to_firm(expression->true_expression) : NULL;
/* create the false block */
ir_node *false_block = new_immBlock();
+ set_cur_block(false_block);
ir_node *false_val = expression_to_firm(expression->false_expression);
ir_node *false_jmp = new_Jmp();
static ir_node *builtin_constant_to_firm(
const builtin_constant_expression_t *expression)
{
- ir_mode *mode = get_ir_mode(expression->base.type);
+ ir_mode *mode = get_ir_mode_arithmetic(expression->base.type);
long v;
if (is_constant_expression(expression->value)) {
ir_graph *rem = current_ir_graph;
current_ir_graph = current_function;
- ir_node *old_cur_block = get_cur_block();
- ir_node *block = new_immBlock();
- set_cur_block(old_cur_block);
+ ir_node *block = new_immBlock();
label->block = block;
}
/* simply create a NULL pointer */
- ir_mode *mode = get_ir_mode(type_void_ptr);
+ ir_mode *mode = get_ir_mode_arithmetic(type_void_ptr);
ir_node *res = new_Const_long(mode, 0);
return res;
if (is_constant_expression(expression)) {
ir_node *res = _expression_to_firm(expression);
- ir_mode *mode = get_ir_mode(expression->base.type);
+ ir_mode *mode = get_ir_mode_arithmetic(expression->base.type);
assert(is_Const(res));
if (is_Const_null(res)) {
return new_Const_long(mode, 0);
/* we have to produce a 0/1 from the mode_b expression */
dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
- ir_mode *mode = get_ir_mode(expression->base.type);
+ ir_mode *mode = get_ir_mode_arithmetic(expression->base.type);
return produce_condition_result(expression, mode, dbgi);
}
case EXPR_BINARY_LOGICAL_AND: {
const binary_expression_t *binary_expression = &expression->binary;
- ir_node *cur_block = get_cur_block();
ir_node *extra_block = new_immBlock();
- set_cur_block(cur_block);
create_condition_evaluation(binary_expression->left, extra_block,
false_block);
mature_immBlock(extra_block);
case EXPR_BINARY_LOGICAL_OR: {
const binary_expression_t *binary_expression = &expression->binary;
- ir_node *cur_block = get_cur_block();
ir_node *extra_block = new_immBlock();
- set_cur_block(cur_block);
create_condition_evaluation(binary_expression->left, true_block,
extra_block);
mature_immBlock(extra_block);
}
add_immBlock_pred(true_block, true_proj);
- if (false_block != NULL) {
- add_immBlock_pred(false_block, false_proj);
- }
+ add_immBlock_pred(false_block, false_proj);
set_cur_block(NULL);
return cond_expr;
ir_type *parent_type)
{
assert(variable->kind == ENTITY_VARIABLE);
- type_t *const type = skip_typeref(variable->declaration.type);
+ 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);
+
ir_entity *const irentity = new_d_entity(parent_type, id, irtype, dbgi);
handle_gnu_attributes_ent(irentity, variable);
variable->variable.v.entity = irentity;
set_entity_variability(irentity, variability_uninitialized);
set_entity_ld_ident(irentity, create_ld_ident(variable));
+
if (parent_type == get_tls_type())
set_entity_allocation(irentity, allocation_automatic);
else if (declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE)
panic("initializer creation for compounds not implemented yet");
}
ir_node *value = expression_to_firm(initializer->value);
+ type_t *type = initializer->value->base.type;
+ ir_mode *mode = get_ir_mode_storage(type);
+ value = create_conv(NULL, value, mode);
return create_initializer_const(value);
}
ir_initializer_t *irinitializer = create_initializer_compound(len);
const char *string = initializer->string.begin;
- ir_mode *mode = get_ir_mode(type->array.element_type);
+ ir_mode *mode = get_ir_mode_storage(type->array.element_type);
for (size_t i = 0; i < len; ++i) {
char c = 0;
/* TODO: bitfields */
ir_node *mem = get_store();
- ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst);
+ ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst, 0);
ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
set_store(proj_m);
} else {
assert(get_type_mode(type) == mode);
ir_node *mem = get_store();
- ir_node *store = new_d_Store(dbgi, mem, base_addr, node);
+ ir_node *store = new_d_Store(dbgi, mem, base_addr, node, 0);
ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
set_store(proj_m);
return;
assert(get_type_mode(type) == mode);
ir_node *mem = get_store();
- ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst);
+ ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst, 0);
ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
set_store(proj_m);
return;
dbg_info *dbgi = get_dbg_info(&entity->base.source_position);
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);
}
dbg_info *dbgi = get_dbg_info(&entity->base.source_position);
ir_node *value = expression_to_firm(initializer_value->value);
+
+ type_t *type = initializer_value->value->base.type;
+ ir_mode *mode = get_ir_mode_storage(type);
+ value = create_conv(dbgi, value, mode);
value = do_strict_conv(dbgi, value);
if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) {
assert(entity->kind == ENTITY_VARIABLE);
assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN);
- type_t *const type = skip_typeref(entity->declaration.type);
+ 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 ?
get_tls_type() : get_glob_type();
ir_type *const irtype = get_ir_type(type);
entity->declaration.kind = DECLARATION_KIND_GLOBAL_VARIABLE;
entity->variable.v.entity = irentity;
+
set_entity_ld_ident(irentity, id);
set_entity_variability(irentity, variability_uninitialized);
set_entity_visibility(irentity, visibility_local);
if (statement->value != NULL) {
ir_node *node = expression_to_firm(statement->value);
- node = do_strict_conv(dbgi, node);
+ if (!is_compound_type(res_type)) {
+ type_t *type = statement->value->base.type;
+ ir_mode *mode = get_ir_mode_storage(type);
+ node = create_conv(dbgi, node, mode);
+ node = do_strict_conv(dbgi, node);
+ }
in[0] = node;
} else {
ir_mode *mode;
entity_t *const last = statement->declarations_end;
if (entity != NULL) {
for ( ;; entity = entity->base.next) {
- if (is_declaration(entity))
+ if (is_declaration(entity)) {
initialize_local_declaration(entity);
+ } else if (entity->kind == ENTITY_TYPEDEF) {
+ type_t *const type = skip_typeref(entity->typedefe.type);
+ if (is_type_array(type) && type->array.is_vla)
+ get_vla_size(&type->array);
+ }
if (entity == last)
break;
}
ir_node *true_block = NULL;
if (statement->true_statement != NULL) {
true_block = new_immBlock();
+ set_cur_block(true_block);
statement_to_firm(statement->true_statement);
if (get_cur_block() != NULL) {
ir_node *jmp = new_Jmp();
ir_node *false_block = NULL;
if (statement->false_statement != NULL) {
false_block = new_immBlock();
+ set_cur_block(false_block);
statement_to_firm(statement->false_statement);
if (get_cur_block() != NULL) {
break_label = NULL;
ir_node *body_block = new_immBlock();
+ set_cur_block(body_block);
statement_to_firm(statement->body);
ir_node *false_block = break_label;
continue_label = header_block;
break_label = NULL;
+ set_cur_block(body_block);
statement_to_firm(statement->body);
ir_node *false_block = break_label;
create_condition_evaluation(statement->condition, body_block, false_block);
mature_immBlock(body_block);
mature_immBlock(header_block);
- if (false_block != NULL) {
- mature_immBlock(false_block);
- }
+ mature_immBlock(false_block);
set_cur_block(false_block);
}
/* create the step block */
ir_node *const step_block = new_immBlock();
+ set_cur_block(step_block);
if (statement->step != NULL) {
expression_to_firm(statement->step);
}
/* create the header block */
ir_node *const header_block = new_immBlock();
+ set_cur_block(header_block);
if (jmp != NULL) {
add_immBlock_pred(header_block, jmp);
}
ir_node *const false_block = new_immBlock();
/* the loop body */
- ir_node * body_block;
+ ir_node *body_block;
if (statement->body != NULL) {
ir_node *const old_continue_label = continue_label;
ir_node *const old_break_label = break_label;
break_label = false_block;
body_block = new_immBlock();
+ set_cur_block(body_block);
statement_to_firm(statement->body);
assert(continue_label == step_block);
static ir_node *get_break_label(void)
{
if (break_label == NULL) {
- ir_node *cur_block = get_cur_block();
break_label = new_immBlock();
- set_cur_block(cur_block);
}
return break_label;
}
ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp());
ir_node *proj;
- ir_node *old_block = get_nodes_block(current_switch_cond);
ir_node *block = new_immBlock();
- set_cur_block(old_block);
+ set_cur_block(get_nodes_block(current_switch_cond));
if (statement->expression != NULL) {
long pn = statement->first_case;
long end_pn = statement->last_case;
ir_asm_constraint constraint;
constraint.pos = pos;
constraint.constraint = new_id_from_str(buf);
- constraint.mode = get_ir_mode(expr->base.type);
+ constraint.mode = get_ir_mode_storage(expr->base.type);
tmp_in_constraints[in_size] = constraint;
ins[in_size] = value;
ir_asm_constraint constraint;
constraint.pos = pos;
constraint.constraint = new_id_from_str(constraints);
- constraint.mode = get_ir_mode(argument->expression->base.type);
+ constraint.mode = get_ir_mode_storage(argument->expression->base.type);
obstack_grow(&asm_obst, &constraint, sizeof(constraint));
}
for (i = 0; i < out_size; ++i) {
const expression_t *out_expr = out_exprs[i];
long pn = i;
- ir_mode *mode = get_ir_mode(out_expr->base.type);
+ ir_mode *mode = get_ir_mode_storage(out_expr->base.type);
ir_node *proj = new_Proj(node, mode, pn);
ir_node *addr = out_addrs[i];
case STATEMENT_LABEL:
label_to_firm(&statement->label);
return;
- case STATEMENT_LOCAL_LABEL:
- /* local labels transform the semantics of labels while parsing
- * they don't need any special treatment here */
- return;
case STATEMENT_GOTO:
goto_to_firm(&statement->gotos);
return;
leave_statement_to_firm(&statement->leave);
return;
}
- panic("Statement not implemented\n");
+ panic("statement not implemented");
}
static int count_local_variables(const entity_t *entity,
long pn = n;
ir_node *value = new_r_Proj(irg, start_block, args, param_mode, pn);
- ir_mode *mode = get_ir_mode(type);
+ ir_mode *mode = get_ir_mode_storage(type);
value = create_conv(NULL, value, mode);
value = do_strict_conv(NULL, value);
*/
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)) */
+ set_irg_additional_property(irg, mtp_property_returns_twice);
+ }
if (decl_modifiers & DM_NORETURN) {
/* TRUE if the declaration includes the Microsoft
__declspec(noreturn) specifier. */
current_function = irg;
set_irg_fp_model(irg, firm_opt.fp_model);
- tarval_enable_fp_ops((firm_opt.fp_model & fp_strict_algebraic) == 0);
+ tarval_enable_fp_ops(1);
set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity));
ir_node *first_block = get_cur_block();
} else {
ir_mode *mode;
if (is_type_scalar(return_type)) {
- mode = get_ir_mode(func_type->return_type);
+ mode = get_ir_mode_storage(func_type->return_type);
} else {
mode = mode_P_data;
}
ir_type_const_char = get_ir_type(type_const_char);
ir_type_wchar_t = get_ir_type(type_wchar_t);
ir_type_void = get_ir_type(type_void);
+
+ const backend_params *be_params = be_get_backend_param();
+ mode_float_arithmetic = be_params->mode_float_arithmetic;
}
void exit_ast2firm(void)
projects / cparser / blobdiff