Changeset 5bb8e45 in mainline

Timestamp:

2005-12-13T01:38:50Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a95b25

Parents:

c52ed6b

Message:

Added support for mips breakpoints.
We have a kind of kernel debugger
Breakpoints on JMP/Branch instructions are not supported and
they are reported after the breakpoint is fired and exited as
a BranchDelay exception. If we found a way, how to detect these
instructions, we would be able to support them as 'one-time' breakpoints.

Files:

• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/mips32/include/debugger.h (added)
• arch/mips32/src/debugger.c (added)
• arch/mips32/src/exception.c (modified) (2 diffs)
• arch/mips32/src/mips32.c (modified) (2 diffs)
• generic/src/console/kconsole.c (modified) (1 diff)

arch/mips32/Makefile.inc

@@ -101 +101 @@
         arch/$(ARCH)/src/interrupt.c \
         arch/$(ARCH)/src/cache.c \
+        arch/$(ARCH)/src/debugger.c \
         arch/$(ARCH)/src/cpu/cpu.c \
         arch/$(ARCH)/src/mm/asid.c \

arch/mips32/src/exception.c

@@ -40 +40 @@
 #include <func.h>
 #include <console/kconsole.h>
+#include <arch/debugger.h>
 
 static char * exctable[] = {
@@ -88 +89 @@
 {
         struct exception_regdump *pstate = (struct exception_regdump *)data;
-        char *symbol = get_symtab_entry(pstate->epc);
 
-#ifdef CONFIG_DEBUG     
-        printf("***Breakpoint %p in %s.\n", pstate->epc, symbol);
-        printf("***Type 'exit' to exit kconsole.\n");
-        /* Umm..we should rather set some 'debugstate' here */
-        haltstate = 1;
-        kconsole("debug");
-        haltstate = 0;
-#endif
-
+#ifdef CONFIG_DEBUG
+        debugger_bpoint(pstate);
+#else
         /* it is necessary to not re-execute BREAK instruction after 
            returning from Exception handler
            (see page 138 in R4000 Manual for more information) */
         pstate->epc += 4;
+#endif
 }
 

arch/mips32/src/mips32.c

@@ -43 +43 @@
 #include <arch/drivers/arc.h>
 #include <console/chardev.h>
+#include <arch/debugger.h>
 
 #include <arch/asm/regname.h>
@@ -92 +93 @@
 
         console_init();
+        debugger_init();
         arc_print_memory_map();
         arc_print_devices();

generic/src/console/kconsole.c

@@ -431 +431 @@
         
         /* If we get a name, try to find it in symbol table */
-        if (text[0] < '0' | text[0] > '9') {
+        if (text[0] < '0' || text[0] > '9') {
                 if (text[0] == '&') {
                         isaddr = true;