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

diff --git a/ir/be/ia32/ia32_map_regs.c b/ir/be/ia32/ia32_map_regs.c
index f4308e04e..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
@@ -8,9 +10,12 @@
 
 #include <stdlib.h>
 
+#include "pmap.h"
+
 #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 */
@@ -36,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]
 };
 
 
@@ -80,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);
 }
@@ -95,44 +100,35 @@ const arch_register_t *ia32_get_firm_reg(const ir_node *irn, set *reg_set) {
 	return assoc->reg;
 }
 
-
-
-/* Mapping to store proj numbers for registers */
-
-struct ia32_reg_projnum_assoc {
-	const arch_register_t *reg;
-	long                   proj_num;
-};
-
-int ia32_cmp_reg_projnum_assoc(const void *a, const void *b, size_t len) {
-	const struct ia32_reg_projnum_assoc *x = a;
-	const struct ia32_reg_projnum_assoc *y = b;
-
-	return !(x->reg == y->reg);
+void ia32_build_16bit_reg_map(pmap *reg_map) {
+	pmap_insert(reg_map, &ia32_gp_regs[REG_EAX], "ax");
+	pmap_insert(reg_map, &ia32_gp_regs[REG_EBX], "bx");
+	pmap_insert(reg_map, &ia32_gp_regs[REG_ECX], "cx");
+	pmap_insert(reg_map, &ia32_gp_regs[REG_EDX], "dx");
+	pmap_insert(reg_map, &ia32_gp_regs[REG_ESI], "si");
+	pmap_insert(reg_map, &ia32_gp_regs[REG_EDI], "di");
+	pmap_insert(reg_map, &ia32_gp_regs[REG_EBP], "bp");
+	pmap_insert(reg_map, &ia32_gp_regs[REG_ESP], "sp");
 }
 
-static struct ia32_reg_projnum_assoc *get_reg_projnum_assoc(const arch_register_t *reg, set *reg_set) {
-	struct ia32_reg_projnum_assoc templ;
-	unsigned int hash;
-
-	templ.reg      = reg;
-	templ.proj_num = -1;
-	hash = HASH_PTR(reg);
-
-	return set_insert(reg_set, &templ, sizeof(templ), hash);
+void ia32_build_8bit_reg_map(pmap *reg_map) {
+	pmap_insert(reg_map, &ia32_gp_regs[REG_EAX], "al");
+	pmap_insert(reg_map, &ia32_gp_regs[REG_EBX], "bl");
+	pmap_insert(reg_map, &ia32_gp_regs[REG_ECX], "cl");
+	pmap_insert(reg_map, &ia32_gp_regs[REG_EDX], "dl");
 }
 
-void ia32_set_reg_projnum(const arch_register_t *reg, long proj_num, set *reg_set) {
-	struct ia32_reg_projnum_assoc *assoc = get_reg_projnum_assoc(reg, reg_set);
-	assoc->proj_num = proj_num;
-}
-
-long ia32_get_reg_projnum(const arch_register_t *reg, set *reg_set) {
-	struct ia32_reg_projnum_assoc *assoc = get_reg_projnum_assoc(reg, reg_set);
-	return assoc->proj_num;
-}
+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?");
+	if (! e) {
+		printf("FIXME: ia32map_regs.c:122: returning fake register name for ia32 with 32 register\n");
+		return reg->name;
+	}
 
+	return e->value;
+}
 
 /**
  * Check all parameters and determine the maximum number of parameters
@@ -147,8 +143,11 @@ long ia32_get_reg_projnum(const arch_register_t *reg, set *reg_set) {
 int ia32_get_n_regparam_class(int n, ir_mode **modes, int *n_int, int *n_float) {
 	int i, finished = 0;
 
+	*n_int   = 0;
+	*n_float = 0;
+
 	for (i = 0; i < n && !finished; i++) {
-		if (mode_is_int(modes[i])) {
+		if (mode_is_int(modes[i]) || mode_is_reference(modes[i])) {
 			*n_int = *n_int + 1;
 		}
 		else if (mode_is_float(modes[i])) {
@@ -177,7 +176,7 @@ int ia32_get_n_regparam_class(int n, ir_mode **modes, int *n_int, int *n_float)
  * @param cc    The calling convention
  * @return      The register
  */
-const arch_register_t *ia32_get_RegParam_req(int n, ir_mode **modes, long nr, unsigned cc) {
+const arch_register_t *ia32_get_RegParam_reg(int n, ir_mode **modes, long nr, unsigned cc) {
 	const arch_register_t **current_gpreg_param_reg;
 	const arch_register_t **current_fpreg_param_reg;
 	const arch_register_t  *param_reg = NULL;
@@ -200,7 +199,7 @@ const arch_register_t *ia32_get_RegParam_req(int n, ir_mode **modes, long nr, un
 
 		/* loop over all parameters and determine whether its a int or float register parameter */
 		for (i = 0; i < nr && !done && (cc & cc_reg_param); i++) {
-			if (mode_is_int(modes[i]) && cur_gp_idx < maxnum_gpreg_args) {
+			if ((mode_is_int(modes[i]) || mode_is_reference(modes[i])) && cur_gp_idx < maxnum_gpreg_args) {
 				/* param can be passed in general purpose register and we have some registers left */
 				cur_gp_idx++;
 			}
@@ -212,7 +211,7 @@ const arch_register_t *ia32_get_RegParam_req(int n, ir_mode **modes, long nr, un
 		}
 
 		/* now: i == nr, that's the parameter requirement we want */
-		if (mode_is_int(modes[i]) && cur_gp_idx < maxnum_gpreg_args) {
+		if ((mode_is_int(modes[i]) || mode_is_reference(modes[i])) && cur_gp_idx < maxnum_gpreg_args) {
 			/* parameter #nr can be passed in general purpose register */
 			param_reg = current_gpreg_param_reg[i];
 		}
@@ -227,69 +226,3 @@ const arch_register_t *ia32_get_RegParam_req(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 *first;
-	ir_node *pred = get_Proj_pred(proj);
-	long nr       = get_Proj_proj(proj);
-
-	if (is_ia32_Load(pred)) {
-		if (nr == pn_Load_res)
-			return 0;
-		assert(0 && "unsupported Proj(Load) number");
-	}
-	else if (is_ia32_Store(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 || pn_Div_res)
-			return 0;
-		if (nr == pn_DivMod_res_mod || 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 (is_ia32_Call(pred)) {
-		return 0;
-	}
-	else if (get_irn_mode(proj) == mode_X && nr == pn_Start_X_initial_exec) {
-		return 0;
-	}
-	else if (is_Proj(pred)) {
-		first = get_Proj_pred(pred);
-
-		if (is_ia32_Call(first))
-			return 0;
-
-		assert(0 && "unsupported proj-pos translation Proj(Proj)");
-		return -1;
-	}
-	else if (get_irn_opcode(pred) == iro_Start) {
-		return nr;
-	}
-
-//	assert(0 && "unsupported Proj(X)");
-	return nr;
-}