Changeset e07fe0c in mainline

Timestamp:

2005-12-12T17:23:09Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

fbe058f

Parents:

ebbdb8f

Message:

added support for breakpoints to mips32

Files:

• arch/mips32/src/exception.c (modified) (2 diffs)
• generic/include/console/kconsole.h (modified) (1 diff)
• generic/src/console/cmd.c (modified) (2 diffs)
• generic/src/console/kconsole.c (modified) (4 diffs)
• generic/src/lib/func.c (modified) (1 diff)
• generic/src/main/kinit.c (modified) (1 diff)
• kernel.config (modified) (1 diff)
• test/debug/mips1/test.c (added)

arch/mips32/src/exception.c

@@ -38 +38 @@
 #include <print.h>
 #include <interrupt.h>
+#include <func.h>
+#include <console/kconsole.h>
 
 static char * exctable[] = {
@@ -86 +88 @@
 {
         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
+
         /* it is necessary to not re-execute BREAK instruction after 
            returning from Exception handler

generic/include/console/kconsole.h

@@ -69 +69 @@
 
 extern void kconsole_init(void);
-extern void kconsole(void *arg);
+extern void kconsole(void *prompt);
 
 extern int cmd_register(cmd_info_t *cmd);

generic/src/console/cmd.c

@@ -59 +59 @@
 };
 
+static cmd_info_t exit_info = {
+        .name = "exit",
+        .description ="Exit kconsole",
+        .argc = 0
+};
+
 /** Data and methods for 'description' command. */
 static int cmd_desc(cmd_arg_t *argv);
@@ -257 +263 @@
         if (!cmd_register(&desc_info))
                 panic("could not register command %s\n", desc_info.name);
+
+        cmd_initialize(&exit_info);
+        if (!cmd_register(&exit_info))
+                panic("could not register command %s\n", exit_info.name);
         
         cmd_initialize(&symaddr_info);

generic/src/console/kconsole.c

@@ -41 +41 @@
 #include <func.h>
 #include <symtab.h>
+#include <macros.h>
 
 /** Simple kernel console.
@@ -396 +397 @@
  * @param arg Not used.
  */
-void kconsole(void *arg)
+void kconsole(void *prompt)
 {
         cmd_info_t *cmd_info;
@@ -408 +409 @@
         
         while (true) {
-                cmdline = clever_readline(__FUNCTION__, stdin);
+                cmdline = clever_readline(prompt, stdin);
                 len = strlen(cmdline);
                 if (!len)
@@ -415 +416 @@
                 if (!cmd_info)
                         continue;
+                if (strncmp(cmd_info->name,"exit", \
+                            min(strlen(cmd_info->name),5)) == 0)
+                        break;
                 (void) cmd_info->func(cmd_info->argv);
         }

generic/src/lib/func.c

@@ -49 +49 @@
 #ifdef CONFIG_DEBUG
         printf("\n");
-        kconsole(NULL); /* Run kconsole as a last resort to user */
+        kconsole("panic"); /* Run kconsole as a last resort to user */
 #endif      
 

generic/src/main/kinit.c

@@ -134 +134 @@
          * Create kernel console.
          */
-        if (t = thread_create(kconsole, NULL, TASK, 0))
+        if (t = thread_create(kconsole, "kconsole", TASK, 0))
                 thread_ready(t);
         else panic("thread_create/kconsole\n");

kernel.config

@@ -82 +82 @@
 @ "thread/thread1" Thread test 1
 @ "mm/mapping1" Mapping test 1
+@ [ARCH=mips32] "debug/mips1" Mips breakpoint-debug test 
 ! CONFIG_TEST (choice)