|
From: <sv...@va...> - 2006-10-17 02:15:22
|
Author: sewardj
Date: 2006-10-17 03:15:17 +0100 (Tue, 17 Oct 2006)
New Revision: 6294
Log:
Track SysRes change.
Modified:
trunk/cachegrind/cg_main.c
trunk/callgrind/command.c
trunk/callgrind/dump.c
trunk/coregrind/m_commandline.c
trunk/coregrind/m_coredump/coredump-elf.c
trunk/coregrind/m_transtab.c
trunk/massif/ms_main.c
Modified: trunk/cachegrind/cg_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/cachegrind/cg_main.c 2006-10-17 02:11:55 UTC (rev 6293)
+++ trunk/cachegrind/cg_main.c 2006-10-17 02:15:17 UTC (rev 6294)
@@ -1002,7 +1002,7 @@
" ... so simulation results will be missing.");
return;
} else {
- fd =3D sres.val;
+ fd =3D sres.res;
}
=20
// "desc:" lines (giving I1/D1/L2 cache configuration). The spaces a=
fter
@@ -1347,7 +1347,7 @@
VG_(details_copyright_author)(
"Copyright (C) 2002-2006, and GNU GPL'd, by Nicholas Nethercote et=
al.");
VG_(details_bug_reports_to) (VG_BUGS_TO);
- VG_(details_avg_translation_sizeB) ( 245 );
+ VG_(details_avg_translation_sizeB) ( 500 );
=20
VG_(basic_tool_funcs) (cg_post_clo_init,
cg_instrument,
Modified: trunk/callgrind/command.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/callgrind/command.c 2006-10-17 02:11:55 UTC (rev 6293)
+++ trunk/callgrind/command.c 2006-10-17 02:15:17 UTC (rev 6294)
@@ -124,7 +124,7 @@
}
}
if (!res.isError)
- fd =3D (Int) res.val;
+ fd =3D (Int) res.res;
if (fd>=3D0) {
Char buf[512];
Int i;
@@ -196,7 +196,7 @@
* to not confuse it with our special value -2
*/
if (res.isError) fd =3D -1;
- else fd =3D (Int) res.val;
+ else fd =3D (Int) res.res;
=20
return fd;
}
@@ -403,7 +403,7 @@
=20
res =3D VG_(open)(current_command_file, VKI_O_RDONLY,0);
if (!res.isError) {
- fd =3D (Int) res.val;
+ fd =3D (Int) res.res;
bytesRead =3D VG_(read)(fd,cmdBuffer,500);
cmdBuffer[500] =3D 0; /* no command overrun please */
VG_(close)(fd);
Modified: trunk/callgrind/dump.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/callgrind/dump.c 2006-10-17 02:11:55 UTC (rev 6293)
+++ trunk/callgrind/dump.c 2006-10-17 02:15:17 UTC (rev 6294)
@@ -1299,7 +1299,7 @@
file_err();
}
}
- fd =3D (Int) res.val;
+ fd =3D (Int) res.res;
=20
CLG_DEBUG(2, " new_dumpfile '%s'\n", filename);
=20
@@ -1557,7 +1557,7 @@
=20
p++;
}
- =20
+
close_dumpfile(print_buf, print_fd, CLG_(current_tid));
if (array) VG_(free)(array);
=20
@@ -1608,7 +1608,6 @@
=20
print_bbccs(trigger, only_current_thread);
=20
-
bbs_done =3D CLG_(stat).bb_executions++;
=20
if (VG_(clo_verbosity) > 1)
@@ -1723,7 +1722,7 @@
file_err();=20
}
}
- if (!res.isError) VG_(close)( (Int)res.val );
+ if (!res.isError) VG_(close)( (Int)res.res );
=20
init_cmdbuf();
=20
Modified: trunk/coregrind/m_commandline.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_commandline.c 2006-10-17 02:11:55 UTC (rev 6293)
+++ trunk/coregrind/m_commandline.c 2006-10-17 02:15:17 UTC (rev 6294)
@@ -81,16 +81,16 @@
( NULL =3D=3D dir ? "" : dir ) );
fd =3D VG_(open)(filename, 0, VKI_S_IRUSR);
if ( !fd.isError ) {
- size =3D VG_(fsize)(fd.val);
+ size =3D VG_(fsize)(fd.res);
if (size > 0) {
f_clo =3D VG_(malloc)(size+1);
vg_assert(f_clo);
- n =3D VG_(read)(fd.val, f_clo, size);
+ n =3D VG_(read)(fd.res, f_clo, size);
if (n =3D=3D -1) n =3D 0;
vg_assert(n >=3D 0 && n <=3D size+1);
f_clo[n] =3D '\0';
}
- VG_(close)(fd.val);
+ VG_(close)(fd.res);
}
return f_clo;
}
Modified: trunk/coregrind/m_coredump/coredump-elf.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_coredump/coredump-elf.c 2006-10-17 02:11:55 UTC (re=
v 6293)
+++ trunk/coregrind/m_coredump/coredump-elf.c 2006-10-17 02:15:17 UTC (re=
v 6294)
@@ -290,7 +290,7 @@
Char *coreext =3D "";
Int seq =3D 0;
Int core_fd;
- NSegment *seg;
+ NSegment const * seg;
ESZ(Ehdr) ehdr;
ESZ(Phdr) *phdrs;
Int num_phdrs;
@@ -323,11 +323,11 @@
VKI_O_CREAT|VKI_O_WRONLY|VKI_O_EXCL|VKI_O_TRUNC,=20
VKI_S_IRUSR|VKI_S_IWUSR);
if (!sres.isError) {
- core_fd =3D sres.val;
+ core_fd =3D sres.res;
break;
}
=20
- if (sres.isError && sres.val !=3D VKI_EEXIST)
+ if (sres.isError && sres.err !=3D VKI_EEXIST)
return; /* can't create file */
}
=20
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 2006-10-17 02:11:55 UTC (rev 6293)
+++ trunk/coregrind/m_transtab.c 2006-10-17 02:15:17 UTC (rev 6294)
@@ -667,7 +667,7 @@
8 * tc_sector_szQ );
/*NOTREACHED*/
}
- sec->tc =3D (ULong*)sres.val;
+ sec->tc =3D (ULong*)sres.res;
=20
sres =3D VG_(am_mmap_anon_float_valgrind)
( N_TTES_PER_SECTOR * sizeof(TTEntry) );
@@ -676,7 +676,7 @@
N_TTES_PER_SECTOR * sizeof(TTEntry)=
);
/*NOTREACHED*/
}
- sec->tt =3D (TTEntry*)sres.val;
+ sec->tt =3D (TTEntry*)sres.res;
=20
for (i =3D 0; i < N_TTES_PER_SECTOR; i++) {
sec->tt[i].status =3D Empty;
@@ -791,8 +791,10 @@
=20
vg_assert(init_done);
vg_assert(vge->n_used >=3D 1 && vge->n_used <=3D 3);
- vg_assert(code_len > 0 && code_len < 20000);
=20
+ /* 60000: should agree with N_TMPBUF in m_translate.c. */
+ vg_assert(code_len > 0 && code_len < 60000);
+
if (0)
VG_(printf)("add_to_transtab(entry =3D 0x%llx, len =3D %d)\n",
entry, code_len);
@@ -1262,7 +1264,7 @@
VG_(out_of_memory_NORETURN)("init_unredir_tt_tc", N_UNREDIR_TT =
* UNREDIR_SZB);
/*NOTREACHED*/
}
- unredir_tc =3D (ULong *)sres.val;
+ unredir_tc =3D (ULong *)sres.res;
}
unredir_tc_used =3D 0;
for (i =3D 0; i < N_UNREDIR_TT; i++)
@@ -1402,7 +1404,7 @@
=20
/* Ensure the calculated value is not way crazy. */
vg_assert(tc_sector_szQ >=3D 2 * N_TTES_PER_SECTOR_USABLE);
- vg_assert(tc_sector_szQ <=3D 50 * N_TTES_PER_SECTOR_USABLE);
+ vg_assert(tc_sector_szQ <=3D 80 * N_TTES_PER_SECTOR_USABLE);
=20
/* Initialise the sectors */
youngest_sector =3D 0;
Modified: trunk/massif/ms_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/massif/ms_main.c 2006-10-17 02:11:55 UTC (rev 6293)
+++ trunk/massif/ms_main.c 2006-10-17 02:15:17 UTC (rev 6294)
@@ -1288,7 +1288,7 @@
file_err( hp_file );
return;
} else {
- fd =3D sres.val;
+ fd =3D sres.res;
}
=20
// File header, including command line
@@ -1601,7 +1601,7 @@
file_err( text_file );
return;
} else {
- fd =3D sres.val;
+ fd =3D sres.res;
}
=20
// Header
|