X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype.c;h=f4a22ea7e58613941fe8d3cd4ace7057d98d8fe3;hb=6d63bdd8157d2b33e7395cd8e6c4e672b4bbfdb7;hp=9ef7daa6fb2b8b3e0d45b3d2c3685d92731ff5f6;hpb=52e7ec50679de00faaf7c25ab0e2b7ef1bcfdff8;p=libfirm

diff --git a/ir/tr/type.c b/ir/tr/type.c
index 9ef7daa6f..f4a22ea7e 100644
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -46,6 +46,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stddef.h>
+#include <stdbool.h>
 
 #include "type_t.h"
 
@@ -59,59 +60,49 @@
 #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;
 }
 
-void ir_init_type(void)
+void ir_init_type(ir_prog *irp)
 {
 	/* 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);
+	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);
+	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);
+	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;
-	}
+	/** 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)
@@ -129,7 +120,17 @@ void (inc_master_type_visited)(void)
 	_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;
@@ -157,13 +158,26 @@ ir_type *new_type(const tp_op *type_op, ir_mode *mode, type_dbg_info *db)
 	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. */
@@ -172,26 +186,12 @@ void free_type(ir_type *tp)
 	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);
@@ -238,7 +238,6 @@ void set_type_mode(ir_type *tp, ir_mode *mode)
 		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);
@@ -269,11 +268,7 @@ void set_type_visibility(ir_type *tp, ir_visibility v)
 void set_type_size_bytes(ir_type *tp, unsigned size)
 {
 	const tp_op *tpop = get_type_tpop(tp);
-
-	if (tpop->ops.set_type_size)
-		tpop->ops.set_type_size(tp, size);
-	else
-		assert(0 && "Cannot set size for this type");
+	tpop->ops.set_type_size(tp, size);
 }
 
 unsigned get_type_alignment_bytes(ir_type *tp)
@@ -427,7 +422,6 @@ int (is_type)(const void *thing)
 	return _is_type(thing);
 }
 
-/* Checks whether two types are structural equal.*/
 int equal_type(ir_type *typ1, ir_type *typ2)
 {
 	ir_entity **m;
@@ -1143,14 +1137,14 @@ ir_type *new_d_type_method(size_t n_param, size_t n_res, type_dbg_info *db)
 
 	assert((get_mode_size_bits(mode_P_code) % 8 == 0) && "unorthodox modes not implemented");
 	res = new_type(type_method, mode_P_code, db);
-	res->flags                       |= tf_layout_fixed;
-	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.n_res                = n_res;
-	res->attr.ma.res_type             = XMALLOCNZ(tp_ent_pair, n_res);
-	res->attr.ma.variadicity          = variadicity_non_variadic;
-	res->attr.ma.additional_properties = mtp_no_property;
+	res->flags               |= tf_layout_fixed;
+	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.n_res        = n_res;
+	res->attr.ma.res_type     = XMALLOCNZ(tp_ent_pair, n_res);
+	res->attr.ma.variadicity  = variadicity_non_variadic;
+	res->attr.ma.properties   = mtp_no_property;
 	hook_new_type(res);
 	return res;
 }
@@ -1177,18 +1171,18 @@ ir_type *clone_type_method(ir_type *tp)
 
 	res = new_type(type_method, mode, db);
 
-	res->flags                         = tp->flags;
-	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);
+	res->flags                    = tp->flags;
+	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.n_res                 = n_res;
-	res->attr.ma.res_type              = XMALLOCN(tp_ent_pair, n_res);
+	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.variadicity           = tp->attr.ma.variadicity;
-	res->attr.ma.additional_properties = tp->attr.ma.additional_properties;
-	res->attr.ma.irg_calling_conv      = tp->attr.ma.irg_calling_conv;
+	res->attr.ma.variadicity      = tp->attr.ma.variadicity;
+	res->attr.ma.properties       = tp->attr.ma.properties;
+	res->attr.ma.irg_calling_conv = tp->attr.ma.irg_calling_conv;
 	hook_new_type(res);
 	return res;
 }
@@ -1463,7 +1457,7 @@ ir_type *new_type_array(size_t n_dimensions, ir_type *element_type)
 
 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));
 }
 
@@ -1481,7 +1475,6 @@ void free_array_attrs(ir_type *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);
@@ -1491,7 +1484,7 @@ size_t get_array_n_dimensions(const ir_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);
@@ -1511,7 +1504,7 @@ void set_array_bounds_int(ir_type *array, size_t dimension, int lower_bound,
 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;
 }
@@ -1525,7 +1518,7 @@ void set_array_lower_bound_int(ir_type *array, size_t dimension, int 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;
 }
@@ -1539,20 +1532,20 @@ void set_array_upper_bound_int(ir_type *array, size_t dimension, int 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));
@@ -1560,20 +1553,20 @@ long get_array_lower_bound_int(const ir_type *array, size_t dimension)
 
 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));
@@ -1581,13 +1574,13 @@ long get_array_upper_bound_int(const ir_type *array, size_t dimension)
 
 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;
 }
 
 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];
 }
 
@@ -1606,20 +1599,20 @@ size_t find_array_dimension(const ir_type *array, size_t order)
 
 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);
@@ -1627,10 +1620,23 @@ void set_array_element_entity(ir_type *array, ir_entity *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);
@@ -1825,11 +1831,10 @@ ir_type *find_pointer_type_to_type(ir_type *tp)
 		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);
@@ -1897,6 +1902,19 @@ size_t get_compound_member_index(const ir_type *tp, ir_entity *member)
 	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);
@@ -1938,14 +1956,24 @@ void add_compound_member(ir_type *compound, ir_entity *entity)
 	}
 }
 
-
-
 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_unknown_type(const ir_type *tp)
+{
+	assert(tp->kind == k_type);
+	return tp->type_op == tpop_unknown;
+}
+
+int is_none_type(const ir_type *tp)
+{
+	assert(tp->kind == k_type);
+	return tp->type_op == tpop_none;
+}
+
 int is_frame_type(const ir_type *tp)
 {
 	return tp->flags & tf_frame_type;
@@ -1989,21 +2017,29 @@ void set_default_size(ir_type *tp, unsigned 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);
@@ -2011,7 +2047,7 @@ void default_layout_compound_type(ir_type *type)
 
 		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) {
@@ -2031,30 +2067,29 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment,
 	ir_type *tp;
 	ident *name;
 	char buf[32];
-	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);
 
-	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 frame_align = get_type_alignment_bytes(frame_type);
 		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) {
@@ -2065,13 +2100,6 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment,
 		/* calculate offset and new type size */
 		offset = 0;
 		frame_size += delta;
-
-		/* 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);
-		}
 	} else {
 		/* calculate offset and new type size */
 		offset = (frame_size + alignment - 1) & ~(alignment - 1);
@@ -2081,6 +2109,9 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment,
 	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);