Use, in uncovered part, the END() macro in order to improve debugging.

In this specific case, Valgrind won't get confused when analyzing such functions. Sponsored by: Sandvine Incorporated Tested by: emaste MFC: 3 days
2009-05-25 14:37:10 +00:00 · 2009-05-25 14:37:10 +00:00 · 4af1dcdee0
commit 4af1dcdee0
parent 4fb8e988d3
57 changed files with 60 additions and 0 deletions
--- a/lib/libc_r/arch/amd64/_atomic_lock.S
+++ b/lib/libc_r/arch/amd64/_atomic_lock.S
@ -38,4 +38,5 @@ ENTRY(_atomic_lock)
 	movl	$1, %eax
 	xchgq	%rax, (%rdi)
 	ret
+END(_atomic_lock)

--- a/lib/libc_r/arch/i386/_atomic_lock.S
+++ b/lib/libc_r/arch/i386/_atomic_lock.S
@ -39,4 +39,5 @@ ENTRY(_atomic_lock)
 	movl	$1, %eax
 	xchg	%eax, (%ecx)
 	ret
+END(_atomic_lock)

--- a/lib/libstand/i386/_setjmp.S
+++ b/lib/libstand/i386/_setjmp.S
@ -58,6 +58,7 @@ ENTRY(_setjmp)
 	movl	%edi,20(%eax)
 	xorl	%eax,%eax
 	ret
+END(_setjmp)

 ENTRY(_longjmp)
 	movl	4(%esp),%edx
@ -73,3 +74,4 @@ ENTRY(_longjmp)
 	incl	%eax
 1:	movl	%ecx,0(%esp)
 	ret
+END(_longjmp)
--- a/lib/msun/amd64/e_sqrt.S
+++ b/lib/msun/amd64/e_sqrt.S
@ -30,4 +30,5 @@ __FBSDID("$FreeBSD$")
 ENTRY(sqrt)
 	sqrtsd	%xmm0, %xmm0
 	ret
+END(sqrt)

--- a/lib/msun/amd64/e_sqrtf.S
+++ b/lib/msun/amd64/e_sqrtf.S
@ -30,3 +30,4 @@ __FBSDID("$FreeBSD$")
 ENTRY(sqrtf)
 	sqrtss	%xmm0, %xmm0
 	ret
+END(sqrtf)
--- a/lib/msun/amd64/s_lrint.S
+++ b/lib/msun/amd64/s_lrint.S
@ -34,3 +34,4 @@ __FBSDID("$FreeBSD$")
 ENTRY(fn)
 	cvtsd2si %xmm0, %rax
 	ret
+END(fn)
--- a/lib/msun/amd64/s_lrintf.S
+++ b/lib/msun/amd64/s_lrintf.S
@ -34,3 +34,4 @@ __FBSDID("$FreeBSD$")
 ENTRY(fn)
 	cvtss2si %xmm0, %rax
 	ret
+END(fn)
--- a/lib/msun/amd64/s_remquo.S
+++ b/lib/msun/amd64/s_remquo.S
@ -63,3 +63,4 @@ ENTRY(remquo)
 	fstpl	-8(%rsp)
 	movsd	-8(%rsp),%xmm0
 	ret
+END(remquo)
--- a/lib/msun/amd64/s_remquof.S
+++ b/lib/msun/amd64/s_remquof.S
@ -63,3 +63,4 @@ ENTRY(remquof)
 	fstps	-4(%rsp)
 	movss	-4(%rsp),%xmm0
 	ret
+END(remquof)
--- a/lib/msun/amd64/s_scalbn.S
+++ b/lib/msun/amd64/s_scalbn.S
@ -37,3 +37,4 @@ ENTRY(scalbn)
 	fstpl	-8(%rsp)
 	movsd	-8(%rsp),%xmm0
 	ret
+END(scalbn)
--- a/lib/msun/amd64/s_scalbnf.S
+++ b/lib/msun/amd64/s_scalbnf.S
@ -37,6 +37,7 @@ ENTRY(scalbnf)
 	fstps	-8(%rsp)
 	movss	-8(%rsp),%xmm0
 	ret
+END(scalbnf)

 .globl CNAME(ldexpf)
 .set	CNAME(ldexpf),CNAME(scalbnf)
--- a/lib/msun/amd64/s_scalbnl.S
+++ b/lib/msun/amd64/s_scalbnl.S
@ -14,6 +14,7 @@ ENTRY(scalbnl)
 	fscale
 	fstp	%st(1)
 	ret
+END(scalbnl)

 .globl	CNAME(ldexpl)
 .set	CNAME(ldexpl),CNAME(scalbnl)
--- a/lib/msun/i387/e_exp.S
+++ b/lib/msun/i387/e_exp.S
@ -96,3 +96,4 @@ x_Inf_or_NaN:
 x_not_minus_Inf:
 	fldl	4(%esp)
 	ret
+END(exp)
--- a/lib/msun/i387/e_fmod.S
+++ b/lib/msun/i387/e_fmod.S
@ -46,3 +46,4 @@ ENTRY(fmod)
 	jp	1b
 	fstp	%st(1)
 	ret
+END(fmod)
--- a/lib/msun/i387/e_log.S
+++ b/lib/msun/i387/e_log.S
@ -42,3 +42,4 @@ ENTRY(log)
 	fldl	4(%esp)
 	fyl2x
 	ret
+END(log)
--- a/lib/msun/i387/e_log10.S
+++ b/lib/msun/i387/e_log10.S
@ -42,3 +42,4 @@ ENTRY(log10)
 	fldl	4(%esp)
 	fyl2x
 	ret
+END(log10)
--- a/lib/msun/i387/e_log10f.S
+++ b/lib/msun/i387/e_log10f.S
@ -13,3 +13,4 @@ ENTRY(log10f)
 	flds	4(%esp)
 	fyl2x
 	ret
+END(log10f)
--- a/lib/msun/i387/e_remainder.S
+++ b/lib/msun/i387/e_remainder.S
@ -46,3 +46,4 @@ ENTRY(remainder)
 	jp	1b
 	fstp	%st(1)
 	ret
+END(remainder)
--- a/lib/msun/i387/e_remainderf.S
+++ b/lib/msun/i387/e_remainderf.S
@ -17,3 +17,4 @@ ENTRY(remainderf)
 	jp	1b
 	fstp	%st(1)
 	ret
+END(remainderf)
--- a/lib/msun/i387/e_sqrt.S
+++ b/lib/msun/i387/e_sqrt.S
@ -41,3 +41,4 @@ ENTRY(sqrt)
 	fldl	4(%esp)
 	fsqrt
 	ret
+END(sqrt)
--- a/lib/msun/i387/e_sqrtf.S
+++ b/lib/msun/i387/e_sqrtf.S
@ -12,3 +12,4 @@ ENTRY(sqrtf)
 	flds	4(%esp)
 	fsqrt
 	ret
+END(sqrtf)
--- a/lib/msun/i387/s_ceil.S
+++ b/lib/msun/i387/s_ceil.S
@ -56,3 +56,4 @@ ENTRY(ceil)

 	leave
 	ret
+END(ceil)
--- a/lib/msun/i387/s_ceilf.S
+++ b/lib/msun/i387/s_ceilf.S
@ -27,3 +27,4 @@ ENTRY(ceilf)

 	leave
 	ret
+END(ceilf)
--- a/lib/msun/i387/s_ceill.S
+++ b/lib/msun/i387/s_ceill.S
@ -25,3 +25,4 @@ ENTRY(ceill)

 	leave
 	ret
+END(ceill)
--- a/lib/msun/i387/s_copysign.S
+++ b/lib/msun/i387/s_copysign.S
@ -46,3 +46,4 @@ ENTRY(copysign)
 	movl	%eax,8(%esp)
 	fldl	4(%esp)
 	ret
+END(copysign)
--- a/lib/msun/i387/s_copysignf.S
+++ b/lib/msun/i387/s_copysignf.S
@ -17,3 +17,4 @@ ENTRY(copysignf)
 	movl	%eax,4(%esp)
 	flds	4(%esp)
 	ret
+END(copysignf)
--- a/lib/msun/i387/s_copysignl.S
+++ b/lib/msun/i387/s_copysignl.S
@ -15,3 +15,4 @@ ENTRY(copysignl)
 	movl	%eax,12(%esp)
 	fldt	4(%esp)
 	ret
+END(copysignl)
--- a/lib/msun/i387/s_cos.S
+++ b/lib/msun/i387/s_cos.S
@ -54,3 +54,4 @@ ENTRY(cos)
 	fstp	%st(1)
 	fcos
 	ret
+END(cos)
--- a/lib/msun/i387/s_finite.S
+++ b/lib/msun/i387/s_finite.S
@ -44,3 +44,4 @@ ENTRY(finite)
 	setneb	%al
 	andl	$0x000000ff, %eax
 	ret
+END(finite)
--- a/lib/msun/i387/s_floor.S
+++ b/lib/msun/i387/s_floor.S
@ -56,3 +56,4 @@ ENTRY(floor)

 	leave
 	ret
+END(floor)
--- a/lib/msun/i387/s_floorf.S
+++ b/lib/msun/i387/s_floorf.S
@ -27,3 +27,4 @@ ENTRY(floorf)

 	leave
 	ret
+END(floorf)
--- a/lib/msun/i387/s_floorl.S
+++ b/lib/msun/i387/s_floorl.S
@ -25,3 +25,4 @@ ENTRY(floorl)

 	leave
 	ret
+END(floorl)
--- a/lib/msun/i387/s_llrint.S
+++ b/lib/msun/i387/s_llrint.S
@ -34,3 +34,4 @@ ENTRY(llrint)
 	popl	%eax
 	popl	%edx
 	ret
+END(llrint)
--- a/lib/msun/i387/s_llrintf.S
+++ b/lib/msun/i387/s_llrintf.S
@ -34,3 +34,4 @@ ENTRY(llrintf)
 	popl	%eax
 	popl	%edx
 	ret
+END(llrintf)
--- a/lib/msun/i387/s_logb.S
+++ b/lib/msun/i387/s_logb.S
@ -42,3 +42,4 @@ ENTRY(logb)
 	fxtract
 	fstp	%st
 	ret
+END(logb)
--- a/lib/msun/i387/s_logbf.S
+++ b/lib/msun/i387/s_logbf.S
@ -13,3 +13,4 @@ ENTRY(logbf)
 	fxtract
 	fstp	%st
 	ret
+END(logbf)
--- a/lib/msun/i387/s_lrint.S
+++ b/lib/msun/i387/s_lrint.S
@ -33,3 +33,4 @@ ENTRY(lrint)
 	fistpl	(%esp)
 	popl	%eax
 	ret
+END(lrint)
--- a/lib/msun/i387/s_lrintf.S
+++ b/lib/msun/i387/s_lrintf.S
@ -33,3 +33,4 @@ ENTRY(lrintf)
 	fistpl	(%esp)
 	popl	%eax
 	ret
+END(lrintf)
--- a/lib/msun/i387/s_remquo.S
+++ b/lib/msun/i387/s_remquo.S
@ -60,3 +60,4 @@ ENTRY(remquo)
 	movl	20(%esp),%ecx
 	movl	%eax,(%ecx)
 	ret
+END(remquo)
--- a/lib/msun/i387/s_remquof.S
+++ b/lib/msun/i387/s_remquof.S
@ -60,3 +60,4 @@ ENTRY(remquof)
 	movl	12(%esp),%ecx
 	movl	%eax,(%ecx)
 	ret
+END(remquof)
--- a/lib/msun/i387/s_rint.S
+++ b/lib/msun/i387/s_rint.S
@ -41,3 +41,4 @@ ENTRY(rint)
 	fldl	4(%esp)
 	frndint
 	ret
+END(rint)
--- a/lib/msun/i387/s_rintf.S
+++ b/lib/msun/i387/s_rintf.S
@ -12,3 +12,4 @@ ENTRY(rintf)
 	flds	4(%esp)
 	frndint
 	ret
+END(rintf)
--- a/lib/msun/i387/s_scalbn.S
+++ b/lib/msun/i387/s_scalbn.S
@ -43,3 +43,4 @@ ENTRY(scalbn)
 	fscale
 	fstp	%st(1)
 	ret
+END(scalbn)
--- a/lib/msun/i387/s_scalbnf.S
+++ b/lib/msun/i387/s_scalbnf.S
@ -14,6 +14,7 @@ ENTRY(scalbnf)
 	fscale
 	fstp	%st(1)		/* bug fix for fp stack overflow */
 	ret
+END(scalbnf)

 .globl CNAME(ldexpf)
 .set	CNAME(ldexpf),CNAME(scalbnf)
--- a/lib/msun/i387/s_scalbnl.S
+++ b/lib/msun/i387/s_scalbnl.S
@ -14,6 +14,7 @@ ENTRY(scalbnl)
 	fscale
 	fstp	%st(1)
 	ret
+END(scalbnl)

 .globl CNAME(ldexpl)
 .set	CNAME(ldexpl),CNAME(scalbnl)
--- a/lib/msun/i387/s_significand.S
+++ b/lib/msun/i387/s_significand.S
@ -42,3 +42,4 @@ ENTRY(significand)
 	fxtract
 	fstp	%st(1)
 	ret
+END(significand)
--- a/lib/msun/i387/s_significandf.S
+++ b/lib/msun/i387/s_significandf.S
@ -13,3 +13,4 @@ ENTRY(significandf)
 	fxtract
 	fstp	%st(1)
 	ret
+END(significandf)
--- a/lib/msun/i387/s_sin.S
+++ b/lib/msun/i387/s_sin.S
@ -54,3 +54,4 @@ ENTRY(sin)
 	fstp	%st(1)
 	fsin
 	ret
+END(sin)
--- a/lib/msun/i387/s_tan.S
+++ b/lib/msun/i387/s_tan.S
@ -56,3 +56,4 @@ ENTRY(tan)
 	fptan
 	fstp	%st(0)
 	ret
+END(tan)
--- a/lib/msun/i387/s_trunc.S
+++ b/lib/msun/i387/s_trunc.S
@ -24,3 +24,4 @@ ENTRY(trunc)

 	leave
 	ret
+END(trunc)
--- a/lib/msun/i387/s_truncf.S
+++ b/lib/msun/i387/s_truncf.S
@ -24,3 +24,4 @@ ENTRY(truncf)

 	leave
 	ret
+END(truncf)
--- a/lib/msun/i387/s_truncl.S
+++ b/lib/msun/i387/s_truncl.S
@ -24,3 +24,4 @@ ENTRY(truncl)

 	leave
 	ret
+END(truncl)
--- a/lib/msun/ia64/s_fma.S
+++ b/lib/msun/ia64/s_fma.S
@ -32,3 +32,4 @@ ENTRY(fma, 3)
 	fma.d		f8 = f8, f9, f10
 	br.ret.sptk	b0
 }
+END(fma)
--- a/lib/msun/ia64/s_fmaf.S
+++ b/lib/msun/ia64/s_fmaf.S
@ -32,3 +32,4 @@ ENTRY(fmaf, 3)
 	fma.s		f8 = f8, f9, f10
 	br.ret.sptk	b0
 }
+END(fmaf)
--- a/lib/msun/ia64/s_fmal.S
+++ b/lib/msun/ia64/s_fmal.S
@ -32,3 +32,4 @@ ENTRY(fmal, 3)
 	fma		f8 = f8, f9, f10
 	br.ret.sptk	b0
 }
+END(fmal)
--- a/tools/KSE/ksetest/kse_asm.S
+++ b/tools/KSE/ksetest/kse_asm.S
@ -99,6 +99,7 @@ ENTRY(uts_to_thread)
 	pop	%ebx			/* %ebx off stack */
 	popf				/* flags off stack */
 5:	ret				/* %eip off stack */
+END(uts_to_thread)

 /*
 * int thread_to_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km);
@ -154,4 +155,5 @@ ENTRY(thread_to_uts)
 	pushl	KM_FUNC_OFFSET(%edx)	/* .. the uts can return to itself */
 	pushl	KM_FUNC_OFFSET(%edx)	/* push the address of the uts func */
 2:	ret
+END(thread_to_uts)

--- a/tools/KSE/rr/kse_asm.S
+++ b/tools/KSE/rr/kse_asm.S
@ -99,6 +99,7 @@ ENTRY(uts_to_thread)
 	pop	%ebx			/* %ebx off stack */
 	popf				/* flags off stack */
 5:	ret				/* %eip off stack */
+END(uts_to_thread)

 /*
 * int thread_to_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km);
@ -154,4 +155,5 @@ ENTRY(thread_to_uts)
 	pushl	KM_FUNC_OFFSET(%edx)	/* .. the uts can return to itself */
 	pushl	KM_FUNC_OFFSET(%edx)	/* push the address of the uts func */
 2:	ret
+END(thread_to_uts)