X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=7c55b6a64eaa5fe89f0711b7dfed316604614ea6;hb=88423364d3b0dc96480ca5d58e3144d87e01a9c8;hp=fe56913bc70b476ae53e794faab4059bbc57b209;hpb=816e7e0779021990465292820aa997d2af768c72;p=libfirm

diff --git a/ir/be/benode.c b/ir/be/benode.c
index fe56913bc..7c55b6a64 100644
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -87,14 +87,15 @@ typedef struct {
 	be_node_attr_t node_attr;     /**< base attributes of every be node. */
 	int            num_ret_vals;  /**< number of return values */
 	unsigned       pop;           /**< number of bytes that should be popped */
+	int            emit_pop;      /**< if set, emit pop bytes, even if pop = 0 */
 } be_return_attr_t;
 
 /** The be_IncSP attribute type. */
 typedef struct {
 	be_node_attr_t node_attr;   /**< base attributes of every be node. */
 	int            offset;      /**< The offset by which the stack shall be expanded/shrinked. */
-	int            align;       /**< wether stack should be aligned after the
-								     IncSP */
+	int            align;       /**< whether stack should be aligned after the
+	                                 IncSP */
 } be_incsp_attr_t;
 
 /** The be_Frame attribute type. */
@@ -107,9 +108,9 @@ typedef struct {
 /** The be_Call attribute type. */
 typedef struct {
 	be_node_attr_t  node_attr;  /**< base attributes of every be node. */
-	ir_entity      *ent;            /**< The called entity if this is a static call. */
+	ir_entity      *ent;        /**< The called entity if this is a static call. */
 	unsigned        pop;
-	ir_type        *call_tp;          /**< The call type, copied from the original Call node. */
+	ir_type        *call_tp;    /**< The call type, copied from the original Call node. */
 } be_call_attr_t;
 
 typedef struct {
@@ -151,6 +152,15 @@ static const ir_op_ops be_node_op_ops;
 #define K   irop_flag_keep
 #define M   irop_flag_uses_memory
 
+static int be_reqs_equal(const be_req_t *req1, const be_req_t *req2)
+{
+	if(!reg_reqs_equal(&req1->req, &req2->req))
+		return 0;
+	if(req1->flags != req2->flags)
+		return 0;
+
+	return 1;
+}
 
 /**
  * Compare two be node attributes.
@@ -166,8 +176,8 @@ static int _node_cmp_attr(const be_node_attr_t *a, const be_node_attr_t *b) {
 	len = ARR_LEN(a->reg_data);
 	for (i = 0; i < len; ++i) {
 		if (a->reg_data[i].reg != b->reg_data[i].reg ||
-				memcmp(&a->reg_data[i].in_req, &b->reg_data[i].in_req, sizeof(b->reg_data[i].in_req)) ||
-			    memcmp(&a->reg_data[i].req,    &b->reg_data[i].req,    sizeof(a->reg_data[i].req)))
+				!be_reqs_equal(&a->reg_data[i].in_req, &b->reg_data[i].in_req) ||
+			    !be_reqs_equal(&a->reg_data[i].req,    &b->reg_data[i].req))
 			return 1;
 	}
 
@@ -214,6 +224,8 @@ static int Return_cmp_attr(ir_node *a, ir_node *b) {
 		return 1;
 	if (a_attr->pop != b_attr->pop)
 		return 1;
+	if (a_attr->emit_pop != b_attr->emit_pop)
+		return 1;
 
 	return _node_cmp_attr(&a_attr->node_attr, &b_attr->node_attr);
 }
@@ -697,25 +709,36 @@ ir_node *be_new_Return(dbg_info *dbg, ir_graph *irg, ir_node *block, int n_res,
 	a = get_irn_attr(res);
 	a->num_ret_vals = n_res;
 	a->pop          = pop;
+	a->emit_pop     = 0;
 
 	return res;
 }
 
 /* Returns the number of real returns values */
-int be_Return_get_n_rets(const ir_node *ret)
-{
+int be_Return_get_n_rets(const ir_node *ret) {
 	const be_return_attr_t *a = get_irn_generic_attr_const(ret);
 	return a->num_ret_vals;
 }
 
-unsigned be_Return_get_pop(const ir_node *ret)
-{
+/* return the number of bytes that should be popped from stack when executing the Return. */
+unsigned be_Return_get_pop(const ir_node *ret) {
 	const be_return_attr_t *a = get_irn_generic_attr_const(ret);
 	return a->pop;
 }
 
-int be_Return_append_node(ir_node *ret, ir_node *node)
-{
+/* return non-zero, if number of popped bytes must be always emitted */
+int be_Return_get_emit_pop(const ir_node *ret) {
+	const be_return_attr_t *a = get_irn_generic_attr_const(ret);
+	return a->emit_pop;
+}
+
+/* return non-zero, if number of popped bytes must be always emitted */
+void be_Return_set_emit_pop(ir_node *ret, int emit_pop) {
+	be_return_attr_t *a = get_irn_generic_attr(ret);
+	a->emit_pop = emit_pop;
+}
+
+int be_Return_append_node(ir_node *ret, ir_node *node) {
 	int pos;
 
 	pos = add_irn_n(ret, node);