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>
127 lines
3.2 KiB
C
127 lines
3.2 KiB
C
#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_ */
|