diff options
| author | jasone <jasone@FreeBSD.org> | 2000-01-20 03:15:01 +0000 |
|---|---|---|
| committer | jasone <jasone@FreeBSD.org> | 2000-01-20 03:15:01 +0000 |
| commit | 271b33587d1dec543e4b44ec4200f0262b78b981 (patch) | |
| tree | 4f87b4d6888e7faab379f3821f95587ffc0db1b5 | |
| parent | fb20480840a20d480ddfac3d78644b58b1d8e5eb (diff) | |
| download | FreeBSD-src-271b33587d1dec543e4b44ec4200f0262b78b981.zip FreeBSD-src-271b33587d1dec543e4b44ec4200f0262b78b981.tar.gz | |
Move ENTRY and ALTENTRY definitions to asm.h where they belong.
Unbreak profiling. Again.
Submitted by: bde
| -rw-r--r-- | lib/libc/i386/DEFS.h | 23 | ||||
| -rw-r--r-- | sys/amd64/include/asm.h | 5 | ||||
| -rw-r--r-- | sys/i386/include/asm.h | 5 |
3 files changed, 8 insertions, 25 deletions
diff --git a/lib/libc/i386/DEFS.h b/lib/libc/i386/DEFS.h index 0e54055..edf08ea 100644 --- a/lib/libc/i386/DEFS.h +++ b/lib/libc/i386/DEFS.h @@ -39,26 +39,3 @@ */ #include <machine/asm.h> - -/* Already defined in machine/asm.h. */ -#undef ENTRY - -#define MCOUNT call PIC_PLT(HIDENAME(mcount)) -#define MEXITCOUNT call PIC_PLT(HIDENAME(mexitcount)) - -#ifdef PROF -/* - * XXX Looks good to me, but it sure looks different than the original... - * (jasone) - */ -#define ENTRY(name) _ENTRY(name) ; 9: ; MCOUNT -/* #define ENTRY(name) _ENTRY(name) ; 9: \ */ -/* pushl %ebp; movl %esp,%ebp; \ */ -/* call PIC_PLT(HIDENAME(mcount)); \ */ -/* popl %ebp */ - -#define ALTENTRY(name) _ENTRY(name) ; MCOUNT ; MEXITCOUNT ; jmp 9f -#else -#define ENTRY(name) _ENTRY(name) -#define ALTENTRY(name) _ENTRY(name) -#endif diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h index 7ac1243..51ec278 100644 --- a/sys/amd64/include/asm.h +++ b/sys/amd64/include/asm.h @@ -84,12 +84,15 @@ .globl CNAME(x); .type CNAME(x),@function; CNAME(x): #ifdef PROF -#define ENTRY(x) _ENTRY(x); \ +#define ENTRY(x) _ENTRY(x); 9: \ pushl %ebp; movl %esp,%ebp; \ call PIC_PLT(HIDENAME(mcount)); \ popl %ebp + +#define ALTENTRY(x) _ENTRY(x) ; call PIC_PLT(HIDENAME(mcount)) ; jmp 9f #else #define ENTRY(x) _ENTRY(x) +#define ALTENTRY(x) _ENTRY(x) #endif #define RCSID(x) .text; .asciz x diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h index 7ac1243..51ec278 100644 --- a/sys/i386/include/asm.h +++ b/sys/i386/include/asm.h @@ -84,12 +84,15 @@ .globl CNAME(x); .type CNAME(x),@function; CNAME(x): #ifdef PROF -#define ENTRY(x) _ENTRY(x); \ +#define ENTRY(x) _ENTRY(x); 9: \ pushl %ebp; movl %esp,%ebp; \ call PIC_PLT(HIDENAME(mcount)); \ popl %ebp + +#define ALTENTRY(x) _ENTRY(x) ; call PIC_PLT(HIDENAME(mcount)) ; jmp 9f #else #define ENTRY(x) _ENTRY(x) +#define ALTENTRY(x) _ENTRY(x) #endif #define RCSID(x) .text; .asciz x |
