66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
63 lines
1.0 KiB
C
63 lines
1.0 KiB
C
|
|
#include <linux/types.h>
|
|
|
|
void * memcpy(void * to, const void * from, size_t n)
|
|
{
|
|
#ifdef CONFIG_COLDFIRE
|
|
void *xto = to;
|
|
size_t temp;
|
|
|
|
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;
|
|
for (; temp; temp--)
|
|
*lto++ = *lfrom++;
|
|
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;
|
|
#else
|
|
const char *c_from = from;
|
|
char *c_to = to;
|
|
while (n-- > 0)
|
|
*c_to++ = *c_from++;
|
|
return((void *) to);
|
|
#endif
|
|
}
|