|
From: <sv...@va...> - 2005-07-20 09:24:08
|
Author: tom
Date: 2005-07-20 10:24:04 +0100 (Wed, 20 Jul 2005)
New Revision: 4213
Log:
More system call fixups.
Modified:
trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
trunk/coregrind/m_syswrap/syswrap-generic.c
trunk/coregrind/m_syswrap/syswrap-x86-linux.c
Modified: trunk/coregrind/m_syswrap/syswrap-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_syswrap/syswrap-amd64-linux.c 2005-07-20 08:46:50 U=
TC (rev 4212)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2005-07-20 09:24:04 U=
TC (rev 4213)
@@ -1307,7 +1307,7 @@
GENX_(__NR_chroot, sys_chroot), // 161=20
GENX_(__NR_sync, sys_sync), // 162=20
// (__NR_acct, sys_acct), // 163=20
- // (__NR_settimeofday, sys_settimeofday), // 164=20
+ GENX_(__NR_settimeofday, sys_settimeofday), // 164=20
=20
LINX_(__NR_mount, sys_mount), // 165
// (__NR_umount2, sys_umount), // 166=20
@@ -1377,17 +1377,17 @@
=20
PLAX_(__NR_semtimedop, sys_semtimedop), // 220=20
LINX_(__NR_fadvise64, sys_fadvise64), // 221=20
- // (__NR_timer_create, sys_timer_create), // 222=20
- // (__NR_timer_settime, sys_timer_settime), // 223=20
- // (__NR_timer_gettime, sys_timer_gettime), // 224=20
+ GENXY(__NR_timer_create, sys_timer_create), // 222=20
+ GENXY(__NR_timer_settime, sys_timer_settime), // 223=20
+ GENXY(__NR_timer_gettime, sys_timer_gettime), // 224=20
=20
- // (__NR_timer_getoverrun, sys_timer_getoverrun)// 225=20
- // (__NR_timer_delete, sys_timer_delete), // 226=20
- // (__NR_clock_settime, sys_clock_settime), // 227=20
+ GENX_(__NR_timer_getoverrun, sys_timer_getoverrun), // 225=20
+ GENX_(__NR_timer_delete, sys_timer_delete), // 226=20
+ GENX_(__NR_clock_settime, sys_clock_settime), // 227=20
GENXY(__NR_clock_gettime, sys_clock_gettime), // 228=20
- // (__NR_clock_getres, sys_clock_getres), // 229=20
+ GENXY(__NR_clock_getres, sys_clock_getres), // 229=20
=20
- // (__NR_clock_nanosleep, sys_clock_nanosleep),// 230=20
+ GENXY(__NR_clock_nanosleep, sys_clock_nanosleep),// 230=20
LINX_(__NR_exit_group, sys_exit_group), // 231=20
LINXY(__NR_epoll_wait, sys_epoll_wait), // 232=20
LINX_(__NR_epoll_ctl, sys_epoll_ctl), // 233=20
Modified: trunk/coregrind/m_syswrap/syswrap-generic.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_syswrap/syswrap-generic.c 2005-07-20 08:46:50 UTC (=
rev 4212)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c 2005-07-20 09:24:04 UTC (=
rev 4213)
@@ -5646,6 +5646,23 @@
POST_MEM_WRITE( ARG2, sizeof(struct vki_timespec) );
}
=20
+PRE(sys_clock_nanosleep)
+{
+ *flags |=3D SfMayBlock|SfPostOnFail;
+ PRINT("sys_clock_nanosleep( %d, %d, %p, %p )", ARG1,ARG2,ARG3,ARG4);
+ PRE_REG_READ4(int32_t, "clock_nanosleep",
+ vki_clockid_t, clkid, int, flags,
+ const struct timespec *, rqtp, struct timespec *, rmtp)=
;
+ PRE_MEM_READ( "clock_nanosleep(rqtp)", ARG3, sizeof(struct vki_timesp=
ec) );
+ if (ARG4 !=3D 0)
+ PRE_MEM_WRITE( "clock_nanosleep(rmtp)", ARG4, sizeof(struct vki_ti=
mespec) );
+}
+POST(sys_clock_nanosleep)
+{
+ if (ARG4 !=3D 0 && FAILURE && RES_unchecked =3D=3D VKI_EINTR)
+ POST_MEM_WRITE( ARG4, sizeof(struct vki_timespec) );
+}
+
#undef PRE
#undef POST
=20
Modified: trunk/coregrind/m_syswrap/syswrap-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_syswrap/syswrap-x86-linux.c 2005-07-20 08:46:50 UTC=
(rev 4212)
+++ trunk/coregrind/m_syswrap/syswrap-x86-linux.c 2005-07-20 09:24:04 UTC=
(rev 4213)
@@ -2263,7 +2263,7 @@
=20
GENXY(__NR_clock_gettime, sys_clock_gettime), // (timer_create+6=
)
GENXY(__NR_clock_getres, sys_clock_getres), // (timer_create+7=
)
-//zz // (__NR_clock_nanosleep, sys_clock_nanosleep),// (timer_cre=
ate+8) */*
+ GENXY(__NR_clock_nanosleep, sys_clock_nanosleep),// (timer_create+8=
) */*
GENXY(__NR_statfs64, sys_statfs64), // 268
GENXY(__NR_fstatfs64, sys_fstatfs64), // 269
=20
|