|
From: <sv...@va...> - 2005-07-26 23:05:19
|
Author: sewardj
Date: 2005-07-27 00:04:25 +0100 (Wed, 27 Jul 2005)
New Revision: 4273
Log:
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.
Modified:
trunk/coregrind/m_transtab.c
trunk/coregrind/pub_core_transtab.h
Modified: trunk/coregrind/m_transtab.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_transtab.c 2005-07-26 22:54:55 UTC (rev 4272)
+++ trunk/coregrind/m_transtab.c 2005-07-26 23:04:25 UTC (rev 4273)
@@ -537,17 +537,17 @@
*/
=20
static inline
-Bool overlap1 ( Addr64 s1, UInt r1, Addr64 s2, UInt r2 )
+Bool overlap1 ( Addr64 s1, ULong r1, Addr64 s2, ULong r2 )
{
- Addr64 e1 =3D s1 + (ULong)r1 - 1ULL;
- Addr64 e2 =3D s2 + (ULong)r2 - 1ULL;
+ Addr64 e1 =3D s1 + r1 - 1ULL;
+ Addr64 e2 =3D s2 + r2 - 1ULL;
if (e1 < s2 || e2 < s1)=20
return False;
return True;
}
=20
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 @@
}
=20
=20
-void VG_(discard_translations) ( Addr64 guest_start, UInt range )
+void VG_(discard_translations) ( Addr64 guest_start, ULong range )
{
Int sno, i;
Bool anyDeleted =3D False;
Modified: trunk/coregrind/pub_core_transtab.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/pub_core_transtab.h 2005-07-26 22:54:55 UTC (rev 4272=
)
+++ trunk/coregrind/pub_core_transtab.h 2005-07-26 23:04:25 UTC (rev 4273=
)
@@ -56,7 +56,7 @@
Addr64 guest_addr,=20
Bool upd_cache );
=20
-extern void VG_(discard_translations) ( Addr64 start, UInt range );
+extern void VG_(discard_translations) ( Addr64 start, ULong range );
=20
extern void VG_(print_tt_tc_stats) ( void );
=20
|