|
From: <sv...@va...> - 2016-11-01 15:00:56
|
Author: philippe
Date: Tue Nov 1 15:00:45 2016
New Revision: 16109
Log:
371412 Rename wrap_sys_shmat to sys_shmat like other wrappers
Modified:
trunk/NEWS
trunk/coregrind/m_syswrap/priv_syswrap-linux.h
trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
trunk/coregrind/m_syswrap/syswrap-arm-linux.c
trunk/coregrind/m_syswrap/syswrap-arm64-linux.c
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/coregrind/m_syswrap/syswrap-mips64-linux.c
trunk/coregrind/m_syswrap/syswrap-tilegx-linux.c
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Tue Nov 1 15:00:45 2016
@@ -21,7 +21,7 @@
https://bugs.kde.org/show_bug.cgi?id=XXXXXX
where XXXXXX is the bug number as listed below.
-
+371412 Rename wrap_sys_shmat to sys_shmat like other wrappers
Modified: trunk/coregrind/m_syswrap/priv_syswrap-linux.h
==============================================================================
--- trunk/coregrind/m_syswrap/priv_syswrap-linux.h (original)
+++ trunk/coregrind/m_syswrap/priv_syswrap-linux.h Tue Nov 1 15:00:45 2016
@@ -337,7 +337,7 @@
DECL_TEMPLATE(linux, sys_semctl);
DECL_TEMPLATE(linux, sys_semtimedop);
/* Shared memory */
-DECL_TEMPLATE(linux, wrap_sys_shmat);
+DECL_TEMPLATE(linux, sys_shmat);
DECL_TEMPLATE(linux, sys_shmget);
DECL_TEMPLATE(linux, sys_shmdt);
DECL_TEMPLATE(linux, sys_shmctl);
Modified: trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-amd64-linux.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c Tue Nov 1 15:00:45 2016
@@ -730,7 +730,7 @@
GENX_(__NR_madvise, sys_madvise), // 28
LINX_(__NR_shmget, sys_shmget), // 29
- LINXY(__NR_shmat, wrap_sys_shmat), // 30
+ LINXY(__NR_shmat, sys_shmat), // 30
LINXY(__NR_shmctl, sys_shmctl), // 31
GENXY(__NR_dup, sys_dup), // 32
GENXY(__NR_dup2, sys_dup2), // 33
Modified: trunk/coregrind/m_syswrap/syswrap-arm-linux.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-arm-linux.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-arm-linux.c Tue Nov 1 15:00:45 2016
@@ -1152,7 +1152,7 @@
LINX_(__NR_readlinkat, sys_readlinkat), //
LINX_(__NR_fchmodat, sys_fchmodat), //
LINX_(__NR_faccessat, sys_faccessat), //
- LINXY(__NR_shmat, wrap_sys_shmat), //305
+ LINXY(__NR_shmat, sys_shmat), //305
LINXY(__NR_shmdt, sys_shmdt), //306
LINX_(__NR_shmget, sys_shmget), //307
LINXY(__NR_shmctl, sys_shmctl), // 308
Modified: trunk/coregrind/m_syswrap/syswrap-arm64-linux.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-arm64-linux.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-arm64-linux.c Tue Nov 1 15:00:45 2016
@@ -1048,7 +1048,7 @@
LINX_(__NR_semop, sys_semop), // 193
LINX_(__NR_shmget, sys_shmget), // 194
LINXY(__NR_shmctl, sys_shmctl), // 195
- LINXY(__NR_shmat, wrap_sys_shmat), // 196
+ LINXY(__NR_shmat, sys_shmat), // 196
LINXY(__NR_shmdt, sys_shmdt), // 197
LINXY(__NR_socket, sys_socket), // 198
LINXY(__NR_socketpair, sys_socketpair), // 199
Modified: trunk/coregrind/m_syswrap/syswrap-linux.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-linux.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c Tue Nov 1 15:00:45 2016
@@ -4004,10 +4004,10 @@
}
}
-PRE(wrap_sys_shmat)
+PRE(sys_shmat)
{
UWord arg2tmp;
- PRINT("wrap_sys_shmat ( %ld, %#lx, %ld )", SARG1, ARG2, SARG3);
+ PRINT("sys_shmat ( %ld, %#lx, %ld )", SARG1, ARG2, SARG3);
PRE_REG_READ3(long, "shmat",
int, shmid, const void *, shmaddr, int, shmflg);
#if defined(VGP_arm_linux)
@@ -4025,7 +4025,7 @@
ARG2 = arg2tmp; // used in POST
}
-POST(wrap_sys_shmat)
+POST(sys_shmat)
{
ML_(generic_POST_sys_shmat)(tid, RES,ARG1,ARG2,ARG3);
}
Modified: trunk/coregrind/m_syswrap/syswrap-mips64-linux.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-mips64-linux.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-mips64-linux.c Tue Nov 1 15:00:45 2016
@@ -706,7 +706,7 @@
GENXY (__NR_mincore, sys_mincore),
GENX_ (__NR_madvise, sys_madvise),
LINX_ (__NR_shmget, sys_shmget),
- LINXY (__NR_shmat, wrap_sys_shmat),
+ LINXY (__NR_shmat, sys_shmat),
LINXY (__NR_shmctl, sys_shmctl),
GENXY (__NR_dup, sys_dup),
GENXY (__NR_dup2, sys_dup2),
Modified: trunk/coregrind/m_syswrap/syswrap-tilegx-linux.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-tilegx-linux.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-tilegx-linux.c Tue Nov 1 15:00:45 2016
@@ -484,7 +484,7 @@
DECL_TEMPLATE (tilegx_linux, sys_msgsnd);
DECL_TEMPLATE (tilegx_linux, sys_msgctl);
DECL_TEMPLATE (tilegx_linux, sys_shmget);
-DECL_TEMPLATE (tilegx_linux, wrap_sys_shmat);
+DECL_TEMPLATE (tilegx_linux, sys_shmat);
DECL_TEMPLATE (tilegx_linux, sys_shmdt);
DECL_TEMPLATE (tilegx_linux, sys_shmdt);
DECL_TEMPLATE (tilegx_linux, sys_shmctl);
@@ -1026,10 +1026,10 @@
PRE_REG_READ3(long, "shmget", vki_key_t, key, vki_size_t, size, int, shmflg);
}
-PRE(wrap_sys_shmat)
+PRE(sys_shmat)
{
UWord arg2tmp;
- PRINT("wrap_sys_shmat ( %ld, %#lx, %ld )", SARG1, ARG2, SARG3);
+ PRINT("sys_shmat ( %ld, %#lx, %ld )", SARG1, ARG2, SARG3);
PRE_REG_READ3(long, "shmat",
int, shmid, const void *, shmaddr, int, shmflg);
arg2tmp = ML_(generic_PRE_sys_shmat)(tid, ARG1,ARG2,ARG3);
@@ -1038,7 +1038,7 @@
else
ARG2 = arg2tmp; // used in POST
}
-POST(wrap_sys_shmat)
+POST(sys_shmat)
{
ML_(generic_POST_sys_shmat)(tid, RES,ARG1,ARG2,ARG3);
}
@@ -1319,7 +1319,7 @@
PLAX_(__NR_semtimedop, sys_semtimedop), // 192
PLAX_(__NR_semop, sys_semop), // 193
PLAX_(__NR_shmget, sys_shmget), // 194
- PLAXY(__NR_shmat, wrap_sys_shmat), // 196
+ PLAXY(__NR_shmat, sys_shmat), // 196
PLAXY(__NR_shmctl, sys_shmctl), // 195
PLAXY(__NR_shmdt, sys_shmdt), // 197
PLAXY(__NR_socket, sys_socket), // 198
|