beifg: Factorise code to count interference components.
[libfirm] / ir / be / begnuas.c
index 22822e8..e7e0f5e 100644 (file)
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -22,7 +8,6 @@
  * @brief       Dumps global variables and constants as gas assembler.
  * @author      Christian Wuerdig, Matthias Braun
  * @date        04.11.2005
- * @version     $Id$
  */
 #include "config.h"
 
 #include "tv.h"
 #include "irnode.h"
 #include "irprog.h"
-#include "pdeq.h"
 #include "entity_t.h"
 #include "error.h"
+#include "util.h"
+#include "execfreq.h"
 
 #include "be_t.h"
+#include "bearch.h"
 #include "beemitter.h"
-#include "be_dbgout.h"
+#include "bedwarf.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;
+elf_variant_t         be_gas_elf_variant        = ELF_VARIANT_NORMAL;
+bool                  be_gas_emit_types         = true;
+char                  be_gas_elf_type_char      = '@';
 
 static be_gas_section_t current_section = (be_gas_section_t) -1;
+static pmap            *block_numbers;
+static unsigned         next_block_nr;
 
 /**
- * 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) {
-       static const char *text[GAS_FLAVOUR_LAST+1][GAS_SECTION_LAST+1] = {
-               { /* GAS_FLAVOUR_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
-               },
-               { /* GAS_FLAVOUR_MINGW */
-                       ".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
-               },
-               { /* 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 */
-                       ".text",
-                       ".data",
-                       ".const",
-                       ".data",
-                       NULL,             /* TLS is not supported on Mach-O */
-                       ".mod_init_func",
-                       NULL,             /* TODO: how is this called? */
-                       ".cstring",
-                       ".section\t__IMPORT,__jump_table,symbol_stubs,self_modifying_code+pure_instructions,5",
-                       ".section\t__IMPORT,__pointers,non_lazy_symbol_pointers"
+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)
+{
+       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;
+               case GAS_SECTION_DEBUG_INFO:      name = "section __DWARF,__debug_info,regular,debug"; break;
+               case GAS_SECTION_DEBUG_ABBREV:    name = "section __DWARF,__debug_abbrev,regular,debug"; break;
+               case GAS_SECTION_DEBUG_LINE:      name = "section __DWARF,__debug_line,regular,debug"; break;
+               case GAS_SECTION_DEBUG_PUBNAMES:  name = "section __DWARF,__debug_pubnames,regular,debug"; break;
+               case GAS_SECTION_DEBUG_FRAME:     name = "section __DWARF,__debug_frame,regular,debug"; break;
+               default: panic("unsupported scetion type 0x%X", section);
                }
+       } 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 if (flags & GAS_SECTION_FLAG_TLS) {
+               panic("thread local storage not supported on macho (section 0x%X)", section);
+       } else {
+               panic("unsupported section type 0x%X", section);
+       }
+       be_emit_irprintf("\t.%s\n", name);
+       be_emit_write_line();
+}
+
+static void emit_section_sparc(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[GAS_SECTION_LAST+1] = {
+               "text",
+               "data",
+               "rodata",
+               "bss",
+               "ctors",
+               "dtors",
+               NULL, /* cstring */
+               NULL, /* pic trampolines */
+               NULL, /* pic symbols */
+               "debug_info",
+               "debug_abbrev",
+               "debug_line",
+               "debug_pubnames"
+               "debug_frame",
        };
 
-       assert((int) be_gas_flavour >= 0 && be_gas_flavour <= GAS_FLAVOUR_LAST);
-       assert((int) section >= 0 && section <= GAS_SECTION_LAST);
-       return text[be_gas_flavour][section];
+       if (current_section == section && !(section & GAS_SECTION_FLAG_COMDAT))
+               return;
+       current_section = section;
+
+       be_emit_cstring("\t.section\t\".");
+
+       /* Part1: section-name */
+       if (flags & GAS_SECTION_FLAG_TLS)
+               be_emit_char('t');
+       assert(base < (be_gas_section_t)ARRAY_SIZE(basename));
+       be_emit_string(basename[base]);
+
+       if (flags & GAS_SECTION_FLAG_COMDAT) {
+               be_emit_char('.');
+               be_gas_emit_entity(entity);
+       }
+       be_emit_char('"');
+
+       /* for the simple sections we're done here */
+       if (flags == 0)
+               goto end;
+
+       be_emit_cstring(",#alloc");
+
+       switch (base) {
+       case GAS_SECTION_TEXT: be_emit_cstring(",#execinstr"); break;
+       case GAS_SECTION_DATA:
+       case GAS_SECTION_BSS:  be_emit_cstring(",#write"); break;
+       default:
+               /* nothing */
+               break;
+       }
+       if (flags & GAS_SECTION_FLAG_TLS) {
+               be_emit_cstring(",#tls");
+       }
+
+end:
+       be_emit_char('\n');
+       be_emit_write_line();
 }
 
-void be_gas_emit_switch_section(be_gas_section_t section) {
-       if (current_section == 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;
+       const char *f;
+       static const struct {
+               const char *name;
+               const char *type;
+               const char *flags;
+       } sectioninfos[GAS_SECTION_LAST+1] = {
+               { "text",           "progbits", "ax" },
+               { "data",           "progbits", "aw" },
+               { "rodata",         "progbits", "a"  },
+               { "bss",            "nobits",   "aw" },
+               { "ctors",          "progbits", "aw" },
+               { "dtors",          "progbits", "aw" },
+               { NULL,             NULL,       NULL }, /* cstring */
+               { NULL,             NULL,       NULL }, /* pic trampolines */
+               { NULL,             NULL,       NULL }, /* pic symbols */
+               { "debug_info",     "progbits", ""   },
+               { "debug_abbrev",   "progbits", ""   },
+               { "debug_line",     "progbits", ""   },
+               { "debug_pubnames", "progbits", ""   },
+               { "debug_frame",    "progbits", ""   },
+       };
+
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
+               emit_section_macho(section);
                return;
+       } else if(be_gas_elf_variant == ELF_VARIANT_SPARC) {
+               emit_section_sparc(section, entity);
+               return;
+       }
 
-       be_emit_char('\t');
-       be_emit_string(get_section_name(section));
+       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 < (be_gas_section_t) ARRAY_SIZE(sectioninfos));
+       be_emit_cstring("\t.section\t.");
+       /* section name */
+       if (flags & GAS_SECTION_FLAG_TLS)
+               be_emit_char('t');
+       be_emit_string(sectioninfos[base].name);
+       if (flags & GAS_SECTION_FLAG_COMDAT) {
+               be_emit_char('.');
+               be_gas_emit_entity(entity);
+       }
+
+       /* section flags */
+       be_emit_cstring(",\"");
+       for (f = sectioninfos[base].flags; *f != '\0'; ++f) {
+               be_emit_char(*f);
+       }
+       if (flags & GAS_SECTION_FLAG_TLS)
+               be_emit_char('T');
+       if (flags & GAS_SECTION_FLAG_COMDAT)
+               be_emit_char('G');
+
+       /* section type */
+       if (be_gas_object_file_format != OBJECT_FILE_FORMAT_COFF) {
+               be_emit_cstring("\",");
+               be_emit_char(be_gas_elf_type_char);
+               be_emit_string(sectioninfos[base].type);
+       }
+
+       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();
-       current_section = section;
 }
 
-void be_gas_emit_function_prolog(ir_entity *entity, unsigned alignment)
+
+
+void be_gas_emit_switch_section(be_gas_section_t section)
 {
-       const char *name = get_entity_ld_name(entity);
-       const char *fill_byte = "";
-       unsigned maximum_skip;
+       /* you have to produce a switch_section call with entity manually
+        * for comdat sections */
+       assert( !(section & GAS_SECTION_FLAG_COMDAT));
 
-       be_gas_emit_switch_section(GAS_SECTION_TEXT);
+       emit_section(section, NULL);
+}
 
-       /* write the begin line (used by scripts processing the assembler... */
-       be_emit_write_line();
-       be_emit_cstring("# -- Begin  ");
-       be_emit_string(name);
+static ir_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 bool initializer_is_string_const(const ir_initializer_t *initializer)
+{
+       size_t i, len;
+       bool found_printable = false;
+
+       if (initializer->kind != IR_INITIALIZER_COMPOUND)
+               return false;
+
+       len = initializer->compound.n_initializers;
+       if (len < 1)
+               return false;
+       for (i = 0; i < len; ++i) {
+               int               c;
+               ir_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 false;
+
+               mode = get_tarval_mode(tv);
+               if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
+                       return false;
+
+               c = get_tarval_long(tv);
+               if (isgraph(c) || isspace(c))
+                       found_printable = true;
+               else if (c != 0)
+                       return false;
+
+               if (i == len - 1 && c != '\0')
+                       return false;
+       }
+
+       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: {
+               ir_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;
+
+       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);
+       }
+
+       return 0;
+}
+
+static bool entity_is_null(const ir_entity *entity)
+{
+       ir_initializer_t *initializer = get_entity_initializer(entity);
+       return initializer == NULL || initializer_is_null(initializer);
+}
+
+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;
+       }
+
+       /* the java frontend keeps some functions inside classes */
+       if (is_Class_type(owner)) {
+               return determine_basic_section(entity);
+       }
+
+       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();
+}
 
-       /* gcc fills space between function with 0x90, no idea if this is needed */
-       if (be_gas_flavour == GAS_FLAVOUR_MACH_O) {
-               fill_byte = "0x90";
+static void emit_visibility(const ir_entity *entity)
+{
+       ir_linkage const linkage = get_entity_linkage(entity);
+
+       if (linkage & 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_external
+                  && entity_has_definition(entity)) {
+               be_emit_cstring("\t.globl ");
+               be_gas_emit_entity(entity);
+               be_emit_char('\n');
+               be_emit_write_line();
        }
 
-       if (alignment > 0) {
-               maximum_skip = (1 << alignment) - 1;
-               be_emit_cstring("\t.p2align ");
-               be_emit_irprintf("%u,%s,%u\n", alignment, fill_byte, maximum_skip);
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O
+                       && (linkage & IR_LINKAGE_HIDDEN_USER)
+                       && get_entity_ld_name(entity)[0] != '\0') {
+               be_emit_cstring("\t.no_dead_strip ");
+               be_gas_emit_entity(entity);
+               be_emit_char('\n');
                be_emit_write_line();
        }
-       if (get_entity_visibility(entity) == visibility_external_visible) {
-               be_emit_cstring(".globl ");
-               be_emit_string(name);
+}
+
+void be_gas_emit_function_prolog(const ir_entity *entity, unsigned po2alignment, const parameter_dbg_info_t *parameter_infos)
+{
+       be_gas_section_t section;
+
+       be_dwarf_method_before(entity, parameter_infos);
+
+       section = determine_section(NULL, entity);
+       emit_section(section, entity);
+
+       /* write the begin line (makes the life easier for scripts parsing the
+        * assembler) */
+       if (be_options.verbose_asm) {
+               be_emit_cstring("# -- Begin  ");
+               be_gas_emit_entity(entity);
                be_emit_char('\n');
                be_emit_write_line();
        }
 
-       switch (be_gas_flavour) {
-       case GAS_FLAVOUR_ELF:
+       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", po2alignment, fill_byte, maximum_skip);
+               be_emit_write_line();
+       }
+       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_emit_cstring(", @function\n");
+               be_gas_emit_entity(entity);
+               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_gas_emit_entity(entity);
+               be_emit_cstring(";");
+               if (get_entity_visibility(entity) == ir_visibility_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);
+       be_gas_emit_entity(entity);
        be_emit_cstring(":\n");
        be_emit_write_line();
+
+       be_dwarf_method_begin();
 }
 
-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);
+       be_dwarf_method_end();
 
-       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_gas_emit_entity(entity);
                be_emit_cstring(", .-");
-               be_emit_string(name);
+               be_gas_emit_entity(entity);
+               be_emit_char('\n');
+               be_emit_write_line();
+       }
+
+       if (be_options.verbose_asm) {
+               be_emit_cstring("# -- End  ");
+               be_gas_emit_entity(entity);
                be_emit_char('\n');
                be_emit_write_line();
        }
 
-       be_emit_cstring("# -- End  ");
-       be_emit_string(name);
        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;
-       waitq               *worklist;           /**< A worklist we use to place not yet handled entities on. */
-} be_gas_decl_env_t;
-
-/************************************************************************/
+       next_block_nr += 199;
+       next_block_nr -= next_block_nr % 100;
+}
 
 /**
  * Output a tarval.
@@ -223,7 +589,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(ir_tarval *tv, unsigned bytes)
 {
        switch (bytes) {
        case 1:
@@ -231,126 +597,34 @@ static void dump_arith_tarval(tarval *tv, int bytes)
                return;
 
        case 2:
-               be_emit_irprintf("0x%02x%02x", get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
+               be_emit_irprintf("0x%02x%02x",
+                       get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
                return;
 
        case 4:
                be_emit_irprintf("0x%02x%02x%02x%02x",
-                       get_tarval_sub_bits(tv, 3), get_tarval_sub_bits(tv, 2), get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
+                       get_tarval_sub_bits(tv, 3), get_tarval_sub_bits(tv, 2),
+                       get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
                return;
 
        case 8:
                be_emit_irprintf("0x%02x%02x%02x%02x%02x%02x%02x%02x",
-                       get_tarval_sub_bits(tv, 7), get_tarval_sub_bits(tv, 6), get_tarval_sub_bits(tv, 5), get_tarval_sub_bits(tv, 4),
-                       get_tarval_sub_bits(tv, 3), get_tarval_sub_bits(tv, 2), get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
-               return;
-
-       case 12:
-               /* Beware: Mixed endian output!  One little endian number emitted as
-                * three longs.  Each long initializer is written in big endian. */
-               be_emit_irprintf(
-                       "\t.long\t0x%02x%02x%02x%02x\n"
-                       "\t.long\t0x%02x%02x%02x%02x\n"
-                       "\t.long\t0x%02x%02x%02x%02x",
-                       get_tarval_sub_bits(tv,  3), get_tarval_sub_bits(tv,  2),
-                       get_tarval_sub_bits(tv,  1), get_tarval_sub_bits(tv,  0),
-                       get_tarval_sub_bits(tv,  7), get_tarval_sub_bits(tv,  6),
-                       get_tarval_sub_bits(tv,  5), get_tarval_sub_bits(tv,  4),
-                       get_tarval_sub_bits(tv, 11), get_tarval_sub_bits(tv, 10),
-                       get_tarval_sub_bits(tv,  9), get_tarval_sub_bits(tv,  8)
-               );
-               return;
-
-       case 16:
-               be_emit_irprintf(
-                       "\t.long\t0x%02x%02x%02x%02x0x%02x%02x%02x%02x0x%02x%02x%02x%02x0x%02x%02x%02x%02x",
-                       get_tarval_sub_bits(tv, 15), get_tarval_sub_bits(tv, 16),
-                       get_tarval_sub_bits(tv, 13), get_tarval_sub_bits(tv, 12),
-                       get_tarval_sub_bits(tv, 11), get_tarval_sub_bits(tv, 10),
-                       get_tarval_sub_bits(tv,  9), get_tarval_sub_bits(tv,  8),
-                       get_tarval_sub_bits(tv,  7), get_tarval_sub_bits(tv,  6),
-                       get_tarval_sub_bits(tv,  5), get_tarval_sub_bits(tv,  4),
-                       get_tarval_sub_bits(tv,  3), get_tarval_sub_bits(tv,  2),
-                       get_tarval_sub_bits(tv,  1), get_tarval_sub_bits(tv,  0)
-               );
+                       get_tarval_sub_bits(tv, 7), get_tarval_sub_bits(tv, 6),
+                       get_tarval_sub_bits(tv, 5), get_tarval_sub_bits(tv, 4),
+                       get_tarval_sub_bits(tv, 3), get_tarval_sub_bits(tv, 2),
+                       get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
                return;
        }
 
        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.
  */
-const char *be_gas_insn_label_prefix(void) {
-       return ".LE";
-}
-
-void be_gas_emit_entity(ir_entity *entity)
+const char *be_gas_insn_label_prefix(void)
 {
-       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.
- *
- * @param init  a node representing the initializer (on the const code irg)
- *
- * @return the tarval
- */
-static tarval *get_atomic_init_tv(ir_node *init)
-{
-       for (;;) {
-               ir_mode *mode = get_irn_mode(init);
-
-               switch (get_irn_opcode(init)) {
-
-               case iro_Cast:
-                       init = get_Cast_op(init);
-                       continue;
-
-               case iro_Conv:
-                       init = get_Conv_op(init);
-                       continue;
-
-               case iro_Const:
-                       return get_Const_tarval(init);
-
-               case iro_SymConst:
-                       switch (get_SymConst_kind(init)) {
-                       case symconst_type_size:
-                               return new_tarval_from_long(get_type_size_bytes(get_SymConst_type(init)), mode);
-
-                       case symconst_type_align:
-                               return new_tarval_from_long(get_type_alignment_bytes(get_SymConst_type(init)), mode);
-
-                       case symconst_ofs_ent:
-                               return new_tarval_from_long(get_entity_offset(get_SymConst_entity(init)), mode);
-
-                       case symconst_enum_const:
-                               return get_enumeration_value(get_SymConst_enum(init));
-
-                       default:
-                               return NULL;
-                       }
-
-               default:
-                       return NULL;
-               }
-       }
+       return ".LE";
 }
 
 /**
@@ -359,43 +633,31 @@ 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 emit_init_expression(be_gas_decl_env_t *env, ir_node *init)
 {
        ir_mode *mode = get_irn_mode(init);
        int bytes     = get_mode_size_bytes(mode);
-       tarval *tv;
+       ir_tarval *tv;
        ir_entity *ent;
 
        init = skip_Id(init);
 
        switch (get_irn_opcode(init)) {
-       case iro_Cast:
-               do_dump_atomic_init(env, get_Cast_op(init));
-               return;
-
        case iro_Conv:
-               do_dump_atomic_init(env, get_Conv_op(init));
+               emit_init_expression(env, get_Conv_op(init));
                return;
 
        case iro_Const:
                tv = get_Const_tarval(init);
 
-               /* it's a arithmetic value */
-               dump_arith_tarval(tv, bytes);
+               /* it's an arithmetic value */
+               emit_arith_tarval(tv, bytes);
                return;
 
        case iro_SymConst:
                switch (get_SymConst_kind(init)) {
-               case symconst_addr_name:
-                       be_emit_ident(get_SymConst_name(init));
-                       break;
-
                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;
 
@@ -414,11 +676,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;
 
@@ -426,31 +688,35 @@ 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));
+               emit_init_expression(env, get_Add_left(init));
                be_emit_cstring(" + ");
-               do_dump_atomic_init(env, get_Add_right(init));
+               emit_init_expression(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));
+               emit_init_expression(env, get_Sub_left(init));
                be_emit_cstring(" - ");
-               do_dump_atomic_init(env, get_Sub_right(init));
+               emit_init_expression(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));
+               emit_init_expression(env, get_Mul_left(init));
                be_emit_cstring(" * ");
-               do_dump_atomic_init(env, get_Mul_right(init));
+               emit_init_expression(env, get_Mul_right(init));
+               return;
+
+       case iro_Unknown:
+               be_emit_cstring("0");
                return;
 
        default:
-               panic("dump_atomic_init(): unsupported IR-node %+F", init);
+               panic("unsupported IR-node %+F", init);
        }
 }
 
@@ -459,308 +725,124 @@ 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");
-               break;
-
-       case 2:
-               be_emit_cstring("\t.word\t");
-               break;
-
-       case 4:
-               be_emit_cstring("\t.long\t");
-               break;
-
-       case 8:
-               be_emit_cstring("\t.quad\t");
-               break;
-
-       case 10:
-       case 12:
-               /* handled in arith */
-               break;
-
-       case 16:
-               be_emit_cstring("\t.octa\t");
-               break;
+       case 1: be_emit_cstring("\t.byte\t");  break;
+       case 2: be_emit_cstring("\t.short\t"); break;
+       case 4: be_emit_cstring("\t.long\t");  break;
+       case 8: be_emit_cstring("\t.quad\t");  break;
 
        default:
                panic("Try to dump a type with %u bytes", (unsigned)size);
        }
 }
 
-/**
- * Emit an atomic value.
- *
- * @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_string_char(int c)
 {
-       ir_mode *mode = get_irn_mode(init);
-       int bytes     = get_mode_size_bytes(mode);
-
-       dump_size_type(bytes);
-       do_dump_atomic_init(env, init);
-       be_emit_char('\n');
-       be_emit_write_line();
-}
-
-/************************************************************************/
-/* 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;
+       switch (c) {
+       case '"' : be_emit_cstring("\\\""); break;
+       case '\n': be_emit_cstring("\\n"); break;
+       case '\r': be_emit_cstring("\\r"); break;
+       case '\t': be_emit_cstring("\\t"); break;
+       case '\\': be_emit_cstring("\\\\"); break;
+       default  :
+               if (isprint(c))
+                       be_emit_char(c);
+               else
+                       be_emit_irprintf("\\%03o", c);
+               break;
        }
-
-       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(ir_entity *ent)
+static size_t emit_string_initializer(const ir_initializer_t *initializer)
 {
-       ir_type *type, *element_type;
-       ir_mode *mode;
-       int i, c, n;
-       int found_printable = 0;
-
-       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->has_initializer) {
-               /* TODO */
-               return 0;
-       } else {
-               /* 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;
-               }
-       }
+       be_emit_cstring("\t.asciz \"");
 
-       /* then we can emit it as a string constant */
-       return found_printable;
-}
+       size_t len = initializer->compound.n_initializers;
+       for (size_t i = 0; i < len-1; ++i) {
+               const ir_initializer_t *sub_initializer
+                       = get_initializer_compound_value(initializer, i);
 
-/**
- * Dump a string constant.
- * No checks are made!!
- *
- * @param ent  The entity to dump.
- */
-static void dump_string_cst(ir_entity *ent)
-{
-       int      i, len;
-       int      output_len;
-       ir_type *type;
-       int      type_size;
-       int      remaining_space;
-
-       len        = get_compound_ent_n_values(ent);
-       output_len = len;
-       if (be_gas_flavour == GAS_FLAVOUR_MACH_O) {
-               be_emit_cstring("\t.ascii \"");
-       } else {
-               be_emit_cstring("\t.string \"");
-               output_len -= 1;
-       }
-
-       for (i = 0; i < output_len; ++i) {
-               ir_node *irn;
-               int c;
-
-               irn = get_compound_ent_value(ent, i);
-               c = (int) get_tarval_long(get_Const_tarval(irn));
-
-               switch (c) {
-               case '"' : be_emit_cstring("\\\""); break;
-               case '\n': be_emit_cstring("\\n"); break;
-               case '\r': be_emit_cstring("\\r"); break;
-               case '\t': be_emit_cstring("\\t"); break;
-               case '\\': be_emit_cstring("\\\\"); break;
-               default  :
-                       if (isprint(c))
-                               be_emit_char(c);
-                       else
-                               be_emit_irprintf("\\%o", c);
-                       break;
-               }
+               ir_tarval *tv = get_initializer_tarval(sub_initializer);
+               int        c  = get_tarval_long(tv);
+               emit_string_char(c);
        }
        be_emit_cstring("\"\n");
        be_emit_write_line();
 
-       type            = get_entity_type(ent);
-       type_size       = get_type_size_bytes(type);
-       remaining_space = type_size - len;
-       assert(remaining_space >= 0);
-       if (remaining_space > 0) {
-               be_emit_irprintf("\t.space\t%d\n", remaining_space);
-       }
+       return initializer->compound.n_initializers;
 }
 
-static void dump_string_initializer(const ir_initializer_t *initializer)
+void be_gas_emit_cstring(const char *string)
 {
-       size_t i, len;
-
-       len = initializer->compound.n_initializers;
-       if (be_gas_flavour == GAS_FLAVOUR_MACH_O) {
-               be_emit_cstring("\t.ascii \"");
-       } else {
-               be_emit_cstring("\t.string \"");
-               len -= 1;
-       }
-
-       for (i = 0; i < len; ++i) {
-               const ir_initializer_t *sub_initializer
-                       = get_initializer_compound_value(initializer, i);
-
-               tarval *tv = get_initializer_tarval_value(sub_initializer);
-               int     c  = get_tarval_long(tv);
-
-               switch (c) {
-               case '"' : be_emit_cstring("\\\""); break;
-               case '\n': be_emit_cstring("\\n"); break;
-               case '\r': be_emit_cstring("\\r"); break;
-               case '\t': be_emit_cstring("\\t"); break;
-               case '\\': be_emit_cstring("\\\\"); break;
-               default  :
-                       if (isprint(c))
-                               be_emit_char(c);
-                       else
-                               be_emit_irprintf("\\%o", c);
-                       break;
-               }
+       be_emit_cstring("\t.asciz \"");
+       for (const char *c = string; *c != '\0'; ++c) {
+               emit_string_char(*c);
        }
        be_emit_cstring("\"\n");
        be_emit_write_line();
 }
 
-enum normal_or_bitfield_kind {
+typedef enum normal_or_bitfield_kind {
        NORMAL = 0,
        TARVAL,
+       STRING,
        BITFIELD
-};
+} normal_or_bitfield_kind;
 
 typedef struct {
-       enum normal_or_bitfield_kind kind;
+       normal_or_bitfield_kind kind;
+       ir_type                *type;
        union {
-               ir_node       *value;
-               tarval        *tarval;
-               unsigned char  bf_val;
+               ir_node                *value;
+               ir_tarval              *tarval;
+               unsigned char           bf_val;
+               const ir_initializer_t *string;
        } v;
-} normal_or_bitfield;
-
-static int is_type_variable_size(ir_type *type)
-{
-       (void) type;
-       /* TODO */
-       return 0;
-}
+} normal_or_bitfield;
 
 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: {
-               if (!is_type_variable_size(type)) {
-                       return get_type_size_bytes(type);
+       case IR_INITIALIZER_COMPOUND:
+               if (is_Array_type(type)) {
+                       if (is_array_variable_size(type)) {
+                               ir_type   *element_type = get_array_element_type(type);
+                               unsigned   element_size = get_type_size_bytes(element_type);
+                               unsigned   element_align
+                                       = get_type_alignment_bytes(element_type);
+                               unsigned   misalign     = element_size % element_align;
+                               size_t     n_inits
+                                       = get_initializer_compound_n_entries(initializer);
+                               element_size += element_align - misalign;
+                               return n_inits * element_size;
+                       } else {
+                               return get_type_size_bytes(type);
+                       }
                } else {
-                       unsigned n_entries
-                               = get_initializer_compound_n_entries(initializer);
-                       unsigned i;
-                       unsigned initializer_size = get_type_size_bytes(type);
-                       for (i = 0; i < n_entries; ++i) {
-                               ir_entity *entity = get_compound_member(type, i);
-                               ir_type   *type   = get_entity_type(entity);
-
-                               const ir_initializer_t *sub_initializer
-                                       = get_initializer_compound_value(initializer, i);
-
-                               unsigned offset = get_entity_offset(entity);
-                               unsigned size   = get_initializer_size(sub_initializer, type);
-
-                               if (offset + size > initializer_size) {
-                                       initializer_size = offset + size;
-                               }
+                       assert(is_compound_type(type));
+                       size_t size = get_type_size_bytes(type);
+                       if (is_compound_variable_size(type)) {
+                               /* last initializer has to be an array of variable size */
+                               size_t l = get_initializer_compound_n_entries(initializer)-1;
+                               const ir_initializer_t *last
+                                       = get_initializer_compound_value(initializer, l);
+                               const ir_entity *last_ent  = get_compound_member(type, l);
+                               ir_type         *last_type = get_entity_type(last_ent);
+                               assert(is_array_variable_size(last_type));
+                               size += get_initializer_size(last, last_type);
                        }
-                       return initializer_size;
+                       return size;
                }
        }
-       }
 
        panic("found invalid initializer");
 }
@@ -770,15 +852,16 @@ 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;
-       ir_mode       *mode      = get_type_mode(type);
-       tarval        *tv        = NULL;
-       unsigned char  curr_bits;
-       int            value_len;
-       int            j;
+       static const size_t BITS_PER_BYTE = 8;
+       ir_mode   *mode      = get_type_mode(type);
+       ir_tarval *tv        = NULL;
+       int        value_len;
+       size_t     bit_offset;
+       size_t     end;
+       bool       big_endian = be_get_backend_param()->byte_order_big_endian;
 
        switch (get_initializer_kind(initializer)) {
        case IR_INITIALIZER_NULL:
@@ -802,30 +885,56 @@ static void dump_bitfield(normal_or_bitfield *vals, size_t offset_bits,
        }
        tv = tarval_convert_to(tv, get_type_mode(type));
 
-       /* normalize offset */
-       vals        += offset_bits >> 3;
-       offset_bits &= 7;
-       value_len    = get_mode_size_bits(mode);
-
-       /* combine bits with existing bits */
-       for (j = 0; value_len + (int) offset_bits > 0; ++j) {
-               assert((size_t) (vals - glob_vals) + j < max_vals);
-               assert(vals[j].kind == BITFIELD ||
-                               (vals[j].kind == NORMAL && vals[j].v.value == NULL));
-               vals[j].kind = BITFIELD;
-               curr_bits    = get_tarval_sub_bits(tv, j);
-               vals[j].v.bf_val
-                       |= (last_bits >> (8 - offset_bits)) | (curr_bits << offset_bits);
-               value_len -= 8;
-               last_bits = curr_bits;
+       value_len  = get_type_size_bytes(get_primitive_base_type(type));
+       bit_offset = 0;
+       end        = get_mode_size_bits(mode);
+       while (bit_offset < end) {
+               size_t        src_offset      = bit_offset / BITS_PER_BYTE;
+               size_t        src_offset_bits = bit_offset % BITS_PER_BYTE;
+               size_t        dst_offset      = (bit_offset+offset_bits) / BITS_PER_BYTE;
+               size_t        dst_offset_bits = (bit_offset+offset_bits) % BITS_PER_BYTE;
+               size_t        src_bits_len    = end-bit_offset;
+               size_t        dst_bits_len    = BITS_PER_BYTE-dst_offset_bits;
+               unsigned char curr_bits;
+               normal_or_bitfield *val;
+               if (src_bits_len > dst_bits_len)
+                       src_bits_len = dst_bits_len;
+
+               if (big_endian) {
+                       val = &vals[value_len - dst_offset - 1];
+               } else {
+                       val = &vals[dst_offset];
+               }
+
+               assert((val-glob_vals) < (ptrdiff_t) max_vals);
+               assert(val->kind == BITFIELD ||
+                               (val->kind == NORMAL && val->v.value == NULL));
+               val->kind  = BITFIELD;
+               curr_bits  = get_tarval_sub_bits(tv, src_offset);
+               curr_bits  = curr_bits >> src_offset_bits;
+               if (src_offset_bits + src_bits_len > 8) {
+                       unsigned next_bits = get_tarval_sub_bits(tv, src_offset+1);
+                       curr_bits |= next_bits << (8 - src_offset_bits);
+               }
+               curr_bits &= (1 << src_bits_len) - 1;
+               val->v.bf_val |= curr_bits << dst_offset_bits;
+
+               bit_offset += dst_bits_len;
        }
 }
 
-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)
 {
-       assert((size_t) (vals - glob_vals) < max_vals);
+       assert((size_t) (vals - glob_vals) <= max_vals);
+
+       if (initializer_is_string_const(initializer)) {
+               assert(vals->kind != BITFIELD);
+               vals->kind     = STRING;
+               vals->v.string = initializer;
+               return;
+       }
 
        switch (get_initializer_kind(initializer)) {
        case IR_INITIALIZER_NULL:
@@ -835,10 +944,12 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
 
                assert(vals->kind != BITFIELD);
                vals->kind     = TARVAL;
+               vals->type     = type;
                vals->v.tarval = get_initializer_tarval_value(initializer);
                assert(get_type_mode(type) == get_tarval_mode(vals->v.tarval));
                for (i = 1; i < get_type_size_bytes(type); ++i) {
                        vals[i].kind    = NORMAL;
+                       vals[i].type    = NULL;
                        vals[i].v.value = NULL;
                }
                return;
@@ -848,9 +959,11 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
 
                assert(vals->kind != BITFIELD);
                vals->kind    = NORMAL;
+               vals->type    = type;
                vals->v.value = get_initializer_const_value(initializer);
                for (i = 1; i < get_type_size_bytes(type); ++i) {
                        vals[i].kind    = NORMAL;
+                       vals[i].type    = NULL;
                        vals[i].v.value = NULL;
                }
                return;
@@ -872,7 +985,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;
                        }
@@ -894,18 +1007,18 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
                                if (mode != NULL) {
                                        size_t offset_bits
                                                = get_entity_offset_bits_remainder(member);
-                                       size_t value_len   = get_mode_size_bits(mode);
 
-                                       if (offset_bits != 0 ||
-                                               (value_len != 8 && value_len != 16 && value_len != 32
-                                                && value_len != 64)) {
-                                               dump_bitfield(&vals[offset], offset_bits,
+                                       if (is_Primitive_type(subtype)
+                                                       && get_primitive_base_type(subtype) != NULL) {
+                                               emit_bitfield(&vals[offset], offset_bits,
                                                              sub_initializer, subtype);
                                                continue;
+                                       } else {
+                                               assert(offset_bits == 0);
                                        }
                                }
 
-                               dump_ir_initializer(&vals[offset], sub_initializer, subtype);
+                               emit_ir_initializer(&vals[offset], sub_initializer, subtype);
                        }
                }
 
@@ -915,16 +1028,107 @@ 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 emit_tarval_data(ir_type *type, ir_tarval *tv)
+{
+       size_t size = get_type_size_bytes(type);
+       if (size == 12) {
+               /* this should be an x86 extended float */
+               assert(be_get_backend_param()->byte_order_big_endian == 0);
+
+               /* Beware: Mixed endian output!  One little endian number emitted as
+                * three longs.  Each long initializer is written in big endian. */
+               be_emit_irprintf(
+                       "\t.long\t0x%02x%02x%02x%02x\n"
+                       "\t.long\t0x%02x%02x%02x%02x\n"
+                       "\t.long\t0x%02x%02x%02x%02x\n",
+                       get_tarval_sub_bits(tv,  3), get_tarval_sub_bits(tv,  2),
+                       get_tarval_sub_bits(tv,  1), get_tarval_sub_bits(tv,  0),
+                       get_tarval_sub_bits(tv,  7), get_tarval_sub_bits(tv,  6),
+                       get_tarval_sub_bits(tv,  5), get_tarval_sub_bits(tv,  4),
+                       get_tarval_sub_bits(tv, 11), get_tarval_sub_bits(tv, 10),
+                       get_tarval_sub_bits(tv,  9), get_tarval_sub_bits(tv,  8)
+               );
+               be_emit_write_line();
+       } else if (size == 16) {
+               if (be_get_backend_param()->byte_order_big_endian) {
+                       be_emit_irprintf(
+                               "\t.long\t0x%02x%02x%02x%02x\n"
+                               "\t.long\t0x%02x%02x%02x%02x\n"
+                               "\t.long\t0x%02x%02x%02x%02x\n"
+                               "\t.long\t0x%02x%02x%02x%02x\n",
+                               get_tarval_sub_bits(tv, 15), get_tarval_sub_bits(tv, 14),
+                               get_tarval_sub_bits(tv, 13), get_tarval_sub_bits(tv, 12),
+                               get_tarval_sub_bits(tv, 11), get_tarval_sub_bits(tv, 10),
+                               get_tarval_sub_bits(tv,  9), get_tarval_sub_bits(tv,  8),
+                               get_tarval_sub_bits(tv,  7), get_tarval_sub_bits(tv,  6),
+                               get_tarval_sub_bits(tv,  5), get_tarval_sub_bits(tv,  4),
+                               get_tarval_sub_bits(tv,  3), get_tarval_sub_bits(tv,  2),
+                               get_tarval_sub_bits(tv,  1), get_tarval_sub_bits(tv,  0)
+                       );
+               } else {
+                       /* Beware: Mixed endian output! One little endian number emitted as
+                        * three longs.  Each long initializer is written in big endian. */
+                       be_emit_irprintf(
+                               "\t.long\t0x%02x%02x%02x%02x\n"
+                               "\t.long\t0x%02x%02x%02x%02x\n"
+                               "\t.long\t0x%02x%02x%02x%02x\n"
+                               "\t.long\t0x%02x%02x%02x%02x\n",
+                               get_tarval_sub_bits(tv,  3), get_tarval_sub_bits(tv,  2),
+                               get_tarval_sub_bits(tv,  1), get_tarval_sub_bits(tv,  0),
+                               get_tarval_sub_bits(tv,  7), get_tarval_sub_bits(tv,  6),
+                               get_tarval_sub_bits(tv,  5), get_tarval_sub_bits(tv,  4),
+                               get_tarval_sub_bits(tv, 11), get_tarval_sub_bits(tv, 10),
+                               get_tarval_sub_bits(tv,  9), get_tarval_sub_bits(tv,  8),
+                               get_tarval_sub_bits(tv, 15), get_tarval_sub_bits(tv, 14),
+                               get_tarval_sub_bits(tv, 13), get_tarval_sub_bits(tv, 12)
+                       );
+               }
+               be_emit_write_line();
+               return;
+       } else {
+               /* default case */
+               emit_size_type(size);
+               emit_arith_tarval(tv, size);
+               be_emit_char('\n');
+               be_emit_write_line();
+       }
+}
+
+/**
+ * Emit an atomic value.
+ *
+ * @param env   the gas output environment
+ * @param init  a node representing the atomic value (on the const code irg)
+ */
+static void emit_node_data(be_gas_decl_env_t *env, ir_node *init, ir_type *type)
+{
+       size_t size = get_type_size_bytes(type);
+       if (size == 12 || size == 16) {
+               ir_tarval *tv;
+               if (!is_Const(init)) {
+                       panic("12/16byte initializers only support Const nodes yet");
+               }
+               tv = get_Const_tarval(init);
+               emit_tarval_data(type, tv);
+               return;
+       }
+
+       emit_size_type(size);
+       emit_init_expression(env, init);
+       be_emit_char('\n');
+       be_emit_write_line();
+}
+
+static void emit_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;
        size_t                  k;
 
        if (initializer_is_string_const(initializer)) {
-               dump_string_initializer(initializer);
+               emit_string_initializer(initializer);
                return;
        }
 
@@ -945,34 +1149,36 @@ static void dump_initializer(be_gas_decl_env_t *env, 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; ) {
-               int space     = 0;
-               int elem_size = 1;
-               if (vals[k].kind == NORMAL) {
+               int                     space     = 0;
+               normal_or_bitfield_kind kind      = vals[k].kind;
+               int                     elem_size;
+               switch (kind) {
+               case NORMAL:
                        if (vals[k].v.value != NULL) {
-                               dump_atomic_init(env, vals[k].v.value);
-                               elem_size = get_mode_size_bytes(get_irn_mode(vals[k].v.value));
-                       } else {
-                               elem_size = 0;
-                       }
-               } else if (vals[k].kind == TARVAL) {
-                       tarval *tv   = vals[k].v.tarval;
-                       size_t  size = get_mode_size_bytes(get_tarval_mode(tv));
-
-                       assert(tv != NULL);
-
-                       elem_size = size;
-                       dump_size_type(size);
-                       dump_arith_tarval(tv, size);
-                       be_emit_char('\n');
-                       be_emit_write_line();
-               } else {
-                       assert(vals[k].kind == BITFIELD);
+                               emit_node_data(env, vals[k].v.value, vals[k].type);
+                               elem_size = get_type_size_bytes(vals[k].type);
+                       } else {
+                               elem_size = 0;
+                       }
+                       break;
+               case TARVAL:
+                       emit_tarval_data(vals[k].type, vals[k].v.tarval);
+                       elem_size = get_type_size_bytes(vals[k].type);
+                       break;
+               case STRING:
+                       elem_size = emit_string_initializer(vals[k].v.string);
+                       break;
+               case BITFIELD:
                        be_emit_irprintf("\t.byte\t%d\n", vals[k].v.bf_val);
                        be_emit_write_line();
+                       elem_size = 1;
+                       break;
+               default:
+                       panic("internal compiler error (invalid normal_or_bitfield_kind");
                }
 
                k += elem_size;
@@ -983,291 +1189,280 @@ static void dump_initializer(be_gas_decl_env_t *env, ir_entity *entity)
 
                /* a gap */
                if (space > 0) {
-                       be_emit_irprintf("\t.space\t%d\n", space);
+                       be_emit_irprintf("\t.space\t%d, 0\n", space);
                        be_emit_write_line();
                }
        }
        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 emit_align(unsigned p2alignment)
 {
-       normal_or_bitfield *vals;
-       int i, j, n;
-       unsigned k, last_ofs;
+       be_emit_irprintf("\t.p2align\t%u\n", log2_floor(p2alignment));
+       be_emit_write_line();
+}
 
-       if (ent->has_initializer) {
-               dump_initializer(env, ent);
-               return;
+static unsigned get_effective_entity_alignment(const ir_entity *entity)
+{
+       unsigned alignment = get_entity_alignment(entity);
+       if (alignment == 0) {
+               ir_type *type = get_entity_type(entity);
+               alignment     = get_type_alignment_bytes(type);
        }
+       return alignment;
+}
 
-       n = get_compound_ent_n_values(ent);
+static void emit_common(const ir_entity *entity)
+{
+       unsigned size      = get_type_size_bytes(get_entity_type(entity));
+       unsigned alignment = get_effective_entity_alignment(entity);
 
-       /* Find the initializer size. Sorrily gcc support a nasty feature:
-          The last field of a compound may be a flexible array. This allows
-          initializers bigger than the type size. */
-       last_ofs = get_type_size_bytes(get_entity_type(ent));
-       for (i = 0; i < n; ++i) {
-               unsigned offset         = get_compound_ent_value_offset_bytes(ent, i);
-               unsigned bits_remainder = get_compound_ent_value_offset_bit_remainder(ent, i);
-               ir_node  *value         = get_compound_ent_value(ent, i);
-               unsigned value_len      = get_mode_size_bits(get_irn_mode(value));
+       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_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");
+}
 
-               offset += (value_len + bits_remainder + 7) >> 3;
+static void emit_local_common(const ir_entity *entity)
+{
+       unsigned size      = get_type_size_bytes(get_entity_type(entity));
+       unsigned alignment = get_effective_entity_alignment(entity);
 
-               if (offset > last_ofs) {
-                       last_ofs = offset;
-               }
+       if (get_entity_linkage(entity) & IR_LINKAGE_WEAK) {
+               emit_weak(entity);
        }
 
-       /*
-        * In the worst case, every initializer allocates one byte.
-        * Moreover, initializer might be big, do not allocate on stack.
-        */
-       vals = XMALLOCNZ(normal_or_bitfield, last_ofs);
+       switch (be_gas_object_file_format) {
+       case OBJECT_FILE_FORMAT_MACH_O:
+               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_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_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");
+}
 
-       /* collect the values and store them at the offsets */
-       for (i = 0; i < n; ++i) {
-               unsigned offset      = get_compound_ent_value_offset_bytes(ent, i);
-               int      offset_bits = get_compound_ent_value_offset_bit_remainder(ent, i);
-               ir_node  *value      = get_compound_ent_value(ent, i);
-               int      value_len   = get_mode_size_bits(get_irn_mode(value));
-
-               assert(offset_bits >= 0);
-
-               if (offset_bits != 0 ||
-                       (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));
-                       }
-                       /* normalize offset */
-                       offset += offset_bits >> 3;
-                       offset_bits &= 7;
-
-                       for (j = 0; value_len + offset_bits > 0; ++j) {
-                               assert(offset + j < last_ofs);
-                               assert(vals[offset + j].kind == BITFIELD || vals[offset + j].v.value == NULL);
-                               vals[offset + j].kind = BITFIELD;
-                               curr_bits = get_tarval_sub_bits(tv, j);
-                               vals[offset + j].v.bf_val |= (last_bits >> (8 - offset_bits)) | (curr_bits << offset_bits);
-                               value_len -= 8;
-                               last_bits = curr_bits;
-                       }
-               } else {
-                       int i;
+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);
 
-                       assert(offset < last_ofs);
-                       assert(vals[offset].kind == NORMAL);
-                       for (i = 1; i < value_len / 8; ++i) {
-                               assert(vals[offset + i].v.value == NULL);
-                       }
-                       vals[offset].v.value = value;
-               }
+       be_gas_emit_entity(entity);
+       be_emit_cstring(":\n");
+       be_emit_write_line();
+       be_emit_irprintf("\t.indirect_symbol %I\n", get_entity_ident(entity));
+       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();
        }
+}
 
-       /* now write them sorted */
-       for (k = 0; k < last_ofs; ) {
-               int space = 0, skip = 0;
-               if (vals[k].kind == NORMAL) {
-                       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 {
-                       assert(vals[k].kind == BITFIELD);
-                       be_emit_irprintf("\t.byte\t%d\n", vals[k].v.bf_val);
-               }
+char const *be_gas_get_private_prefix(void)
+{
+       return be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O ? "L" : ".L";
+}
 
-               ++k;
-               while (k < last_ofs && vals[k].kind == NORMAL && vals[k].v.value == NULL) {
-                       ++space;
-                       ++k;
-               }
-               space -= skip;
-               assert(space >= 0);
+void be_gas_emit_entity(const ir_entity *entity)
+{
+       if (entity->type == get_code_type()) {
+               ir_label_t label = get_entity_label(entity);
+               be_emit_irprintf("%s_%lu", be_gas_get_private_prefix(), label);
+               return;
+       }
 
-               /* a gap */
-               if (space > 0) {
-                       be_emit_irprintf("\t.space\t%d\n", space);
-                       be_emit_write_line();
-               }
+       if (get_entity_visibility(entity) == ir_visibility_private) {
+               be_emit_string(be_gas_get_private_prefix());
        }
-       xfree(vals);
+       be_emit_irprintf("%I", get_entity_ld_ident(entity));
 }
 
-static void emit_align(unsigned p2alignment)
+void be_gas_emit_block_name(const ir_node *block)
 {
-       be_emit_irprintf("\t.p2align\t%u\n", log2_floor(p2alignment));
-       be_emit_write_line();
+       ir_entity *entity = get_Block_entity(block);
+       if (entity != NULL) {
+               be_gas_emit_entity(entity);
+       } else {
+               void *nr_val = pmap_get(void, block_numbers, block);
+               int   nr;
+               if (nr_val == NULL) {
+                       nr = next_block_nr++;
+                       pmap_insert(block_numbers, block, INT_TO_PTR(nr+1));
+               } else {
+                       nr = PTR_TO_INT(nr_val)-1;
+               }
+               be_emit_irprintf("%s%d", be_gas_get_private_prefix(), nr);
+       }
 }
 
-static unsigned get_effective_entity_alignment(ir_entity *entity)
+void be_gas_begin_block(const ir_node *block, bool needs_label)
 {
-       unsigned alignment = get_entity_alignment(entity);
-       if (alignment == 0) {
-               ir_type *type = get_entity_type(entity);
-               alignment     = get_type_alignment_bytes(type);
+       if (needs_label) {
+               be_gas_emit_block_name(block);
+               be_emit_char(':');
+       } else {
+               if (!be_options.verbose_asm)
+                       return;
+               be_emit_cstring("/*");
+               be_gas_emit_block_name(block);
+               be_emit_cstring(":*/");
        }
-       return alignment;
-}
 
+       if (be_options.verbose_asm) {
+               be_emit_pad_comment();
+               be_emit_irprintf("/* %+F preds:", block);
+
+               int arity = get_irn_arity(block);
+               if (arity == 0) {
+                       be_emit_cstring(" none");
+               } else {
+                       int i;
+                       for (i = 0; i < arity; ++i) {
+                               ir_node *predblock = get_Block_cfgpred_block(block, i);
+                               be_emit_char(' ');
+                               be_gas_emit_block_name(predblock);
+                       }
+               }
+               be_emit_irprintf(", freq: %.3f */", get_block_execfreq(block));
+       }
+       be_emit_char('\n');
+       be_emit_write_line();
+}
 
 /**
  * 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 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);
-       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);
+       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 emitted in the code. */
+       if (type == get_code_type())
+               return;
 
+       /* we already emitted all methods with graphs in other functions like
+        * be_gas_emit_function_prolog(). All others don't need to be emitted.
+        */
        if (is_Method_type(type) && section != GAS_SECTION_PIC_TRAMPOLINES) {
                return;
        }
-       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;
+       be_dwarf_variable(entity);
+
+       if (section == GAS_SECTION_BSS) {
+               switch (visibility) {
+               case ir_visibility_local:
+               case ir_visibility_private:
+                       emit_local_common(entity);
+                       return;
+               case ir_visibility_external:
+                       if (linkage & IR_LINKAGE_MERGE) {
+                               emit_common(entity);
+                               return;
+                       }
+                       break;
                }
-       } 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);
-       }
+       emit_visibility(entity);
 
-       be_dbg_variable(ent);
+       if (!is_po2(alignment))
+               panic("alignment not a power of 2");
 
-       /* 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... */
+       emit_section(section, entity);
+
+       if (section == GAS_SECTION_PIC_TRAMPOLINES
+                       || section == GAS_SECTION_PIC_SYMBOLS) {
+               emit_indirect_symbol(entity, section);
                return;
        }
-       if (!is_po2(alignment))
-               panic("alignment not a power of 2");
+
+       /* nothing left to do without an initializer */
+       if (!entity_has_definition(entity))
+               return;
+
        /* 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) {
+       if (be_gas_object_file_format == OBJECT_FILE_FORMAT_ELF
+                       && be_gas_emit_types
+                       && visibility != ir_visibility_private) {
                be_emit_cstring("\t.type\t");
-               be_emit_ident(ld_ident);
-               be_emit_cstring(", @object\n\t.size\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_gas_emit_entity(entity);
                be_emit_irprintf(", %u\n", get_type_size_bytes(type));
        }
 
-       if (!emit_as_common) {
-               be_emit_ident(ld_ident);
+       if (get_id_str(ld_ident)[0] != '\0') {
+               be_gas_emit_entity(entity);
                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));
+       if (entity_is_null(entity)) {
+               /* we should use .space for stuff in the bss segment */
+               unsigned size = get_type_size_bytes(type);
+               if (size > 0) {
+                       be_emit_irprintf("\t.space %u, 0\n", get_type_size_bytes(type));
                        be_emit_write_line();
                }
        } 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()");
-                       }
-               }
+               assert(entity->initializer != NULL);
+               emit_initializer(env, entity);
        }
 }
 
@@ -1276,76 +1471,178 @@ 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_emit_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);
+       size_t i, n = get_compound_n_members(gt);
 
-               dump_global(env, ent);
+       for (i = 0; i < n; i++) {
+               ir_entity *ent = get_compound_member(gt, i);
+               emit_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)
+static void emit_global_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_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
+        * 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();
+       }
+}
+
+void be_emit_jump_table(const ir_node *node, const ir_switch_table *table,
+                        ir_entity *entity, get_cfop_target_func get_cfop_target)
+{
+       unsigned        n_outs    = arch_get_irn_n_outs(node);
+       const ir_node **targets   = XMALLOCNZ(const ir_node*, n_outs);
+       size_t          n_entries = ir_switch_table_get_n_entries(table);
+       unsigned long   length    = 0;
+       size_t          e;
+       unsigned        i;
+       const ir_node **labels;
+
+       /* go over all proj's and collect their jump targets */
+       foreach_out_edge(node, edge) {
+               ir_node *proj   = get_edge_src_irn(edge);
+               long     pn     = get_Proj_proj(proj);
+               ir_node *target = get_cfop_target(proj);
+               assert(targets[pn] == NULL);
+               targets[pn] = target;
+       }
+
+       /* go over table to determine max value (note that we normalized the
+        * ranges so that the minimum is 0) */
+       for (e = 0; e < n_entries; ++e) {
+               const ir_switch_table_entry *entry
+                       = ir_switch_table_get_entry_const(table, e);
+               ir_tarval *max = entry->max;
+               unsigned long val;
+               if (entry->pn == 0)
+                       continue;
+               if (!tarval_is_long(max))
+                       panic("switch case overflow (%+F)", node);
+               val = (unsigned long) get_tarval_long(max);
+               if (val > length) {
+                       length = val;
+               }
+       }
+
+       /* 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 (%+F)", node);
+       }
+       ++length;
+
+       labels = XMALLOCNZ(const ir_node*, length);
+       for (e = 0; e < n_entries; ++e) {
+               const ir_switch_table_entry *entry
+                       = ir_switch_table_get_entry_const(table, e);
+               ir_tarval     *min    = entry->min;
+               ir_tarval     *max    = entry->max;
+               const ir_node *target = targets[entry->pn];
+               assert(entry->pn < (long)n_outs);
+               if (min == max) {
+                       unsigned long val = (unsigned long)get_tarval_long(max);
+                       labels[val] = target;
+               } else {
+                       unsigned long min_val;
+                       unsigned long max_val;
+                       unsigned long i;
+                       if (!tarval_is_long(min))
+                               panic("switch case overflow (%+F)", node);
+                       min_val = (unsigned long)get_tarval_long(min);
+                       max_val = (unsigned long)get_tarval_long(max);
+                       assert(min_val <= max_val);
+                       for (i = min_val; i <= max_val; ++i) {
+                               labels[i] = target;
+                       }
                }
        }
+
+       /* emit table */
+       if (entity != NULL) {
+               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) {
+               const ir_node *block = labels[i];
+               if (block == NULL)
+                       block = targets[0];
+               be_emit_cstring("\t.long ");
+               be_gas_emit_block_name(block);
+               be_emit_char('\n');
+               be_emit_write_line();
+       }
+
+       if (entity != NULL)
+               be_gas_emit_switch_section(GAS_SECTION_TEXT);
+
+       xfree(labels);
+       xfree(targets);
+}
+
+static void emit_global_asms(void)
+{
+       size_t n = get_irp_n_asms();
+       size_t i;
+
+       be_gas_emit_switch_section(GAS_SECTION_TEXT);
+       for (i = 0; i < n; ++i) {
+               ident *asmtext = get_irp_asm(i);
+
+               be_emit_cstring("#APP\n");
+               be_emit_write_line();
+               be_emit_irprintf("%I\n", asmtext);
+               be_emit_write_line();
+               be_emit_cstring("#NO_APP\n");
+               be_emit_write_line();
+       }
+}
+
+void be_gas_begin_compilation_unit(const be_main_env_t *env)
+{
+       be_dwarf_open();
+       be_dwarf_unit_begin(env->cup_name);
+
+       block_numbers = pmap_create();
+       next_block_nr = 0;
+
+       emit_global_asms();
+}
+
+void be_gas_end_compilation_unit(const be_main_env_t *env)
+{
+       emit_global_decls(env);
+
+       pmap_destroy(block_numbers);
+
+       be_dwarf_unit_end();
+       be_dwarf_close();
 }