commit be91aaee409591d71491bf1fbf51660d08886c2d
author njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Mar 27 01:42:41 2005 +0000
committer njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Mar 27 01:42:41 2005 +0000
tree cfc15b1a11f0650f37048c18f4a5e6121076f15e
parent 860fc631c229e2934ddd3e017dea245c2cd5c3f4

Add VG_ prefix to SKIPLIST_INIT and IS_*_ALIGNED macros.  Also pull
IS_PAGE_ALIGNED into tool.h with the others.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3457 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/vg_memory.c

diff --git a/coregrind/vg_memory.c b/coregrind/vg_memory.c
index 421f70d..6b9307d 100644
--- a/coregrind/vg_memory.c
+++ b/coregrind/vg_memory.c
@@ -37,9 +37,6 @@
 
 static const Bool mem_debug = False;
 
-#define IS_PAGE_ALIGNED(_aa)  (((_aa) & (VKI_PAGE_SIZE-1)) == 0)
-
-
 /*--------------------------------------------------------------*/
 /*--- A simple, self-contained ordered array of segments.    ---*/
 /*--------------------------------------------------------------*/
@@ -347,7 +344,7 @@
 {
    Int r;
    HWord delta;
-   vg_assert(IS_PAGE_ALIGNED(a));
+   vg_assert(VG_IS_PAGE_ALIGNED(a));
    r = find_segment(a);
    if (r == -1)
       /* not found */
@@ -562,8 +559,8 @@
    end = addr+len;
 
    /* Everything must be page-aligned */
-   vg_assert(IS_PAGE_ALIGNED(addr));
-   vg_assert(IS_PAGE_ALIGNED(len));
+   vg_assert(VG_IS_PAGE_ALIGNED(addr));
+   vg_assert(VG_IS_PAGE_ALIGNED(len));
 
    for (i = 0; i < segments_used; i++) {
 
@@ -675,7 +672,7 @@
          addr, (ULong)len, prot, flags, dev, ino, off, filename);
 
    /* Everything must be page-aligned */
-   vg_assert(IS_PAGE_ALIGNED(addr));
+   vg_assert(VG_IS_PAGE_ALIGNED(addr));
    len = PGROUNDUP(len);
 
    /* Nuke/truncate any existing segment(s) covering [addr,addr+len) */
@@ -786,7 +783,7 @@
    if (0) show_segments( "mprotect_range(before)" );
 
    /* Everything must be page-aligned */
-   vg_assert(IS_PAGE_ALIGNED(a));
+   vg_assert(VG_IS_PAGE_ALIGNED(a));
    len = PGROUNDUP(len);
 
    split_segment(a);
@@ -877,8 +874,8 @@
       if (hole_start == hole_end+1)
          continue;
 
-      vg_assert(IS_PAGE_ALIGNED(hole_start));
-      vg_assert(IS_PAGE_ALIGNED(hole_end+1));
+      vg_assert(VG_IS_PAGE_ALIGNED(hole_start));
+      vg_assert(VG_IS_PAGE_ALIGNED(hole_end+1));
 
       /* ignore holes which fall outside the allowable area */
       if (!(hole_start >= base && hole_end <= limit))
@@ -886,7 +883,7 @@
 
       vg_assert(hole_end > hole_start);
       hole_len = hole_end - hole_start + 1;
-      vg_assert(IS_PAGE_ALIGNED(hole_len));
+      vg_assert(VG_IS_PAGE_ALIGNED(hole_len));
 
       if (hole_len >= len && i_any == -1) {
          /* It will at least fit in this hole. */
@@ -1119,8 +1116,8 @@
 
    p    = PGROUNDDN(p);
    size = PGROUNDUP(size);
-   vg_assert(IS_PAGE_ALIGNED(p));
-   vg_assert(IS_PAGE_ALIGNED(size));
+   vg_assert(VG_IS_PAGE_ALIGNED(p));
+   vg_assert(VG_IS_PAGE_ALIGNED(size));
 
    for (; size > 0; size -= VKI_PAGE_SIZE) {
       seg = VG_(find_segment)(p);
@@ -1288,8 +1285,8 @@
       goto failed;
 
    try_here = shadow_alloc;
-   vg_assert(IS_PAGE_ALIGNED(try_here));
-   vg_assert(IS_PAGE_ALIGNED(size));
+   vg_assert(VG_IS_PAGE_ALIGNED(try_here));
+   vg_assert(VG_IS_PAGE_ALIGNED(size));
    vg_assert(size > 0);
 
    if (0)