diff options
Diffstat (limited to 'libc/sysdeps/linux/xtensa')
| -rw-r--r-- | libc/sysdeps/linux/xtensa/pread_write.c | 79 |
1 files changed, 17 insertions, 62 deletions
diff --git a/libc/sysdeps/linux/xtensa/pread_write.c b/libc/sysdeps/linux/xtensa/pread_write.c index e8b39e9cf..f4453a604 100644 --- a/libc/sysdeps/linux/xtensa/pread_write.c +++ b/libc/sysdeps/linux/xtensa/pread_write.c @@ -4,30 +4,12 @@ * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -/* - * Based in part on the files - * ./sysdeps/unix/sysv/linux/pwrite.c, - * ./sysdeps/unix/sysv/linux/pread.c, - * sysdeps/posix/pread.c - * sysdeps/posix/pwrite.c - * from GNU libc 2.2.5, but reworked considerably... - */ #include <sys/syscall.h> #include <unistd.h> -#include <stdint.h> #include <endian.h> -extern __typeof(pread) __libc_pread; -extern __typeof(pwrite) __libc_pwrite; -#ifdef __UCLIBC_HAS_LFS__ -extern __typeof(pread64) __libc_pread64; -extern __typeof(pwrite64) __libc_pwrite64; -#endif - -#include <bits/kernel_types.h> - -#ifdef __NR_pread64 /* Newer kernels renamed but it's the same. */ +#ifdef __NR_pread64 # ifdef __NR_pread # error "__NR_pread and __NR_pread64 both defined???" # endif @@ -35,31 +17,16 @@ extern __typeof(pwrite64) __libc_pwrite64; #endif #ifdef __NR_pread - # define __NR___syscall_pread __NR_pread -/* On Xtensa, 64-bit values are aligned in even/odd register pairs. */ -static __inline__ _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, - size_t, count, int, pad, off_t, offset_hi, off_t, offset_lo) - -ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) -{ - return __syscall_pread(fd, buf, count, 0, __LONG_LONG_PAIR(offset >> 31, offset)); -} -weak_alias(__libc_pread,pread) - -# ifdef __UCLIBC_HAS_LFS__ -ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset) -{ - uint32_t low = offset & 0xffffffff; - uint32_t high = offset >> 32; - return __syscall_pread(fd, buf, count, 0, __LONG_LONG_PAIR(high, low)); -} -weak_alias(__libc_pread64,pread64) -# endif /* __UCLIBC_HAS_LFS__ */ - -#endif /* __NR_pread */ +static _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, + size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo) +# define MY_PREAD(fd, buf, count, offset) \ + __syscall_pread(fd, buf, count, 0, OFF_HI_LO(offset)) +# define MY_PREAD64(fd, buf, count, offset) \ + __syscall_pread(fd, buf, count, 0, OFF64_HI_LO(offset)) +#endif -#ifdef __NR_pwrite64 /* Newer kernels renamed but it's the same. */ +#ifdef __NR_pwrite64 # ifdef __NR_pwrite # error "__NR_pwrite and __NR_pwrite64 both defined???" # endif @@ -67,25 +34,13 @@ weak_alias(__libc_pread64,pread64) #endif #ifdef __NR_pwrite - # define __NR___syscall_pwrite __NR_pwrite -/* On Xtensa, 64-bit values are aligned in even/odd register pairs. */ -static __inline__ _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, - size_t, count, int, pad, off_t, offset_hi, off_t, offset_lo) - -ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) -{ - return __syscall_pwrite(fd, buf, count, 0, __LONG_LONG_PAIR(offset >> 31, offset)); -} -weak_alias(__libc_pwrite,pwrite) +static _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, + size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo) +# define MY_PWRITE(fd, buf, count, offset) \ + __syscall_pwrite(fd, buf, count, 0, OFF_HI_LO(offset)) +# define MY_PWRITE64(fd, buf, count, offset) \ + __syscall_pwrite(fd, buf, count, 0, OFF64_HI_LO(offset)) +#endif -# ifdef __UCLIBC_HAS_LFS__ -ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset) -{ - uint32_t low = offset & 0xffffffff; - uint32_t high = offset >> 32; - return __syscall_pwrite(fd, buf, count, 0, __LONG_LONG_PAIR(high, low)); -} -weak_alias(__libc_pwrite64,pwrite64) -# endif /* __UCLIBC_HAS_LFS__ */ -#endif /* __NR_pwrite */ +#include "../common/pread_write.c" |