371412 Rename wrap_sys_shmat to sys_shmat like other wrappers

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16109

diff --git a/NEWS b/NEWS
index ee3346525063dc70d1de29ae60c778f70c137f02..42bb8f5e9611e256cede45df81031e28d51b818c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,7 @@ To see details of a given bug, visit
   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
 
 
 

diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h
index 162f8e5c8a06cfcd7707828085b260d16006e21c..38fcd7b6253277e7d06d98b5ed7a2b3e558bdf7b 100644 (file)
--- a/coregrind/m_syswrap/priv_syswrap-linux.h
+++ b/coregrind/m_syswrap/priv_syswrap-linux.h
@@ -337,7 +337,7 @@ DECL_TEMPLATE(linux, sys_semop);
 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);

diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index a39148d1e8b3b67243db266d880c9f109a255785..08e9a93f17ef06fce8629857d8627ef68a110e5e 100644 (file)
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -730,7 +730,7 @@ static SyscallTableEntry syscall_table[] = {
    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 

diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c
index 445d5ac67f7b38e3b30f106754040f3a2c196ee3..3bbd109564f8188602de5d479b5e59d1b1b10242 100644 (file)
--- a/coregrind/m_syswrap/syswrap-arm-linux.c
+++ b/coregrind/m_syswrap/syswrap-arm-linux.c
@@ -1152,7 +1152,7 @@ static SyscallTableEntry syscall_main_table[] = {
    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 

diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c
index 00b013819a983bd9136380e503cd2ce9109869f2..6b579e82593a69aafce4d16c00eb86b29228c064 100644 (file)
--- a/coregrind/m_syswrap/syswrap-arm64-linux.c
+++ b/coregrind/m_syswrap/syswrap-arm64-linux.c
@@ -1048,7 +1048,7 @@ static SyscallTableEntry syscall_main_table[] = {
    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

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index f2ebc161f159372707698a2f87f7b99057f428b9..1dcb95dce053095eccd6d894f322bb0b3cf3084b 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -4004,10 +4004,10 @@ PRE(sys_shmget)
    }
 }
 
-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 @@ PRE(wrap_sys_shmat)
       ARG2 = arg2tmp;  // used in POST
 }
 
-POST(wrap_sys_shmat)
+POST(sys_shmat)
 {
    ML_(generic_POST_sys_shmat)(tid, RES,ARG1,ARG2,ARG3);
 }

diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c
index ed274954b7af3064f5ca6b1131ae280560cc4186..2f204e5c9c43f257da17692560f96f2e9a469a84 100644 (file)
--- a/coregrind/m_syswrap/syswrap-mips64-linux.c
+++ b/coregrind/m_syswrap/syswrap-mips64-linux.c
@@ -706,7 +706,7 @@ static SyscallTableEntry syscall_main_table[] = {
    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),

diff --git a/coregrind/m_syswrap/syswrap-tilegx-linux.c b/coregrind/m_syswrap/syswrap-tilegx-linux.c
index 4845f79fb8d7033b1fe58b9b54485f84e8ced37c..7501b20eea9e729a1486b593d39c59174c68edca 100644 (file)
--- a/coregrind/m_syswrap/syswrap-tilegx-linux.c
+++ b/coregrind/m_syswrap/syswrap-tilegx-linux.c
@@ -484,7 +484,7 @@ DECL_TEMPLATE (tilegx_linux, sys_msgrcv);
 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(sys_shmget)
   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 @@ PRE(wrap_sys_shmat)
   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 @@ static SyscallTableEntry syscall_table[] = {
   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