diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2006-11-13 22:07:32 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:26:55 +0200 |
| commit | 628f717ec2fbc9c0b59fd747df5b0e2d4e75a5ac (patch) | |
| tree | 836be4490302a3cba43a3a32e3bc7a9919e110d3 | |
| parent | a42c7a969bfbc6d556179bd19d1fda7cf80f25a8 (diff) | |
2006-11-13 Samuel Thibault <samuel.thibault@ens-lyon.org>
* i386/i386at/iopl.c (ioplmmap): Add `int' return type.
* i386/i386at/model_dep.c (halt_all_cpus): Fix typo in declaration.
* kern/assert.h (Assert): Add __attribute__ ((noreturn)) to
declaration.
* kern/debug.c (Debugger): Add __attribute__ ((noreturn)) to
declaration.
(Debugger): Add call to panic().
* kern/debug.h (panic): Add __attribute__ ((noreturn)) to declaration.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | i386/i386at/iopl.c | 1 | ||||
| -rw-r--r-- | i386/i386at/model_dep.c | 2 | ||||
| -rw-r--r-- | kern/assert.h | 2 | ||||
| -rw-r--r-- | kern/debug.c | 4 | ||||
| -rw-r--r-- | kern/debug.h | 2 |
6 files changed, 19 insertions, 5 deletions
@@ -1,4 +1,15 @@ -2006-11-14 Barry deFreese <bddebian@comcast.net> +2006-11-13 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * i386/i386at/iopl.c (ioplmmap): Add `int' return type. + * i386/i386at/model_dep.c (halt_all_cpus): Fix typo in declaration. + * kern/assert.h (Assert): Add __attribute__ ((noreturn)) to + declaration. + * kern/debug.c (Debugger): Add __attribute__ ((noreturn)) to + declaration. + (Debugger): Add call to panic(). + * kern/debug.h (panic): Add __attribute__ ((noreturn)) to declaration. + +2006-11-13 Barry deFreese <bddebian@comcast.net> * device/chario.c (tty_cts): Add `void' return type. * device/cons.c (cninit, cnputc): Add `void' return type. diff --git a/i386/i386at/iopl.c b/i386/i386at/iopl.c index 03217c0..8080911 100644 --- a/i386/i386at/iopl.c +++ b/i386/i386at/iopl.c @@ -103,6 +103,7 @@ ioplclose(dev, flags) /*ARGSUSED*/ int iopl_all = 1; +int ioplmmap(dev, off, prot) int dev; vm_offset_t off; diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c index b1c8226..1546077 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -88,7 +88,7 @@ extern char version[]; extern void setup_main(); -void halt_all_cpu (boolean_t reboot) __attribute__ ((noreturn)); +void halt_all_cpus (boolean_t reboot) __attribute__ ((noreturn)); void halt_cpu (void) __attribute__ ((noreturn)); void inittodr(); /* forward */ diff --git a/kern/assert.h b/kern/assert.h index 228f91c..2829728 100644 --- a/kern/assert.h +++ b/kern/assert.h @@ -36,7 +36,7 @@ #endif #if MACH_ASSERT -extern void Assert(char *exp, char *filename, int line); +extern void Assert(char *exp, char *filename, int line) __attribute__ ((noreturn)); #define assert(ex) \ MACRO_BEGIN \ diff --git a/kern/debug.c b/kern/debug.c index f8774fc..c6e0257 100644 --- a/kern/debug.c +++ b/kern/debug.c @@ -34,7 +34,7 @@ #include <kern/debug.h> extern void cnputc(); -void Debugger(); +void Debugger() __attribute__ ((noreturn)); #if MACH_KDB extern int db_breakpoints_inserted; @@ -100,6 +100,8 @@ void Debugger(message) #ifdef i386 asm("int3"); #endif + + panic("Debugger returned!"); } /* Be prepared to panic anytime, diff --git a/kern/debug.h b/kern/debug.h index 28e7b73..62be7fc 100644 --- a/kern/debug.h +++ b/kern/debug.h @@ -58,6 +58,6 @@ #endif /* NDEBUG */ extern void panic_init(); -extern void panic (const char *s, ...); +extern void panic (const char *s, ...) __attribute__ ((noreturn)); #endif /* _mach_debug__debug_ */ |