X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbegnuas.c;h=72b46aa3e86826272814e3e2b1d70c8efe01f934;hb=0c2e8bedc56cb9dba9b2544927a8093ddb7ee614;hp=71e6a1144bb0ee3e9a11fe07156fba5561ac0127;hpb=8e504f6f3d09e9eed86b5a47f3891771d15f8142;p=libfirm

diff --git a/ir/be/begnuas.c b/ir/be/begnuas.c
index 71e6a1144..72b46aa3e 100644
--- a/ir/be/begnuas.c
+++ b/ir/be/begnuas.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -160,7 +160,7 @@ 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) {
@@ -262,17 +262,17 @@ static ir_tarval *get_initializer_tarval(const ir_initializer_t *initializer)
 	return get_tarval_undefined();
 }
 
-static int initializer_is_string_const(const ir_initializer_t *initializer)
+static bool initializer_is_string_const(const ir_initializer_t *initializer)
 {
 	size_t i, len;
-	int found_printable = 0;
+	bool found_printable = false;
 
 	if (initializer->kind != IR_INITIALIZER_COMPOUND)
-		return 0;
+		return false;
 
 	len = initializer->compound.n_initializers;
 	if (len < 1)
-		return 0;
+		return false;
 	for (i = 0; i < len; ++i) {
 		int               c;
 		ir_tarval        *tv;
@@ -282,20 +282,20 @@ static int initializer_is_string_const(const ir_initializer_t *initializer)
 
 		tv = get_initializer_tarval(sub_initializer);
 		if (!tarval_is_constant(tv))
-			return 0;
+			return false;
 
 		mode = get_tarval_mode(tv);
 		if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
-			return 0;
+			return false;
 
 		c = get_tarval_long(tv);
 		if (isgraph(c) || isspace(c))
-			found_printable = 1;
+			found_printable = true;
 		else if (c != 0)
-			return 0;
+			return false;
 
 		if (i == len - 1 && c != '\0')
-			return 0;
+			return false;
 	}
 
 	return found_printable;
@@ -489,7 +489,8 @@ static void emit_visibility(const ir_entity *entity)
 	}
 
 	if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O
-			&& (linkage & IR_LINKAGE_HIDDEN_USER)) {
+			&& (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');
@@ -721,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;
 
@@ -899,7 +900,7 @@ static void emit_string_cst(const ir_entity *ent)
 	}
 }
 
-static void emit_string_initializer(const ir_initializer_t *initializer)
+static size_t emit_string_initializer(const ir_initializer_t *initializer)
 {
 	size_t i, len;
 
@@ -934,20 +935,24 @@ static void emit_string_initializer(const ir_initializer_t *initializer)
 	}
 	be_emit_cstring("\"\n");
 	be_emit_write_line();
+
+	return initializer->compound.n_initializers;
 }
 
-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;
 	union {
-		ir_node       *value;
-		ir_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;
 
@@ -972,9 +977,9 @@ static size_t get_initializer_size(const ir_initializer_t *initializer,
 		if (!is_type_variable_size(type)) {
 			return get_type_size_bytes(type);
 		} else {
-			unsigned n_entries
+			size_t n_entries
 				= get_initializer_compound_n_entries(initializer);
-			unsigned i;
+			size_t i;
 			unsigned initializer_size = get_type_size_bytes(type);
 			for (i = 0; i < n_entries; ++i) {
 				ir_entity *entity = get_compound_member(type, i);
@@ -1079,6 +1084,13 @@ static void emit_ir_initializer(normal_or_bitfield *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:
 		return;
@@ -1146,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);
 					}
 				}
 
@@ -1202,16 +1213,19 @@ static void emit_initializer(be_gas_decl_env_t *env, const ir_entity *entity)
 
 	/* now write values sorted */
 	for (k = 0; k < size; ) {
-		int space     = 0;
-		int elem_size = 1;
-		if (vals[k].kind == NORMAL) {
+		int                     space     = 0;
+		int                     elem_size = 1;
+		normal_or_bitfield_kind kind      = vals[k].kind;
+		switch (kind) {
+		case NORMAL:
 			if (vals[k].v.value != NULL) {
 				emit_atomic_init(env, vals[k].v.value);
 				elem_size = get_mode_size_bytes(get_irn_mode(vals[k].v.value));
 			} else {
 				elem_size = 0;
 			}
-		} else if (vals[k].kind == TARVAL) {
+			break;
+		case TARVAL: {
 			ir_tarval *tv   = vals[k].v.tarval;
 			size_t     size = get_mode_size_bytes(get_tarval_mode(tv));
 
@@ -1222,10 +1236,15 @@ static void emit_initializer(be_gas_decl_env_t *env, const ir_entity *entity)
 			emit_arith_tarval(tv, size);
 			be_emit_char('\n');
 			be_emit_write_line();
-		} else {
-			assert(vals[k].kind == BITFIELD);
+			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();
+			break;
 		}
 
 		k += elem_size;
@@ -1582,8 +1601,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 {
@@ -1600,7 +1622,7 @@ static void emit_global(be_gas_decl_env_t *env, const ir_entity *entity)
  */
 static void be_gas_emit_globals(ir_type *gt, be_gas_decl_env_t *env)
 {
-	int i, n = get_compound_n_members(gt);
+	size_t i, n = get_compound_n_members(gt);
 
 	for (i = 0; i < n; i++) {
 		ir_entity *ent = get_compound_member(gt, i);
@@ -1637,3 +1659,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);
+}