Index: arch/ia32/include/asm.h
===================================================================
--- arch/ia32/include/asm.h	(revision fcfac420803a43318bce80248d718b848e2bcaa3)
+++ arch/ia32/include/asm.h	(revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c)
@@ -224,3 +224,15 @@
 }
 
+/** Return current IP address */
+static inline __address * get_ip() 
+{
+	__address *ip;
+
+	__asm__ volatile (
+		"mov %%eip, %0"
+		: "=r" (ip)
+		);
+	return ip;
+}
+
 #endif
Index: arch/ia32/include/debug.h
===================================================================
--- arch/ia32/include/debug.h	(revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c)
+++ arch/ia32/include/debug.h	(revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __ia32_DEBUG_H__
+#define __ia32_DEBUG_H__
+
+#include <arch/asm.h>
+
+/** Return caller of this function 
+ *
+ * @param first_arg First argument of the function
+ */
+#define CALLER(first_arg) 	 ((__address *) &first_arg)[-1];
+
+#define HERE get_ip()
+
+#endif