Removed some warnings due to missing const

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

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index b0426ad..42dfca1 100644 (file)
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -372,9 +372,12 @@ const char *ia32_emit_binop(const ir_node *n, ia32_emit_env_t *env) {
 
        switch(get_ia32_op_type(n)) {
                case ia32_Normal:
-                       if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n)) {
+                       if (is_ia32_ImmConst(n)) {
                                lc_esnprintf(ia32_get_arg_env(), buf, SNPRINTF_BUF_LEN, "%3S, %s", n, get_ia32_cnst(n));
                        }
+                       else if (is_ia32_ImmSymConst(n)) {
+                               lc_esnprintf(ia32_get_arg_env(), buf, SNPRINTF_BUF_LEN, "%3S, OFFSET FLAT:%s", n, get_ia32_cnst(n));
+                       }
                        else {
                                const arch_register_t *in1 = get_in_reg(n, 2);
                                const arch_register_t *in2 = get_in_reg(n, 3);
@@ -416,9 +419,9 @@ const char *ia32_emit_binop(const ir_node *n, ia32_emit_env_t *env) {
                                        get_ia32_cnst(n));                               /* tell the assembler to store it's address.   */
                        }
                        else {
-                               const arch_register_t *in1 = get_in_reg(n, 2);
-                               ir_mode              *mode = get_ia32_res_mode(n);
-                               const char           *in_name;
+                               const arch_register_t *in1 = get_in_reg(n, get_irn_arity(n) == 5 ? 3 : 2);
+                               ir_mode               *mode = get_ia32_res_mode(n);
+                               const char            *in_name;
 
                                mode    = mode ? mode : get_ia32_ls_mode(n);
                                in_name = ia32_get_reg_name_for_mode(env, mode, in1);
@@ -545,6 +548,14 @@ const char *ia32_emit_unop(const ir_node *n, ia32_emit_env_t *env) {
                case ia32_AddrModeD:
                        snprintf(buf, SNPRINTF_BUF_LEN, "%s", ia32_emit_am(n, env));
                        break;
+               case ia32_AddrModeS:
+                       /*
+                               Mulh is emitted via emit_unop
+                               imul [MEM]  means EDX:EAX <- EAX * [MEM]
+                       */
+                       assert((is_ia32_Mulh(n) || is_ia32_MulS(n)) && "Only MulS and Mulh can have AM source as unop");
+                       lc_esnprintf(ia32_get_arg_env(), buf, SNPRINTF_BUF_LEN, "%s", ia32_emit_am(n, env));
+                       break;
                default:
                        assert(0 && "unsupported op type");
        }
@@ -560,7 +571,6 @@ const char *ia32_emit_am(const ir_node *n, ia32_emit_env_t *env) {
        int               had_output = 0;
        char              *s;
        const char        *p;
-       int               size;
        static struct obstack *obst  = NULL;
        ir_mode *mode = get_ia32_ls_mode(n);
 
@@ -630,9 +640,8 @@ const char *ia32_emit_am(const ir_node *n, ia32_emit_env_t *env) {
        if (had_output)
                obstack_printf(obst, "] ");
 
-       size        = obstack_object_size(obst);
-       s           = obstack_finish(obst);
-       s[size - 1] = '\0';
+       obstack_1grow(obst, '\0');
+       s = obstack_finish(obst);
 
        return s;
 }
@@ -1080,17 +1089,6 @@ static void Set_emitter(ir_node *irn, ia32_emit_env_t *env) {
                instr = "sub";
        }
 
-       /* in case of a PsiCondSet use mov because it doesn't affect the eflags */
-       if (is_ia32_PsiCondSet(irn)) {
-               snprintf(cmd_buf, SNPRINTF_BUF_LEN, "mov %%%s, 0", arch_register_get_name(out));
-       }
-       else {
-               snprintf(cmd_buf, SNPRINTF_BUF_LEN, "%s %%%s, %%%s", instr, arch_register_get_name(out), arch_register_get_name(out));
-       }
-
-       snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* clear target as set modifies only lower 8 bit */");
-       IA32_DO_EMIT(irn);
-
        if (is_ia32_CmpSet(irn)) {
                lc_esnprintf(arg_env, cmd_buf, SNPRINTF_BUF_LEN, "cmp %s", ia32_emit_binop(irn, env));
        }
@@ -1107,6 +1105,11 @@ static void Set_emitter(ir_node *irn, ia32_emit_env_t *env) {
        snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* calculate Psi condition */" );
        IA32_DO_EMIT(irn);
 
+       /* use mov to clear target because it doesn't affect the eflags */
+       snprintf(cmd_buf, SNPRINTF_BUF_LEN, "mov %%%s, 0", arch_register_get_name(out));
+       snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* clear target as set modifies only lower 8 bit */");
+       IA32_DO_EMIT(irn);
+
        snprintf(cmd_buf, SNPRINTF_BUF_LEN, "set%s %%%s", cmp_suffix, reg8bit);
        snprintf(cmnt_buf, SNPRINTF_BUF_LEN, "/* set 1 iff true, 0 otherweise */" );
        IA32_DO_EMIT(irn);
@@ -1223,7 +1226,7 @@ static void emit_ia32_SwitchJmp(const ir_node *irn, ia32_emit_env_t *emit_env) {
 
        /* fill the table structure */
        tbl.label        = xmalloc(SNPRINTF_BUF_LEN);
-       tbl.label        = get_unique_label(tbl.label, SNPRINTF_BUF_LEN, "JMPTBL_");
+       tbl.label        = get_unique_label(tbl.label, SNPRINTF_BUF_LEN, ".TBL_");
        tbl.defProj      = NULL;
        tbl.num_branches = get_irn_n_edges(irn);
        tbl.branches     = xcalloc(tbl.num_branches, sizeof(tbl.branches[0]));
@@ -1377,7 +1380,7 @@ static void emit_Proj(const ir_node *irn, ia32_emit_env_t *env) {
 /**
  * Emit movsb/w instructions to make mov count divideable by 4
  */
-static void emit_CopyB_prolog(FILE *F, ir_node *irn, int rem) {
+static void emit_CopyB_prolog(FILE *F, const ir_node *irn, int rem) {
        char cmd_buf[SNPRINTF_BUF_LEN], cmnt_buf[SNPRINTF_BUF_LEN];
 
        ir_fprintf(F, "\t/* memcopy prolog %+F */\n", irn);