diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2009-02-08 17:07:29 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2009-02-08 17:07:29 -0500 |
commit | e07e18e9867db5744738df6427aeee24c0638184 (patch) | |
tree | c4b804334739992ed2cf8d39ee90a35143de2c2f | |
parent | 71f036d6e31b6281f05a7ea3a9f3105891495c97 (diff) |
Minor - rename BX_PANIC to panic.
-rw-r--r-- | src/boot.c | 4 | ||||
-rw-r--r-- | src/memmap.c | 2 | ||||
-rw-r--r-- | src/misc.c | 2 | ||||
-rw-r--r-- | src/output.c | 2 | ||||
-rw-r--r-- | src/resume.c | 4 | ||||
-rw-r--r-- | src/util.h | 2 | ||||
-rwxr-xr-x | tools/checkstack.py | 4 |
7 files changed, 10 insertions, 10 deletions
@@ -217,14 +217,14 @@ static void do_boot(u16 seq_nr) { if (! CONFIG_BOOT) - BX_PANIC("Boot support not compiled in.\n"); + panic("Boot support not compiled in.\n"); u32 bootdev = IPL.bootorder; bootdev >>= 4 * seq_nr; bootdev &= 0xf; if (bootdev == 0) - BX_PANIC("No bootable device.\n"); + panic("No bootable device.\n"); /* Translate bootdev to an IPL table offset by subtracting 1 */ bootdev -= 1; diff --git a/src/memmap.c b/src/memmap.c index 3d03248..1cc4691 100644 --- a/src/memmap.c +++ b/src/memmap.c @@ -145,5 +145,5 @@ memmap_finalize() , (100 * (bios_table_cur_addr - (u32)&BiosTableSpace) / CONFIG_MAX_BIOSTABLE)); if (bios_table_cur_addr > bios_table_end_addr) - BX_PANIC("bios_table_end_addr overflow!\n"); + panic("bios_table_end_addr overflow!\n"); } @@ -58,7 +58,7 @@ void VISIBLE16 handle_nmi() { debug_isr(DEBUG_ISR_nmi); - BX_PANIC("NMI Handler called\n"); + panic("NMI Handler called\n"); } void diff --git a/src/output.c b/src/output.c index 63aec9d..2e6246b 100644 --- a/src/output.c +++ b/src/output.c @@ -224,7 +224,7 @@ bvprintf(u16 action, const char *fmt, va_list args) } void -BX_PANIC(const char *fmt, ...) +panic(const char *fmt, ...) { if (CONFIG_DEBUG_LEVEL) { va_list args; diff --git a/src/resume.c b/src/resume.c index aab52ed..38723d8 100644 --- a/src/resume.c +++ b/src/resume.c @@ -91,14 +91,14 @@ handle_resume(u8 status) break; } - BX_PANIC("Unimplemented shutdown status: %02x\n", status); + panic("Unimplemented shutdown status: %02x\n", status); } void VISIBLE32 s3_resume() { if (!CONFIG_S3_RESUME) - BX_PANIC("S3 resume support not compiled in.\n"); + panic("S3 resume support not compiled in.\n"); dprintf(1, "In 32bit resume\n"); @@ -88,7 +88,7 @@ int get_keystroke(int msec); // output.c void debug_serial_setup(); -void BX_PANIC(const char *fmt, ...) +void panic(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) __attribute__ ((noreturn)); void printf(const char *fmt, ...) diff --git a/tools/checkstack.py b/tools/checkstack.py index 070bd25..503fbf3 100755 --- a/tools/checkstack.py +++ b/tools/checkstack.py @@ -13,8 +13,8 @@ import sys import re # List of functions we can assume are never called. -#IGNORE = ['BX_PANIC', '__dprintf', '__send_disk_op'] -IGNORE = ['BX_PANIC', '__send_disk_op'] +#IGNORE = ['panic', '__dprintf', '__send_disk_op'] +IGNORE = ['panic', '__send_disk_op'] # Find out maximum stack usage for a function def calcmaxstack(funcs, funcaddr): |