Author: njn
Date: 2005-06-02 04:52:53 +0100 (Thu, 02 Jun 2005)
New Revision: 3839
Modified:
trunk/coregrind/core.h
trunk/coregrind/m_aspacemgr/aspacemgr.c
trunk/coregrind/m_debuginfo/symtab.c
trunk/coregrind/m_main.c
trunk/coregrind/m_sigframe/sigframe-amd64-linux.c
trunk/coregrind/m_sigframe/sigframe-x86-linux.c
trunk/coregrind/m_signals.c
trunk/coregrind/m_syscalls/syscalls-amd64-linux.c
trunk/coregrind/m_syscalls/syscalls-linux.c
trunk/coregrind/m_syscalls/syscalls-x86-linux.c
trunk/coregrind/m_syscalls/syscalls.c
trunk/coregrind/stage1.c
trunk/coregrind/ume.c
trunk/helgrind/hg_main.c
trunk/include/tool.h
trunk/memcheck/mac_leakcheck.c
Log:
Rename *ROUND* as VG_*ROUND* to be consistent with everything else. Also
make them tool-visible, so that Memcheck and Helgrind don't have to defin=
ed
their own versions!
Modified: trunk/coregrind/core.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/core.h 2005-06-02 03:39:33 UTC (rev 3838)
+++ trunk/coregrind/core.h 2005-06-02 03:52:53 UTC (rev 3839)
@@ -49,12 +49,6 @@
/* Max length of a text fragment used to construct error messages. */
#define VG_ERRTXT_LEN 4096
=20
-// 'a' -- the alignment -- must be a power of 2
-#define ROUNDDN(p, a) ((Addr)(p) & ~((Addr)(a)-1))
-#define ROUNDUP(p, a) ROUNDDN((p)+(a)-1, (a))
-#define PGROUNDDN(p) ROUNDDN(p, VKI_PAGE_SIZE)
-#define PGROUNDUP(p) ROUNDUP(p, VKI_PAGE_SIZE)
-
/* ---------------------------------------------------------------------
Environment variables
------------------------------------------------------------------ */
Modified: trunk/coregrind/m_aspacemgr/aspacemgr.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_aspacemgr/aspacemgr.c 2005-06-02 03:39:33 UTC (rev =
3838)
+++ trunk/coregrind/m_aspacemgr/aspacemgr.c 2005-06-02 03:52:53 UTC (rev =
3839)
@@ -583,7 +583,7 @@
if (len =3D=3D 0)
return;
=20
- len =3D PGROUNDUP(len);
+ len =3D VG_PGROUNDUP(len);
=20
if (debug)
VG_(printf)("unmap_range(%p, %lu)\n", addr, len);
@@ -705,7 +705,7 @@
=20
/* Everything must be page-aligned */
vg_assert(VG_IS_PAGE_ALIGNED(addr));
- len =3D PGROUNDUP(len);
+ len =3D VG_PGROUNDUP(len);
=20
/* Nuke/truncate any existing segment(s) covering [addr,addr+len) */
VG_(unmap_range)(addr, len);
@@ -816,7 +816,7 @@
=20
/* Everything must be page-aligned */
vg_assert(VG_IS_PAGE_ALIGNED(a));
- len =3D PGROUNDUP(len);
+ len =3D VG_PGROUNDUP(len);
=20
split_segment(a);
split_segment(a+len);
@@ -868,7 +868,7 @@
=20
/* Everything must be page-aligned */
vg_assert((addr & (VKI_PAGE_SIZE-1)) =3D=3D 0);
- len =3D PGROUNDUP(len);
+ len =3D VG_PGROUNDUP(len);
=20
len +=3D VKI_PAGE_SIZE * 2; /* leave redzone gaps before and after ma=
pping */
=20
@@ -1158,8 +1158,8 @@
if (size =3D=3D 0)
return True; /* isn't this a bit of a strange case? */
=20
- p =3D PGROUNDDN(p);
- size =3D PGROUNDUP(size);
+ p =3D VG_PGROUNDDN(p);
+ size =3D VG_PGROUNDUP(size);
vg_assert(VG_IS_PAGE_ALIGNED(p));
vg_assert(VG_IS_PAGE_ALIGNED(size));
=20
@@ -1184,7 +1184,7 @@
Addr VG_(get_memory_from_mmap_for_client)
(Addr addr, SizeT len, UInt prot, UInt sf_flags)
{
- len =3D PGROUNDUP(len);
+ len =3D VG_PGROUNDUP(len);
=20
tl_assert(!(sf_flags & SF_FIXED));
tl_assert(0 =3D=3D addr);
@@ -1259,15 +1259,15 @@
vg_assert(VG_(needs).shadow_memory);
vg_assert(VG_(tdict).track_init_shadow_page);
=20
- sz =3D PGROUNDUP(p+sz) - PGROUNDDN(p);
- p =3D PGROUNDDN(p);
+ sz =3D VG_PGROUNDUP(p+sz) - VG_PGROUNDDN(p);
+ p =3D VG_PGROUNDDN(p);
=20
VG_(mprotect)((void *)p, sz, VKI_PROT_READ|VKI_PROT_WRITE);
=20
if (call_init)=20
while(sz) {
/* ask the tool to initialize each page */
- VG_TRACK( init_shadow_page, PGROUNDDN(p) );
+ VG_TRACK( init_shadow_page, VG_PGROUNDDN(p) );
=20
p +=3D VKI_PAGE_SIZE;
sz -=3D VKI_PAGE_SIZE;
@@ -1285,7 +1285,7 @@
vg_assert(VG_(needs).shadow_memory);
vg_assert(!VG_(tdict).track_init_shadow_page);
=20
- size =3D PGROUNDUP(size);
+ size =3D VG_PGROUNDUP(size);
=20
if (shadow_alloc =3D=3D 0)
shadow_alloc =3D VG_(shadow_base);
Modified: trunk/coregrind/m_debuginfo/symtab.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_debuginfo/symtab.c 2005-06-02 03:39:33 UTC (rev 383=
8)
+++ trunk/coregrind/m_debuginfo/symtab.c 2005-06-02 03:52:53 UTC (rev 383=
9)
@@ -1654,7 +1654,7 @@
=20
/* Did we find a debuglink section? */
if (debuglink !=3D NULL) {
- UInt crc_offset =3D ROUNDUP(VG_(strlen)(debuglink)+1, 4);
+ UInt crc_offset =3D VG_ROUNDUP(VG_(strlen)(debuglink)+1, 4);
UInt crc;
=20
vg_assert(crc_offset + sizeof(UInt) <=3D debuglink_sz);
Modified: trunk/coregrind/m_main.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_main.c 2005-06-02 03:39:33 UTC (rev 3838)
+++ trunk/coregrind/m_main.c 2005-06-02 03:52:53 UTC (rev 3839)
@@ -300,7 +300,7 @@
break;
=20
case AT_PHDR:
- VG_(valgrind_base) =3D PGROUNDDN(auxv->u.a_val);
+ VG_(valgrind_base) =3D VG_PGROUNDDN(auxv->u.a_val);
break;
}
=20
@@ -328,20 +328,20 @@
// VG_(valgrind_base) should have been set by scan_auxv, but if not,
// this is a workable approximation
if (VG_(valgrind_base) =3D=3D 0) {
- VG_(valgrind_base) =3D PGROUNDDN(&_start);
+ VG_(valgrind_base) =3D VG_PGROUNDDN(&_start);
}
=20
- VG_(valgrind_last) =3D ROUNDUP(argc_addr, 0x10000) - 1; // stack
+ VG_(valgrind_last) =3D VG_ROUNDUP(argc_addr, 0x10000) - 1; // stack
=20
// This gives the client the largest possible address space while
// taking into account the tool's shadow needs.
- client_size =3D ROUNDDN((VG_(valgrind_base)-REDZONE_SIZE) / (=
1.+ratio),
+ client_size =3D VG_ROUNDDN((VG_(valgrind_base)-REDZONE_SIZE) =
/ (1.+ratio),
CLIENT_SIZE_MULTIPLE);
VG_(client_base) =3D 0;
VG_(client_end) =3D VG_(client_base) + client_size;
/* where !FIXED mmap goes */
VG_(client_mapbase) =3D VG_(client_base) +
- PGROUNDDN((Addr)(client_size * CLIENT_HEAP_PROPORTION));
+ VG_PGROUNDDN((Addr)(client_size * CLIENT_HEAP_PROPORTION));
=20
VG_(shadow_base) =3D VG_(client_end) + REDZONE_SIZE;
VG_(shadow_end) =3D VG_(valgrind_base);
@@ -873,7 +873,7 @@
sizeof(char **)*envc + /* envp */
sizeof(char **) + /* terminal NULL */
auxsize + /* auxv */
- ROUNDUP(stringsize, sizeof(Word)) +/* strings (aligned) */
+ VG_ROUNDUP(stringsize, sizeof(Word)) +/* strings (aligned) */
VKI_PAGE_SIZE; /* page for trampoline code */
=20
if (0) VG_(printf)("stacksize =3D %d\n", stacksize);
@@ -885,13 +885,13 @@
=20
/* cl_esp is the client's stack pointer */
cl_esp =3D VG_(clstk_end) - stacksize;
- cl_esp =3D ROUNDDN(cl_esp, 16); /* make stack 16 byte aligned */
+ cl_esp =3D VG_ROUNDDN(cl_esp, 16); /* make stack 16 byte aligned */
=20
/* base of the string table (aligned) */
stringbase =3D strtab =3D (char *)(VG_(client_trampoline_code)=20
- - ROUNDUP(stringsize, sizeof(int)));
+ - VG_ROUNDUP(stringsize, sizeof(int)));
=20
- VG_(clstk_base) =3D PGROUNDDN(cl_esp);
+ VG_(clstk_base) =3D VG_PGROUNDDN(cl_esp);
=20
if (0)
printf("stringsize=3D%d auxsize=3D%d stacksize=3D%d\n"
@@ -903,7 +903,8 @@
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D alloc=
ate space =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
=20
/* allocate a stack - mmap enough space for the stack */
- res =3D mmap((void *)PGROUNDDN(cl_esp), VG_(clstk_end) - PGROUNDDN(cl=
_esp),
+ res =3D mmap((void *)VG_PGROUNDDN(cl_esp),=20
+ VG_(clstk_end) - VG_PGROUNDDN(cl_esp),
PROT_READ | PROT_WRITE | PROT_EXEC,=20
MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0);
vg_assert((void*)-1 !=3D res);=20
Modified: trunk/coregrind/m_sigframe/sigframe-amd64-linux.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_sigframe/sigframe-amd64-linux.c 2005-06-02 03:39:33=
UTC (rev 3838)
+++ trunk/coregrind/m_sigframe/sigframe-amd64-linux.c 2005-06-02 03:52:53=
UTC (rev 3839)
@@ -442,7 +442,7 @@
Int sigNo =3D siginfo->si_signo;
=20
rsp -=3D sizeof(*frame);
- rsp =3D ROUNDDN(rsp, 16);
+ rsp =3D VG_ROUNDDN(rsp, 16);
frame =3D (struct rt_sigframe *)rsp;
=20
if (!extend(tst, rsp, sizeof(*frame)))
Modified: trunk/coregrind/m_sigframe/sigframe-x86-linux.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_sigframe/sigframe-x86-linux.c 2005-06-02 03:39:33 U=
TC (rev 3838)
+++ trunk/coregrind/m_sigframe/sigframe-x86-linux.c 2005-06-02 03:52:53 U=
TC (rev 3839)
@@ -465,7 +465,7 @@
vg_assert((flags & VKI_SA_SIGINFO) =3D=3D 0);
=20
esp -=3D sizeof(*frame);
- esp =3D ROUNDDN(esp, 16);
+ esp =3D VG_ROUNDDN(esp, 16);
frame =3D (struct sigframe *)esp;
=20
if (!extend(tst, esp, sizeof(*frame)))
@@ -512,7 +512,7 @@
vg_assert((flags & VKI_SA_SIGINFO) !=3D 0);
=20
esp -=3D sizeof(*frame);
- esp =3D ROUNDDN(esp, 16);
+ esp =3D VG_ROUNDDN(esp, 16);
frame =3D (struct rt_sigframe *)esp;
=20
if (!extend(tst, esp, sizeof(*frame)))
Modified: trunk/coregrind/m_signals.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_signals.c 2005-06-02 03:39:33 UTC (rev 3838)
+++ trunk/coregrind/m_signals.c 2005-06-02 03:52:53 UTC (rev 3839)
@@ -943,15 +943,15 @@
=20
static UInt note_size(const struct note *n)
{
- return sizeof(Elf32_Nhdr) + ROUNDUP(VG_(strlen)(n->name)+1, 4) + ROUN=
DUP(n->note.n_descsz, 4);
+ return sizeof(Elf32_Nhdr) + VG_ROUNDUP(VG_(strlen)(n->name)+1, 4) + V=
G_ROUNDUP(n->note.n_descsz, 4);
}
=20
static void add_note(struct note **list, const Char *name, UInt type, co=
nst void *data, UInt datasz)
{
Int namelen =3D VG_(strlen)(name)+1;
Int notelen =3D sizeof(struct note) +=20
- ROUNDUP(namelen, 4) +=20
- ROUNDUP(datasz, 4);
+ VG_ROUNDUP(namelen, 4) +=20
+ VG_ROUNDUP(datasz, 4);
struct note *n =3D VG_(arena_malloc)(VG_AR_CORE, notelen);
=20
VG_(memset)(n, 0, notelen);
@@ -964,7 +964,7 @@
n->note.n_descsz =3D datasz;
=20
VG_(memcpy)(n->name, name, namelen);
- VG_(memcpy)(n->name+ROUNDUP(namelen,4), data, datasz);
+ VG_(memcpy)(n->name+VG_ROUNDUP(namelen,4), data, datasz);
}
=20
static void write_note(Int fd, const struct note *n)
@@ -1147,7 +1147,7 @@
=20
off +=3D notesz;
=20
- off =3D PGROUNDUP(off);
+ off =3D VG_PGROUNDUP(off);
=20
for(seg =3D VG_(first_segment)(), idx =3D 1;
seg !=3D NULL;
@@ -1660,7 +1660,7 @@
vg_assert(seg->addr > addr);
=20
/* Create the mapping */
- base =3D PGROUNDDN(addr);
+ base =3D VG_PGROUNDDN(addr);
newsize =3D seg->addr - base;
=20
if (seg->len + newsize >=3D maxsize)
@@ -1810,11 +1810,11 @@
nothing mapped there (as opposed to a permissions fault),
then extend the stack segment.=20
*/
- Addr base =3D PGROUNDDN(esp - VGA_STACK_REDZONE_SZB);
+ Addr base =3D VG_PGROUNDDN(esp - VGA_STACK_REDZONE_SZB);
if (VG_(extend_stack)(base, VG_(threads)[tid].client_stack_szB)) {
if (VG_(clo_trace_signals))
VG_(message)(Vg_DebugMsg,=20
- " -> extended stack base to %p", PGROUNDDN(fault));
+ " -> extended stack base to %p", VG_PGROUNDDN(fault));
return; // extension succeeded, restart instruction
} else
VG_(message)(Vg_UserMsg, "Stack overflow in thread %d: can't grow s=
tack to %p",=20
@@ -1833,7 +1833,7 @@
static Int recursion =3D 0;
=20
if (recursion++ =3D=3D 0) {
- VG_(init_shadow_range)(PGROUNDDN(fault), VKI_PAGE_SIZE, True);
+ VG_(init_shadow_range)(VG_PGROUNDDN(fault), VKI_PAGE_SIZE, True);
recursion--;
return;
} else {
Modified: trunk/coregrind/m_syscalls/syscalls-amd64-linux.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_syscalls/syscalls-amd64-linux.c 2005-06-02 03:39:33=
UTC (rev 3838)
+++ trunk/coregrind/m_syscalls/syscalls-amd64-linux.c 2005-06-02 03:52:53=
UTC (rev 3839)
@@ -427,12 +427,12 @@
only go down to the start of the mmaped segment. */
seg =3D VG_(find_segment)((Addr)rsp);
if (seg) {
- ctst->client_stack_highest_word =3D (Addr)PGROUNDUP(rsp);
+ ctst->client_stack_highest_word =3D (Addr)VG_PGROUNDUP(rsp);
ctst->client_stack_szB =3D ctst->client_stack_highest_word - seg-=
>addr;
=20
if (debug)
VG_(printf)("tid %d: guessed client stack range %p-%p\n",
- ctid, seg->addr, PGROUNDUP(rsp));
+ ctid, seg->addr, VG_PGROUNDUP(rsp));
} else {
VG_(message)(Vg_UserMsg, "!? New thread %d starts with RSP(%p) unm=
apped\n",
ctid, rsp);
Modified: trunk/coregrind/m_syscalls/syscalls-linux.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_syscalls/syscalls-linux.c 2005-06-02 03:39:33 UTC (=
rev 3838)
+++ trunk/coregrind/m_syscalls/syscalls-linux.c 2005-06-02 03:52:53 UTC (=
rev 3839)
@@ -596,8 +596,8 @@
unsigned, nr_events, vki_aio_context_t *, ctxp);
PRE_MEM_WRITE( "io_setup(ctxp)", ARG2, sizeof(vki_aio_context_t) );
=20
- size =3D PGROUNDUP(sizeof(struct vki_aio_ring) +
- ARG1*sizeof(struct vki_io_event));
+ size =3D VG_PGROUNDUP(sizeof(struct vki_aio_ring) +
+ ARG1*sizeof(struct vki_io_event));
addr =3D VG_(find_map_space)(0, size, True);
=20
if (addr =3D=3D 0) {
@@ -645,8 +645,8 @@
// If we are going to seg fault (due to a bogus ARG1) do it as late a=
s
// possible...
r =3D *(struct vki_aio_ring **)ARG1;
- size =3D PGROUNDUP(sizeof(struct vki_aio_ring) +=20
- r->nr*sizeof(struct vki_io_event));
+ size =3D VG_PGROUNDUP(sizeof(struct vki_aio_ring) +=20
+ r->nr*sizeof(struct vki_io_event));
=20
SET_RESULT( VG_(do_syscall1)(SYSNO, ARG1) );
=20
Modified: trunk/coregrind/m_syscalls/syscalls-x86-linux.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_syscalls/syscalls-x86-linux.c 2005-06-02 03:39:33 U=
TC (rev 3838)
+++ trunk/coregrind/m_syscalls/syscalls-x86-linux.c 2005-06-02 03:52:53 U=
TC (rev 3839)
@@ -431,12 +431,12 @@
only go down to the start of the mmaped segment. */
seg =3D VG_(find_segment)((Addr)esp);
if (seg) {
- ctst->client_stack_highest_word =3D (Addr)PGROUNDUP(esp);
+ ctst->client_stack_highest_word =3D (Addr)VG_PGROUNDUP(esp);
ctst->client_stack_szB =3D ctst->client_stack_highest_word - seg-=
>addr;
=20
if (debug)
VG_(printf)("tid %d: guessed client stack range %p-%p\n",
- ctid, seg->addr, PGROUNDUP(esp));
+ ctid, seg->addr, VG_PGROUNDUP(esp));
} else {
VG_(message)(Vg_UserMsg, "!? New thread %d starts with ESP(%p) unm=
apped\n",
ctid, esp);
Modified: trunk/coregrind/m_syscalls/syscalls.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_syscalls/syscalls.c 2005-06-02 03:39:33 UTC (rev 38=
38)
+++ trunk/coregrind/m_syscalls/syscalls.c 2005-06-02 03:52:53 UTC (rev 38=
39)
@@ -173,8 +173,8 @@
{
Addr ra;
=20
- ra =3D PGROUNDDN(*a);
- *len =3D PGROUNDUP(*a + *len) - ra;
+ ra =3D VG_PGROUNDDN(*a);
+ *len =3D VG_PGROUNDUP(*a + *len) - ra;
*a =3D ra;
}
=20
@@ -211,10 +211,10 @@
Addr ret;
Segment *seg, *next;
=20
- old_size =3D PGROUNDUP(old_size);
- new_size =3D PGROUNDUP(new_size);
+ old_size =3D VG_PGROUNDUP(old_size);
+ new_size =3D VG_PGROUNDUP(new_size);
=20
- if (PGROUNDDN(old_addr) !=3D old_addr)
+ if (VG_PGROUNDDN(old_addr) !=3D old_addr)
return -VKI_EINVAL;
=20
if (!VG_(valid_client_addr)(old_addr, old_size, tid, "mremap(old_addr=
)"))
@@ -225,7 +225,7 @@
flags &=3D ~(VKI_MREMAP_FIXED|VKI_MREMAP_MAYMOVE);
=20
if (flags & VKI_MREMAP_FIXED) {
- if (PGROUNDDN(new_addr) !=3D new_addr)
+ if (VG_PGROUNDDN(new_addr) !=3D new_addr)
return -VKI_EINVAL;
=20
if (!VG_(valid_client_addr)(new_addr, new_size, tid, "mremap(new_a=
ddr)"))
@@ -907,8 +907,8 @@
if (seg !=3D NULL && newbrk > seg->addr)
return VG_(brk_limit);
=20
- current =3D PGROUNDUP(VG_(brk_limit));
- newaddr =3D PGROUNDUP(newbrk);
+ current =3D VG_PGROUNDUP(VG_(brk_limit));
+ newaddr =3D VG_PGROUNDUP(newbrk);
if (newaddr !=3D current) {
=20
/* new brk in a new page - fix the mappings */
Modified: trunk/coregrind/stage1.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/stage1.c 2005-06-02 03:39:33 UTC (rev 3838)
+++ trunk/coregrind/stage1.c 2005-06-02 03:52:53 UTC (rev 3839)
@@ -265,15 +265,15 @@
extern char _end;
int *esp;
char buf[strlen(valgrind_lib) + sizeof(stage2) + 16];
- info.exe_end =3D PGROUNDDN(init_sp);
+ info.exe_end =3D VG_PGROUNDDN(init_sp);
#ifdef HAVE_PIE
- info.exe_base =3D ROUNDDN(info.exe_end - 0x02000000, 0x10000000);
- assert(info.exe_base >=3D PGROUNDUP(&_end));
+ info.exe_base =3D VG_ROUNDDN(info.exe_end - 0x02000000, 0x10000000);
+ assert(info.exe_base >=3D VG_PGROUNDUP(&_end));
info.map_base =3D info.exe_base + 0x01000000;
#else
// If this system doesn't have PIE (position-independent executables)=
,
// we have to choose a hardwired location for stage2.
- info.exe_base =3D PGROUNDUP(&_end);
+ info.exe_base =3D VG_PGROUNDUP(&_end);
info.map_base =3D KICKSTART_BASE + 0x01000000;
#endif
=20
Modified: trunk/coregrind/ume.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/ume.c 2005-06-02 03:39:33 UTC (rev 3838)
+++ trunk/coregrind/ume.c 2005-06-02 03:52:53 UTC (rev 3839)
@@ -251,22 +251,23 @@
// use ph->p_align -- part of stage2's memory gets trashed somehow=
.)
//
// The condition handles the case of a zero-length segment.
- if (PGROUNDUP(bss)-PGROUNDDN(addr) > 0) {
- res =3D mmap((char *)PGROUNDDN(addr), PGROUNDUP(bss)-PGROUNDDN(=
addr),
- prot, MAP_FIXED|MAP_PRIVATE, e->fd, PGROUNDDN(off));
- check_mmap(res, (char*)PGROUNDDN(addr),
- PGROUNDUP(bss)-PGROUNDDN(addr));
+ if (VG_PGROUNDUP(bss)-VG_PGROUNDDN(addr) > 0) {
+ res =3D mmap((char *)VG_PGROUNDDN(addr),
+ VG_PGROUNDUP(bss)-VG_PGROUNDDN(addr),
+ prot, MAP_FIXED|MAP_PRIVATE, e->fd, VG_PGROUNDDN(off=
));
+ check_mmap(res, (char*)VG_PGROUNDDN(addr),
+ VG_PGROUNDUP(bss)-VG_PGROUNDDN(addr));
}
=20
// if memsz > filesz, fill the remainder with zeroed pages
if (memsz > filesz) {
UInt bytes;
=20
- bytes =3D PGROUNDUP(brkaddr)-PGROUNDUP(bss);
+ bytes =3D VG_PGROUNDUP(brkaddr)-VG_PGROUNDUP(bss);
if (bytes > 0) {
- res =3D mmap((char *)PGROUNDUP(bss), bytes,
+ res =3D mmap((char *)VG_PGROUNDUP(bss), bytes,
prot, MAP_FIXED|MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- check_mmap(res, (char*)PGROUNDUP(bss), bytes);
+ check_mmap(res, (char*)VG_PGROUNDUP(bss), bytes);
}
=20
bytes =3D bss & (VKI_PAGE_SIZE - 1);
@@ -413,7 +414,7 @@
int flags =3D MAP_PRIVATE|MAP_ANONYMOUS;
=20
if (info->map_base !=3D 0) {
- base =3D (char *)ROUNDUP(info->map_base, interp_align);
+ base =3D (char *)VG_ROUNDUP(info->map_base, interp_align);
flags |=3D MAP_FIXED;
}
=20
Modified: trunk/helgrind/hg_main.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/helgrind/hg_main.c 2005-06-02 03:39:33 UTC (rev 3838)
+++ trunk/helgrind/hg_main.c 2005-06-02 03:52:53 UTC (rev 3839)
@@ -77,12 +77,6 @@
/* Rotate an unsigned quantity left */
#define ROTL(x, n) (((x) << (n)) | ((x) >> ((sizeof(x)*8)-(n))))
=20
-/* round a up to the next multiple of N. N must be a power of 2 */
-#define ROUNDUP(a, N) ((a + N - 1) & ~(N-1))
-
-/* Round a down to the next multiple of N. N must be a power of 2 */
-#define ROUNDDN(a, N) ((a) & ~(N-1))
-
/*------------------------------------------------------------*/
/*--- Command line options ---*/
/*------------------------------------------------------------*/
@@ -1625,8 +1619,8 @@
* len/4+1 words. This works out which it is by aligning the block a=
nd
* seeing if the end byte is in the same word as it is for the unalig=
ned
* block; if not, it's the awkward case. */
- end =3D ROUNDUP(a + len, 4);
- a =3D ROUNDDN(a, 4);
+ end =3D VG_ROUNDUP(a + len, 4);
+ a =3D VG_ROUNDDN(a, 4);
=20
/* Do it ... */
switch (status) {
@@ -3049,8 +3043,8 @@
{
Addr end;
=20
- end =3D ROUNDUP(a+size, 4);
- a =3D ROUNDDN(a, 4);
+ end =3D VG_ROUNDUP(a+size, 4);
+ a =3D VG_ROUNDDN(a, 4);
=20
for ( ; a < end; a +=3D 4)
hg_mem_read_word(a, tid);
@@ -3154,8 +3148,8 @@
{
Addr end;
=20
- end =3D ROUNDUP(a+size, 4);
- a =3D ROUNDDN(a, 4);
+ end =3D VG_ROUNDUP(a+size, 4);
+ a =3D VG_ROUNDDN(a, 4);
=20
for ( ; a < end; a +=3D 4)
hg_mem_write_word(a, tid);
Modified: trunk/include/tool.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/include/tool.h 2005-06-02 03:39:33 UTC (rev 3838)
+++ trunk/include/tool.h 2005-06-02 03:52:53 UTC (rev 3839)
@@ -57,6 +57,12 @@
/*=3D=3D=3D Useful macros =
=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=3D=3D=3D=3D*/
=20
+// 'a' -- the alignment -- must be a power of 2
+#define VG_ROUNDDN(p, a) ((Addr)(p) & ~((Addr)(a)-1))
+#define VG_ROUNDUP(p, a) VG_ROUNDDN((p)+(a)-1, (a))
+#define VG_PGROUNDDN(p) VG_ROUNDDN(p, VKI_PAGE_SIZE)
+#define VG_PGROUNDUP(p) VG_ROUNDUP(p, VKI_PAGE_SIZE)
+
/* No, really. I _am_ that strange. */
#define OINK(nnn) VG_(message)(Vg_DebugMsg, "OINK %d",nnn)
=20
Modified: trunk/memcheck/mac_leakcheck.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/memcheck/mac_leakcheck.c 2005-06-02 03:39:33 UTC (rev 3838)
+++ trunk/memcheck/mac_leakcheck.c 2005-06-02 03:52:53 UTC (rev 3839)
@@ -38,11 +38,6 @@
#define VG_DEBUG_LEAKCHECK 0
#define VG_DEBUG_CLIQUE 0
=20
-#define ROUNDDN(p, a) ((Addr)(p) & ~((a)-1))
-#define ROUNDUP(p, a) ROUNDDN((p)+(a)-1, (a))
-#define PGROUNDDN(p) ROUNDDN(p, VKI_PAGE_SIZE)
-#define PGROUNDUP(p) ROUNDUP(p, VKI_PAGE_SIZE)
-
/*------------------------------------------------------------*/
/*--- Low-level address-space scanning, for the leak ---*/
/*--- detector. ---*/
@@ -371,8 +366,8 @@
cliques, and clique is the index of the current clique leader. */
static void _lc_scan_memory(Addr start, SizeT len, Int clique)
{
- Addr ptr =3D ROUNDUP(start, sizeof(Addr));
- Addr end =3D ROUNDDN(start+len, sizeof(Addr));
+ Addr ptr =3D VG_ROUNDUP(start, sizeof(Addr));
+ Addr end =3D VG_ROUNDDN(start+len, sizeof(Addr));
vki_sigset_t sigmask;
=20
if (VG_DEBUG_LEAKCHECK)
@@ -384,14 +379,14 @@
=20
if (!VG_(is_client_addr)(ptr) ||
!VG_(is_addressable)(ptr, sizeof(Addr), VKI_PROT_READ))
- ptr =3D PGROUNDUP(ptr+1); /* first page bad */
+ ptr =3D VG_PGROUNDUP(ptr+1); /* first page bad */
=20
while (ptr < end) {
Addr addr;
=20
/* Skip invalid chunks */
if (!(*lc_is_within_valid_secondary)(ptr)) {
- ptr =3D ROUNDUP(ptr+1, SECONDARY_SIZE);
+ ptr =3D VG_ROUNDUP(ptr+1, SECONDARY_SIZE);
continue;
}
=20
@@ -414,7 +409,7 @@
longjmped out of a signal handler. */
VG_(sigprocmask)(VKI_SIG_SETMASK, &sigmask, NULL);
=20
- ptr =3D PGROUNDUP(ptr+1); /* bad page - skip it */
+ ptr =3D VG_PGROUNDUP(ptr+1); /* bad page - skip it */
}
}
=20
|