added another test file

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

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index 18ea6f3..42c7356 100644 (file)
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -137,12 +137,15 @@ enum io_direction {
  */
 static const char *get_ia32_reg_name(ir_node *irn, int pos, enum io_direction in_out) {
        const arch_register_t *reg;
-       const char            *name;
-       static char           *buf = NULL;
-       int                    len;
 
        if (in_out == IN_REG) {
                reg = get_in_reg(irn, pos);
+
+               if (reg->reg_class == &ia32_reg_classes[CLASS_ia32_vfp]) {
+                       /* FIXME: works for binop only */
+                       assert(2 <= pos && pos <= 3);
+                       reg = get_ia32_attr(irn)->x87[pos - 2];
+               }
        }
        else {
                /* destination address mode nodes don't have outputs */
@@ -151,20 +154,10 @@ static const char *get_ia32_reg_name(ir_node *irn, int pos, enum io_direction in
                }
 
                reg = get_out_reg(irn, pos);
+               if (reg->reg_class == &ia32_reg_classes[CLASS_ia32_vfp])
+                       reg = get_ia32_attr(irn)->x87[pos + 2];
        }
-
-       name = arch_register_get_name(reg);
-
-       if (buf) {
-               free(buf);
-       }
-
-       len = strlen(name) + 2;
-       buf = xcalloc(1, len);
-
-       snprintf(buf, len, "%%%s", name);
-
-       return buf;
+       return arch_register_get_name(reg);
 }
 
 /**
@@ -180,17 +173,10 @@ static int ia32_get_reg_name(lc_appendable_t *app,
        if (!X)
                return lc_appendable_snadd(app, "(null)", 6);
 
-       if (has_x87_register(X)) {
-               ia32_attr_t *attr = get_ia32_attr(X);
-
-               if (occ->conversion == 'S')
-                       buf = arch_register_get_name(attr->x87[nr - 2]);
-               else
-                       buf = arch_register_get_name(attr->x87[2 + nr]);
-       }
-       else
-               buf = get_ia32_reg_name(X, nr, occ->conversion == 'S' ? IN_REG : OUT_REG);
+       buf = get_ia32_reg_name(X, nr, occ->conversion == 'S' ? IN_REG : OUT_REG);
 
+       /* append the stupid % to register names */
+       lc_appendable_chadd(app, '%');
        return lc_appendable_snadd(app, buf, strlen(buf));
 }
 
@@ -210,6 +196,7 @@ static int ia32_get_x87_name(lc_appendable_t *app,
 
        attr = get_ia32_attr(X);
        buf = attr->x87[nr]->name;
+       lc_appendable_chadd(app, '%');
        return lc_appendable_snadd(app, buf, strlen(buf));
 }
 
@@ -503,7 +490,7 @@ char *ia32_emit_am(const ir_node *n, ia32_emit_env_t *env) {
                                break;
                        case 64:
                                if (has_x87_register(n))
-                                       /* ARGHHH: x87 wants QWORD PTR but SSE must be WITHOUT */
+                                       /* ARGHHH: stupid gas x87 wants QWORD PTR but SSE must be WITHOUT */
                                        obstack_printf(obst, "QWORD PTR ");
                                break;
                        case 80:
@@ -784,13 +771,6 @@ static void emit_ia32_CondJmp(const ir_node *irn, ia32_emit_env_t *env) {
        CondJmp_emitter(irn, env);
 }
 
-/**
- * Emits code for conditional jump with immediate.
- */
-static void emit_ia32_CondJmp_i(const ir_node *irn, ia32_emit_env_t *env) {
-       CondJmp_emitter(irn, env);
-}
-
 /**
  * Emits code for conditional test and jump.
  */
@@ -1218,9 +1198,10 @@ static void emit_ia32_Conv_FP2FP(const ir_node *irn, ia32_emit_env_t *emit_env)
  * Emits code for an Int conversion.
  */
 static void emit_ia32_Conv_I2I(const ir_node *irn, ia32_emit_env_t *emit_env) {
-       FILE               *F    = emit_env->out;
-       const lc_arg_env_t *env  = ia32_get_arg_env();
-       char *move_cmd, *conv_cmd;
+       FILE               *F        = emit_env->out;
+       const lc_arg_env_t *env      = ia32_get_arg_env();
+       char               *move_cmd = "movzx";
+       char               *conv_cmd = NULL;
        ir_mode *src_mode, *tgt_mode;
        int n, m;
        char cmd_buf[SNPRINTF_BUF_LEN], cmnt_buf[SNPRINTF_BUF_LEN];
@@ -1241,10 +1222,6 @@ static void emit_ia32_Conv_I2I(const ir_node *irn, ia32_emit_env_t *emit_env) {
                else
                        assert(0 && "unsupported Conv_I2I");
        }
-       else {
-               move_cmd = "movzx";
-               conv_cmd = NULL;
-       }
 
        switch(get_ia32_op_type(irn)) {
                case ia32_Normal:
@@ -1449,10 +1426,10 @@ static void ia32_register_emitters(void) {
  * Emits code for a node.
  */
 static void ia32_emit_node(const ir_node *irn, void *env) {
-       ia32_emit_env_t        *emit_env = env;
-       firm_dbg_module_t *mod      = emit_env->mod;
+       ia32_emit_env_t   *emit_env = env;
        FILE              *F        = emit_env->out;
        ir_op             *op       = get_irn_op(irn);
+       DEBUG_ONLY(firm_dbg_module_t *mod = emit_env->mod;)
 
        DBG((mod, LEVEL_1, "emitting code for %+F\n", irn));
 
@@ -1488,6 +1465,7 @@ static void ia32_emit_func_prolog(FILE *F, ir_graph *irg) {
        entity     *irg_ent  = get_irg_entity(irg);
        const char *irg_name = get_entity_name(irg_ent);
 
+       fprintf(F, "\t.section\t.text\n");
        if (get_entity_visibility(irg_ent) == visibility_external_visible) {
                fprintf(F, ".globl %s\n", irg_name);
        }