|
From: <sv...@va...> - 2005-08-26 03:49:46
|
Author: njn
Date: 2005-08-26 04:49:43 +0100 (Fri, 26 Aug 2005)
New Revision: 4518
Log:
Move clock_* syscalls from "generic" to "linux".
Modified:
trunk/coregrind/m_syswrap/priv_syswrap-linux.h
trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
trunk/coregrind/m_syswrap/syswrap-generic.c
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c
trunk/coregrind/m_syswrap/syswrap-x86-linux.c
Modified: trunk/coregrind/m_syswrap/priv_syswrap-linux.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/m_syswrap/priv_syswrap-linux.h 2005-08-26 03:43:28 UT=
C (rev 4517)
+++ trunk/coregrind/m_syswrap/priv_syswrap-linux.h 2005-08-26 03:49:43 UT=
C (rev 4518)
@@ -103,6 +103,11 @@
DECL_TEMPLATE(linux, sys_mq_notify);
DECL_TEMPLATE(linux, sys_mq_getsetattr);
=20
+DECL_TEMPLATE(linux, sys_clock_settime);
+DECL_TEMPLATE(linux, sys_clock_gettime);
+DECL_TEMPLATE(linux, sys_clock_getres);
+DECL_TEMPLATE(linux, sys_clock_nanosleep);
+
#endif // __PRIV_SYSWRAP_LINUX_H
=20
/*--------------------------------------------------------------------*/
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-08-26 03:43:28 U=
TC (rev 4517)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2005-08-26 03:49:43 U=
TC (rev 4518)
@@ -1448,11 +1448,11 @@
=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
- GENXY(__NR_clock_getres, sys_clock_getres), // 229=20
+ LINX_(__NR_clock_settime, sys_clock_settime), // 227=20
+ LINXY(__NR_clock_gettime, sys_clock_gettime), // 228=20
+ LINXY(__NR_clock_getres, sys_clock_getres), // 229=20
=20
- GENXY(__NR_clock_nanosleep, sys_clock_nanosleep),// 230=20
+ LINXY(__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-08-26 03:43:28 UTC (=
rev 4517)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c 2005-08-26 03:49:43 UTC (=
rev 4518)
@@ -5572,59 +5572,6 @@
PRE_REG_READ1(long, "timer_delete", vki_timer_t, timerid);
}
=20
-PRE(sys_clock_settime)
-{
- PRINT("sys_clock_settime( %d, %p )", ARG1,ARG2);
- PRE_REG_READ2(long, "clock_settime",=20
- vki_clockid_t, clk_id, const struct timespec *, tp);
- PRE_MEM_READ( "clock_settime(tp)", ARG2, sizeof(struct vki_timespec) =
);
-}
-
-PRE(sys_clock_gettime)
-{
- PRINT("sys_clock_gettime( %d, %p )" , ARG1,ARG2);
- PRE_REG_READ2(long, "clock_gettime",=20
- vki_clockid_t, clk_id, struct timespec *, tp);
- PRE_MEM_WRITE( "clock_gettime(tp)", ARG2, sizeof(struct vki_timespec)=
);
-}
-POST(sys_clock_gettime)
-{
- POST_MEM_WRITE( ARG2, sizeof(struct vki_timespec) );
-}
-
-PRE(sys_clock_getres)
-{
- PRINT("sys_clock_getres( %d, %p )" , ARG1,ARG2);
- // Nb: we can't use "RES" as the param name because that's a macro
- // defined above!
- PRE_REG_READ2(long, "clock_getres",=20
- vki_clockid_t, clk_id, struct timespec *, res);
- if (ARG2 !=3D 0)
- PRE_MEM_WRITE( "clock_getres(res)", ARG2, sizeof(struct vki_timesp=
ec) );
-}
-POST(sys_clock_getres)
-{
- if (ARG2 !=3D 0)
- POST_MEM_WRITE( ARG2, sizeof(struct vki_timespec) );
-}
-
-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) );
-}
-
PRE(sys_waitid)
{
*flags |=3D SfMayBlock;
Modified: trunk/coregrind/m_syswrap/syswrap-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-linux.c 2005-08-26 03:43:28 UTC (re=
v 4517)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c 2005-08-26 03:49:43 UTC (re=
v 4518)
@@ -913,7 +913,6 @@
(Addr)&attr->mq_msgsize, sizeof(attr->mq_msgsize) )=
;
}
}
-
POST(sys_mq_open)
{
vg_assert(SUCCESS);
@@ -972,7 +971,6 @@
ARG5, sizeof(struct vki_timespec) );
}
}
-
POST(sys_mq_timedreceive)
{
POST_MEM_WRITE( ARG2, ARG3 );
@@ -1011,13 +1009,65 @@
sizeof(struct vki_mq_attr) );
} =20
}
-
POST(sys_mq_getsetattr)
{
if (ARG3 !=3D 0)
POST_MEM_WRITE( ARG3, sizeof(struct vki_mq_attr) );
}
=20
+PRE(sys_clock_settime)
+{
+ PRINT("sys_clock_settime( %d, %p )", ARG1,ARG2);
+ PRE_REG_READ2(long, "clock_settime",=20
+ vki_clockid_t, clk_id, const struct timespec *, tp);
+ PRE_MEM_READ( "clock_settime(tp)", ARG2, sizeof(struct vki_timespec) =
);
+}
+
+PRE(sys_clock_gettime)
+{
+ PRINT("sys_clock_gettime( %d, %p )" , ARG1,ARG2);
+ PRE_REG_READ2(long, "clock_gettime",=20
+ vki_clockid_t, clk_id, struct timespec *, tp);
+ PRE_MEM_WRITE( "clock_gettime(tp)", ARG2, sizeof(struct vki_timespec)=
);
+}
+POST(sys_clock_gettime)
+{
+ POST_MEM_WRITE( ARG2, sizeof(struct vki_timespec) );
+}
+
+PRE(sys_clock_getres)
+{
+ PRINT("sys_clock_getres( %d, %p )" , ARG1,ARG2);
+ // Nb: we can't use "RES" as the param name because that's a macro
+ // defined above!
+ PRE_REG_READ2(long, "clock_getres",=20
+ vki_clockid_t, clk_id, struct timespec *, res);
+ if (ARG2 !=3D 0)
+ PRE_MEM_WRITE( "clock_getres(res)", ARG2, sizeof(struct vki_timesp=
ec) );
+}
+POST(sys_clock_getres)
+{
+ if (ARG2 !=3D 0)
+ POST_MEM_WRITE( ARG2, sizeof(struct vki_timespec) );
+}
+
+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-ppc32-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-ppc32-linux.c 2005-08-26 03:43:28 U=
TC (rev 4517)
+++ trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c 2005-08-26 03:49:43 U=
TC (rev 4518)
@@ -2256,10 +2256,10 @@
//.. GENXY(__NR_timer_gettime, sys_timer_gettime), // 242
//.. GENX_(__NR_timer_getoverrun, sys_timer_getoverrun), // 243
//.. GENX_(__NR_timer_delete, sys_timer_delete), // 244
-//.. GENX_(__NR_clock_settime, sys_clock_settime), // 245
- GENXY(__NR_clock_gettime, sys_clock_gettime), // 246
-//.. GENXY(__NR_clock_getres, sys_clock_getres), // 247
-//.. // (__NR_clock_nanosleep, sys_clock_nanosleep), // 248
+//.. LINX_(__NR_clock_settime, sys_clock_settime), // 245
+ LINXY(__NR_clock_gettime, sys_clock_gettime), // 246
+//.. LINXY(__NR_clock_getres, sys_clock_getres), // 247
+//.. LINXY(__NR_clock_nanosleep, sys_clock_nanosleep), // 248
=20
// __NR_swapcontext // 249
=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-08-26 03:43:28 UTC=
(rev 4517)
+++ trunk/coregrind/m_syswrap/syswrap-x86-linux.c 2005-08-26 03:49:43 UTC=
(rev 4518)
@@ -2259,11 +2259,11 @@
GENXY(__NR_timer_gettime, sys_timer_gettime), // (timer_create+2=
)
GENX_(__NR_timer_getoverrun, sys_timer_getoverrun),//(timer_create+3=
)
GENX_(__NR_timer_delete, sys_timer_delete), // (timer_create+4=
)
- GENX_(__NR_clock_settime, sys_clock_settime), // (timer_create+5=
)
+ LINX_(__NR_clock_settime, sys_clock_settime), // (timer_create+5=
)
=20
- GENXY(__NR_clock_gettime, sys_clock_gettime), // (timer_create+6=
)
- GENXY(__NR_clock_getres, sys_clock_getres), // (timer_create+7=
)
- GENXY(__NR_clock_nanosleep, sys_clock_nanosleep),// (timer_create+8=
) */*
+ LINXY(__NR_clock_gettime, sys_clock_gettime), // (timer_create+6=
)
+ LINXY(__NR_clock_getres, sys_clock_getres), // (timer_create+7=
)
+ LINXY(__NR_clock_nanosleep, sys_clock_nanosleep),// (timer_create+8=
) */*
GENXY(__NR_statfs64, sys_statfs64), // 268
GENXY(__NR_fstatfs64, sys_fstatfs64), // 269
=20
|