Inline gen_Minus_ex() into its only caller gen_Minus().

[libfirm] / ir / be / benode_t.h

diff --git a/ir/be/benode_t.h b/ir/be/benode_t.h
index 72289c3..a8b5a73 100644 (file)
--- a/ir/be/benode_t.h
+++ b/ir/be/benode_t.h
@@ -53,12 +53,8 @@ extern ir_op *op_be_Return;
 extern ir_op *op_be_IncSP;
 extern ir_op *op_be_AddSP;
 extern ir_op *op_be_SubSP;
-extern ir_op *op_be_SetSP;
 extern ir_op *op_be_RegParams;
-extern ir_op *op_be_StackParam;
 extern ir_op *op_be_FrameAddr;
-extern ir_op *op_be_FrameLoad;
-extern ir_op *op_be_FrameStore;
 extern ir_op *op_be_Barrier;
 
 typedef enum {
@@ -75,11 +71,7 @@ typedef enum {
        beo_AddSP,
        beo_SubSP,
        beo_IncSP,
-       beo_SetSP,
        beo_RegParams,
-       beo_StackParam,
-       beo_FrameLoad,
-       beo_FrameStore,
        beo_FrameAddr,
        beo_Barrier,
        beo_Last
@@ -157,36 +149,27 @@ void be_set_Copy_op(ir_node *cpy, ir_node *op);
  * Make a new Perm node.
  */
 ir_node *be_new_Perm(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int arity, ir_node *in[]);
-/**
- * Create a new MemPerm node.
- */
-ir_node *be_new_MemPerm(const arch_env_t *arch_env, ir_graph *irg, ir_node *bl, int n, ir_node *in[]);
-ir_node *be_new_Keep(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int arity, ir_node *in[]);
-
-void be_Keep_add_node(ir_node *keep, const arch_register_class_t *cls, ir_node *node);
 
 /**
- * Position numbers for the be_FrameLoad inputs
+ * Reduce a Perm.
+ * Basically, we provide a map to remap the Perm's arguments. If an entry in the
+ * map is -1, the argument gets deleted.
+ * This function takes care, that the register data and the input array reflects
+ * the changes described by the map.
+ * This is needed by the Perm optimization/movement in belower.c, see push_through_perm().
+ * @param perm     The perm node.
+ * @param new_size The new number of arguments (must be smaller or equal to the current one).
+ * @param map      A map assigning each operand a new index (or -1 to indicate deletion).
  */
-enum {
-       be_pos_FrameLoad_mem = 0,
-       be_pos_FrameLoad_ptr = 1
-};
-
-ir_node *be_new_FrameLoad(const arch_register_class_t *cls_frame, const arch_register_class_t *cls_data,
-                                                 ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *frame, ir_entity *ent);
+void be_Perm_reduce(ir_node *perm, int new_size, int *map);
 
 /**
- * Position numbers for the be_FrameStore inputs
+ * Create a new MemPerm node.
  */
-enum {
-       be_pos_FrameStore_mem = 0,
-       be_pos_FrameStore_ptr = 1,
-       be_pos_FrameStore_val = 2
-};
+ir_node *be_new_MemPerm(const arch_env_t *arch_env, ir_graph *irg, ir_node *bl, int n, ir_node *in[]);
+ir_node *be_new_Keep(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int arity, ir_node *in[]);
 
-ir_node *be_new_FrameStore(const arch_register_class_t *cls_frame, const arch_register_class_t *cls_data,
-                                                  ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *frame, ir_node *data, ir_entity *ent);
+void be_Keep_add_node(ir_node *keep, const arch_register_class_t *cls, ir_node *node);
 
 /**
  * Position numbers for the be_FrameAddr inputs
@@ -199,7 +182,9 @@ enum {
 ir_node *be_new_FrameAddr(const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *bl, ir_node *frame, ir_entity *ent);
 
 /** Return the frame input of a FrameAddr node. */
-ir_node *be_get_FrameAddr_frame(ir_node *node);
+ir_node *be_get_FrameAddr_frame(const ir_node *node);
+
+ir_entity *be_get_FrameAddr_entity(const ir_node *node);
 
 /**
  * Position numbers for the be_AddSP inputs
@@ -211,9 +196,10 @@ enum {
 };
 
 enum {
-       pn_be_AddSP_res  = 0,
-       pn_be_AddSP_M    = 1,
-       pn_be_AddSP_last = 2
+       pn_be_AddSP_sp   = 0,
+       pn_be_AddSP_res  = 1,
+       pn_be_AddSP_M    = 2,
+       pn_be_AddSP_last = 3
 };
 
 /**
@@ -240,7 +226,7 @@ enum {
 };
 
 enum {
-       pn_be_SubSP_res  = 0,
+       pn_be_SubSP_sp   = 0,
        pn_be_SubSP_M    = 1,
        pn_be_SubSP_last = 2
 };
@@ -259,8 +245,6 @@ enum {
  */
 ir_node *be_new_SubSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *sz);
 
-ir_node *be_new_SetSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *operand, ir_node *mem);
-
 /**
  * Make a stack pointer increase/decrease node.
  * @param sp     The stack pointer register.
@@ -361,17 +345,6 @@ int be_Return_get_n_rets(ir_node *ret);
 /** appends a node to the return node, returns the position of the node */
 int be_Return_append_node(ir_node *ret, ir_node *node);
 
-/**
- * StackParam input positions
- */
-enum {
-       be_pos_StackParam_ptr = 0
-};
-
-/**
- * Construct a new Stack Parameter node.
- */
-ir_node *be_new_StackParam(const arch_register_class_t *cls, const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *bl, ir_mode *mode, ir_node *frame_pointer, ir_entity *ent);
 ir_node *be_new_RegParams(ir_graph *irg, ir_node *bl, int n_out);
 
 ir_node *be_new_Barrier(ir_graph *irg, ir_node *bl, int n, ir_node *in[]);
@@ -437,14 +410,10 @@ int be_is_CopyKeep(const ir_node *irn);
 int be_is_Call(const ir_node *irn);
 int be_is_Return(const ir_node *irn);
 int be_is_IncSP(const ir_node *irn);
-int be_is_SetSP(const ir_node *irn);
 int be_is_AddSP(const ir_node *irn);
 int be_is_SubSP(const ir_node *irn);
 int be_is_RegParams(const ir_node *irn);
-int be_is_StackParam(const ir_node *irn);
 int be_is_FrameAddr(const ir_node *irn);
-int be_is_FrameLoad(const ir_node *irn);
-int be_is_FrameStore(const ir_node *irn);
 int be_is_Barrier(const ir_node *irn);
 
 /**
@@ -498,6 +467,8 @@ void be_set_constr_limited(ir_node *irn, int pos, const arch_register_req_t *req
  */
 void be_node_set_flags(ir_node *irn, int pos, arch_irn_flags_t flags);
 
+void be_node_add_flags(ir_node *irn, int pos, arch_irn_flags_t flags);
+
 /**
  * Set the register class of a node.
  * @param irn The node itself.