diff options
| author | Bruce Evans <bde@FreeBSD.org> | 2006-10-28 06:04:29 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 2006-10-28 06:04:29 +0000 |
| commit | 94450a83e82dea2e31ab3b5afaf1df3a9cb7e6bd (patch) | |
| tree | 12834a3d76512711beec1b8e76397f183472976e /sys/amd64/amd64/prof_machdep.c | |
| parent | 52f92a311c840fb94c796f2034801cd21bec29b8 (diff) | |
| download | src-94450a83e82dea2e31ab3b5afaf1df3a9cb7e6bd.tar.gz src-94450a83e82dea2e31ab3b5afaf1df3a9cb7e6bd.zip | |
Removed all traces of HIDENAME() in amd64 and i386 kernel code. Using
this used to be slightly cleaner than using ifdefs in a few places to
support both a.out and elf, but using it now just causes messes and
unportabilities. It seems to be impossible to implement the elf
HIDENAME() portably in cpp (since token pasting of "." and <name> is
invalid).
*/prof_machdep.c:
- Removed all uses of CNAME(). CNAME() is easy enough to use in pure
asm code, but using it in inline asm requires messy quoting. The
core pure asm code has been hacked on more and all uses of CNAME() in
it have already gone away. Just assume the elf convention here too.
- Removed now-uneeded include of <machine/asmacros.h>.
- Removed the workaround for a namespace conflict with this include.
Notes
Notes:
svn path=/head/; revision=163726
Diffstat (limited to 'sys/amd64/amd64/prof_machdep.c')
| -rw-r--r-- | sys/amd64/amd64/prof_machdep.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c index 4c57f34a8f4e..b0ef17c1322a 100644 --- a/sys/amd64/amd64/prof_machdep.c +++ b/sys/amd64/amd64/prof_machdep.c @@ -44,10 +44,8 @@ __FBSDID("$FreeBSD$"); #include <machine/perfmon.h> #endif #include <machine/profile.h> -#undef MCOUNT #endif -#include <machine/asmacros.h> #include <machine/timerreg.h> #ifdef GUPROF @@ -80,7 +78,7 @@ __mcount: \n\ # \n\ # Check that we are profiling. Do it early for speed. \n\ # \n\ - cmpl $GMON_PROF_OFF," __XSTRING(CNAME(_gmonparam)) "+GM_STATE \n\ + cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\ je .mcount_exit \n\ # \n\ # __mcount is the same as [.]mcount except the caller \n\ @@ -98,11 +96,11 @@ __mcount: \n\ jmp .got_frompc \n\ \n\ .p2align 4,0x90 \n\ - .globl " __XSTRING(HIDENAME(mcount)) " \n\ -" __XSTRING(HIDENAME(mcount)) ": \n\ + .globl .mcount \n\ +.mcount: \n\ .globl __cyg_profile_func_enter \n\ __cyg_profile_func_enter: \n\ - cmpl $GMON_PROF_OFF," __XSTRING(CNAME(_gmonparam)) "+GM_STATE \n\ + cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\ je .mcount_exit \n\ # \n\ # The caller's stack frame has already been built, so \n\ @@ -126,7 +124,7 @@ __cyg_profile_func_enter: \n\ \n\ pushfq \n\ cli \n\ - call " __XSTRING(CNAME(mcount)) " \n\ + call mcount \n\ popfq \n\ popq %r9 \n\ popq %r8 \n\ @@ -164,11 +162,11 @@ __mexitcount: \n\ GMON_PROF_HIRES = 4 \n\ \n\ .p2align 4,0x90 \n\ - .globl " __XSTRING(HIDENAME(mexitcount)) " \n\ -" __XSTRING(HIDENAME(mexitcount)) ": \n\ + .globl .mexitcount \n\ +.mexitcount: \n\ .globl __cyg_profile_func_exit \n\ __cyg_profile_func_exit: \n\ - cmpl $GMON_PROF_HIRES," __XSTRING(CNAME(_gmonparam)) "+GM_STATE \n\ + cmpl $GMON_PROF_HIRES,_gmonparam+GM_STATE \n\ jne .mexitcount_exit \n\ pushq %rax \n\ pushq %rdx \n\ @@ -180,7 +178,7 @@ __cyg_profile_func_exit: \n\ movq 7*8(%rsp),%rdi \n\ pushfq \n\ cli \n\ - call " __XSTRING(CNAME(mexitcount)) " \n\ + call mexitcount \n\ popfq \n\ popq %r9 \n\ popq %r8 \n\ |