Index: arch/amd64/include/asm.h =================================================================== --- arch/amd64/include/asm.h (revision 208189f478f1065037c19230498c75f6cb6d2644) +++ arch/amd64/include/asm.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) @@ -218,4 +218,16 @@ } +static inline __address * get_ip() +{ + __address *ip; + + __asm__ volatile ( + "mov %%rip, %0" + : "=r" (ip) + ); + return ip; +} + + extern size_t interrupt_handler_size; extern void interrupt_handlers(void); Index: arch/amd64/include/debug.h =================================================================== --- arch/amd64/include/debug.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) +++ arch/amd64/include/debug.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) @@ -0,0 +1,1 @@ +../../ia32/include/debug.h Index: arch/ia32/include/asm.h =================================================================== --- arch/ia32/include/asm.h (revision 208189f478f1065037c19230498c75f6cb6d2644) +++ 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 + +/** 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 Index: arch/ia64/include/debug.h =================================================================== --- arch/ia64/include/debug.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) +++ arch/ia64/include/debug.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2005 + * 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 __ia64_DEBUG_H__ +#define __ia64_DEBUG_H__ + +#endif Index: arch/mips32/include/debug.h =================================================================== --- arch/mips32/include/debug.h (revision 208189f478f1065037c19230498c75f6cb6d2644) +++ arch/mips32/include/debug.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) @@ -43,3 +43,17 @@ #define ___intmode() asm volatile ( "\t.word\t0x29\n"); +/** Return current IP address */ +static inline __address * _get_ra() +{ + __address *ip; + + __asm__ volatile ( + "mov %%31, %0" + : "=r" (ip) + ); + return ip; +} +#define CALLER(first_arg) (_get_ra()) + + #endif Index: arch/ppc32/include/debug.h =================================================================== --- arch/ppc32/include/debug.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) +++ arch/ppc32/include/debug.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2005 + * 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 __ppc32_DEBUG_H__ +#define __ppc32_DEBUG_H__ + +#endif Index: arch/sparc64/include/debug.h =================================================================== --- arch/sparc64/include/debug.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) +++ arch/sparc64/include/debug.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2005 + * 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 __sparc64_DEBUG_H__ +#define __sparc64_DEBUG_H__ + +#endif Index: generic/include/debug.h =================================================================== --- generic/include/debug.h (revision 208189f478f1065037c19230498c75f6cb6d2644) +++ generic/include/debug.h (revision a3ac9a7e277c7bc7d416f4d9ad871db2c430696c) @@ -31,5 +31,18 @@ #include +#include +#include +#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 208189f478f1065037c19230498c75f6cb6d2644) +++ 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 208189f478f1065037c19230498c75f6cb6d2644) +++ 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;