提交 d6359fd7 编写于 作者: R Roman Zippel 提交者: Linus Torvalds

[PATCH] m68k: cleanup string functions

- cleanup asm of string functions
- deinline strncat()/strncmp()
- provide non-inlined strcpy()
Signed-off-by: NRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 7236e978
#include <linux/module.h> #include <linux/module.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/string.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/user.h> #include <linux/user.h>
#include <linux/elfcore.h> #include <linux/elfcore.h>
...@@ -53,9 +52,6 @@ EXPORT_SYMBOL(mach_beep); ...@@ -53,9 +52,6 @@ EXPORT_SYMBOL(mach_beep);
#endif #endif
EXPORT_SYMBOL(dump_fpu); EXPORT_SYMBOL(dump_fpu);
EXPORT_SYMBOL(dump_thread); EXPORT_SYMBOL(dump_thread);
EXPORT_SYMBOL(strnlen);
EXPORT_SYMBOL(strrchr);
EXPORT_SYMBOL(strstr);
EXPORT_SYMBOL(kernel_thread); EXPORT_SYMBOL(kernel_thread);
#ifdef CONFIG_VME #ifdef CONFIG_VME
EXPORT_SYMBOL(vme_brdtype); EXPORT_SYMBOL(vme_brdtype);
......
/*
* 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.
*/
#define __IN_STRING_C
#include <linux/types.h>
#include <linux/module.h> #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 *memset(void *s, int c, size_t count)
{ {
......
#ifndef _M68K_STRING_H_ #ifndef _M68K_STRING_H_
#define _M68K_STRING_H_ #define _M68K_STRING_H_
#include <asm/setup.h> #include <linux/types.h>
#include <asm/page.h> #include <linux/compiler.h>
#define __HAVE_ARCH_STRCPY static inline size_t __kernel_strlen(const char *s)
static inline char * strcpy(char * dest,const char *src)
{ {
char *xdest = dest; const char *sc;
__asm__ __volatile__
("1:\tmoveb %1@+,%0@+\n\t"
"jne 1b"
: "=a" (dest), "=a" (src)
: "0" (dest), "1" (src) : "memory");
return xdest;
}
#define __HAVE_ARCH_STRNCPY for (sc = s; *sc++; )
static inline char * strncpy(char *dest, const char *src, size_t n) ;
{ return sc - s - 1;
char *xdest = dest;
if (n == 0)
return xdest;
__asm__ __volatile__
("1:\tmoveb %1@+,%0@+\n\t"
"jeq 2f\n\t"
"subql #1,%2\n\t"
"jne 1b\n\t"
"2:"
: "=a" (dest), "=a" (src), "=d" (n)
: "0" (dest), "1" (src), "2" (n)
: "memory");
return xdest;
} }
#define __HAVE_ARCH_STRCAT static inline char *__kernel_strcpy(char *dest, const char *src)
static inline char * strcat(char * dest, const char * src)
{ {
char *tmp = dest; char *xdest = dest;
while (*dest) asm volatile ("\n"
dest++; "1: move.b (%1)+,(%0)+\n"
while ((*dest++ = *src++)) " jne 1b"
; : "+a" (dest), "+a" (src)
: : "memory");
return tmp; return xdest;
} }
#define __HAVE_ARCH_STRNCAT #ifndef __IN_STRING_C
static inline char * strncat(char *dest, const char *src, size_t count)
{
char *tmp = dest;
if (count) {
while (*dest)
dest++;
while ((*dest++ = *src++)) {
if (--count == 0) {
*dest++='\0';
break;
}
}
}
return tmp; #define __HAVE_ARCH_STRLEN
} #define strlen(s) (__builtin_constant_p(s) ? \
__builtin_strlen(s) : \
__kernel_strlen(s))
#define __HAVE_ARCH_STRCHR #define __HAVE_ARCH_STRNLEN
static inline char * strchr(const char * s, int c) static inline size_t strnlen(const char *s, size_t count)
{ {
const char ch = c; const char *sc = s;
for(; *s != ch; ++s) asm volatile ("\n"
if (*s == '\0') "1: subq.l #1,%1\n"
return( NULL ); " jcs 2f\n"
return( (char *) s); " tst.b (%0)+\n"
" jne 1b\n"
" subq.l #1,%0\n"
"2:"
: "+a" (sc), "+d" (count));
return sc - s;
} }
/* strstr !! */ #define __HAVE_ARCH_STRCPY
#if __GNUC__ >= 4
#define strcpy(d, s) (__builtin_constant_p(s) && \
__builtin_strlen(s) <= 32 ? \
__builtin_strcpy(d, s) : \
__kernel_strcpy(d, s))
#else
#define strcpy(d, s) __kernel_strcpy(d, s)
#endif
#define __HAVE_ARCH_STRLEN #define __HAVE_ARCH_STRNCPY
static inline size_t strlen(const char * s) static inline char *strncpy(char *dest, const char *src, size_t n)
{ {
const char *sc; char *xdest = dest;
for (sc = s; *sc != '\0'; ++sc) ;
return(sc - s); asm volatile ("\n"
" jra 2f\n"
"1: move.b (%1),(%0)+\n"
" jeq 2f\n"
" addq.l #1,%1\n"
"2: subq.l #1,%2\n"
" jcc 1b\n"
: "+a" (dest), "+a" (src), "+d" (n)
: : "memory");
return xdest;
} }
/* strnlen !! */ #define __HAVE_ARCH_STRCAT
#define strcat(d, s) ({ \
char *__d = (d); \
strcpy(__d + strlen(__d), (s)); \
})
#define __HAVE_ARCH_STRCMP #define __HAVE_ARCH_STRCHR
static inline int strcmp(const char * cs,const char * ct) static inline char *strchr(const char *s, int c)
{ {
char __res; char sc, ch = c;
__asm__ for (; (sc = *s++) != ch; ) {
("1:\tmoveb %0@+,%2\n\t" /* get *cs */ if (!sc)
"cmpb %1@+,%2\n\t" /* compare a byte */ return NULL;
"jne 2f\n\t" /* not equal, break out */ }
"tstb %2\n\t" /* at end of cs? */ return (char *)s - 1;
"jne 1b\n\t" /* no, keep going */
"jra 3f\n\t" /* strings are equal */
"2:\tsubb %1@-,%2\n\t" /* *cs - *ct */
"3:"
: "=a" (cs), "=a" (ct), "=d" (__res)
: "0" (cs), "1" (ct));
return __res;
} }
#define __HAVE_ARCH_STRNCMP #define __HAVE_ARCH_STRCMP
static inline int strncmp(const char * cs,const char * ct,size_t count) static inline int strcmp(const char *cs, const char *ct)
{ {
char __res; char res;
if (!count) asm ("\n"
return 0; "1: move.b (%0)+,%2\n" /* get *cs */
__asm__ " cmp.b (%1)+,%2\n" /* compare a byte */
("1:\tmovb %0@+,%3\n\t" /* get *cs */ " jne 2f\n" /* not equal, break out */
"cmpb %1@+,%3\n\t" /* compare a byte */ " tst.b %2\n" /* at end of cs? */
"jne 3f\n\t" /* not equal, break out */ " jne 1b\n" /* no, keep going */
"tstb %3\n\t" /* at end of cs? */ " jra 3f\n" /* strings are equal */
"jeq 4f\n\t" /* yes, all done */ "2: sub.b -(%1),%2\n" /* *cs - *ct */
"subql #1,%2\n\t" /* no, adjust count */ "3:"
"jne 1b\n\t" /* more to do, keep going */ : "+a" (cs), "+a" (ct), "=d" (res));
"2:\tmoveq #0,%3\n\t" /* strings are equal */ return res;
"jra 4f\n\t"
"3:\tsubb %1@-,%3\n\t" /* *cs - *ct */
"4:"
: "=a" (cs), "=a" (ct), "=d" (count), "=d" (__res)
: "0" (cs), "1" (ct), "2" (count));
return __res;
} }
#define __HAVE_ARCH_MEMSET #define __HAVE_ARCH_MEMSET
...@@ -150,4 +126,6 @@ extern void *memmove(void *, const void *, __kernel_size_t); ...@@ -150,4 +126,6 @@ extern void *memmove(void *, const void *, __kernel_size_t);
extern int memcmp(const void *, const void *, __kernel_size_t); extern int memcmp(const void *, const void *, __kernel_size_t);
#define memcmp(d, s, n) __builtin_memcmp(d, s, n) #define memcmp(d, s, n) __builtin_memcmp(d, s, n)
#endif
#endif /* _M68K_STRING_H_ */ #endif /* _M68K_STRING_H_ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册