[Valgrind-developers] valgrind: r6192 - in branches/AIX5: auxprogs coregrind/m_syswrap include/vki

[<sv...@va...>]

Author: sewardj
Date: 2006-10-05 13:41:44 +0100 (Thu, 05 Oct 2006)
New Revision: 6192

Log:
Tidy up fstatfs things.

Modified:
   branches/AIX5/auxprogs/aix5_VKI_info.c
   branches/AIX5/coregrind/m_syswrap/syswrap-aix5.c
   branches/AIX5/include/vki/vki-ppc32-aix5.h
   branches/AIX5/include/vki/vki-ppc64-aix5.h


Modified: branches/AIX5/auxprogs/aix5_VKI_info.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
--- branches/AIX5/auxprogs/aix5_VKI_info.c	2006-10-05 12:38:52 UTC (rev 6=
191)
+++ branches/AIX5/auxprogs/aix5_VKI_info.c	2006-10-05 12:41:44 UTC (rev 6=
192)
@@ -127,14 +127,6 @@
    printf("#define _VKI_IOC_READ %d\n",  3 & (IOC_OUT >> 30));
    printf("#define _VKI_IOC_WRITE %d\n", 3 & (IOC_IN >> 30));
    printf("\n");
-   printf("/* -------------- Filesystems --------------- */\n");
-   printf("\n");
-
-   /* info about struct statfs */
-   struct statfs stf;
-   printf("sizeof(struct statfs) =3D %d\n", (int)sizeof(struct statfs));
-
-   printf("\n");
    printf("/* ---------------- MMappery ---------------- */\n");
    printf("\n");
    printf("#define VKI_PAGE_SIZE %d\n", (int)sysconf(_SC_PAGESIZE));

Modified: branches/AIX5/coregrind/m_syswrap/syswrap-aix5.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
--- branches/AIX5/coregrind/m_syswrap/syswrap-aix5.c	2006-10-05 12:38:52 =
UTC (rev 6191)
+++ branches/AIX5/coregrind/m_syswrap/syswrap-aix5.c	2006-10-05 12:41:44 =
UTC (rev 6192)
@@ -257,6 +257,7 @@
 #include <sys/times.h>
 #include <sys/shm.h>
 #include <semaphore.h>
+#include <sys/statfs.h>
 /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
=20
 HChar* ML_(aix5debugstuff_pc_to_fnname) ( Addr pc )
@@ -2154,11 +2155,11 @@
    PRINT("sys_statfs ( %p(%s), %p )",ARG1,ARG1,ARG2);
    PRE_REG_READ2(long, "statfs", const char *, path, struct statfs *, bu=
f);
    PRE_MEM_RASCIIZ( "statfs(path)", ARG1 );
-   PRE_MEM_WRITE( "statfs(buf)", ARG2, sizeof(struct vki_statfs) );
+   PRE_MEM_WRITE( "statfs(buf)", ARG2, sizeof(struct statfs) );
 }
 POST(sys_statfs)
 {
-   POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs) );
+   POST_MEM_WRITE( ARG2, sizeof(struct statfs) );
 }
=20
 PRE(sys_statx)

Modified: branches/AIX5/include/vki/vki-ppc32-aix5.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/include/vki/vki-ppc32-aix5.h	2006-10-05 12:38:52 UTC (r=
ev 6191)
+++ branches/AIX5/include/vki/vki-ppc32-aix5.h	2006-10-05 12:41:44 UTC (r=
ev 6192)
@@ -143,15 +143,6 @@
 #define _VKI_IOC_DIR(_x)   (((_x) >> 30) & 3)
 #define _VKI_IOC_SIZE(_x)  (((_x) >> 16) & 0x7F)
=20
-/* -------------- Filesystems --------------- */
-
-/* Known:
-   sizeof(struct statfs) =3D 132
-*/
-struct vki_statfs {
-   UChar __off0[132];
-};
-
 /* ---------------- MMappery ---------------- */
=20
 #define VKI_PAGE_SIZE 4096 /* this is checked by the launcher */

Modified: branches/AIX5/include/vki/vki-ppc64-aix5.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/include/vki/vki-ppc64-aix5.h	2006-10-05 12:38:52 UTC (r=
ev 6191)
+++ branches/AIX5/include/vki/vki-ppc64-aix5.h	2006-10-05 12:41:44 UTC (r=
ev 6192)
@@ -143,15 +143,6 @@
 #define _VKI_IOC_DIR(_x)   (((_x) >> 30) & 3)
 #define _VKI_IOC_SIZE(_x)  (((_x) >> 16) & 0x7F)
=20
-/* -------------- Filesystems --------------- */
-
-/* Known:
-   sizeof(struct statfs) =3D 176
-*/
-struct vki_statfs {
-   UChar __off0[176];
-};
-
 /* ---------------- MMappery ---------------- */
=20
 #define VKI_PAGE_SIZE 4096 /* this is checked by the launcher */