diff options
| author | Marvin Borner | 2020-08-22 01:10:59 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-08-22 01:10:59 +0200 |
| commit | 45db1523a02730a172564ca8c2be55422d5d2f0b (patch) | |
| tree | 1b64e92fcc5519d3466f15a325267127d6e63905 /libc | |
| parent | e72ef04668a87702c92cebc868612b9ebb8b0ad8 (diff) | |
Fixed some TODOs
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/inc/assert.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libc/inc/assert.h b/libc/inc/assert.h index a553444..758c91b 100644 --- a/libc/inc/assert.h +++ b/libc/inc/assert.h @@ -6,17 +6,22 @@ #include <print.h> #ifdef kernel +#include <proc.h> #define assert(exp) \ if (!(exp)) { \ printf("%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp); \ - __asm__ volatile("cli\nhlt"); \ + struct proc *proc = proc_current(); \ + if (proc) \ + proc_exit(proc, 1); \ + else \ + __asm__ volatile("cli\nhlt"); \ } #elif defined(userspace) #include <sys.h> #define assert(exp) \ if (!(exp)) { \ printf("%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp); \ - sys0(SYS_LOOP); \ + sys1(SYS_EXIT, 1); \ } #else #error "No lib target specified. Please use -Dkernel or -Duserspace" |