/*
- * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
}
/** the global type visited flag */
-unsigned long firm_type_visited;
+ir_visited_t firm_type_visited;
-void (set_master_type_visited)(unsigned long val) { _set_master_type_visited(val); }
-unsigned long (get_master_type_visited)(void) { return _get_master_type_visited(); }
-void (inc_master_type_visited)(void) { _inc_master_type_visited(); }
+void (set_master_type_visited)(ir_visited_t val) { _set_master_type_visited(val); }
+ir_visited_t (get_master_type_visited)(void) { return _get_master_type_visited(); }
+void (inc_master_type_visited)(void) { _inc_master_type_visited(); }
/*
* Creates a new type representation.
tp->flags &= ~tf_layout_fixed;
}
-unsigned long (get_type_visited)(const ir_type *tp) {
+ir_visited_t (get_type_visited)(const ir_type *tp) {
return _get_type_visited(tp);
}
-void (set_type_visited)(ir_type *tp, unsigned long num) {
+void (set_type_visited)(ir_type *tp, ir_visited_t num) {
_set_type_visited(tp, num);
}
void add_class_member(ir_type *clss, ir_entity *member) {
assert(clss && (clss->type_op == type_class));
assert(clss != get_entity_type(member) && "recursive type");
+ assert(get_type_state(clss) != layout_fixed);
ARR_APP1 (ir_entity *, clss->attr.ca.members, member);
}
assert(strct && (strct->type_op == type_struct));
assert(get_type_tpop(get_entity_type(member)) != type_method);
assert(strct != get_entity_type(member) && "recursive type");
+ assert(get_type_state(strct) != layout_fixed);
ARR_APP1 (ir_entity *, strct->attr.sa.members, member);
}
ir_type *new_d_type_method(ident *name, int n_param, int n_res, dbg_info *db) {
ir_type *res;
- assert((get_mode_size_bytes(mode_P_code) != -1) && "unorthodox modes not implemented");
+ assert((get_mode_size_bits(mode_P_code) % 8 == 0) && "unorthodox modes not implemented");
res = new_type(type_method, mode_P_code, name, 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 = xcalloc(n_param, sizeof(res->attr.ma.params[0]));
+ 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 = xcalloc(n_res, sizeof(res->attr.ma.res_type[0]));
+ 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;
name = tp->name;
if (prefix != NULL)
- mangle(prefix, name);
+ name = mangle(prefix, name);
mode = tp->mode;
n_params = tp->attr.ma.n_params;
res = new_type(type_method, mode, name, db);
res->flags = tp->flags;
+ res->assoc_type = tp->assoc_type;
res->size = tp->size;
- res->attr.ma.params = xcalloc(n_params, sizeof(res->attr.ma.params[0]));
+ 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.res_type = xcalloc(n_res, sizeof(res->attr.ma.res_type[0]));
+ 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;
void add_union_member(ir_type *uni, ir_entity *member) {
assert(uni && (uni->type_op == type_union));
assert(uni != get_entity_type(member) && "recursive type");
+ assert(get_type_state(uni) != layout_fixed);
ARR_APP1(ir_entity *, uni->attr.ua.members, member);
}
res = new_type(type_array, NULL, name, db);
res->attr.aa.n_dimensions = n_dimensions;
- res->attr.aa.lower_bound = xcalloc(n_dimensions, sizeof(*res->attr.aa.lower_bound));
- res->attr.aa.upper_bound = xcalloc(n_dimensions, sizeof(*res->attr.aa.upper_bound));
- res->attr.aa.order = xcalloc(n_dimensions, sizeof(*res->attr.aa.order));
+ 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);
current_ir_graph = get_const_code_irg();
unk = new_Unknown(mode_Iu);
int has_array_lower_bound(const ir_type *array, int dimension) {
assert(array && (array->type_op == type_array));
- return (get_irn_op(array->attr.aa.lower_bound[dimension]) != op_Unknown);
+ return !is_Unknown(array->attr.aa.lower_bound[dimension]);
}
ir_node *get_array_lower_bound(const ir_type *array, int dimension) {
ir_node *node;
assert(array && (array->type_op == type_array));
node = array->attr.aa.lower_bound[dimension];
- assert(get_irn_op(node) == op_Const);
+ assert(is_Const(node));
return get_tarval_long(get_Const_tarval(node));
}
int has_array_upper_bound(const ir_type *array, int dimension) {
assert(array && (array->type_op == type_array));
- return get_irn_op(array->attr.aa.upper_bound[dimension]) != op_Unknown;
+ return !is_Unknown(array->attr.aa.upper_bound[dimension]);
}
ir_node *get_array_upper_bound(const ir_type *array, int dimension) {
ir_node *node;
assert(array && (array->type_op == type_array));
node = array->attr.aa.upper_bound[dimension];
- assert(get_irn_op(node) == op_Const);
+ assert(is_Const(node));
return get_tarval_long(get_Const_tarval(node));
}
void set_enumeration_mode(ir_type *tp, ir_mode *mode) {
assert(mode_is_int(mode) && "Modes of enumerations must be integers");
/* For pointer and enumeration size depends on the mode, but only byte size allowed. */
- assert((get_mode_size_bits(mode) & 7) == 0 && "unorthodox modes not implemented");
+ assert((get_mode_size_bits(mode) % 8) == 0 && "unorthodox modes not implemented");
tp->size = get_mode_size_bytes(mode);
tp->mode = mode;
assert(mode_is_reference(ptr_mode));
res = new_type(type_pointer, ptr_mode, name, db);
res->attr.pa.points_to = points_to;
- assert((get_mode_size_bytes(res->mode) != -1) && "unorthodox modes not implemented");
+ assert((get_mode_size_bits(res->mode) % 8 == 0) && "unorthodox modes not implemented");
res->size = get_mode_size_bytes(res->mode);
res->flags |= tf_layout_fixed;
hook_new_type(res);
return res;
}
+/* Makes a clone of a frame type. */
+ir_type *clone_frame_type(ir_type *type) {
+ ir_type *res;
+ int i, n;
+
+ assert(is_frame_type(type));
+
+ res = new_type_frame(type->name);
+ for (i = 0, n = get_class_n_members(type); i < n; ++i) {
+ ir_entity *ent = get_class_member(type, i);
+ ir_entity *nent = copy_entity_own(ent, res);
+ set_entity_link(ent, nent);
+ set_entity_link(nent, ent);
+ }
+ return res;
+}
+
/* Sets a lowered type for a type. This sets both associations. */
void set_lowered_type(ir_type *tp, ir_type *lowered_type) {
assert(is_type(tp) && is_type(lowered_type));
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(new_id_from_chars("byte", 4), mode_Bu);
/* 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);
+ }
} else {
/* calculate offset and new type size */
offset = (frame_size + alignment - 1) & ~(alignment - 1);
/* mark this entity as compiler generated */
set_entity_compiler_generated(area, 1);
+
+ set_type_state(frame_type, layout_fixed);
return area;
}
projects / libfirm / blobdiff