* Debug output
****************************************************************/
-#define DEBUG_PORT PORT_SERIAL1
#define DEBUG_TIMEOUT 100000
void
-debug_serial_setup()
+debug_serial_setup(void)
{
if (!CONFIG_DEBUG_SERIAL)
return;
// setup for serial logging: 8N1
u8 oldparam, newparam = 0x03;
- oldparam = inb(DEBUG_PORT+SEROFF_LCR);
- outb(newparam, DEBUG_PORT+SEROFF_LCR);
+ oldparam = inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LCR);
+ outb(newparam, CONFIG_DEBUG_SERIAL_PORT+SEROFF_LCR);
// Disable irqs
u8 oldier, newier = 0;
- oldier = inb(DEBUG_PORT+SEROFF_IER);
- outb(newier, DEBUG_PORT+SEROFF_IER);
+ oldier = inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_IER);
+ outb(newier, CONFIG_DEBUG_SERIAL_PORT+SEROFF_IER);
if (oldparam != newparam || oldier != newier)
dprintf(1, "Changing serial settings was %x/%x now %x/%x\n"
if (!CONFIG_DEBUG_SERIAL)
return;
int timeout = DEBUG_TIMEOUT;
- while ((inb(DEBUG_PORT+SEROFF_LSR) & 0x60) != 0x60)
+ while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x20) != 0x20)
if (!timeout--)
// Ran out of time.
return;
- outb(c, DEBUG_PORT+SEROFF_DATA);
+ outb(c, CONFIG_DEBUG_SERIAL_PORT+SEROFF_DATA);
}
// Make sure all serial port writes have been completely sent.
static void
-debug_serial_flush()
+debug_serial_flush(void)
{
if (!CONFIG_DEBUG_SERIAL)
return;
int timeout = DEBUG_TIMEOUT;
- while ((inb(DEBUG_PORT+SEROFF_LSR) & 0x40) != 0x40)
+ while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x60) != 0x60)
if (!timeout--)
// Ran out of time.
return;
debug_serial(c);
}
-// In 16bit mode just need a dummy variable (putc_debug is always used
-// anyway), and in 32bit mode need a pointer to the 32bit instance of
-// putc_debug().
+// In segmented mode just need a dummy variable (putc_debug is always
+// used anyway), and in 32bit flat mode need a pointer to the 32bit
+// instance of putc_debug().
#if MODE16
static struct putcinfo debuginfo VAR16;
+#elif MODESEGMENT
+static struct putcinfo debuginfo VAR32SEG;
#else
static struct putcinfo debuginfo = { putc_debug };
#endif
static void
putc_screen(struct putcinfo *action, char c)
{
- if (CONFIG_SCREEN_AND_DEBUG)
+ if (ScreenAndDebug)
putc_debug(&debuginfo, c);
if (c == '\n')
screenc('\r');
static void
putc(struct putcinfo *action, char c)
{
- if (MODE16) {
- // Only debugging output supported in 16bit mode.
+ if (MODESEGMENT) {
+ // Only debugging output supported in segmented mode.
putc_debug(action, c);
return;
}
static void
puts(struct putcinfo *action, const char *s)
{
+ if (!MODESEGMENT && !s)
+ s = "(NULL)";
for (; *s; s++)
putc(action, *s);
}
// Output an integer in hexadecimal.
static void
-puthex(struct putcinfo *action, u32 val, int width)
+puthex(struct putcinfo *action, u32 val, int width, int spacepad)
{
if (!width) {
u32 tmp = val;
width = 1;
- if (tmp > 0xffff) {
- width += 4;
- tmp >>= 16;
- }
- if (tmp > 0xff) {
- width += 2;
- tmp >>= 8;
+ while (tmp >>= 4)
+ width++;
+ } else if (spacepad) {
+ u32 tmp = val;
+ u32 count = 1;
+ while (tmp >>= 4)
+ count++;
+ if (width > count) {
+ count = width - count;
+ width -= count;
+ while (count--)
+ putc(action, ' ');
}
- if (tmp > 0xf)
- width += 1;
}
switch (width) {
}
const char *n = s+1;
int field_width = 0;
+ int spacepad = 1;
for (;;) {
c = GET_GLOBAL(*(u8*)n);
if (!isdigit(c))
break;
- field_width = field_width * 10 + c - '0';
+ if (!field_width && (c == '0'))
+ spacepad = 0;
+ else
+ field_width = field_width * 10 + c - '0';
n++;
}
if (c == 'l') {
putc(action, '0');
putc(action, 'x');
field_width = 8;
+ spacepad = 0;
case 'x':
val = va_arg(args, s32);
- puthex(action, val, field_width);
+ puthex(action, val, field_width, spacepad);
break;
case 'c':
val = va_arg(args, int);
void
__dprintf(const char *fmt, ...)
{
- if (!MODE16 && CONFIG_THREADS && CONFIG_DEBUG_LEVEL >= DEBUG_thread
+ if (!MODESEGMENT && CONFIG_THREADS && CONFIG_DEBUG_LEVEL >= DEBUG_thread
&& *fmt != '\\' && *fmt != '/') {
struct thread_info *cur = getCurThread();
if (cur != &MainThread) {
// Show "thread id" for this debug message.
putc_debug(&debuginfo, '|');
- puthex(&debuginfo, (u32)cur, 8);
+ puthex(&debuginfo, (u32)cur, 8, 0);
putc_debug(&debuginfo, '|');
putc_debug(&debuginfo, ' ');
}
void
printf(const char *fmt, ...)
{
- ASSERT32();
+ ASSERT32FLAT();
va_list args;
va_start(args, fmt);
bvprintf(&screeninfo, fmt, args);
va_end(args);
- if (CONFIG_SCREEN_AND_DEBUG)
+ if (ScreenAndDebug)
debug_serial_flush();
}
sinfo->str++;
}
-void
+// Build a formatted string. Note, this function returns the actual
+// number of bytes used (not including null) even in the overflow
+// case.
+int
snprintf(char *str, size_t size, const char *fmt, ...)
{
- ASSERT32();
+ ASSERT32FLAT();
if (!size)
- return;
+ return 0;
+ struct snprintfinfo sinfo = { { putc_str }, str, str + size };
+ va_list args;
+ va_start(args, fmt);
+ bvprintf(&sinfo.info, fmt, args);
+ va_end(args);
+ char *end = sinfo.str;
+ if (end >= sinfo.end)
+ end = sinfo.end - 1;
+ *end = '\0';
+ return end - str;
+}
+
+// Build a formatted string - malloc'ing the memory.
+char *
+znprintf(size_t size, const char *fmt, ...)
+{
+ ASSERT32FLAT();
+ if (!size)
+ return NULL;
+ char *str = malloc_tmp(size);
+ if (!str) {
+ warn_noalloc();
+ return NULL;
+ }
struct snprintfinfo sinfo = { { putc_str }, str, str + size };
va_list args;
va_start(args, fmt);
va_end(args);
char *end = sinfo.str;
if (end >= sinfo.end)
- end--;
+ end = sinfo.end - 1;
*end = '\0';
+ return str;
}
while (len > 0) {
if (count % 8 == 0) {
putc(&debuginfo, '\n');
- puthex(&debuginfo, count*4, 8);
+ puthex(&debuginfo, count*4, 8, 0);
putc(&debuginfo, ':');
} else {
putc(&debuginfo, ' ');
}
- puthex(&debuginfo, *(u32*)d, 8);
+ puthex(&debuginfo, *(u32*)d, 8, 0);
count++;
len-=4;
d+=4;
dump_regs(regs);
}
-// Report on a handler returning a failure notification to the caller.
+// Report on an invalid parameter.
void
-__set_fail(struct bregs *regs, int lineno, const char *fname)
+__warn_invalid(struct bregs *regs, int lineno, const char *fname)
{
- dprintf(1, "fail %s:%d:\n", fname, lineno);
- dump_regs(regs);
- set_fail_silent(regs);
+ if (CONFIG_DEBUG_LEVEL >= DEBUG_invalid) {
+ dprintf(1, "invalid %s:%d:\n", fname, lineno);
+ dump_regs(regs);
+ }
}
-// Report on a handler returning a failure code to the caller. Note,
-// the lineno and return code are encoded in the same parameter as gcc
-// does a better job of scheduling function calls when there are 3 or
-// less parameters.
+// Report on an unimplemented feature.
void
-__set_code_fail(struct bregs *regs, u32 linecode, const char *fname)
+__warn_unimplemented(struct bregs *regs, int lineno, const char *fname)
+{
+ if (CONFIG_DEBUG_LEVEL >= DEBUG_unimplemented) {
+ dprintf(1, "unimplemented %s:%d:\n", fname, lineno);
+ dump_regs(regs);
+ }
+}
+
+// Report a detected internal inconsistency.
+void
+__warn_internalerror(int lineno, const char *fname)
+{
+ dprintf(1, "WARNING - internal error detected at %s:%d!\n"
+ , fname, lineno);
+}
+
+// Report on an allocation failure.
+void
+__warn_noalloc(int lineno, const char *fname)
+{
+ dprintf(1, "WARNING - Unable to allocate resource at %s:%d!\n"
+ , fname, lineno);
+}
+
+// Report on a timeout exceeded.
+void
+__warn_timeout(int lineno, const char *fname)
+{
+ dprintf(1, "WARNING - Timeout at %s:%d!\n", fname, lineno);
+}
+
+// Report a handler reporting an invalid parameter to the caller.
+void
+__set_invalid(struct bregs *regs, int lineno, const char *fname)
+{
+ __warn_invalid(regs, lineno, fname);
+ set_invalid_silent(regs);
+}
+
+// Report a call of an unimplemented function.
+void
+__set_unimplemented(struct bregs *regs, int lineno, const char *fname)
+{
+ __warn_unimplemented(regs, lineno, fname);
+ set_invalid_silent(regs);
+}
+
+// Report a handler reporting an invalid parameter code to the
+// caller. Note, the lineno and return code are encoded in the same
+// parameter as gcc does a better job of scheduling function calls
+// when there are 3 or less parameters.
+void
+__set_code_invalid(struct bregs *regs, u32 linecode, const char *fname)
{
u8 code = linecode;
u32 lineno = linecode >> 8;
- dprintf(1, "fail %s:%d(%x):\n", fname, lineno, code);
- dump_regs(regs);
- set_code_fail_silent(regs, code);
+ __warn_invalid(regs, lineno, fname);
+ set_code_invalid_silent(regs, code);
+}
+
+// Report a call of an unimplemented function.
+void
+__set_code_unimplemented(struct bregs *regs, u32 linecode, const char *fname)
+{
+ u8 code = linecode;
+ u32 lineno = linecode >> 8;
+ __warn_unimplemented(regs, lineno, fname);
+ set_code_invalid_silent(regs, code);
}