- at blockstart emit list of predblocks in comment
[libfirm] / ir / be / ia32 / ia32_emitter.c
index 528816e..192ecbe 100644 (file)
@@ -70,6 +70,10 @@ void ia32_switch_section(FILE *F, section_t sec) {
        case SECTION_RODATA:
        case SECTION_COMMON:
                fprintf(F, "\t%s\n", text[asm_flavour][sec]);
+               break;
+
+       default:
+               break;
        }
 }
 
@@ -82,6 +86,8 @@ static void ia32_dump_function_object(FILE *F, const char *name)
        case ASM_MINGW_GAS:
                fprintf(F, "\t.def\t%s;\t.scl\t2;\t.type\t32;\t.endef\n", name);
                break;
+       default:
+               break;
        }
 }
 
@@ -91,6 +97,8 @@ static void ia32_dump_function_size(FILE *F, const char *name)
        case ASM_LINUX_GAS:
                fprintf(F, "\t.size\t%s, .-%s\n", name, name);
                break;
+       default:
+               break;
        }
 }
 
@@ -293,7 +301,9 @@ static int ia32_get_mode_suffix(lc_appendable_t *app,
        ir_mode *mode = get_irn_mode(irn);
 
        if (mode == mode_T) {
-               mode = (is_ia32_Ld(irn) || is_ia32_St(irn)) ? get_ia32_ls_mode(irn) : get_ia32_res_mode(irn);
+               mode = get_ia32_res_mode(irn);
+               if (! mode)
+                       mode = get_ia32_ls_mode(irn);
        }
 
        if (! irn)
@@ -1129,41 +1139,80 @@ static void emit_ia32_xCmp(ir_node *irn, ia32_emit_env_t *env) {
        FILE               *F       = env->out;
        const lc_arg_env_t *arg_env = ia32_get_arg_env();
        int                sse_pnc  = -1;
+       long               pnc      = get_ia32_pncode(irn);
+       long               unord    = pnc & pn_Cmp_Uo;
        char cmd_buf[SNPRINTF_BUF_LEN];
        char cmnt_buf[SNPRINTF_BUF_LEN];
 
-       switch (get_ia32_pncode(irn)) {
+       switch (pnc) {
                case pn_Cmp_Leg: /* odered */
                        sse_pnc = 7;
                        break;
                case pn_Cmp_Uo:  /* unordered */
                        sse_pnc = 3;
                        break;
-               case pn_Cmp_Ue:  /* == */
+               case pn_Cmp_Ue:
+               case pn_Cmp_Eq:  /* == */
                        sse_pnc = 0;
                        break;
-               case pn_Cmp_Ul:  /* < */
+               case pn_Cmp_Ul:
+               case pn_Cmp_Lt:  /* < */
                        sse_pnc = 1;
                        break;
-               case pn_Cmp_Ule: /* <= */
+               case pn_Cmp_Ule:
+               case pn_Cmp_Le: /* <= */
                        sse_pnc = 2;
                        break;
-               case pn_Cmp_Ug:  /* > */
+               case pn_Cmp_Ug:
+               case pn_Cmp_Gt:  /* > */
                        sse_pnc = 6;
                        break;
-               case pn_Cmp_Uge: /* >= */
+               case pn_Cmp_Uge:
+               case pn_Cmp_Ge: /* >= */
                        sse_pnc = 5;
                        break;
-               case pn_Cmp_Ne:  /* != */
+               case pn_Cmp_Ne:
+               case pn_Cmp_Lg:  /* != */
                        sse_pnc = 4;
                        break;
        }
 
-       assert(sse_pnc >= 0 && "unsupported floating point compare");
-
-       lc_esnprintf(arg_env, cmd_buf, SNPRINTF_BUF_LEN, "cmps%M %s, %d", irn, ia32_emit_binop(irn, env), sse_pnc);
-       lc_esnprintf(arg_env, cmnt_buf, SNPRINTF_BUF_LEN, "/* SSE compare with result in %1D */", irn);
+       assert(sse_pnc >= 0 && "unsupported compare");
+
+       if (unord && sse_pnc != 3) {
+               /*
+                       We need a separate compare against unordered.
+                       Quick and Dirty solution:
+                       - get some memory on stack
+                       - compare
+                       - store result
+                       - compare
+                       - and result and stored result
+                   - cleanup stack
+               */
+               snprintf(cmd_buf, SNPRINTF_BUF_LEN, "sub %%esp, 8");
+               snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* reserve some space for unordered compare result */");
+               IA32_DO_EMIT(NULL);
+               snprintf(cmd_buf, SNPRINTF_BUF_LEN, "cmpsd %s, 3", ia32_emit_binop(irn, env));
+               snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* SSE compare: unordered */");
+               IA32_DO_EMIT(NULL);
+               lc_esnprintf(arg_env, cmd_buf, SNPRINTF_BUF_LEN, "movsd [%%esp], %1D", irn);
+               snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* store compare result */");
+               IA32_DO_EMIT(NULL);
+       }
+
+       snprintf(cmd_buf, SNPRINTF_BUF_LEN, "cmpsd %s, %d", ia32_emit_binop(irn, env), sse_pnc);
+       lc_esnprintf(arg_env, cmnt_buf, SNPRINTF_BUF_LEN, "/* SSE compare (%+F) with result in %1D */", irn, irn);
        IA32_DO_EMIT(irn);
+
+       if (unord && sse_pnc != 3) {
+               lc_esnprintf(arg_env, cmd_buf, SNPRINTF_BUF_LEN, "andpd %1D, [%%esp]", irn);
+               snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* build the final result */");
+               IA32_DO_EMIT(NULL);
+               snprintf(cmd_buf, SNPRINTF_BUF_LEN, "add %%esp, 8");
+               snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* free allocated space */");
+               IA32_DO_EMIT(NULL);
+       }
 }
 
 /*********************************************************
@@ -1735,6 +1784,30 @@ static void emit_ia32_Const(const ir_node *n, ia32_emit_env_t *env) {
        lc_efprintf(arg_env, F, "\t%-35s %-60s /* %+F (%+G) */\n", cmd_buf, cmnt_buf, n, n);
 }
 
+/**
+ * Emits code to increase stack pointer.
+ */
+static void emit_ia32_AddSP(const ir_node *irn, ia32_emit_env_t *emit_env) {
+       FILE          *F = emit_env->out;
+       char cmd_buf[SNPRINTF_BUF_LEN], cmnt_buf[SNPRINTF_BUF_LEN];
+
+       if (is_ia32_ImmConst(irn)) {
+               lc_esnprintf(ia32_get_arg_env(), cmd_buf, SNPRINTF_BUF_LEN, "sub %1D, %C", irn, irn);
+       }
+       else if (is_ia32_ImmSymConst(irn)) {
+               if (get_ia32_op_type(irn) == ia32_Normal)
+                       lc_esnprintf(ia32_get_arg_env(), cmd_buf, SNPRINTF_BUF_LEN, "sub %1D, OFFSET_FLAT:%C", irn, irn);
+               else /* source address mode */
+                       lc_esnprintf(ia32_get_arg_env(), cmd_buf, SNPRINTF_BUF_LEN, "sub %1D, [%s%s]", irn, get_id_str(get_ia32_am_sc(irn)), get_ia32_am_offs(irn));
+       }
+       else {
+               lc_esnprintf(ia32_get_arg_env(), cmd_buf, SNPRINTF_BUF_LEN, "sub %1D, %2S", irn, irn);
+       }
+       snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* reserve space on stack */");
+
+       IA32_DO_EMIT(irn);
+}
+
 static void emit_be_Return(const ir_node *n, ia32_emit_env_t *env) {
        FILE *F = env->out;
        const lc_arg_env_t *arg_env = ia32_get_arg_env();
@@ -1742,6 +1815,11 @@ static void emit_be_Return(const ir_node *n, ia32_emit_env_t *env) {
        lc_efprintf(arg_env, F, "\t%-35s %-60s /* %+F (%+G) */\n", "ret", "/* be_Return */", n, n);
 }
 
+static void emit_Nothing(const ir_node *n, ia32_emit_env_t *env) {
+       FILE *F = env->out;
+
+       ir_fprintf(F, "\t%35s /* %+F (%+G) */\n", " ", n, n);
+}
 
 
 /***********************************************************************************
@@ -1763,7 +1841,9 @@ static void ia32_register_emitters(void) {
 #define IA32_EMIT2(a,b) op_ia32_##a->ops.generic = (op_func)emit_ia32_##b
 #define IA32_EMIT(a)    IA32_EMIT2(a,a)
 #define EMIT(a)         op_##a->ops.generic = (op_func)emit_##a
+#define IGN(a)                 op_##a->ops.generic = (op_func)emit_Nothing
 #define BE_EMIT(a)      op_be_##a->ops.generic = (op_func)emit_be_##a
+#define BE_IGN(a)              op_be_##a->ops.generic = (op_func)emit_Nothing
 
        /* first clear the generic function pointer for all ops */
        clear_irp_opcodes_generic_func();
@@ -1789,6 +1869,7 @@ static void ia32_register_emitters(void) {
        IA32_EMIT(Conv_I2I);
        IA32_EMIT(Conv_I2I8Bit);
        IA32_EMIT(Const);
+       IA32_EMIT(AddSP);
        IA32_EMIT(xCmp);
        IA32_EMIT(xCmpSet);
        IA32_EMIT(xCmpCMov);
@@ -1809,12 +1890,19 @@ static void ia32_register_emitters(void) {
        BE_EMIT(Perm);
        BE_EMIT(Return);
 
+       BE_IGN(RegParams);
+       BE_IGN(Barrier);
+       BE_IGN(Keep);
+
        /* firm emitter */
        EMIT(Jmp);
        EMIT(Proj);
+       IGN(Phi);
+       IGN(Start);
 
 #undef BE_EMIT
 #undef EMIT
+#undef IGN
 #undef IA32_EMIT2
 #undef IA32_EMIT
 }
@@ -1824,7 +1912,6 @@ static void ia32_register_emitters(void) {
  */
 static void ia32_emit_node(const ir_node *irn, void *env) {
        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;)
 
@@ -1835,7 +1922,8 @@ static void ia32_emit_node(const ir_node *irn, void *env) {
                (*emit)(irn, env);
        }
        else {
-               ir_fprintf(F, "\t%35s /* %+F (%+G) */\n", " ", irn, irn);
+               emit_Nothing(irn, env);
+               ir_fprintf(stderr, "Warning: No emit handler for node %+F (%+G)\n", irn, irn);
        }
 }
 
@@ -1879,7 +1967,7 @@ static void ia32_emit_align_label(FILE *F, cpu_support cpu) {
        unsigned align; unsigned maximum_skip;
 
        /* gcc doesn't emit alignment for p4 ?*/
-    if (cpu == arch_pentium_4)
+       if (cpu == arch_pentium_4)
                return;
 
        switch (cpu) {
@@ -1905,7 +1993,10 @@ static void ia32_emit_align_label(FILE *F, cpu_support cpu) {
 static void ia32_gen_block(ir_node *block, void *env) {
        ia32_emit_env_t *emit_env = env;
        const ir_node *irn;
+       char cmd_buf[SNPRINTF_BUF_LEN];
+       char cmnt_buf[SNPRINTF_BUF_LEN];
        int need_label = block != get_irg_start_block(get_irn_irg(block));
+       FILE *F = emit_env->out;
 
        if (! is_Block(block))
                return;
@@ -1917,10 +2008,40 @@ static void ia32_gen_block(ir_node *block, void *env) {
        }
 
        if (need_label) {
+               int i, arity;
+               char* predstring = cmnt_buf;
+               size_t cmntsize;
+               int res;
+
                ia32_emit_align_label(emit_env->out, emit_env->isa->opt_arch);
-               fprintf(emit_env->out, BLOCK_PREFIX("%ld:\n"), get_irn_node_nr(block));
+
+               ir_snprintf(cmd_buf, sizeof(cmd_buf), BLOCK_PREFIX("%d:"),
+                           get_irn_node_nr(block));
+
+               /* emit list of pred blocks in comment */
+               cmntsize = sizeof(cmnt_buf);
+               res = snprintf(predstring, cmntsize, "/* preds: ");
+               cmntsize -= res;
+               predstring += res;
+
+               arity = get_irn_arity(block);
+               for(i = 0; i < arity; ++i) {
+                       ir_node *predblock = get_Block_cfgpred_block(block, i);
+                       res = snprintf(predstring, cmntsize, " %ld", get_irn_node_nr(predblock));
+                       cmntsize -= res;
+                       predstring += res;
+                       if(cmntsize <= 3)
+                               break;
+               }
+               if(cmntsize < 3) {
+                       predstring = cmnt_buf + sizeof(cmnt_buf) - 3;
+                       cmntsize = 3;
+               }
+               snprintf(predstring, cmntsize, "*/");
+               fprintf(F, "%-43s %-60s\n", cmd_buf, cmnt_buf);
        }
 
+       /* emit the contents of the block */
        sched_foreach(block, irn) {
                ia32_emit_node(irn, env);
        }