|
From: <sv...@va...> - 2005-06-23 07:52:57
|
Author: cerion
Date: 2005-06-23 08:52:54 +0100 (Thu, 23 Jun 2005)
New Revision: 4003
Log:
VG_() -> ML() for ppc32, amd64
(plus a few scattered ones in comments etc)
Modified:
trunk/coregrind/m_debuginfo/symtab.c
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-main.c
trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c
trunk/coregrind/m_syswrap/syswrap-x86-linux.c
Modified: trunk/coregrind/m_debuginfo/symtab.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_debuginfo/symtab.c 2005-06-23 03:27:57 UTC (rev 400=
2)
+++ trunk/coregrind/m_debuginfo/symtab.c 2005-06-23 07:52:54 UTC (rev 400=
3)
@@ -870,8 +870,8 @@
/*
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. */
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-06-23 03:27:57 U=
TC (rev 4002)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2005-06-23 07:52:54 U=
TC (rev 4003)
@@ -137,15 +137,15 @@
=20
VG_(debugLog)(1, "syswrap-amd64-linux",=20
"run_a_thread_NORETURN(tid=3D%lld): "
- "VG_(thread_wrapper) called\n",
+ "ML_(thread_wrapper) called\n",
(ULong)tidW);
=20
/* Run the thread all the way through. */
- VgSchedReturnCode src =3D VG_(thread_wrapper)(tid); =20
+ VgSchedReturnCode src =3D ML_(thread_wrapper)(tid); =20
=20
VG_(debugLog)(1, "syswrap-amd64-linux",=20
"run_a_thread_NORETURN(tid=3D%lld): "
- "VG_(thread_wrapper) done\n",
+ "ML_(thread_wrapper) done\n",
(ULong)tidW);
=20
Int c =3D VG_(count_living_threads)();
@@ -617,7 +617,7 @@
=20
cloneflags =3D ARG1;
=20
- 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 @@
=20
/* 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);
=20
VG_(sigframe_destroy)(tid, True);
=20
@@ -738,7 +738,7 @@
{
SysRes r;
vg_assert(SUCCESS);
- r =3D VG_(generic_POST_sys_socket)(tid, VG_(mk_SysRes_Success)(RES));
+ r =3D ML_(generic_POST_sys_socket)(tid, VG_(mk_SysRes_Success)(RES));
SET_STATUS_from_SysRes(r);
}
=20
@@ -748,7 +748,7 @@
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);
}
=20
PRE(sys_getsockopt)
@@ -757,12 +757,12 @@
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);
}
=20
@@ -772,7 +772,7 @@
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);
}
=20
PRE(sys_accept)
@@ -781,13 +781,13 @@
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 =3D VG_(generic_POST_sys_accept)(tid, VG_(mk_SysRes_Success)(RES),
+ r =3D ML_(generic_POST_sys_accept)(tid, VG_(mk_SysRes_Success)(RES),
ARG1,ARG2,ARG3);
SET_STATUS_from_SysRes(r);
}
@@ -800,7 +800,7 @@
int, s, const void *, msg, int, len,=20
unsigned int, flags,=20
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);
}
=20
PRE(sys_recvfrom)
@@ -810,12 +810,12 @@
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);
}
=20
@@ -825,7 +825,7 @@
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);
}
=20
PRE(sys_recvmsg)
@@ -833,11 +833,11 @@
*flags |=3D SfMayBlock;
PRINT("sys_recvmsg ( %d, %p, %d )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "recvmsg", int, s, struct msghdr *, msg, int, fla=
gs);
- 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);
}
=20
PRE(sys_shutdown)
@@ -852,7 +852,7 @@
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);
}
=20
PRE(sys_listen)
@@ -866,12 +866,12 @@
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);
}
=20
@@ -880,12 +880,12 @@
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);
}
=20
@@ -894,12 +894,12 @@
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);
}
=20
@@ -915,7 +915,7 @@
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);
}
=20
PRE(sys_semtimedop)
@@ -925,7 +925,7 @@
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);
}
=20
PRE(sys_semctl)
@@ -956,11 +956,11 @@
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);
}
=20
PRE(sys_msgget)
@@ -974,7 +974,7 @@
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, i=
nt, 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) =3D=3D 0)
*flags |=3D SfMayBlock;
}
@@ -985,13 +985,13 @@
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) =3D=3D 0)
*flags |=3D 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);
}
=20
PRE(sys_msgctl)
@@ -999,11 +999,11 @@
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);
}
=20
PRE(sys_shmget)
@@ -1018,7 +1018,7 @@
PRINT("wrap_sys_shmat ( %d, %p, %d )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "shmat",
int, shmid, const void *, shmaddr, int, shmflg);
- arg2tmp =3D VG_(generic_PRE_sys_shmat)(tid, ARG1,ARG2,ARG3);
+ arg2tmp =3D ML_(generic_PRE_sys_shmat)(tid, ARG1,ARG2,ARG3);
if (arg2tmp =3D=3D 0)
SET_STATUS_Failure( VKI_EINVAL );
else
@@ -1026,19 +1026,19 @@
}
POST(wrap_sys_shmat)
{
- VG_(generic_POST_sys_shmat)(tid, RES,ARG1,ARG2,ARG3);
+ ML_(generic_POST_sys_shmat)(tid, RES,ARG1,ARG2,ARG3);
}
=20
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);
}
=20
PRE(sys_shmctl)
@@ -1046,11 +1046,11 @@
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);
}
=20
#undef PRE
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-06-23 03:27:57 UTC (=
rev 4002)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c 2005-06-23 07:52:54 UTC (=
rev 4003)
@@ -664,7 +664,7 @@
for (i =3D 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]);
}
=20
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-06-23 03:27:57 UTC (re=
v 4002)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c 2005-06-23 07:52:54 UTC (re=
v 4003)
@@ -53,7 +53,7 @@
VgSchedReturnCode ML_(thread_wrapper)(Word /*ThreadId*/ tidW)
{
VG_(debugLog)(1, "core_os",=20
- "VG_(thread_wrapper)(tid=3D%lld): entry\n",=20
+ "ML_(thread_wrapper)(tid=3D%lld): entry\n",=20
(ULong)tidW);
=20
VgSchedReturnCode ret;
@@ -85,7 +85,7 @@
vg_assert(VG_(is_running_thread)(tid));
=20
VG_(debugLog)(1, "core_os",=20
- "VG_(thread_wrapper)(tid=3D%lld): done\n",=20
+ "ML_(thread_wrapper)(tid=3D%lld): done\n",=20
(ULong)tidW);
=20
/* Return to caller, still holding the lock. */
@@ -598,14 +598,14 @@
//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=20
//zz /* If we're sending SIGKILL, check to see if the target is one o=
f
//zz our threads and handle it specially. */
-//zz if (ARG2 =3D=3D VKI_SIGKILL && VG_(do_sigkill)(ARG1, -1))
+//zz if (ARG2 =3D=3D VKI_SIGKILL && ML_(do_sigkill)(ARG1, -1))
//zz SET_STATUS_(0);
//zz else
//zz SET_STATUS_(VG_(do_syscall2)(SYSNO, ARG1, ARG2));
Modified: trunk/coregrind/m_syswrap/syswrap-main.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-main.c 2005-06-23 03:27:57 UTC (rev=
4002)
+++ trunk/coregrind/m_syswrap/syswrap-main.c 2005-06-23 07:52:54 UTC (rev=
4003)
@@ -972,7 +972,7 @@
}
=20
#else
-# error "VG_(fixup_guest_state_to_restart_syscall): unknown plat"
+# error "ML_(fixup_guest_state_to_restart_syscall): unknown plat"
#endif
}
=20
@@ -1111,7 +1111,7 @@
VG_(core_panic)("?? strange syscall interrupt state?");
=20
/* 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 =3D SsIdle;
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-06-23 03:27:57 U=
TC (rev 4002)
+++ trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c 2005-06-23 07:52:54 U=
TC (rev 4003)
@@ -138,15 +138,15 @@
=20
VG_(debugLog)(1, "syscalls-ppc32-linux",=20
"run_a_thread_NORETURN(tid=3D%lld): "
- "VG_(thread_wrapper) called\n",
+ "ML_(thread_wrapper) called\n",
(ULong)tidW);
=20
/* Run the thread all the way through. */
- VgSchedReturnCode src =3D VG_(thread_wrapper)(tid); =20
+ VgSchedReturnCode src =3D ML_(thread_wrapper)(tid); =20
=20
VG_(debugLog)(1, "syscalls-ppc32-linux",=20
"run_a_thread_NORETURN(tid=3D%lld): "
- "VG_(thread_wrapper) done\n",
+ "ML_(thread_wrapper) done\n",
(ULong)tidW);
=20
Int c =3D VG_(count_living_threads)();
@@ -1048,7 +1048,7 @@
//..=20
//.. cloneflags =3D ARG1;
//..=20
-//.. 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 @@
//..=20
//.. 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 |=3D MayBlock; */
//.. break;
//.. case VKI_SEMGET:
@@ -1277,15 +1277,15 @@
//.. case VKI_SEMCTL:
//.. {
//.. UWord arg =3D 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 |=3D 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) =3D=3D 0)
//.. tst->sys_flags |=3D MayBlock;
//.. */
@@ -1302,7 +1302,7 @@
//.. (Addr) (&((struct vki_ipc_kludge *)ARG5)->msgtyp),
//.. "msgrcv(msgp)" );
//..=20
-//.. VG_(generic_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, A=
RG4 );
+//.. ML_(generic_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, A=
RG4 );
//..=20
//.. /* if ((ARG4 & VKI_IPC_NOWAIT) =3D=3D 0)
//.. tst->sys_flags |=3D MayBlock;
@@ -1312,22 +1312,22 @@
//.. 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 =3D VG_(generic_PRE_sys_shmat)( tid, ARG2, ARG5, ARG3 );
+//.. ARG5 =3D ML_(generic_PRE_sys_shmat)( tid, ARG2, ARG5, ARG3 );
//.. if (ARG5 =3D=3D 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 @@
//.. case VKI_SEMCTL:
//.. {
//.. UWord arg =3D 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 @@
//.. (Addr) (&((struct vki_ipc_kludge *)ARG5)->msgtyp),
//.. "msgrcv(msgp)" );
//..=20
-//.. VG_(generic_POST_sys_msgrcv)( tid, RES, ARG2, msgp, ARG3, msg=
typ, ARG4 );
+//.. ML_(generic_POST_sys_msgrcv)( tid, RES, ARG2, msgp, ARG3, msg=
typ, 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 @@
//..=20
//.. addr =3D deref_Addr ( tid, ARG4, "shmat(addr)" );
//.. if ( addr > 0 ) {=20
-//.. 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,
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-06-23 03:27:57 UTC=
(rev 4002)
+++ trunk/coregrind/m_syswrap/syswrap-x86-linux.c 2005-06-23 07:52:54 UTC=
(rev 4003)
@@ -143,7 +143,7 @@
=20
VG_(debugLog)(1, "syswrap-x86-linux",=20
"run_a_thread_NORETURN(tid=3D%lld): "
- "VG_(thread_wrapper) called\n",
+ "ML_(thread_wrapper) called\n",
(ULong)tidW);
=20
/* Run the thread all the way through. */
@@ -151,7 +151,7 @@
=20
VG_(debugLog)(1, "syswrap-x86-linux",=20
"run_a_thread_NORETURN(tid=3D%lld): "
- "VG_(thread_wrapper) done\n",
+ "ML_(thread_wrapper) done\n",
(ULong)tidW);
=20
Int c =3D VG_(count_living_threads)();
|