VG_() -> ML() for ppc32, amd64

(plus a few scattered ones in comments etc)

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

diff --git a/coregrind/m_debuginfo/symtab.c b/coregrind/m_debuginfo/symtab.c
index 1d703ac654ff04cc3bf1158ea58a1d4247fdad52..62f7cff7f9f1d3405408bfb6626b0eb673a094dc 100644 (file)
--- a/coregrind/m_debuginfo/symtab.c
+++ b/coregrind/m_debuginfo/symtab.c
@@ -870,8 +870,8 @@ void canonicaliseCfiSI ( SegInfo* si )
          /*
          if (!(si->cfisi[i].base < si->cfisi[i+1].base)) {
             VG_(printf)("\nOOO cfisis:\n");
-            VG_(ppCfiSI)(&si->cfisi[i]);
-            VG_(ppCfiSI)(&si->cfisi[i+1]);
+            ML_(ppCfiSI)(&si->cfisi[i]);
+            ML_(ppCfiSI)(&si->cfisi[i+1]);
          }
          */
          /* In order. */

diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index 22e78f496820baca20f517e401932c99d03f286f..d7382882f76e80a0228c7788ee6951ffbdaef088 100644 (file)
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -137,15 +137,15 @@ static void run_a_thread_NORETURN ( Word tidW )
 
    VG_(debugLog)(1, "syswrap-amd64-linux", 
                     "run_a_thread_NORETURN(tid=%lld): "
-                       "VG_(thread_wrapper) called\n",
+                       "ML_(thread_wrapper) called\n",
                        (ULong)tidW);
 
    /* Run the thread all the way through. */
-   VgSchedReturnCode src = VG_(thread_wrapper)(tid);  
+   VgSchedReturnCode src = ML_(thread_wrapper)(tid);  
 
    VG_(debugLog)(1, "syswrap-amd64-linux", 
                     "run_a_thread_NORETURN(tid=%lld): "
-                       "VG_(thread_wrapper) done\n",
+                       "ML_(thread_wrapper) done\n",
                        (ULong)tidW);
 
    Int c = VG_(count_living_threads)();
@@ -617,7 +617,7 @@ PRE(sys_clone)
 
    cloneflags = ARG1;
 
-   if (!VG_(client_signal_OK)(ARG1 & VKI_CSIGNAL)) {
+   if (!ML_(client_signal_OK)(ARG1 & VKI_CSIGNAL)) {
       SET_STATUS_Failure( VKI_EINVAL );
       return;
    }
@@ -688,7 +688,7 @@ PRE(sys_rt_sigreturn)
 
    /* This is only so that the RIP is (might be) useful to report if
       something goes wrong in the sigreturn */
-   VG_(fixup_guest_state_to_restart_syscall)(&tst->arch);
+   ML_(fixup_guest_state_to_restart_syscall)(&tst->arch);
 
    VG_(sigframe_destroy)(tid, True);
 
@@ -738,7 +738,7 @@ POST(sys_socket)
 {
    SysRes r;
    vg_assert(SUCCESS);
-   r = VG_(generic_POST_sys_socket)(tid, VG_(mk_SysRes_Success)(RES));
+   r = ML_(generic_POST_sys_socket)(tid, VG_(mk_SysRes_Success)(RES));
    SET_STATUS_from_SysRes(r);
 }
 
@@ -748,7 +748,7 @@ PRE(sys_setsockopt)
    PRE_REG_READ5(long, "setsockopt",
                  int, s, int, level, int, optname,
                  const void *, optval, int, optlen);
-   VG_(generic_PRE_sys_setsockopt)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
+   ML_(generic_PRE_sys_setsockopt)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
 }
 
 PRE(sys_getsockopt)
@@ -757,12 +757,12 @@ PRE(sys_getsockopt)
    PRE_REG_READ5(long, "getsockopt",
                  int, s, int, level, int, optname,
                  void *, optval, int, *optlen);
-   VG_(generic_PRE_sys_getsockopt)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
+   ML_(generic_PRE_sys_getsockopt)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
 }
 POST(sys_getsockopt)
 {
    vg_assert(SUCCESS);
-   VG_(generic_POST_sys_getsockopt)(tid, VG_(mk_SysRes_Success)(RES),
+   ML_(generic_POST_sys_getsockopt)(tid, VG_(mk_SysRes_Success)(RES),
                                          ARG1,ARG2,ARG3,ARG4,ARG5);
 }
 
@@ -772,7 +772,7 @@ PRE(sys_connect)
    PRINT("sys_connect ( %d, %p, %d )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "connect",
                  int, sockfd, struct sockaddr *, serv_addr, int, addrlen);
-   VG_(generic_PRE_sys_connect)(tid, ARG1,ARG2,ARG3);
+   ML_(generic_PRE_sys_connect)(tid, ARG1,ARG2,ARG3);
 }
 
 PRE(sys_accept)
@@ -781,13 +781,13 @@ PRE(sys_accept)
    PRINT("sys_accept ( %d, %p, %d )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "accept",
                  int, s, struct sockaddr *, addr, int, *addrlen);
-   VG_(generic_PRE_sys_accept)(tid, ARG1,ARG2,ARG3);
+   ML_(generic_PRE_sys_accept)(tid, ARG1,ARG2,ARG3);
 }
 POST(sys_accept)
 {
    SysRes r;
    vg_assert(SUCCESS);
-   r = VG_(generic_POST_sys_accept)(tid, VG_(mk_SysRes_Success)(RES),
+   r = ML_(generic_POST_sys_accept)(tid, VG_(mk_SysRes_Success)(RES),
                                          ARG1,ARG2,ARG3);
    SET_STATUS_from_SysRes(r);
 }
@@ -800,7 +800,7 @@ PRE(sys_sendto)
                  int, s, const void *, msg, int, len, 
                  unsigned int, flags, 
                  const struct sockaddr *, to, int, tolen);
-   VG_(generic_PRE_sys_sendto)(tid, ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
+   ML_(generic_PRE_sys_sendto)(tid, ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
 }
 
 PRE(sys_recvfrom)
@@ -810,12 +810,12 @@ PRE(sys_recvfrom)
    PRE_REG_READ6(long, "recvfrom",
                  int, s, void *, buf, int, len, unsigned int, flags,
                  struct sockaddr *, from, int *, fromlen);
-   VG_(generic_PRE_sys_recvfrom)(tid, ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
+   ML_(generic_PRE_sys_recvfrom)(tid, ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
 }
 POST(sys_recvfrom)
 {
    vg_assert(SUCCESS);
-   VG_(generic_POST_sys_recvfrom)(tid, VG_(mk_SysRes_Success)(RES),
+   ML_(generic_POST_sys_recvfrom)(tid, VG_(mk_SysRes_Success)(RES),
                                        ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
 }
 
@@ -825,7 +825,7 @@ PRE(sys_sendmsg)
    PRINT("sys_sendmsg ( %d, %p, %d )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "sendmsg",
                  int, s, const struct msghdr *, msg, int, flags);
-   VG_(generic_PRE_sys_sendmsg)(tid, ARG1,ARG2);
+   ML_(generic_PRE_sys_sendmsg)(tid, ARG1,ARG2);
 }
 
 PRE(sys_recvmsg)
@@ -833,11 +833,11 @@ PRE(sys_recvmsg)
    *flags |= SfMayBlock;
    PRINT("sys_recvmsg ( %d, %p, %d )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "recvmsg", int, s, struct msghdr *, msg, int, flags);
-   VG_(generic_PRE_sys_recvmsg)(tid, ARG1,ARG2);
+   ML_(generic_PRE_sys_recvmsg)(tid, ARG1,ARG2);
 }
 POST(sys_recvmsg)
 {
-   VG_(generic_POST_sys_recvmsg)(tid, ARG1,ARG2);
+   ML_(generic_POST_sys_recvmsg)(tid, ARG1,ARG2);
 }
 
 PRE(sys_shutdown)
@@ -852,7 +852,7 @@ PRE(sys_bind)
    PRINT("sys_bind ( %d, %p, %d )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "bind",
                  int, sockfd, struct sockaddr *, my_addr, int, addrlen);
-   VG_(generic_PRE_sys_bind)(tid, ARG1,ARG2,ARG3);
+   ML_(generic_PRE_sys_bind)(tid, ARG1,ARG2,ARG3);
 }
 
 PRE(sys_listen)
@@ -866,12 +866,12 @@ PRE(sys_getsockname)
    PRINT("sys_getsockname ( %d, %p, %p )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "getsockname",
                  int, s, struct sockaddr *, name, int *, namelen);
-   VG_(generic_PRE_sys_getsockname)(tid, ARG1,ARG2,ARG3);
+   ML_(generic_PRE_sys_getsockname)(tid, ARG1,ARG2,ARG3);
 }
 POST(sys_getsockname)
 {
    vg_assert(SUCCESS);
-   VG_(generic_POST_sys_getsockname)(tid, VG_(mk_SysRes_Success)(RES),
+   ML_(generic_POST_sys_getsockname)(tid, VG_(mk_SysRes_Success)(RES),
                                           ARG1,ARG2,ARG3);
 }
 
@@ -880,12 +880,12 @@ PRE(sys_getpeername)
    PRINT("sys_getpeername ( %d, %p, %p )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "getpeername",
                  int, s, struct sockaddr *, name, int *, namelen);
-   VG_(generic_PRE_sys_getpeername)(tid, ARG1,ARG2,ARG3);
+   ML_(generic_PRE_sys_getpeername)(tid, ARG1,ARG2,ARG3);
 }
 POST(sys_getpeername)
 {
    vg_assert(SUCCESS);
-   VG_(generic_POST_sys_getpeername)(tid, VG_(mk_SysRes_Success)(RES),
+   ML_(generic_POST_sys_getpeername)(tid, VG_(mk_SysRes_Success)(RES),
                                           ARG1,ARG2,ARG3);
 }
 
@@ -894,12 +894,12 @@ PRE(sys_socketpair)
    PRINT("sys_socketpair ( %d, %d, %d, %p )",ARG1,ARG2,ARG3,ARG4);
    PRE_REG_READ4(long, "socketpair",
                  int, d, int, type, int, protocol, int [2], sv);
-   VG_(generic_PRE_sys_socketpair)(tid, ARG1,ARG2,ARG3,ARG4);
+   ML_(generic_PRE_sys_socketpair)(tid, ARG1,ARG2,ARG3,ARG4);
 }
 POST(sys_socketpair)
 {
    vg_assert(SUCCESS);
-   VG_(generic_POST_sys_socketpair)(tid, VG_(mk_SysRes_Success)(RES),
+   ML_(generic_POST_sys_socketpair)(tid, VG_(mk_SysRes_Success)(RES),
                                          ARG1,ARG2,ARG3,ARG4);
 }
 
@@ -915,7 +915,7 @@ PRE(sys_semop)
    PRINT("sys_semop ( %d, %p, %u )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "semop",
                  int, semid, struct sembuf *, sops, unsigned, nsoops);
-   VG_(generic_PRE_sys_semop)(tid, ARG1,ARG2,ARG3);
+   ML_(generic_PRE_sys_semop)(tid, ARG1,ARG2,ARG3);
 }
 
 PRE(sys_semtimedop)
@@ -925,7 +925,7 @@ PRE(sys_semtimedop)
    PRE_REG_READ4(long, "semtimedop",
                  int, semid, struct sembuf *, sops, unsigned, nsoops,
                  struct timespec *, timeout);
-   VG_(generic_PRE_sys_semtimedop)(tid, ARG1,ARG2,ARG3,ARG4);
+   ML_(generic_PRE_sys_semtimedop)(tid, ARG1,ARG2,ARG3,ARG4);
 }
 
 PRE(sys_semctl)
@@ -956,11 +956,11 @@ PRE(sys_semctl)
                     int, semid, int, semnum, int, cmd);
       break;
    }
-   VG_(generic_PRE_sys_semctl)(tid, ARG1,ARG2,ARG3,ARG4);
+   ML_(generic_PRE_sys_semctl)(tid, ARG1,ARG2,ARG3,ARG4);
 }
 POST(sys_semctl)
 {
-   VG_(generic_POST_sys_semctl)(tid, RES,ARG1,ARG2,ARG3,ARG4);
+   ML_(generic_POST_sys_semctl)(tid, RES,ARG1,ARG2,ARG3,ARG4);
 }
 
 PRE(sys_msgget)
@@ -974,7 +974,7 @@ PRE(sys_msgsnd)
    PRINT("sys_msgsnd ( %d, %p, %d, %d )",ARG1,ARG2,ARG3,ARG4);
    PRE_REG_READ4(long, "msgsnd",
                  int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz, int, msgflg);
-   VG_(generic_PRE_sys_msgsnd)(tid, ARG1,ARG2,ARG3,ARG4);
+   ML_(generic_PRE_sys_msgsnd)(tid, ARG1,ARG2,ARG3,ARG4);
    if ((ARG4 & VKI_IPC_NOWAIT) == 0)
       *flags |= SfMayBlock;
 }
@@ -985,13 +985,13 @@ PRE(sys_msgrcv)
    PRE_REG_READ5(long, "msgrcv",
                  int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz,
                  long, msgytp, int, msgflg);
-   VG_(generic_PRE_sys_msgrcv)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
+   ML_(generic_PRE_sys_msgrcv)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
    if ((ARG4 & VKI_IPC_NOWAIT) == 0)
       *flags |= SfMayBlock;
 }
 POST(sys_msgrcv)
 {
-   VG_(generic_POST_sys_msgrcv)(tid, RES,ARG1,ARG2,ARG3,ARG4,ARG5);
+   ML_(generic_POST_sys_msgrcv)(tid, RES,ARG1,ARG2,ARG3,ARG4,ARG5);
 }
 
 PRE(sys_msgctl)
@@ -999,11 +999,11 @@ PRE(sys_msgctl)
    PRINT("sys_msgctl ( %d, %d, %p )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "msgctl",
                  int, msqid, int, cmd, struct msqid_ds *, buf);
-   VG_(generic_PRE_sys_msgctl)(tid, ARG1,ARG2,ARG3);
+   ML_(generic_PRE_sys_msgctl)(tid, ARG1,ARG2,ARG3);
 }
 POST(sys_msgctl)
 {
-   VG_(generic_POST_sys_msgctl)(tid, RES,ARG1,ARG2,ARG3);
+   ML_(generic_POST_sys_msgctl)(tid, RES,ARG1,ARG2,ARG3);
 }
 
 PRE(sys_shmget)
@@ -1018,7 +1018,7 @@ PRE(wrap_sys_shmat)
    PRINT("wrap_sys_shmat ( %d, %p, %d )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "shmat",
                  int, shmid, const void *, shmaddr, int, shmflg);
-   arg2tmp = VG_(generic_PRE_sys_shmat)(tid, ARG1,ARG2,ARG3);
+   arg2tmp = ML_(generic_PRE_sys_shmat)(tid, ARG1,ARG2,ARG3);
    if (arg2tmp == 0)
       SET_STATUS_Failure( VKI_EINVAL );
    else
@@ -1026,19 +1026,19 @@ PRE(wrap_sys_shmat)
 }
 POST(wrap_sys_shmat)
 {
-   VG_(generic_POST_sys_shmat)(tid, RES,ARG1,ARG2,ARG3);
+   ML_(generic_POST_sys_shmat)(tid, RES,ARG1,ARG2,ARG3);
 }
 
 PRE(sys_shmdt)
 {
    PRINT("sys_shmdt ( %p )",ARG1);
    PRE_REG_READ1(long, "shmdt", const void *, shmaddr);
-   if (!VG_(generic_PRE_sys_shmdt)(tid, ARG1))
+   if (!ML_(generic_PRE_sys_shmdt)(tid, ARG1))
       SET_STATUS_Failure( VKI_EINVAL );
 }
 POST(sys_shmdt)
 {
-   VG_(generic_POST_sys_shmdt)(tid, RES,ARG1);
+   ML_(generic_POST_sys_shmdt)(tid, RES,ARG1);
 }
 
 PRE(sys_shmctl)
@@ -1046,11 +1046,11 @@ PRE(sys_shmctl)
    PRINT("sys_shmctl ( %d, %d, %p )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "shmctl",
                  int, shmid, int, cmd, struct shmid_ds *, buf);
-   VG_(generic_PRE_sys_shmctl)(tid, ARG1,ARG2,ARG3);
+   ML_(generic_PRE_sys_shmctl)(tid, ARG1,ARG2,ARG3);
 }
 POST(sys_shmctl)
 {
-   VG_(generic_POST_sys_shmctl)(tid, RES,ARG1,ARG2,ARG3);
+   ML_(generic_POST_sys_shmctl)(tid, RES,ARG1,ARG2,ARG3);
 }
 
 #undef PRE

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 3b283c46fe8ef6737ed9b417e63e8a3b4b09a884..8c0406bf938fc0139174a83ca0a893babd67b8ba 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -664,7 +664,7 @@ static void check_cmsg_for_fds(ThreadId tid, struct vki_msghdr *msg)
          for (i = 0; i < fdc; i++)
             if(VG_(clo_track_fds))
                // XXX: must we check the range on these fds with
-               //      VG_(fd_allowed)()?
+               //      ML_(fd_allowed)()?
                record_fd_open_named(tid, fds[i]);
       }
 

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index 36fb9c81016841cf8b9d159f6b564ec0ffe1fedd..f98156ea9e89748a25293051b9e6468d8939ee95 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -53,7 +53,7 @@
 VgSchedReturnCode ML_(thread_wrapper)(Word /*ThreadId*/ tidW)
 {
    VG_(debugLog)(1, "core_os", 
-                    "VG_(thread_wrapper)(tid=%lld): entry\n", 
+                    "ML_(thread_wrapper)(tid=%lld): entry\n", 
                     (ULong)tidW);
 
    VgSchedReturnCode ret;
@@ -85,7 +85,7 @@ VgSchedReturnCode ML_(thread_wrapper)(Word /*ThreadId*/ tidW)
    vg_assert(VG_(is_running_thread)(tid));
 
    VG_(debugLog)(1, "core_os", 
-                    "VG_(thread_wrapper)(tid=%lld): done\n", 
+                    "ML_(thread_wrapper)(tid=%lld): done\n", 
                     (ULong)tidW);
 
    /* Return to caller, still holding the lock. */
@@ -598,14 +598,14 @@ PRE(sys_gettid)
 //zz    /* int tkill(pid_t tid, int sig); */
 //zz    PRINT("sys_tkill ( %d, %d )", ARG1,ARG2);
 //zz    PRE_REG_READ2(long, "tkill", int, tid, int, sig);
-//zz    if (!VG_(client_signal_OK)(ARG2)) {
+//zz    if (!ML_(client_signal_OK)(ARG2)) {
 //zz       SET_STATUS_( -VKI_EINVAL );
 //zz       return;
 //zz    }
 //zz 
 //zz    /* If we're sending SIGKILL, check to see if the target is one of
 //zz       our threads and handle it specially. */
-//zz    if (ARG2 == VKI_SIGKILL && VG_(do_sigkill)(ARG1, -1))
+//zz    if (ARG2 == VKI_SIGKILL && ML_(do_sigkill)(ARG1, -1))
 //zz       SET_STATUS_(0);
 //zz    else
 //zz       SET_STATUS_(VG_(do_syscall2)(SYSNO, ARG1, ARG2));

diff --git a/coregrind/m_syswrap/syswrap-main.c b/coregrind/m_syswrap/syswrap-main.c
index b6fad1d2a9f1e6602eddbb04b4d66932a312df6e..3df4f72526d06b09b217345b9cf92a920493c33b 100644 (file)
--- a/coregrind/m_syswrap/syswrap-main.c
+++ b/coregrind/m_syswrap/syswrap-main.c
@@ -972,7 +972,7 @@ void ML_(fixup_guest_state_to_restart_syscall) ( ThreadArchState* arch )
    }
 
 #else
-#  error "VG_(fixup_guest_state_to_restart_syscall): unknown plat"
+#  error "ML_(fixup_guest_state_to_restart_syscall): unknown plat"
 #endif
 }
 
@@ -1111,7 +1111,7 @@ VG_(fixup_guest_state_after_syscall_interrupted)( ThreadId tid,
       VG_(core_panic)("?? strange syscall interrupt state?");
 
    /* In all cases, the syscall is now finished (even if we called
-      VG_(fixup_guest_state_to_restart_syscall), since that just
+      ML_(fixup_guest_state_to_restart_syscall), since that just
       re-positions the guest's IP for another go at it).  So we need
       to record that fact. */
    sci->status.what = SsIdle;

diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c
index 94908e2ba75300f81beeac741fa5a04e6ca84b6e..8a7acd8ed9be5eb4b455765b4d602eb8e7d27157 100644 (file)
--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c
+++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c
@@ -138,15 +138,15 @@ static void run_a_thread_NORETURN ( Word tidW )
 
    VG_(debugLog)(1, "syscalls-ppc32-linux", 
                     "run_a_thread_NORETURN(tid=%lld): "
-                       "VG_(thread_wrapper) called\n",
+                       "ML_(thread_wrapper) called\n",
                        (ULong)tidW);
 
    /* Run the thread all the way through. */
-   VgSchedReturnCode src = VG_(thread_wrapper)(tid);  
+   VgSchedReturnCode src = ML_(thread_wrapper)(tid);  
 
    VG_(debugLog)(1, "syscalls-ppc32-linux", 
                     "run_a_thread_NORETURN(tid=%lld): "
-                       "VG_(thread_wrapper) done\n",
+                       "ML_(thread_wrapper) done\n",
                        (ULong)tidW);
 
    Int c = VG_(count_living_threads)();
@@ -1048,7 +1048,7 @@ POST(sys_fstat64)
 //.. 
 //..    cloneflags = ARG1;
 //.. 
-//..    if (!VG_(client_signal_OK)(ARG1 & VKI_CSIGNAL)) {
+//..    if (!ML_(client_signal_OK)(ARG1 & VKI_CSIGNAL)) {
 //..       SET_RESULT( -VKI_EINVAL );
 //..       return;
 //..    }
@@ -1269,7 +1269,7 @@ POST(sys_fstat64)
 //.. 
 //..    switch (ARG1 /* call */) {
 //..    case VKI_SEMOP:
-//..       VG_(generic_PRE_sys_semop)( tid, ARG2, ARG5, ARG3 );
+//..       ML_(generic_PRE_sys_semop)( tid, ARG2, ARG5, ARG3 );
 //..       /* tst->sys_flags |= MayBlock; */
 //..       break;
 //..    case VKI_SEMGET:
@@ -1277,15 +1277,15 @@ POST(sys_fstat64)
 //..    case VKI_SEMCTL:
 //..    {
 //..       UWord arg = deref_Addr( tid, ARG5, "semctl(arg)" );
-//..       VG_(generic_PRE_sys_semctl)( tid, ARG2, ARG3, ARG4, arg );
+//..       ML_(generic_PRE_sys_semctl)( tid, ARG2, ARG3, ARG4, arg );
 //..       break;
 //..    }
 //..    case VKI_SEMTIMEDOP:
-//..       VG_(generic_PRE_sys_semtimedop)( tid, ARG2, ARG5, ARG3, ARG6 );
+//..       ML_(generic_PRE_sys_semtimedop)( tid, ARG2, ARG5, ARG3, ARG6 );
 //..       /* tst->sys_flags |= MayBlock; */
 //..       break;
 //..    case VKI_MSGSND:
-//..       VG_(generic_PRE_sys_msgsnd)( tid, ARG2, ARG5, ARG3, ARG4 );
+//..       ML_(generic_PRE_sys_msgsnd)( tid, ARG2, ARG5, ARG3, ARG4 );
 //..       /* if ((ARG4 & VKI_IPC_NOWAIT) == 0)
 //..             tst->sys_flags |= MayBlock;
 //..       */
@@ -1302,7 +1302,7 @@ POST(sys_fstat64)
 //..                      (Addr) (&((struct vki_ipc_kludge *)ARG5)->msgtyp),
 //..                      "msgrcv(msgp)" );
 //.. 
-//..       VG_(generic_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, ARG4 );
+//..       ML_(generic_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, ARG4 );
 //.. 
 //..       /* if ((ARG4 & VKI_IPC_NOWAIT) == 0)
 //..             tst->sys_flags |= MayBlock;
@@ -1312,22 +1312,22 @@ POST(sys_fstat64)
 //..    case VKI_MSGGET:
 //..       break;
 //..    case VKI_MSGCTL:
-//..       VG_(generic_PRE_sys_msgctl)( tid, ARG2, ARG3, ARG5 );
+//..       ML_(generic_PRE_sys_msgctl)( tid, ARG2, ARG3, ARG5 );
 //..       break;
 //..    case VKI_SHMAT:
 //..       PRE_MEM_WRITE( "shmat(raddr)", ARG4, sizeof(Addr) );
-//..       ARG5 = VG_(generic_PRE_sys_shmat)( tid, ARG2, ARG5, ARG3 );
+//..       ARG5 = ML_(generic_PRE_sys_shmat)( tid, ARG2, ARG5, ARG3 );
 //..       if (ARG5 == 0)
 //..          SET_RESULT( -VKI_EINVAL );
 //..       break;
 //..    case VKI_SHMDT:
-//..       if (!VG_(generic_PRE_sys_shmdt)(tid, ARG5))
+//..       if (!ML_(generic_PRE_sys_shmdt)(tid, ARG5))
 //..    SET_RESULT( -VKI_EINVAL );
 //..       break;
 //..    case VKI_SHMGET:
 //..       break;
 //..    case VKI_SHMCTL: /* IPCOP_shmctl */
-//..       VG_(generic_PRE_sys_shmctl)( tid, ARG2, ARG3, ARG5 );
+//..       ML_(generic_PRE_sys_shmctl)( tid, ARG2, ARG3, ARG5 );
 //..       break;
 //..    default:
 //..       VG_(message)(Vg_DebugMsg, "FATAL: unhandled syscall(ipc) %d", ARG1 );
@@ -1345,7 +1345,7 @@ POST(sys_fstat64)
 //..    case VKI_SEMCTL:
 //..    {
 //..       UWord arg = deref_Addr( tid, ARG5, "semctl(arg)" );
-//..       VG_(generic_PRE_sys_semctl)( tid, ARG2, ARG3, ARG4, arg );
+//..       ML_(generic_PRE_sys_semctl)( tid, ARG2, ARG3, ARG4, arg );
 //..       break;
 //..    }
 //..    case VKI_SEMTIMEDOP:
@@ -1363,13 +1363,13 @@ POST(sys_fstat64)
 //..                      (Addr) (&((struct vki_ipc_kludge *)ARG5)->msgtyp),
 //..                      "msgrcv(msgp)" );
 //.. 
-//..       VG_(generic_POST_sys_msgrcv)( tid, RES, ARG2, msgp, ARG3, msgtyp, ARG4 );
+//..       ML_(generic_POST_sys_msgrcv)( tid, RES, ARG2, msgp, ARG3, msgtyp, ARG4 );
 //..       break;
 //..    }
 //..    case VKI_MSGGET:
 //..       break;
 //..    case VKI_MSGCTL:
-//..       VG_(generic_POST_sys_msgctl)( tid, RES, ARG2, ARG3, ARG5 );
+//..       ML_(generic_POST_sys_msgctl)( tid, RES, ARG2, ARG3, ARG5 );
 //..       break;
 //..    case VKI_SHMAT:
 //..    {
@@ -1382,17 +1382,17 @@ POST(sys_fstat64)
 //.. 
 //..       addr = deref_Addr ( tid, ARG4, "shmat(addr)" );
 //..       if ( addr > 0 ) { 
-//..          VG_(generic_POST_sys_shmat)( tid, addr, ARG2, ARG5, ARG3 );
+//..          ML_(generic_POST_sys_shmat)( tid, addr, ARG2, ARG5, ARG3 );
 //..       }
 //..       break;
 //..    }
 //..    case VKI_SHMDT:
-//..       VG_(generic_POST_sys_shmdt)( tid, RES, ARG5 );
+//..       ML_(generic_POST_sys_shmdt)( tid, RES, ARG5 );
 //..       break;
 //..    case VKI_SHMGET:
 //..       break;
 //..    case VKI_SHMCTL:
-//..       VG_(generic_POST_sys_shmctl)( tid, RES, ARG2, ARG3, ARG5 );
+//..       ML_(generic_POST_sys_shmctl)( tid, RES, ARG2, ARG3, ARG5 );
 //..       break;
 //..    default:
 //..       VG_(message)(Vg_DebugMsg,

diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
index fb5e01b51193fd9971779283cf95f119fab63680..b883494836827993ee9be4fafc403e0aee7a429c 100644 (file)
--- a/coregrind/m_syswrap/syswrap-x86-linux.c
+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
@@ -143,7 +143,7 @@ static void run_a_thread_NORETURN ( Word tidW )
 
    VG_(debugLog)(1, "syswrap-x86-linux", 
                     "run_a_thread_NORETURN(tid=%lld): "
-                       "VG_(thread_wrapper) called\n",
+                       "ML_(thread_wrapper) called\n",
                        (ULong)tidW);
 
    /* Run the thread all the way through. */
@@ -151,7 +151,7 @@ static void run_a_thread_NORETURN ( Word tidW )
 
    VG_(debugLog)(1, "syswrap-x86-linux", 
                     "run_a_thread_NORETURN(tid=%lld): "
-                       "VG_(thread_wrapper) done\n",
+                       "ML_(thread_wrapper) done\n",
                        (ULong)tidW);
 
    Int c = VG_(count_living_threads)();