Commit 10f56ceb authored by Michael Beck's avatar Michael Beck
Browse files

- renamed cons_flags to ir_cons_flags

[r24681]
parent 7ff74f4d
......@@ -295,8 +295,8 @@
* ir_node *new_Cast (ir_node *op, ir_type *to_tp);
* ir_node *new_Carry (ir_node *op1, ir_node *op2, ir_mode *mode);
* ir_node *new_Borrow (ir_node *op1, ir_node *op2, ir_mode *mode);
* ir_node *new_Load (ir_node *store, ir_node *addr, ir_mode *mode, cons_flags flags);
* ir_node *new_Store (ir_node *store, ir_node *addr, ir_node *val, cons_flags flags);
* ir_node *new_Load (ir_node *store, ir_node *addr, ir_mode *mode, ir_cons_flags flags);
* ir_node *new_Store (ir_node *store, ir_node *addr, ir_node *val, ir_cons_flags flags);
* ir_node *new_Alloc (ir_node *store, ir_node *size, ir_type *alloc_type,
* where_alloc where);
* ir_node *new_Free (ir_node *store, ir_node *ptr, ir_node *size,
......@@ -842,7 +842,7 @@
* The definition valid in this block.
*
* ir_node *new_Mux (ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode)
* -----------------------------------------------------------------------------
* -----------------------------------------------------------------------------------
*
* Creates a Mux node. This node implements the following semantic:
* If the sel node (which must be of mode_b) evaluates to true, its value is
......@@ -853,8 +853,8 @@
* OPERATIONS TO MANAGE MEMORY EXPLICITLY
* --------------------------------------
*
* ir_node *new_Load (ir_node *store, ir_node *addr, ir_mode *mode, cons_flags flags)
* ----------------------------------------------------------------
* ir_node *new_Load (ir_node *store, ir_node *addr, ir_mode *mode, ir_cons_flags flags)
* -------------------------------------------------------------------------------------
*
* The Load operation reads a value from memory.
*
......@@ -870,8 +870,8 @@
* A tuple of the memory, a control flow to be taken in case of
* an exception and the loaded value.
*
* ir_node *new_Store (ir_node *store, ir_node *addr, ir_node *val, cons_flags flags)
* ----------------------------------------------------------------
* ir_node *new_Store (ir_node *store, ir_node *addr, ir_node *val, ir_cons_flags flags)
* -------------------------------------------------------------------------------------
*
* The Store operation writes a value to a variable in memory.
*
......@@ -1122,12 +1122,15 @@
#include "firm_types.h"
typedef enum cons_flags {
cons_none = 0,
cons_volatile = 1U << 0,
cons_unaligned = 1U << 1,
cons_floats = 1U << 2
} cons_flags;
/**
* constrained flags for memory operations.
*/
typedef enum ir_cons_flags {
cons_none = 0, /**< No constrains. */
cons_volatile = 1U << 0, /**< Memory operation is volatile. */
cons_unaligned = 1U << 1, /**< Memory operation is unaligned. */
cons_floats = 1U << 2 /**< Memory operation can float. */
} ir_cons_flags;
/*-------------------------------------------------------------------------*/
/* The raw interface */
......@@ -1751,7 +1754,7 @@ ir_node *new_rd_Phi (dbg_info *db, ir_graph *irg, ir_node *block, int arity,
* @param flags Additional flags for alignment, volatility and pin state.
*/
ir_node *new_rd_Load (dbg_info *db, ir_graph *irg, ir_node *block,
ir_node *store, ir_node *adr, ir_mode *mode, cons_flags flags);
ir_node *store, ir_node *adr, ir_mode *mode, ir_cons_flags flags);
/** Constructor for a Store node.
*
......@@ -1764,7 +1767,7 @@ ir_node *new_rd_Load (dbg_info *db, ir_graph *irg, ir_node *block,
* @param flags Additional flags for alignment, volatility and pin state.
*/
ir_node *new_rd_Store (dbg_info *db, ir_graph *irg, ir_node *block,
ir_node *store, ir_node *adr, ir_node *val, cons_flags flags);
ir_node *store, ir_node *adr, ir_node *val, ir_cons_flags flags);
/** Constructor for a Alloc node.
*
......@@ -2555,7 +2558,7 @@ ir_node *new_r_Phi (ir_graph *irg, ir_node *block, int arity,
* @param flags Additional flags for alignment, volatility and pin state.
*/
ir_node *new_r_Load (ir_graph *irg, ir_node *block,
ir_node *store, ir_node *adr, ir_mode *mode, cons_flags flags);
ir_node *store, ir_node *adr, ir_mode *mode, ir_cons_flags flags);
/** Constructor for a Store node.
*
......@@ -2567,7 +2570,7 @@ ir_node *new_r_Load (ir_graph *irg, ir_node *block,
* @param flags Additional flags for alignment, volatility and pin state.
*/
ir_node *new_r_Store (ir_graph *irg, ir_node *block,
ir_node *store, ir_node *adr, ir_node *val, cons_flags flags);
ir_node *store, ir_node *adr, ir_node *val, ir_cons_flags flags);
/** Constructor for a Alloc node.
*
......@@ -3383,7 +3386,7 @@ ir_node *new_d_Phi (dbg_info *db, int arity, ir_node *in[], ir_mode *mode);
* @param *mode The mode of the value to be loaded.
* @param flags Additional flags for alignment, volatility and pin state.
*/
ir_node *new_d_Load(dbg_info *db, ir_node *store, ir_node *addr, ir_mode *mode, cons_flags flags);
ir_node *new_d_Load(dbg_info *db, ir_node *store, ir_node *addr, ir_mode *mode, ir_cons_flags flags);
/** Constructor for a Store node.
*
......@@ -3395,7 +3398,7 @@ ir_node *new_d_Load(dbg_info *db, ir_node *store, ir_node *addr, ir_mode *mode,
* @param *val The value to write to this variable.
* @param flags Additional flags for alignment, volatility and pin state.
*/
ir_node *new_d_Store(dbg_info *db, ir_node *store, ir_node *addr, ir_node *val, cons_flags flags);
ir_node *new_d_Store(dbg_info *db, ir_node *store, ir_node *addr, ir_node *val, ir_cons_flags flags);
/** Constructor for a Alloc node.
*
......@@ -4170,7 +4173,7 @@ ir_node *new_Phi (int arity, ir_node *in[], ir_mode *mode);
* @param *mode The mode of the value to be loaded.
* @param flags Additional flags for alignment, volatility and pin state.
*/
ir_node *new_Load(ir_node *store, ir_node *addr, ir_mode *mode, cons_flags flags);
ir_node *new_Load(ir_node *store, ir_node *addr, ir_mode *mode, ir_cons_flags flags);
/** Constructor for a Store node.
*
......@@ -4179,7 +4182,7 @@ ir_node *new_Load(ir_node *store, ir_node *addr, ir_mode *mode, cons_flags flags
* @param *val The value to write to this variable.
* @param flags Additional flags for alignment, volatility and pin state.
*/
ir_node *new_Store(ir_node *store, ir_node *addr, ir_node *val, cons_flags flags);
ir_node *new_Store(ir_node *store, ir_node *addr, ir_node *val, ir_cons_flags flags);
/** Constructor for a Alloc node.
*
......
......@@ -516,7 +516,7 @@ new_bd_Return(dbg_info *db, ir_node *block,
static ir_node *
new_bd_Load(dbg_info *db, ir_node *block,
ir_node *store, ir_node *adr, ir_mode *mode, cons_flags flags) {
ir_node *store, ir_node *adr, ir_mode *mode, ir_cons_flags flags) {
ir_node *in[2];
ir_node *res;
ir_graph *irg = current_ir_graph;
......@@ -535,7 +535,7 @@ new_bd_Load(dbg_info *db, ir_node *block,
static ir_node *
new_bd_Store(dbg_info *db, ir_node *block,
ir_node *store, ir_node *adr, ir_node *val, cons_flags flags) {
ir_node *store, ir_node *adr, ir_node *val, ir_cons_flags flags) {
ir_node *in[3];
ir_node *res;
ir_graph *irg = current_ir_graph;
......@@ -1140,7 +1140,7 @@ new_rd_Return(dbg_info *db, ir_graph *irg, ir_node *block,
ir_node *
new_rd_Load(dbg_info *db, ir_graph *irg, ir_node *block,
ir_node *store, ir_node *adr, ir_mode *mode, cons_flags flags) {
ir_node *store, ir_node *adr, ir_mode *mode, ir_cons_flags flags) {
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1153,7 +1153,7 @@ new_rd_Load(dbg_info *db, ir_graph *irg, ir_node *block,
ir_node *
new_rd_Store(dbg_info *db, ir_graph *irg, ir_node *block,
ir_node *store, ir_node *adr, ir_node *val, cons_flags flags) {
ir_node *store, ir_node *adr, ir_node *val, ir_cons_flags flags) {
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1617,11 +1617,11 @@ ir_node *new_r_Phi(ir_graph *irg, ir_node *block, int arity,
return new_rd_Phi(NULL, irg, block, arity, in, mode);
}
ir_node *new_r_Load(ir_graph *irg, ir_node *block,
ir_node *store, ir_node *adr, ir_mode *mode, cons_flags flags) {
ir_node *store, ir_node *adr, ir_mode *mode, ir_cons_flags flags) {
return new_rd_Load(NULL, irg, block, store, adr, mode, flags);
}
ir_node *new_r_Store(ir_graph *irg, ir_node *block,
ir_node *store, ir_node *adr, ir_node *val, cons_flags flags) {
ir_node *store, ir_node *adr, ir_node *val, ir_cons_flags flags) {
return new_rd_Store(NULL, irg, block, store, adr, val, flags);
}
ir_node *new_r_Alloc(ir_graph *irg, ir_node *block, ir_node *store,
......@@ -2504,7 +2504,7 @@ new_d_Return(dbg_info *db, ir_node* store, int arity, ir_node **in) {
} /* new_d_Return */
ir_node *
new_d_Load(dbg_info *db, ir_node *store, ir_node *addr, ir_mode *mode, cons_flags flags) {
new_d_Load(dbg_info *db, ir_node *store, ir_node *addr, ir_mode *mode, ir_cons_flags flags) {
ir_node *res;
res = new_bd_Load(db, current_ir_graph->current_block,
store, addr, mode, flags);
......@@ -2516,7 +2516,7 @@ new_d_Load(dbg_info *db, ir_node *store, ir_node *addr, ir_mode *mode, cons_flag
} /* new_d_Load */
ir_node *
new_d_Store(dbg_info *db, ir_node *store, ir_node *addr, ir_node *val, cons_flags flags) {
new_d_Store(dbg_info *db, ir_node *store, ir_node *addr, ir_node *val, ir_cons_flags flags) {
ir_node *res;
res = new_bd_Store(db, current_ir_graph->current_block,
store, addr, val, flags);
......@@ -3029,10 +3029,10 @@ ir_node *new_Cast(ir_node *op, ir_type *to_tp) {
ir_node *new_Phi(int arity, ir_node **in, ir_mode *mode) {
return new_d_Phi(NULL, arity, in, mode);
}
ir_node *new_Load(ir_node *store, ir_node *addr, ir_mode *mode, cons_flags flags) {
ir_node *new_Load(ir_node *store, ir_node *addr, ir_mode *mode, ir_cons_flags flags) {
return new_d_Load(NULL, store, addr, mode, flags);
}
ir_node *new_Store(ir_node *store, ir_node *addr, ir_node *val, cons_flags flags) {
ir_node *new_Store(ir_node *store, ir_node *addr, ir_node *val, ir_cons_flags flags) {
return new_d_Store(NULL, store, addr, val, flags);
}
ir_node *new_Alloc(ir_node *store, ir_node *size, ir_type *alloc_type,
......
......@@ -364,7 +364,7 @@ static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) {
dbg_info *dbg;
ir_node *block = get_nodes_block(node);
int idx;
cons_flags volatility = get_Load_volatility(node) == volatility_is_volatile
ir_cons_flags volatility = get_Load_volatility(node) == volatility_is_volatile
? cons_volatile : 0;
if (env->params->little_endian) {
......@@ -426,7 +426,7 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) {
dbg_info *dbg;
int idx;
node_entry_t *entry;
cons_flags volatility = get_Store_volatility(node) == volatility_is_volatile
ir_cons_flags volatility = get_Store_volatility(node) == volatility_is_volatile
? cons_volatile : 0;
(void) mode;
......
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