m68k/m68knommu: merge MMU and non-MMU string.h
The MMU and non-MMU string.h varients (string_no.h and string_mm.h) and almost the same. Switch to using the string_mm.h one, merging in the necessary ColdFire support. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Greg Ungerer
Geert Uytterhoeven
parent
5bc5a70b62
commit
ea61bc461d
|
|
@ -1,5 +1,133 @@
|
|||
#ifdef __uClinux__
|
||||
#include "string_no.h"
|
||||
#ifndef _M68K_STRING_H_
|
||||
#define _M68K_STRING_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
static inline size_t __kernel_strlen(const char *s)
|
||||
{
|
||||
const char *sc;
|
||||
|
||||
for (sc = s; *sc++; )
|
||||
;
|
||||
return sc - s - 1;
|
||||
}
|
||||
|
||||
static inline char *__kernel_strcpy(char *dest, const char *src)
|
||||
{
|
||||
char *xdest = dest;
|
||||
|
||||
asm volatile ("\n"
|
||||
"1: move.b (%1)+,(%0)+\n"
|
||||
" jne 1b"
|
||||
: "+a" (dest), "+a" (src)
|
||||
: : "memory");
|
||||
return xdest;
|
||||
}
|
||||
|
||||
#ifndef __IN_STRING_C
|
||||
|
||||
#define __HAVE_ARCH_STRLEN
|
||||
#define strlen(s) (__builtin_constant_p(s) ? \
|
||||
__builtin_strlen(s) : \
|
||||
__kernel_strlen(s))
|
||||
|
||||
#define __HAVE_ARCH_STRNLEN
|
||||
static inline size_t strnlen(const char *s, size_t count)
|
||||
{
|
||||
const char *sc = s;
|
||||
|
||||
asm volatile ("\n"
|
||||
"1: subq.l #1,%1\n"
|
||||
" jcs 2f\n"
|
||||
" tst.b (%0)+\n"
|
||||
" jne 1b\n"
|
||||
" subq.l #1,%0\n"
|
||||
"2:"
|
||||
: "+a" (sc), "+d" (count));
|
||||
return sc - s;
|
||||
}
|
||||
|
||||
#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
|
||||
#include "string_mm.h"
|
||||
#define strcpy(d, s) __kernel_strcpy(d, s)
|
||||
#endif
|
||||
|
||||
#define __HAVE_ARCH_STRNCPY
|
||||
static inline char *strncpy(char *dest, const char *src, size_t n)
|
||||
{
|
||||
char *xdest = dest;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
#define __HAVE_ARCH_STRCAT
|
||||
#define strcat(d, s) ({ \
|
||||
char *__d = (d); \
|
||||
strcpy(__d + strlen(__d), (s)); \
|
||||
})
|
||||
|
||||
#define __HAVE_ARCH_STRCHR
|
||||
static inline char *strchr(const char *s, int c)
|
||||
{
|
||||
char sc, ch = c;
|
||||
|
||||
for (; (sc = *s++) != ch; ) {
|
||||
if (!sc)
|
||||
return NULL;
|
||||
}
|
||||
return (char *)s - 1;
|
||||
}
|
||||
|
||||
#ifndef CONFIG_COLDFIRE
|
||||
#define __HAVE_ARCH_STRCMP
|
||||
static inline int strcmp(const char *cs, const char *ct)
|
||||
{
|
||||
char res;
|
||||
|
||||
asm ("\n"
|
||||
"1: move.b (%0)+,%2\n" /* get *cs */
|
||||
" cmp.b (%1)+,%2\n" /* compare a byte */
|
||||
" jne 2f\n" /* not equal, break out */
|
||||
" tst.b %2\n" /* at end of cs? */
|
||||
" jne 1b\n" /* no, keep going */
|
||||
" jra 3f\n" /* strings are equal */
|
||||
"2: sub.b -(%1),%2\n" /* *cs - *ct */
|
||||
"3:"
|
||||
: "+a" (cs), "+a" (ct), "=d" (res));
|
||||
return res;
|
||||
}
|
||||
|
||||
#define __HAVE_ARCH_MEMMOVE
|
||||
extern void *memmove(void *, const void *, __kernel_size_t);
|
||||
|
||||
#define __HAVE_ARCH_MEMCMP
|
||||
extern int memcmp(const void *, const void *, __kernel_size_t);
|
||||
#define memcmp(d, s, n) __builtin_memcmp(d, s, n)
|
||||
#endif /* CONFIG_COLDFIRE */
|
||||
|
||||
#define __HAVE_ARCH_MEMSET
|
||||
extern void *memset(void *, int, __kernel_size_t);
|
||||
#define memset(d, c, n) __builtin_memset(d, c, n)
|
||||
|
||||
#define __HAVE_ARCH_MEMCPY
|
||||
extern void *memcpy(void *, const void *, __kernel_size_t);
|
||||
#define memcpy(d, s, n) __builtin_memcpy(d, s, n)
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* _M68K_STRING_H_ */
|
||||
|
|
|
|||
|
|
@ -1,131 +0,0 @@
|
|||
#ifndef _M68K_STRING_H_
|
||||
#define _M68K_STRING_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
static inline size_t __kernel_strlen(const char *s)
|
||||
{
|
||||
const char *sc;
|
||||
|
||||
for (sc = s; *sc++; )
|
||||
;
|
||||
return sc - s - 1;
|
||||
}
|
||||
|
||||
static inline char *__kernel_strcpy(char *dest, const char *src)
|
||||
{
|
||||
char *xdest = dest;
|
||||
|
||||
asm volatile ("\n"
|
||||
"1: move.b (%1)+,(%0)+\n"
|
||||
" jne 1b"
|
||||
: "+a" (dest), "+a" (src)
|
||||
: : "memory");
|
||||
return xdest;
|
||||
}
|
||||
|
||||
#ifndef __IN_STRING_C
|
||||
|
||||
#define __HAVE_ARCH_STRLEN
|
||||
#define strlen(s) (__builtin_constant_p(s) ? \
|
||||
__builtin_strlen(s) : \
|
||||
__kernel_strlen(s))
|
||||
|
||||
#define __HAVE_ARCH_STRNLEN
|
||||
static inline size_t strnlen(const char *s, size_t count)
|
||||
{
|
||||
const char *sc = s;
|
||||
|
||||
asm volatile ("\n"
|
||||
"1: subq.l #1,%1\n"
|
||||
" jcs 2f\n"
|
||||
" tst.b (%0)+\n"
|
||||
" jne 1b\n"
|
||||
" subq.l #1,%0\n"
|
||||
"2:"
|
||||
: "+a" (sc), "+d" (count));
|
||||
return sc - s;
|
||||
}
|
||||
|
||||
#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_STRNCPY
|
||||
static inline char *strncpy(char *dest, const char *src, size_t n)
|
||||
{
|
||||
char *xdest = dest;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
#define __HAVE_ARCH_STRCAT
|
||||
#define strcat(d, s) ({ \
|
||||
char *__d = (d); \
|
||||
strcpy(__d + strlen(__d), (s)); \
|
||||
})
|
||||
|
||||
#define __HAVE_ARCH_STRCHR
|
||||
static inline char *strchr(const char *s, int c)
|
||||
{
|
||||
char sc, ch = c;
|
||||
|
||||
for (; (sc = *s++) != ch; ) {
|
||||
if (!sc)
|
||||
return NULL;
|
||||
}
|
||||
return (char *)s - 1;
|
||||
}
|
||||
|
||||
#define __HAVE_ARCH_STRCMP
|
||||
static inline int strcmp(const char *cs, const char *ct)
|
||||
{
|
||||
char res;
|
||||
|
||||
asm ("\n"
|
||||
"1: move.b (%0)+,%2\n" /* get *cs */
|
||||
" cmp.b (%1)+,%2\n" /* compare a byte */
|
||||
" jne 2f\n" /* not equal, break out */
|
||||
" tst.b %2\n" /* at end of cs? */
|
||||
" jne 1b\n" /* no, keep going */
|
||||
" jra 3f\n" /* strings are equal */
|
||||
"2: sub.b -(%1),%2\n" /* *cs - *ct */
|
||||
"3:"
|
||||
: "+a" (cs), "+a" (ct), "=d" (res));
|
||||
return res;
|
||||
}
|
||||
|
||||
#define __HAVE_ARCH_MEMSET
|
||||
extern void *memset(void *, int, __kernel_size_t);
|
||||
#define memset(d, c, n) __builtin_memset(d, c, n)
|
||||
|
||||
#define __HAVE_ARCH_MEMCPY
|
||||
extern void *memcpy(void *, const void *, __kernel_size_t);
|
||||
#define memcpy(d, s, n) __builtin_memcpy(d, s, n)
|
||||
|
||||
#define __HAVE_ARCH_MEMMOVE
|
||||
extern void *memmove(void *, const void *, __kernel_size_t);
|
||||
|
||||
#define __HAVE_ARCH_MEMCMP
|
||||
extern int memcmp(const void *, const void *, __kernel_size_t);
|
||||
#define memcmp(d, s, n) __builtin_memcmp(d, s, n)
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* _M68K_STRING_H_ */
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
#ifndef _M68KNOMMU_STRING_H_
|
||||
#define _M68KNOMMU_STRING_H_
|
||||
|
||||
#ifdef __KERNEL__ /* only set these up for kernel code */
|
||||
|
||||
#include <asm/setup.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
#define __HAVE_ARCH_STRCPY
|
||||
static inline char * strcpy(char * dest,const char *src)
|
||||
{
|
||||
char *xdest = dest;
|
||||
|
||||
__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
|
||||
static inline char * strncpy(char *dest, const char *src, size_t n)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
#ifndef CONFIG_COLDFIRE
|
||||
|
||||
#define __HAVE_ARCH_STRCMP
|
||||
static inline int strcmp(const char * cs,const char * ct)
|
||||
{
|
||||
char __res;
|
||||
|
||||
__asm__
|
||||
("1:\tmoveb %0@+,%2\n\t" /* get *cs */
|
||||
"cmpb %1@+,%2\n\t" /* compare a byte */
|
||||
"jne 2f\n\t" /* not equal, break out */
|
||||
"tstb %2\n\t" /* at end of cs? */
|
||||
"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
|
||||
static inline int strncmp(const char * cs,const char * ct,size_t count)
|
||||
{
|
||||
char __res;
|
||||
|
||||
if (!count)
|
||||
return 0;
|
||||
__asm__
|
||||
("1:\tmovb %0@+,%3\n\t" /* get *cs */
|
||||
"cmpb %1@+,%3\n\t" /* compare a byte */
|
||||
"jne 3f\n\t" /* not equal, break out */
|
||||
"tstb %3\n\t" /* at end of cs? */
|
||||
"jeq 4f\n\t" /* yes, all done */
|
||||
"subql #1,%2\n\t" /* no, adjust count */
|
||||
"jne 1b\n\t" /* more to do, keep going */
|
||||
"2:\tmoveq #0,%3\n\t" /* strings are equal */
|
||||
"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;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_COLDFIRE */
|
||||
|
||||
#define __HAVE_ARCH_MEMSET
|
||||
extern void * memset(void * s, int c, size_t count);
|
||||
|
||||
#define __HAVE_ARCH_MEMCPY
|
||||
extern void * memcpy(void *d, const void *s, size_t count);
|
||||
|
||||
#else /* KERNEL */
|
||||
|
||||
/*
|
||||
* let user libraries deal with these,
|
||||
* IMHO the kernel has no place defining these functions for user apps
|
||||
*/
|
||||
|
||||
#define __HAVE_ARCH_STRCPY 1
|
||||
#define __HAVE_ARCH_STRNCPY 1
|
||||
#define __HAVE_ARCH_STRCAT 1
|
||||
#define __HAVE_ARCH_STRNCAT 1
|
||||
#define __HAVE_ARCH_STRCMP 1
|
||||
#define __HAVE_ARCH_STRNCMP 1
|
||||
#define __HAVE_ARCH_STRNICMP 1
|
||||
#define __HAVE_ARCH_STRCHR 1
|
||||
#define __HAVE_ARCH_STRRCHR 1
|
||||
#define __HAVE_ARCH_STRSTR 1
|
||||
#define __HAVE_ARCH_STRLEN 1
|
||||
#define __HAVE_ARCH_STRNLEN 1
|
||||
#define __HAVE_ARCH_MEMSET 1
|
||||
#define __HAVE_ARCH_MEMCPY 1
|
||||
#define __HAVE_ARCH_MEMMOVE 1
|
||||
#define __HAVE_ARCH_MEMSCAN 1
|
||||
#define __HAVE_ARCH_MEMCMP 1
|
||||
#define __HAVE_ARCH_MEMCHR 1
|
||||
#define __HAVE_ARCH_STRTOK 1
|
||||
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* _M68K_STRING_H_ */
|
||||
Reference in New Issue