diff --git a/common.h b/common.h index 00c3483..999a40e 100644 --- a/common.h +++ b/common.h @@ -13,12 +13,6 @@ #define offsetof(type, member) ((size_t)&(((type*)0)->member)) -#define PANIC(fmt, ...) \ - do { \ - printf("panic %s:%d" fmt "\n", __FILE__, __LINE__, ## __VAR_ARGS__); \ - while(1){}; \ - } while(0) - typedef int bool; typedef unsigned char uint8_t; typedef unsigned short uint16_t ; diff --git a/kernel.c b/kernel.c index 85dc8da..760d749 100644 --- a/kernel.c +++ b/kernel.c @@ -42,6 +42,8 @@ void kernel_main(void) printf("offsetof(sbiret, error) = %x\n", offsetof(sbiret, error)); printf("offsetof(sbiret, value) = %x\n", offsetof(sbiret, value)); + PANIC("booted!"); + while(1) { // wfi -> wait for interrupt __asm__ __volatile__("wfi"); diff --git a/kernel.h b/kernel.h index 574f227..66d60f7 100644 --- a/kernel.h +++ b/kernel.h @@ -6,4 +6,10 @@ typedef struct { long value; } sbiret; +#define PANIC(fmt, ...) \ + do { \ + printf("PANIC: %s:%d " fmt "\n", __FILE__, __LINE__, ## __VA_ARGS__); \ + while(1) {}; \ + } while(0) + #endif // KERNEL_H_