X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fdebug%2Fdebugger.c;h=b2cafc0f12d82d5311e354985c43cc344b4a1925;hb=ed0e4ce9a109277e1a63f48f2aca7750f473bc6a;hp=a2c79c8c4653aee9d2f988d5d814eae2f5cf0e97;hpb=a1e9069afa4fa1e16e2d176bcd7905d6a1ed4677;p=libfirm diff --git a/ir/debug/debugger.c b/ir/debug/debugger.c index a2c79c8c4..b2cafc0f1 100644 --- a/ir/debug/debugger.c +++ b/ir/debug/debugger.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2010 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -39,10 +39,7 @@ #include #include #include - -#ifdef HAVE_STRINGS_H #include -#endif #include @@ -254,7 +251,7 @@ static void dbg_new_node(void *ctx, ir_graph *irg, ir_node *node) key.nr = get_irn_node_nr(node); key.bp.reason = BP_ON_NEW_NODE; - elem = set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); + elem = (bp_nr_t*)set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); if (elem && elem->bp.active) { dbg_printf("Firm BP %u reached, %+F created\n", elem->bp.bpnr, node); firm_debug_break(); @@ -276,7 +273,7 @@ static void dbg_replace(void *ctx, ir_node *old, ir_node *nw) key.nr = get_irn_node_nr(old); key.bp.reason = BP_ON_REPLACE; - elem = set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); + elem = (bp_nr_t*)set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); if (elem && elem->bp.active) { dbg_printf("Firm BP %u reached, %+F will be replaced by %+F\n", elem->bp.bpnr, old, nw); firm_debug_break(); @@ -297,7 +294,7 @@ static void dbg_lower(void *ctx, ir_node *node) key.nr = get_irn_node_nr(node); key.bp.reason = BP_ON_LOWER; - elem = set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); + elem = (bp_nr_t*)set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); if (elem && elem->bp.active) { dbg_printf("Firm BP %u reached, %+F will be lowered\n", elem->bp.bpnr, node); firm_debug_break(); @@ -318,7 +315,7 @@ static void dbg_free_graph(void *ctx, ir_graph *irg) key.nr = get_irg_graph_nr(irg); key.bp.reason = BP_ON_REMIRG; - elem = set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); + elem = (bp_nr_t*)set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); if (elem && elem->bp.active) { ir_printf("Firm BP %u reached, %+F will be deleted\n", elem->bp.bpnr, irg); firm_debug_break(); @@ -334,7 +331,7 @@ static void dbg_free_graph(void *ctx, ir_graph *irg) key.id = get_entity_ident(ent); key.bp.reason = BP_ON_REMIRG; - elem = set_find(bp_idents, &key, sizeof(key), HASH_IDENT_BP(key)); + elem = (bp_ident_t*)set_find(bp_idents, &key, sizeof(key), HASH_IDENT_BP(key)); if (elem && elem->bp.active) { dbg_printf("Firm BP %u reached, %+F will be deleted\n", elem->bp.bpnr, ent); firm_debug_break(); @@ -357,7 +354,7 @@ static void dbg_new_entity(void *ctx, ir_entity *ent) key.id = get_entity_ident(ent); key.bp.reason = BP_ON_NEW_ENT; - elem = set_find(bp_idents, &key, sizeof(key), HASH_IDENT_BP(key)); + elem = (bp_ident_t*)set_find(bp_idents, &key, sizeof(key), HASH_IDENT_BP(key)); if (elem && elem->bp.active) { ir_printf("Firm BP %u reached, %+F was created\n", elem->bp.bpnr, ent); firm_debug_break(); @@ -369,7 +366,7 @@ static void dbg_new_entity(void *ctx, ir_entity *ent) key.nr = get_entity_nr(ent); key.bp.reason = BP_ON_NEW_ENT; - elem = set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); + elem = (bp_nr_t*)set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); if (elem && elem->bp.active) { dbg_printf("Firm BP %u reached, %+F was created\n", elem->bp.bpnr, ent); firm_debug_break(); @@ -392,7 +389,7 @@ static void dbg_new_type(void *ctx, ir_type *tp) key.nr = get_type_nr(tp); key.bp.reason = BP_ON_NEW_TYPE; - elem = set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); + elem = (bp_nr_t*)set_find(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); if (elem && elem->bp.active) { ir_printf("Firm BP %u reached, %+F was created\n", elem->bp.bpnr, tp); firm_debug_break(); @@ -422,8 +419,8 @@ static const char *reason_str(bp_reasons_t reason) */ static int cmp_nr_bp(const void *elt, const void *key, size_t size) { - const bp_nr_t *e1 = elt; - const bp_nr_t *e2 = key; + const bp_nr_t *e1 = (const bp_nr_t*)elt; + const bp_nr_t *e2 = (const bp_nr_t*)key; (void) size; return (e1->nr - e2->nr) | (e1->bp.reason - e2->bp.reason); @@ -434,8 +431,8 @@ static int cmp_nr_bp(const void *elt, const void *key, size_t size) */ static int cmp_ident_bp(const void *elt, const void *key, size_t size) { - const bp_ident_t *e1 = elt; - const bp_ident_t *e2 = key; + const bp_ident_t *e1 = (const bp_ident_t*)elt; + const bp_ident_t *e2 = (const bp_ident_t*)key; (void) size; return (e1->id != e2->id) | (e1->bp.reason - e2->bp.reason); @@ -497,7 +494,7 @@ static void break_on_nr(long nr, bp_reasons_t reason) key.bp.reason = reason; key.nr = nr; - elem = set_insert(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); + elem = (bp_nr_t*)set_insert(bp_numbers, &key, sizeof(key), HASH_NR_BP(key)); if (elem->bp.bpnr == 0) { /* new break point */ @@ -524,7 +521,7 @@ static void break_on_ident(const char *name, bp_reasons_t reason) key.bp.reason = reason; key.id = new_id_from_str(name); - elem = set_insert(bp_idents, &key, sizeof(key), HASH_IDENT_BP(key)); + elem = (bp_ident_t*)set_insert(bp_idents, &key, sizeof(key), HASH_IDENT_BP(key)); if (elem->bp.bpnr == 0) { /* new break point */ @@ -677,10 +674,10 @@ static void show_firm_object(void *firm_thing) fprintf(f, "BAD: (%p)\n", firm_thing); break; case k_entity: - dump_entity_to_file(f, firm_thing); + dump_entity_to_file(f, (ir_entity*)firm_thing); break; case k_type: - dump_type_to_file(f, firm_thing); + dump_type_to_file(f, (ir_type*)firm_thing); break; case k_ir_graph: case k_ir_node: @@ -753,7 +750,7 @@ typedef struct find_env { */ static void check_ent_nr(type_or_ent tore, void *ctx) { - find_env_t *env = ctx; + find_env_t *env = (find_env_t*)ctx; if (is_entity(tore.ent)) { if (get_entity_nr(tore.ent) == env->u.nr) { @@ -767,7 +764,7 @@ static void check_ent_nr(type_or_ent tore, void *ctx) */ static void check_ent_name(type_or_ent tore, void *ctx) { - find_env_t *env = ctx; + find_env_t *env = (find_env_t*)ctx; if (is_entity(tore.ent)) if (strcmp(get_entity_name(tore.ent), env->u.name) == 0) { @@ -933,7 +930,7 @@ static struct lexer { unsigned cur_token; /**< current token. */ unsigned number; /**< current token attribute. */ const char *s; /**< current token attribute. */ - unsigned len; /**< current token attribute. */ + size_t len; /**< current token attribute. */ const char *curr_pos; const char *end_pos; @@ -1052,7 +1049,7 @@ static unsigned get_token(void) void firm_debug(const char *cmd) { char name[1024], fname[1024]; - int len; + size_t len; init_lexer(cmd);