[Valgrind-developers] valgrind: r9066 - branches/VALGRIND_3_4_BRANCH/coregrind/m_syswrap

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

Author: sewardj
Date: 2009-01-26 12:41:31 +0000 (Mon, 26 Jan 2009)
New Revision: 9066

Log:
merge:
r8957  The SG_GET_VERSION_NUM ioctl writes to memory rather than
       reading it.

r8958  The SG_GET_TIMEOUT ioctl doesn't write to memory - it returns the
       timeout via it's return value.



Modified:
   branches/VALGRIND_3_4_BRANCH/coregrind/m_syswrap/syswrap-generic.c


Modified: branches/VALGRIND_3_4_BRANCH/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- branches/VALGRIND_3_4_BRANCH/coregrind/m_syswrap/syswrap-generic.c	2009-01-26 12:24:36 UTC (rev 9065)
+++ branches/VALGRIND_3_4_BRANCH/coregrind/m_syswrap/syswrap-generic.c	2009-01-26 12:41:31 UTC (rev 9066)
@@ -3351,10 +3351,9 @@
       PRE_MEM_WRITE( "ioctl(SG_GET_RESERVED_SIZE)", ARG3, sizeof(int) );
       break;
    case VKI_SG_GET_TIMEOUT:
-      PRE_MEM_WRITE( "ioctl(SG_GET_TIMEOUT)", ARG3, sizeof(int) );
       break;
    case VKI_SG_GET_VERSION_NUM:
-      PRE_MEM_READ(  "ioctl(SG_GET_VERSION_NUM)",  ARG3, sizeof(int) );
+      PRE_MEM_WRITE(  "ioctl(SG_GET_VERSION_NUM)",  ARG3, sizeof(int) );
       break;
    case VKI_SG_EMULATED_HOST: /* 0x2203 */
       PRE_MEM_WRITE( "ioctl(SG_EMULATED_HOST)",    ARG3, sizeof(int) );
@@ -4431,9 +4430,9 @@
       POST_MEM_WRITE(ARG3, sizeof(int));
       break;
    case VKI_SG_GET_TIMEOUT:
-      POST_MEM_WRITE(ARG3, sizeof(int));
       break;
    case VKI_SG_GET_VERSION_NUM:
+      POST_MEM_WRITE(ARG3, sizeof(int));
       break;
    case VKI_SG_EMULATED_HOST:
       POST_MEM_WRITE(ARG3, sizeof(int));