socsvn commit: r223767 - in soc2011/xxp/xxp-head/lib: libc/amd64/gen libc/amd64/sys msun/amd64

xxp at FreeBSD.org xxp at FreeBSD.org
Mon Jun 27 15:12:33 UTC 2011 

Author: xxp
Date: Mon Jun 27 15:12:31 2011
New Revision: 223767
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223767

Log:
  Annotate libc, msun for amd64

Modified:
  soc2011/xxp/xxp-head/lib/libc/amd64/gen/_setjmp.S
  soc2011/xxp/xxp-head/lib/libc/amd64/gen/rfork_thread.S
  soc2011/xxp/xxp-head/lib/libc/amd64/gen/setjmp.S
  soc2011/xxp/xxp-head/lib/libc/amd64/gen/sigsetjmp.S
  soc2011/xxp/xxp-head/lib/libc/amd64/sys/brk.S
  soc2011/xxp/xxp-head/lib/libc/amd64/sys/cerror.S
  soc2011/xxp/xxp-head/lib/libc/amd64/sys/exect.S
  soc2011/xxp/xxp-head/lib/libc/amd64/sys/getcontext.S
  soc2011/xxp/xxp-head/lib/libc/amd64/sys/sbrk.S
  soc2011/xxp/xxp-head/lib/libc/amd64/sys/vfork.S
  soc2011/xxp/xxp-head/lib/msun/amd64/s_llrintl.S
  soc2011/xxp/xxp-head/lib/msun/amd64/s_lrintl.S

Modified: soc2011/xxp/xxp-head/lib/libc/amd64/gen/_setjmp.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/amd64/gen/_setjmp.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/libc/amd64/gen/_setjmp.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -48,6 +48,7 @@
 
 ENTRY(_setjmp)
 	movq	%rdi,%rax
+	cfi_register(%rdi, $rax)
 	movq	0(%rsp),%rdx		/* retval */
 	movq	%rdx, 0(%rax)		/* 0; retval */
 	movq	%rbx, 8(%rax)		/* 1; rbx */
@@ -67,6 +68,7 @@
 	.set	CNAME(_longjmp),CNAME(___longjmp)
 ENTRY(___longjmp)
 	movq	%rdi,%rdx
+	cfi_register(%rdi, $rdx)
 	/* Restore the mxcsr, but leave exception flags intact. */
 	stmxcsr	-4(%rsp)
 	movl	68(%rdx),%eax
@@ -77,6 +79,7 @@
 	movl	%edi,-4(%rsp)
 	ldmxcsr -4(%rsp)
 	movq	%rsi,%rax		/* retval */
+	cfi_register(%rsi, $rax)
 	movq	0(%rdx),%rcx
 	movq	8(%rdx),%rbx
 	movq	16(%rdx),%rsp

Modified: soc2011/xxp/xxp-head/lib/libc/amd64/gen/rfork_thread.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/amd64/gen/rfork_thread.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/libc/amd64/gen/rfork_thread.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -46,7 +46,9 @@
 
 ENTRY(rfork_thread)
 	pushq	%rbx
+	cfi_adjust_cfa_offset(8)
 	pushq	%r12
+	cfi_adjust_cfa_offset(8)
 	movq	%rdx, %rbx
 	movq	%rcx, %r12
 
@@ -63,7 +65,9 @@
 	cmpl	$0, %edx
 	jnz	1f
 	popq	%r12
+	cfi_adjust_cfa_offset(-8)
 	popq	%rbx
+	cfi_adjust_cfa_offset(-8)
 	ret
 
 	/*
@@ -92,7 +96,9 @@
 	 */
 2:
 	popq	%r12
+	cfi_adjust_cfa_offset(-8)
 	popq	%rbx
+	cfi_adjust_cfa_offset(-8)
 #ifdef PIC
 	movq	PIC_GOT(HIDENAME(cerror)), %rdx
 	jmp	*%rdx

Modified: soc2011/xxp/xxp-head/lib/libc/amd64/gen/setjmp.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/amd64/gen/setjmp.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/libc/amd64/gen/setjmp.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -50,12 +50,14 @@
 
 ENTRY(setjmp)
 	pushq	%rdi
+	cfi_adjust_cfa_offset(8)
 	movq	%rdi,%rcx
 	movq	$1,%rdi			/* SIG_BLOCK       */
 	movq	$0,%rsi			/* (sigset_t*)set  */
 	leaq	72(%rcx),%rdx		/* 9,10; (sigset_t*)oset */
 	call	PIC_PLT(CNAME(_sigprocmask))
 	popq	%rdi
+	cfi_adjust_cfa_offset(-8)
 	movq	%rdi,%rcx
 	movq	0(%rsp),%rdx		/* retval */
 	movq	%rdx, 0(%rcx)		/* 0; retval */
@@ -76,14 +78,18 @@
 	.set CNAME(longjmp),CNAME(__longjmp)
 ENTRY(__longjmp)
 	pushq	%rdi
+	cfi_adjust_cfa_offset(8)
 	pushq	%rsi
+	cfi_adjust_cfa_offset(8)
 	movq	%rdi,%rdx
 	movq	$3,%rdi			/* SIG_SETMASK     */
 	leaq	72(%rdx),%rsi		/* (sigset_t*)set  */
 	movq	$0,%rdx			/* (sigset_t*)oset */
 	call	PIC_PLT(CNAME(_sigprocmask))
 	popq	%rsi
+	cfi_adjust_cfa_offset(-8)
 	popq	%rdi			/* jmpbuf */
+	cfi_adjust_cfa_offset(-8)
 	movq	%rdi,%rdx
 	/* Restore the mxcsr, but leave exception flags intact. */
 	stmxcsr	-4(%rsp)

Modified: soc2011/xxp/xxp-head/lib/libc/amd64/gen/sigsetjmp.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/amd64/gen/sigsetjmp.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/libc/amd64/gen/sigsetjmp.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -58,12 +58,14 @@
 	testl	%esi,%esi
 	jz	2f
 	pushq	%rdi
+	cfi_adjust_cfa_offset(8)
 	movq	%rdi,%rcx
 	movq	$1,%rdi			/* SIG_BLOCK       */
 	movq	$0,%rsi			/* (sigset_t*)set  */
 	leaq	72(%rcx),%rdx		/* 9,10 (sigset_t*)oset */
 	call	PIC_PLT(CNAME(_sigprocmask))
 	popq	%rdi
+	cfi_adjust_cfa_offset(-8)
 2:	movq	%rdi,%rcx
 	movq	0(%rsp),%rdx		/* retval */
 	movq	%rdx, 0(%rcx)		/* 0; retval */
@@ -86,13 +88,17 @@
 	jz	2f
 	movq	%rdi,%rdx
 	pushq	%rdi
+	cfi_adjust_cfa_offset(8)
 	pushq	%rsi
+	cfi_adjust_cfa_offset(8)
 	movq	$3,%rdi			/* SIG_SETMASK     */
 	leaq	72(%rdx),%rsi		/* (sigset_t*)set  */
 	movq	$0,%rdx			/* (sigset_t*)oset */
 	call	PIC_PLT(CNAME(_sigprocmask))
 	popq	%rsi
+	cfi_adjust_cfa_offset(-8)
 	popq	%rdi			/* jmpbuf */
+	cfi_adjust_cfa_offset(-8)
 2:	movq	%rdi,%rdx
 	movq	%rsi,%rax		/* retval */
 	movq	0(%rdx),%rcx

Modified: soc2011/xxp/xxp-head/lib/libc/amd64/sys/brk.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/amd64/sys/brk.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/libc/amd64/sys/brk.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -42,12 +42,15 @@
 	.globl	HIDENAME(minbrk)
 ENTRY(_brk)
 	pushq	%rdi
+	cfi_adjust_cfa_offset(8)
 	jmp	ok
 END(_brk)
 
 ENTRY(brk)
 	pushq	%rdi
+	cfi_adjust_cfa_offset(8)
 	movq	%rdi,%rax
+	cfi_register(%rdi, %rax)
 #ifdef PIC
 	movq	PIC_GOT(HIDENAME(minbrk)),%rdx
 	cmpq	%rax,(%rdx)
@@ -73,9 +76,11 @@
 #endif
 	movq	$0,%rax
 	popq	%rdi
+	cfi_restore(%rdi)
 	ret
 err:
 	addq	$8, %rsp
+	cfi_adjust_cfa_offset(-8)
 #ifdef PIC
 	movq	PIC_GOT(HIDENAME(cerror)),%rdx
 	jmp	*%rdx

Modified: soc2011/xxp/xxp-head/lib/libc/amd64/sys/cerror.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/amd64/sys/cerror.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/libc/amd64/sys/cerror.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -49,8 +49,10 @@
 	.type	CNAME(__error), at function
 HIDENAME(cerror):
 	pushq	%rax
+	cfi_adjust_cfa_offset(8)
 	call	PIC_PLT(CNAME(__error))
 	popq	%rcx
+	cfi_adjust_cfa_offset(-8)
 	movl	%ecx,(%rax)
 	movq	$-1,%rax
 	movq	$-1,%rdx

Modified: soc2011/xxp/xxp-head/lib/libc/amd64/sys/exect.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/amd64/sys/exect.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/libc/amd64/sys/exect.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -42,10 +42,14 @@
 ENTRY(exect)
 	movq	$SYS_execve,%rax
 	pushfq
+	cfi_adjust_cfa_offset(8)
 	popq	%r8
+	cfi_adjust_cfa_offset(-8)
 	orq	$PSL_T,%r8
 	pushq	%r8
+	cfi_adjust_cfa_offset(8)
 	popfq
+	cfi_adjust_cfa_offset(-8)
 	KERNCALL
 #ifdef PIC
 	movq	PIC_GOT(HIDENAME(cerror)),%rdx

Modified: soc2011/xxp/xxp-head/lib/libc/amd64/sys/getcontext.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/amd64/sys/getcontext.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/libc/amd64/sys/getcontext.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -44,6 +44,7 @@
 	KERNCALL
 	jb	1f
 	addq	$8,%rsp		/* remove stale (setcontext) return address */
+	cfi_adjust_cfa_offset(-8)
 	jmp	*%rsi		/* restore return address */
 1:
 #ifdef PIC

Modified: soc2011/xxp/xxp-head/lib/libc/amd64/sys/sbrk.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/amd64/sys/sbrk.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/libc/amd64/sys/sbrk.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -49,7 +49,9 @@
 
 ENTRY(sbrk)
 	pushq	%rdi
+	cfi_adjust_cfa_offset(8)
 	movq	%rdi,%rcx
+	cif_register(%rdi, %rcx)
 #ifdef PIC
 	movq	PIC_GOT(HIDENAME(curbrk)),%rdx
 	movq	(%rdx),%rax
@@ -76,9 +78,11 @@
 #endif
 back:
 	addq	$8, %rsp
+	cfi_adjust_cfa_offset(-8)
 	ret
 err:
 	addq	$8, %rsp
+	cfi_adjust_cfa_offset(-8)
 #ifdef PIC
 	movq	PIC_GOT(HIDENAME(cerror)),%rdx
 	jmp	*%rdx

Modified: soc2011/xxp/xxp-head/lib/libc/amd64/sys/vfork.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/amd64/sys/vfork.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/libc/amd64/sys/vfork.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -44,12 +44,14 @@
 	.set	vfork,__sys_vfork
 ENTRY(__sys_vfork)
 	popq	%rsi		/* fetch return address (%rsi preserved) */
+	cfi_adjust_cfa_offset(-8)
 	mov	$SYS_vfork,%rax
 	KERNCALL
 	jb	1f
 	jmp	*%rsi
 1:
 	pushq	%rsi
+	cfi_adjust_cfa_offset(8)
 #ifdef PIC
 	movq	PIC_GOT(HIDENAME(cerror)),%rdx
 	jmp	*%rdx

Modified: soc2011/xxp/xxp-head/lib/msun/amd64/s_llrintl.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/msun/amd64/s_llrintl.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/msun/amd64/s_llrintl.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -30,8 +30,10 @@
 ENTRY(llrintl)
 	fldt	8(%rsp)
 	subq	$8,%rsp
+	cfi_adjust_cfa_offset(8)
 	fistpll	(%rsp)
 	popq	%rax
+	cfi_adjust_cfa_offset(-8)
 	ret
 
 	.section .note.GNU-stack,"",%progbits

Modified: soc2011/xxp/xxp-head/lib/msun/amd64/s_lrintl.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/msun/amd64/s_lrintl.S	Mon Jun 27 13:58:24 2011	(r223766)
+++ soc2011/xxp/xxp-head/lib/msun/amd64/s_lrintl.S	Mon Jun 27 15:12:31 2011	(r223767)
@@ -30,8 +30,10 @@
 ENTRY(lrintl)
 	fldt	8(%rsp)
 	subq	$8,%rsp
+	cfi_adjust_cfa_offset(8)
 	fistpll	(%rsp)
 	popq	%rax
+	cfi_adjust_cfa_offset(-8)
 	ret
 
 	.section .note.GNU-stack,"",%progbits

More information about the svn-soc-all mailing list