|
From: <sv...@va...> - 2012-04-21 15:33:34
|
sewardj 2012-04-21 16:33:26 +0100 (Sat, 21 Apr 2012)
New Revision: 12523
Log:
Fix assertion failure on x86-darwin following r12504 (pread fix)
Modified files:
trunk/coregrind/m_libcfile.c
Modified: trunk/coregrind/m_libcfile.c (+3 -2)
===================================================================
--- trunk/coregrind/m_libcfile.c 2012-04-21 14:55:28 +01:00 (rev 12522)
+++ trunk/coregrind/m_libcfile.c 2012-04-21 16:33:26 +01:00 (rev 12523)
@@ -601,12 +601,13 @@
res = VG_(do_syscall4)(__NR_pread64, fd, (UWord)buf, count, offset);
return res;
# elif defined(VGP_amd64_darwin)
+ vg_assert(sizeof(OffT) == 8);
res = VG_(do_syscall4)(__NR_pread_nocancel, fd, (UWord)buf, count, offset);
return res;
# elif defined(VGP_x86_darwin)
- vg_assert(sizeof(OffT) == 4);
+ vg_assert(sizeof(OffT) == 8);
res = VG_(do_syscall5)(__NR_pread_nocancel, fd, (UWord)buf, count,
- offset, 0);
+ offset & 0xffffffff, offset >> 32);
return res;
# else
# error "Unknown platform"
|