X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fdebug%2Fdebugger.c;h=e8d3e7a752185533339d1669a49b68aaa30492cc;hb=52f5575dc678a5f7f1b3a078dcc46b1cdbaf5182;hp=d56366c531738931a36ed021aa33624100825194;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm diff --git a/ir/debug/debugger.c b/ir/debug/debugger.c index d56366c53..e8d3e7a75 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. * @@ -33,6 +33,8 @@ #include #endif +#include "debugger.h" + #include #include #include @@ -84,7 +86,7 @@ typedef enum { /** * Reasons for node number breakpoints. */ -typedef enum _bp_reasons_t { +typedef enum bp_reasons_t { BP_ON_NEW_NODE, /**< break if node with number is created */ BP_ON_REPLACE, /**< break if node with number is replaced */ BP_ON_LOWER, /**< break if node with number is lowered */ @@ -95,12 +97,12 @@ typedef enum _bp_reasons_t { } bp_reasons_t; /** A breakpoint. */ -typedef struct _breakpoint { +typedef struct breakpoint { bp_kind kind; /**< the kind of this break point */ unsigned bpnr; /**< break point number */ int active; /**< non-zero, if this break point is active */ bp_reasons_t reason; /**< reason for the breakpoint */ - struct _breakpoint *next; /**< link to the next one */ + struct breakpoint *next; /**< link to the next one */ } breakpoint; /** A number breakpoint. */ @@ -163,14 +165,14 @@ static int is_active = 0; do { \ debugger_hooks[h].hook._##h = fkt; \ register_hook(h, &debugger_hooks[h]); \ -} while(0) +} while (0) /** unhook the hook h */ #define UNHOOK(h) \ do { \ unregister_hook(h, &debugger_hooks[h]); \ debugger_hooks[h].hook._##h = NULL; \ -} while(0) +} while (0) /** returns non-zero if a entry hook h is used */ #define IS_HOOKED(h) (debugger_hooks[h].hook._##h != NULL) @@ -185,12 +187,9 @@ do { \ #define FIRM_DBG_MINOR 0 /** for automatic detection of the debug extension */ -static const char firm_debug_info_string[] = +static const char __attribute__((used)) firm_debug_info_string[] = API_VERSION(FIRM_DBG_MAJOR, FIRM_DBG_MINOR); -/** - * Returns non-zero, if the debug extension is active - */ int firm_debug_active(void) { return is_active; @@ -204,19 +203,11 @@ static void reset_dbg_buf(void) firm_dbg_msg_buf[0] = '\0'; } /* reset_dbg_buf */ -/** - * Add text to the debug text buffer. - */ static void add_to_dbg_buf(const char *buf) { strncat(firm_dbg_msg_buf, buf, sizeof(firm_dbg_msg_buf)); } /* add_to_dbg_buf */ -/** - * Return the content of the debug text buffer. - * - * To be called from the debugger. - */ const char *firm_debug_text(void) { firm_dbg_msg_buf[sizeof(firm_dbg_msg_buf) - 1] = '\0'; @@ -263,7 +254,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(); @@ -285,7 +276,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(); @@ -306,7 +297,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(); @@ -327,7 +318,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(); @@ -343,7 +334,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(); @@ -366,7 +357,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(); @@ -378,7 +369,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(); @@ -401,7 +392,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(); @@ -431,8 +422,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); @@ -443,8 +434,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); @@ -473,7 +464,7 @@ static void update_hooks(breakpoint *bp) CASE_ON(BP_ON_NEW_ENT, new_entity); CASE_ON(BP_ON_NEW_TYPE, new_type); default: - ; + break; } } else { @@ -486,7 +477,7 @@ static void update_hooks(breakpoint *bp) CASE_OFF(BP_ON_NEW_ENT, new_entity); CASE_OFF(BP_ON_NEW_TYPE, new_type); default: - ; + break; } } #undef CASE_ON @@ -506,7 +497,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 */ @@ -533,7 +524,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 */ @@ -686,10 +677,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_verbosity_max); + dump_entity_to_file(f, (ir_entity*)firm_thing); break; case k_type: - dump_type_to_file(f, firm_thing, dump_verbosity_max); + dump_type_to_file(f, (ir_type*)firm_thing); break; case k_ir_graph: case k_ir_node: @@ -762,7 +753,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) { @@ -776,7 +767,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) { @@ -942,7 +933,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; @@ -970,7 +961,7 @@ static char next_char(void) return *lexer.curr_pos++; } /* next_char */ -#define unput() if (lexer.curr_pos < lexer.end_pos) --lexer.curr_pos +#define unput() if (lexer.curr_pos < lexer.end_pos) --lexer.curr_pos #undef MIN #define MIN(a, b) (a) < (b) ? (a) : (b) @@ -1058,15 +1049,10 @@ static unsigned get_token(void) return c; } /* get_token */ -/** - * High level function to use from debugger interface - * - * See show_commands() for supported commands. - */ void firm_debug(const char *cmd) { char name[1024], fname[1024]; - int len; + size_t len; init_lexer(cmd); @@ -1277,7 +1263,6 @@ leave: ; } /* firm_debug */ -/* creates the debugger tables */ void firm_init_debugger(void) { char *env; @@ -1306,9 +1291,6 @@ const char *gdb_node_helper(void *firm_object) return buf; } -/** - * A gdb helper function to print tarvals. - */ const char *gdb_tarval_helper(void *tv_object) { static char buf[1024];