X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbegnuas.c;h=7ca9fcfa86a86f5a7b91b4d52b285f5c92e3a4bb;hb=beffbfdbf9abb9de3ff7c740836c068e6b1aa643;hp=10798241ece2bcc8221773f8d675873159d6522b;hpb=d44b3844af84684de9b0213b77c175f80f8b84ee;p=libfirm

diff --git a/ir/be/begnuas.c b/ir/be/begnuas.c
index 10798241e..7ca9fcfa8 100644
--- a/ir/be/begnuas.c
+++ b/ir/be/begnuas.c
@@ -436,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);
 	}
 }
 
@@ -634,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;
 
@@ -675,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);
 	}
 }
 
@@ -814,6 +816,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;
@@ -951,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;
@@ -996,7 +999,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();
 		}
 	}
@@ -1040,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) {
@@ -1109,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();
 		}
 	}
@@ -1220,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");
 			}
@@ -1254,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()");
 			}
 		}
 	}