From 01fd13440d6b5d1349e7ce6b74fe9fcf29d1ff58 Mon Sep 17 00:00:00 2001 From: marcel Date: Fri, 27 Aug 2004 19:42:35 +0000 Subject: Move the kernel-specific logic to adjust frompc from MI to MD. For these two reasons: 1. On ia64 a function pointer does not hold the address of the first instruction of a functions implementation. It holds the address of a function descriptor. Hence the user(), btrap(), eintr() and bintr() prototypes are wrong for getting the actual code address. 2. The logic forces interrupt, trap and exception entry points to be layed-out contiguously. This can not be achieved on ia64 and is generally just bad programming. The MCOUNT_FROMPC_USER macro is used to set the frompc argument to some kernel address which represents any frompc that falls outside the kernel text range. The macro can expand to ~0U to bail out in that case. The MCOUNT_FROMPC_INTR macro is used to set the frompc argument to some kernel address to represent a call to a trap or interrupt handler. This to avoid that the trap or interrupt handler appear to be called from everywhere in the call graph. The macro can expand to ~0U to prevent adjusting frompc. Note that the argument is selfpc, not frompc. This commit defines the macros on all architectures equivalently to the original code in sys/libkern/mcount.c. People can take it from here... Compile-tested on: alpha, amd64, i386, ia64 and sparc64 Boot-tested on: i386 --- sys/i386/include/profile.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'sys/i386/include') diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h index 1c5ecf2..4e59ca0 100644 --- a/sys/i386/include/profile.h +++ b/sys/i386/include/profile.h @@ -87,6 +87,19 @@ extern int mcount_lock; #endif #endif /* GUPROF */ +void bintr(void); +void btrap(void); +void eintr(void); +void user(void); + +#define MCOUNT_FROMPC_USER(pc) \ + ((pc < (uintfptr_t)VM_MAXUSER_ADDRESS) ? (uintfptr_t)user : pc) + +#define MCOUNT_FROMPC_INTR(pc) \ + ((pc >= (uintfptr_t)btrap && pc < (uintfptr_t)eintr) ? \ + ((pc >= (uintfptr_t)bintr) ? (uintfptr_t)bintr : \ + (uintfptr_t)btrap) : ~0U) + #else /* !_KERNEL */ #define FUNCTION_ALIGNMENT 4 -- cgit v1.1