X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbegnuas.c;h=7ca9fcfa86a86f5a7b91b4d52b285f5c92e3a4bb;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=32543aef4c327fa731f56746f858e6dedd6010dc;hpb=1213046523ddd8216dce6e64bf597cd420fb752d;p=libfirm

diff --git a/ir/be/begnuas.c b/ir/be/begnuas.c
index 32543aef4..7ca9fcfa8 100644
--- a/ir/be/begnuas.c
+++ b/ir/be/begnuas.c
@@ -69,6 +69,7 @@ static const char *get_section_name(be_gas_section_t section) {
 			".section\t.bss",
 			".section\t.tbss,\"awT\",@nobits",
 			".section\t.ctors,\"aw\",@progbits",
+			".section\t.dtors,\"aw\",@progbits",
 			NULL, /* no cstring section */
 			NULL,
 			NULL
@@ -80,6 +81,7 @@ static const char *get_section_name(be_gas_section_t section) {
 			".section\t.bss",
 			".section\t.tbss,\"awT\",@nobits",
 			".section\t.ctors,\"aw\",@progbits",
+			".section\t.dtors,\"aw\",@progbits",
 			NULL,
 			NULL,
 			NULL
@@ -91,6 +93,7 @@ static const char *get_section_name(be_gas_section_t section) {
 			".section\t.bss",
 			".section\t.tbss,\"awT\",@nobits",
 			".section\t.ctors,\"aw\",@progbits",
+			".section\t.dtors,\"aw\",@progbits",
 			NULL,
 			NULL,
 			NULL
@@ -102,6 +105,7 @@ static const char *get_section_name(be_gas_section_t section) {
 			".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"
@@ -167,7 +171,11 @@ void be_gas_emit_function_prolog(ir_entity *entity, unsigned alignment)
 	case GAS_FLAVOUR_MINGW:
 		be_emit_cstring("\t.def\t");
 		be_emit_string(name);
-		be_emit_cstring(";\t.scl\t2;\t.type\t32;\t.endef\n");
+		if (get_entity_visibility(entity) == visibility_external_visible) {
+			be_emit_cstring(";\t.scl\t2;\t.type\t32;\t.endef\n");
+		} else {
+			be_emit_cstring(";\t.scl\t3;\t.type\t32;\t.endef\n");
+		}
 		be_emit_write_line();
 		break;
 	case GAS_FLAVOUR_MACH_O:
@@ -223,59 +231,76 @@ static void dump_arith_tarval(tarval *tv, int bytes)
 	switch (bytes) {
 	case 1:
 		be_emit_irprintf("0x%02x", get_tarval_sub_bits(tv, 0));
-		break;
+		return;
 
 	case 2:
 		be_emit_irprintf("0x%02x%02x", get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
-		break;
+		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));
-		break;
+		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));
-		break;
+		return;
 
-	case 10:
 	case 12:
-		break;
+		/* 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("0x%02x%02x%02x%02x%02x%02x%02x%02x"
-				               "%02x%02x%02x%02x%02x%02x%02x%02x",
+		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));
-		break;
-
-
-	default:
-		fprintf(stderr, "Try to dump an tarval with %d bytes\n", bytes);
-		assert(0);
+			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)
+		);
+		return;
 	}
+
+	panic("Can't dump a tarval with %d bytes", bytes);
 }
 
 /**
  * Return the label prefix for labeled blocks.
  */
-const char *be_gas_label_prefix(void) {
+const char *be_gas_block_label_prefix(void) {
 	return ".LG";
 }
 
+/**
+ * Return the label prefix for labeled instructions.
+ */
+const char *be_gas_insn_label_prefix(void) {
+	return ".LE";
+}
+
 /**
  * Dump a label.
  */
 static void dump_label(ir_label_t label) {
-	be_emit_irprintf("%s%ld", be_gas_label_prefix(), label);
+	be_emit_irprintf("%s%lu", be_gas_block_label_prefix(), label);
 }
 
 /**
@@ -411,26 +436,35 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 		}
 		return;
 
-		case iro_Add:
-			do_dump_atomic_init(env, get_Add_left(init));
-			be_emit_cstring(" + ");
-			do_dump_atomic_init(env, get_Add_right(init));
-			return;
+	case iro_Add:
+		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));
+		be_emit_cstring(" + ");
+		do_dump_atomic_init(env, get_Add_right(init));
+		return;
 
-		case iro_Sub:
-			do_dump_atomic_init(env, get_Sub_left(init));
-			be_emit_cstring(" - ");
-			do_dump_atomic_init(env, get_Sub_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));
+		be_emit_cstring(" - ");
+		do_dump_atomic_init(env, get_Sub_right(init));
+		return;
 
-		case iro_Mul:
-			do_dump_atomic_init(env, get_Mul_left(init));
-			be_emit_cstring(" * ");
-			do_dump_atomic_init(env, get_Mul_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));
+		be_emit_cstring(" * ");
+		do_dump_atomic_init(env, get_Mul_right(init));
+		return;
 
-		default:
-			assert(0 && "dump_atomic_init(): unknown IR-node");
+	default:
+		panic("dump_atomic_init(): unsupported IR-node %+F", init);
 	}
 }
 
@@ -467,7 +501,7 @@ static void dump_size_type(size_t size) {
 		break;
 
 	default:
-		panic("Try to dump a type with %u bytes\n", (unsigned) size);
+		panic("Try to dump a type with %u bytes", (unsigned)size);
 	}
 }
 
@@ -600,19 +634,21 @@ static int ent_is_string_const(ir_entity *ent)
 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);
+	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 \"");
-		len -= 1;
+		output_len -= 1;
 	}
 
-	for (i = 0; i < len; ++i) {
+	for (i = 0; i < output_len; ++i) {
 		ir_node *irn;
 		int c;
 
@@ -641,7 +677,7 @@ static void dump_string_cst(ir_entity *ent)
 	remaining_space = type_size - len;
 	assert(remaining_space >= 0);
 	if(remaining_space > 0) {
-		be_emit_irprintf("\t.skip\t%d\n", remaining_space);
+		be_emit_irprintf("\t.space\t%d\n", remaining_space);
 	}
 }
 
@@ -778,8 +814,9 @@ static void dump_bitfield(normal_or_bitfield *vals, size_t offset_bits,
 		panic("bitfield initializer is compound");
 	}
 	if (tv == NULL) {
-		panic("Couldn't get numeric value for bitfield initializer\n");
+		panic("Couldn't get numeric value for bitfield initializer");
 	}
+	tv = tarval_convert_to(tv, get_type_mode(type));
 
 	/* normalize offset */
 	vals        += offset_bits >> 3;
@@ -917,7 +954,7 @@ static void dump_initializer(be_gas_decl_env_t *env, ir_entity *entity)
 	 * In the worst case, every initializer allocates one byte.
 	 * Moreover, initializer might be big, do not allocate on stack.
 	 */
-	vals = xcalloc(size, sizeof(vals[0]));
+	vals = XMALLOCNZ(normal_or_bitfield, size);
 
 #ifndef NDEBUG
 	glob_vals = vals;
@@ -928,13 +965,14 @@ static void dump_initializer(be_gas_decl_env_t *env, ir_entity *entity)
 
 	/* now write values sorted */
 	for (k = 0; k < size; ) {
-		int space = 0, skip = 0;
+		int space     = 0;
+		int elem_size = 1;
 		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;
+				elem_size = get_mode_size_bytes(get_irn_mode(vals[k].v.value));
 	 		} else {
-	 			space = 1;
+	 			elem_size = 0;
 	 		}
 		} else if(vals[k].kind == TARVAL) {
 			tarval *tv   = vals[k].v.tarval;
@@ -942,7 +980,7 @@ static void dump_initializer(be_gas_decl_env_t *env, ir_entity *entity)
 
 			assert(tv != NULL);
 
-			skip = size - 1;
+			elem_size = size;
 			dump_size_type(size);
 			dump_arith_tarval(tv, size);
 			be_emit_char('\n');
@@ -953,17 +991,15 @@ static void dump_initializer(be_gas_decl_env_t *env, ir_entity *entity)
 			be_emit_write_line();
 		}
 
-		++k;
+		k += elem_size;
 		while (k < size && vals[k].kind == NORMAL && vals[k].v.value == NULL) {
 			++space;
 			++k;
 		}
-		space -= skip;
-		assert(space >= 0);
 
 		/* a gap */
 		if (space > 0) {
-			be_emit_irprintf("\t.skip\t%d\n", space);
+			be_emit_irprintf("\t.space\t%d\n", space);
 			be_emit_write_line();
 		}
 	}
@@ -1007,7 +1043,7 @@ static void dump_compound_init(be_gas_decl_env_t *env, ir_entity *ent)
 	 * In the worst case, every initializer allocates one byte.
 	 * Moreover, initializer might be big, do not allocate on stack.
 	 */
-	vals = xcalloc(last_ofs, sizeof(vals[0]));
+	vals = XMALLOCNZ(normal_or_bitfield, last_ofs);
 
 	/* collect the values and store them at the offsets */
 	for (i = 0; i < n; ++i) {
@@ -1023,7 +1059,7 @@ static void dump_compound_init(be_gas_decl_env_t *env, ir_entity *ent)
 			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'\n",
+				panic("Couldn't get numeric value for bitfield initializer '%s'",
 				      get_entity_ld_name(ent));
 			}
 			/* normalize offset */
@@ -1076,7 +1112,7 @@ static void dump_compound_init(be_gas_decl_env_t *env, ir_entity *ent)
 
 		/* a gap */
 		if (space > 0) {
-			be_emit_irprintf("\t.skip\t%d\n", space);
+			be_emit_irprintf("\t.space\t%d\n", space);
 			be_emit_write_line();
 		}
 	}
@@ -1088,7 +1124,7 @@ static void emit_align(unsigned alignment)
 	if (!is_po2(alignment))
 		panic("alignment not a power of 2");
 
-	be_emit_irprintf(".p2align\t%u\n", log2_floor(alignment));
+	be_emit_irprintf("\t.p2align\t%u\n", log2_floor(alignment));
 	be_emit_write_line();
 }
 
@@ -1156,6 +1192,15 @@ static void dump_global(be_gas_decl_env_t *env, ir_entity *ent)
 		emit_align(align);
 	}
 
+	if (visibility != visibility_external_allocated && !emit_as_common
+			&& be_gas_flavour == GAS_FLAVOUR_ELF) {
+		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_emit_irprintf(", %u\n", get_type_size_bytes(type));
+	}
+
 	if (!emit_as_common) {
 		be_emit_ident(ld_ident);
 		be_emit_cstring(":\n");
@@ -1178,14 +1223,21 @@ static void dump_global(be_gas_decl_env_t *env, ir_entity *ent)
 				be_emit_write_line();
 				break;
 			}
-		} else if (section == GAS_SECTION_PIC_TRAMPOLINES) {
+		} 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();
-				be_emit_cstring("\thlt ; hlt ; hlt ; hlt ; hlt\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");
 			}
@@ -1212,7 +1264,7 @@ static void dump_global(be_gas_decl_env_t *env, ir_entity *ent)
 				dump_compound_init(env, ent);
 				break;
 			default:
-				assert(0);
+				panic("Unimplemented type kind in dump_global()");
 			}
 		}
 	}
@@ -1277,9 +1329,13 @@ void be_gas_emit_decls(const be_main_env_t *main_env,
 	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_CTOR;
-	be_gas_dump_globals(get_constructors_type(), &env,
+	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);