Enable extra debugging.

Route BX_INFO to debug port.
Add a new debug_stub() function.

diff --git a/src/output.c b/src/output.c
index 6c7f71989f5006f5c46448d48e0afb37cec4fb2d..043caa2762c0e58d49672ff5401e9c16e31d2425 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -140,6 +140,7 @@ bprintf(u16 action, const char *fmt, ...)
             puts_cs(action, sarg);
             break;
         default:
+            putc(action, '%');
             putc(action, *s);
             n = s;
         }
@@ -178,3 +179,9 @@ __debug_exit(const char *fname, struct bregs *regs)
         return;
     dump_regs(fname, "exit", regs);
 }
+
+void
+__debug_stub(const char *fname, struct bregs *regs)
+{
+    dump_regs(fname, "stub", regs);
+}

diff --git a/src/post.c b/src/post.c
index f19c44ae837cd845e924d6af7806664f1fe6707c..07f0a2b90cf39d8fc8043ed8e9297e157312631c 100644 (file)
--- a/src/post.c
+++ b/src/post.c
@@ -537,7 +537,7 @@ post()
     if (status != 0x00 && status != 0x09 && status < 0x0d)
         status_restart(status);
 
-    BX_INFO("Start bios");
+    BX_INFO("Start bios\n");
 
     init_bda();
     init_handlers();

diff --git a/src/util.h b/src/util.h
index 53281b5e92dac6e185e877feb05f15345cd79088..cdb8b1bd8429116b9c9205be4ec3827cf650ff39 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -39,7 +39,7 @@ static inline void nop(void)
 
 #define DEBUGF(fmt, args...)
 #define BX_PANIC(fmt, args...)
-#define BX_INFO(fmt, args...)
+#define BX_INFO(fmt, args...) bprintf(0, fmt , ##args)
 
 static inline void
 memset(void *s, int c, size_t n)
@@ -97,10 +97,13 @@ void bprintf(u16 action, const char *fmt, ...)
     __attribute__ ((format (printf, 2, 3)));
 void __debug_enter(const char *fname, struct bregs *regs);
 void __debug_exit(const char *fname, struct bregs *regs);
+void __debug_stub(const char *fname, struct bregs *regs);
 #define debug_enter(regs) \
     __debug_enter(__func__, regs)
 #define debug_exit(regs) \
     __debug_exit(__func__, regs)
+#define debug_stub(regs) \
+    __debug_stub(__func__, regs)
 #define printf(fmt, args...)                     \
     bprintf(1, fmt , ##args )