X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_gen_decls.c;h=46f0e31f7706fdb15b97d11af87f3bcb0566397a;hb=a1a465eb2b3f54027b29f829423fffd0396937f4;hp=2b79f3197a975e23e3b563f1839910834f665a09;hpb=c3106c447068cd52b83e08fc3a43531b462e5c5b;p=libfirm

diff --git a/ir/be/ia32/ia32_gen_decls.c b/ir/be/ia32/ia32_gen_decls.c
index 2b79f3197..46f0e31f7 100644
--- a/ir/be/ia32/ia32_gen_decls.c
+++ b/ir/be/ia32/ia32_gen_decls.c
@@ -66,7 +66,7 @@ static unsigned highest_bit(unsigned v)
 	return res;
 }
 
-static void ia32_dump_comm(obstack_t *obst, const char *name, visibility vis, int size, int align) {
+static void ia32_dump_comm(obstack_t *obst, const char *name, ir_visibility vis, int size, int align) {
 	switch (asm_flavour) {
 	case ASM_LINUX_GAS:
 		if (vis == visibility_local)
@@ -189,6 +189,10 @@ static void do_dump_atomic_init(obstack_t *obst, ir_node *init)
 			obstack_printf(obst, "%s", get_entity_ld_name(get_SymConst_entity(init)));
 			break;
 
+		case symconst_ofs_ent:
+			obstack_printf(obst, "%d", get_entity_offset_bytes(get_SymConst_entity(init)));
+			break;
+
 		case symconst_type_size:
 			obstack_printf(obst, "%d", get_type_size_bytes(get_SymConst_type(init)));
 			break;
@@ -203,7 +207,7 @@ static void do_dump_atomic_init(obstack_t *obst, ir_node *init)
 			break;
 
 		default:
-			assert(0 && "dump_atomic_init(): don't know how to init from this SymConst");
+			assert(!"dump_atomic_init(): don't know how to init from this SymConst");
 		}
 		return;
 
@@ -400,14 +404,13 @@ static void dump_global(const be_main_env_t *main_env,
 	const char *ld_name = get_entity_ld_name(ent);
 	obstack_t *obst     = data_obstack;
 	int align, h;
-	const arch_env_t *arch_env = main_env->arch_env;
 
 	/*
 	 * FIXME: did NOT work for partly constant values
 	 */
 	if (! is_Method_type(ty)) {
-		ent_variability variability = get_entity_variability(ent);
-		visibility visibility = get_entity_visibility(ent);
+		ir_variability variability = get_entity_variability(ent);
+		ir_visibility visibility = get_entity_visibility(ent);
 
 		if (variability == variability_constant) {
 			/* a constant entity, put it on the rdata */
@@ -416,7 +419,7 @@ static void dump_global(const be_main_env_t *main_env,
 
 		/* check, whether it is initialized, if yes create data */
 		if (variability != variability_uninitialized) {
-			be_dbg_global(main_env->db_handle, obst, ent);
+			be_dbg_variable(main_env->db_handle, obst, ent);
 
 			if (visibility == visibility_external_visible) {
 				obstack_printf(obst, ".globl\t%s\n", ld_name);
@@ -564,7 +567,7 @@ static void dump_global(const be_main_env_t *main_env,
 			obstack_printf(obst, "\n");
 		}
 		else if (visibility != visibility_external_allocated) {
-			be_dbg_global(main_env->db_handle, comm_obstack, ent);
+			be_dbg_variable(main_env->db_handle, comm_obstack, ent);
 
 			/* uninitialized and NOT external */
 			if (get_entity_owner(ent) != get_tls_type()) {