Commit 1992a09a authored by Michael Beck's avatar Michael Beck
Browse files

renamed where_alloc to ir_where_alloc

[r17099]
parent 74d65e7d
......@@ -1744,7 +1744,7 @@ ir_node *new_rd_Store (dbg_info *db, ir_graph *irg, ir_node *block,
* @param where Where to allocate the variable, either heap_alloc or stack_alloc.
*/
ir_node *new_rd_Alloc (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store,
ir_node *size, ir_type *alloc_type, where_alloc where);
ir_node *size, ir_type *alloc_type, ir_where_alloc where);
/** Constructor for a Free node.
*
......@@ -1761,7 +1761,7 @@ ir_node *new_rd_Alloc (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *st
* @param where Where the variable was allocated, either heap_alloc or stack_alloc.
*/
ir_node *new_rd_Free (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store,
ir_node *ptr, ir_node *size, ir_type *free_type, where_alloc where);
ir_node *ptr, ir_node *size, ir_type *free_type, ir_where_alloc where);
/** Constructor for a Sync node.
*
......@@ -2560,7 +2560,7 @@ ir_node *new_r_Store (ir_graph *irg, ir_node *block,
* @param where Where to allocate the variable, either heap_alloc or stack_alloc.
*/
ir_node *new_r_Alloc (ir_graph *irg, ir_node *block, ir_node *store,
ir_node *size, ir_type *alloc_type, where_alloc where);
ir_node *size, ir_type *alloc_type, ir_where_alloc where);
/** Constructor for a Free node.
*
......@@ -2576,7 +2576,7 @@ ir_node *new_r_Alloc (ir_graph *irg, ir_node *block, ir_node *store,
* @param where Where the variable was allocated, either heap_alloc or stack_alloc.
*/
ir_node *new_r_Free (ir_graph *irg, ir_node *block, ir_node *store,
ir_node *ptr, ir_node *size, ir_type *free_type, where_alloc where);
ir_node *ptr, ir_node *size, ir_type *free_type, ir_where_alloc where);
/** Constructor for a Sync node.
*
......@@ -3385,7 +3385,7 @@ ir_node *new_d_Store (dbg_info *db, ir_node *store, ir_node *addr, ir_node *val
* @param where Where to allocate the variable, either heap_alloc or stack_alloc.
*/
ir_node *new_d_Alloc (dbg_info *db, ir_node *store, ir_node *size, ir_type *alloc_type,
where_alloc where);
ir_where_alloc where);
/** Constructor for a Free node.
*
......@@ -3401,7 +3401,7 @@ ir_node *new_d_Alloc (dbg_info *db, ir_node *store, ir_node *size, ir_type *all
* @param where Where the variable was allocated, either heap_alloc or stack_alloc.
*/
ir_node *new_d_Free (dbg_info *db, ir_node *store, ir_node *ptr, ir_node *size,
ir_type *free_type, where_alloc where);
ir_type *free_type, ir_where_alloc where);
/** Constructor for a Sync node.
*
......@@ -4180,7 +4180,7 @@ ir_node *new_Store (ir_node *store, ir_node *addr, ir_node *val);
* @param where Where to allocate the variable, either heap_alloc or stack_alloc.
*/
ir_node *new_Alloc (ir_node *store, ir_node *size, ir_type *alloc_type,
where_alloc where);
ir_where_alloc where);
/** Constructor for a Free node.
*
......@@ -4195,7 +4195,7 @@ ir_node *new_Alloc (ir_node *store, ir_node *size, ir_type *alloc_type,
* @param where Where the variable was allocated, either heap_alloc or stack_alloc.
*/
ir_node *new_Free (ir_node *store, ir_node *ptr, ir_node *size,
ir_type *free_type, where_alloc where);
ir_type *free_type, ir_where_alloc where);
/** Constructor for a Sync node.
*
......
......@@ -1011,10 +1011,10 @@ void set_Alloc_type(ir_node *node, ir_type *tp);
typedef enum {
stack_alloc, /**< Alloc allocates the object on the stack. */
heap_alloc /**< Alloc allocates the object on the heap. */
} where_alloc;
} ir_where_alloc;
where_alloc get_Alloc_where(ir_node *node);
void set_Alloc_where(ir_node *node, where_alloc where);
ir_where_alloc get_Alloc_where(ir_node *node);
void set_Alloc_where(ir_node *node, ir_where_alloc where);
ir_node *get_Free_mem(ir_node *node);
void set_Free_mem(ir_node *node, ir_node *mem);
......@@ -1025,8 +1025,8 @@ void set_Free_size(ir_node *node, ir_node *size);
ir_type *get_Free_type(ir_node *node);
void set_Free_type(ir_node *node, ir_type *tp);
where_alloc get_Free_where(ir_node *node);
void set_Free_where(ir_node *node, where_alloc where);
ir_where_alloc get_Free_where(ir_node *node);
void set_Free_where(ir_node *node, ir_where_alloc where);
ir_node **get_Sync_preds_arr(ir_node *node);
int get_Sync_n_preds(ir_node *node);
......
......@@ -531,7 +531,7 @@ new_bd_Store(dbg_info *db, ir_node *block,
static ir_node *
new_bd_Alloc(dbg_info *db, ir_node *block, ir_node *store,
ir_node *size, ir_type *alloc_type, where_alloc where) {
ir_node *size, ir_type *alloc_type, ir_where_alloc where) {
ir_node *in[2];
ir_node *res;
ir_graph *irg = current_ir_graph;
......@@ -549,7 +549,7 @@ new_bd_Alloc(dbg_info *db, ir_node *block, ir_node *store,
static ir_node *
new_bd_Free(dbg_info *db, ir_node *block, ir_node *store,
ir_node *ptr, ir_node *size, ir_type *free_type, where_alloc where) {
ir_node *ptr, ir_node *size, ir_type *free_type, ir_where_alloc where) {
ir_node *in[3];
ir_node *res;
ir_graph *irg = current_ir_graph;
......@@ -1137,7 +1137,7 @@ new_rd_Store(dbg_info *db, ir_graph *irg, ir_node *block,
ir_node *
new_rd_Alloc(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store,
ir_node *size, ir_type *alloc_type, where_alloc where) {
ir_node *size, ir_type *alloc_type, ir_where_alloc where) {
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1150,7 +1150,7 @@ new_rd_Alloc(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store,
ir_node *
new_rd_Free(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store,
ir_node *ptr, ir_node *size, ir_type *free_type, where_alloc where) {
ir_node *ptr, ir_node *size, ir_type *free_type, ir_where_alloc where) {
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1606,11 +1606,11 @@ ir_node *new_r_Store(ir_graph *irg, ir_node *block,
return new_rd_Store(NULL, irg, block, store, adr, val);
}
ir_node *new_r_Alloc(ir_graph *irg, ir_node *block, ir_node *store,
ir_node *size, ir_type *alloc_type, where_alloc where) {
ir_node *size, ir_type *alloc_type, ir_where_alloc where) {
return new_rd_Alloc(NULL, irg, block, store, size, alloc_type, where);
}
ir_node *new_r_Free(ir_graph *irg, ir_node *block, ir_node *store,
ir_node *ptr, ir_node *size, ir_type *free_type, where_alloc where) {
ir_node *ptr, ir_node *size, ir_type *free_type, ir_where_alloc where) {
return new_rd_Free(NULL, irg, block, store, ptr, size, free_type, where);
}
ir_node *new_r_Sync(ir_graph *irg, ir_node *block, int arity, ir_node *in[]) {
......@@ -2478,7 +2478,7 @@ new_d_Store(dbg_info *db, ir_node *store, ir_node *addr, ir_node *val) {
ir_node *
new_d_Alloc(dbg_info *db, ir_node *store, ir_node *size, ir_type *alloc_type,
where_alloc where) {
ir_where_alloc where) {
ir_node *res;
res = new_bd_Alloc(db, current_ir_graph->current_block,
store, size, alloc_type, where);
......@@ -2491,7 +2491,7 @@ new_d_Alloc(dbg_info *db, ir_node *store, ir_node *size, ir_type *alloc_type,
ir_node *
new_d_Free(dbg_info *db, ir_node *store, ir_node *ptr,
ir_node *size, ir_type *free_type, where_alloc where) {
ir_node *size, ir_type *free_type, ir_where_alloc where) {
return new_bd_Free(db, current_ir_graph->current_block,
store, ptr, size, free_type, where);
}
......@@ -2985,11 +2985,11 @@ ir_node *new_Store(ir_node *store, ir_node *addr, ir_node *val) {
return new_d_Store(NULL, store, addr, val);
}
ir_node *new_Alloc(ir_node *store, ir_node *size, ir_type *alloc_type,
where_alloc where) {
ir_where_alloc where) {
return new_d_Alloc(NULL, store, size, alloc_type, where);
}
ir_node *new_Free(ir_node *store, ir_node *ptr, ir_node *size,
ir_type *free_type, where_alloc where) {
ir_type *free_type, ir_where_alloc where) {
return new_d_Free(NULL, store, ptr, size, free_type, where);
}
ir_node *new_Sync(int arity, ir_node *in[]) {
......
......@@ -1848,14 +1848,14 @@ set_Alloc_type(ir_node *node, ir_type *tp) {
node->attr.alloc.type = tp;
}
where_alloc
ir_where_alloc
get_Alloc_where(ir_node *node) {
assert(node->op == op_Alloc);
return node->attr.alloc.where;
}
void
set_Alloc_where(ir_node *node, where_alloc where) {
set_Alloc_where(ir_node *node, ir_where_alloc where) {
assert(node->op == op_Alloc);
node->attr.alloc.where = where;
}
......@@ -1909,14 +1909,14 @@ set_Free_type(ir_node *node, ir_type *tp) {
node->attr.free.type = tp;
}
where_alloc
ir_where_alloc
get_Free_where(ir_node *node) {
assert(node->op == op_Free);
return node->attr.free.where;
}
void
set_Free_where(ir_node *node, where_alloc where) {
set_Free_where(ir_node *node, ir_where_alloc where) {
assert(node->op == op_Free);
node->attr.free.where = where;
}
......
......@@ -192,13 +192,13 @@ typedef struct {
typedef struct {
except_attr exc; /**< the exception attribute. MUST be the first one. */
ir_type *type; /**< Type of the allocated object. */
where_alloc where; /**< stack, heap or other managed part of memory */
ir_where_alloc where; /**< stack, heap or other managed part of memory */
} alloc_attr;
/** Free attributes. */
typedef struct {
ir_type *type; /**< Type of the allocated object. */
where_alloc where; /**< stack, heap or other managed part of memory */
ir_where_alloc where; /**< stack, heap or other managed part of memory */
} free_attr;
/** InstOf attributes. */
......
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