[Linux-vax-usr-commit] glibc/sysdeps/vax DEFS.h,1.3,1.4 bcopy.S,1.4,1.5 bsd-_setjmp.S,1.4,1.5 bsd-setjmp.S,1.3,1.4 bzero.S,1.4,1.5 ffs.S,1.2,1.3 htonl.S,1.2,1.3 htons.S,1.2,1.3 memchr.S,1.3,1.4 memcmp.S,1.3,1.4 memmove.S,1.4,1.5 memset.S,1.4,1.5 strcat.S,1.3,1.4 strchr.S,1.3,1.4 strcmp.S,1.3,1.4 strcpy.S,1.4,1.5 strcspn.S,1.4,1.5 strlen.S,1.2,1.3 strncat.S,1.4,1.5 strncmp.S,1.3,1.4 strncpy.S,1.4,1.5 strpbrk.S,1.4,1.5 strrchr.S,1.3,1.4 strsep.S,1.4,1.5 strspn.S,1.4,1.5 strstr.S,1.4,1.5 sysdep.h,1.1,1.2

[<ai...@us...>]

Update of /cvsroot/linux-vax/glibc/sysdeps/vax
In directory sc8-pr-cvs1:/tmp/cvs-serv30301

Modified Files:
	DEFS.h bcopy.S bsd-_setjmp.S bsd-setjmp.S bzero.S ffs.S 
	htonl.S htons.S memchr.S memcmp.S memmove.S memset.S strcat.S 
	strchr.S strcmp.S strcpy.S strcspn.S strlen.S strncat.S 
	strncmp.S strncpy.S strpbrk.S strrchr.S strsep.S strspn.S 
	strstr.S sysdep.h 
Log Message:
DA: add size and type to assembler files by modifiying entry and end parameters
(needed for linker to stop warnings and crashage)



Index: DEFS.h
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/DEFS.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DEFS.h	15 Aug 2003 13:07:30 -0000	1.3
+++ DEFS.h	16 Jan 2004 13:26:29 -0000	1.4
@@ -42,6 +42,7 @@
 #define	R10	0x400
 #define	R11	0x800
 
+#if 0
 #ifdef PROF
 #define	ENTRY(x, regs) \
 	.globl /**/x; .align 2; /**/x: .word regs; \
@@ -55,3 +56,6 @@
 #define	ASENTRY(x, regs) \
 	.globl x; .align 2; x: .word regs
 #endif
+#endif
+
+#include <sysdep.h>

Index: bcopy.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/bcopy.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bcopy.S	15 Aug 2003 13:25:42 -0000	1.4
+++ bcopy.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -72,3 +72,4 @@
 	subl2	%r6,%r3
 	movc3	%r6,(%r1),(%r3)
 	ret
+END(bcopy)

Index: bsd-_setjmp.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/bsd-_setjmp.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bsd-_setjmp.S	15 Aug 2003 13:07:31 -0000	1.4
+++ bsd-_setjmp.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -23,10 +23,11 @@
 
 #include <sysdep.h>
 
-ENTRY (_setjmp)
+ENTRY (_setjmp, 0)
 	movl (%sp)+,%r0			/* Pop return PC.  */
 	movl (%sp)+,%r1			/* Pop jmp_buf argument.  */
 	pushl $0		/* Push second argument of zero.  */
 	pushl %r1		/* Push back first argument.  */
 	pushl %r0		/* Push back return PC.  */
 	jmp C_SYMBOL_NAME (__sigsetjmp)
+END(_setjmp)

Index: bsd-setjmp.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/bsd-setjmp.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bsd-setjmp.S	15 Aug 2003 13:07:31 -0000	1.3
+++ bsd-setjmp.S	16 Jan 2004 13:26:29 -0000	1.4
@@ -23,10 +23,11 @@
 
 #include <sysdep.h>
 
-ENTRY (setjmp)
+ENTRY (setjmp, 0)
 	movl (%sp)+,%r0			/* Pop return PC.  */
 	movl (%sp)+,%r1			/* Pop jmp_buf argument.  */
 	pushl $1		/* Push second argument of one.  */
 	pushl %r1		/* Push back first argument.  */
 	pushl %r0		/* Push back return PC.  */
 	jmp C_SYMBOL_NAME (__sigsetjmp)
+END(setjmp)

Index: bzero.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/bzero.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bzero.S	15 Aug 2003 13:07:31 -0000	1.4
+++ bzero.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -47,4 +47,5 @@
 	jgtr	1b
 	movc5	$0,(%r3),$0,8(%ap),(%r3)
 	ret
+END(__bzero)
 weak_alias (__bzero, bzero)

Index: ffs.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/ffs.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ffs.S	15 Aug 2003 13:25:42 -0000	1.2
+++ ffs.S	16 Jan 2004 13:26:29 -0000	1.3
@@ -42,4 +42,5 @@
 1:
 	incl	%r0
 	ret
+END(__ffs)
 weak_alias (__ffs, ffs)

Index: htonl.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/htonl.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- htonl.S	27 Aug 2003 12:02:58 -0000	1.2
+++ htonl.S	16 Jan 2004 13:26:29 -0000	1.3
@@ -28,4 +28,5 @@
 	insv	%r0,$16,$8,%r0
 	movb	7(%ap),%r0
 	ret
+END(htonl)
 weak_alias (htonl, ntohl)

Index: htons.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/htons.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- htons.S	27 Aug 2003 12:02:59 -0000	1.2
+++ htons.S	16 Jan 2004 13:26:29 -0000	1.3
@@ -28,4 +28,5 @@
 	movb	5(%ap),%r0
 	movzwl	%r0,%r0
 	ret
+END(htons)
 weak_alias (htons, ntohs)

Index: memchr.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/memchr.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- memchr.S	15 Aug 2003 13:07:31 -0000	1.3
+++ memchr.S	16 Jan 2004 13:26:29 -0000	1.4
@@ -67,7 +67,7 @@
 	decw	%r0		# from 0 to 65535
 	subl2	%r0,%r4		# adjust n
 	brb	0b		# and loop
-
+END(__memchr)
 weak_alias (__memchr, memchr)
 #if !__BOUNDED_POINTERS__
 weak_alias (__memchr, __ubp_memchr)

Index: memcmp.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/memcmp.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- memcmp.S	15 Aug 2003 13:07:31 -0000	1.3
+++ memcmp.S	16 Jan 2004 13:26:29 -0000	1.4
@@ -55,5 +55,5 @@
 	cmpc3	%r5,(%r1),(%r3)
 	jeql	0b		/* loop if same */
 	jbr	1b
-
+END(memcmp)
 weak_alias (memcmp, bcmp)

Index: memmove.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/memmove.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- memmove.S	15 Aug 2003 13:25:42 -0000	1.4
+++ memmove.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -87,3 +87,4 @@
 	subl2	%r0,%r1
 	subl2	%r0,%r3
 	brb	5b
+END(memmove)

Index: memset.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/memset.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- memset.S	15 Aug 2003 13:25:42 -0000	1.4
+++ memset.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -49,3 +49,4 @@
 	subl2	%r0,12(%ap)
 	movc5	$0,(%r3),%r1,%r0,(%r3)
 	jbr	1b
+END(memset)	

Index: strcat.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strcat.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- strcat.S	15 Aug 2003 13:25:42 -0000	1.3
+++ strcat.S	16 Jan 2004 13:26:29 -0000	1.4
@@ -60,3 +60,4 @@
 	movc3	%r1,(%r7),(%r3)	# copy remainder
 	movl	%r6,%r0
 	ret
+END(strcat)

Index: strchr.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strchr.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- strchr.S	15 Aug 2003 13:25:42 -0000	1.3
+++ strchr.S	16 Jan 2004 13:26:29 -0000	1.4
@@ -99,5 +99,6 @@
 	beql	2f		/* not found: return NULL */
 	movl	%r1,%r0
 2:	ret
-
+END(strchr)
+	
 weak_alias (strchr, index)

Index: strcmp.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strcmp.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- strcmp.S	15 Aug 2003 13:25:42 -0000	1.3
+++ strcmp.S	16 Jan 2004 13:26:29 -0000	1.4
@@ -79,3 +79,4 @@
 4:
 	clrl	%r0		# both the same to null
 	ret
+END(strcmp)

Index: strcpy.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strcpy.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- strcpy.S	15 Aug 2003 13:25:42 -0000	1.4
+++ strcpy.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -56,3 +56,4 @@
 	movc3	%r1,(%r6),(%r3)	# copy remainder
 	movl	4(%ap),%r0	# return base of s1
 	ret
+END(strcpy)

Index: strcspn.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strcspn.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- strcspn.S	15 Aug 2003 13:25:42 -0000	1.4
+++ strcspn.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -60,3 +60,4 @@
 	decl	%r0		/* s-- */
 	subl2	%r1,%r0		/* r0 = s - s1 = count */
 	ret
+END(strcspn)

Index: strlen.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strlen.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- strlen.S	15 Aug 2003 13:25:42 -0000	1.2
+++ strlen.S	16 Jan 2004 13:26:29 -0000	1.3
@@ -46,3 +46,4 @@
 	beql	1b
 	subl3	4(%ap),%r1,%r0	# len = cp - base
 	ret
+END(strlen)

Index: strncat.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strncat.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- strncat.S	15 Aug 2003 13:25:42 -0000	1.4
+++ strncat.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -77,3 +77,4 @@
 done:
 	movl	4(%ap),%r0	# return s1
 	ret
+END(strncat)

Index: strncmp.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strncmp.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- strncmp.S	15 Aug 2003 13:25:42 -0000	1.3
+++ strncmp.S	16 Jan 2004 13:26:29 -0000	1.4
@@ -83,3 +83,4 @@
 5:
 	clrl	%r0		# both the same to null
 	ret
+END(strncmp)

Index: strncpy.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strncpy.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- strncpy.S	15 Aug 2003 13:25:42 -0000	1.4
+++ strncpy.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -78,3 +78,4 @@
 done:
 	movl	4(%ap),%r0	# return s1
 	ret
+END(strncpy)

Index: strpbrk.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strpbrk.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- strpbrk.S	15 Aug 2003 13:25:42 -0000	1.4
+++ strpbrk.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -62,3 +62,4 @@
 3:
 	clrl	%r0
 	ret
+END(strpbrk)

Index: strrchr.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strrchr.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- strrchr.S	15 Aug 2003 13:25:42 -0000	1.3
+++ strrchr.S	16 Jan 2004 13:26:29 -0000	1.4
@@ -108,5 +108,5 @@
 3:
 	movl	%r5,%r0		/* return stashed pointer */
 	ret
-
+END(strrchr)
 weak_alias (strrchr, rindex)

Index: strsep.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strsep.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- strsep.S	15 Aug 2003 13:25:42 -0000	1.4
+++ strsep.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -79,3 +79,4 @@
 3:
 	clrl	(%r1)		/* else *stringp = NULL */
 	ret
+END(strsep)

Index: strspn.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strspn.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- strspn.S	15 Aug 2003 13:25:42 -0000	1.4
+++ strspn.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -64,3 +64,4 @@
 	decl	%r0		/* s-- */
 	subl2	%r1,%r0		/* r0 = s - s1 = count */
 	ret
+END(strspn)

Index: strstr.S
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/strstr.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- strstr.S	15 Aug 2003 13:25:42 -0000	1.4
+++ strstr.S	16 Jan 2004 13:26:29 -0000	1.5
@@ -107,3 +107,4 @@
 	bneq	5b		/* loop until strncmp says rest same too */
 	subl3	$1,%r3,%r0	/* return previous s1 */
 	ret
+END(strstr)

Index: sysdep.h
===================================================================
RCS file: /cvsroot/linux-vax/glibc/sysdeps/vax/sysdep.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sysdep.h	12 Sep 2001 23:14:41 -0000	1.1
+++ sysdep.h	16 Jan 2004 13:26:29 -0000	1.2
@@ -49,11 +49,12 @@
 #endif
 
 /* Define an entry point visible from C.  */
-#define	ENTRY(name)							      \
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name);				      \
+#define	ENTRY(name,regs)							\
+  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name);    				\
   ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),function)			      \
   .align ALIGNARG(4);							      \
   C_LABEL(name)								      \
+       .word regs;                                                            \
   CALL_MCOUNT
 
 #undef	END
@@ -62,7 +63,8 @@
 
 /* If compiled for profiling, call `mcount' at the start of each function.  */
 #ifdef	PROF
-#define CALL_MCOUNT             /* FIXME */
+/* FIXME -maybe*/
+#define CALL_MCOUNT    .data; 1:; .long 0; .text; moval 1b,%r0; jsb mcount;
 #else
 #define CALL_MCOUNT		/* Do nothing.  */
 #endif