Streamlined and consistified alignment checking.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3168 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/addrcheck/ac_main.c b/addrcheck/ac_main.c
index 739f183..efe06b8 100644
--- a/addrcheck/ac_main.c
+++ b/addrcheck/ac_main.c
@@ -233,7 +233,7 @@
UChar abits8;
PROF_EVENT(24);
# ifdef VG_DEBUG_MEMORY
- tl_assert(IS_ALIGNED4_ADDR(a));
+ tl_assert(IS_4_ALIGNED(a));
# endif
sm = primary_map[a >> 16];
sm_off = a & 0xFFFF;
@@ -861,7 +861,7 @@
# else
if (size == 4) {
- if (!IS_ALIGNED4_ADDR(addr)) goto slow4;
+ if (!IS_4_ALIGNED(addr)) goto slow4;
PROF_EVENT(91);
/* Properly aligned. */
sm = primary_map[addr >> 16];
@@ -876,7 +876,7 @@
}
if (size == 8) {
- if (!IS_ALIGNED4_ADDR(addr)) goto slow8;
+ if (!IS_4_ALIGNED(addr)) goto slow8;
PROF_EVENT(92);
/* Properly aligned. Do it in two halves. */
addr4 = addr + 4;
@@ -1122,7 +1122,7 @@
Bool ac_is_valid_address ( Addr a )
{
UChar abits;
- tl_assert(IS_ALIGNED4_ADDR(a));
+ tl_assert(IS_4_ALIGNED(a));
abits = get_abits4_ALIGNED(a);
if (abits == VGM_NIBBLE_VALID) {
return True;