X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fdebug%2Fdebugger.c;h=4bb9d8904937b3c94e966e23b4885e9480231615;hb=aa5c48c22eb13b5c64a340fe8dca931d4bedd1e7;hp=9117378ee968bbfd51216aeda56c3715357e05fa;hpb=0fbcef83aa6060534172bb13e71cdadb04428806;p=libfirm

diff --git a/ir/debug/debugger.c b/ir/debug/debugger.c
index 9117378ee..4bb9d8904 100644
--- a/ir/debug/debugger.c
+++ b/ir/debug/debugger.c
@@ -31,19 +31,13 @@
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-
 #endif
 
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
-
 #include <stdio.h>
 #include <signal.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
+
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
@@ -406,18 +400,6 @@ static void dbg_new_type(void *ctx, ir_type *tp)
 			firm_debug_break();
 		}
 	}
-	{
-		bp_ident_t key, *elem;
-
-		key.id        = get_type_ident(tp);
-		key.bp.reason = BP_ON_NEW_TYPE;
-
-		elem = set_find(bp_idents, &key, sizeof(key), HASH_IDENT_BP(key));
-		if (elem && elem->bp.active) {
-			dbg_printf("Firm BP %u reached, %+F was created\n", elem->bp.bpnr, tp);
-			firm_debug_break();
-		}
-	}
 }  /* dbg_new_type */
 
 /**
@@ -740,11 +722,14 @@ static ir_type *find_type_name(const char *name) {
 
 	for (i = 0; i < n; ++i) {
 		tp = get_irp_type(i);
-		if (strcmp(get_type_name(tp), name) == 0)
+		if (!is_compound_type(tp))
+			continue;
+
+		if (strcmp(get_compound_name(tp), name) == 0)
 			return tp;
 	}
 	tp = get_glob_type();
-	if (strcmp(get_type_name(tp), name) == 0)
+	if (strcmp(get_compound_name(tp), name) == 0)
 		return tp;
 	return NULL;
 }  /* find_type_name */
@@ -822,7 +807,7 @@ static void show_by_name(type_or_ent tore, void *env) {
 				ir_graph *irg = get_entity_irg(ent);
 
 				if (owner != get_glob_type()) {
-					printf("%s::%s", get_type_name(owner), get_id_str(id));
+					printf("%s::%s", get_compound_name(owner), get_id_str(id));
 				} else {
 					printf("%s", get_id_str(id));
 				}
@@ -850,7 +835,7 @@ static void show_by_ldname(type_or_ent tore, void *env) {
 				ir_graph *irg = get_entity_irg(ent);
 
 				if (owner != get_glob_type()) {
-					printf("%s::%s", get_type_name(owner), get_id_str(id));
+					printf("%s::%s", get_compound_name(owner), get_id_str(id));
 				} else {
 					printf("%s", get_id_str(id));
 				}