X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbegnuas.c;h=0679d60927c9b6f31eb5d59fa708e2c41dfd021c;hb=2428e8c0513d2b96a64dfa072e8cd1b861d62b8e;hp=ab6f56baf01dcbea149f3c72f48679cf9b9c351f;hpb=cbcf8b93de62865b8564e6a47aca7a28790b65ad;p=libfirm

diff --git a/ir/be/begnuas.c b/ir/be/begnuas.c
index ab6f56baf..0679d6092 100644
--- a/ir/be/begnuas.c
+++ b/ir/be/begnuas.c
@@ -24,9 +24,7 @@
  * @date        04.11.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "begnuas.h"
 
@@ -249,27 +247,33 @@ static void dump_arith_tarval(tarval *tv, int bytes)
 		return;
 
 	case 12:
-		be_emit_irprintf("0x%02x%02x%02x%02x%02x%02x%02x%02x"
-		                   "%02x%02x%02x%02x", 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));
+		/* 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));
+			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;
 	}
 
@@ -430,35 +434,35 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *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:
-			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:
-			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;
+	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;
 
-		default:
-			assert(0 && "dump_atomic_init(): unknown IR-node");
+	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:
+		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:
+		panic("dump_atomic_init(): unsupported IR-node %+F", init);
 	}
 }
 
@@ -628,19 +632,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;
 
@@ -669,7 +675,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);
 	}
 }
 
@@ -808,6 +814,7 @@ static void dump_bitfield(normal_or_bitfield *vals, size_t offset_bits,
 	if (tv == NULL) {
 		panic("Couldn't get numeric value for bitfield initializer");
 	}
+	tv = tarval_convert_to(tv, get_type_mode(type));
 
 	/* normalize offset */
 	vals        += offset_bits >> 3;
@@ -945,7 +952,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;
@@ -990,7 +997,7 @@ static void dump_initializer(be_gas_decl_env_t *env, ir_entity *entity)
 
 		/* 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();
 		}
 	}
@@ -1034,7 +1041,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) {
@@ -1103,7 +1110,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();
 		}
 	}
@@ -1214,14 +1221,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");
 			}
@@ -1248,7 +1262,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()");
 			}
 		}
 	}