X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbegnuas.c;h=b89f43b749a234401bfbc44b7b3e226f7a280930;hb=1db02a4692443f95545ede1cabff8c828e33442b;hp=f09bddba0c2fa1fa68272652fe5538ed52bb8cac;hpb=9e31d4eab3ffb00fae7791ed224ea27fbca2eade;p=libfirm

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