|
From: <sv...@va...> - 2005-10-18 02:15:52
|
Author: sewardj
Date: 2005-10-18 03:15:39 +0100 (Tue, 18 Oct 2005)
New Revision: 4940
Log:
Fix socket stuff on ppc32, so that --log-socket actually works.
Modified:
trunk/coregrind/m_libcfile.c
Modified: trunk/coregrind/m_libcfile.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_libcfile.c 2005-10-16 17:48:09 UTC (rev 4939)
+++ trunk/coregrind/m_libcfile.c 2005-10-18 02:15:39 UTC (rev 4940)
@@ -342,16 +342,24 @@
static=20
UInt my_htonl ( UInt x )
{
+# if defined(VG_BIGENDIAN)
+ return x;
+# else
return
(((x >> 24) & 0xFF) << 0) | (((x >> 16) & 0xFF) << 8)
| (((x >> 8) & 0xFF) << 16) | (((x >> 0) & 0xFF) << 24);
+# endif
}
=20
static
UShort my_htons ( UShort x )
{
+# if defined(VG_BIGENDIAN)
+ return x;
+# else
return
(((x >> 8) & 0xFF) << 0) | (((x >> 0) & 0xFF) << 8);
+# endif
}
=20
=20
@@ -388,16 +396,16 @@
/* create socket */
sd =3D my_socket(VKI_AF_INET, VKI_SOCK_STREAM, 0 /* IPPROTO_IP ? */);
if (sd < 0) {
- /* this shouldn't happen ... nevertheless */
- return -2;
+ /* this shouldn't happen ... nevertheless */
+ return -2;
}
- =09
+ =09
/* connect to server */
res =3D my_connect(sd, (struct vki_sockaddr_in *) &servAddr,=20
sizeof(servAddr));
if (res < 0) {
- /* connection failed */
- return -2;
+ /* connection failed */
+ return -2;
}
=20
return sd;
@@ -501,7 +509,7 @@
error is still returned. */
Int flags =3D VKI_MSG_NOSIGNAL;
=20
-#if defined(VGP_x86_linux)
+#if defined(VGP_x86_linux) || defined(VGP_ppc32_linux)
SysRes res;
UWord args[4];
args[0] =3D sd;
@@ -516,11 +524,6 @@
res =3D VG_(do_syscall6)(__NR_sendto, sd, (UWord)msg, count, flags, 0=
,0);
return res.isError ? -1 : res.val;
=20
-#elif defined(VGP_ppc32_linux)
- //CAB: TODO
- I_die_here;
- flags =3D 0; // stop compiler complaints
-
#else
# error Unknown arch
#endif
|