* @file type.c
* @brief Representation of types.
* @author Goetz Lindenmaier, Michael Beck
- * @version $Id$
* @brief
*
* Implementation of the datastructure to hold
#include <string.h>
#include <stdlib.h>
#include <stddef.h>
+#include <stdbool.h>
#include "type_t.h"
#include "tpop_t.h"
#include "tv_t.h"
#include "irhooks.h"
-#include "irtools.h"
+#include "util.h"
#include "entity_t.h"
#include "error.h"
#include "dbginfo.h"
+#include "irprog_t.h"
#include "array.h"
-ir_type *firm_none_type;
+static ir_type *new_type(tp_op const *type_op, ir_mode *mode, type_dbg_info *db);
+
ir_type *get_none_type(void)
{
- return firm_none_type;
+ return irp->none_type;
}
-ir_type *firm_code_type;
ir_type *get_code_type(void)
{
- return firm_code_type;
+ return irp->code_type;
}
-ir_type *firm_unknown_type;
ir_type *get_unknown_type(void)
{
- return firm_unknown_type;
+ return irp->unknown_type;
}
-/* Suffixes added to types used for pass-by-value representations. */
-static ident *value_params_suffix = NULL;
-static ident *value_ress_suffix = NULL;
-
-void ir_init_type(void)
+void ir_init_type(ir_prog *irp)
{
- value_params_suffix = new_id_from_str(VALUE_PARAMS_SUFFIX);
- value_ress_suffix = new_id_from_str(VALUE_RESS_SUFFIX);
-
/* construct none and unknown type. */
- firm_none_type = new_type(tpop_none, mode_BAD, NULL);
- set_type_size_bytes(firm_none_type, 0);
- set_type_state (firm_none_type, layout_fixed);
- remove_irp_type(firm_none_type);
+ irp->none_type = new_type(tpop_none, mode_BAD, NULL);
+ set_type_size_bytes(irp->none_type, 0);
+ set_type_state (irp->none_type, layout_fixed);
- firm_code_type = new_type(tpop_code, mode_ANY, NULL);
- set_type_state(firm_code_type, layout_fixed);
- remove_irp_type(firm_code_type);
+ irp->code_type = new_type(tpop_code, mode_ANY, NULL);
+ set_type_state(irp->code_type, layout_fixed);
- firm_unknown_type = new_type(tpop_unknown, mode_ANY, NULL);
- set_type_size_bytes(firm_unknown_type, 0);
- set_type_state (firm_unknown_type, layout_fixed);
- remove_irp_type(firm_unknown_type);
+ irp->unknown_type = new_type(tpop_unknown, mode_ANY, NULL);
+ set_type_size_bytes(irp->unknown_type, 0);
+ set_type_state (irp->unknown_type, layout_fixed);
}
-void ir_finish_type(void)
+void ir_finish_type(ir_prog *irp)
{
- if (firm_none_type != NULL) {
- free_type(firm_none_type);
- firm_none_type = NULL;
- }
- if (firm_code_type != NULL) {
- free_type(firm_code_type);
- firm_code_type = NULL;
- }
- if (firm_unknown_type != NULL) {
- free_type(firm_unknown_type);
- firm_unknown_type = NULL;
- }
- value_params_suffix = NULL;
- value_ress_suffix = NULL;
+ /** nothing todo. (The none, code, unknown types are in the global type list
+ * and freed there */
+ (void)irp;
}
-/** the global type visited flag */
ir_visited_t firm_type_visited;
void (set_master_type_visited)(ir_visited_t val)
_inc_master_type_visited();
}
-ir_type *new_type(const tp_op *type_op, ir_mode *mode, type_dbg_info *db)
+/**
+ * Creates a new type representation:
+ *
+ * @param type_op the kind of this type. May not be type_id.
+ * @param mode the mode to be used for this type, may be NULL
+ * @param db debug info
+ *
+ * @return A new type of the given type. The remaining private attributes are
+ * not initialized. The type is in state layout_undefined.
+ */
+static ir_type *new_type(tp_op const *type_op, ir_mode *mode, type_dbg_info *db)
{
ir_type *res;
size_t node_size;
res->visit = 0;
res->link = NULL;
res->dbi = db;
- res->assoc_type = NULL;
#ifdef DEBUG_libfirm
res->nr = get_irp_new_node_nr();
#endif /* defined DEBUG_libfirm */
return res;
}
+void free_type_entities(ir_type *tp)
+{
+ const tp_op *op = get_type_tpop(tp);
+ if (op->ops.free_entities != NULL)
+ op->ops.free_entities(tp);
+}
+
+static void free_type_attrs(ir_type *tp)
+{
+ const tp_op *tpop = get_type_tpop(tp);
+
+ if (tpop->ops.free_attrs)
+ tpop->ops.free_attrs(tp);
+}
+
void free_type(ir_type *tp)
{
const tp_op *op = get_type_tpop(tp);
- if ((get_type_tpop(tp) == tpop_none) || (get_type_tpop(tp) == tpop_unknown)
- || (get_type_tpop(tp) == tpop_code))
- return;
+ free_type_entities(tp);
/* Remove from list of all types */
remove_irp_type(tp);
/* Free the attributes of the type. */
if (op->ops.free_auto_entities)
op->ops.free_auto_entities(tp);
/* And now the type itself... */
+#ifdef DEBUG_libfirm
tp->kind = k_BAD;
+#endif
free(tp);
}
-void free_type_entities(ir_type *tp)
-{
- const tp_op *tpop = get_type_tpop(tp);
-
- if (tpop->ops.free_entities)
- tpop->ops.free_entities(tp);
-}
-
-void free_type_attrs(ir_type *tp)
-{
- const tp_op *tpop = get_type_tpop(tp);
-
- if (tpop->ops.free_attrs)
- tpop->ops.free_attrs(tp);
-}
-
void *(get_type_link)(const ir_type *tp)
{
return _get_type_link(tp);
assert(0 && "setting a mode is NOT allowed for this type");
}
-/* Outputs a unique number for this node */
long get_type_nr(const ir_type *tp)
{
assert(tp);
const char *get_type_state_name(ir_type_state s)
{
-#define X(a) case a: return #a;
+#define X(a) case a: return #a
switch (s) {
X(layout_undefined);
X(layout_fixed);
return _is_type(thing);
}
-/* Checks whether two types are structural equal.*/
int equal_type(ir_type *typ1, ir_type *typ2)
{
ir_entity **m;
if (get_method_calling_convention(typ1) !=
get_method_calling_convention(typ2)) return 0;
- if (get_method_variadicity(typ1) == variadicity_non_variadic) {
- n_param1 = get_method_n_params(typ1);
- n_param2 = get_method_n_params(typ2);
- } else {
- n_param1 = get_method_first_variadic_param_index(typ1);
- n_param2 = get_method_first_variadic_param_index(typ2);
- }
+ n_param1 = get_method_n_params(typ1);
+ n_param2 = get_method_n_params(typ2);
if (n_param1 != n_param2) return 0;
if (get_method_calling_convention(st) !=
get_method_calling_convention(lt)) return 0;
- if (get_method_variadicity(st) == variadicity_non_variadic) {
- n_param1 = get_method_n_params(st);
- n_param2 = get_method_n_params(lt);
- } else {
- n_param1 = get_method_first_variadic_param_index(st);
- n_param2 = get_method_first_variadic_param_index(lt);
- }
+ n_param1 = get_method_n_params(st);
+ n_param2 = get_method_n_params(lt);
if (n_param1 != n_param2) return 0;
tp->size = size;
}
-
-/**
- * Lazy construction of value argument / result representation.
- * Constructs a struct type and its member. The types of the members
- * are passed in the argument list.
- *
- * @param name name of the type constructed
- * @param len number of fields
- * @param tps array of field types with length len
- */
-static ir_type *build_value_type(char const* name, size_t len, tp_ent_pair *tps)
-{
- size_t i;
- ir_type *res = new_type_struct(new_id_from_str(name));
- res->flags |= tf_value_param_type;
- /* Remove type from type list. Must be treated differently than other types. */
- remove_irp_type(res);
- for (i = 0; i < len; ++i) {
- ident *id = tps[i].param_name;
-
- /* use res as default if corresponding type is not yet set. */
- ir_type *elt_type = tps[i].tp ? tps[i].tp : res;
-
- /* use the parameter name if specified */
- if (id == NULL) {
- id = new_id_from_str("elt");
- }
- tps[i].ent = new_entity(res, id, elt_type);
- set_entity_allocation(tps[i].ent, allocation_parameter);
- }
- return res;
-}
-
ir_type *new_d_type_method(size_t n_param, size_t n_res, type_dbg_info *db)
{
ir_type *res;
res->size = get_mode_size_bytes(mode_P_code);
res->attr.ma.n_params = n_param;
res->attr.ma.params = XMALLOCNZ(tp_ent_pair, n_param);
- res->attr.ma.value_params = NULL;
res->attr.ma.n_res = n_res;
res->attr.ma.res_type = XMALLOCNZ(tp_ent_pair, n_res);
- res->attr.ma.value_ress = NULL;
res->attr.ma.variadicity = variadicity_non_variadic;
- res->attr.ma.first_variadic_param = -1;
res->attr.ma.additional_properties = mtp_no_property;
hook_new_type(res);
return res;
res = new_type(type_method, mode, db);
res->flags = tp->flags;
- res->assoc_type = tp->assoc_type;
+ res->higher_type = tp->higher_type;
res->size = tp->size;
res->attr.ma.n_params = n_params;
res->attr.ma.params = XMALLOCN(tp_ent_pair, n_params);
memcpy(res->attr.ma.params, tp->attr.ma.params, n_params * sizeof(res->attr.ma.params[0]));
- res->attr.ma.value_params = tp->attr.ma.value_params;
res->attr.ma.n_res = n_res;
res->attr.ma.res_type = XMALLOCN(tp_ent_pair, n_res);
memcpy(res->attr.ma.res_type, tp->attr.ma.res_type, n_res * sizeof(res->attr.ma.res_type[0]));
- res->attr.ma.value_ress = tp->attr.ma.value_ress;
res->attr.ma.variadicity = tp->attr.ma.variadicity;
- res->attr.ma.first_variadic_param = tp->attr.ma.first_variadic_param;
res->attr.ma.additional_properties = tp->attr.ma.additional_properties;
res->attr.ma.irg_calling_conv = tp->attr.ma.irg_calling_conv;
hook_new_type(res);
assert(method && (method->type_op == type_method));
free(method->attr.ma.params);
free(method->attr.ma.res_type);
- /* cannot free it yet, type could be cloned ...
- if (method->attr.ma.value_params) {
- free_type_entities(method->attr.ma.value_params);
- free_type(method->attr.ma.value_params);
- }
- */
- if (method->attr.ma.value_ress) {
- free_type_entities(method->attr.ma.value_ress);
- free_type(method->attr.ma.value_ress);
- }
}
size_t (get_method_n_params)(const ir_type *method)
return _get_method_n_params(method);
}
-ir_type *get_method_param_type(ir_type *method, size_t pos)
+ir_type *get_method_param_type(const ir_type *method, size_t pos)
{
ir_type *res;
assert(method->type_op == type_method);
assert(method->type_op == type_method);
assert(pos < get_method_n_params(method));
method->attr.ma.params[pos].tp = tp;
- /* If information constructed set pass-by-value representation. */
- if (method->attr.ma.value_params) {
- assert(get_method_n_params(method) == get_struct_n_members(method->attr.ma.value_params));
- set_entity_type(get_struct_member(method->attr.ma.value_params, pos), tp);
- }
-}
-
-ident *get_method_param_ident(ir_type *method, size_t pos)
-{
- assert(method->type_op == type_method);
- assert(pos < get_method_n_params(method));
- return method->attr.ma.params[pos].param_name;
-}
-
-const char *get_method_param_name(ir_type *method, size_t pos)
-{
- ident *id = get_method_param_ident(method, pos);
- return id ? get_id_str(id) : NULL;
-}
-
-void set_method_param_ident(ir_type *method, size_t pos, ident *id)
-{
- assert(method->type_op == type_method);
- assert(pos < get_method_n_params(method));
- method->attr.ma.params[pos].param_name = id;
-}
-
-ir_entity *get_method_value_param_ent(ir_type *method, size_t pos)
-{
- assert(method && (method->type_op == type_method));
- assert(pos < get_method_n_params(method));
-
- if (!method->attr.ma.value_params) {
- /* parameter value type not created yet, build */
- method->attr.ma.value_params = build_value_type("<value param>",
- get_method_n_params(method), method->attr.ma.params);
- }
- /*
- * build_value_type() sets the method->attr.ma.value_params type as default if
- * no type is set!
- */
- assert((get_entity_type(method->attr.ma.params[pos].ent) != method->attr.ma.value_params)
- && "param type not yet set");
- return method->attr.ma.params[pos].ent;
-}
-
-void set_method_value_param_type(ir_type *method, ir_type *tp)
-{
- size_t i;
- size_t n;
-
- assert(method && (method->type_op == type_method));
- assert(is_value_param_type(tp));
- assert(get_method_n_params(method) == get_struct_n_members(tp));
-
- method->attr.ma.value_params = tp;
-
- n = get_struct_n_members(tp);
- for (i = 0; i < n; i++) {
- ir_entity *ent = get_struct_member(tp, i);
- method->attr.ma.params[i].ent = ent;
- }
-}
-
-ir_type *get_method_value_param_type(const ir_type *method)
-{
- assert(method && (method->type_op == type_method));
- return method->attr.ma.value_params;
}
size_t (get_method_n_ress)(const ir_type *method)
return _get_method_n_ress(method);
}
-ir_type *get_method_res_type(ir_type *method, size_t pos)
+ir_type *get_method_res_type(const ir_type *method, size_t pos)
{
ir_type *res;
assert(method->type_op == type_method);
/* set the result ir_type */
method->attr.ma.res_type[pos].tp = tp;
/* If information constructed set pass-by-value representation. */
- if (method->attr.ma.value_ress) {
- assert(get_method_n_ress(method) == get_struct_n_members(method->attr.ma.value_ress));
- set_entity_type(get_struct_member(method->attr.ma.value_ress, pos), tp);
- }
-}
-
-ir_entity *get_method_value_res_ent(ir_type *method, size_t pos)
-{
- assert(method->type_op == type_method);
- assert(pos < get_method_n_ress(method));
-
- if (!method->attr.ma.value_ress) {
- /* result value type not created yet, build */
- method->attr.ma.value_ress = build_value_type("<value result>",
- get_method_n_ress(method), method->attr.ma.res_type);
- }
- /*
- * build_value_type() sets the method->attr.ma.value_ress type as default if
- * no type is set!
- */
- assert((get_entity_type(method->attr.ma.res_type[pos].ent) != method->attr.ma.value_ress)
- && "result type not yet set");
-
- return method->attr.ma.res_type[pos].ent;
-}
-
-ir_type *get_method_value_res_type(const ir_type *method)
-{
- assert(method->type_op == type_method);
- return method->attr.ma.value_ress;
}
const char *get_variadicity_name(ir_variadicity vari)
method->attr.ma.variadicity = vari;
}
-size_t get_method_first_variadic_param_index(const ir_type *method)
-{
- assert(method->type_op == type_method);
-
- if (method->attr.ma.variadicity == variadicity_non_variadic)
- return (size_t)-1;
-
- if (method->attr.ma.first_variadic_param == (size_t)-1)
- return get_method_n_params(method);
- return method->attr.ma.first_variadic_param;
-}
-
-void set_method_first_variadic_param_index(ir_type *method, size_t index)
-{
- assert(method->type_op == type_method);
- assert(index <= get_method_n_params(method));
-
- method->attr.ma.first_variadic_param = index;
-}
-
mtp_additional_properties (get_method_additional_properties)(const ir_type *method)
{
return _get_method_additional_properties(method);
-ir_type *new_d_type_array(int n_dimensions, ir_type *element_type,
+ir_type *new_d_type_array(size_t n_dimensions, ir_type *element_type,
type_dbg_info *db)
{
ir_type *res;
- int i;
+ size_t i;
ir_node *unk;
ir_graph *irg = get_const_code_irg();
res->attr.aa.n_dimensions = n_dimensions;
res->attr.aa.lower_bound = XMALLOCNZ(ir_node*, n_dimensions);
res->attr.aa.upper_bound = XMALLOCNZ(ir_node*, n_dimensions);
- res->attr.aa.order = XMALLOCNZ(int, n_dimensions);
+ res->attr.aa.order = XMALLOCNZ(size_t, n_dimensions);
unk = new_r_Unknown(irg, mode_Iu);
for (i = 0; i < n_dimensions; i++) {
return res;
}
-ir_type *new_type_array(int n_dimensions, ir_type *element_type)
+ir_type *new_type_array(size_t n_dimensions, ir_type *element_type)
{
return new_d_type_array(n_dimensions, element_type, NULL);
}
void free_array_automatic_entities(ir_type *array)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
free_entity(get_array_element_entity(array));
}
free(array->attr.aa.order);
}
-/* manipulate private fields of array ir_type */
size_t get_array_n_dimensions(const ir_type *array)
{
assert(array->type_op == type_array);
void set_array_bounds(ir_type *array, size_t dimension, ir_node *lower_bound,
ir_node *upper_bound)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
assert(lower_bound && "lower_bound node may not be NULL.");
assert(upper_bound && "upper_bound node may not be NULL.");
assert(dimension < array->attr.aa.n_dimensions);
void set_array_lower_bound(ir_type *array, size_t dimension,
ir_node *lower_bound)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
assert(lower_bound && "lower_bound node may not be NULL.");
array->attr.aa.lower_bound[dimension] = lower_bound;
}
void set_array_upper_bound(ir_type *array, size_t dimension, ir_node *upper_bound)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
assert(upper_bound && "upper_bound node may not be NULL.");
array->attr.aa.upper_bound[dimension] = upper_bound;
}
int has_array_lower_bound(const ir_type *array, size_t dimension)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
return !is_Unknown(array->attr.aa.lower_bound[dimension]);
}
ir_node *get_array_lower_bound(const ir_type *array, size_t dimension)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
return array->attr.aa.lower_bound[dimension];
}
long get_array_lower_bound_int(const ir_type *array, size_t dimension)
{
ir_node *node;
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
node = array->attr.aa.lower_bound[dimension];
assert(is_Const(node));
return get_tarval_long(get_Const_tarval(node));
int has_array_upper_bound(const ir_type *array, size_t dimension)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
return !is_Unknown(array->attr.aa.upper_bound[dimension]);
}
ir_node *get_array_upper_bound(const ir_type *array, size_t dimension)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
return array->attr.aa.upper_bound[dimension];
}
long get_array_upper_bound_int(const ir_type *array, size_t dimension)
{
ir_node *node;
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
node = array->attr.aa.upper_bound[dimension];
assert(is_Const(node));
return get_tarval_long(get_Const_tarval(node));
}
-void set_array_order(ir_type *array, size_t dimension, int order)
+void set_array_order(ir_type *array, size_t dimension, size_t order)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
array->attr.aa.order[dimension] = order;
}
-int get_array_order(const ir_type *array, size_t dimension)
+size_t get_array_order(const ir_type *array, size_t dimension)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
return array->attr.aa.order[dimension];
}
-size_t find_array_dimension(const ir_type *array, int order)
+size_t find_array_dimension(const ir_type *array, size_t order)
{
size_t dim;
void set_array_element_type(ir_type *array, ir_type *tp)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
assert(!is_Method_type(tp));
array->attr.aa.element_type = tp;
}
ir_type *get_array_element_type(const ir_type *array)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
return array->attr.aa.element_type;
}
void set_array_element_entity(ir_type *array, ir_entity *ent)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
assert((get_entity_type(ent)->type_op != type_method));
array->attr.aa.element_ent = ent;
array->attr.aa.element_type = get_entity_type(ent);
ir_entity *get_array_element_entity(const ir_type *array)
{
- assert(array && (array->type_op == type_array));
+ assert(array->type_op == type_array);
return array->attr.aa.element_ent;
}
+int is_array_variable_size(const ir_type *array)
+{
+ assert(array->type_op == type_array);
+ return (array->flags & tf_variable_size) != 0;
+}
+
+void set_array_variable_size(ir_type *array, int flag)
+{
+ assert(array->type_op == type_array);
+ array->flags = (array->flags & ~tf_variable_size)
+ | (flag != 0 ? tf_variable_size : 0);
+}
+
int (is_Array_type)(const ir_type *array)
{
return _is_array_type(array);
if (is_Pointer_type(found) && get_pointer_points_to_type(found) == tp)
return (found);
}
- return firm_unknown_type;
+ return get_unknown_type();
}
-
ir_type *new_d_type_primitive(ir_mode *mode, type_dbg_info *db)
{
ir_type *res = new_type(type_primitive, mode, db);
return op->ops.get_member_index(tp, member);
}
+void set_compound_variable_size(ir_type *tp, int variable_size_flag)
+{
+ assert(is_compound_type(tp));
+ tp->flags = (tp->flags & ~tf_variable_size)
+ | (variable_size_flag != 0 ? tf_variable_size : 0);
+}
+
+int is_compound_variable_size(const ir_type *tp)
+{
+ assert(is_compound_type(tp));
+ return (tp->flags & tf_variable_size) != 0;
+}
+
int is_compound_type(const ir_type *tp)
{
assert(tp->kind == k_type);
}
}
-
-
int is_code_type(const ir_type *tp)
{
- assert(tp && tp->kind == k_type);
+ assert(tp->kind == k_type);
return tp->type_op == tpop_code;
}
-int is_frame_type(const ir_type *tp)
+int is_unknown_type(const ir_type *tp)
{
- return tp->flags & tf_frame_type;
-}
-
-int is_value_param_type(const ir_type *tp)
-{
- return tp->flags & tf_value_param_type;
+ assert(tp->kind == k_type);
+ return tp->type_op == tpop_unknown;
}
-int is_lowered_type(const ir_type *tp)
+int is_none_type(const ir_type *tp)
{
- return tp->flags & tf_lowered_type;
+ assert(tp->kind == k_type);
+ return tp->type_op == tpop_none;
}
-ir_type *new_type_value(void)
+int is_frame_type(const ir_type *tp)
{
- ir_type *res = new_type_struct(new_id_from_str("<value_type>"));
-
- res->flags |= tf_value_param_type;
-
- /* Remove type from type list. Must be treated differently than other types. */
- remove_irp_type(res);
-
- return res;
+ return tp->flags & tf_frame_type;
}
ir_type *new_type_frame(void)
res->flags |= tf_frame_type;
- /* Remove type from type list. Must be treated differently than other types. */
- remove_irp_type(res);
-
/* It is not possible to derive from the frame type. Set the final flag. */
set_class_final(res, 1);
assert(is_frame_type(type));
/* the entity link resource should be allocated if this function is called */
- assert(irp_resources_reserved(irp) & IR_RESOURCE_ENTITY_LINK);
+ assert(irp_resources_reserved(irp) & IRP_RESOURCE_ENTITY_LINK);
res = new_type_frame();
for (i = 0, n = get_class_n_members(type); i < n; ++i) {
return res;
}
-void set_lowered_type(ir_type *tp, ir_type *lowered_type)
-{
- assert(is_type(tp) && is_type(lowered_type));
- lowered_type->flags |= tf_lowered_type;
- tp->assoc_type = lowered_type;
- lowered_type->assoc_type = tp;
-}
-
-ir_type *get_associated_type(const ir_type *tp)
-{
- return tp->assoc_type;
-}
-
void set_default_size(ir_type *tp, unsigned size)
{
tp->size = size;
void default_layout_compound_type(ir_type *type)
{
- size_t i;
- size_t n = get_compound_n_members(type);
- int size = 0;
+ size_t i;
+ size_t n = get_compound_n_members(type);
+ int size = 0;
unsigned align_all = 1;
+ bool var_size = is_compound_variable_size(type);
for (i = 0; i < n; ++i) {
ir_entity *entity = get_compound_member(type, i);
ir_type *entity_type = get_entity_type(entity);
unsigned align;
unsigned misalign;
+ unsigned entity_size;
if (is_Method_type(entity_type))
continue;
- assert(get_type_state(entity_type) == layout_fixed);
+ if (i+1 < n || !var_size) {
+ assert(get_type_state(entity_type) == layout_fixed);
+ entity_size = get_type_size_bytes(entity_type);
+ } else {
+ entity_size = 0;
+ }
+
align = get_type_alignment_bytes(entity_type);
align_all = align > align_all ? align : align_all;
misalign = (align ? size % align : 0);
set_entity_offset(entity, size);
if (!is_Union_type(type)) {
- size += get_type_size_bytes(entity_type);
+ size += entity_size;
}
}
if (align_all > 0 && size % align_all) {
ir_type *tp;
ident *name;
char buf[32];
- unsigned frame_align;
- int offset, frame_size;
+ int offset;
+ unsigned frame_size = get_type_size_bytes(frame_type);
+ unsigned frame_align = get_type_alignment_bytes(frame_type);
static unsigned area_cnt = 0;
- static ir_type *a_byte = NULL;
assert(is_frame_type(frame_type));
assert(get_type_state(frame_type) == layout_fixed);
assert(get_type_alignment_bytes(frame_type) > 0);
set_type_state(frame_type, layout_undefined);
- if (! a_byte)
- a_byte = new_type_primitive(mode_Bu);
+ if (irp->byte_type == NULL)
+ irp->byte_type = new_type_primitive(mode_Bu);
snprintf(buf, sizeof(buf), "area%u", area_cnt++);
name = new_id_from_str(buf);
- /* align the size */
- frame_align = get_type_alignment_bytes(frame_type);
- size = (size + frame_align - 1) & ~(frame_align - 1);
-
- tp = new_type_array(1, a_byte);
+ tp = new_type_array(1, irp->byte_type);
set_array_bounds_int(tp, 0, 0, size);
set_type_alignment_bytes(tp, alignment);
+ set_type_size_bytes(tp, size);
- frame_size = get_type_size_bytes(frame_type);
if (at_start) {
size_t i, n;
+ unsigned delta = (size + frame_align - 1) & ~(frame_align - 1);
/* fix all offsets so far */
for (i = 0, n = get_class_n_members(frame_type); i < n; ++i) {
ir_entity *ent = get_class_member(frame_type, i);
- set_entity_offset(ent, get_entity_offset(ent) + size);
+ set_entity_offset(ent, get_entity_offset(ent) + delta);
}
/* calculate offset and new type size */
offset = 0;
- frame_size += size;
-
- /* increase size to match alignment... */
- if (alignment > frame_align) {
- frame_align = alignment;
- set_type_alignment_bytes(frame_type, frame_align);
- frame_size = (frame_size + frame_align - 1) & ~(frame_align - 1);
- }
+ frame_size += delta;
} else {
/* calculate offset and new type size */
offset = (frame_size + alignment - 1) & ~(alignment - 1);
area = new_entity(frame_type, name, tp);
set_entity_offset(area, offset);
set_type_size_bytes(frame_type, frame_size);
+ if (alignment > frame_align) {
+ set_type_alignment_bytes(frame_type, alignment);
+ }
/* mark this entity as compiler generated */
set_entity_compiler_generated(area, 1);
projects / libfirm / blobdiff