support negative number, so we can set all bits of a debug mask with -1
[libfirm] / ir / debug / debugger.c
index d74f2bb..31689e6 100644 (file)
@@ -6,18 +6,20 @@
  * Modified by:
  * Created:     2005
  * CVS-ID:      $Id$
- * Copyright:   (c) 2001-2006 Universität Karlsruhe
+ * Copyright:   (c) 2001-2007 Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifndef NDEBUG
+#ifdef DEBUG_libfirm
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+
+#define strncasecmp strnicmp
 #endif
 
 #ifdef HAVE_STDLIB_H
 #ifdef _WIN32
 /* Break into the debugger. The Win32 way. */
 void firm_debug_break(void) {
-  DebugBreak();
+       DebugBreak();
 }
 #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64))
 /* Break into the debugger. The ia32/x86_64 way under GCC. */
 void firm_debug_break(void) {
-  __asm__ __volatile__("int3");
+       __asm__ __volatile__("int3");
 }
 #else
 /* Break into the debugger. Poor Unix way. */
 void firm_debug_break(void) {
-  raise(SIGINT);
+       raise(SIGINT);
 }
 #endif /* _WIN32 */
 
 /** supported breakpoint kinds */
 typedef enum {
-  BP_NR    = 'n',   /**< break on node number. */
-  BP_IDENT = 'i'    /**< break on ident. */
+       BP_NR    = 'n',   /**< break on node number. */
+       BP_IDENT = 'i'    /**< break on ident. */
 } bp_kind;
 
 /**
  * Reasons for node number breakpoints.
  */
 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 */
-  BP_ON_REMIRG,      /**< break if an IRG is removed */
-  BP_ON_NEW_ENT,     /**< break if a new entity is created */
-  BP_ON_NEW_TYPE,    /**< break if a new type is created */
-  BP_MAX_REASON
+       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 */
+       BP_ON_REMIRG,      /**< break if an IRG is removed */
+       BP_ON_NEW_ENT,     /**< break if a new entity is created */
+       BP_ON_NEW_TYPE,    /**< break if a new type is created */
+       BP_MAX_REASON
 } bp_reasons_t;
 
 /** A 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 */
+       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 */
 } breakpoint;
 
 /** A number breakpoint. */
 typedef struct {
-  breakpoint   bp;       /**< the breakpoint data */
-  long         nr;       /**< the node number */
+       breakpoint   bp;       /**< the breakpoint data */
+       long         nr;       /**< the node number */
 } bp_nr_t;
 
 /** Calculate the hash value for a node breakpoint. */
@@ -99,8 +101,8 @@ typedef struct {
 
 /** An ident breakpoint. */
 typedef struct {
-  breakpoint   bp;       /**< the breakpoint data */
-  ident        *id;      /**< the ident */
+       breakpoint   bp;       /**< the breakpoint data */
+       ident        *id;      /**< the ident */
 } bp_ident_t;
 
 /** Calculate the hash value for an ident breakpoint. */
@@ -145,16 +147,16 @@ static int is_active = 0;
 
 /** hook the hook h with function fkt. */
 #define HOOK(h, fkt) \
-do {                                    \
-  debugger_hooks[h].hook._##h = fkt;    \
-  register_hook(h, &debugger_hooks[h]); \
+do {                                      \
+       debugger_hooks[h].hook._##h = fkt;    \
+       register_hook(h, &debugger_hooks[h]); \
 } while(0)
 
 /** unhook the hook h */
 #define UNHOOK(h) \
-do {                                      \
-  unregister_hook(h, &debugger_hooks[h]); \
-  debugger_hooks[h].hook._##h = NULL;     \
+do {                                        \
+       unregister_hook(h, &debugger_hooks[h]); \
+       debugger_hooks[h].hook._##h = NULL;     \
 } while(0)
 
 /** returns non-zero if a entry hook h is used */
@@ -171,28 +173,27 @@ do {                                      \
 
 /** for automatic detection of the debug extension */
 static const char *firm_debug_info_string =
-  API_VERSION(FIRM_DBG_MAJOR, FIRM_DBG_MINOR)
-  ;
+       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;
+       return is_active;
 }  /* firm_debug_active */
 
 /**
  * Reset the debug text buffer.
  */
 static void reset_dbg_buf(void) {
-  firm_dbg_msg_buf[0] = '\0';
+       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));
+       strncat(firm_dbg_msg_buf, buf, sizeof(firm_dbg_msg_buf));
 }  /* add_to_dbg_buf */
 
 /**
@@ -201,8 +202,8 @@ static void add_to_dbg_buf(const char *buf) {
  * To be called from the debugger.
  */
 const char *firm_debug_text(void) {
-  firm_dbg_msg_buf[sizeof(firm_dbg_msg_buf) - 1] = '\0';
-  return firm_dbg_msg_buf;
+       firm_dbg_msg_buf[sizeof(firm_dbg_msg_buf) - 1] = '\0';
+       return firm_dbg_msg_buf;
 }  /* firm_debug_text */
 
 /**
@@ -210,23 +211,23 @@ const char *firm_debug_text(void) {
  */
 static void dbg_printf(const char *fmt, ...)
 {
-  char buf[1024];
+       char buf[1024];
 
-  va_list args;
-  va_start(args, fmt);
+       va_list args;
+       va_start(args, fmt);
 
-  if (fmt[0] != '+')
-    reset_dbg_buf();
-  else
-    ++fmt;
+       if (fmt[0] != '+')
+               reset_dbg_buf();
+       else
+               ++fmt;
 
-  ir_vsnprintf(buf, sizeof(buf), fmt, args);
-  va_end(args);
+       ir_vsnprintf(buf, sizeof(buf), fmt, args);
+       va_end(args);
 
-  if (redir_output)
-    add_to_dbg_buf(buf);
-  else
-    puts(buf);
+       if (redir_output)
+               add_to_dbg_buf(buf);
+       else
+               puts(buf);
 }  /* dbg_printf */
 
 /**
@@ -238,16 +239,16 @@ static void dbg_printf(const char *fmt, ...)
  */
 static void dbg_new_node(void *ctx, ir_graph *irg, ir_node *node)
 {
-  bp_nr_t key, *elem;
+       bp_nr_t key, *elem;
 
-  key.nr        = get_irn_node_nr(node);
-  key.bp.reason = BP_ON_NEW_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));
-  if (elem && elem->bp.active) {
-    dbg_printf("Firm BP %u reached, %+F created\n", elem->bp.bpnr, node);
-    firm_debug_break();
-  }
+       elem = 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();
+       }
 }  /* dbg_new_node */
 
 /**
@@ -259,16 +260,16 @@ static void dbg_new_node(void *ctx, ir_graph *irg, ir_node *node)
  */
 static void dbg_replace(void *ctx, ir_node *old, ir_node *nw)
 {
-  bp_nr_t key, *elem;
+       bp_nr_t key, *elem;
 
-  key.nr        = get_irn_node_nr(old);
-  key.bp.reason = BP_ON_REPLACE;
+       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));
-  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();
-  }
+       elem = 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();
+       }
 }  /* dbg_replace */
 
 /**
@@ -279,16 +280,16 @@ static void dbg_replace(void *ctx, ir_node *old, ir_node *nw)
  */
 static void dbg_lower(void *ctx, ir_node *node)
 {
-  bp_nr_t key, *elem;
+       bp_nr_t key, *elem;
 
-  key.nr        = get_irn_node_nr(node);
-  key.bp.reason = BP_ON_LOWER;
+       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));
-  if (elem && elem->bp.active) {
-    dbg_printf("Firm BP %u reached, %+F will be lowered\n", elem->bp.bpnr, node);
-    firm_debug_break();
-  }
+       elem = 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();
+       }
 }  /* dbg_lower */
 
 /**
@@ -299,33 +300,33 @@ static void dbg_lower(void *ctx, ir_node *node)
  */
 static void dbg_free_graph(void *ctx, ir_graph *irg)
 {
-  {
-    bp_nr_t key, *elem;
-    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));
-    if (elem && elem->bp.active) {
-      ir_printf("Firm BP %u reached, %+F will be deleted\n", elem->bp.bpnr, irg);
-      firm_debug_break();
-    }
-  }
-  {
-    bp_ident_t key, *elem;
-    entity *ent = get_irg_entity(irg);
-
-    if (! ent)
-      return;
-
-    key.id        = get_entity_ident(ent);
-    key.bp.reason = BP_ON_REMIRG;
-
-    elem = 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();
-    }
-  }
+       {
+               bp_nr_t key, *elem;
+               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));
+               if (elem && elem->bp.active) {
+                       ir_printf("Firm BP %u reached, %+F will be deleted\n", elem->bp.bpnr, irg);
+                       firm_debug_break();
+               }
+       }
+       {
+               bp_ident_t key, *elem;
+               ir_entity *ent = get_irg_entity(irg);
+
+               if (! ent)
+                       return;
+
+               key.id        = get_entity_ident(ent);
+               key.bp.reason = BP_ON_REMIRG;
+
+               elem = 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();
+               }
+       }
 }  /* dbg_free_graph */
 
 /**
@@ -334,32 +335,32 @@ static void dbg_free_graph(void *ctx, ir_graph *irg)
  * @param ctx   the hook context
  * @param ent   the newly created entity
  */
-static void dbg_new_entity(void *ctx, entity *ent)
+static void dbg_new_entity(void *ctx, ir_entity *ent)
 {
-  {
-    bp_ident_t key, *elem;
-
-    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));
-    if (elem && elem->bp.active) {
-      ir_printf("Firm BP %u reached, %+F was created\n", elem->bp.bpnr, ent);
-      firm_debug_break();
-    }
-  }
-  {
-    bp_nr_t key, *elem;
-
-    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));
-    if (elem && elem->bp.active) {
-      dbg_printf("Firm BP %u reached, %+F was created\n", elem->bp.bpnr, ent);
-      firm_debug_break();
-    }
-  }
+       {
+               bp_ident_t key, *elem;
+
+               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));
+               if (elem && elem->bp.active) {
+                       ir_printf("Firm BP %u reached, %+F was created\n", elem->bp.bpnr, ent);
+                       firm_debug_break();
+               }
+       }
+       {
+               bp_nr_t key, *elem;
+
+               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));
+               if (elem && elem->bp.active) {
+                       dbg_printf("Firm BP %u reached, %+F was created\n", elem->bp.bpnr, ent);
+                       firm_debug_break();
+               }
+       }
 }  /* dbg_new_entity */
 
 /**
@@ -370,30 +371,30 @@ static void dbg_new_entity(void *ctx, entity *ent)
  */
 static void dbg_new_type(void *ctx, ir_type *tp)
 {
-  {
-    bp_nr_t key, *elem;
-
-    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));
-    if (elem && elem->bp.active) {
-      ir_printf("Firm BP %u reached, %+F was created\n", elem->bp.bpnr, 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();
-    }
-  }
+       {
+               bp_nr_t key, *elem;
+
+               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));
+               if (elem && elem->bp.active) {
+                       ir_printf("Firm BP %u reached, %+F was created\n", elem->bp.bpnr, 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 */
 
 /**
@@ -401,16 +402,16 @@ static void dbg_new_type(void *ctx, ir_type *tp)
  */
 static const char *reason_str(bp_reasons_t reason)
 {
-  switch (reason) {
-  case BP_ON_NEW_NODE: return "node creation";
-  case BP_ON_REPLACE:  return "node replace";
-  case BP_ON_LOWER:    return "node lowering";
-  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);
-  }
-  return "unknown";
+       switch (reason) {
+       case BP_ON_NEW_NODE: return "node creation";
+       case BP_ON_REPLACE:  return "node replace";
+       case BP_ON_LOWER:    return "node lowering";
+       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);
+       }
+       return "unknown";
 }  /* reason_str */
 
 /**
@@ -418,10 +419,10 @@ 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 = elt;
+       const bp_nr_t *e2 = key;
 
-  return (e1->nr - e2->nr) | (e1->bp.reason - e2->bp.reason);
+       return (e1->nr - e2->nr) | (e1->bp.reason - e2->bp.reason);
 }  /* cmp_nr_bp */
 
 /**
@@ -429,10 +430,10 @@ 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 = elt;
+       const bp_ident_t *e2 = key;
 
-  return (e1->id != e2->id) | (e1->bp.reason - e2->bp.reason);
+       return (e1->id != e2->id) | (e1->bp.reason - e2->bp.reason);
 }  /* cmp_ident_bp */
 
 /**
@@ -443,37 +444,37 @@ static void update_hooks(breakpoint *bp)
 #define CASE_ON(a, b)  case a: if (! IS_HOOKED(hook_##b)) HOOK(hook_##b, dbg_##b); break
 #define CASE_OFF(a, b) case a: if (IS_HOOKED(hook_##b)) UNHOOK(hook_##b); break
 
-  if (bp->active)
-    ++num_active_bp[bp->reason];
-  else
-    --num_active_bp[bp->reason];
-
-  if (num_active_bp[bp->reason] > 0) {
-    /* register the hooks on demand */
-    switch (bp->reason) {
-    CASE_ON(BP_ON_NEW_NODE, new_node);
-    CASE_ON(BP_ON_REPLACE, replace);
-    CASE_ON(BP_ON_LOWER, lower);
-    CASE_ON(BP_ON_REMIRG, free_graph);
-    CASE_ON(BP_ON_NEW_ENT, new_entity);
-    CASE_ON(BP_ON_NEW_TYPE, new_type);
-    default:
-      ;
-    }
-  }
-  else {
-    /* unregister the hook on demand */
-    switch (bp->reason) {
-    CASE_OFF(BP_ON_NEW_NODE, new_node);
-    CASE_OFF(BP_ON_REPLACE, replace);
-    CASE_OFF(BP_ON_LOWER, lower);
-    CASE_OFF(BP_ON_REMIRG, free_graph);
-    CASE_OFF(BP_ON_NEW_ENT, new_entity);
-    CASE_OFF(BP_ON_NEW_TYPE, new_type);
-    default:
-      ;
-    }
-  }
+       if (bp->active)
+               ++num_active_bp[bp->reason];
+       else
+               --num_active_bp[bp->reason];
+
+       if (num_active_bp[bp->reason] > 0) {
+               /* register the hooks on demand */
+               switch (bp->reason) {
+               CASE_ON(BP_ON_NEW_NODE, new_node);
+               CASE_ON(BP_ON_REPLACE, replace);
+               CASE_ON(BP_ON_LOWER, lower);
+               CASE_ON(BP_ON_REMIRG, free_graph);
+               CASE_ON(BP_ON_NEW_ENT, new_entity);
+               CASE_ON(BP_ON_NEW_TYPE, new_type);
+               default:
+                       ;
+               }
+       }
+       else {
+               /* unregister the hook on demand */
+               switch (bp->reason) {
+               CASE_OFF(BP_ON_NEW_NODE, new_node);
+               CASE_OFF(BP_ON_REPLACE, replace);
+               CASE_OFF(BP_ON_LOWER, lower);
+               CASE_OFF(BP_ON_REMIRG, free_graph);
+               CASE_OFF(BP_ON_NEW_ENT, new_entity);
+               CASE_OFF(BP_ON_NEW_TYPE, new_type);
+               default:
+                       ;
+               }
+       }
 #undef CASE_ON
 #undef CASE_OFF
 }  /* update_hooks */
@@ -483,52 +484,52 @@ static void update_hooks(breakpoint *bp)
  */
 static void break_on_nr(long nr, bp_reasons_t reason)
 {
-  bp_nr_t key, *elem;
+       bp_nr_t key, *elem;
 
-  key.bp.kind   = BP_NR;
-  key.bp.bpnr   = 0;
-  key.bp.active = 1;
-  key.bp.reason = reason;
-  key.nr        = nr;
+       key.bp.kind   = BP_NR;
+       key.bp.bpnr   = 0;
+       key.bp.active = 1;
+       key.bp.reason = reason;
+       key.nr        = nr;
 
-  elem = set_insert(bp_numbers, &key, sizeof(key), HASH_NR_BP(key));
+       elem = set_insert(bp_numbers, &key, sizeof(key), HASH_NR_BP(key));
 
-  if (elem->bp.bpnr == 0) {
-    /* new break point */
-    elem->bp.bpnr = ++bp_num;
-    elem->bp.next = bp_list;
-    bp_list = &elem->bp;
+       if (elem->bp.bpnr == 0) {
+               /* new break point */
+               elem->bp.bpnr = ++bp_num;
+               elem->bp.next = bp_list;
+               bp_list = &elem->bp;
 
-    dbg_printf("Firm BP %u: %s of Nr %ld\n", elem->bp.bpnr, reason_str(reason), nr);
+               dbg_printf("Firm BP %u: %s of Nr %ld\n", elem->bp.bpnr, reason_str(reason), nr);
 
-    update_hooks(&elem->bp);
-  }
+               update_hooks(&elem->bp);
+       }
 }  /* break_on_nr */
 
 /**
  * Break if ident name is reached.
  */
 static void break_on_ident(const char *name, bp_reasons_t reason) {
-  bp_ident_t key, *elem;
+       bp_ident_t key, *elem;
 
-  key.bp.kind   = BP_IDENT;
-  key.bp.bpnr   = 0;
-  key.bp.active = 1;
-  key.bp.reason = reason;
-  key.id        = new_id_from_str(name);
+       key.bp.kind   = BP_IDENT;
+       key.bp.bpnr   = 0;
+       key.bp.active = 1;
+       key.bp.reason = reason;
+       key.id        = new_id_from_str(name);
 
-  elem = set_insert(bp_idents, &key, sizeof(key), HASH_IDENT_BP(key));
+       elem = set_insert(bp_idents, &key, sizeof(key), HASH_IDENT_BP(key));
 
-  if (elem->bp.bpnr == 0) {
-    /* new break point */
-    elem->bp.bpnr = ++bp_num;
-    elem->bp.next = bp_list;
-    bp_list = &elem->bp;
+       if (elem->bp.bpnr == 0) {
+               /* new break point */
+               elem->bp.bpnr = ++bp_num;
+               elem->bp.next = bp_list;
+               bp_list = &elem->bp;
 
-    dbg_printf("Firm BP %u: %s of ident \"%s\"\n", elem->bp.bpnr, reason_str(reason), name);
+               dbg_printf("Firm BP %u: %s of ident \"%s\"\n", elem->bp.bpnr, reason_str(reason), name);
 
-    update_hooks(&elem->bp);
-  }
+               update_hooks(&elem->bp);
+       }
 }  /* break_on_ident */
 
 /**
@@ -536,20 +537,20 @@ static void break_on_ident(const char *name, bp_reasons_t reason) {
  */
 static void bp_activate(unsigned bp, int active)
 {
-  breakpoint *p;
-
-  for (p = bp_list; p; p = p->next) {
-    if (p->bpnr == bp) {
-      if (p->active != active) {
-        p->active = active;
-        update_hooks(p);
-      }
-
-      dbg_printf("Firm BP %u is now %s\n", bp, active ? "enabled" : "disabled");
-      return;
-    }
-  }
-  dbg_printf("Error: Firm BP %u not exists.\n", bp);
+       breakpoint *p;
+
+       for (p = bp_list; p; p = p->next) {
+               if (p->bpnr == bp) {
+                       if (p->active != active) {
+                               p->active = active;
+                               update_hooks(p);
+                       }
+
+                       dbg_printf("Firm BP %u is now %s\n", bp, active ? "enabled" : "disabled");
+                       return;
+               }
+       }
+       dbg_printf("Error: Firm BP %u not exists.\n", bp);
 }  /* bp_activate */
 
 
@@ -557,57 +558,57 @@ static void bp_activate(unsigned bp, int active)
  * Show a list of supported commands
  */
 static void show_commands(void) {
-  dbg_printf("Internal Firm debugger extension $Revision$ commands:\n"
-    ".init                  break after initialization\n"
-    ".create nr             break if node nr was created\n"
-    ".replace nr            break if node nr is replaced by another node\n"
-    ".lower nr              break before node nr is lowered\n"
-    ".remirg nr|name        break if the irg of nr or entity name is deleted\n"
-    ".newent nr|name        break if the entity nr or name was created\n"
-    ".newtype nr|name       break if the type nr or name was created\n"
-    ".bp                    show all breakpoints\n"
-    ".enable nr             enable breakpoint nr\n"
-    ".disable nr            disable breakpoint nr\n"
-    ".showtype nr|name      show content of the type nr or name\n"
-    ".showent nr|name       show content of the entity nr or name\n"
-    ".setmask name msk      sets the debug module name to mask msk\n"
-    ".setlvl  name lvl      sets the debug module name to level lvl\n"
-    ".setoutfile name file  redirects debug output of module name to file\n"
-    ".irgname name          prints address and graph number of a method given by its name\n"
-    ".irgldname ldname      prints address and graph number of a method given by its ldname\n"
-    ".help                  list all commands\n"
-  );
+       dbg_printf("Internal Firm debugger extension $Revision$ commands:\n"
+               ".init                  break after initialization\n"
+               ".create nr             break if node nr was created\n"
+               ".replace nr            break if node nr is replaced by another node\n"
+               ".lower nr              break before node nr is lowered\n"
+               ".remirg nr|name        break if the irg of nr or entity name is deleted\n"
+               ".newent nr|name        break if the entity nr or name was created\n"
+               ".newtype nr|name       break if the type nr or name was created\n"
+               ".bp                    show all breakpoints\n"
+               ".enable nr             enable breakpoint nr\n"
+               ".disable nr            disable breakpoint nr\n"
+               ".showtype nr|name      show content of the type nr or name\n"
+               ".showent nr|name       show content of the entity nr or name\n"
+               ".setmask name msk      sets the debug module name to mask msk\n"
+               ".setlvl  name lvl      sets the debug module name to level lvl\n"
+               ".setoutfile name file  redirects debug output of module name to file\n"
+               ".irgname name          prints address and graph number of a method given by its name\n"
+               ".irgldname ldname      prints address and graph number of a method given by its ldname\n"
+               ".help                  list all commands\n"
+               );
 }  /* show_commands */
 
 /**
  * Shows all Firm breakpoints.
  */
 static void show_bp(void) {
-  breakpoint *p;
-  bp_nr_t  *node_p;
-  bp_ident_t *ident_p;
-  int have_one = 0;
-
-  dbg_printf("Firm Breakpoints:");
-  for (p = bp_list; p; p = p->next) {
-    have_one = 1;
-    dbg_printf("+\n  BP %u: ", p->bpnr);
-
-    switch (p->kind) {
-    case BP_NR:
-      node_p = (bp_nr_t *)p;
-      dbg_printf("%s of Nr %ld ", reason_str(p->reason), node_p->nr);
-      break;
-
-    case BP_IDENT:
-      ident_p = (bp_ident_t *)p;
-      dbg_printf("+%s of ident \"%s\" ", reason_str(p->reason), get_id_str(ident_p->id));
-      break;
-    }
-
-    dbg_printf(p->active ? "+enabled" : "+disabled");
-  }
-  dbg_printf(have_one ? "+\n" : "+ NONE\n");
+       breakpoint *p;
+       bp_nr_t  *node_p;
+       bp_ident_t *ident_p;
+       int have_one = 0;
+
+       dbg_printf("Firm Breakpoints:");
+       for (p = bp_list; p; p = p->next) {
+               have_one = 1;
+               dbg_printf("+\n  BP %u: ", p->bpnr);
+
+               switch (p->kind) {
+               case BP_NR:
+                       node_p = (bp_nr_t *)p;
+                       dbg_printf("%s of Nr %ld ", reason_str(p->reason), node_p->nr);
+                       break;
+
+               case BP_IDENT:
+                       ident_p = (bp_ident_t *)p;
+                       dbg_printf("+%s of ident \"%s\" ", reason_str(p->reason), get_id_str(ident_p->id));
+                       break;
+               }
+
+               dbg_printf(p->active ? "+enabled" : "+disabled");
+       }
+       dbg_printf(have_one ? "+\n" : "+ NONE\n");
 }  /* show_bp */
 
 /**
@@ -615,9 +616,9 @@ static void show_bp(void) {
  * So we need this little helper function
  */
 static firm_dbg_module_t *dbg_register(const char *name) {
-  ident *id = new_id_from_str(name);
+       ident *id = new_id_from_str(name);
 
-  return firm_dbg_register(get_id_str(id));
+       return firm_dbg_register(get_id_str(id));
 }  /* dbg_register */
 
 /**
@@ -625,13 +626,13 @@ static firm_dbg_module_t *dbg_register(const char *name) {
  */
 static void set_dbg_level(const char *name, unsigned lvl)
 {
-  firm_dbg_module_t *module = dbg_register(name);
+       firm_dbg_module_t *module = dbg_register(name);
 
-  if (firm_dbg_get_mask(module) != lvl) {
-    firm_dbg_set_mask(module, lvl);
+       if (firm_dbg_get_mask(module) != lvl) {
+               firm_dbg_set_mask(module, lvl);
 
-    dbg_printf("Setting debug mask of module %s to %u\n", name, lvl);
-  }
+               dbg_printf("Setting debug mask of module %s to %u\n", name, lvl);
+       }
 }  /* set_dbg_level */
 
 /**
@@ -639,223 +640,406 @@ static void set_dbg_level(const char *name, unsigned lvl)
  */
 static void set_dbg_outfile(const char *name, const char *fname)
 {
-  firm_dbg_module_t *module = dbg_register(name);
-  FILE *f = fopen(fname, "w");
+       firm_dbg_module_t *module = dbg_register(name);
+       FILE *f = fopen(fname, "w");
 
-  if (! f) {
-    perror(fname);
-    return;
-  }
+       if (! f) {
+               perror(fname);
+               return;
+       }
 
-  firm_dbg_set_file(module, f);
-  dbg_printf("Redirecting debug output of module %s to file %s\n", name, fname);
+       firm_dbg_set_file(module, f);
+       dbg_printf("Redirecting debug output of module %s to file %s\n", name, fname);
 }  /* set_dbg_outfile */
 
 /**
  * Show info about a firm thing.
  */
 static void show_firm_object(void *firm_thing) {
-  FILE *f = stdout;
-
-  if (firm_thing == NULL) {
-    fprintf(f, "<NULL>\n");
-    return;
-  }
-  switch (get_kind(firm_thing)) {
-  case k_BAD:
-    fprintf(f, "BAD: (%p)\n", firm_thing);
-    break;
-  case k_entity:
-    dump_entity_to_file(f, firm_thing, dump_verbosity_max);
-    break;
-  case k_type:
-    dump_type_to_file(f, firm_thing, dump_verbosity_max);
-    break;
-  case k_ir_graph:
-  case k_ir_node:
-  case k_ir_mode:
-  case k_ir_op:
-  case k_tarval:
-  case k_ir_loop:
-  case k_ir_compound_graph_path:
-  case k_ir_extblk:
-  case k_ir_prog:
-    fprintf(f, "NIY\n");
-    break;
-  default:
-    fprintf(f, "Cannot identify thing at (%p).\n", firm_thing);
-  }
+       FILE *f = stdout;
+
+       if (firm_thing == NULL) {
+               fprintf(f, "<NULL>\n");
+               return;
+       }
+       switch (get_kind(firm_thing)) {
+       case k_BAD:
+               fprintf(f, "BAD: (%p)\n", firm_thing);
+               break;
+       case k_entity:
+               dump_entity_to_file(f, firm_thing, dump_verbosity_max);
+               break;
+       case k_type:
+               dump_type_to_file(f, firm_thing, dump_verbosity_max);
+               break;
+       case k_ir_graph:
+       case k_ir_node:
+       case k_ir_mode:
+       case k_ir_op:
+       case k_tarval:
+       case k_ir_loop:
+       case k_ir_compound_graph_path:
+       case k_ir_extblk:
+       case k_ir_prog:
+               fprintf(f, "NIY\n");
+               break;
+       default:
+               fprintf(f, "Cannot identify thing at (%p).\n", firm_thing);
+       }
 }  /* show_firm_object */
 
 /**
  * Find a firm type by its number.
  */
 static ir_type *find_type_nr(long nr) {
-  int i, n = get_irp_n_types();
-  ir_type *tp;
-
-  for (i = 0; i < n; ++i) {
-    tp = get_irp_type(i);
-    if (get_type_nr(tp) == nr)
-      return tp;
-  }
-  tp = get_glob_type();
-  if (get_type_nr(tp) == nr)
-    return tp;
-  return NULL;
+       int i, n = get_irp_n_types();
+       ir_type *tp;
+
+       for (i = 0; i < n; ++i) {
+               tp = get_irp_type(i);
+               if (get_type_nr(tp) == nr)
+                       return tp;
+       }
+       tp = get_glob_type();
+       if (get_type_nr(tp) == nr)
+               return tp;
+       return NULL;
 }  /* find_type_nr */
 
 /**
  * Find a firm type by its name.
  */
 static ir_type *find_type_name(const char *name) {
-  int i, n = get_irp_n_types();
-  ir_type *tp;
-
-  for (i = 0; i < n; ++i) {
-    tp = get_irp_type(i);
-    if (strcmp(get_type_name(tp), name) == 0)
-      return tp;
-  }
-  tp = get_glob_type();
-  if (strcmp(get_type_name(tp), name) == 0)
-    return tp;
-  return NULL;
+       int i, n = get_irp_n_types();
+       ir_type *tp;
+
+       for (i = 0; i < n; ++i) {
+               tp = get_irp_type(i);
+               if (strcmp(get_type_name(tp), name) == 0)
+                       return tp;
+       }
+       tp = get_glob_type();
+       if (strcmp(get_type_name(tp), name) == 0)
+               return tp;
+       return NULL;
 }  /* find_type_name */
 
 /** The environment for the entity search functions. */
 typedef struct find_env {
-  union {
-    long        nr;   /**< the number that is searched for */
-    const char *name; /**< the name that is searched for */
-  } u;
-  entity *res;        /**< the result */
+       union {
+               long        nr;   /**< the number that is searched for */
+               const char *name; /**< the name that is searched for */
+       } u;
+       ir_entity *res;     /**< the result */
 } find_env_t;
 
 /**
  * Type-walker: Find an entity with given number.
  */
 static void check_ent_nr(type_or_ent *tore, void *ctx) {
-  entity *ent = (entity *)tore;
-  find_env_t *env = ctx;
+       ir_entity *ent = (ir_entity *)tore;
+       find_env_t *env = ctx;
 
-  if (is_entity(ent))
-    if (get_entity_nr(ent) == env->u.nr) {
-      env->res = ent;
-    }
+       if (is_entity(ent))
+               if (get_entity_nr(ent) == env->u.nr) {
+                       env->res = ent;
+               }
 }  /* check_ent_nr */
 
 /**
  * Type-walker: Find an entity with given name.
  */
 static void check_ent_name(type_or_ent *tore, void *ctx) {
-  entity *ent = (entity *)tore;
-  find_env_t *env = ctx;
+       ir_entity *ent = (ir_entity *)tore;
+       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(ent))
+               if (strcmp(get_entity_name(ent), env->u.name) == 0) {
+                       env->res = ent;
+               }
 }  /* check_ent_name */
 
 /**
  * Find a firm entity by its number.
  */
-static entity *find_entity_nr(long nr) {
-  find_env_t env;
+static ir_entity *find_entity_nr(long nr) {
+       find_env_t env;
 
-  env.u.nr = nr;
-  env.res  = NULL;
-  type_walk(check_ent_nr, NULL, &env);
-  return env.res;
+       env.u.nr = nr;
+       env.res  = NULL;
+       type_walk(check_ent_nr, NULL, &env);
+       return env.res;
 }  /* find_entity_nr */
 
 /**
  * Find a firm entity by its name.
  */
-static entity *find_entity_name(const char *name) {
-  find_env_t env;
+static ir_entity *find_entity_name(const char *name) {
+       find_env_t env;
 
-  env.u.name = name;
-  env.res    = NULL;
-  type_walk(check_ent_name, NULL, &env);
-  return env.res;
+       env.u.name = name;
+       env.res    = NULL;
+       type_walk(check_ent_name, NULL, &env);
+       return env.res;
 }  /* find_entity_name */
 
 /**
  * Search methods for a name.
  */
 static void show_by_name(type_or_ent *tore, void *env) {
-  ident *id = (ident *)env;
-
-  if (is_entity(tore)) {
-    entity *ent = (entity *)tore;
-
-    if (is_method_entity(ent)) {
-      if (get_entity_ident(ent) == id) {
-        ir_type *owner = get_entity_owner(ent);
-        ir_graph *irg = get_entity_irg(ent);
-
-        if (owner != get_glob_type()) {
-          printf("%s::%s", get_type_name(owner), get_id_str(id));
-        } else {
-          printf("%s", get_id_str(id));
-        }
-        if (irg)
-          printf("[%ld] (%p)\n", get_irg_graph_nr(irg), irg);
-        else
-          printf(" NULL\n");
-      }
-    }
-  }
+       ident *id = (ident *)env;
+
+       if (is_entity(tore)) {
+               ir_entity *ent = (ir_entity *)tore;
+
+               if (is_method_entity(ent)) {
+                       if (get_entity_ident(ent) == id) {
+                               ir_type *owner = get_entity_owner(ent);
+                               ir_graph *irg = get_entity_irg(ent);
+
+                               if (owner != get_glob_type()) {
+                                       printf("%s::%s", get_type_name(owner), get_id_str(id));
+                               } else {
+                                       printf("%s", get_id_str(id));
+                               }
+                               if (irg)
+                                       printf("[%ld] (%p)\n", get_irg_graph_nr(irg), irg);
+                               else
+                                       printf(" NULL\n");
+                       }
+               }
+       }
 }  /* show_by_name */
 
 /**
  * Search methods for a ldname.
  */
 static void show_by_ldname(type_or_ent *tore, void *env) {
-  ident *id = (ident *)env;
-
-  if (is_entity(tore)) {
-    entity *ent = (entity *)tore;
-
-    if (is_method_entity(ent)) {
-      if (get_entity_ld_ident(ent) == id) {
-        ir_type *owner = get_entity_owner(ent);
-        ir_graph *irg = get_entity_irg(ent);
-
-        if (owner != get_glob_type()) {
-          printf("%s::%s", get_type_name(owner), get_id_str(id));
-        } else {
-          printf("%s", get_id_str(id));
-        }
-        if (irg)
-          printf("[%ld] (%p)\n", get_irg_graph_nr(irg), irg);
-        else
-          printf(" NULL\n");
-      }
-    }
-  }
+       ident *id = (ident *)env;
+
+       if (is_entity(tore)) {
+               ir_entity *ent = (ir_entity *)tore;
+
+               if (is_method_entity(ent)) {
+                       if (get_entity_ld_ident(ent) == id) {
+                               ir_type *owner = get_entity_owner(ent);
+                               ir_graph *irg = get_entity_irg(ent);
+
+                               if (owner != get_glob_type()) {
+                                       printf("%s::%s", get_type_name(owner), get_id_str(id));
+                               } else {
+                                       printf("%s", get_id_str(id));
+                               }
+                               if (irg)
+                                       printf("[%ld] (%p)\n", get_irg_graph_nr(irg), irg);
+                               else
+                                       printf(" NULL\n");
+                       }
+               }
+       }
 }  /* show_by_ldname */
 
 /**
  * prints the address and graph number of all irgs with given name
  */
 static void irg_name(const char *name) {
-  ident *id = new_id_from_str(name);
+       ident *id = new_id_from_str(name);
 
-  type_walk(show_by_name, NULL, (void *)id);
+       type_walk(show_by_name, NULL, (void *)id);
 }  /* irg_name */
 
 /**
  * prints the address and graph number of all irgs with given ld_name
  */
 static void irg_ld_name(const char *name) {
-  ident *id = new_id_from_str(name);
+       ident *id = new_id_from_str(name);
 
-  type_walk(show_by_ldname, NULL, (void *)id);
+       type_walk(show_by_ldname, NULL, (void *)id);
 }  /* irg_ld_name */
 
+enum tokens {
+       tok_create = 256,
+       tok_replace,
+       tok_lower,
+       tok_remirg,
+       tok_newent,
+       tok_newtype,
+       tok_showtype,
+       tok_showent,
+       tok_init,
+       tok_bp,
+       tok_enable,
+       tok_disable,
+       tok_setmask,
+       tok_setlvl,
+       tok_setoutfile,
+       tok_irgname,
+       tok_irgldname,
+       tok_help,
+       tok_identifier,
+       tok_number,
+       tok_eof,
+       tok_error
+};
+
+static const char *reserved[] = {
+       "create",
+       "replace",
+       "lower",
+       "remirg",
+       "newent",
+       "newtype",
+       "showtype",
+       "showent",
+       "init",
+       "bp",
+       "enable",
+       "disable",
+       "setmask",
+       "setlvl",
+       "setoutfile",
+       "irgname",
+       "irgldname",
+       "help"
+};
+
+/**
+ * The Lexer data.
+ */
+static struct lexer {
+       int has_token;        /**< set if a token is cached. */
+       unsigned cur_token;   /**< current token. */
+       unsigned number;      /**< current token attribute. */
+       const char *s;        /**< current token attribute. */
+       unsigned len;         /**< current token attribute. */
+
+       const char *curr_pos;
+       const char *end_pos;
+       const char *tok_start;
+} lexer;
+
+/**
+ * Initialize the lexer.
+ */
+static void init_lexer(const char *input) {
+       lexer.has_token = 0;
+       lexer.curr_pos  = input;
+       lexer.end_pos   = input + strlen(input);
+}  /* init_lexer */
+
+
+/**
+ * Get the next char from the input.
+ */
+static char next_char(void) {
+       if (lexer.curr_pos >= lexer.end_pos)
+               return '\0';
+       return *lexer.curr_pos++;
+}  /* next_char */
+
+#define unput()                if (lexer.curr_pos < lexer.end_pos) --lexer.curr_pos
+
+#undef MIN
+#define MIN(a, b) (a) < (b) ? (a) : (b)
+
+/**
+ * The lexer.
+ */
+static unsigned get_token(void) {
+       char c;
+       int i;
+
+       /* skip white space */
+       do {
+               c = next_char();
+       } while (c != '\0' && isspace(c));
+
+       lexer.tok_start = lexer.curr_pos - 1;
+       if (c == '.') {
+               /* command begins here */
+               int len = 0;
+
+               do {
+                       c = next_char();
+                       ++len;
+               } while (isalpha(c));
+               unput();
+
+               --len;
+               for (i = sizeof(reserved)/sizeof(reserved[0]) - 1; i >= 0; --i) {
+                       if (strncasecmp(lexer.tok_start + 1, reserved[i], len) == 0 && reserved[i][len] == '\0')
+                               break;
+               }
+               if (i >= 0)
+                       return 256 + i;
+               return tok_error;
+       } else if (isalpha(c)) {
+               /* identifier */
+               lexer.s = lexer.curr_pos - 1;
+
+               do {
+                       c = next_char();
+               } while (isgraph(c));
+               unput();
+               lexer.len = lexer.curr_pos - lexer.s;
+               return tok_identifier;
+       } else if (isdigit(c) || c == '-') {
+               unsigned number = 0;
+               unsigned sign   = 0;
+
+               /* we support negative numbers as well, so one can easily set all bits with -1 */
+               if (c == '-') {
+                       sign = 1;
+                       c    = next_char();
+               }
+
+               if (c == '0') {
+                       c = next_char();
+
+                       if (c == 'x' || c == 'X') {
+                               for (;;) {
+                                       c = next_char();
+
+                                       if (! isxdigit(c))
+                                               break;
+                                       if (isdigit(c))
+                                               number = (number << 4) | (c - '0');
+                                       else
+                                               number = (number << 4) | (toupper(c) - 'A' + 10);
+                               }
+                               unput();
+                               lexer.number = number;
+                               return tok_number;
+                       }
+               }
+               for (;;) {
+                       if (! isdigit(c))
+                               break;
+                       number = number * 10 + (c - '0');
+                       c = next_char();
+               }
+               unput();
+               lexer.number = sign ? 0 - number : number;
+               return tok_number;
+       }
+       else if (c == '\0')
+               return tok_eof;
+       return c;
+}  /* get_token */
+
+/**
+ * returns the next token.
+ */
+static unsigned next_token(void) {
+       if (! lexer.has_token) {
+               lexer.cur_token = get_token();
+               lexer.has_token = 1;
+       }
+       return lexer.cur_token;
+}  /* next_token */
+
+#define drop_token()  lexer.has_token = 0
+
 /**
  * High level function to use from debugger interface
  *
@@ -864,92 +1048,235 @@ static void irg_ld_name(const char *name) {
  *  .help         list all commands
  */
 void firm_debug(const char *cmd) {
-  long nr;
-  unsigned bp;
-  char name[1024], fname[1024];
-  unsigned lvl;
-
-  while (isspace(*cmd)) ++cmd;
-
-  if (sscanf(cmd, ".create %ld\n", &nr) == 1) {
-    break_on_nr(nr, BP_ON_NEW_NODE);
-  }
-  else if (sscanf(cmd, ".replace %ld\n", &nr) == 1) {
-    break_on_nr(nr, BP_ON_REPLACE);
-  }
-  else if (sscanf(cmd, ".lower %ld\n", &nr) == 1) {
-    break_on_nr(nr, BP_ON_LOWER);
-  }
-  else if (sscanf(cmd, ".remirg %ld\n", &nr) == 1) {
-    break_on_nr(nr, BP_ON_REMIRG);
-  }
-  else if (sscanf(cmd, ".remirg %s\n", name) == 1) {
-    break_on_ident(name, BP_ON_REMIRG);
-  }
-  else if (sscanf(cmd, ".newent %ld\n", &nr) == 1) {
-    break_on_nr(nr, BP_ON_NEW_ENT);
-  }
-  else if (sscanf(cmd, ".newent %s\n", name) == 1) {
-    break_on_ident(name, BP_ON_NEW_ENT);
-  }
-  else if (sscanf(cmd, ".newtype %ld\n", &nr) == 1) {
-    break_on_nr(nr, BP_ON_NEW_TYPE);
-  }
-  else if (sscanf(cmd, ".newtype %s\n", name) == 1) {
-    break_on_ident(name, BP_ON_NEW_TYPE);
-  }
-  else if (sscanf(cmd, ".showtype %ld\n", &nr) == 1) {
-    show_firm_object(find_type_nr(nr));
-  }
-  else if (sscanf(cmd, ".showtype %s\n", name) == 1) {
-    show_firm_object(find_type_name(name));
-  }
-  else if (sscanf(cmd, ".showent %ld\n", &nr) == 1) {
-    show_firm_object(find_entity_nr(nr));
-  }
-  else if (sscanf(cmd, ".showent %s\n", name) == 1) {
-    show_firm_object(find_entity_name(name));
-  }
-  else if (strcmp(cmd, ".init") == 0)
-    break_on_init = 1;
-  else if (strcmp(cmd, ".bp") == 0)
-    show_bp();
-  else if (sscanf(cmd, ".enable %u", &bp) == 1)
-    bp_activate(bp, 1);
-  else if (sscanf(cmd, ".disable %u", &bp) == 1)
-    bp_activate(bp, 0);
-  else if (sscanf(cmd, ".setmask %s %u\n", name, &lvl) == 2)
-    set_dbg_level(name, lvl);
-  else if (sscanf(cmd, ".setlvl %s %u\n", name, &lvl) == 2)
-    set_dbg_level(name, (1 << lvl) - 1);
-  else if (sscanf(cmd, ".setoutfile %s %s\n", name, fname) == 2)
-    set_dbg_outfile(name, fname);
-  else if (sscanf(cmd, ".irgname %s\n", name) == 1)
-    irg_name(name);
-  else if (sscanf(cmd, ".irgldname %s\n", name) == 1)
-    irg_ld_name(name);
-  else {
-    show_commands();
-  }
+       char name[1024], fname[1024];
+       int len;
+
+       init_lexer(cmd);
+
+       for (;;) {
+               unsigned token;
+
+               token = get_token();
+
+               switch (token) {
+               case tok_eof:
+                       goto leave;
+
+               case tok_create:
+                       token = get_token();
+                       if (token != tok_number)
+                               goto error;
+                       break_on_nr(lexer.number, BP_ON_NEW_NODE);
+                       break;
+
+               case tok_replace:
+                       token = get_token();
+                       if (token != tok_number)
+                               goto error;
+                       break_on_nr(lexer.number, BP_ON_REPLACE);
+                       break;
+
+               case tok_lower:
+                       token = get_token();
+                       if (token != tok_number)
+                               goto error;
+                       break_on_nr(lexer.number, BP_ON_LOWER);
+                       break;
+
+               case tok_remirg:
+                       token = get_token();
+
+                       if (token == tok_number)
+                               break_on_nr(lexer.number, BP_ON_REMIRG);
+                       else if (token == tok_identifier) {
+                               len = MIN(lexer.len, 1023);
+                               strncpy(name, lexer.s, len);
+                               name[len] = '\0';
+                               break_on_ident(name, BP_ON_REMIRG);
+                       } else
+                               goto error;
+                       break;
+
+               case tok_newent:
+                       token = get_token();
+
+                       if (token == tok_number)
+                               break_on_nr(lexer.number, BP_ON_NEW_ENT);
+                       else if (token == tok_identifier) {
+                               len = MIN(lexer.len, 1023);
+                               strncpy(name, lexer.s, len);
+                               name[len] = '\0';
+                               break_on_ident(name, BP_ON_NEW_ENT);
+                       } else
+                               goto error;
+                       break;
+
+               case tok_newtype:
+                       token = get_token();
+
+                       if (token == tok_number)
+                               break_on_nr(lexer.number, BP_ON_NEW_TYPE);
+                       else if (token == tok_identifier) {
+                               len = MIN(lexer.len, 1023);
+                               strncpy(name, lexer.s, len);
+                               name[len] = '\0';
+                               break_on_ident(name, BP_ON_NEW_TYPE);
+                       } else
+                               goto error;
+                       break;
+
+               case tok_showtype:
+                       token = get_token();
+
+                       if (token == tok_number)
+                               show_firm_object(find_type_nr(lexer.number));
+                       else if (token == tok_identifier) {
+                               len = MIN(lexer.len, 1023);
+                               strncpy(name, lexer.s, len);
+                               name[len] = '\0';
+                               show_firm_object(find_type_name(name));
+                       } else
+                               goto error;
+                       break;
+
+               case tok_showent:
+                       token = get_token();
+
+                       if (token == tok_number)
+                               show_firm_object(find_entity_nr(lexer.number));
+                       else if (token == tok_identifier) {
+                               len = MIN(lexer.len, 1023);
+                               strncpy(name, lexer.s, len);
+                               name[len] = '\0';
+                               show_firm_object(find_entity_name(name));
+                       } else
+                               goto error;
+                       break;
+
+               case tok_init:
+                       break_on_init = 1;
+                       break;
+
+               case tok_bp:
+                       show_bp();
+                       break;
+
+               case tok_enable:
+                       token = get_token();
+                       if (token != tok_number)
+                               goto error;
+                       bp_activate(lexer.number, 1);
+                       break;
+
+               case tok_disable:
+                       token = get_token();
+                       if (token != tok_number)
+                               goto error;
+                       bp_activate(lexer.number, 0);
+                       break;
+
+               case tok_setmask:
+                       token = get_token();
+                       if (token != tok_identifier)
+                               goto error;
+                       len = MIN(lexer.len, 1023);
+                       strncpy(name, lexer.s, len);
+                       name[len] = '\0';
+
+                       token = get_token();
+                       if (token != tok_number)
+                               goto error;
+                       set_dbg_level(name, lexer.number);
+                       break;
+
+               case tok_setlvl:
+                       token = get_token();
+                       if (token != tok_identifier)
+                               goto error;
+                       len = MIN(lexer.len, 1023);
+                       strncpy(name, lexer.s, len);
+                       name[len] = '\0';
+
+                       token = get_token();
+                       if (token != tok_number)
+                               goto error;
+                       set_dbg_level(name, (1 << lexer.number) - 1);
+                       break;
+
+               case tok_setoutfile:
+                       token = get_token();
+                       if (token != tok_identifier)
+                               goto error;
+                       len = MIN(lexer.len, 1023);
+                       strncpy(name, lexer.s, len);
+                       name[len] = '\0';
+
+                       token = get_token();
+                       if (token != tok_identifier)
+                               goto error;
+                       len = MIN(lexer.len, 1023);
+                       strncpy(fname, lexer.s, len);
+                       fname[len] = '\0';
+                       set_dbg_outfile(name, fname);
+
+               case tok_irgname:
+                       token = get_token();
+                       if (token != tok_identifier)
+                               goto error;
+                       len = MIN(lexer.len, 1023);
+                       strncpy(name, lexer.s, len);
+                       name[len] = '\0';
+                       irg_name(name);
+
+               case tok_irgldname:
+                       token = get_token();
+                       if (token != tok_identifier)
+                               goto error;
+                       len = MIN(lexer.len, 1023);
+                       strncpy(name, lexer.s, len);
+                       name[len] = '\0';
+                       irg_ld_name(name);
+                       break;
+
+               case tok_help:
+                       show_commands();
+                       break;
+
+               case tok_error:
+               default:
+error:
+                       printf("Error: before %s\n", lexer.tok_start);
+                       show_commands();
+                       goto leave;
+               }
+
+               token = get_token();
+               if (token == tok_eof)
+                       break;
+               if (token != ';')
+                       goto error;
+       }
+leave:
+       ;
 }  /* firm_debug */
 
 /* creates the debugger tables */
 void firm_init_debugger(void)
 {
-  char *env;
+       char *env;
 
-  bp_numbers = new_set(cmp_nr_bp, 8);
-  bp_idents  = new_set(cmp_ident_bp, 8);
+       bp_numbers = new_set(cmp_nr_bp, 8);
+       bp_idents  = new_set(cmp_ident_bp, 8);
 
-  env = getenv("FIRMDBG");
+       env = getenv("FIRMDBG");
 
-  is_active = 1;
+       is_active = 1;
 
-  if (env)
-    firm_debug(env);
+       if (env)
+               firm_debug(env);
 
-  if (break_on_init)
-    firm_debug_break();
+       if (break_on_init)
+               firm_debug_break();
 }  /* firm_init_debugger */
 
 #else
@@ -965,6 +1292,7 @@ static int _firm_only_that_you_can_compile_with_NDEBUG_defined;
  * Firm contains a debugger extension. This allows to set debugger breakpoints
  * an various events.
  * The extension uses a text interface which can be accessed from most debuggers.
+ * More than one command can be given separated by ';'.
  *
  * @section sec_cmd Supported commands
  *