X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_map_regs.c;h=33307b894719e96d6d96047e76abb2540f383220;hb=ada1f44f881666551cc1f9c31463963b198ead45;hp=98e7e0e168a5bfc1460b97a8d8b9cf3b82c5d495;hpb=d78ff68d0afb420d8586aa9d0a28289941487101;p=libfirm

diff --git a/ir/be/ia32/ia32_map_regs.c b/ir/be/ia32/ia32_map_regs.c
index 98e7e0e16..33307b894 100644
--- a/ir/be/ia32/ia32_map_regs.c
+++ b/ir/be/ia32/ia32_map_regs.c
@@ -1,5 +1,7 @@
 /**
  * Register mapping for firm nodes. Stolen from bearch_firm :)
+ * Calculate requirements for register parameter.
+ * @author Christian Wuerdig
  * $Id$
  */
 #ifdef HAVE_CONFIG_H
@@ -13,6 +15,7 @@
 #include "ia32_map_regs.h"
 #include "ia32_new_nodes.h"
 #include "gen_ia32_regalloc_if.h"
+#include "../benodesets.h"
 
 static int maxnum_gpreg_args = 3;   /* maximum number of int arguments passed in registers; default 3 */
 static int maxnum_fpreg_args = 5;   /* maximum number of float arguments passed in registers; default 5 */
@@ -38,26 +41,26 @@ const arch_register_t *gpreg_param_reg_this[] = {
 };
 
 const arch_register_t *fpreg_param_reg_std[] = {
-	&ia32_fp_regs[REG_XMM0],
-	&ia32_fp_regs[REG_XMM1],
-	&ia32_fp_regs[REG_XMM2],
-	&ia32_fp_regs[REG_XMM3],
-	&ia32_fp_regs[REG_XMM4],
-	&ia32_fp_regs[REG_XMM5],
-	&ia32_fp_regs[REG_XMM6],
-	&ia32_fp_regs[REG_XMM7]
+	&ia32_xmm_regs[REG_XMM0],
+	&ia32_xmm_regs[REG_XMM1],
+	&ia32_xmm_regs[REG_XMM2],
+	&ia32_xmm_regs[REG_XMM3],
+	&ia32_xmm_regs[REG_XMM4],
+	&ia32_xmm_regs[REG_XMM5],
+	&ia32_xmm_regs[REG_XMM6],
+	&ia32_xmm_regs[REG_XMM7]
 };
 
 const arch_register_t *fpreg_param_reg_this[] = {
 	NULL,  /* in case of a "this" pointer, the first parameter must not be a float */
-	&ia32_fp_regs[REG_XMM0],
-	&ia32_fp_regs[REG_XMM1],
-	&ia32_fp_regs[REG_XMM2],
-	&ia32_fp_regs[REG_XMM3],
-	&ia32_fp_regs[REG_XMM4],
-	&ia32_fp_regs[REG_XMM5],
-	&ia32_fp_regs[REG_XMM6],
-	&ia32_fp_regs[REG_XMM7]
+	&ia32_xmm_regs[REG_XMM0],
+	&ia32_xmm_regs[REG_XMM1],
+	&ia32_xmm_regs[REG_XMM2],
+	&ia32_xmm_regs[REG_XMM3],
+	&ia32_xmm_regs[REG_XMM4],
+	&ia32_xmm_regs[REG_XMM5],
+	&ia32_xmm_regs[REG_XMM6],
+	&ia32_xmm_regs[REG_XMM7]
 };
 
 
@@ -82,7 +85,7 @@ static struct ia32_irn_reg_assoc *get_irn_reg_assoc(const ir_node *irn, set *reg
 
 	templ.irn = irn;
 	templ.reg = NULL;
-	hash = HASH_PTR(irn);
+	hash = nodeset_hash(irn);
 
 	return set_insert(reg_set, &templ, sizeof(templ), hash);
 }
@@ -115,10 +118,14 @@ void ia32_build_8bit_reg_map(pmap *reg_map) {
 	pmap_insert(reg_map, &ia32_gp_regs[REG_EDX], "dl");
 }
 
-char *ia32_get_mapped_reg_name(pmap *reg_map, const arch_register_t *reg) {
+const char *ia32_get_mapped_reg_name(pmap *reg_map, const arch_register_t *reg) {
 	pmap_entry *e = pmap_find(reg_map, (void *)reg);
 
-	assert(e && "missing map init?");
+	//assert(e && "missing map init?");
+	if (! e) {
+		printf("FIXME: ia32map_regs.c:122: returning fake register name for ia32 with 32 register\n");
+		return reg->name;
+	}
 
 	return e->value;
 }
@@ -219,59 +226,3 @@ const arch_register_t *ia32_get_RegParam_reg(int n, ir_mode **modes, long nr, un
 
 	return param_reg;
 }
-
-
-
-/**
- * Translates the projnum into a "real" argument position for register
- * requirements dependend on the predecessor.
- */
-long ia32_translate_proj_pos(const ir_node *proj) {
-	ir_node *pred = get_Proj_pred(proj);
-	long nr       = get_Proj_proj(proj);
-
-	if (is_ia32_Ld(pred)) {
-		if (nr == pn_Load_res || nr == 0)
-			return 0;
-		assert(0 && "unsupported Proj(Load) number");
-	}
-	else if (is_ia32_St(pred)) {
-		return 0;
-	}
-	else if (is_ia32_CondJmp(pred)) {
-		return 0;
-	}
-	else if (is_ia32_SwitchJmp(pred)) {
-		return 0;
-	}
-	else if (is_ia32_Cdq(pred) || is_ia32_Mulh(pred)) {
-		if (nr == pn_EAX)
-			return 0;
-		if (nr == pn_EDX)
-			return 1;
-	}
-	else if (is_ia32_DivMod(pred)) {
-		if (nr == pn_DivMod_res_div || nr == pn_Div_res)
-			return 0;
-		if (nr == pn_DivMod_res_mod || nr == pn_Mod_res)
-			return 1;
-	}
-	else if (is_ia32_fDiv(pred)) {
-		if (nr == pn_Quot_res)
-			return 0;
-		else
-			assert(0 && "there should be no more Projs for a fDiv");
-	}
-	else if (get_irn_mode(proj) == mode_X && nr == pn_Start_X_initial_exec) {
-		return 0;
-	}
-	else if (is_Proj(pred)) {
-		return nr;
-	}
-	else if (get_irn_opcode(pred) == iro_Start) {
-		return nr;
-	}
-
-//	assert(0 && "unsupported Proj(X)");
-	return nr;
-}