Index: head/lib/libc/sparc64/Symbol.map =================================================================== --- head/lib/libc/sparc64/Symbol.map (revision 169487) +++ head/lib/libc/sparc64/Symbol.map (revision 169488) @@ -1,102 +1,103 @@ /* * $FreeBSD$ */ /* * This only needs to contain symbols that are not listed in * symbol maps from other parts of libc (i.e., not found in * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...). */ FBSD_1.0 { /* PSEUDO syscalls */ _exit; + _mcount; _setjmp; _longjmp; fabs; __flt_rounds; fpgetmask; fpgetround; fpgetsticky; fpsetmask; fpsetround; __infinity; __nan; makecontext; modf; setjmp; longjmp; sigsetjmp; siglongjmp; htonl; __htonl; htons; __htons; ntohl; __ntohl; ntohs; __ntohs; brk; exect; sbrk; vfork; /* SCD libc 64 psABI */ _Qp_sqrt; _Qp_add; _Qp_div; _Qp_mul; _Qp_sub; _Qp_dtoq; _Qp_itoq; _Qp_stoq; _Qp_xtoq; _Qp_uitoq; _Qp_uxtoq; _Qp_qtod; _Qp_qtoi; _Qp_qtos; _Qp_qtox; _Qp_qtoui; _Qp_qtoux; _Qp_feq; _Qp_fge; _Qp_fgt; _Qp_fle; _Qp_flt; _Qp_fne; _Qp_cmp; _Qp_cmpe; __dtoul; __sparc_utrap_install; }; FBSDprivate_1.0 { /* PSEUDO syscalls */ __sys_getlogin; _getlogin; __sys_exit; _set_tp; ___longjmp; __makecontext; __longjmp; signalcontext; __signalcontext; __siglongjmp; .curbrk; .minbrk; __sys_brk; _brk; .cerror; __sys_exect; _exect; _end; __sys_sbrk; _sbrk; __sys_vfork; _vfork; /* used in src/lib/csu/sparc64/crt1.c */ __sparc_utrap_setup; }; Index: head/sys/sparc64/include/profile.h =================================================================== --- head/sys/sparc64/include/profile.h (revision 169487) +++ head/sys/sparc64/include/profile.h (revision 169488) @@ -1,70 +1,102 @@ /*- * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. * * Author: Chris G. Demetriou * * Permission to use, copy, modify and distribute this software and * its documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. * * Carnegie Mellon requests users of this software to return to * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * * from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp * from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29 * $FreeBSD$ */ #ifndef _MACHINE_PROFILE_H_ #define _MACHINE_PROFILE_H_ -#define FUNCTION_ALIGNMENT 32 -#define _MCOUNT_DECL void mcount -#define MCOUNT +#if !defined(_KERNEL) && !defined(_SYS_CDEFS_H_) +#error this file needs sys/cdefs.h as a prerequisite +#endif +#define FUNCTION_ALIGNMENT 32 + typedef u_long fptrdiff_t; #ifdef _KERNEL #include +#include +#define _MCOUNT_DECL void mcount +#define MCOUNT + #define MCOUNT_DECL(s) register_t s; -#define MCOUNT_ENTER(s) s = rdpr(pil); wrpr(pil, 0, 14) +#define MCOUNT_ENTER(s) s = rdpr(pil); wrpr(pil, 0, PIL_TICK) #define MCOUNT_EXIT(s) wrpr(pil, 0, s) 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) : ~0UL) void mcount(uintfptr_t frompc, uintfptr_t selfpc); #else /* !_KERNEL */ typedef u_long uintfptr_t; + +#define _MCOUNT_DECL static __inline void __mcount + +#ifdef __GNUCLIKE_ASM +#define MCOUNT \ +void \ +_mcount() \ +{ \ + uintfptr_t frompc, selfpc; \ + \ + /* \ + * Find the return address for mcount, \ + * and the return address for mcount's caller. \ + * \ + * selfpc = pc pushed by call to mcount \ + */ \ + __asm("add %%o7, 8, %0" : "=r" (selfpc)); \ + /* \ + * frompc = pc pushed by call to mcount's caller. \ + */ \ + __asm("add %%i7, 8, %0" : "=r" (frompc)); \ + __mcount(frompc, selfpc); \ +} +#else /* !__GNUCLIKE_ASM */ +#define MCOUNT +#endif /* __GNUCLIKE_ASM */ #endif /* _KERNEL */ #endif /* !_MACHINE_PROFILE_H_ */ Index: head/sys/sun4v/include/profile.h =================================================================== --- head/sys/sun4v/include/profile.h (revision 169487) +++ head/sys/sun4v/include/profile.h (revision 169488) @@ -1,70 +1,102 @@ /*- * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. * * Author: Chris G. Demetriou * * Permission to use, copy, modify and distribute this software and * its documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. * * Carnegie Mellon requests users of this software to return to * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * * from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp * from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29 * $FreeBSD$ */ #ifndef _MACHINE_PROFILE_H_ #define _MACHINE_PROFILE_H_ -#define FUNCTION_ALIGNMENT 32 -#define _MCOUNT_DECL void mcount -#define MCOUNT +#if !defined(_KERNEL) && !defined(_SYS_CDEFS_H_) +#error this file needs sys/cdefs.h as a prerequisite +#endif +#define FUNCTION_ALIGNMENT 32 + typedef u_long fptrdiff_t; #ifdef _KERNEL #include +#include +#define _MCOUNT_DECL void mcount +#define MCOUNT + #define MCOUNT_DECL(s) register_t s; -#define MCOUNT_ENTER(s) s = rdpr(pil); wrpr(pil, 0, 14) +#define MCOUNT_ENTER(s) s = rdpr(pil); wrpr(pil, 0, PIL_TICK) #define MCOUNT_EXIT(s) wrpr(pil, 0, s) 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) : ~0UL) void mcount(uintfptr_t frompc, uintfptr_t selfpc); #else /* !_KERNEL */ typedef u_long uintfptr_t; + +#define _MCOUNT_DECL static __inline void __mcount + +#ifdef __GNUCLIKE_ASM +#define MCOUNT \ +void \ +_mcount() \ +{ \ + uintfptr_t frompc, selfpc; \ + \ + /* \ + * Find the return address for mcount, \ + * and the return address for mcount's caller. \ + * \ + * selfpc = pc pushed by call to mcount \ + */ \ + __asm("add %%o7, 8, %0" : "=r" (selfpc)); \ + /* \ + * frompc = pc pushed by call to mcount's caller. \ + */ \ + __asm("add %%i7, 8, %0" : "=r" (frompc)); \ + __mcount(frompc, selfpc); \ +} +#else /* !__GNUCLIKE_ASM */ +#define MCOUNT +#endif /* __GNUCLIKE_ASM */ #endif /* _KERNEL */ #endif /* !_MACHINE_PROFILE_H_ */