fix sse/x87 fixup code added at wrong places

[libfirm] / ir / be / ia32 / ia32_map_regs.c

diff --git a/ir/be/ia32/ia32_map_regs.c b/ir/be/ia32/ia32_map_regs.c
index 051321f..2083d25 100644 (file)
--- a/ir/be/ia32/ia32_map_regs.c
+++ b/ir/be/ia32/ia32_map_regs.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 
 #include "pmap.h"
+#include "error.h"
 
 #include "ia32_map_regs.h"
 #include "ia32_new_nodes.h"
@@ -37,8 +38,8 @@
 #include "bearch_ia32_t.h"
 #include "../benodesets.h"
 
-static int maxnum_gpreg_args = 3;   /* maximum number of int arguments passed in registers; default 3 */
-static int maxnum_sse_args = 5;   /* maximum number of float arguments passed in registers; default 5 */
+#define MAXNUM_GPREG_ARGS     3
+#define MAXNUM_SSE_ARGS       5
 
 /* this is the order of the assigned registers usesd for parameter passing */
 
@@ -95,6 +96,7 @@ struct ia32_irn_reg_assoc {
 int ia32_cmp_irn_reg_assoc(const void *a, const void *b, size_t len) {
        const struct ia32_irn_reg_assoc *x = a;
        const struct ia32_irn_reg_assoc *y = b;
+       (void) len;
 
        return x->irn != y->irn;
 }
@@ -157,79 +159,37 @@ const char *ia32_get_mapped_reg_name(pmap *reg_map, const arch_register_t *reg)
        return e->value;
 }
 
-/**
- * Check all parameters and determine the maximum number of parameters
- * to pass in gp regs resp. in fp regs.
- *
- * @param n       The number of parameters
- * @param modes   The list of the parameter modes
- * @param n_int   Holds the number of int parameters to be passed in regs after the call
- * @param n_float Holds the number of float parameters to be passed in regs after the call
- * @return        The number of the last parameter to be passed in register
- */
-int ia32_get_n_regparam_class(ia32_code_gen_t *cg, int n, ir_mode **modes,
-                              int *n_int, int *n_float)
-{
-       int i, finished = 0;
-       int max_fp_regs;
-
-       if(USE_SSE2(cg)) {
-               max_fp_regs = maxnum_sse_args;
-       } else {
-               max_fp_regs = 0;
-       }
-
-       *n_int   = 0;
-       *n_float = 0;
-
-       for (i = 0; i < n && !finished; i++) {
-               if (mode_is_int(modes[i]) || mode_is_reference(modes[i])) {
-                       *n_int = *n_int + 1;
-               }
-               else if (mode_is_float(modes[i])) {
-                       *n_float = *n_float + 1;
-               }
-               else {
-                       finished = 1;
-               }
-
-               /* test for maximum */
-               if (*n_int == maxnum_gpreg_args || *n_float == max_fp_regs) {
-                       finished = 1;
-               }
-       }
-
-       return i - 1;
-}
-
-
 /**
  * Returns the register for parameter nr.
- *
- * @param n     The number of parameters
- * @param modes The list of the parameter modes
- * @param nr    The number of the parameter to return the requirements for
- * @param cc    The calling convention
- * @return      The register
  */
 const arch_register_t *ia32_get_RegParam_reg(ia32_code_gen_t *cg, unsigned cc,
-                                             unsigned nr, ir_mode *mode)
+                                             size_t nr, const ir_mode *mode)
 {
+       if(! (cc & cc_reg_param))
+               return NULL;
+
        if(mode_is_float(mode)) {
                if(!USE_SSE2(cg))
                        return NULL;
-               assert(nr < maxnum_sse_args);
+               if(nr >= MAXNUM_SSE_ARGS)
+                       return NULL;
+
                if(cc & cc_this_call) {
                        return fpreg_sse_param_reg_this[nr];
                }
                return fpreg_sse_param_reg_std[nr];
-       }
+       } else if(mode_is_int(mode) || mode_is_reference(mode)) {
+               if(get_mode_size_bits(mode) > 32)
+                       return NULL;
 
-       assert(mode_is_int(mode) || mode_is_reference(mode));
+               if(nr >= MAXNUM_GPREG_ARGS)
+                       return NULL;
 
-       if(cc & cc_this_call) {
-               assert(nr < maxnum_gpreg_args);
-               return gpreg_param_reg_this[nr];
+               if(cc & cc_this_call) {
+                       return gpreg_param_reg_this[nr];
+               }
+               return gpreg_param_reg_std[nr];
        }
-       return gpreg_param_reg_std[nr];
+
+       panic("unknown argument mode");
 }