Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 06 Aug 2011 12:29:39 +0000
From:      xxp@FreeBSD.org
To:        svn-soc-all@FreeBSD.org
Subject:   socsvn commit: r224914 - in soc2011/xxp/xxp-head: lib/csu/i386-elf lib/libc/i386/gen lib/libc/i386/string lib/libc/i386/sys sys/i386/include
Message-ID:  <20110806122939.33AFF1065670@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: xxp
Date: Sat Aug  6 12:29:38 2011
New Revision: 224914
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=224914

Log:
  Review libc/i386

Modified:
  soc2011/xxp/xxp-head/lib/csu/i386-elf/crt1_s.S
  soc2011/xxp/xxp-head/lib/libc/i386/gen/_ctx_start.S
  soc2011/xxp/xxp-head/lib/libc/i386/gen/modf.S
  soc2011/xxp/xxp-head/lib/libc/i386/gen/rfork_thread.S
  soc2011/xxp/xxp-head/lib/libc/i386/gen/setjmp.S
  soc2011/xxp/xxp-head/lib/libc/i386/gen/sigsetjmp.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/bcmp.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/bcopy.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/bzero.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/index.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/memchr.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/memcmp.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/memset.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/rindex.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/strcat.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/strchr.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/strcpy.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/strncmp.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/strrchr.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/swab.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/wcschr.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/wcscmp.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/wcslen.S
  soc2011/xxp/xxp-head/lib/libc/i386/string/wmemchr.S
  soc2011/xxp/xxp-head/lib/libc/i386/sys/Ovfork.S
  soc2011/xxp/xxp-head/lib/libc/i386/sys/cerror.S
  soc2011/xxp/xxp-head/lib/libc/i386/sys/exect.S
  soc2011/xxp/xxp-head/lib/libc/i386/sys/getcontext.S
  soc2011/xxp/xxp-head/lib/libc/i386/sys/setlogin.S
  soc2011/xxp/xxp-head/lib/libc/i386/sys/syscall.S
  soc2011/xxp/xxp-head/sys/i386/include/asm.h

Modified: soc2011/xxp/xxp-head/lib/csu/i386-elf/crt1_s.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/csu/i386-elf/crt1_s.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/csu/i386-elf/crt1_s.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -33,13 +33,13 @@
 	.globl	_start
 	.type	_start, @function
 _start:
-	.cfi_startproc
+	cfi_startproc
 	xorl	%ebp,%ebp
 	pushl	%ebp
-	.cfi_def_cfa_offset 4
+	cfi_def_cfa_offset(4)
 	movl	%esp,%ebp
-	.cfi_offset %ebp,-8
-	.cfi_def_cfa_register %ebp
+	cfi_offset(%ebp,-8)
+	cfi_def_cfa_register(%ebp)
 	andl	$0xfffffff0,%esp # align stack
 	leal	8(%ebp),%eax
 	subl	$4,%esp
@@ -48,7 +48,7 @@
 	pushl	%edx		# rtld cleanup
 	call	_start1
 	int3
-	.cfi_endproc
+	cfi_endproc
 	.size	_start, . - _start
 
 	.section .note.GNU-stack,"",%progbits

Modified: soc2011/xxp/xxp-head/lib/libc/i386/gen/_ctx_start.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/gen/_ctx_start.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/gen/_ctx_start.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -40,14 +40,12 @@
  */
 ENTRY(_ctx_start)
 	popl	%eax		/* get start function */
-	cfi_adjust_cfa_offset(-4)
 	call	*%eax		/* call start function */
 	PIC_PROLOGUE
 	movl	%esi, %esp	/*
 				 * setup stack for completion routine;
 				 * ucp is now at top of stack
 				 */
-	cfi_register(%esi,%esp)
 	call	PIC_PLT(_ctx_done)	/* should never return */
 	call	PIC_PLT(abort)		/* fubar */
 	ret

Modified: soc2011/xxp/xxp-head/lib/libc/i386/gen/modf.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/gen/modf.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/gen/modf.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -49,9 +49,9 @@
 ENTRY(modf)
 	pushl %ebp
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ebp,-8)
 	movl %esp,%ebp
-	cfi_register(%esp,%ebp)
+	cfi_rel_offset(%ebp, 0)
+	cfi_def_cfa_register(%ebp) 
 	/* Check for Inf/NaN */
 	movl 12(%ebp),%eax
 	andl $0x7fffffff,%eax
@@ -59,7 +59,6 @@
 	jae 1f
 	/* Finite value */
 	subl $16,%esp
-	cfi_adjust_cfa_offset(16)
 	fnstcw -12(%ebp)
 	movw -12(%ebp),%dx
 	orw $3072,%dx
@@ -77,6 +76,7 @@
 	fldl 8(%ebp)
 	fsubl -8(%ebp)
 	leave
+	cfi_def_cfa(%esp, 0)
 	ret
 	/* Inf/NaN handling */
 1:	fldl 8(%ebp)
@@ -85,6 +85,7 @@
 	fldz
 	fdivp	/* return +/- 0 for +/- Inf, NaN for NaN */
 	leave
+	cfi_def_cfa(%esp, 0)
 	ret
 END(modf)
 

Modified: soc2011/xxp/xxp-head/lib/libc/i386/gen/rfork_thread.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/gen/rfork_thread.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/gen/rfork_thread.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -45,13 +45,8 @@
 
 ENTRY(rfork_thread)
 	pushl	%ebp
-	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ebp,-8)
 	movl	%esp, %ebp
-	cif_register(%esp,%ebp)
 	pushl	%esi
-	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ebp,-12)
 
 	/*
 	 * Push thread info onto the new thread's stack
@@ -70,9 +65,7 @@
 	 * Prepare and execute the thread creation syscall
 	 */
 	pushl	8(%ebp)
-	cfi_adjust_cfa_offset(4)
 	pushl	$0
-	cfi_adjust_cfa_offset(4)
 	movl	$SYS_rfork, %eax
 	KERNCALL
 	jb 	2f
@@ -83,14 +76,9 @@
 	cmpl	$0, %edx
 	jnz	1f
 	addl	$8, %esp
-	cfi_adjust_cfa_offset(-8)
 	popl	%esi
-	cfi_adjust_cfa_offset(4)
-	cfi_restore(%esi)
 	movl	%ebp, %esp
-	cfi_offset(%ebp,%esp)
 	popl	%ebp
-	cfi_adjust_cfa_offset(-4)
 	ret
 	.p2align 2
 
@@ -101,20 +89,15 @@
 	 */
 1:
 	movl	%esi,%esp
-	cfi_offset(%esi,%esp)
 	popl	%eax 
-	cfi_adjust_cfa_offset(-4)
 	call	*%eax
 	addl	$4, %esp
-	cfi_adjust_cfa_offset(-4)
 
 	/*
 	 * Exit system call
 	 */
 	pushl	%eax
-	cfi_adjust_cfa_offset(4)
 	pushl	$0
-	cfi_adjust_cfa_offset(4)
 #ifdef SYS_exit
 	movl	$SYS_exit, %eax
 #else
@@ -127,13 +110,9 @@
 	 */
 2:
 	addl	$8, %esp
-	cfi_adjust_cfa_offset(-8)
 	popl	%esi
-	cfi_adjust_cfa_offset(-4)
 	movl	%ebp, %esp
-	cfi_register(%ebp, %esp)
 	popl	%ebp
-	cfi_adjust_cfa_offset(-4)
 	PIC_PROLOGUE
 	jmp	PIC_PLT(HIDENAME(cerror))
 END(rfork_thread)

Modified: soc2011/xxp/xxp-head/lib/libc/i386/gen/setjmp.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/gen/setjmp.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/gen/setjmp.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -53,15 +53,10 @@
 	PIC_PROLOGUE
 	leal	28(%ecx), %eax
 	pushl	%eax			/* (sigset_t*)oset */
-	cfi_adjust_cfa_offset(4)
-	cfi_offset(%eax,-8)
 	pushl	$0			/* (sigset_t*)set  */
-	cfi_adjust_cfa_offset(4)
 	pushl	$1			/* SIG_BLOCK       */
-	cfi_adjust_cfa_offset(4)
 	call	PIC_PLT(CNAME(_sigprocmask))
 	addl	$12,%esp
-	cfi_adjust_cfa_offset(-12)
 	PIC_EPILOGUE
 	movl	4(%esp),%ecx
 	movl	0(%esp),%edx
@@ -82,16 +77,11 @@
 	movl	4(%esp),%edx
 	PIC_PROLOGUE
 	pushl	$0			/* (sigset_t*)oset */
-	cfi_adjust_cfa_offset(4)
 	leal	28(%edx), %eax
 	pushl	%eax			/* (sigset_t*)set  */
-	cfi_adjust_cfa_offset(4)
-	cfi_offset(%eax,-8)
 	pushl	$3			/* SIG_SETMASK     */
-	cfi_adjust_cfa_offset(4)
 	call	PIC_PLT(CNAME(_sigprocmask))
 	addl	$12,%esp
-	cfi_adjust_cfa_offset(-12)
 	PIC_EPILOGUE
 	movl	4(%esp),%edx
 	movl	8(%esp),%eax

Modified: soc2011/xxp/xxp-head/lib/libc/i386/gen/sigsetjmp.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/gen/sigsetjmp.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/gen/sigsetjmp.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -62,15 +62,10 @@
 	PIC_PROLOGUE
 	leal	28(%ecx), %eax
 	pushl	%eax			/* (sigset_t*)oset */
-	cfi_adjust_cfa_offset(4)
-	cfi_offset(%eax,-8)
 	pushl	$0			/* (sigset_t*)set  */
-	cfi_adjust_cfa_offset(4)
 	pushl	$1			/* SIG_BLOCK       */
-	cfi_adjust_cfa_offset(4)
 	call	PIC_PLT(CNAME(_sigprocmask))
 	addl	$12,%esp
-	cfi_adjust_cfa_offset(-12)
 	PIC_EPILOGUE
 	movl	4(%esp),%ecx
 2:	movl	0(%esp),%edx
@@ -93,16 +88,11 @@
 	jz	2f
 	PIC_PROLOGUE
 	pushl	$0			/* (sigset_t*)oset */
-	cfi_adjust_cfa_offset(4)
 	leal	28(%edx), %eax
 	pushl	%eax			/* (sigset_t*)set  */
-	cfi_adjust_cfa_offset(4)
-	cfi_offset(%eax,-12)
 	pushl	$3			/* SIG_SETMASK     */
-	cfi_adjust_cfa_offset(4)
 	call	PIC_PLT(CNAME(_sigprocmask))
 	addl	$12,%esp
-	cfi_adjust_cfa_offset(-12)
 	PIC_EPILOGUE
 	movl	4(%esp),%edx
 2:	movl	8(%esp),%eax

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/bcmp.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/bcmp.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/bcmp.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -41,12 +41,12 @@
 ENTRY(bcmp)
 	pushl	%edi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-8)
 	pushl	%esi
-	cfi_offset(%esi,-12)
 	cfi_adjust_cfa_offset(4)
 	movl	12(%esp),%edi
+	cfi_rel_offset(%edi, 4)
 	movl	16(%esp),%esi
+	cfi_rel_offset(%esi, 0)
 	cld				/* set compare direction forward */
 
 	movl	20(%esp),%ecx		/* compare by words */

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/bcopy.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/bcopy.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/bcopy.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -52,17 +52,19 @@
 #endif
 	pushl	%esi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%esi,-8)
 	pushl	%edi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%esi,-12)
 #if defined(MEMCOPY) || defined(MEMMOVE)
 	movl	12(%esp),%edi
+	cfi_rel_offset(%edi, 0)
 	movl	16(%esp),%esi
+	cfi_rel_offset(%esi, 4)
 	movl	%edi,%eax
 #else
 	movl	12(%esp),%esi
+	cfi_rel_offset(%edi, 0)
 	movl	16(%esp),%edi
+	cfi_rel_offset(%esi, 4)
 #endif
 	movl	20(%esp),%ecx
 	movl	%edi,%edx
@@ -80,8 +82,10 @@
 	movsb
 	popl	%edi
 	cfi_adjust_cfa_offset(-4)
+	cfi_restore(%edi)
 	popl	%esi
 	cfi_adjust_cfa_offset(-4)
+	cfi_restore(%esi)
 	ret
 1:
 	addl	%ecx,%edi	/* copy backwards. */

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/bzero.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/bzero.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/bzero.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -42,11 +42,10 @@
 ENTRY(bzero)
 	pushl	%edi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-8)
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-12)
 	movl	12(%esp),%edi
+	cfi_rel_offset(%edi, 4)
 	movl	16(%esp),%ecx
 
 	cld				/* set fill direction forward */
@@ -64,6 +63,7 @@
 	negl	%edx
 	andl	$3,%edx
 	movl	%ecx,%ebx
+	cfi_rel_offset(%ebx, 0)
 	subl	%edx,%ebx
 
 	movl	%edx,%ecx		/* zero until word aligned */

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/index.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/index.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/index.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -48,7 +48,7 @@
 ENTRY(index)
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ebx,-8)
+	cfi_rel_offset(%ebx, 0)
 	movl	8(%esp),%eax
 	movb	12(%esp),%cl
 	.align 2,0x90

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/memchr.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/memchr.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/memchr.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -42,8 +42,8 @@
 ENTRY(memchr)
 	pushl	%edi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-8)
 	movl	8(%esp),%edi		/* string address */
+	cfi_rel_offset(%edi, 0)
 	movl	12(%esp),%eax		/* set character to search for */
 	movl	16(%esp),%ecx		/* set length of search */
 	testl	%esp,%esp		/* clear Z flag, for len == 0 */

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/memcmp.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/memcmp.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/memcmp.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -40,9 +40,13 @@
 
 ENTRY(memcmp)
 	pushl	%edi
+	cfi_adjust_cfa_offset(4)
 	pushl	%esi
+	cfi_adjust_cfa_offset(4)
 	movl	12(%esp),%edi
+	cfi_rel_offset(%edi, 4)
 	movl	16(%esp),%esi
+	cfi_rel_offset(%esi, 0)
 	cld				/* set compare direction forward */
 
 	movl	20(%esp),%ecx		/* compare by words */
@@ -59,7 +63,11 @@
 
 	xorl	%eax,%eax		/* we match, return zero	*/
 	popl	%esi
+	cfi_adjust_cfa_offset(-4)
+	cfi_restore(%esi)
 	popl	%edi
+	cfi_adjust_cfa_offset(-4)
+	cfi_restore(%edi)
 	ret
 
 L5:	movl	$4,%ecx			/* We know that one of the next	*/
@@ -71,7 +79,11 @@
         movzbl  -1(%esi),%edx
         subl    %edx,%eax
 	popl	%esi
+	cfi_adjust_cfa_offset(-4)
+	cfi_restore(%esi)
 	popl	%edi
+	cfi_adjust_cfa_offset(-4)
+	cfi_restore(%edi)
 	ret
 END(memcmp)
 

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/memset.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/memset.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/memset.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -43,16 +43,15 @@
 ENTRY(memset)
 	pushl	%edi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-8)
+	cfi_rel_offset(%edi, 0)
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-12)
+	cfi_rel_offset(%ebx, 0)
 	movl	12(%esp),%edi
 	movzbl	16(%esp),%eax		/* unsigned char, zero extend */
 	movl	20(%esp),%ecx
 	pushl	%edi			/* push address of buffer */
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-16)
 
 	cld				/* set fill direction forward */
 

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/rindex.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/rindex.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/rindex.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -48,7 +48,7 @@
 ENTRY(rindex)
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ebx,-8)
+	cfi_rel_offset(%ebx, 0)
 	movl	8(%esp),%edx
 	movb	12(%esp),%cl
 	xorl	%eax,%eax		/* init pointer to null */

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/strcat.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/strcat.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/strcat.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -49,12 +49,11 @@
 ENTRY(strcat)
 	pushl	%edi			/* save edi */
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-8)
 	movl	8(%esp),%edi		/* dst address */
+	cfi_rel_offset(%edi, 0)
 	movl	12(%esp),%edx		/* src address */
 	pushl	%edi			/* push destination address */
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-12)
 
 	cld				/* set search forward */
 	xorl	%eax,%eax		/* set search for null terminator */

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/strchr.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/strchr.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/strchr.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -48,7 +48,6 @@
 ENTRY(strchr)
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ebx,-8)
 	movl	8(%esp),%eax
 	movb	12(%esp),%cl
 	.align 2,0x90

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/strcpy.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/strcpy.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/strcpy.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -50,7 +50,6 @@
 	movl	8(%esp),%edx		/* src address */
 	pushl	%ecx			/* push dst address */
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ecx,-8)
 
 	.align 2,0x90
 L1:	movb	(%edx),%al		/* unroll loop, but not too much */
@@ -89,7 +88,6 @@
 	jne	L1
 L2:	popl	%eax			/* pop dst address */
 	cfi_adjust_cfa_offset(-4)
-	cfi_restore(%eax)
 	ret
 END(strcpy)
 

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/strncmp.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/strncmp.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/strncmp.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -56,7 +56,7 @@
 ENTRY(strncmp)
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ebx,-8)
+	cfi_rel_offset(%ebx, 0)
 	movl	8(%esp),%eax
 	movl	12(%esp),%ecx
 	movl	16(%esp),%edx

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/strrchr.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/strrchr.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/strrchr.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -48,7 +48,7 @@
 ENTRY(strrchr)
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ebx,-8)
+	cfi_rel_offset(%ebx, 0)
 	movl	8(%esp),%edx
 	movb	12(%esp),%cl
 	xorl	%eax,%eax		/* init pointer to null */

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/swab.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/swab.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/swab.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -47,12 +47,12 @@
 ENTRY(swab)
 	pushl	%esi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%esi,-8)
 	pushl	%edi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-12)
 	movl	12(%esp),%esi
+	cfi_rel_offset(%esi, 4)
 	movl	16(%esp),%edi
+	cfi_rel_offset(%edi, 0)
 	movl	20(%esp),%ecx
 
 	cld				# set direction forward

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/wcschr.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/wcschr.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/wcschr.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -38,7 +38,7 @@
 	movl	8(%esp),%eax		/* Character */
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ebx,-8)
+	cfi_rel_offset(%ebx, 0)
 .p2align 4,0x90
 L1:	movl	(%ecx),%ebx
 	cmpl	%eax,%ebx

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/wcscmp.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/wcscmp.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/wcscmp.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -36,12 +36,12 @@
 ENTRY(wcscmp)
 	pushl	%edi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-8)
 	pushl	%esi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%esi,-12)
 	movl	12(%esp),%edi		/* s1 */
+	cfi_rel_offset(%edi, 4)
 	movl	16(%esp),%esi		/* s2 */
+	cfi_rel_offset(%edi, 0)
 .p2align 4,0x90
 top:	movl	(%edi),%eax
 	cmpl	%eax,(%esi)

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/wcslen.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/wcslen.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/wcslen.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -35,7 +35,9 @@
 ENTRY(wcslen)
 	movl	4(%esp),%ecx		/* String */
 	pushl	%ebx
+	cfi_adjust_cfa_offset(4)
 	xorl	%ebx,%ebx
+	cfi_rel_offset(%ebx, 0)
 	xorl	%eax,%eax
 .p2align 4,0x90
 L1:	cmpl	%ebx,(%ecx)
@@ -65,6 +67,8 @@
 found2:	incl	%eax
 found1:	incl	%eax
 found0:	popl	%ebx
+	cfi_adjust_cfa_offset(-4)
+	cfi_restore(%ebx)
 	ret
 END(wcslen)
 

Modified: soc2011/xxp/xxp-head/lib/libc/i386/string/wmemchr.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/string/wmemchr.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/string/wmemchr.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -37,11 +37,10 @@
 ENTRY(wmemchr)
 	pushl	%edi
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%edi,-8)
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
-	cfi_offset(%ebx,-12)
 	movl	12(%esp),%edi		/* Buffer */
+	cfi_rel_offset(%edi, 4)
 	movl	16(%esp),%eax		/* Wide character */
 	movl	20(%esp),%ecx		/* Length of buffer */
 
@@ -49,6 +48,7 @@
 	 * Search in chunks of 8 wide characters (32 bytes).
 	 */
 	movl	%ecx,%ebx
+	cfi_rel_offset(%ebx, 0)
 	shrl	$3,%ecx
 	jz	small
 .p2align 4,0x90
@@ -74,7 +74,11 @@
 	jmp	small
 found:	movl	%edi,%eax
 	popl	%ebx
+	cfi_adjust_cfa_offst(-4)
+	cfi_restore(%ebx)
 	popl	%edi
+	cfi_adjust_cfa_offst(-4)
+	cfi_restore(%edi)
 	ret
 found4:	leal	4(%edi),%edi
 	jmp	found

Modified: soc2011/xxp/xxp-head/lib/libc/i386/sys/Ovfork.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/sys/Ovfork.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/sys/Ovfork.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -44,14 +44,12 @@
 	.set	vfork,__sys_vfork
 ENTRY(__sys_vfork)
 	popl	%ecx		/* my rta into ecx */
-	cfi_adjust_cfa_offset(-4)
 	mov	$SYS_vfork,%eax
 	KERNCALL
 	jb	1f
 	jmp	*%ecx
 1:
 	pushl	%ecx
-	cfi_adjust_cfa_offset(4)
 	PIC_PROLOGUE
 	jmp     PIC_PLT(HIDENAME(cerror))
 END(__sys_vfork)

Modified: soc2011/xxp/xxp-head/lib/libc/i386/sys/cerror.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/sys/cerror.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/sys/cerror.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -49,17 +49,14 @@
 	.type	CNAME(__error),@function
 HIDENAME(cerror):
 	pushl	%eax
-	cfi_adjust_cfa_offset(4)
 #ifdef PIC
 	/* The caller must execute the PIC prologue before jumping to cerror. */
 	call	PIC_PLT(CNAME(__error))
 	popl	%ecx
-	cfi_adjust_cfa_offset(-4)
 	PIC_EPILOGUE
 #else
 	call	CNAME(__error)
 	popl	%ecx
-	cfi_adjust_cfa_offset(-4)
 #endif
 	movl	%ecx,(%eax)
 	movl	$-1,%eax

Modified: soc2011/xxp/xxp-head/lib/libc/i386/sys/exect.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/sys/exect.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/sys/exect.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -42,14 +42,14 @@
 ENTRY(exect)
 	mov	$SYS_execve,%eax
 	pushf
-	cfi_adjust_cfa_offset(2)
+	cfi_adjust_cfa_offset(4)
 	popl	%edx
 	cfi_adjust_cfa_offset(-4)
 	orl	$ PSL_T,%edx
 	pushl	%edx
 	cfi_adjust_cfa_offset(4)
 	popf
-	cfi_adjust_cfa_offset(-2)
+	cfi_adjust_cfa_offset(-4)
 	KERNCALL
 	PIC_PROLOGUE
 	jmp	PIC_PLT(HIDENAME(cerror))	/* exect(file, argv, env); */

Modified: soc2011/xxp/xxp-head/lib/libc/i386/sys/getcontext.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/sys/getcontext.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/sys/getcontext.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -44,7 +44,6 @@
 	KERNCALL
 	jb	1f
 	addl	$4,%esp		/* remove stale (setcontext) return address */
-	cfi_adjust_cfa_offset(-4)
 	jmp	*%ecx		/* restore return address */
 1:
 	PIC_PROLOGUE

Modified: soc2011/xxp/xxp-head/lib/libc/i386/sys/setlogin.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/sys/setlogin.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/sys/setlogin.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -44,11 +44,9 @@
 #ifdef PIC
 	PIC_PROLOGUE
 	pushl	%eax
-	cfi_adjust_cfa_offset(4)
 	movl	PIC_GOT(CNAME(_logname_valid)),%eax
 	movl	$0,(%eax)
 	popl	%eax
-	cfi_adjust_cfa_offset(-4)
 	PIC_EPILOGUE
 #else
 	movl	$0,CNAME(_logname_valid)

Modified: soc2011/xxp/xxp-head/lib/libc/i386/sys/syscall.S
==============================================================================
--- soc2011/xxp/xxp-head/lib/libc/i386/sys/syscall.S	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/lib/libc/i386/sys/syscall.S	Sat Aug  6 12:29:38 2011	(r224914)
@@ -40,15 +40,11 @@
 
 ENTRY(syscall)
 	pop	%ecx	/* rta */
-	cfi_adjust_cfa_offset(-4)
 	pop	%eax	/* syscall number */
-	cfi_adjust_cfa_offset(-4)
 	push	%ecx
-	cfi_adjust_cfa_offset(4)
 	KERNCALL
 	push	%ecx	/* need to push a word to keep stack frame intact
 			   upon return; the word must be the return address. */
-	cfi_adjust_cfa_offset(4)
 	jb	1f
 	ret
 1:

Modified: soc2011/xxp/xxp-head/sys/i386/include/asm.h
==============================================================================
--- soc2011/xxp/xxp-head/sys/i386/include/asm.h	Sat Aug  6 11:43:00 2011	(r224913)
+++ soc2011/xxp/xxp-head/sys/i386/include/asm.h	Sat Aug  6 12:29:38 2011	(r224914)
@@ -41,15 +41,12 @@
 #ifdef PIC
 #define	PIC_PROLOGUE	\
 	pushl	%ebx;	\
-	cfi_adjust_cfa_offset(4);	\
 	call	1f;	\
 1:			\
 	popl	%ebx;	\
-	cfi_adjust_cfa_offset(-4);	\
 	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b],%ebx
 #define	PIC_EPILOGUE	\
 	popl	%ebx	\
-	cfi_adjust_cfa_offset(-4); 	\
 #define	PIC_PLT(x)	x@PLT
 #define	PIC_GOT(x)	x@GOT(%ebx)
 #else
@@ -81,21 +78,21 @@
 #ifdef PROF
 #define	ALTENTRY(x)	_ENTRY(x); \
 			pushl %ebp; \
-			cfi_adjust_cfa_offset(4); cfi_offset(%ebp,-4); \
+			cfi_adjust_cfa_offset(4); \
 			movl %esp,%ebp; \
-			cfi_register(%esp,%ebp); \
+			cfi_def_cfa_register(%ebp); \
 			call PIC_PLT(HIDENAME(mcount)); \
 			popl %ebp; \
-			cfi_def_cfa(%esp,4); cfi_restore(%ebp); \
+			cfi_def_cfa(%esp,4); \
 			jmp 9f
 #define	ENTRY(x)	_ENTRY(x); \
 			pushl %ebp; \
-			cfi_adjust_cfa_offset(4); cfi_offset(%ebp,-4); \
+			cfi_adjust_cfa_offset(4); \
 			movl %esp,%ebp; \
-			cfi_register(%esp,%ebp); cfi_def_cfa_register(%ebp); \
+			cfi_def_cfa_register(%ebp); \
 			call PIC_PLT(HIDENAME(mcount)); \
 			popl %ebp; \
-			cfi_def_cfa(%esp,4); cfi_restore(%ebp); \
+			cfi_def_cfa(%esp,4); \
 			9:
 #else
 #define	ALTENTRY(x)	_ENTRY(x)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110806122939.33AFF1065670>