summaryrefslogtreecommitdiff
path: root/laden
diff options
context:
space:
mode:
authorneal <neal>2004-11-17 16:21:37 +0000
committerneal <neal>2004-11-17 16:21:37 +0000
commit1742c541aba8b5b4a9677ae532e96ea07c9fa526 (patch)
treeb905847f6c033b0e797f8fd348b74ded2847c301 /laden
parent84e98be73efcf23492488cc5209c5b0685f5ccbd (diff)
deva/
2004-11-17 Neal H. Walfield <neal@gnu.org> * output.h (debug): Include program_name and __FUNCTION__ in output. laden/ 2004-11-17 Neal H. Walfield <neal@gnu.org> * output.h (debug): Include program_name and __FUNCTION__ in output. physmem/ 2004-11-17 Neal H. Walfield <neal@gnu.org> * output.h (debug): Include program_name and __FUNCTION__ in output. * physmem.c (create_bootstrap_caps): First argument to debug must be a constant format string. task/ 2004-11-17 Neal H. Walfield <neal@gnu.org> * output.h (debug): Include program_name and __FUNCTION__ in output. wortel/ 2004-11-17 Neal H. Walfield <neal@gnu.org> * output.h (debug): Include program_name and __FUNCTION__ in output.
Diffstat (limited to 'laden')
-rw-r--r--laden/ChangeLog5
-rw-r--r--laden/ia32-cmain.c2
-rw-r--r--laden/output.h8
3 files changed, 13 insertions, 2 deletions
diff --git a/laden/ChangeLog b/laden/ChangeLog
index 3418d6a..132c612 100644
--- a/laden/ChangeLog
+++ b/laden/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-17 Neal H. Walfield <neal@gnu.org>
+
+ * output.h (debug): Include program_name and __FUNCTION__ in
+ output.
+
2004-10-23 Marcus Brinkmann <marcus@gnu.org>
* ia32-cmain.c (start_kernel): Flush the D-cache.
diff --git a/laden/ia32-cmain.c b/laden/ia32-cmain.c
index ae09acc..c733c4b 100644
--- a/laden/ia32-cmain.c
+++ b/laden/ia32-cmain.c
@@ -212,7 +212,7 @@ find_components (void)
mbi->mods_count--;
}
/* Swallow the modules we used so far. This makes the
- rootserver the first module in the list, irregardless if
+ rootserver the first module in the list, regardless if
sigma1 is used or not. FIXME: The rootserver might need the
information about the other modules, though. */
mbi->mods_addr = (l4_word_t) mod;
diff --git a/laden/output.h b/laden/output.h
index 5ab13fa..70e26bc 100644
--- a/laden/output.h
+++ b/laden/output.h
@@ -73,6 +73,12 @@ extern int output_debug;
/* Print a debug message. */
-#define debug(...) do { if (output_debug) printf (__VA_ARGS__); } while (0)
+#define debug(fmt, ...) \
+ ({ \
+ extern char *program_name; \
+ if (output_debug) \
+ printf ("%s:%s: " fmt, program_name, \
+ __FUNCTION__, __VA_ARGS__); \
+ })
#endif /* _OUTPUT_H */