WebSVN – HelenOS – Diff – /branches/dd/kernel/arch/amd64/src/debugger.c

 } bpinfo_t;
 static 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,
     .argc = 0,
 };
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
 static int cmd_del_breakpoint(cmd_arg_t *argv);
 static cmd_arg_t del_argv = {
     .type = ARG_TYPE_INT
 };
 static cmd_info_t delbkpt_info = {
     .func = cmd_add_breakpoint,
     .argc = 1,
     .argv = &addw_argv
 };
-#endif
-/** Print table of active breakpoints */
-int cmd_print_breakpoints(cmd_arg_t *argv __attribute__((unused)))
-{
-    unsigned int i;
-    char *symbol;
-    if (sizeof(void *) == 4) {
-        printf("#  Count Address    In symbol\n");
-        printf("-- ----- ---------- ---------\n");
-    } else {
-        printf("#  Count Address            In symbol\n");
-        printf("-- ----- ------------------ ---------\n");
-    }
-    for (i = 0; i < BKPOINTS_MAX; i++)
-        if (breakpoints[i].address) {
-            symbol = get_symtab_entry(breakpoints[i].address);
-            if (sizeof(void *) == 4)
+#endif /* CONFIG_KCONSOLE */
-                printf("%-2u %-5d %#10zx %s\n", i, breakpoints[i].counter,
-                    breakpoints[i].address, symbol);
-            else
-                printf("%-2u %-5d %#18zx %s\n", i, breakpoints[i].counter,
-                    breakpoints[i].address, symbol);
-        }
-    return 1;
-}
 /* Setup DR register according to table */
 static void setup_dr(int curidx)
+{
     unative_t dr7;
         dr7 &= ~ (0x3 << (16 + 4*curidx));
         dr7 &= ~ (0x3 << (18 + 4*curidx));
         if ((flags & BKPOINT_INSTR)) {
+            ;
         } else {
-            if (sizeof(int) == 4)
+#ifdef __32_BITS__
-                dr7 |= ((unative_t) 0x3) << (18 + 4*curidx);
+            dr7 |= ((unative_t) 0x3) << (18 + 4 * curidx);
+#endif
-            else /* 8 */
+#ifdef __64_BITS__
-                dr7 |= ((unative_t) 0x2) << (18 + 4*curidx);
+            dr7 |= ((unative_t) 0x2) << (18 + 4 * curidx);
+#endif
             if ((flags & BKPOINT_WRITE))
-                dr7 |= ((unative_t) 0x1) << (16 + 4*curidx);
+                dr7 |= ((unative_t) 0x1) << (16 + 4 * curidx);
             else if ((flags & BKPOINT_READ_WRITE))
-                dr7 |= ((unative_t) 0x3) << (16 + 4*curidx);
+                dr7 |= ((unative_t) 0x3) << (16 + 4 * curidx);
+        }
         /* Enable global breakpoint */
-        dr7 |= 0x2 << (curidx*2);
+        dr7 |= 0x2 << (curidx * 2);
         write_dr7(dr7);
+    }
+}
     spinlock_unlock(&bkpoint_lock);
     interrupts_restore(ipl);
     /* Send IPI */
 #ifdef CONFIG_SMP
 //  ipi_broadcast(VECTOR_DEBUG_IPI);
 #endif
     return curidx;
+}
-#ifdef amd64
+#ifdef __64_BITS__
-#   define getip(x) ((x)->rip)
+    #define getip(x)  ((x)->rip)
 #else
-#   define getip(x) ((x)->eip)
+    #define getip(x)  ((x)->eip)
 #endif
 static void handle_exception(int slot, istate_t *istate)
+{
     ASSERT(breakpoints[slot].address);
     /* Handle zero checker */
     if (! (breakpoints[slot].flags & BKPOINT_INSTR)) {
         if ((breakpoints[slot].flags & BKPOINT_CHECK_ZERO)) {
             if (*((unative_t *) breakpoints[slot].address) != 0)
                 return;
-            printf("**** Found ZERO on address %lx (slot %d) ****\n",
+            printf("*** Found ZERO on address %lx (slot %d) ***\n",
                 breakpoints[slot].address, slot);
         } else {
             printf("Data watchpoint - new data: %lx\n",
-                   *((unative_t *) breakpoints[slot].address));
+                *((unative_t *) breakpoints[slot].address));
+        }
+    }
     printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
-           get_symtab_entry(getip(istate)));
+        get_symtab_entry(getip(istate)));
-    printf("***Type 'exit' to exit kconsole.\n");
+#ifdef CONFIG_KCONSOLE
-    atomic_set(&haltstate,1);
+    atomic_set(&haltstate, 1);
-    kconsole((void *) "debug");
+    kconsole("debug", "Debug console ready (type 'exit' to continue)\n", false);
-    atomic_set(&haltstate,0);
+    atomic_set(&haltstate, 0);
+#endif
+}
 void breakpoint_del(int slot)
+{
     bpinfo_t *cur;
 #ifdef CONFIG_SMP
 //  ipi_broadcast(VECTOR_DEBUG_IPI);
 #endif
+}
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
-/** Remove breakpoint from table */
-int cmd_del_breakpoint(cmd_arg_t *argv)
-{
-    unative_t bpno = argv->intval;
-    if (bpno > BKPOINTS_MAX) {
-        printf("Invalid breakpoint number.\n");
-        return 0;
-    }
-    breakpoint_del(argv->intval);
-    return 1;
-}
-/** Add new breakpoint to table */
-static int cmd_add_breakpoint(cmd_arg_t *argv)
-{
-    int flags;
-    int id;
-    if (argv == &add_argv) {
-        flags = BKPOINT_INSTR;
-    } else { /* addwatchp */
-        flags = BKPOINT_WRITE;
-    }
-    printf("Adding breakpoint on address: %p\n", argv->intval);
-    id = breakpoint_add((void *)argv->intval, flags, -1);
-    if (id < 0)
-        printf("Add breakpoint failed.\n");
-    else
-        printf("Added breakpoint %d.\n", id);
-    return 1;
-}
-#endif
 static void debug_exception(int n __attribute__((unused)), istate_t *istate)
+{
     unative_t dr6;
     int i;
     /* Set RF to restart the instruction  */
-#ifdef amd64
+#ifdef __64_BITS__
     istate->rflags |= RFLAGS_RF;
 #else
     istate->eflags |= EFLAGS_RF;
 #endif
+        }
+    }
+}
 #ifdef CONFIG_SMP
+static void
+debug_ipi(int n __attribute__((unused)),
-static void debug_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
+    istate_t *istate __attribute__((unused)))
+{
     int i;
     spinlock_lock(&bkpoint_lock);
     for (i = 0; i < BKPOINTS_MAX; i++)
 /** Initialize debugger */
 void debugger_init()
+{
     int i;
-    for (i=0; i<BKPOINTS_MAX; 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);
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
     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(&addwatchp_info);
     if (!cmd_register(&addwatchp_info))
-        panic("could not register command %s\n", addwatchp_info.name);
+        printf("Cannot register command %s\n", addwatchp_info.name);
-#endif
+#endif /* CONFIG_KCONSOLE */
-    exc_register(VECTOR_DEBUG, "debugger",
+    exc_register(VECTOR_DEBUG, "debugger", debug_exception);
-             debug_exception);
 #ifdef CONFIG_SMP
-    exc_register(VECTOR_DEBUG_IPI, "debugger_smp",
+    exc_register(VECTOR_DEBUG_IPI, "debugger_smp", debug_ipi);
+#endif
+}
+#ifdef CONFIG_KCONSOLE
+/** Print table of active breakpoints */
+int cmd_print_breakpoints(cmd_arg_t *argv __attribute__((unused)))
+{
-             debug_ipi);
+    unsigned int i;
+    char *symbol;
+#ifdef __32_BITS__
+    printf("#  Count Address    In symbol\n");
+    printf("-- ----- ---------- ---------\n");
+#endif
+#ifdef __64_BITS__
+    printf("#  Count Address            In symbol\n");
+    printf("-- ----- ------------------ ---------\n");
 #endif
+    for (i = 0; i < BKPOINTS_MAX; i++)
+        if (breakpoints[i].address) {
+            symbol = get_symtab_entry(breakpoints[i].address);
+#ifdef __32_BITS__
+            printf("%-2u %-5d %#10zx %s\n", i,
+                breakpoints[i].counter, breakpoints[i].address,
+                symbol);
+#endif
+#ifdef __64_BITS__
+            printf("%-2u %-5d %#18zx %s\n", i,
+                breakpoints[i].counter, breakpoints[i].address,
+                symbol);
+#endif
+        }
+    return 1;
+}
+/** Remove breakpoint from table */
+int cmd_del_breakpoint(cmd_arg_t *argv)
+{
+    unative_t bpno = argv->intval;
+    if (bpno > BKPOINTS_MAX) {
+        printf("Invalid breakpoint number.\n");
+        return 0;
+    }
+    breakpoint_del(argv->intval);
+    return 1;
+}
+/** Add new breakpoint to table */
+static int cmd_add_breakpoint(cmd_arg_t *argv)
+{
+    int flags;
+    int id;
+    if (argv == &add_argv) {
+        flags = BKPOINT_INSTR;
+    } else { /* addwatchp */
+        flags = BKPOINT_WRITE;
+    }
+    printf("Adding breakpoint on address: %p\n", argv->intval);
+    id = breakpoint_add((void *)argv->intval, flags, -1);
+    if (id < 0)
+        printf("Add breakpoint failed.\n");
+    else
+        printf("Added breakpoint %d.\n", id);
+    return 1;
+}
+#endif /* CONFIG_KCONSOLE */
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/dd/kernel/arch/amd64/src/debugger.c – Rev 3022 → 4055