Commit 10d43535 authored by Matthias Braun's avatar Matthias Braun
Browse files

Change "associated type" logic to a single linked list to the "higher type"

parent a28e6806
......@@ -707,8 +707,8 @@ static void stabs_method_begin(dbg_handle *handle, const ir_entity *ent)
/* create the method entry */
mtp = get_entity_type(ent);
if (is_lowered_type(mtp))
mtp = get_associated_type(mtp);
while (is_lowered_type(mtp))
mtp = get_higher_type(mtp);
if (get_method_n_ress(mtp) > 0)
rtp = get_method_res_type(mtp, 0);
else
......
......@@ -116,6 +116,13 @@ static void adjust_entity_offsets(ir_type *type, long offset)
}
}
/**
* Perform some fixups for variadic functions.
* To make the rest of the frontend code easier to understand we add
* "dummy" parameters until the number of parameters transmitted in registers.
* (because otherwise the backend wouldn't store the value of the register
* parameters into memory for the VLA magic)
*/
bool sparc_variadic_fixups(ir_graph *irg, calling_convention_t *cconv)
{
ir_entity *entity = get_irg_entity(irg);
......@@ -154,7 +161,7 @@ bool sparc_variadic_fixups(ir_graph *irg, calling_convention_t *cconv)
set_method_variadicity(new_mtp, get_method_variadicity(mtp));
set_method_calling_convention(new_mtp, get_method_calling_convention(mtp));
set_method_additional_properties(new_mtp, get_method_additional_properties(mtp));
set_lowered_type(mtp, new_mtp);
set_higher_type(new_mtp, mtp);
set_entity_type(entity, new_mtp);
}
......@@ -226,7 +233,7 @@ static ir_type *compute_arg_type(ir_graph *irg, calling_convention_t *cconv,
if (va_start_entity != NULL) {
/* sparc_variadic_fixups() fiddled with our type, find out the
* original number of parameters */
ir_type *non_lowered = get_associated_type(mtp);
ir_type *non_lowered = get_higher_type(mtp);
size_t orig_n_params = get_method_n_params(non_lowered);
long offset;
assert(get_method_variadicity(mtp) == variadicity_variadic);
......
......@@ -167,7 +167,7 @@ static ir_type *lower_mtp(compound_call_lowering_flags flags, ir_type *mtp)
set_method_additional_properties(lowered, mtp_properties);
/* associate the lowered type with the original one for easier access */
set_lowered_type(mtp, lowered);
set_higher_type(lowered, mtp);
pmap_insert(lowered_mtps, mtp, lowered);
return lowered;
......@@ -470,15 +470,10 @@ static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp,
/**
* Add the hidden parameter from the CopyB node to the Call node.
*
* @param irg the graph
* @param n_com number of compound results (will be number of hidden parameters)
* @param ins in array to store the hidden parameters into
* @param entry the call list
* @param env the environment
*/
static void add_hidden_param(ir_graph *irg, size_t n_com, ir_node **ins,
cl_entry *entry, wlk_env *env)
cl_entry *entry, wlk_env *env,
ir_type *ctp)
{
ir_node *p, *n, *mem, *blk;
size_t n_args;
......@@ -508,13 +503,9 @@ static void add_hidden_param(ir_graph *irg, size_t n_com, ir_node **ins,
/* now create dummy entities for function with ignored return value */
if (n_args < n_com) {
ir_type *ctp = get_Call_type(entry->call);
size_t i;
size_t j;
if (is_lowered_type(ctp))
ctp = get_associated_type(ctp);
for (j = i = 0; i < get_method_n_ress(ctp); ++i) {
ir_type *rtp = get_method_res_type(ctp, i);
if (is_compound_type(rtp)) {
......@@ -556,7 +547,7 @@ static void fix_call_list(ir_graph *irg, wlk_env *env)
pos = 2;
ARR_RESIZE(ir_node *, new_in, n_params + n_com + pos);
memset(new_in, 0, sizeof(*new_in) * (n_params + n_com + pos));
add_hidden_param(irg, n_com, &new_in[pos], p, env);
add_hidden_param(irg, n_com, &new_in[pos], p, env, ctp);
pos += n_com;
/* copy all other parameters */
for (i = 0; i < n_params; ++i)
......
......@@ -1796,7 +1796,7 @@ static ir_type *lower_mtp(ir_type *mtp)
set_method_calling_convention(res, get_method_calling_convention(mtp));
set_method_additional_properties(res, get_method_additional_properties(mtp));
set_lowered_type(mtp, res);
set_higher_type(res, mtp);
set_type_link(res, mtp);
pmap_insert(lowered_type, mtp, res);
......
......@@ -415,7 +415,7 @@ static ir_type *lower_method_type(ir_type *mtp)
set_method_calling_convention(res, get_method_calling_convention(mtp));
set_method_additional_properties(res, get_method_additional_properties(mtp));
set_lowered_type(mtp, res);
set_higher_type(res, mtp);
pmap_insert(lowered_type, mtp, res);
return res;
......
......@@ -152,7 +152,6 @@ ir_type *new_type(const tp_op *type_op, ir_mode *mode, type_dbg_info *db)
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 */
......@@ -1183,7 +1182,7 @@ ir_type *clone_type_method(ir_type *tp)
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);
......
......@@ -155,53 +155,6 @@ ENUM_BITSET(type_flags)
* the type. These are distinguished by a type opcode.
* A type is described by a set of attributes. Some of these attributes
* are common to all types, others depend on the kind of the type.
*
* The following describes the common attributes. They can only be
* accessed by the functions given below.
*
* The common fields are:
*
* - firm_kind: A firm_kind tag containing k_type. This is useful
* for dynamically checking whether a node is a type node.
* - type_op: A tp_op specifying the kind of the type.
* - name: An identifier specifying the name of the type. To be
* set by the frontend.
* - size: The size of the type, i.e. an entity of this type will
* occupy size bits in memory. In several cases this is
* determined when fixing the layout of this type (class,
* struct, union, array, enumeration).
* - alignment The alignment of the type, i.e. an entity of this type will
* be allocated an an address in memory with this alignment.
* In several cases this is determined when fixing the layout
* of this type (class, struct, union, array)
* - mode: The mode to be used to represent the type on a machine.
* - state: The state of the type. The state represents whether the
* layout of the type is undefined or fixed (values: layout_undefined
* or layout_fixed). Compound types can have an undefined
* layout. The layout of the basic types primitive and pointer
* is always layout_fixed. If the layout of
* compound types is fixed all entities must have an offset
* and the size of the type must be set.
* A fixed layout for enumeration types means that each enumeration
* is associated with an implementation value.
* - assoc_type: The associated lowered/upper type.
* - visit: A counter for walks of the type information.
* - link: A void* to associate some additional information with the type.
*
* These fields can only be accessed via access functions.
*
* Depending on the value of @c type_op, i.e., depending on the kind of the
* type the adt contains further attributes. These are documented below.
*
* @see
*
* @link class_type class @endlink, @link struct_type struct @endlink,
* @link method_type method @endlink, @link union_type union @endlink,
* @link array_type array @endlink, @link enumeration_type enumeration @endlink,
* @link pointer_type pointer @endlink, @link primitive_type primitive @endlink
*
* @todo
* mode maybe not global field??
*/
struct ir_type {
firm_kind kind; /**< the firm kind, must be k_type */
......@@ -209,27 +162,27 @@ struct ir_type {
ident *name; /**< The name of the type */
ir_visibility visibility;/**< Visibility of entities of this type. */
unsigned flags; /**< Type flags, a bitmask of enum type_flags. */
unsigned size; /**< Size of an ir_entity of this type. This is determined
when fixing the layout of this class. Size must be
given in bytes. */
unsigned align; /**< Alignment of an ir_entity of this type. This should be
set according to the source language needs. If not set, it's
calculated automatically by get_type_alignment().
unsigned size; /**< Size of an ir_entity of this type. This is
determined when fixing the layout of this
class. Size must be given in bytes. */
unsigned align; /**< Alignment of an ir_entity of this type. This
should be set according to the source
language needs. If not set, it's calculated
automatically by get_type_alignment().
Alignment must be given in bytes. */
ir_mode *mode; /**< The mode for atomic types */
ir_visited_t visit; /**< visited counter for walks of the type information */
void *link; /**< holds temporary data - like in irnode_t.h */
type_dbg_info *dbi; /**< A pointer to information for debug support. */
ir_type *assoc_type; /**< The associated lowered/unlowered type */
/* ------------- fields for analyses ---------------*/
ir_type *higher_type; /**< link to highlevel type in case of lowered
types */
#ifdef DEBUG_libfirm
long nr; /**< An unique node number for each node to make output
readable. */
long nr; /**< An unique node number for each node to make
output readable. */
#endif
tp_attr attr; /**< Type kind specific fields. This must be the last
entry in this struct! Varying size! */
tp_attr attr; /**< Type kind specific fields. This must be the
last entry in this struct! Varying size! */
};
/**
......@@ -298,36 +251,37 @@ void ir_finish_type(void);
*/
ir_type *clone_type_method(ir_type *tp);
/* ------------------- *
* inline functions *
* ------------------- */
extern ir_visited_t firm_type_visited;
static inline void _set_master_type_visited(ir_visited_t val) { firm_type_visited = val; }
static inline ir_visited_t _get_master_type_visited(void) { return firm_type_visited; }
static inline void _inc_master_type_visited(void) { ++firm_type_visited; }
static inline void _set_master_type_visited(ir_visited_t val)
{
firm_type_visited = val;
}
static inline ir_visited_t _get_master_type_visited(void)
{
return firm_type_visited;
}
static inline void _inc_master_type_visited(void)
{
++firm_type_visited;
}
static inline int is_lowered_type(const ir_type *tp)
{
return tp->flags & tf_lowered_type;
}
/**
* Gets the lowered/unlowered type of a type or NULL if this type
* has no lowered/unlowered one.
*/
static inline ir_type *get_associated_type(const ir_type *tp)
static inline ir_type *get_higher_type(const ir_type *tp)
{
return tp->assoc_type;
return tp->higher_type;
}
static inline void set_lowered_type(ir_type *tp, ir_type *lowered_type)
static inline void set_higher_type(ir_type *tp, ir_type *higher_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;
tp->flags |= tf_lowered_type;
tp->higher_type = higher_type;
}
static inline void *_get_type_link(const ir_type *tp)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment