|
From: <sv...@va...> - 2005-08-26 04:03:07
|
Author: njn
Date: 2005-08-26 05:03:04 +0100 (Fri, 26 Aug 2005)
New Revision: 4520
Log:
Move cap{get,set} syscalls from "generic" to "linux".
Modified:
trunk/coregrind/m_syswrap/priv_syswrap-generic.h
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-generic.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-generic.h 2005-08-26 03:54:30 =
UTC (rev 4519)
+++ trunk/coregrind/m_syswrap/priv_syswrap-generic.h 2005-08-26 04:03:04 =
UTC (rev 4520)
@@ -129,15 +129,6 @@
DECL_TEMPLATE(generic, sys_wait4);
DECL_TEMPLATE(generic, sys_mprotect);
DECL_TEMPLATE(generic, sys_sigprocmask);
-DECL_TEMPLATE(generic, sys_timer_create); // Linux: varies across arc=
hs?
-DECL_TEMPLATE(generic, sys_timer_settime);
-DECL_TEMPLATE(generic, sys_timer_gettime);
-DECL_TEMPLATE(generic, sys_timer_getoverrun);
-DECL_TEMPLATE(generic, sys_timer_delete);
-DECL_TEMPLATE(generic, sys_clock_settime);
-DECL_TEMPLATE(generic, sys_clock_gettime);
-DECL_TEMPLATE(generic, sys_clock_getres);
-DECL_TEMPLATE(generic, sys_clock_nanosleep);
DECL_TEMPLATE(generic, sys_getcwd);
DECL_TEMPLATE(generic, sys_symlink);
DECL_TEMPLATE(generic, sys_getgroups);
@@ -223,8 +214,6 @@
DECL_TEMPLATE(generic, sys_rt_sigsuspend); // () ()
DECL_TEMPLATE(generic, sys_pread64); // * (Unix98?)
DECL_TEMPLATE(generic, sys_pwrite64); // * (Unix98?)
-DECL_TEMPLATE(generic, sys_capget); // * L?
-DECL_TEMPLATE(generic, sys_capset); // * L?
DECL_TEMPLATE(generic, sys_sigaltstack); // (x86) (XPG4-UNIX)
DECL_TEMPLATE(generic, sys_getpmsg); // (?) (?)
DECL_TEMPLATE(generic, sys_putpmsg); // (?) (?)
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:54:30 UT=
C (rev 4519)
+++ trunk/coregrind/m_syswrap/priv_syswrap-linux.h 2005-08-26 04:03:04 UT=
C (rev 4520)
@@ -114,6 +114,9 @@
DECL_TEMPLATE(linux, sys_timer_getoverrun);
DECL_TEMPLATE(linux, sys_timer_delete);
=20
+DECL_TEMPLATE(linux, sys_capget);
+DECL_TEMPLATE(linux, sys_capset);
+
#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:54:30 U=
TC (rev 4519)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2005-08-26 04:03:04 U=
TC (rev 4520)
@@ -1326,8 +1326,8 @@
LINX_(__NR_setfsgid, sys_setfsgid), // 123=20
GENX_(__NR_getsid, sys_getsid), // 124=20
=20
- // (__NR_capget, sys_capget), // 125=20
- // (__NR_capset, sys_capset), // 126=20
+ // LINXY(__NR_capget, sys_capget), // 125=20
+ // LINX_(__NR_capset, sys_capset), // 126=20
GENXY(__NR_rt_sigpending, sys_rt_sigpending), // 127=20
GENXY(__NR_rt_sigtimedwait, sys_rt_sigtimedwait),// 128=20
GENXY(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo),// 129=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:54:30 UTC (=
rev 4519)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c 2005-08-26 04:03:04 UTC (=
rev 4520)
@@ -2215,34 +2215,6 @@
PRE_MEM_RASCIIZ( "init_module(uargs)", ARG3 );
}
=20
-PRE(sys_capget)
-{
- PRINT("sys_capget ( %p, %p )", ARG1, ARG2 );
- PRE_REG_READ2(long, "capget",=20
- vki_cap_user_header_t, header, vki_cap_user_data_t, dat=
a);
- PRE_MEM_READ( "capget(header)", ARG1,=20
- sizeof(struct __vki_user_cap_header_struct) );
- PRE_MEM_WRITE( "capget(data)", ARG2,=20
- sizeof(struct __vki_user_cap_data_struct) );
-}
-POST(sys_capget)
-{
- if (ARG2 !=3D (Addr)NULL)
- POST_MEM_WRITE( ARG2, sizeof(struct __vki_user_cap_data_struct) );
-}
-
-PRE(sys_capset)
-{
- PRINT("sys_capset ( %p, %p )", ARG1, ARG2 );
- PRE_REG_READ2(long, "capset",=20
- vki_cap_user_header_t, header,
- const vki_cap_user_data_t, data);
- PRE_MEM_READ( "capset(header)",=20
- ARG1, sizeof(struct __vki_user_cap_header_struct) );
- PRE_MEM_READ( "capset(data)",=20
- ARG2, sizeof(struct __vki_user_cap_data_struct) );
-}
-
// Pre_read a char** argument.
static void pre_argv_envp(Addr a, ThreadId tid, Char* s1, Char* s2)
{
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:54:30 UTC (re=
v 4519)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c 2005-08-26 04:03:04 UTC (re=
v 4520)
@@ -1127,6 +1127,34 @@
PRE_REG_READ1(long, "timer_delete", vki_timer_t, timerid);
}
=20
+PRE(sys_capget)
+{
+ PRINT("sys_capget ( %p, %p )", ARG1, ARG2 );
+ PRE_REG_READ2(long, "capget",=20
+ vki_cap_user_header_t, header, vki_cap_user_data_t, dat=
a);
+ PRE_MEM_READ( "capget(header)", ARG1,=20
+ sizeof(struct __vki_user_cap_header_struct) );
+ PRE_MEM_WRITE( "capget(data)", ARG2,=20
+ sizeof(struct __vki_user_cap_data_struct) );
+}
+POST(sys_capget)
+{
+ if (ARG2 !=3D (Addr)NULL)
+ POST_MEM_WRITE( ARG2, sizeof(struct __vki_user_cap_data_struct) );
+}
+
+PRE(sys_capset)
+{
+ PRINT("sys_capset ( %p, %p )", ARG1, ARG2 );
+ PRE_REG_READ2(long, "capset",=20
+ vki_cap_user_header_t, header,
+ const vki_cap_user_data_t, data);
+ PRE_MEM_READ( "capset(header)",=20
+ ARG1, sizeof(struct __vki_user_cap_header_struct) );
+ PRE_MEM_READ( "capset(data)",=20
+ ARG2, sizeof(struct __vki_user_cap_data_struct) );
+}
+
#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:54:30 U=
TC (rev 4519)
+++ trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c 2005-08-26 04:03:04 U=
TC (rev 4520)
@@ -2180,9 +2180,9 @@
GENX_(__NR_pwrite64, sys_pwrite64), // 180
GENX_(__NR_chown, sys_chown16), // 181
GENXY(__NR_getcwd, sys_getcwd), // 182
-//.. GENXY(__NR_capget, sys_capget), // 183
+//.. LINXY(__NR_capget, sys_capget), // 183
//..=20
-//.. GENX_(__NR_capset, sys_capset), // 184
+//.. LINX_(__NR_capset, sys_capset), // 184
GENXY(__NR_sigaltstack, sys_sigaltstack), // 185
//.. LINXY(__NR_sendfile, sys_sendfile), // 186
//.. GENXY(__NR_getpmsg, sys_getpmsg), // 187
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:54:30 UTC=
(rev 4519)
+++ trunk/coregrind/m_syswrap/syswrap-x86-linux.c 2005-08-26 04:03:04 UTC=
(rev 4520)
@@ -2162,9 +2162,9 @@
GENX_(__NR_pwrite64, sys_pwrite64), // 181
GENX_(__NR_chown, sys_chown16), // 182
GENXY(__NR_getcwd, sys_getcwd), // 183
- GENXY(__NR_capget, sys_capget), // 184
+ LINXY(__NR_capget, sys_capget), // 184
=20
- GENX_(__NR_capset, sys_capset), // 185
+ LINX_(__NR_capset, sys_capset), // 185
GENXY(__NR_sigaltstack, sys_sigaltstack), // 186
LINXY(__NR_sendfile, sys_sendfile), // 187
GENXY(__NR_getpmsg, sys_getpmsg), // 188
|