FreeBSD regtest and syscall message

diff --git a/coregrind/m_syswrap/syswrap-freebsd.c b/coregrind/m_syswrap/syswrap-freebsd.c
index 594298420722e485eb359f34ca5780b9ee07e5bc..ef4712391f809c8739c3287be9e27feaaa0b6ec7 100644 (file)
--- a/coregrind/m_syswrap/syswrap-freebsd.c
+++ b/coregrind/m_syswrap/syswrap-freebsd.c
@@ -2169,7 +2169,7 @@ PRE(sys_freebsd7___semctl)
    case VKI_GETALL:
    case VKI_SETALL:
       PRINT("sys_freebsd7___semctl ( %" FMT_REGWORD "u, %" FMT_REGWORD "u, %" FMT_REGWORD "u, %#" FMT_REGWORD "x )",ARG1,ARG2,ARG3,ARG4);
-      PRE_REG_READ4(int, "semctl",
+      PRE_REG_READ4(int, "freebsd7___semctl",
                     int, semid, int, semnum, int, cmd, union vki_semun *, arg);
       PRE_MEM_READ("freebsd7___semctl(arg)", ARG4, sizeof(union vki_semun));
       semun = (union vki_semun*)ARG4;
@@ -2180,7 +2180,7 @@ PRE(sys_freebsd7___semctl)
       break;
    default:
       PRINT("sys_freebsd7___semctl ( %" FMT_REGWORD "u, %" FMT_REGWORD "u, %" FMT_REGWORD "u )",ARG1,ARG2,ARG3);
-      PRE_REG_READ3(long, "semctl",
+      PRE_REG_READ3(long, "freebsd7___semctl",
                     int, semid, int, semnum, int, cmd);
       break;
    }

diff --git a/memcheck/tests/freebsd/scalar.c b/memcheck/tests/freebsd/scalar.c
index 177d1dac3324119f21eac6256ebe67b4d146baf1..62b192374d5be3abac99d7368285327e8e7369b2 100644 (file)
--- a/memcheck/tests/freebsd/scalar.c
+++ b/memcheck/tests/freebsd/scalar.c
@@ -835,16 +835,16 @@ int main(void)
    FAKE_SY("Syscall param freebsd7_semctl(semid) contains uninitialised byte(s)\n");
    FAKE_SY("   ...\n");
    FAKE_SY("\n");
-   FAKE_SY("Syscall param freebsd7_semctl(semnum) contains uninitialised byte(s)\n");
+   FAKE_SY("Syscall param freebsd7___semctl(semnum) contains uninitialised byte(s)\n");
    FAKE_SY("   ...\n");
    FAKE_SY("\n");
-   FAKE_SY("Syscall param freebsd7_semctl(cmd) contains uninitialised byte(s)\n");
+   FAKE_SY("Syscall param freebsd7___semctl(cmd) contains uninitialised byte(s)\n");
    FAKE_SY("   ...\n");
    FAKE_SY("\n");
    FAKE_SY("Syscall param freebsd7_semctl(arg) contains uninitialised byte(s)\n");
    FAKE_SY("   ...\n");
    FAKE_SY("\n");
-   FAKE_SY("Syscall param sys_freebsd7___semctl(arg) points to unaddressable byte(s)\n");
+   FAKE_SY("Syscall param freebsd7___semctl(arg) points to unaddressable byte(s)\n");
    FAKE_SY("   ...\n");
    FAKE_SY(" Address 0x........ is not stack'd, malloc'd or (recently) free'd\n");
    FAKE_SY("\n");
@@ -852,10 +852,10 @@ int main(void)
    FAKE_SY("Syscall param freebsd7_semctl(semid) contains uninitialised byte(s)\n");
    FAKE_SY("   ...\n");
    FAKE_SY("\n");
-   FAKE_SY("Syscall param freebsd7_semctl(semnum) contains uninitialised byte(s)\n");
+   FAKE_SY("Syscall param freebsd7___semctl(semnum) contains uninitialised byte(s)\n");
    FAKE_SY("   ...\n");
    FAKE_SY("\n");
-   FAKE_SY("Syscall param semctl(cmd) contains uninitialised byte(s)\n");
+   FAKE_SY("Syscall param freebsd7___semctl(cmd) contains uninitialised byte(s)\n");
    FAKE_SY("   ...\n");
    FAKE_SY("\n");
 #endif

diff --git a/memcheck/tests/freebsd/scalar.stderr.exp b/memcheck/tests/freebsd/scalar.stderr.exp
index 86ead33ff20f2b780ff09e8d8132525a9bbfdc7e..857ffceee293eeb6787a105a49ac303521fb257b 100644 (file)
--- a/memcheck/tests/freebsd/scalar.stderr.exp
+++ b/memcheck/tests/freebsd/scalar.stderr.exp
@@ -1581,16 +1581,16 @@ Syscall param poll(ufds.events) points to uninitialised byte(s)
 ---------------------------------------------------------
 220:   SYS_freebsd7___semctl (IPC_STAT) 4s 1m
 ---------------------------------------------------------
-Syscall param semctl(semid) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(semid) contains uninitialised byte(s)
    ...
 
-Syscall param semctl(semnum) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(semnum) contains uninitialised byte(s)
    ...
 
-Syscall param semctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(cmd) contains uninitialised byte(s)
    ...
 
-Syscall param semctl(arg) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(arg) contains uninitialised byte(s)
    ...
 
 Syscall param freebsd7___semctl(arg) points to unaddressable byte(s)
@@ -1600,13 +1600,13 @@ Syscall param freebsd7___semctl(arg) points to unaddressable byte(s)
 ---------------------------------------------------------
 220:   SYS_freebsd7___semctl (bogus cmd) 3s 0m
 ---------------------------------------------------------
-Syscall param semctl(semid) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(semid) contains uninitialised byte(s)
    ...
 
-Syscall param semctl(semnum) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(semnum) contains uninitialised byte(s)
    ...
 
-Syscall param semctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(cmd) contains uninitialised byte(s)
    ...
 
 ---------------------------------------------------------

diff --git a/memcheck/tests/freebsd/scalar.stderr.exp-x86 b/memcheck/tests/freebsd/scalar.stderr.exp-x86
index 6d53f938784986b3b81e3996dfca5d58a8fcc292..9b650198bf005116e219c7bd5a361c7711c5df02 100644 (file)
--- a/memcheck/tests/freebsd/scalar.stderr.exp-x86
+++ b/memcheck/tests/freebsd/scalar.stderr.exp-x86
@@ -1581,16 +1581,16 @@ Syscall param poll(ufds.events) points to uninitialised byte(s)
 ---------------------------------------------------------
 220:   SYS_freebsd7___semctl (IPC_STAT) 4s 1m
 ---------------------------------------------------------
-Syscall param semctl(semid) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(semid) contains uninitialised byte(s)
    ...
 
-Syscall param semctl(semnum) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(semnum) contains uninitialised byte(s)
    ...
 
-Syscall param semctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(cmd) contains uninitialised byte(s)
    ...
 
-Syscall param semctl(arg) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(arg) contains uninitialised byte(s)
    ...
 
 Syscall param freebsd7___semctl(arg) points to unaddressable byte(s)
@@ -1600,13 +1600,13 @@ Syscall param freebsd7___semctl(arg) points to unaddressable byte(s)
 ---------------------------------------------------------
 220:   SYS_freebsd7___semctl (bogus cmd) 3s 0m
 ---------------------------------------------------------
-Syscall param semctl(semid) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(semid) contains uninitialised byte(s)
    ...
 
-Syscall param semctl(semnum) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(semnum) contains uninitialised byte(s)
    ...
 
-Syscall param semctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7___semctl(cmd) contains uninitialised byte(s)
    ...
 
 ---------------------------------------------------------