diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-11 13:47:29 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-11 13:47:29 +0200 |
| commit | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (patch) | |
| tree | c353e3ad19017c8f5cdb330d6363ca2845cb11c4 /kern/startup.c | |
| parent | ec91b8ae6735a3f2977dc886ea63ff28e1aeef41 (diff) | |
| parent | e1f856119dae48fcc1b649521ca45e4bdaa80ea9 (diff) | |
Merge branch 'master' into master-gdb_stubs
Conflicts:
i386/i386at/com.c
Diffstat (limited to 'kern/startup.c')
| -rw-r--r-- | kern/startup.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/kern/startup.c b/kern/startup.c index 81626dbf..75a05b0e 100644 --- a/kern/startup.c +++ b/kern/startup.c @@ -27,6 +27,8 @@ * Mach kernel startup. */ +#include <string.h> + #include <mach/boolean.h> #include <mach/machine.h> #include <mach/task_special_ports.h> @@ -76,6 +78,10 @@ extern void device_service_create(); void cpu_launch_first_thread(); /* forward */ void start_kernel_threads(); /* forward */ +#if ! MACH_KBD +boolean_t reboot_on_panic = 1; +#endif + #if NCPUS > 1 extern void start_other_cpus(); extern void action_thread(); @@ -83,6 +89,7 @@ extern void action_thread(); /* XX */ extern vm_offset_t phys_first_addr, phys_last_addr; +extern char *kernel_cmdline; /* * Running in virtual memory, on the interrupt stack. @@ -94,6 +101,23 @@ void setup_main() { thread_t startup_thread; +#if MACH_KDB + /* + * Cause a breakpoint trap to the debugger before proceeding + * any further if the proper option flag was specified + * on the kernel's command line. + * XXX check for surrounding spaces. + */ + if (strstr(kernel_cmdline, "-d ")) { + cninit(); /* need console for debugger */ + SoftDebugger("init"); + } +#else /* MACH_KDB */ + if (strstr (kernel_cmdline, "-H ")) { + reboot_on_panic = 0; + } +#endif /* MACH_KDB */ + panic_init(); printf_init(); |