Minor - rename BX_PANIC to panic.

diff --git a/src/boot.c b/src/boot.c
index 9dec69e757f329fa2076ade6bc52ef2a7b4bda3b..fc81ed60d24f23f9209e9f3831f1bb728daa0b66 100644 (file)
--- a/src/boot.c
+++ b/src/boot.c
@@ -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 3d0324858d12c309c460d0c67c6a3e7c2aa36dca..1cc4691f24f7b730092789ab2185d424cf80900c 100644 (file)
--- 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");
 }

diff --git a/src/misc.c b/src/misc.c
index 2557eb927fbc4570acfe8fc9e873897da739b643..6548249fec7a787e9cf01f2f2bc004b6a34e045d 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -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 63aec9d50fad25206dcbc522059d72f7f45974eb..2e6246b6ad7884659be3a7c80a302a4cd480cb10 100644 (file)
--- 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 aab52edc1162f7f066caa9ab2739a73a82d58ad1..38723d8ad0bebaf278e8f636dc5242b349bc0a62 100644 (file)
--- 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");
 

diff --git a/src/util.h b/src/util.h
index 0757fa4dd019fcc8b2398d95ec176aaff1fb3ec3..b7fbf2e27ee08475cc90f8d8f0fd367090bcd0c4 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -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 070bd25e7655e030010d05fbf3bad7d28871ccaf..503fbf35e85494cca1e5c17b70b77e8221a19edb 100755 (executable)
--- 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):