Doug / smarc-fsl-linux-kernel | Embedian Git Server

Commit d6359fd783251238dbbf70b7c2fc745db25cf51f

Authored by Roman Zippel 2006-10-06 15:43:55 +0800

Committed by Linus Torvalds 2006-10-06 23:53:40 +0800

Exists in master and in 7 other branches

[PATCH] m68k: cleanup string functions

- cleanup asm of string functions
- deinline strncat()/strncmp()
- provide non-inlined strcpy()

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 102 additions and 115 deletions Inline Diff

arch/m68k/kernel/m68k_ksyms.c
arch/m68k/lib/string.c
include/asm-m68k/string.h

arch/m68k/kernel/m68k_ksyms.c

Diff comments View file @ d6359fd

 #include <linux/module.h>
 #include <linux/linkage.h>
 #include <linux/sched.h>
-#include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/in6.h>
 #include <linux/interrupt.h>
 #include <asm/setup.h>
 #include <asm/machdep.h>
 #include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
 #include <asm/checksum.h>
 asmlinkage long long __ashldi3 (long long, int);
 asmlinkage long long __ashrdi3 (long long, int);
 asmlinkage long long __lshrdi3 (long long, int);
 asmlinkage long long __muldi3 (long long, long long);
 extern char m68k_debug_device[];
 /* platform dependent support */
 EXPORT_SYMBOL(m68k_machtype);
 EXPORT_SYMBOL(m68k_cputype);
 EXPORT_SYMBOL(m68k_is040or060);
 EXPORT_SYMBOL(m68k_realnum_memory);
 EXPORT_SYMBOL(m68k_memory);
 #ifndef CONFIG_SUN3
 EXPORT_SYMBOL(cache_push);
 EXPORT_SYMBOL(cache_clear);
 #ifndef CONFIG_SINGLE_MEMORY_CHUNK
 EXPORT_SYMBOL(mm_vtop);
 EXPORT_SYMBOL(mm_ptov);
 EXPORT_SYMBOL(mm_end_of_chunk);
 #else
 EXPORT_SYMBOL(m68k_memoffset);
 #endif /* !CONFIG_SINGLE_MEMORY_CHUNK */
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(kernel_set_cachemode);
 #endif /* !CONFIG_SUN3 */
 EXPORT_SYMBOL(m68k_debug_device);
 EXPORT_SYMBOL(mach_hwclk);
 EXPORT_SYMBOL(mach_get_ss);
 EXPORT_SYMBOL(mach_get_rtc_pll);
 EXPORT_SYMBOL(mach_set_rtc_pll);
 #ifdef CONFIG_INPUT_M68K_BEEP_MODULE
 EXPORT_SYMBOL(mach_beep);
 #endif
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(dump_thread);
-EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strrchr);
-EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(kernel_thread);
 #ifdef CONFIG_VME
 EXPORT_SYMBOL(vme_brdtype);
 #endif
 /* The following are special because they're not called
    explicitly (the C compiler generates them).  Fortunately,
    their interface isn't gonna change any time soon now, so
    it's OK to leave it out of version control.  */
 EXPORT_SYMBOL(__ashldi3);
 EXPORT_SYMBOL(__ashrdi3);
 EXPORT_SYMBOL(__lshrdi3);
 EXPORT_SYMBOL(__muldi3);
 EXPORT_SYMBOL(__down_failed);
 EXPORT_SYMBOL(__down_failed_interruptible);
 EXPORT_SYMBOL(__down_failed_trylock);
 EXPORT_SYMBOL(__up_wakeup);

arch/m68k/lib/string.c

Diff comments View file @ d6359fd

+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
-#include <linux/types.h>
+#define __IN_STRING_C
 #include <linux/module.h>
+#include <linux/string.h>
+char *strcpy(char *dest, const char *src)
+{
+	return __kernel_strcpy(dest, src);
+}
+EXPORT_SYMBOL(strcpy);
 void *memset(void *s, int c, size_t count)
 {
 	void *xs = s;
 	size_t temp, temp1;
 	if (!count)
 		return xs;
 	c &= 0xff;
 	c |= c << 8;
 	c |= c << 16;
 	if ((long)s & 1) {
 		char *cs = s;
 		*cs++ = c;
 		s = cs;
 		count--;
 	}
 	if (count > 2 && (long)s & 2) {
 		short *ss = s;
 		*ss++ = c;
 		s = ss;
 		count -= 2;
 	}
 	temp = count >> 2;
 	if (temp) {
 		long *ls = s;
 		asm volatile (
 			"	movel %1,%2\n"
 			"	andw  #7,%2\n"
 			"	lsrl  #3,%1\n"
 			"	negw  %2\n"
 			"	jmp   %%pc@(2f,%2:w:2)\n"
 			"1:	movel %3,%0@+\n"
 			"	movel %3,%0@+\n"
 			"	movel %3,%0@+\n"
 			"	movel %3,%0@+\n"
 			"	movel %3,%0@+\n"
 			"	movel %3,%0@+\n"
 			"	movel %3,%0@+\n"
 			"	movel %3,%0@+\n"
 			"2:	dbra  %1,1b\n"
 			"	clrw  %1\n"
 			"	subql #1,%1\n"
 			"	jpl   1b"
 			: "=a" (ls), "=d" (temp), "=&d" (temp1)
 			: "d" (c), "0" (ls), "1" (temp));
 		s = ls;
 	}
 	if (count & 2) {
 		short *ss = s;
 		*ss++ = c;
 		s = ss;
 	}
 	if (count & 1) {
 		char *cs = s;
 		*cs = c;
 	}
 	return xs;
 }
 EXPORT_SYMBOL(memset);
 void *memcpy(void *to, const void *from, size_t n)
 {
 	void *xto = to;
 	size_t temp, temp1;
 	if (!n)
 		return xto;
 	if ((long)to & 1) {
 		char *cto = to;
 		const char *cfrom = from;
 		*cto++ = *cfrom++;
 		to = cto;
 		from = cfrom;
 		n--;
 	}
 	if (n > 2 && (long)to & 2) {
 		short *sto = to;
 		const short *sfrom = from;
 		*sto++ = *sfrom++;
 		to = sto;
 		from = sfrom;
 		n -= 2;
 	}
 	temp = n >> 2;
 	if (temp) {
 		long *lto = to;
 		const long *lfrom = from;
 		asm volatile (
 			"	movel %2,%3\n"
 			"	andw  #7,%3\n"
 			"	lsrl  #3,%2\n"
 			"	negw  %3\n"
 			"	jmp   %%pc@(1f,%3:w:2)\n"
 			"4:	movel %0@+,%1@+\n"
 			"	movel %0@+,%1@+\n"
 			"	movel %0@+,%1@+\n"
 			"	movel %0@+,%1@+\n"
 			"	movel %0@+,%1@+\n"
 			"	movel %0@+,%1@+\n"
 			"	movel %0@+,%1@+\n"
 			"	movel %0@+,%1@+\n"
 			"1:	dbra  %2,4b\n"
 			"	clrw  %2\n"
 			"	subql #1,%2\n"
 			"	jpl   4b"
 			: "=a" (lfrom), "=a" (lto), "=d" (temp), "=&d" (temp1)
 			: "0" (lfrom), "1" (lto), "2" (temp));
 		to = lto;
 		from = lfrom;
 	}
 	if (n & 2) {
 		short *sto = to;
 		const short *sfrom = from;
 		*sto++ = *sfrom++;
 		to = sto;
 		from = sfrom;
 	}
 	if (n & 1) {
 		char *cto = to;
 		const char *cfrom = from;
 		*cto = *cfrom;
 	}
 	return xto;
 }
 EXPORT_SYMBOL(memcpy);
 void *memmove(void *dest, const void *src, size_t n)
 {
 	void *xdest = dest;
 	size_t temp;
 	if (!n)
 		return xdest;
 	if (dest < src) {
 		if ((long)dest & 1) {
 			char *cdest = dest;
 			const char *csrc = src;
 			*cdest++ = *csrc++;
 			dest = cdest;
 			src = csrc;
 			n--;
 		}
 		if (n > 2 && (long)dest & 2) {
 			short *sdest = dest;
 			const short *ssrc = src;
 			*sdest++ = *ssrc++;
 			dest = sdest;
 			src = ssrc;
 			n -= 2;
 		}
 		temp = n >> 2;
 		if (temp) {
 			long *ldest = dest;
 			const long *lsrc = src;
 			temp--;
 			do
 				*ldest++ = *lsrc++;
 			while (temp--);
 			dest = ldest;
 			src = lsrc;
 		}
 		if (n & 2) {
 			short *sdest = dest;
 			const short *ssrc = src;
 			*sdest++ = *ssrc++;
 			dest = sdest;
 			src = ssrc;
 		}
 		if (n & 1) {
 			char *cdest = dest;
 			const char *csrc = src;
 			*cdest = *csrc;
 		}
 	} else {
 		dest = (char *)dest + n;
 		src = (const char *)src + n;
 		if ((long)dest & 1) {
 			char *cdest = dest;
 			const char *csrc = src;
 			*--cdest = *--csrc;
 			dest = cdest;
 			src = csrc;
 			n--;
 		}
 		if (n > 2 && (long)dest & 2) {
 			short *sdest = dest;
 			const short *ssrc = src;
 			*--sdest = *--ssrc;
 			dest = sdest;
 			src = ssrc;
 			n -= 2;
 		}
 		temp = n >> 2;
 		if (temp) {
 			long *ldest = dest;
 			const long *lsrc = src;
 			temp--;
 			do
 				*--ldest = *--lsrc;
 			while (temp--);
 			dest = ldest;
 			src = lsrc;
 		}
 		if (n & 2) {
 			short *sdest = dest;
 			const short *ssrc = src;
 			*--sdest = *--ssrc;
 			dest = sdest;
 			src = ssrc;
 		}
 		if (n & 1) {
 			char *cdest = dest;
 			const char *csrc = src;
 			*--cdest = *--csrc;
 		}
 	}
 	return xdest;
 }
 EXPORT_SYMBOL(memmove);
 int memcmp(const void *cs, const void *ct, size_t count)
 {
 	const unsigned char *su1, *su2;
 	for (su1 = cs, su2 = ct; count > 0; ++su1, ++su2, count--)
 		if (*su1 != *su2)
 			return *su1 < *su2 ? -1 : +1;
 	return 0;
 }
 EXPORT_SYMBOL(memcmp);

include/asm-m68k/string.h

Diff comments View file @ d6359fd

1	#ifndef _M68K_STRING_H_	1	#ifndef _M68K_STRING_H_
2	#define _M68K_STRING_H_	2	#define _M68K_STRING_H_
3		3
4	#include <asm/setup.h>	4	#include <linux/types.h>
5	#include <asm/page.h>	5	#include <linux/compiler.h>
6		6
7	#define __HAVE_ARCH_STRCPY	7	static inline size_t __kernel_strlen(const char *s)
8	static inline char * strcpy(char * dest,const char *src)
9	{	8	{
10	char *xdest = dest;	9	const char *sc;
11		10
12	__asm__ __volatile__	11	for (sc = s; *sc++; )
13	("1:\tmoveb %1@+,%0@+\n\t"	12	;
14	"jne 1b"	13	return sc - s - 1;
15	: "=a" (dest), "=a" (src)
16	: "0" (dest), "1" (src) : "memory");
17	return xdest;
18	}	14	}
19		15
20	#define __HAVE_ARCH_STRNCPY	16	static inline char __kernel_strcpy(char dest, const char *src)
21	static inline char * strncpy(char dest, const char src, size_t n)
22	{	17	{
23	char *xdest = dest;	18	char *xdest = dest;
24		19
25	if (n == 0)	20	asm volatile ("\n"
26	return xdest;	21	"1: move.b (%1)+,(%0)+\n"
27		22	" jne 1b"
28	__asm__ __volatile__	23	: "+a" (dest), "+a" (src)
29	("1:\tmoveb %1@+,%0@+\n\t"	24	: : "memory");
30	"jeq 2f\n\t"	25	return xdest;
31	"subql #1,%2\n\t"
32	"jne 1b\n\t"
33	"2:"
34	: "=a" (dest), "=a" (src), "=d" (n)
35	: "0" (dest), "1" (src), "2" (n)
36	: "memory");
37	return xdest;
38	}	26	}
39		27
40	#define __HAVE_ARCH_STRCAT	28	#ifndef __IN_STRING_C
41	static inline char * strcat(char * dest, const char * src)
42	{
43	char *tmp = dest;
44		29
45	while (*dest)	30	#define __HAVE_ARCH_STRLEN
46	dest++;	31	#define strlen(s) (__builtin_constant_p(s) ? \
47	while ((dest++ = src++))	32	__builtin_strlen(s) : \
48	;	33	__kernel_strlen(s))
49		34
50	return tmp;	35	#define __HAVE_ARCH_STRNLEN
51	}	36	static inline size_t strnlen(const char *s, size_t count)
52
53	#define __HAVE_ARCH_STRNCAT
54	static inline char * strncat(char dest, const char src, size_t count)
55	{	37	{
56	char *tmp = dest;	38	const char *sc = s;
57		39
58	if (count) {	40	asm volatile ("\n"
59	while (*dest)	41	"1: subq.l #1,%1\n"
60	dest++;	42	" jcs 2f\n"
61	while ((dest++ = src++)) {	43	" tst.b (%0)+\n"
62	if (--count == 0) {	44	" jne 1b\n"
63	*dest++='\0';	45	" subq.l #1,%0\n"
64	break;	46	"2:"
65	}	47	: "+a" (sc), "+d" (count));
66	}	48	return sc - s;
67	}
68
69	return tmp;
70	}	49	}
71		50
72	#define __HAVE_ARCH_STRCHR	51	#define __HAVE_ARCH_STRCPY
73	static inline char * strchr(const char * s, int c)	52	#if __GNUC__ >= 4
		53	#define strcpy(d, s) (__builtin_constant_p(s) && \
		54	__builtin_strlen(s) <= 32 ? \
		55	__builtin_strcpy(d, s) : \
		56	__kernel_strcpy(d, s))
		57	#else
		58	#define strcpy(d, s) __kernel_strcpy(d, s)
		59	#endif
		60
		61	#define __HAVE_ARCH_STRNCPY
		62	static inline char strncpy(char dest, const char *src, size_t n)
74	{	63	{
75	const char ch = c;	64	char *xdest = dest;
76		65
77	for(; *s != ch; ++s)	66	asm volatile ("\n"
78	if (*s == '\0')	67	" jra 2f\n"
79	return( NULL );	68	"1: move.b (%1),(%0)+\n"
80	return( (char *) s);	69	" jeq 2f\n"
		70	" addq.l #1,%1\n"
		71	"2: subq.l #1,%2\n"
		72	" jcc 1b\n"
		73	: "+a" (dest), "+a" (src), "+d" (n)
		74	: : "memory");
		75	return xdest;
81	}	76	}
82		77
83	/* strstr !! */	78	#define __HAVE_ARCH_STRCAT
		79	#define strcat(d, s) ({ \
		80	char *__d = (d); \
		81	strcpy(__d + strlen(__d), (s)); \
		82	})
84		83
85	#define __HAVE_ARCH_STRLEN	84	#define __HAVE_ARCH_STRCHR
86	static inline size_t strlen(const char * s)	85	static inline char strchr(const char s, int c)
87	{	86	{
88	const char *sc;	87	char sc, ch = c;
89	for (sc = s; *sc != '\0'; ++sc) ;	88
90	return(sc - s);	89	for (; (sc = *s++) != ch; ) {
		90	if (!sc)
		91	return NULL;
		92	}
		93	return (char *)s - 1;
91	}	94	}
92		95
93	/* strnlen !! */
94
95	#define __HAVE_ARCH_STRCMP	96	#define __HAVE_ARCH_STRCMP
96	static inline int strcmp(const char * cs,const char * ct)	97	static inline int strcmp(const char cs, const char ct)
97	{	98	{
98	char __res;	99	char res;
99		100
100	__asm__	101	asm ("\n"
101	("1:\tmoveb %0@+,%2\n\t" /* get cs /	102	"1: move.b (%0)+,%2\n" /* get cs /
102	"cmpb %1@+,%2\n\t" /* compare a byte */	103	" cmp.b (%1)+,%2\n" /* compare a byte */
103	"jne 2f\n\t" /* not equal, break out */	104	" jne 2f\n" /* not equal, break out */
104	"tstb %2\n\t" /* at end of cs? */	105	" tst.b %2\n" /* at end of cs? */
105	"jne 1b\n\t" /* no, keep going */	106	" jne 1b\n" /* no, keep going */
106	"jra 3f\n\t" /* strings are equal */	107	" jra 3f\n" /* strings are equal */
107	"2:\tsubb %1@-,%2\n\t" /* cs - ct */	108	"2: sub.b -(%1),%2\n" /* cs - ct */
108	"3:"	109	"3:"
109	: "=a" (cs), "=a" (ct), "=d" (__res)	110	: "+a" (cs), "+a" (ct), "=d" (res));
110	: "0" (cs), "1" (ct));	111	return res;
111	return __res;
112	}	112	}
113		113
114	#define __HAVE_ARCH_STRNCMP
115	static inline int strncmp(const char * cs,const char * ct,size_t count)
116	{
117	char __res;
118
119	if (!count)
120	return 0;
121	__asm__
122	("1:\tmovb %0@+,%3\n\t" /* get cs /
123	"cmpb %1@+,%3\n\t" /* compare a byte */
124	"jne 3f\n\t" /* not equal, break out */
125	"tstb %3\n\t" /* at end of cs? */
126	"jeq 4f\n\t" /* yes, all done */
127	"subql #1,%2\n\t" /* no, adjust count */
128	"jne 1b\n\t" /* more to do, keep going */
129	"2:\tmoveq #0,%3\n\t" /* strings are equal */
130	"jra 4f\n\t"