Index: generic/include/debug.h
===================================================================
--- generic/include/debug.h	(revision 402fc8bfc804170513e71aa4ec23a4308e4616a2)
+++ generic/include/debug.h	(revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c)
@@ -31,5 +31,18 @@
 
 #include <panic.h>
+#include <arch/debug.h>
+#include <arch.h>
 
+#ifndef CALLER
+/**  Default (returns 0) macro for getting address of calling function
+ *   @param x First argument of the called function
+ */
+#  define CALLER(x)       ((__address *) 0)
+#endif
+
+#ifndef HERE
+/** Current Instruction Pointer address */
+#  define HERE ((__address *)0)
+#endif
 
 /** Debugging ASSERT macro
Index: generic/src/interrupt/interrupt.c
===================================================================
--- generic/src/interrupt/interrupt.c	(revision 402fc8bfc804170513e71aa4ec23a4308e4616a2)
+++ generic/src/interrupt/interrupt.c	(revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c)
@@ -112,5 +112,5 @@
 
 static cmd_info_t exc_info = {
-	.name = "exc_print",
+	.name = "pexc",
 	.description = "Print exception table",
 	.func = exc_print_cmd,
Index: generic/src/synch/spinlock.c
===================================================================
--- generic/src/synch/spinlock.c	(revision 402fc8bfc804170513e71aa4ec23a4308e4616a2)
+++ generic/src/synch/spinlock.c	(revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c)
@@ -64,5 +64,5 @@
 {
 	count_t i = 0;
-	__address caller = ((__address *) &sl)[-1];
+	__address caller = CALLER(sl);
 	char *symbol;
 	bool deadlock_reported = false;