Make VG_(discard_translations) 64-bit clean. As JosefW points out, it
doesn't make much sense to have a 64-bit base address but only a
32-bit length.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4273 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_transtab.c b/coregrind/m_transtab.c
index 50930a4..f83ea28 100644
--- a/coregrind/m_transtab.c
+++ b/coregrind/m_transtab.c
@@ -537,17 +537,17 @@
*/
static inline
-Bool overlap1 ( Addr64 s1, UInt r1, Addr64 s2, UInt r2 )
+Bool overlap1 ( Addr64 s1, ULong r1, Addr64 s2, ULong r2 )
{
- Addr64 e1 = s1 + (ULong)r1 - 1ULL;
- Addr64 e2 = s2 + (ULong)r2 - 1ULL;
+ Addr64 e1 = s1 + r1 - 1ULL;
+ Addr64 e2 = s2 + r2 - 1ULL;
if (e1 < s2 || e2 < s1)
return False;
return True;
}
static inline
-Bool overlaps ( Addr64 start, UInt range, VexGuestExtents* vge )
+Bool overlaps ( Addr64 start, ULong range, VexGuestExtents* vge )
{
if (overlap1(start, range, vge->base[0], (UInt)vge->len[0]))
return True;
@@ -563,7 +563,7 @@
}
-void VG_(discard_translations) ( Addr64 guest_start, UInt range )
+void VG_(discard_translations) ( Addr64 guest_start, ULong range )
{
Int sno, i;
Bool anyDeleted = False;