Output proper local lables (starting with .L/L) for the PIC base, switch tables and...
[libfirm] / ir / be / begnuas.c
index 65a5456..6d4d337 100644 (file)
@@ -52,105 +52,395 @@ char                  be_gas_elf_type_char      = '@';
 static be_gas_section_t current_section = (be_gas_section_t) -1;
 
 /**
- * Return the pseudo-instruction to be issued for a section switch
- * depending on the current flavour.
- *
- * @param section  the section to switch to
- *
- * @return  the pseudo-instruction
+ * An environment containing all needed dumper data.
+ * Currently we create the file completely in memory first, then
+ * write it to the disk. This is an artifact from the old C-generating backend
+ * and even there NOT needed. So we might change it in the future.
  */
-static const char *get_section_name(be_gas_section_t section)
+typedef struct _be_gas_decl_env {
+       be_gas_section_t     section;
+       const be_main_env_t *main_env;
+} be_gas_decl_env_t;
+
+static void emit_section_macho(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",
-                       ".section\t.bss",
-                       ".section\t.tbss,\"awT\",@nobits",
-                       ".section\t.ctors,\"aw\",@progbits",
-                       ".section\t.dtors,\"aw\",@progbits",
-                       NULL, /* no cstring section */
-                       NULL,
-                       NULL
-               },
-               { /* OBJECT_FILE_FORMAT_COFF */
-                       ".section\t.text",
-                       ".section\t.data",
-                       ".section .rdata,\"dr\"",
-                       ".section\t.bss",
-                       ".section\t.tbss,\"awT\",@nobits",
-                       ".section\t.ctors,\"w\"",
-                       ".section\t.dtors,\"w\"",
-                       NULL,
-                       NULL,
-                       NULL
-               },
-               { /* OBJECT_FILE_FORMAT_MACH_O */
-                       ".text",
-                       ".data",
-                       ".const",
-                       ".data",
-                       NULL,             /* TLS is not supported on Mach-O */
-                       ".mod_init_func",
-                       ".mod_term_func",
-                       ".cstring",
-                       ".section\t__IMPORT,__jump_table,symbol_stubs,self_modifying_code+pure_instructions,5",
-                       ".section\t__IMPORT,__pointers,non_lazy_symbol_pointers"
+       be_gas_section_t  base  = section & GAS_SECTION_TYPE_MASK;
+       be_gas_section_t  flags = section & ~GAS_SECTION_TYPE_MASK;
+       const char       *name;
+
+       if (current_section == section)
+               return;
+       current_section = section;
+
+       /* shortforms */
+       if (flags == 0) {
+               switch (base) {
+               case GAS_SECTION_TEXT:            name = "text";          break;
+               case GAS_SECTION_DATA:            name = "data";          break;
+               case GAS_SECTION_RODATA:          name = "const";         break;
+               case GAS_SECTION_BSS:             name = "data";          break;
+               case GAS_SECTION_CONSTRUCTORS:    name = "mod_init_func"; break;
+               case GAS_SECTION_DESTRUCTORS:     name = "mod_term_func"; break;
+               case GAS_SECTION_PIC_TRAMPOLINES: name = "section\t__IMPORT,__jump_table,symbol_stubs,self_modifying_code+pure_instructions,5"; break;
+               case GAS_SECTION_PIC_SYMBOLS:     name = "section\t__IMPORT,__pointers,non_lazy_symbol_pointers"; break;
+               case GAS_SECTION_CSTRING:         name = "cstring";       break;
+               default: panic("unsupported scetion type 0x%X", section);
                }
+               be_emit_irprintf("\t.%s\n", name);
+               be_emit_write_line();
+       } else if (flags & GAS_SECTION_FLAG_COMDAT) {
+               switch (base) {
+               case GAS_SECTION_TEXT:            name = "section __TEXT,__textcoal_nt,coalesced,pure_instructions"; break;
+               case GAS_SECTION_BSS:
+               case GAS_SECTION_DATA:            name = "section __DATA,__datacoal_nt,coalesced"; break;
+               case GAS_SECTION_RODATA:          name = "section __TEXT,__const_coal,coalesced"; break;
+               case GAS_SECTION_CSTRING:         name = "section __TEXT,__const_coal,coalesced"; break;
+               default: panic("unsupported scetion type 0x%X", section);
+               }
+       } else {
+               panic("unsupported section type 0x%X\n", section);
+       }
+}
+
+static void emit_section(be_gas_section_t section, const ir_entity *entity)
+{
+       be_gas_section_t base = section & GAS_SECTION_TYPE_MASK;
+       be_gas_section_t flags = section & ~GAS_SECTION_TYPE_MASK;
+       static const char *const basename[] = {
+               "text", "data", "rodata", "bss", "ctors", "dtors"
+       };
+       static const char *const type[] = {
+               "progbits", "progbits", "progbits", "nobits", "init_array", "fini_array"
        };
 
-       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_object_file_format][section];
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
+               emit_section_macho(section);
+               return;
+       }
+
+       if (current_section == section && !(section & GAS_SECTION_FLAG_COMDAT))
+               return;
+       current_section = section;
+
+       /* shortforms */
+       if (flags == 0) {
+               switch (base) {
+               case GAS_SECTION_TEXT:
+                       be_emit_cstring("\t.text\n");
+                       be_emit_write_line();
+                       return;
+               case GAS_SECTION_DATA:
+                       be_emit_cstring("\t.data\n");
+                       be_emit_write_line();
+                       return;
+               case GAS_SECTION_RODATA:
+                       be_emit_cstring("\t.section\t.rodata\n");
+                       be_emit_write_line();
+                       return;
+               case GAS_SECTION_BSS:
+                       be_emit_cstring("\t.bss\n");
+                       be_emit_write_line();
+                       return;
+               default:
+                       break;
+               }
+       }
+
+       assert(base < sizeof(basename)/sizeof(basename[0]));
+       be_emit_cstring("\t.section\t.");
+       /* section name */
+       if (flags & GAS_SECTION_FLAG_TLS)
+               be_emit_char('t');
+       be_emit_string(basename[base]);
+       if (flags & GAS_SECTION_FLAG_COMDAT) {
+               be_emit_char('.');
+               be_gas_emit_entity(entity);
+       }
+
+       /* section flags */
+       be_emit_cstring(",\"");
+       if (be_gas_object_file_format != OBJECT_FILE_FORMAT_COFF)
+               be_emit_char('a');
+       if (base != GAS_SECTION_RODATA)
+               be_emit_char('w');
+       if (flags & GAS_SECTION_FLAG_TLS)
+               be_emit_char('T');
+       if (flags & GAS_SECTION_FLAG_COMDAT)
+               be_emit_char('G');
+       be_emit_cstring("\",");
+       be_emit_char(be_gas_elf_type_char);
+       be_emit_string(type[base]);
+
+       if (flags & GAS_SECTION_FLAG_COMDAT) {
+               be_emit_char(',');
+               be_gas_emit_entity(entity);
+               be_emit_cstring(",comdat");
+       }
+       be_emit_char('\n');
+       be_emit_write_line();
 }
 
 void be_gas_emit_switch_section(be_gas_section_t section)
 {
-       if (current_section == section)
-               return;
+       /* you have to produce a switch_section call with entity manually
+        * for comdat sections */
+       assert( !(section & GAS_SECTION_FLAG_COMDAT));
+
+       emit_section(section, NULL);
+}
+
+static tarval *get_initializer_tarval(const ir_initializer_t *initializer)
+{
+       if (initializer->kind == IR_INITIALIZER_TARVAL)
+               return initializer->tarval.value;
+       if (initializer->kind == IR_INITIALIZER_CONST) {
+               ir_node *node = initializer->consti.value;
+               if (is_Const(node)) {
+                       return get_Const_tarval(node);
+               }
+       }
+       return get_tarval_undefined();
+}
+
+static int initializer_is_string_const(const ir_initializer_t *initializer)
+{
+       size_t i, len;
+       int found_printable = 0;
+
+       if (initializer->kind != IR_INITIALIZER_COMPOUND)
+               return 0;
+
+       len = initializer->compound.n_initializers;
+       if (len < 1)
+               return 0;
+       for (i = 0; i < len; ++i) {
+               int               c;
+               tarval           *tv;
+               ir_mode          *mode;
+               ir_initializer_t *sub_initializer
+                       = initializer->compound.initializers[i];
+
+               tv = get_initializer_tarval(sub_initializer);
+               if (!tarval_is_constant(tv))
+                       return 0;
+
+               mode = get_tarval_mode(tv);
+               if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
+                       return 0;
+
+               c = get_tarval_long(tv);
+               if (isgraph(c) || isspace(c))
+                       found_printable = 1;
+               else if (c != 0)
+                       return 0;
+
+               if (i == len - 1 && c != '\0')
+                       return 0;
+       }
+
+       return found_printable;
+}
+
+static bool initializer_is_null(const ir_initializer_t *initializer)
+{
+       switch (initializer->kind) {
+       case IR_INITIALIZER_NULL:
+               return true;
+       case IR_INITIALIZER_TARVAL: {
+               tarval *tv = initializer->tarval.value;
+               return tarval_is_null(tv);
+       }
+       case IR_INITIALIZER_CONST: {
+               ir_node *value = initializer->consti.value;
+               if (!is_Const(value))
+                       return false;
+               return is_Const_null(value);
+       }
+       case IR_INITIALIZER_COMPOUND: {
+               size_t i;
+               for (i = 0; i < initializer->compound.n_initializers; ++i) {
+                       ir_initializer_t *subinitializer
+                               = initializer->compound.initializers[i];
+                       if (!initializer_is_null(subinitializer))
+                               return false;
+               }
+               return true;
+       }
+       }
+       panic("invalid initializer in initializer_is_null");
+}
+
+/**
+ * Determine if an entity is a string constant
+ * @param ent The entity
+ * @return 1 if it is a string constant, 0 otherwise
+ */
+static int entity_is_string_const(const ir_entity *ent)
+{
+       ir_type *type, *element_type;
+       ir_mode *mode;
+       int i, c, n;
+
+       type = get_entity_type(ent);
+
+       /* if it's an array */
+       if (!is_Array_type(type))
+               return 0;
+
+       element_type = get_array_element_type(type);
+
+       /* and the array's element type is primitive */
+       if (!is_Primitive_type(element_type))
+               return 0;
 
-       be_emit_char('\t');
-       be_emit_string(get_section_name(section));
+       /* and the mode of the element type is an int of
+        * the same size as the byte mode */
+       mode = get_type_mode(element_type);
+       if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
+               return 0;
+
+       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) {
+                       ir_node *irn = get_compound_ent_value(ent, i);
+                       if (! is_Const(irn))
+                               return 0;
+
+                       c = (int) get_tarval_long(get_Const_tarval(irn));
+
+                       if (isgraph(c) || isspace(c))
+                               found_printable = 1;
+                       else if (c != 0)
+                               return 0;
+
+                       if (i == n - 1 && c != '\0')
+                               return 0;
+               }
+               return found_printable;
+       }
+
+       return 0;
+}
+
+static bool entity_is_null(const ir_entity *entity)
+{
+       if (entity->initializer != NULL) {
+               return initializer_is_null(entity->initializer);
+       } else if (entity_has_compound_ent_values(entity)) {
+               /* I'm too lazy to implement this case as compound graph paths will be
+                * remove anyway in the future */
+       }
+       /* uninitialized, NULL is fine */
+       return true;
+}
+
+static bool is_comdat(const ir_entity *entity)
+{
+       ir_linkage linkage = get_entity_linkage(entity);
+       return (linkage & IR_LINKAGE_MERGE)
+               && (linkage & IR_LINKAGE_GARBAGE_COLLECT);
+}
+
+static be_gas_section_t determine_basic_section(const ir_entity *entity)
+{
+       ir_linkage linkage;
+
+       if (is_method_entity(entity))
+               return GAS_SECTION_TEXT;
+
+       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
+                               && entity_is_string_const(entity))
+                       return GAS_SECTION_CSTRING;
+
+               return GAS_SECTION_RODATA;
+       }
+       if (entity_is_null(entity))
+               return GAS_SECTION_BSS;
+
+       return GAS_SECTION_DATA;
+}
+
+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)) {
+               be_gas_section_t section = determine_basic_section(entity);
+               if (is_comdat(entity))
+                       section |= GAS_SECTION_FLAG_COMDAT;
+               return section;
+       } else if (env != NULL && owner == env->main_env->pic_symbols_type) {
+               return GAS_SECTION_PIC_SYMBOLS;
+       } else if (env != NULL && 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)) {
+               be_gas_section_t section = determine_basic_section(entity);
+               if (is_comdat(entity))
+                       section |= GAS_SECTION_FLAG_COMDAT;
+
+               return section | GAS_SECTION_FLAG_TLS;
+       }
+
+       panic("Couldn't determine section for %+F?!?", entity);
+}
+
+static void emit_weak(const ir_entity *entity)
+{
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
+               be_emit_cstring("\t.weak_reference ");
+       } else {
+               be_emit_cstring("\t.weak ");
+       }
+       be_gas_emit_entity(entity);
        be_emit_char('\n');
        be_emit_write_line();
-       current_section = section;
 }
 
-static void emit_entity_visibility(const ir_entity *entity)
+static void emit_visibility(const ir_entity *entity)
 {
-       ir_visibility visibility = get_entity_visibility(entity);
-       ir_linkage    linkage    = get_entity_linkage(entity);
+       ir_linkage linkage = get_entity_linkage(entity);
 
-       if (visibility != ir_visibility_local) {
+       if (get_entity_linkage(entity) & IR_LINKAGE_WEAK) {
+               emit_weak(entity);
+               /* Note: .weak seems to imply .globl so no need to output .globl */
+       } else if (get_entity_visibility(entity) == ir_visibility_default) {
                be_emit_cstring(".globl ");
-               be_emit_ident(get_entity_ld_ident(entity));
+               be_gas_emit_entity(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));
+
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O
+                       && (linkage & IR_LINKAGE_HIDDEN_USER)) {
+               be_emit_cstring("\t.no_dead_strip ");
+               be_gas_emit_entity(entity);
                be_emit_char('\n');
                be_emit_write_line();
        }
 }
 
-void be_gas_emit_function_prolog(ir_entity *entity, unsigned po2alignment)
+void be_gas_emit_function_prolog(const ir_entity *entity, unsigned po2alignment)
 {
-       const char *name = get_entity_ld_name(entity);
-
-       be_gas_emit_switch_section(GAS_SECTION_TEXT);
+       be_gas_section_t section = determine_section(NULL, entity);
+       emit_section(section, entity);
 
        /* 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_gas_emit_entity(entity);
        be_emit_char('\n');
        be_emit_write_line();
 
@@ -165,12 +455,12 @@ void be_gas_emit_function_prolog(ir_entity *entity, unsigned po2alignment)
                be_emit_irprintf("%u,%s,%u\n", po2alignment, fill_byte, maximum_skip);
                be_emit_write_line();
        }
-       emit_entity_visibility(entity);
+       emit_visibility(entity);
 
        switch (be_gas_object_file_format) {
        case OBJECT_FILE_FORMAT_ELF:
                be_emit_cstring("\t.type\t");
-               be_emit_string(name);
+               be_gas_emit_entity(entity);
                be_emit_cstring(", ");
                be_emit_char(be_gas_elf_type_char);
                be_emit_cstring("function\n");
@@ -178,7 +468,7 @@ void be_gas_emit_function_prolog(ir_entity *entity, unsigned po2alignment)
                break;
        case OBJECT_FILE_FORMAT_COFF:
                be_emit_cstring("\t.def\t");
-               be_emit_string(name);
+               be_gas_emit_entity(entity);
                be_emit_cstring(";");
                if (get_entity_visibility(entity) == ir_visibility_local) {
                        be_emit_cstring("\t.scl\t3;");
@@ -191,41 +481,28 @@ void be_gas_emit_function_prolog(ir_entity *entity, unsigned po2alignment)
        case OBJECT_FILE_FORMAT_MACH_O:
                break;
        }
-       be_emit_string(name);
+       be_gas_emit_entity(entity);
        be_emit_cstring(":\n");
        be_emit_write_line();
 }
 
-void be_gas_emit_function_epilog(ir_entity *entity)
+void be_gas_emit_function_epilog(const ir_entity *entity)
 {
-       const char *name = get_entity_ld_name(entity);
-
        if (be_gas_object_file_format == OBJECT_FILE_FORMAT_ELF) {
                be_emit_cstring("\t.size\t");
-               be_emit_string(name);
+               be_gas_emit_entity(entity);
                be_emit_cstring(", .-");
-               be_emit_string(name);
+               be_gas_emit_entity(entity);
                be_emit_char('\n');
                be_emit_write_line();
        }
 
        be_emit_cstring("# -- End  ");
-       be_emit_string(name);
+       be_gas_emit_entity(entity);
        be_emit_char('\n');
        be_emit_write_line();
 }
 
-/**
- * An environment containing all needed dumper data.
- * Currently we create the file completely in memory first, then
- * write it to the disk. This is an artifact from the old C-generating backend
- * and even there NOT needed. So we might change it in the future.
- */
-typedef struct _be_gas_decl_env {
-       be_gas_section_t     section;
-       const be_main_env_t *main_env;
-} be_gas_decl_env_t;
-
 /************************************************************************/
 
 /**
@@ -234,7 +511,7 @@ typedef struct _be_gas_decl_env {
  * @param tv     the tarval
  * @param bytes  the width of the tarvals value in bytes
  */
-static void dump_arith_tarval(tarval *tv, int bytes)
+static void emit_arith_tarval(tarval *tv, int bytes)
 {
        switch (bytes) {
        case 1:
@@ -295,14 +572,6 @@ static void dump_arith_tarval(tarval *tv, int bytes)
        panic("Can't dump a tarval with %d bytes", bytes);
 }
 
-/**
- * Return the label prefix for labeled blocks.
- */
-const char *be_gas_block_label_prefix(void)
-{
-       return ".LG";
-}
-
 /**
  * Return the label prefix for labeled instructions.
  */
@@ -311,17 +580,6 @@ const char *be_gas_insn_label_prefix(void)
        return ".LE";
 }
 
-void be_gas_emit_entity(ir_entity *entity)
-{
-       if (entity->type == firm_code_type) {
-               ir_label_t label = get_entity_label(entity);
-               be_emit_string(be_gas_block_label_prefix());
-               be_emit_irprintf("%lu", label);
-       } else {
-               be_emit_ident(get_entity_ld_ident(entity));
-       }
-}
-
 /**
  * Return the tarval of an atomic initializer.
  *
@@ -377,7 +635,7 @@ static tarval *get_atomic_init_tv(ir_node *init)
  * @param env   the gas output environment
  * @param init  a node representing the atomic value (on the const code irg)
  */
-static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
+static void do_emit_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 {
        ir_mode *mode = get_irn_mode(init);
        int bytes     = get_mode_size_bytes(mode);
@@ -388,18 +646,18 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 
        switch (get_irn_opcode(init)) {
        case iro_Cast:
-               do_dump_atomic_init(env, get_Cast_op(init));
+               do_emit_atomic_init(env, get_Cast_op(init));
                return;
 
        case iro_Conv:
-               do_dump_atomic_init(env, get_Conv_op(init));
+               do_emit_atomic_init(env, get_Conv_op(init));
                return;
 
        case iro_Const:
                tv = get_Const_tarval(init);
 
                /* it's a arithmetic value */
-               dump_arith_tarval(tv, bytes);
+               emit_arith_tarval(tv, bytes);
                return;
 
        case iro_SymConst:
@@ -428,11 +686,11 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 
                case symconst_enum_const:
                        tv = get_enumeration_value(get_SymConst_enum(init));
-                       dump_arith_tarval(tv, bytes);
+                       emit_arith_tarval(tv, bytes);
                        break;
 
                default:
-                       assert(!"dump_atomic_init(): don't know how to init from this SymConst");
+                       assert(!"emit_atomic_init(): don't know how to init from this SymConst");
                }
                return;
 
@@ -440,27 +698,27 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
                if (!mode_is_int(mode) && !mode_is_reference(mode)) {
                        panic("Constant must be int or pointer for '+' to work");
                }
-               do_dump_atomic_init(env, get_Add_left(init));
+               do_emit_atomic_init(env, get_Add_left(init));
                be_emit_cstring(" + ");
-               do_dump_atomic_init(env, get_Add_right(init));
+               do_emit_atomic_init(env, get_Add_right(init));
                return;
 
        case iro_Sub:
                if (!mode_is_int(mode) && !mode_is_reference(mode)) {
                        panic("Constant must be int or pointer for '-' to work");
                }
-               do_dump_atomic_init(env, get_Sub_left(init));
+               do_emit_atomic_init(env, get_Sub_left(init));
                be_emit_cstring(" - ");
-               do_dump_atomic_init(env, get_Sub_right(init));
+               do_emit_atomic_init(env, get_Sub_right(init));
                return;
 
        case iro_Mul:
                if (!mode_is_int(mode) && !mode_is_reference(mode)) {
                        panic("Constant must be int or pointer for '*' to work");
                }
-               do_dump_atomic_init(env, get_Mul_left(init));
+               do_emit_atomic_init(env, get_Mul_left(init));
                be_emit_cstring(" * ");
-               do_dump_atomic_init(env, get_Mul_right(init));
+               do_emit_atomic_init(env, get_Mul_right(init));
                return;
 
        case iro_Unknown:
@@ -468,7 +726,7 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
                return;
 
        default:
-               panic("dump_atomic_init(): unsupported IR-node %+F", init);
+               panic("emit_atomic_init(): unsupported IR-node %+F", init);
        }
 }
 
@@ -477,7 +735,8 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
  *
  * @param size  the size in bytes
  */
-static void dump_size_type(size_t size) {
+static void emit_size_type(size_t size)
+{
        switch (size) {
        case 1:
                be_emit_cstring("\t.byte\t");
@@ -512,13 +771,13 @@ static void dump_size_type(size_t size) {
  * @param env   the gas output environment
  * @param init  a node representing the atomic value (on the const code irg)
  */
-static void dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
+static void emit_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 {
        ir_mode *mode = get_irn_mode(init);
        int bytes     = get_mode_size_bytes(mode);
 
-       dump_size_type(bytes);
-       do_dump_atomic_init(env, init);
+       emit_size_type(bytes);
+       do_emit_atomic_init(env, init);
        be_emit_char('\n');
        be_emit_write_line();
 }
@@ -527,109 +786,13 @@ static void dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 /* Routines to dump global variables                                    */
 /************************************************************************/
 
-static int initializer_is_string_const(const ir_initializer_t *initializer)
-{
-       size_t i, len;
-       int found_printable = 0;
-
-       if (initializer->kind != IR_INITIALIZER_COMPOUND)
-               return 0;
-
-       len = initializer->compound.n_initializers;
-       if (len < 1)
-               return 0;
-       for (i = 0; i < len; ++i) {
-               int               c;
-               tarval           *tv;
-               ir_mode          *mode;
-               ir_initializer_t *sub_initializer
-                       = initializer->compound.initializers[i];
-
-               if (sub_initializer->kind != IR_INITIALIZER_TARVAL)
-                       return 0;
-
-               tv   = sub_initializer->tarval.value;
-               mode = get_tarval_mode(tv);
-
-               if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
-                       return 0;
-
-               c = get_tarval_long(tv);
-               if (isgraph(c) || isspace(c))
-                       found_printable = 1;
-               else if (c != 0)
-                       return 0;
-
-               if (i == len - 1 && c != '\0')
-                       return 0;
-       }
-
-       return found_printable;
-}
-
-/**
- * Determine if an entity is a string constant
- * @param ent The entity
- * @return 1 if it is a string constant, 0 otherwise
- */
-static int ent_is_string_const(const ir_entity *ent)
-{
-       ir_type *type, *element_type;
-       ir_mode *mode;
-       int i, c, n;
-
-       type = get_entity_type(ent);
-
-       /* if it's an array */
-       if (!is_Array_type(type))
-               return 0;
-
-       element_type = get_array_element_type(type);
-
-       /* and the array's element type is primitive */
-       if (!is_Primitive_type(element_type))
-               return 0;
-
-       /* and the mode of the element type is an int of
-        * the same size as the byte mode */
-       mode = get_type_mode(element_type);
-       if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
-               return 0;
-
-       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) {
-                       ir_node *irn = get_compound_ent_value(ent, i);
-                       if (! is_Const(irn))
-                               return 0;
-
-                       c = (int) get_tarval_long(get_Const_tarval(irn));
-
-                       if (isgraph(c) || isspace(c))
-                               found_printable = 1;
-                       else if (c != 0)
-                               return 0;
-
-                       if (i == n - 1 && c != '\0')
-                               return 0;
-               }
-               return found_printable;
-       }
-
-       return 0;
-}
-
 /**
  * Dump a string constant.
  * No checks are made!!
  *
  * @param ent  The entity to dump.
  */
-static void dump_string_cst(const ir_entity *ent)
+static void emit_string_cst(const ir_entity *ent)
 {
        int      i, len;
        int      output_len;
@@ -679,7 +842,7 @@ static void dump_string_cst(const ir_entity *ent)
        }
 }
 
-static void dump_string_initializer(const ir_initializer_t *initializer)
+static void emit_string_initializer(const ir_initializer_t *initializer)
 {
        size_t i, len;
 
@@ -695,7 +858,7 @@ static void dump_string_initializer(const ir_initializer_t *initializer)
                const ir_initializer_t *sub_initializer
                        = get_initializer_compound_value(initializer, i);
 
-               tarval *tv = get_initializer_tarval_value(sub_initializer);
+               tarval *tv = get_initializer_tarval(sub_initializer);
                int     c  = get_tarval_long(tv);
 
                switch (c) {
@@ -782,7 +945,7 @@ static normal_or_bitfield *glob_vals;
 static size_t              max_vals;
 #endif
 
-static void dump_bitfield(normal_or_bitfield *vals, size_t offset_bits,
+static void emit_bitfield(normal_or_bitfield *vals, size_t offset_bits,
                           const ir_initializer_t *initializer, ir_type *type)
 {
        unsigned char  last_bits = 0;
@@ -833,7 +996,7 @@ static void dump_bitfield(normal_or_bitfield *vals, size_t offset_bits,
        }
 }
 
-static void dump_ir_initializer(normal_or_bitfield *vals,
+static void emit_ir_initializer(normal_or_bitfield *vals,
                                 const ir_initializer_t *initializer,
                                 ir_type *type)
 {
@@ -884,7 +1047,7 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
                                ir_initializer_t *sub_initializer
                                        = get_initializer_compound_value(initializer, i);
 
-                               dump_ir_initializer(vals, sub_initializer, element_type);
+                               emit_ir_initializer(vals, sub_initializer, element_type);
 
                                vals += skip;
                        }
@@ -911,13 +1074,13 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
                                        if (offset_bits != 0 ||
                                                (value_len != 8 && value_len != 16 && value_len != 32
                                                 && value_len != 64)) {
-                                               dump_bitfield(&vals[offset], offset_bits,
+                                               emit_bitfield(&vals[offset], offset_bits,
                                                              sub_initializer, subtype);
                                                continue;
                                        }
                                }
 
-                               dump_ir_initializer(&vals[offset], sub_initializer, subtype);
+                               emit_ir_initializer(&vals[offset], sub_initializer, subtype);
                        }
                }
 
@@ -927,7 +1090,7 @@ 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, const ir_entity *entity)
+static void emit_initializer(be_gas_decl_env_t *env, const ir_entity *entity)
 {
        const ir_initializer_t *initializer = entity->initializer;
        ir_type                *type;
@@ -936,7 +1099,7 @@ static void dump_initializer(be_gas_decl_env_t *env, const ir_entity *entity)
        size_t                  k;
 
        if (initializer_is_string_const(initializer)) {
-               dump_string_initializer(initializer);
+               emit_string_initializer(initializer);
                return;
        }
 
@@ -957,7 +1120,7 @@ static void dump_initializer(be_gas_decl_env_t *env, const ir_entity *entity)
        max_vals  = size;
 #endif
 
-       dump_ir_initializer(vals, initializer, type);
+       emit_ir_initializer(vals, initializer, type);
 
        /* now write values sorted */
        for (k = 0; k < size; ) {
@@ -965,7 +1128,7 @@ static void dump_initializer(be_gas_decl_env_t *env, const ir_entity *entity)
                int elem_size = 1;
                if (vals[k].kind == NORMAL) {
                        if (vals[k].v.value != NULL) {
-                               dump_atomic_init(env, vals[k].v.value);
+                               emit_atomic_init(env, vals[k].v.value);
                                elem_size = get_mode_size_bytes(get_irn_mode(vals[k].v.value));
                        } else {
                                elem_size = 0;
@@ -977,8 +1140,8 @@ static void dump_initializer(be_gas_decl_env_t *env, const ir_entity *entity)
                        assert(tv != NULL);
 
                        elem_size = size;
-                       dump_size_type(size);
-                       dump_arith_tarval(tv, size);
+                       emit_size_type(size);
+                       emit_arith_tarval(tv, size);
                        be_emit_char('\n');
                        be_emit_write_line();
                } else {
@@ -1002,15 +1165,15 @@ static void dump_initializer(be_gas_decl_env_t *env, const ir_entity *entity)
        xfree(vals);
 }
 
-static void dump_compound_graph_init(be_gas_decl_env_t *env,
+static void emit_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_is_string_const(ent)) {
-               dump_string_cst(ent);
+       if (entity_is_string_const(ent)) {
+               emit_string_cst(ent);
                return;
        }
 
@@ -1086,7 +1249,7 @@ static void dump_compound_graph_init(be_gas_decl_env_t *env,
                int space = 0, skip = 0;
                if (vals[k].kind == NORMAL) {
                        if (vals[k].v.value != NULL) {
-                               dump_atomic_init(env, vals[k].v.value);
+                               emit_atomic_init(env, vals[k].v.value);
                                skip = get_mode_size_bytes(get_irn_mode(vals[k].v.value)) - 1;
                        } else {
                                space = 1;
@@ -1129,71 +1292,80 @@ static unsigned get_effective_entity_alignment(const ir_entity *entity)
        return alignment;
 }
 
-static be_gas_section_t determine_section(be_gas_decl_env_t *env,
-                                          const ir_entity *entity)
+static void emit_common(const ir_entity *entity)
 {
-       ir_type *owner = get_entity_owner(entity);
+       unsigned size      = get_type_size_bytes(get_entity_type(entity));
+       unsigned alignment = get_effective_entity_alignment(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;
+       if (get_entity_linkage(entity) & IR_LINKAGE_WEAK) {
+               emit_weak(entity);
        }
 
-       panic("Couldn't determine section for %+F?!?", entity);
+       switch (be_gas_object_file_format) {
+       case OBJECT_FILE_FORMAT_MACH_O:
+               be_emit_cstring("\t.comm ");
+               be_gas_emit_entity(entity);
+               be_emit_irprintf(",%u,%u\n", size, log2_floor(alignment));
+               be_emit_write_line();
+               return;
+       case OBJECT_FILE_FORMAT_ELF:
+               be_emit_cstring("\t.comm ");
+               be_gas_emit_entity(entity);
+               be_emit_irprintf(",%u,%u\n", size, alignment);
+               be_emit_write_line();
+               return;
+       case OBJECT_FILE_FORMAT_COFF:
+               be_emit_cstring("\t.comm ");
+               be_gas_emit_entity(entity);
+               be_emit_irprintf(",%u # %u\n", size, alignment);
+               be_emit_write_line();
+               return;
+       }
+       panic("invalid object file format");
 }
 
-static void emit_common(const ir_entity *ent)
+static void emit_local_common(const ir_entity *entity)
 {
-       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);
+       unsigned size      = get_type_size_bytes(get_entity_type(entity));
+       unsigned alignment = get_effective_entity_alignment(entity);
+
+       if (get_entity_linkage(entity) & IR_LINKAGE_WEAK) {
+               emit_weak(entity);
+       }
 
        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_cstring("\t.lcomm ");
+               be_gas_emit_entity(entity);
+               be_emit_irprintf(",%u,%u\n", 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_cstring("\t.local ");
+               be_gas_emit_entity(entity);
+               be_emit_cstring("\n");
+               be_emit_write_line();
+               be_emit_cstring("\t.comm ");
+               be_gas_emit_entity(entity);
+               be_emit_irprintf(",%u,%u\n", 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_cstring("\t.lcomm ");
+               be_gas_emit_entity(entity);
+               be_emit_irprintf(",%u # %u\n", size, alignment);
                be_emit_write_line();
                return;
        }
        panic("invalid object file format");
 }
 
-static void dump_indirect_symbol(const ir_entity *entity, be_gas_section_t section)
+static void emit_indirect_symbol(const ir_entity *entity, be_gas_section_t section)
 {
        /* we can only do PIC code on macho so far */
        assert(be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O);
 
-       be_emit_ident(get_entity_ld_ident(entity));
+       be_gas_emit_entity(entity);
        be_emit_cstring(":\n");
        be_emit_write_line();
        be_emit_cstring("\t.indirect_symbol ");
@@ -1210,51 +1382,104 @@ static void dump_indirect_symbol(const ir_entity *entity, be_gas_section_t secti
        }
 }
 
+char const *be_gas_get_private_prefix(void)
+{
+       return
+               be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O ? "L" :
+               ".L";
+}
+
+void be_gas_emit_entity(const ir_entity *entity)
+{
+       if (entity->type == firm_code_type) {
+               ir_label_t label = get_entity_label(entity);
+               be_emit_irprintf("%s_%lu", be_gas_get_private_prefix(), label);
+               return;
+       }
+
+       if (get_entity_visibility(entity) == ir_visibility_private) {
+               be_emit_string(be_gas_get_private_prefix());
+       }
+       be_emit_ident(get_entity_ld_ident(entity));
+}
+
+void be_gas_emit_block_name(const ir_node *block)
+{
+       if (has_Block_entity(block)) {
+               ir_entity *entity = get_Block_entity(block);
+               be_gas_emit_entity(entity);
+       } else {
+               be_emit_irprintf("%s%ld", be_gas_get_private_prefix(), get_irn_node_nr(block));
+       }
+}
+
 /**
  * Dump a global entity.
  *
  * @param env  the gas output environment
  * @param ent  the entity to be dumped
  */
-static void dump_global(be_gas_decl_env_t *env, const ir_entity *ent)
+static void emit_global(be_gas_decl_env_t *env, const ir_entity *entity)
 {
-       ir_type          *type           = get_entity_type(ent);
-       ident            *ld_ident       = get_entity_ld_ident(ent);
-       unsigned          alignment      = get_effective_entity_alignment(ent);
-       be_gas_section_t  section        = determine_section(env, ent);
+       ir_type          *type       = get_entity_type(entity);
+       ident            *ld_ident   = get_entity_ld_ident(entity);
+       unsigned          alignment  = get_effective_entity_alignment(entity);
+       be_gas_section_t  section    = determine_section(env, entity);
+       ir_visibility     visibility = get_entity_visibility(entity);
+       ir_linkage        linkage    = get_entity_linkage(entity);
+
+       /* block labels are already emittet in the code */
+       if (type == firm_code_type)
+               return;
 
        /* we already emitted all methods. Except for the trampolines which
         * the assembler/linker generates */
        if (is_Method_type(type) && section != GAS_SECTION_PIC_TRAMPOLINES) {
+               /* functions with graph are already emitted with
+                * be_gas_emit_function_prolog */
+               if (get_entity_irg(entity) == NULL) {
+                       emit_visibility(entity);
+               }
                return;
        }
-       /* block labels are already emittet in the code */
-       if (type == firm_code_type)
-               return;
-
-       be_dbg_variable(ent);
 
-       /* nothing to do for externally defined values */
-       if (get_entity_visibility(ent) == ir_visibility_external)
-               return;
+       be_dbg_variable(entity);
 
-       if (!is_po2(alignment))
-               panic("alignment not a power of 2");
+       if (section == GAS_SECTION_BSS) {
+               ir_visibility visibility = get_entity_visibility(entity);
 
-       if (section == GAS_SECTION_BSS &&
-                       (get_entity_linkage(ent) & IR_LINKAGE_MERGE)) {
-               if (get_entity_visibility(ent) != ir_visibility_default) {
-                       panic("merge link semantic not supported for local/extern entities");
+               switch (visibility) {
+               case ir_visibility_local:
+               case ir_visibility_private:
+                       emit_local_common(entity);
+                       return;
+               case ir_visibility_default:
+                       if (linkage & IR_LINKAGE_MERGE) {
+                               emit_common(entity);
+                               return;
+                       }
+                       break;
+               case ir_visibility_external:
+                       if (linkage & IR_LINKAGE_MERGE)
+                               panic("merge link semantic not supported for extern entities");
+                       break;
                }
-               emit_common(ent);
+       }
+
+       emit_visibility(entity);
+       if (visibility == ir_visibility_external) {
+               /* nothing to do for externally defined values */
                return;
        }
 
-       be_gas_emit_switch_section(section);
+       if (!is_po2(alignment))
+               panic("alignment not a power of 2");
+
+       emit_section(section, entity);
 
        if (section == GAS_SECTION_PIC_TRAMPOLINES
                        || section == GAS_SECTION_PIC_SYMBOLS) {
-               dump_indirect_symbol(ent, section);
+               emit_indirect_symbol(entity, section);
                return;
        }
 
@@ -1262,29 +1487,31 @@ static void dump_global(be_gas_decl_env_t *env, const ir_entity *ent)
        if (alignment > 1) {
                emit_align(alignment);
        }
-       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_gas_emit_entity(entity);
                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_cstring("object\n\t.size\t");\
+               be_gas_emit_entity(entity);
                be_emit_irprintf(", %u\n", get_type_size_bytes(type));
        }
-       be_emit_ident(ld_ident);
-       be_emit_cstring(":\n");
-       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 {
-               /* uninitialized */
+       if (get_id_str(ld_ident)[0] != '\0') {
+           be_gas_emit_entity(entity);
+               be_emit_cstring(":\n");
+               be_emit_write_line();
+       }
+
+       if (entity_is_null(entity)) {
                be_emit_irprintf("\t.space %u\n", get_type_size_bytes(type));
                be_emit_write_line();
+       } else if(entity_has_compound_ent_values(entity)) {
+               emit_compound_graph_init(env, entity);
+       } else {
+               assert(entity->initializer != NULL);
+               emit_initializer(env, entity);
        }
 }
 
@@ -1294,13 +1521,13 @@ static void dump_global(be_gas_decl_env_t *env, const ir_entity *ent)
  * @param gt                a global like type, either the global or the TLS one
  * @param env               an environment
  */
-static void be_gas_dump_globals(ir_type *gt, be_gas_decl_env_t *env)
+static void be_gas_emit_globals(ir_type *gt, be_gas_decl_env_t *env)
 {
        int i, n = get_compound_n_members(gt);
 
        for (i = 0; i < n; i++) {
                ir_entity *ent = get_compound_member(gt, i);
-               dump_global(env, ent);
+               emit_global(env, ent);
        }
 }
 
@@ -1316,12 +1543,12 @@ void be_gas_emit_decls(const be_main_env_t *main_env)
        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);
+       be_gas_emit_globals(get_glob_type(), &env);
+       be_gas_emit_globals(get_tls_type(), &env);
+       be_gas_emit_globals(get_segment_type(IR_SEGMENT_CONSTRUCTORS), &env);
+       be_gas_emit_globals(get_segment_type(IR_SEGMENT_DESTRUCTORS), &env);
+       be_gas_emit_globals(main_env->pic_symbols_type, &env);
+       be_gas_emit_globals(main_env->pic_trampolines_type, &env);
 
        /**
         * ".subsections_via_symbols marks object files which are OK to divide