mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 10:31:48 +00:00
49148020bc
Merge header files for m68k and m68knommu to the single location: arch/m68k/include/asm The majority of this patch was the result of the script that is included in the changelog below. The script was originally written by Arnd Bergman and exten by me to cover a few more files. When the header files differed the script uses the following: The original m68k file is named <file>_mm.h [mm for memory manager] The m68knommu file is named <file>_no.h [no for no memory manager] The files uses the following include guard: This include gaurd works as the m68knommu toolchain set the __uClinux__ symbol - so this should work in userspace too. Merging the header files for m68k and m68knommu exposes the (unexpected?) ABI differences thus it is easier to actually identify these and thus to fix them. The commit has been build tested with both a m68k and a m68knommu toolchain - with success. The commit has also been tested with "make headers_check" and this patch fixes make headers_check for m68knommu. The script used: TARGET=arch/m68k/include/asm SOURCE=arch/m68knommu/include/asm INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \ linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \ oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \ shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \ termbits.h termios.h tlb.h types.h user.h" EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \ ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \ sections.h topology.h" NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \ elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \ m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \ m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \ m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \ mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \ mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \ nettel.h quicc_simple.h smp.h" FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \ cacheflush.h checksum.h current.h delay.h div64.h \ dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \ irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \ module.h page.h page_offset.h param.h pci.h pgalloc.h \ pgtable.h processor.h ptrace.h scatterlist.h segment.h \ setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \ thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \ unaligned.h unistd.h" mergefile() { BASE=${1%.h} git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h cat << EOF > ${TARGET}/$1 EOF git add ${TARGET}/$1 } set -e mkdir -p ${TARGET} git mv include/asm-m68k/* ${TARGET} rmdir include/asm-m68k git rm ${SOURCE}/Kbuild for F in $INCLUDE $EQUAL; do git rm ${SOURCE}/$F done for F in $NOMUUFILES; do git mv ${SOURCE}/$F ${TARGET}/$F done for F in $FILES ; do mergefile $F done rmdir arch/m68knommu/include/asm rmdir arch/m68knommu/include Cc: Arnd Bergmann <arnd@arndb.de> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
132 lines
2.7 KiB
C
132 lines
2.7 KiB
C
#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_ */
|