|
From: <sv...@va...> - 2005-09-01 03:35:49
|
Author: njn
Date: 2005-09-01 04:35:40 +0100 (Thu, 01 Sep 2005)
New Revision: 4606
Log:
Fix AMD64 breakage and possibly the PPC32 breakage, too.
Modified:
trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c
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-09-01 01:05:14 U=
TC (rev 4605)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2005-09-01 03:35:40 U=
TC (rev 4606)
@@ -1040,7 +1040,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);
- ML_(generic_PRE_sys_msgsnd)(tid, ARG1,ARG2,ARG3,ARG4);
+ ML_(linux_PRE_sys_msgsnd)(tid, ARG1,ARG2,ARG3,ARG4);
if ((ARG4 & VKI_IPC_NOWAIT) =3D=3D 0)
*flags |=3D SfMayBlock;
}
@@ -1051,7 +1051,7 @@
PRE_REG_READ5(long, "msgrcv",
int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz,
long, msgytp, int, msgflg);
- ML_(generic_PRE_sys_msgrcv)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
+ ML_(linux_PRE_sys_msgrcv)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
if ((ARG4 & VKI_IPC_NOWAIT) =3D=3D 0)
*flags |=3D SfMayBlock;
}
@@ -1065,7 +1065,7 @@
PRINT("sys_msgctl ( %d, %d, %p )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "msgctl",
int, msqid, int, cmd, struct msqid_ds *, buf);
- ML_(generic_PRE_sys_msgctl)(tid, ARG1,ARG2,ARG3);
+ ML_(linux_PRE_sys_msgctl)(tid, ARG1,ARG2,ARG3);
}
POST(sys_msgctl)
{
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-09-01 01:05:14 U=
TC (rev 4605)
+++ trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c 2005-09-01 03:35:40 U=
TC (rev 4606)
@@ -1277,7 +1277,7 @@
*flags |=3D SfMayBlock;
break;
case VKI_MSGSND:
- ML_(generic_PRE_sys_msgsnd)( tid, ARG2, ARG5, ARG3, ARG4 );
+ ML_(linux_PRE_sys_msgsnd)( tid, ARG2, ARG5, ARG3, ARG4 );
if ((ARG4 & VKI_IPC_NOWAIT) =3D=3D 0)
*flags |=3D SfMayBlock;
break;
@@ -1293,7 +1293,7 @@
(Addr) (&((struct vki_ipc_kludge *)ARG5)->msgtyp),
"msgrcv(msgp)" );
=20
- ML_(generic_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, ARG4 );
+ ML_(linux_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, ARG4 );
=20
if ((ARG4 & VKI_IPC_NOWAIT) =3D=3D 0)
*flags |=3D SfMayBlock;
@@ -1302,7 +1302,7 @@
case VKI_MSGGET:
break;
case VKI_MSGCTL:
- ML_(generic_PRE_sys_msgctl)( tid, ARG2, ARG3, ARG5 );
+ ML_(linux_PRE_sys_msgctl)( tid, ARG2, ARG3, ARG5 );
break;
case VKI_SHMAT:
{
@@ -1745,7 +1745,7 @@
//.. /* tst->sys_flags |=3D MayBlock; */
//.. break;
//.. case VKI_MSGSND:
-//.. ML_(generic_PRE_sys_msgsnd)( tid, ARG2, ARG5, ARG3, ARG4 );
+//.. ML_(linux_PRE_sys_msgsnd)( tid, ARG2, ARG5, ARG3, ARG4 );
//.. /* if ((ARG4 & VKI_IPC_NOWAIT) =3D=3D 0)
//.. tst->sys_flags |=3D MayBlock;
//.. */
@@ -1762,7 +1762,7 @@
//.. (Addr) (&((struct vki_ipc_kludge *)ARG5)->msgtyp),
//.. "msgrcv(msgp)" );
//..=20
-//.. ML_(generic_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, A=
RG4 );
+//.. ML_(linux_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, ARG=
4 );
//..=20
//.. /* if ((ARG4 & VKI_IPC_NOWAIT) =3D=3D 0)
//.. tst->sys_flags |=3D MayBlock;
@@ -1772,7 +1772,7 @@
//.. case VKI_MSGGET:
//.. break;
//.. case VKI_MSGCTL:
-//.. ML_(generic_PRE_sys_msgctl)( tid, ARG2, ARG3, ARG5 );
+//.. ML_(linux_PRE_sys_msgctl)( tid, ARG2, ARG3, ARG5 );
//.. break;
//.. case VKI_SHMAT:
//.. PRE_MEM_WRITE( "shmat(raddr)", ARG4, sizeof(Addr) );
|