sparc: remove unnecessary convs before stores

[libfirm] / ir / be / begnuas.c

diff --git a/ir/be/begnuas.c b/ir/be/begnuas.c
index 2315169..b89f43b 100644 (file)
--- a/ir/be/begnuas.c
+++ b/ir/be/begnuas.c
@@ -47,6 +47,7 @@
 
 /** by default, we generate assembler code for the Linux gas */
 object_file_format_t  be_gas_object_file_format = OBJECT_FILE_FORMAT_ELF;
+elf_variant_t         be_gas_elf_variant        = ELF_VARIANT_NORMAL;
 bool                  be_gas_emit_types         = true;
 char                  be_gas_elf_type_char      = '@';
 
@@ -160,13 +161,13 @@ static void emit_section(be_gas_section_t section, const ir_entity *entity)
                "text", "data", "rodata", "bss", "ctors", "dtors"
        };
        static const char *const type[] = {
-               "progbits", "progbits", "progbits", "nobits", "init_array", "fini_array"
+               "progbits", "progbits", "progbits", "nobits", "progbits", "progbits"
        };
 
        if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
                emit_section_macho(section);
                return;
-       } else if(be_gas_object_file_format == OBJECT_FILE_FORMAT_ELF_SPARC) {
+       } else if(be_gas_elf_variant == ELF_VARIANT_SPARC) {
                emit_section_sparc(section, entity);
                return;
        }
@@ -526,7 +527,6 @@ void be_gas_emit_function_prolog(const ir_entity *entity, unsigned po2alignment)
 
        switch (be_gas_object_file_format) {
        case OBJECT_FILE_FORMAT_ELF:
-       case OBJECT_FILE_FORMAT_ELF_SPARC:
                be_emit_cstring("\t.type\t");
                be_gas_emit_entity(entity);
                be_emit_cstring(", ");
@@ -884,7 +884,7 @@ static void emit_string_cst(const ir_entity *ent)
                        if (isprint(c))
                                be_emit_char(c);
                        else
-                               be_emit_irprintf("\\%o", c);
+                               be_emit_irprintf("\\%03o", c);
                        break;
                }
        }
@@ -929,7 +929,7 @@ static size_t emit_string_initializer(const ir_initializer_t *initializer)
                        if (isprint(c))
                                be_emit_char(c);
                        else
-                               be_emit_irprintf("\\%o", c);
+                               be_emit_irprintf("\\%03o", c);
                        break;
                }
        }
@@ -1406,7 +1406,6 @@ static void emit_common(const ir_entity *entity)
                be_emit_write_line();
                return;
        case OBJECT_FILE_FORMAT_ELF:
-       case OBJECT_FILE_FORMAT_ELF_SPARC:
                be_emit_cstring("\t.comm ");
                be_gas_emit_entity(entity);
                be_emit_irprintf(",%u,%u\n", size, alignment);
@@ -1439,7 +1438,6 @@ static void emit_local_common(const ir_entity *entity)
                be_emit_write_line();
                return;
        case OBJECT_FILE_FORMAT_ELF:
-       case OBJECT_FILE_FORMAT_ELF_SPARC:
                be_emit_cstring("\t.local ");
                be_gas_emit_entity(entity);
                be_emit_cstring("\n");
@@ -1659,3 +1657,65 @@ void be_gas_emit_decls(const be_main_env_t *main_env)
                be_emit_write_line();
        }
 }
+
+void emit_jump_table(const ir_node *node, long default_pn, ir_entity *entity,
+                     get_cfop_target_func get_cfop_target)
+{
+       long             switch_max    = LONG_MIN;
+       ir_node         *default_block = NULL;
+       unsigned long    length;
+       const ir_edge_t *edge;
+       unsigned         i;
+       ir_node        **table;
+
+       /* go over all proj's and collect them */
+       foreach_out_edge(node, edge) {
+               ir_node *proj = get_edge_src_irn(edge);
+               long     pn   = get_Proj_proj(proj);
+
+               /* check for default proj */
+               if (pn == default_pn) {
+                       assert(default_block == NULL); /* more than 1 default_pn? */
+                       default_block = get_cfop_target(proj);
+               } else {
+                       switch_max = pn > switch_max ? pn : switch_max;
+               }
+       }
+       assert(switch_max > LONG_MIN);
+
+       length = (unsigned long) switch_max + 1;
+       /* the 16000 isn't a real limit of the architecture. But should protect us
+        * from seamingly endless compiler runs */
+       if (length > 16000) {
+               /* switch lowerer should have broken this monster to pieces... */
+               panic("too large switch encountered");
+       }
+
+       table = XMALLOCNZ(ir_node*, length);
+       foreach_out_edge(node, edge) {
+               ir_node *proj = get_edge_src_irn(edge);
+               long     pn   = get_Proj_proj(proj);
+               if (pn == default_pn)
+                       continue;
+
+               table[pn] = get_cfop_target(proj);
+       }
+
+       /* emit table */
+       be_gas_emit_switch_section(GAS_SECTION_RODATA);
+       be_emit_cstring("\t.align 4\n");
+       be_gas_emit_entity(entity);
+       be_emit_cstring(":\n");
+       for (i = 0; i < length; ++i) {
+               ir_node *block = table[i];
+               if (block == NULL)
+                       block = default_block;
+               be_emit_cstring("\t.long ");
+               be_gas_emit_block_name(block);
+               be_emit_char('\n');
+               be_emit_write_line();
+       }
+       be_gas_emit_switch_section(GAS_SECTION_TEXT);
+
+       xfree(table);
+}