d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFppc64:

Browse Source 
Use longs instead of ints as the native word type in bcopy(). This will
expand nicely on 64-bit systems.
This commit is contained in:
nwhitehorn 2010-07-09 14:01:18 +00:00
parent 087c04e6ae
commit 75d8db5ef4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/powerpc/powerpc/bcopy.c
View File

@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
* sizeof(word) MUST BE A POWER OF TWO * sizeof(word) MUST BE A POWER OF TWO
* SO THAT wmask BELOW IS ALL ONES * SO THAT wmask BELOW IS ALL ONES
*/ */
typedef int word; /* "word" used for optimal copy speed */ typedef long word; /* "word" used for optimal copy speed */
#define wsize sizeof(word) #define wsize sizeof(word)
#define wmask (wsize - 1) #define wmask (wsize - 1)
@ -86,14 +86,14 @@ memcpy(void *dst0, const void *src0, size_t length)
/* /*
* Copy forward. * Copy forward.
*/ */
t = (int)src; /* only need low bits */ t = (size_t)src; /* only need low bits */
if ((t | (int)dst) & wmask) { if ((t | (uintptr_t)dst) & wmask) {
/* /*
* Try to align operands. This cannot be done * Try to align operands. This cannot be done
* unless the low bits match. * unless the low bits match.
*/ */
if ((t ^ (int)dst) & wmask || length < wsize) { if ((t ^ (uintptr_t)dst) & wmask || length < wsize) {
t = length; t = length;
} else { } else {
t = wsize - (t & wmask); t = wsize - (t & wmask);
@ -118,10 +118,10 @@ memcpy(void *dst0, const void *src0, size_t length)
*/ */
src += length; src += length;
dst += length; dst += length;
t = (int)src; t = (uintptr_t)src;
if ((t | (int)dst) & wmask) { if ((t | (uintptr_t)dst) & wmask) {
if ((t ^ (int)dst) & wmask || length <= wsize) { if ((t ^ (uintptr_t)dst) & wmask || length <= wsize) {
t = length; t = length;
} else { } else {
t &= wmask; t &= wmask;