|
From: <sv...@va...> - 2005-09-14 08:10:37
|
Author: tom
Date: 2005-09-14 09:10:28 +0100 (Wed, 14 Sep 2005)
New Revision: 4652
Log:
Change the type of dev and ino to UWord for amd64 compatability.
Modified:
branches/ASPACEM/coregrind/m_aspacemgr/aspacemgr.c
branches/ASPACEM/coregrind/pub_core_aspacemgr.h
Modified: branches/ASPACEM/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
--- branches/ASPACEM/coregrind/m_aspacemgr/aspacemgr.c 2005-09-14 01:46:2=
1 UTC (rev 4651)
+++ branches/ASPACEM/coregrind/m_aspacemgr/aspacemgr.c 2005-09-14 08:10:2=
8 UTC (rev 4652)
@@ -1602,8 +1602,8 @@
show_nsegment_full ( Int logLevel, NSegment* seg )
{
VG_(debugLog)(logLevel, "aspacem",
- "NSegment{%s, start=3D0x%llx, end=3D0x%llx, smode=3D%s, dev=3D%u, =
"
- "ino=3D%u, offset=3D%llu, fnIdx=3D%d, hasR=3D%d, hasW=3D%d, hasX=3D=
%d, "
+ "NSegment{%s, start=3D0x%llx, end=3D0x%llx, smode=3D%s, dev=3D%lu,=
"
+ "ino=3D%lu, offset=3D%llu, fnIdx=3D%d, hasR=3D%d, hasW=3D%d, hasX=3D=
%d, "
"hasT=3D%d, mark=3D%d}\n",
show_SegKind(seg->kind),
(ULong)seg->start,
@@ -1649,7 +1649,7 @@
case SkFileC: case SkFileV:
VG_(debugLog)(
logLevel, "aspacem",
- "%3d: %s %08llx-%08llx %s %c%c%c%c d=3D0x%03x i=3D%-7d o=3D%=
-7lld (%d)\n",
+ "%3d: %s %08llx-%08llx %s %c%c%c%c d=3D0x%03lx i=3D%-7ld o=3D=
%-7lld (%d)\n",
segNo, show_SegKind(seg->kind),
(ULong)seg->start, (ULong)seg->end, len_buf,
seg->hasR ? 'r' : '-', seg->hasW ? 'w' : '-',=20
@@ -2196,8 +2196,8 @@
/* If these fail, we'd better change the type of dev and ino in
NSegment accordingly. */
struct vki_stat buf;
- aspacem_assert(sizeof(buf.st_dev) =3D=3D sizeof(UInt));
- aspacem_assert(sizeof(buf.st_ino) =3D=3D sizeof(UInt));
+ aspacem_assert(sizeof(buf.st_dev) =3D=3D sizeof(seg.dev));
+ aspacem_assert(sizeof(buf.st_ino) =3D=3D sizeof(seg.ino));
}
=20
/* Add a single interval covering the entire address space. */
Modified: branches/ASPACEM/coregrind/pub_core_aspacemgr.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
--- branches/ASPACEM/coregrind/pub_core_aspacemgr.h 2005-09-14 01:46:21 U=
TC (rev 4651)
+++ branches/ASPACEM/coregrind/pub_core_aspacemgr.h 2005-09-14 08:10:28 U=
TC (rev 4652)
@@ -217,8 +217,8 @@
/* Shrinkable? (SkResvn only) */
ShrinkMode smode;
/* Associated file (SkFile{C,V} only) */
- UInt dev;
- UInt ino;
+ UWord dev;
+ UWord ino;
ULong offset;
Int fnIdx; // file name table index, if name is known
/* Permissions (SkAnon{C,V}, SkFile{C,V} only) */
|