Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-03-04 08:27:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Re-commit r243686 - [Sanitizers] [Bug 24151] Generalize type of offset in internal_mmap

Browse Source 
The builder remains broken in the same way without this patch so this patch is
innocent.

llvm-svn: 243744
This commit is contained in:
Daniel Sanders 2015-07-31 11:29:25 +00:00
parent 341d42c270
commit adf1fcc2a5
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/lib/sanitizer_common/sanitizer_common.h
View File

@ -238,7 +238,7 @@ bool ReadFileToBuffer(const char *file_name, char **buff, uptr *buff_size,
// (or NULL if mapping fails). Stores the size of mmaped region
// in '*buff_size'.
void *MapFileToMemory(const char *file_name, uptr *buff_size);
void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, uptr offset);
void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, OFF_T offset);
bool IsAccessibleMemoryRange(uptr beg, uptr size);

2
compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
View File

@ -104,7 +104,7 @@ namespace __sanitizer {
// --------------- sanitizer_libc.h
uptr internal_mmap(void *addr, uptr length, int prot, int flags, int fd,
u64 offset) {
OFF_T offset) {
#if SANITIZER_FREEBSD || SANITIZER_LINUX_USES_64BIT_SYSCALLS
return internal_syscall(SYSCALL(mmap), (uptr)addr, length, prot, flags, fd,
offset);

6
compiler-rt/lib/sanitizer_common/sanitizer_posix.cc
View File

@ -240,14 +240,14 @@ void *MapFileToMemory(const char *file_name, uptr *buff_size) {
return internal_iserror(map) ? 0 : (void *)map;
}
void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, uptr offset) {
void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, OFF_T offset) {
uptr flags = MAP_SHARED;
if (addr) flags |= MAP_FIXED;
uptr p = internal_mmap(addr, size, PROT_READ | PROT_WRITE, flags, fd, offset);
int mmap_errno = 0;
if (internal_iserror(p, &mmap_errno)) {
Printf("could not map writable file (%d, %zu, %zu): %zd, errno: %d\n",
fd, offset, size, p, mmap_errno);
Printf("could not map writable file (%d, %lld, %zu): %zd, errno: %d\n",
fd, (long long)offset, size, p, mmap_errno);
return 0;
}
return (void *)p;

2
compiler-rt/lib/sanitizer_common/sanitizer_posix.h
View File

@ -35,7 +35,7 @@ uptr internal_write(fd_t fd, const void *buf, uptr count);
// Memory
uptr internal_mmap(void *addr, uptr length, int prot, int flags,
int fd, u64 offset);
int fd, OFF_T offset);
uptr internal_munmap(void *addr, uptr length);
int internal_mprotect(void *addr, uptr length, int prot);

2
compiler-rt/lib/sanitizer_common/sanitizer_win.cc
View File

@ -170,7 +170,7 @@ void *MapFileToMemory(const char *file_name, uptr *buff_size) {
UNIMPLEMENTED();
}
void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, uptr offset) {
void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, OFF_T offset) {
UNIMPLEMENTED();
}