WebSVN – HelenOS – Diff – //branches/network/kernel/arch/mips32/src/debugger.c

 #include <arch/debugger.h>
 #include <arch/barrier.h>
 #include <memstr.h>
 #include <console/kconsole.h>
 #include <console/cmd.h>
-#include <symtab.h>
 #include <print.h>
 #include <panic.h>
 #include <arch.h>
 #include <arch/cp0.h>
 #include <func.h>
+#include <symtab.h>
 bpinfo_t breakpoints[BKPOINTS_MAX];
 SPINLOCK_INITIALIZE(bkpoint_lock);
+#ifdef CONFIG_KCONSOLE
 static int cmd_print_breakpoints(cmd_arg_t *argv);
 static cmd_info_t bkpts_info = {
     .name = "bkpts",
     .description = "Print breakpoint table.",
     .func = cmd_print_breakpoints,
     {0xfc000000, 0x0c000000}, /* JAL */
     {0xfc1f07ff, 0x00000009}, /* JALR */
     {0, 0} /* EndOfTable */
 };
 /** Test, if the given instruction is a jump or branch instruction
+ *
  * @param instr Instruction code
  * @return true - it is jump instruction, false otherwise
+ *
  */
 static bool is_jump(unative_t instr)
+{
     int i;
     /* Check, that the breakpoints do not conflict */
     for (i = 0; i < BKPOINTS_MAX; i++) {
         if (breakpoints[i].address == (uintptr_t)argv->intval) {
             printf("Duplicate breakpoint %d.\n", i);
-            spinlock_unlock(&bkpoints_lock);
+            spinlock_unlock(&bkpoint_lock);
             return 0;
         } else if (breakpoints[i].address == (uintptr_t)argv->intval +
             sizeof(unative_t) || breakpoints[i].address ==
             (uintptr_t)argv->intval - sizeof(unative_t)) {
             printf("Adjacent breakpoints not supported, conflict "
                 "with %d.\n", i);
-            spinlock_unlock(&bkpoints_lock);
+            spinlock_unlock(&bkpoint_lock);
             return 0;
+        }
+    }
     for (i = 0; i < BKPOINTS_MAX; i++)
         if (!breakpoints[i].address) {
             cur = &breakpoints[i];
     printf("#  Count Address    INPROG ONESHOT FUNCCALL In symbol\n");
     printf("-- ----- ---------- ------ ------- -------- ---------\n");
     for (i = 0; i < BKPOINTS_MAX; i++)
         if (breakpoints[i].address) {
+            symbol = symtab_fmt_name_lookup(
-            symbol = get_symtab_entry(breakpoints[i].address);
+                breakpoints[i].address);
             printf("%-2u %-5d %#10zx %-6s %-7s %-8s %s\n", i,
                 breakpoints[i].counter, breakpoints[i].address,
                 ((breakpoints[i].flags & BKPOINT_INPROG) ? "true" :
                 "false"), ((breakpoints[i].flags & BKPOINT_ONESHOT)
                 ? "true" : "false"), ((breakpoints[i].flags &
                 BKPOINT_FUNCCALL) ? "true" : "false"), symbol);
+        }
     return 1;
+}
+#endif
 /** Initialize debugger */
 void debugger_init()
+{
     int i;
     for (i = 0; i < BKPOINTS_MAX; i++)
         breakpoints[i].address = NULL;
+#ifdef CONFIG_KCONSOLE
     cmd_initialize(&bkpts_info);
     if (!cmd_register(&bkpts_info))
-        panic("could not register command %s\n", bkpts_info.name);
+        printf("Cannot register command %s\n", bkpts_info.name);
     cmd_initialize(&delbkpt_info);
     if (!cmd_register(&delbkpt_info))
-        panic("could not register command %s\n", delbkpt_info.name);
+        printf("Cannot register command %s\n", delbkpt_info.name);
     cmd_initialize(&addbkpt_info);
     if (!cmd_register(&addbkpt_info))
-        panic("could not register command %s\n", addbkpt_info.name);
+        printf("Cannot register command %s\n", addbkpt_info.name);
     cmd_initialize(&addbkpte_info);
     if (!cmd_register(&addbkpte_info))
-        panic("could not register command %s\n", addbkpte_info.name);
+        printf("Cannot register command %s\n", addbkpte_info.name);
+#endif
+}
 /** Handle breakpoint
+ *
  * Find breakpoint in breakpoint table.
     uintptr_t fireaddr = istate->epc;
     int i;
     /* test branch delay slot */
     if (cp0_cause_read() & 0x80000000)
-        panic("Breakpoint in branch delay slot not supported.\n");
+        panic("Breakpoint in branch delay slot not supported.");
     spinlock_lock(&bkpoint_lock);
     for (i = 0; i < BKPOINTS_MAX; i++) {
         /* Normal breakpoint */
         if (fireaddr == breakpoints[i].address &&
             return;
+        }
         if (cur->flags & BKPOINT_INPROG)
             printf("Warning: breakpoint recursion\n");
-        if (!(cur->flags & BKPOINT_FUNCCALL))
+        if (!(cur->flags & BKPOINT_FUNCCALL)) {
             printf("***Breakpoint %d: %p in %s.\n", i, fireaddr,
-                get_symtab_entry(istate->epc));
+                symtab_fmt_name_lookup(istate->epc));
+        }
         /* Return first instruction back */
         ((uint32_t *)cur->address)[0] = cur->instruction;
         smc_coherence(cur->address);
             ((uint32_t *)cur->address)[1] = 0x0d;
             cur->flags |= BKPOINT_REINST;
+        }
         cur->flags |= BKPOINT_INPROG;
     } else {
-        printf("***Breakpoint %p in %s.\n", fireaddr,
+        printf("***Breakpoint %d: %p in %s.\n", i, fireaddr,
-               get_symtab_entry(fireaddr));
+            symtab_fmt_name_lookup(fireaddr));
         /* Move on to next instruction */
         istate->epc += 4;
+    }
     if (cur)
         cur->counter++;
     if (cur && (cur->flags & BKPOINT_FUNCCALL)) {
         /* Allow zero bkfunc, just for counting */
         if (cur->bkfunc)
             cur->bkfunc(cur, istate);
     } else {
-        printf("***Type 'exit' to exit kconsole.\n");
+#ifdef CONFIG_KCONSOLE
         /* This disables all other processors - we are not SMP,
          * actually this gets us to cpu_halt, if scheduler() is run
          * - we generally do not want scheduler to be run from debug,
          *   so this is a good idea
          */
-        atomic_set(&haltstate,1);
+        atomic_set(&haltstate, 1);
         spinlock_unlock(&bkpoint_lock);
-        kconsole("debug");
+        kconsole("debug", "Debug console ready.\n", false);
         spinlock_lock(&bkpoint_lock);
-        atomic_set(&haltstate,0);
+        atomic_set(&haltstate, 0);
+#endif
+    }
     if (cur && cur->address == fireaddr && (cur->flags & BKPOINT_INPROG)) {
         /* Remove one-shot breakpoint */
         if ((cur->flags & BKPOINT_ONESHOT))
             cur->address = NULL;

Subversion Repositories HelenOS

(root)//branches/network/kernel/arch/mips32/src/debugger.c – Rev 3386 → 4153