upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-25 16:39:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libc/string/bcopy.c: Use intptr_t as the copy type

Browse source 
While most 64-bit architectures have an assembly implementation of this
file RISC-V does not. As we now copy 8 bytes instead of 4 it should speed
up RISC-V. Using intptr_t instead of int also allows using this file for
CHERI pure-capability code since trying to copy pointers using integer
loads/stores will invalidate pointers.

Reviewed By:	kib
Obtained from:	CheriBSD (partially)
MFC after:	1 week
Differential Revision: https://reviews.freebsd.org/D29535

(cherry picked from commit 0b4ad01d91)
This commit is contained in:
Alex Richardson 2021-04-20 00:15:57 +01:00
parent f66ada7504
commit 0e1e71400a
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/libc/string/bcopy.c
View file

@ -40,11 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
/*
* sizeof(word) MUST BE A POWER OF TWO
* SO THAT wmask BELOW IS ALL ONES
*/
typedef int word; /* "word" used for optimal copy speed */
typedef intptr_t word; /* "word" used for optimal copy speed */
#define wsize sizeof(word)
#define wmask (wsize - 1)
@ -105,7 +101,8 @@ bcopy(const void *src0, void *dst0, size_t length)
* Copy whole words, then mop up any trailing bytes.
*/
t = length / wsize;
TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
TLOOP(*(word *)(void *)dst = *(const word *)(const void *)src;
src += wsize; dst += wsize);
t = length & wmask;
TLOOP(*dst++ = *src++);
} else {
@ -126,7 +123,8 @@ bcopy(const void *src0, void *dst0, size_t length)
TLOOP1(*--dst = *--src);
}
t = length / wsize;
TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src);
TLOOP(src -= wsize; dst -= wsize;
*(word *)(void *)dst = *(const word *)(const void *)src);
t = length & wmask;
TLOOP(*--dst = *--src);
}