X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbegnuas.c;h=8cc6ec5cdcb196d2a9ff7864a748f8101c388ebf;hb=0b1140d1887f497ef413709e5cda2608f2cd1017;hp=f1b48f47f1c3960520a862e371fa2ce597054805;hpb=52b38347d10831203454fe7d2c58f07c7701dd05;p=libfirm

diff --git a/ir/be/begnuas.c b/ir/be/begnuas.c
index f1b48f47f..8cc6ec5cd 100644
--- a/ir/be/begnuas.c
+++ b/ir/be/begnuas.c
@@ -249,31 +249,37 @@ 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;
 	}
 
-	panic("Can't dump a tarval with %d bytes\n", bytes);
+	panic("Can't dump a tarval with %d bytes", bytes);
 }
 
 /**
@@ -430,35 +436,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);
 	}
 }
 
@@ -495,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);
 	}
 }
 
@@ -806,7 +812,7 @@ 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");
 	}
 
 	/* normalize offset */
@@ -1050,7 +1056,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 */
@@ -1115,7 +1121,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();
 }
 
@@ -1183,6 +1189,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");
@@ -1205,14 +1220,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");
 			}
@@ -1239,7 +1261,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()");
 			}
 		}
 	}