X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=6123524173d0a60d251a7fe13fb644a53f819cdd;hb=adbae5c7cf3dc4262cad0bb7743c34b462f40907;hp=b33cad72548b175ee7d7eb215f02f210a865f7e1;hpb=2e291eab8268af551488b1f4fb4d9ca61b625e33;p=libfirm

diff --git a/ir/be/beabi.c b/ir/be/beabi.c
index b33cad725..612352417 100644
--- a/ir/be/beabi.c
+++ b/ir/be/beabi.c
@@ -23,9 +23,7 @@
  * @author      Sebastian Hack, Michael Beck
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "obst.h"
 #include "offset.h"
@@ -172,7 +170,7 @@ static be_abi_call_arg_t *get_or_set_call_arg(be_abi_call_t *call, int is_res, i
  * @param is_res    true for call results, false for call arguments
  * @param pos       position of the argument
  */
-static INLINE be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos)
+static inline be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos)
 {
 	return get_or_set_call_arg(call, is_res, pos, 0);
 }
@@ -383,7 +381,7 @@ static void stack_layout_dump(FILE *file, be_stack_layout_t *frame)
  * Returns non-zero if the call argument at given position
  * is transfered on the stack.
  */
-static INLINE int is_on_stack(be_abi_call_t *call, int pos)
+static inline int is_on_stack(be_abi_call_t *call, int pos)
 {
 	be_abi_call_arg_t *arg = get_call_arg(call, 0, pos);
 	return arg && !arg->in_reg;
@@ -1367,10 +1365,10 @@ static ir_node *create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pm
 		arch_set_irn_register(proj, reg);
 
 		/* if the proj projects a ignore register or a node which is set to ignore, propagate this property. */
-		if (arch_register_type_is(reg, ignore) || arch_irn_is(env->birg->main_env->arch_env, in[n], ignore))
+		if (arch_register_type_is(reg, ignore) || arch_irn_is(in[n], ignore))
 			flags |= arch_irn_flags_ignore;
 
-		if (arch_irn_is(env->birg->main_env->arch_env, in[n], modify_sp))
+		if (arch_irn_is(in[n], modify_sp))
 			flags |= arch_irn_flags_modify_sp;
 
 		be_node_set_flags(irn, pos, flags);
@@ -2306,7 +2304,6 @@ typedef ir_node **node_array;
 
 typedef struct fix_stack_walker_env_t {
 	node_array sp_nodes;
-	const arch_env_t *arch_env;
 } fix_stack_walker_env_t;
 
 /**
@@ -2316,7 +2313,7 @@ static void collect_stack_nodes_walker(ir_node *node, void *data)
 {
 	fix_stack_walker_env_t *env = data;
 
-	if (arch_irn_is(env->arch_env, node, modify_sp)) {
+	if (arch_irn_is(node, modify_sp)) {
 		assert(get_irn_mode(node) != mode_M && get_irn_mode(node) != mode_T);
 		ARR_APP1(ir_node*, env->sp_nodes, node);
 	}
@@ -2332,7 +2329,6 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env)
 	fix_stack_walker_env_t walker_env;
 
 	walker_env.sp_nodes = NEW_ARR_F(ir_node*, 0);
-	walker_env.arch_env = birg->main_env->arch_env;
 
 	irg_walk_graph(birg->irg, collect_stack_nodes_walker, NULL, &walker_env);
 
@@ -2366,8 +2362,8 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env)
 	len = ARR_LEN(phis);
 	for(i = 0; i < len; ++i) {
 		ir_node *phi = phis[i];
-		be_set_phi_reg_req(walker_env.arch_env, phi, &env->sp_req);
-		be_set_phi_flags(walker_env.arch_env, phi, arch_irn_flags_ignore | arch_irn_flags_modify_sp);
+		be_set_phi_reg_req(phi, &env->sp_req);
+		be_set_phi_flags(phi, arch_irn_flags_ignore | arch_irn_flags_modify_sp);
 		arch_set_irn_register(phi, env->arch_env->sp);
 	}
 	be_ssa_construction_destroy(&senv);