backend_marked was a buggy/wrong concept, removed it
[libfirm] / ir / be / begnuas.c
index 22822e8..f9a3bb0 100644 (file)
@@ -37,7 +37,6 @@
 #include "tv.h"
 #include "irnode.h"
 #include "irprog.h"
-#include "pdeq.h"
 #include "entity_t.h"
 #include "error.h"
 
@@ -46,7 +45,9 @@
 #include "be_dbgout.h"
 
 /** by default, we generate assembler code for the Linux gas */
-be_gas_flavour_t be_gas_flavour = GAS_FLAVOUR_ELF;
+object_file_format_t  be_gas_object_file_format = OBJECT_FILE_FORMAT_ELF;
+bool                  be_gas_emit_types         = true;
+char                  be_gas_elf_type_char      = '@';
 
 static be_gas_section_t current_section = (be_gas_section_t) -1;
 
@@ -58,9 +59,10 @@ static be_gas_section_t current_section = (be_gas_section_t) -1;
  *
  * @return  the pseudo-instruction
  */
-static const char *get_section_name(be_gas_section_t section) {
-       static const char *text[GAS_FLAVOUR_LAST+1][GAS_SECTION_LAST+1] = {
-               { /* GAS_FLAVOUR_ELF */
+static const char *get_section_name(be_gas_section_t section)
+{
+       static const char *text[OBJECT_FILE_FORMAT_LAST+1][GAS_SECTION_LAST+1] = {
+               { /* OBJECT_FILE_FORMAT_ELF */
                        ".section\t.text",
                        ".section\t.data",
                        ".section\t.rodata",
@@ -72,7 +74,7 @@ static const char *get_section_name(be_gas_section_t section) {
                        NULL,
                        NULL
                },
-               { /* GAS_FLAVOUR_MINGW */
+               { /* OBJECT_FILE_FORMAT_COFF */
                        ".section\t.text",
                        ".section\t.data",
                        ".section .rdata,\"dr\"",
@@ -84,38 +86,28 @@ static const char *get_section_name(be_gas_section_t section) {
                        NULL,
                        NULL
                },
-               { /* GAS_FLAVOUR_YASM */
-                       ".section\t.text",
-                       ".section\t.data",
-                       ".section\t.rodata",
-                       ".section\t.bss",
-                       ".section\t.tbss,\"awT\",@nobits",
-                       ".section\t.ctors,\"aw\",@progbits",
-                       ".section\t.dtors,\"aw\",@progbits",
-                       NULL,
-                       NULL,
-                       NULL
-               },
-               { /* GAS_FLAVOUR_MACH_O */
+               { /* OBJECT_FILE_FORMAT_MACH_O */
                        ".text",
                        ".data",
                        ".const",
                        ".data",
                        NULL,             /* TLS is not supported on Mach-O */
                        ".mod_init_func",
-                       NULL,             /* TODO: how is this called? */
+                       NULL,             /* are there destructors on mach-o? */
                        ".cstring",
                        ".section\t__IMPORT,__jump_table,symbol_stubs,self_modifying_code+pure_instructions,5",
                        ".section\t__IMPORT,__pointers,non_lazy_symbol_pointers"
                }
        };
 
-       assert((int) be_gas_flavour >= 0 && be_gas_flavour <= GAS_FLAVOUR_LAST);
+       assert((int) be_gas_object_file_format >= 0
+                       && be_gas_object_file_format <= OBJECT_FILE_FORMAT_LAST);
        assert((int) section >= 0 && section <= GAS_SECTION_LAST);
-       return text[be_gas_flavour][section];
+       return text[be_gas_object_file_format][section];
 }
 
-void be_gas_emit_switch_section(be_gas_section_t section) {
+void be_gas_emit_switch_section(be_gas_section_t section)
+{
        if (current_section == section)
                return;
 
@@ -126,58 +118,76 @@ void be_gas_emit_switch_section(be_gas_section_t section) {
        current_section = section;
 }
 
-void be_gas_emit_function_prolog(ir_entity *entity, unsigned alignment)
+static void emit_entity_visibility(const ir_entity *entity)
+{
+       ir_linkage linkage = get_entity_linkage(entity);
+
+       if (! (linkage & IR_LINKAGE_LOCAL)) {
+               be_emit_cstring(".globl ");
+               be_emit_ident(get_entity_ld_ident(entity));
+               be_emit_char('\n');
+               be_emit_write_line();
+       }
+       if (linkage & IR_LINKAGE_WEAK) {
+               if (! (linkage & IR_LINKAGE_MERGE)) {
+                       panic("Weak symbols only supported in combination with IR_LINKAGE_MERGE on this architecture");
+               }
+               be_emit_cstring(".weak ");
+               be_emit_ident(get_entity_ld_ident(entity));
+               be_emit_char('\n');
+               be_emit_write_line();
+       }
+}
+
+void be_gas_emit_function_prolog(ir_entity *entity, unsigned po2alignment)
 {
        const char *name = get_entity_ld_name(entity);
-       const char *fill_byte = "";
-       unsigned maximum_skip;
 
        be_gas_emit_switch_section(GAS_SECTION_TEXT);
 
-       /* write the begin line (used by scripts processing the assembler... */
+       /* write the begin line (makes the life easier for scripts parsing the
+        * assembler) */
        be_emit_write_line();
        be_emit_cstring("# -- Begin  ");
        be_emit_string(name);
        be_emit_char('\n');
        be_emit_write_line();
 
-       /* gcc fills space between function with 0x90, no idea if this is needed */
-       if (be_gas_flavour == GAS_FLAVOUR_MACH_O) {
-               fill_byte = "0x90";
-       }
-
-       if (alignment > 0) {
-               maximum_skip = (1 << alignment) - 1;
+       if (po2alignment > 0) {
+               const char *fill_byte = "";
+               unsigned    maximum_skip = (1 << po2alignment) - 1;
+               /* gcc fills space between function with 0x90... */
+               if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
+                       fill_byte = "0x90";
+               }
                be_emit_cstring("\t.p2align ");
-               be_emit_irprintf("%u,%s,%u\n", alignment, fill_byte, maximum_skip);
-               be_emit_write_line();
-       }
-       if (get_entity_visibility(entity) == visibility_external_visible) {
-               be_emit_cstring(".globl ");
-               be_emit_string(name);
-               be_emit_char('\n');
+               be_emit_irprintf("%u,%s,%u\n", po2alignment, fill_byte, maximum_skip);
                be_emit_write_line();
        }
+       emit_entity_visibility(entity);
 
-       switch (be_gas_flavour) {
-       case GAS_FLAVOUR_ELF:
+       switch (be_gas_object_file_format) {
+       case OBJECT_FILE_FORMAT_ELF:
                be_emit_cstring("\t.type\t");
                be_emit_string(name);
-               be_emit_cstring(", @function\n");
+               be_emit_cstring(", ");
+               be_emit_char(be_gas_elf_type_char);
+               be_emit_cstring("function\n");
                be_emit_write_line();
                break;
-       case GAS_FLAVOUR_MINGW:
+       case OBJECT_FILE_FORMAT_COFF:
                be_emit_cstring("\t.def\t");
                be_emit_string(name);
-               if (get_entity_visibility(entity) == visibility_external_visible) {
-                       be_emit_cstring(";\t.scl\t2;\t.type\t32;\t.endef\n");
+               be_emit_cstring(";");
+               if (get_entity_linkage(entity) & IR_LINKAGE_LOCAL) {
+                       be_emit_cstring("\t.scl\t3;");
                } else {
-                       be_emit_cstring(";\t.scl\t3;\t.type\t32;\t.endef\n");
+                       be_emit_cstring("\t.scl\t2;");
                }
+               be_emit_cstring("\t.type\t32;\t.endef\n");
                be_emit_write_line();
                break;
-       case GAS_FLAVOUR_MACH_O:
-       case GAS_FLAVOUR_YASM:
+       case OBJECT_FILE_FORMAT_MACH_O:
                break;
        }
        be_emit_string(name);
@@ -189,7 +199,7 @@ void be_gas_emit_function_epilog(ir_entity *entity)
 {
        const char *name = get_entity_ld_name(entity);
 
-       if (be_gas_flavour == GAS_FLAVOUR_ELF) {
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_ELF) {
                be_emit_cstring("\t.size\t");
                be_emit_string(name);
                be_emit_cstring(", .-");
@@ -212,7 +222,7 @@ void be_gas_emit_function_epilog(ir_entity *entity)
  */
 typedef struct _be_gas_decl_env {
        be_gas_section_t     section;
-       waitq               *worklist;           /**< A worklist we use to place not yet handled entities on. */
+       const be_main_env_t *main_env;
 } be_gas_decl_env_t;
 
 /************************************************************************/
@@ -282,14 +292,16 @@ static void dump_arith_tarval(tarval *tv, int bytes)
 /**
  * Return the label prefix for labeled blocks.
  */
-const char *be_gas_block_label_prefix(void) {
+const char *be_gas_block_label_prefix(void)
+{
        return ".LG";
 }
 
 /**
  * Return the label prefix for labeled instructions.
  */
-const char *be_gas_insn_label_prefix(void) {
+const char *be_gas_insn_label_prefix(void)
+{
        return ".LE";
 }
 
@@ -392,10 +404,6 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 
                case symconst_addr_ent:
                        ent = get_SymConst_entity(init);
-                       if (!is_entity_backend_marked(ent)) {
-                               waitq_put(env->worklist, ent);
-                               set_entity_backend_marked(ent, 1);
-                       }
                        be_gas_emit_entity(ent);
                        break;
 
@@ -449,6 +457,10 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
                do_dump_atomic_init(env, get_Mul_right(init));
                return;
 
+       case iro_Unknown:
+               be_emit_cstring("0");
+               return;
+
        default:
                panic("dump_atomic_init(): unsupported IR-node %+F", init);
        }
@@ -466,7 +478,7 @@ static void dump_size_type(size_t size) {
                break;
 
        case 2:
-               be_emit_cstring("\t.word\t");
+               be_emit_cstring("\t.short\t");
                break;
 
        case 4:
@@ -557,12 +569,11 @@ static int initializer_is_string_const(const ir_initializer_t *initializer)
  * @param ent The entity
  * @return 1 if it is a string constant, 0 otherwise
  */
-static int ent_is_string_const(ir_entity *ent)
+static int ent_is_string_const(const ir_entity *ent)
 {
        ir_type *type, *element_type;
        ir_mode *mode;
        int i, c, n;
-       int found_printable = 0;
 
        type = get_entity_type(ent);
 
@@ -582,10 +593,10 @@ static int ent_is_string_const(ir_entity *ent)
        if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
                return 0;
 
-       if (ent->has_initializer) {
-               /* TODO */
-               return 0;
-       } else {
+       if (ent->initializer != NULL) {
+               return initializer_is_string_const(ent->initializer);
+       } else if (entity_has_compound_ent_values(ent)) {
+               int found_printable = 0;
                /* if it contains only printable chars and a 0 at the end */
                n = get_compound_ent_n_values(ent);
                for (i = 0; i < n; ++i) {
@@ -603,10 +614,10 @@ static int ent_is_string_const(ir_entity *ent)
                        if (i == n - 1 && c != '\0')
                                return 0;
                }
+               return found_printable;
        }
 
-       /* then we can emit it as a string constant */
-       return found_printable;
+       return 0;
 }
 
 /**
@@ -615,7 +626,7 @@ static int ent_is_string_const(ir_entity *ent)
  *
  * @param ent  The entity to dump.
  */
-static void dump_string_cst(ir_entity *ent)
+static void dump_string_cst(const ir_entity *ent)
 {
        int      i, len;
        int      output_len;
@@ -625,7 +636,7 @@ static void dump_string_cst(ir_entity *ent)
 
        len        = get_compound_ent_n_values(ent);
        output_len = len;
-       if (be_gas_flavour == GAS_FLAVOUR_MACH_O) {
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
                be_emit_cstring("\t.ascii \"");
        } else {
                be_emit_cstring("\t.string \"");
@@ -670,7 +681,7 @@ static void dump_string_initializer(const ir_initializer_t *initializer)
        size_t i, len;
 
        len = initializer->compound.n_initializers;
-       if (be_gas_flavour == GAS_FLAVOUR_MACH_O) {
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
                be_emit_cstring("\t.ascii \"");
        } else {
                be_emit_cstring("\t.string \"");
@@ -728,14 +739,13 @@ static size_t get_initializer_size(const ir_initializer_t *initializer,
                                    ir_type *type)
 {
        switch (get_initializer_kind(initializer)) {
-       case IR_INITIALIZER_TARVAL: {
+       case IR_INITIALIZER_TARVAL:
                assert(get_tarval_mode(get_initializer_tarval_value(initializer)) == get_type_mode(type));
                return get_type_size_bytes(type);
-       }
        case IR_INITIALIZER_CONST:
        case IR_INITIALIZER_NULL:
                return get_type_size_bytes(type);
-       case IR_INITIALIZER_COMPOUND: {
+       case IR_INITIALIZER_COMPOUND:
                if (!is_type_variable_size(type)) {
                        return get_type_size_bytes(type);
                } else {
@@ -760,7 +770,6 @@ static size_t get_initializer_size(const ir_initializer_t *initializer,
                        return initializer_size;
                }
        }
-       }
 
        panic("found invalid initializer");
 }
@@ -915,9 +924,9 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
        panic("invalid ir_initializer kind found");
 }
 
-static void dump_initializer(be_gas_decl_env_t *env, ir_entity *entity)
+static void dump_initializer(be_gas_decl_env_t *env, const ir_entity *entity)
 {
-       const ir_initializer_t *initializer = entity->attr.initializer;
+       const ir_initializer_t *initializer = entity->initializer;
        ir_type                *type;
        normal_or_bitfield     *vals;
        size_t                  size;
@@ -990,17 +999,15 @@ static void dump_initializer(be_gas_decl_env_t *env, ir_entity *entity)
        xfree(vals);
 }
 
-/**
- * Dump an initializer for a compound entity.
- */
-static void dump_compound_init(be_gas_decl_env_t *env, ir_entity *ent)
+static void dump_compound_graph_init(be_gas_decl_env_t *env,
+                                     const ir_entity *ent)
 {
        normal_or_bitfield *vals;
        int i, j, n;
        unsigned k, last_ofs;
 
-       if (ent->has_initializer) {
-               dump_initializer(env, ent);
+       if (ent_is_string_const(ent)) {
+               dump_string_cst(ent);
                return;
        }
 
@@ -1039,12 +1046,12 @@ static void dump_compound_init(be_gas_decl_env_t *env, ir_entity *ent)
                assert(offset_bits >= 0);
 
                if (offset_bits != 0 ||
-                       (value_len != 8 && value_len != 16 && value_len != 32 && value_len != 64)) {
+                               (value_len != 8 && value_len != 16 && value_len != 32 && value_len != 64)) {
                        tarval *tv = get_atomic_init_tv(value);
                        unsigned char curr_bits, last_bits = 0;
                        if (tv == NULL) {
                                panic("Couldn't get numeric value for bitfield initializer '%s'",
-                                     get_entity_ld_name(ent));
+                                               get_entity_ld_name(ent));
                        }
                        /* normalize offset */
                        offset += offset_bits >> 3;
@@ -1078,9 +1085,9 @@ static void dump_compound_init(be_gas_decl_env_t *env, ir_entity *ent)
                        if (vals[k].v.value != NULL) {
                                dump_atomic_init(env, vals[k].v.value);
                                skip = get_mode_size_bytes(get_irn_mode(vals[k].v.value)) - 1;
-                       } else {
-                               space = 1;
-                       }
+                       } else {
+                               space = 1;
+                       }
                } else {
                        assert(vals[k].kind == BITFIELD);
                        be_emit_irprintf("\t.byte\t%d\n", vals[k].v.bf_val);
@@ -1109,7 +1116,7 @@ static void emit_align(unsigned p2alignment)
        be_emit_write_line();
 }
 
-static unsigned get_effective_entity_alignment(ir_entity *entity)
+static unsigned get_effective_entity_alignment(const ir_entity *entity)
 {
        unsigned alignment = get_entity_alignment(entity);
        if (alignment == 0) {
@@ -1119,155 +1126,132 @@ static unsigned get_effective_entity_alignment(ir_entity *entity)
        return alignment;
 }
 
+static be_gas_section_t determine_section(be_gas_decl_env_t *env,
+                                          const ir_entity *entity)
+{
+       ir_type *owner = get_entity_owner(entity);
+
+       if (owner == get_segment_type(IR_SEGMENT_GLOBAL)) {
+               ir_linkage linkage = get_entity_linkage(entity);
+               if (linkage & IR_LINKAGE_CONSTANT) {
+                       /* mach-o is the only one with a cstring section */
+                       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O
+                                       && ent_is_string_const(entity))
+                               return GAS_SECTION_CSTRING;
+
+                       return GAS_SECTION_RODATA;
+               }
+               if (!entity_has_definition(entity))
+                       return GAS_SECTION_BSS;
+
+               return GAS_SECTION_DATA;
+
+       } else if (owner == env->main_env->pic_symbols_type) {
+               return GAS_SECTION_PIC_SYMBOLS;
+       } else if (owner == env->main_env->pic_trampolines_type) {
+               return GAS_SECTION_PIC_TRAMPOLINES;
+       } else if (owner == get_segment_type(IR_SEGMENT_CONSTRUCTORS)) {
+               return GAS_SECTION_CONSTRUCTORS;
+       } else if (owner == get_segment_type(IR_SEGMENT_DESTRUCTORS)) {
+               return GAS_SECTION_DESTRUCTORS;
+       } else if (owner == get_segment_type(IR_SEGMENT_THREAD_LOCAL)) {
+               return GAS_SECTION_TLS;
+       }
+
+       panic("Couldn't determine section for %+F?!?", entity);
+}
+
+static void emit_common(const ir_entity *ent)
+{
+       const char *name      = get_entity_ld_name(ent);
+       unsigned    size      = get_type_size_bytes(get_entity_type(ent));
+       unsigned    alignment = get_effective_entity_alignment(ent);
+
+       switch (be_gas_object_file_format) {
+       case OBJECT_FILE_FORMAT_MACH_O:
+               be_emit_irprintf("\t.comm %s,%u,%u\n", name, size,
+                                log2_floor(alignment));
+               be_emit_write_line();
+               return;
+       case OBJECT_FILE_FORMAT_ELF:
+               be_emit_irprintf("\t.comm %s,%u,%u\n", name, size, alignment);
+               be_emit_write_line();
+               return;
+       case OBJECT_FILE_FORMAT_COFF:
+               be_emit_irprintf("\t.comm %s,%u # %u\n", name, size, alignment);
+               be_emit_write_line();
+               return;
+       }
+       panic("invalid object file format");
+}
 
 /**
  * Dump a global entity.
  *
- * @param env           the gas output environment
- * @param ent           the entity to be dumped
+ * @param env  the gas output environment
+ * @param ent  the entity to be dumped
  */
-static void dump_global(be_gas_decl_env_t *env, ir_entity *ent)
+static void dump_global(be_gas_decl_env_t *env, const ir_entity *ent)
 {
        ir_type          *type           = get_entity_type(ent);
        ident            *ld_ident       = get_entity_ld_ident(ent);
        unsigned          alignment      = get_effective_entity_alignment(ent);
-       int               emit_as_common = 0;
-       be_gas_section_t  section        = env->section;
-       ir_variability    variability    = get_entity_variability(ent);
-       ir_visibility     visibility     = get_entity_visibility(ent);
+       be_gas_section_t  section        = determine_section(env, ent);
+       ir_linkage        linkage        = get_entity_linkage(ent);
 
+       /* we already emitted all methods. Except for the trampolines which
+        * the assembler/linker generates */
        if (is_Method_type(type) && section != GAS_SECTION_PIC_TRAMPOLINES) {
                return;
        }
-       if (type == firm_code_type) {
+       /* block labels are already emittet in the code */
+       if (type == firm_code_type)
                return;
-       }
-
-       if (section != (be_gas_section_t) -1) {
-               emit_as_common = 0;
-       } else if (variability == variability_constant) {
-               /* a constant entity, put it on the rdata */
-               section = GAS_SECTION_RODATA;
-               if (be_gas_flavour == GAS_FLAVOUR_MACH_O
-                               && ent_is_string_const(ent)) {
-                       section = GAS_SECTION_CSTRING;
-               }
-       } else if (variability == variability_uninitialized) {
-               /* uninitialized entity put it in bss segment */
-               section = GAS_SECTION_COMMON;
-               if (visibility != visibility_local)
-                       emit_as_common = 1;
-       } else {
-               section = GAS_SECTION_DATA;
-       }
-
-       if (!emit_as_common) {
-               be_gas_emit_switch_section(section);
-       }
 
        be_dbg_variable(ent);
 
-       /* global or not global */
-       if (visibility == visibility_external_visible && !emit_as_common) {
-               be_emit_cstring(".globl\t");
-               be_emit_ident(ld_ident);
-               be_emit_char('\n');
-               be_emit_write_line();
-       } else if (visibility == visibility_external_allocated) {
-               be_emit_cstring(".globl\t");
-               be_emit_ident(ld_ident);
-               be_emit_char('\n');
-               be_emit_write_line();
-               /* we can return now... */
+       /* nothing to do for externally defined values */
+       if (linkage & IR_LINKAGE_EXTERN)
                return;
-       }
+
        if (!is_po2(alignment))
                panic("alignment not a power of 2");
+
+       if (section == GAS_SECTION_BSS &&
+                       (get_entity_linkage(ent) & IR_LINKAGE_MERGE)) {
+               emit_common(ent);
+               return;
+       }
+
+       be_gas_emit_switch_section(section);
+
        /* alignment */
-       if (alignment > 1 && !emit_as_common && section != GAS_SECTION_PIC_TRAMPOLINES
-                       && section != GAS_SECTION_PIC_SYMBOLS) {
+       if (alignment > 1) {
                emit_align(alignment);
        }
-
-       if (visibility != visibility_external_allocated && !emit_as_common
-                       && be_gas_flavour == GAS_FLAVOUR_ELF) {
+       emit_entity_visibility(ent);
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_ELF
+                       && be_gas_emit_types) {
                be_emit_cstring("\t.type\t");
                be_emit_ident(ld_ident);
-               be_emit_cstring(", @object\n\t.size\t");
+               be_emit_cstring(", ");
+               be_emit_char(be_gas_elf_type_char);
+               be_emit_cstring("object\n\t.size\t");
                be_emit_ident(ld_ident);
                be_emit_irprintf(", %u\n", get_type_size_bytes(type));
        }
+       be_emit_ident(ld_ident);
+       be_emit_cstring(":\n");
+       be_emit_write_line();
 
-       if (!emit_as_common) {
-               be_emit_ident(ld_ident);
-               be_emit_cstring(":\n");
-               be_emit_write_line();
-       }
-
-       if (variability == variability_uninitialized) {
-               if (emit_as_common) {
-                       switch (be_gas_flavour) {
-                       case GAS_FLAVOUR_MACH_O:
-                               be_emit_irprintf("\t.comm %s,%u,%u\n",
-                                       get_id_str(ld_ident), get_type_size_bytes(type),
-                                       log2_floor(alignment));
-                               break;
-                       case GAS_FLAVOUR_ELF:
-                       case GAS_FLAVOUR_YASM:
-                               be_emit_irprintf("\t.comm %s,%u,%u\n",
-                                       get_id_str(ld_ident), get_type_size_bytes(type), alignment);
-                               be_emit_write_line();
-                               break;
-                       case GAS_FLAVOUR_MINGW:
-                               be_emit_irprintf("\t.comm %s,%u # %u\n",
-                                       get_id_str(ld_ident), get_type_size_bytes(type), alignment);
-                               be_emit_write_line();
-                               break;
-                       }
-               } else if (section == GAS_SECTION_PIC_TRAMPOLINES
-                               || section == GAS_SECTION_PIC_SYMBOLS) {
-                       if (be_gas_flavour == GAS_FLAVOUR_MACH_O) {
-                               be_emit_cstring("\t.indirect_symbol ");
-                               be_emit_ident(get_entity_ident(ent));
-                               be_emit_char('\n');
-                               be_emit_write_line();
-                               if (section == GAS_SECTION_PIC_TRAMPOLINES) {
-                                       be_emit_cstring("\thlt ; hlt ; hlt ; hlt ; hlt\n");
-                                       be_emit_write_line();
-                               } else {
-                                       assert(section == GAS_SECTION_PIC_SYMBOLS);
-                                       be_emit_cstring("\t.long 0\n");
-                                       be_emit_write_line();
-                               }
-                       } else {
-                               panic("PIC trampolines not yet supported in this gas mode");
-                       }
-               } else {
-                       be_emit_irprintf("\t.space %u\n", get_type_size_bytes(type));
-                       be_emit_write_line();
-               }
+       if (ent->initializer != NULL) {
+               dump_initializer(env, ent);
+       } else if(entity_has_compound_ent_values(ent)) {
+               dump_compound_graph_init(env, ent);
        } else {
-               if (is_atomic_entity(ent)) {
-                       dump_atomic_init(env, get_atomic_ent_value(ent));
-               } else {
-                       /* sort_compound_ent_values(ent); */
-
-                       switch (get_type_tpop_code(get_entity_type(ent))) {
-                       case tpo_array:
-                               if (ent_is_string_const(ent))
-                                       dump_string_cst(ent);
-                               else
-                                       dump_compound_init(env, ent);
-                               break;
-                       case tpo_struct:
-                       case tpo_class:
-                       case tpo_union:
-                               dump_compound_init(env, ent);
-                               break;
-                       default:
-                               panic("Unimplemented type kind in dump_global()");
-                       }
-               }
+               /* uninitialized */
+               be_emit_irprintf("\t.space %u\n", get_type_size_bytes(type));
+               be_emit_write_line();
        }
 }
 
@@ -1276,76 +1260,45 @@ static void dump_global(be_gas_decl_env_t *env, ir_entity *ent)
  *
  * @param gt                a global like type, either the global or the TLS one
  * @param env               an environment
- * @param only_emit_marked  if non-zero, external allocated entities that do not have
- *                          its visited flag set are ignored
  */
-static void be_gas_dump_globals(ir_type *gt, be_gas_decl_env_t *env,
-                                int only_emit_marked)
+static void be_gas_dump_globals(ir_type *gt, be_gas_decl_env_t *env)
 {
        int i, n = get_compound_n_members(gt);
-       waitq *worklist = new_waitq();
-
-       if (only_emit_marked) {
-               for (i = 0; i < n; i++) {
-                       ir_entity *ent = get_compound_member(gt, i);
-                       if (is_entity_backend_marked(ent) ||
-                           get_entity_visibility(ent) != visibility_external_allocated) {
-                               waitq_put(worklist, ent);
-                               set_entity_backend_marked(ent, 1);
-                       }
-               }
-       } else {
-               for (i = 0; i < n; i++) {
-                       ir_entity *ent = get_compound_member(gt, i);
-                       set_entity_backend_marked(ent, 1);
-                       waitq_put(worklist, ent);
-               }
-       }
-
-       env->worklist = worklist;
-
-       while (!waitq_empty(worklist)) {
-               ir_entity *ent = waitq_get(worklist);
 
+       for (i = 0; i < n; i++) {
+               ir_entity *ent = get_compound_member(gt, i);
                dump_global(env, ent);
        }
-
-       del_waitq(worklist);
-       env->worklist = NULL;
 }
 
 /************************************************************************/
 
 /* Generate all entities. */
-void be_gas_emit_decls(const be_main_env_t *main_env,
-                       int only_emit_marked_entities)
+void be_gas_emit_decls(const be_main_env_t *main_env)
 {
        be_gas_decl_env_t env;
        memset(&env, 0, sizeof(env));
 
        /* dump global type */
-       env.section = (be_gas_section_t) -1;
-       be_gas_dump_globals(get_glob_type(), &env, only_emit_marked_entities);
-       env.section = GAS_SECTION_TLS;
-       be_gas_dump_globals(get_tls_type(), &env, only_emit_marked_entities);
-       env.section = GAS_SECTION_CONSTRUCTORS;
-       be_gas_dump_globals(get_segment_type(IR_SEGMENT_CONSTRUCTORS), &env,
-                           only_emit_marked_entities);
-       env.section = GAS_SECTION_DESTRUCTORS;
-       be_gas_dump_globals(get_segment_type(IR_SEGMENT_DESTRUCTORS), &env,
-                           only_emit_marked_entities);
-
-       env.section = GAS_SECTION_PIC_SYMBOLS;
-       be_gas_dump_globals(main_env->pic_symbols_type, &env,
-                           only_emit_marked_entities);
-
-       if (get_compound_n_members(main_env->pic_trampolines_type) > 0) {
-               env.section = GAS_SECTION_PIC_TRAMPOLINES;
-               be_gas_dump_globals(main_env->pic_trampolines_type, &env,
-                                   only_emit_marked_entities);
-               if (be_gas_flavour == GAS_FLAVOUR_MACH_O) {
-                       be_emit_cstring("\t.subsections_via_symbols\n");
-                       be_emit_write_line();
-               }
+       env.main_env = main_env;
+       env.section  = (be_gas_section_t) -1;
+
+       be_gas_dump_globals(get_glob_type(), &env);
+       be_gas_dump_globals(get_tls_type(), &env);
+       be_gas_dump_globals(get_segment_type(IR_SEGMENT_CONSTRUCTORS), &env);
+       be_gas_dump_globals(get_segment_type(IR_SEGMENT_DESTRUCTORS), &env);
+       be_gas_dump_globals(main_env->pic_symbols_type, &env);
+       be_gas_dump_globals(main_env->pic_trampolines_type, &env);
+
+       /**
+        * ".subsections_via_symbols marks object files which are OK to divide
+        * their section contents into individual blocks".
+        * From my understanding this means no label points in the middle of an
+        * object which we want to address as a whole. Firm code should be fine
+        * with this.
+        */
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
+               be_emit_cstring("\t.subsections_via_symbols\n");
+               be_emit_write_line();
        }
 }