Changeset 76fca31 in mainline for kernel/arch/mips32/src/debugger.c

Timestamp:

2008-12-16T19:02:07Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5ae4443

Parents:

8fe5980

Message:

kconsole is optional
kernel & uspace framebuffer rewrite with speedups (some things are slightly broken yet)

File:

• kernel/arch/mips32/src/debugger.c (modified) (6 diffs)

kernel/arch/mips32/src/debugger.c

@@ -47 +47 @@
 bpinfo_t breakpoints[BKPOINTS_MAX];
 SPINLOCK_INITIALIZE(bkpoint_lock);
+
+#ifdef CONFIG_KCONSOLE
 
 static int cmd_print_breakpoints(cmd_arg_t *argv);
@@ -124 +126 @@
 };
 
+
 /** 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)
@@ -268 +272 @@
 }
 
+#endif
+
 /** Initialize debugger */
 void debugger_init()
@@ -275 +281 @@
         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
 }
 
@@ -368 +376 @@
                         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
@@ -374 +382 @@
                  *   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 (type 'exit' to continue)\n", false);
+                
                 spinlock_lock(&bkpoint_lock);
-                atomic_set(&haltstate,0);
+                atomic_set(&haltstate, 0);
+#endif
         }
         if (cur && cur->address == fireaddr && (cur->flags & BKPOINT_INPROG)) {