X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fdebug%2Fdebugger.c;h=91bfc236c45b9db36cdf065999dc5f51550884c3;hb=dd4cd761ab637d4488c7e29f49843b1b02366acf;hp=c4c375deeb6ca2d5ad67eb5b6ccba119b6f062ad;hpb=09f030384e26ac3cf076aefb99903cd8b918a580;p=libfirm

diff --git a/ir/debug/debugger.c b/ir/debug/debugger.c
index c4c375dee..91bfc236c 100644
--- a/ir/debug/debugger.c
+++ b/ir/debug/debugger.c
@@ -36,7 +36,6 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#define strncasecmp strnicmp
 #endif
 
 #ifdef HAVE_STDLIB_H
@@ -64,6 +63,7 @@
 #include "irdump.h"
 #include "iredges_t.h"
 #include "debug.h"
+#include "error.h"
 
 #ifdef _WIN32
 /* Break into the debugger. The Win32 way. */
@@ -436,9 +436,9 @@ static const char *reason_str(bp_reasons_t reason)
 	case BP_ON_REMIRG:   return "removing IRG";
 	case BP_ON_NEW_ENT:  return "entity creation";
 	case BP_ON_NEW_TYPE: return "type creation";
-	default:             assert(0);
+	case BP_MAX_REASON:  break;
 	}
-	return "unknown";
+	panic("unsupported reason");
 }  /* reason_str */
 
 /**
@@ -765,26 +765,25 @@ typedef struct find_env {
 /**
  * Type-walker: Find an entity with given number.
  */
-static void check_ent_nr(type_or_ent *tore, void *ctx) {
-	ir_entity *ent = (ir_entity *)tore;
+static void check_ent_nr(type_or_ent tore, void *ctx) {
 	find_env_t *env = ctx;
 
-	if (is_entity(ent))
-		if (get_entity_nr(ent) == env->u.nr) {
-			env->res = ent;
+	if (is_entity(tore.ent)) {
+		if (get_entity_nr(tore.ent) == env->u.nr) {
+			env->res = tore.ent;
 		}
+	}
 }  /* check_ent_nr */
 
 /**
  * Type-walker: Find an entity with given name.
  */
-static void check_ent_name(type_or_ent *tore, void *ctx) {
-	ir_entity *ent = (ir_entity *)tore;
+static void check_ent_name(type_or_ent tore, void *ctx) {
 	find_env_t *env = ctx;
 
-	if (is_entity(ent))
-		if (strcmp(get_entity_name(ent), env->u.name) == 0) {
-			env->res = ent;
+	if (is_entity(tore.ent))
+		if (strcmp(get_entity_name(tore.ent), env->u.name) == 0) {
+			env->res = tore.ent;
 		}
 }  /* check_ent_name */
 
@@ -815,11 +814,11 @@ static ir_entity *find_entity_name(const char *name) {
 /**
  * Search methods for a name.
  */
-static void show_by_name(type_or_ent *tore, void *env) {
+static void show_by_name(type_or_ent tore, void *env) {
 	ident *id = (ident *)env;
 
-	if (is_entity(tore)) {
-		ir_entity *ent = (ir_entity *)tore;
+	if (is_entity(tore.ent)) {
+		ir_entity *ent = tore.ent;
 
 		if (is_method_entity(ent)) {
 			if (get_entity_ident(ent) == id) {
@@ -843,11 +842,11 @@ static void show_by_name(type_or_ent *tore, void *env) {
 /**
  * Search methods for a ldname.
  */
-static void show_by_ldname(type_or_ent *tore, void *env) {
+static void show_by_ldname(type_or_ent tore, void *env) {
 	ident *id = (ident *)env;
 
-	if (is_entity(tore)) {
-		ir_entity *ent = (ir_entity *)tore;
+	if (is_entity(tore.ent)) {
+		ir_entity *ent = tore.ent;
 
 		if (is_method_entity(ent)) {
 			if (get_entity_ld_ident(ent) == id) {