FreeBSD regtest: clean up compat syscall messages

Old syscalls never die. They just become freebsdXX_syscall.
And I forget to rename all their arguments.

diff --git a/coregrind/m_syswrap/priv_syswrap-freebsd.h b/coregrind/m_syswrap/priv_syswrap-freebsd.h
index 65f69e85a0be6109ef6ec971cc8455d590abd722..b30cce4e869e6045aa0ecfad5d6a862822c73387 100644 (file)
--- a/coregrind/m_syswrap/priv_syswrap-freebsd.h
+++ b/coregrind/m_syswrap/priv_syswrap-freebsd.h
@@ -81,7 +81,7 @@ DECL_TEMPLATE(freebsd, sys_fchflags) // 35
 // generic kill 37
 // generic getppid 39
 // generic dup 41
-DECL_TEMPLATE(freebsd, sys_pipe) // 42
+DECL_TEMPLATE(freebsd, sys_freebsd10_pipe) // 42
 // generic getegid 43
 // generic profil redirect to ni_syscall 44
 // sys_ktrace refirect to ni_syscall 45

diff --git a/coregrind/m_syswrap/syswrap-freebsd.c b/coregrind/m_syswrap/syswrap-freebsd.c
index bf7c96a8f27e388bd326d89fc39f8ee190a547be..0c68acdc8fd9487d9d2ae10e6f46cd641ffab87e 100644 (file)
--- a/coregrind/m_syswrap/syswrap-freebsd.c
+++ b/coregrind/m_syswrap/syswrap-freebsd.c
@@ -918,15 +918,15 @@ PRE(sys_fchflags)
 // Pipe on freebsd doesn't have args, and uses dual returns!
 // SYS_freebsd10_pipe   42
 // int pipe(void);
-PRE(sys_pipe)
+PRE(sys_freebsd10_pipe)
 {
-   PRINT("%s", "sys_pipe ()");
+   PRINT("%s", "sys_freebsd10_pipe ()");
 }
 
-POST(sys_pipe)
+POST(sys_freebsd10_pipe)
 {
-   if (!ML_(fd_allowed)(RES, "pipe", tid, True) ||
-         !ML_(fd_allowed)(RESHI, "pipe", tid, True)) {
+   if (!ML_(fd_allowed)(RES, "freebsd10_pipe", tid, True) ||
+         !ML_(fd_allowed)(RESHI, "freebsd10_pipe", tid, True)) {
       VG_(close)(RES);
       VG_(close)(RESHI);
       SET_STATUS_Failure( VKI_EMFILE );
@@ -1788,9 +1788,9 @@ PRE(sys_seteuid)
 PRE(sys_freebsd11_stat)
 {
    PRINT("sys_freebsd11_stat ( %#" FMT_REGWORD "x(%s), %#" FMT_REGWORD "x )",ARG1,(char *)ARG1,ARG2);
-   PRE_REG_READ2(int, "stat", char *, path, struct freebsd11_stat *, sb);
-   PRE_MEM_RASCIIZ( "stat(path)", ARG1 );
-   PRE_MEM_WRITE( "stat(sb)", ARG2, sizeof(struct vki_freebsd11_stat) );
+   PRE_REG_READ2(int, "freebsd11_stat", char *, path, struct freebsd11_stat *, sb);
+   PRE_MEM_RASCIIZ( "freebsd11_stat(path)", ARG1 );
+   PRE_MEM_WRITE( "freebsd11_stat(sb)", ARG2, sizeof(struct vki_freebsd11_stat) );
 }
 
 POST(sys_freebsd11_stat)
@@ -1803,10 +1803,10 @@ POST(sys_freebsd11_stat)
 PRE(sys_freebsd11_fstat)
 {
    PRINT("sys_freebsd11_fstat ( %" FMT_REGWORD "d, %#" FMT_REGWORD "x )",SARG1,ARG2);
-   PRE_REG_READ2(int, "fstat", int, fd, struct stat *, sb);
+   PRE_REG_READ2(int, "freebsd11_fstat", int, fd, struct stat *, sb);
    if (!ML_(fd_allowed)(ARG1, "freebsd11_fstat", tid, False))
       SET_STATUS_Failure(VKI_EBADF);
-   PRE_MEM_WRITE( "fstat(sb)", ARG2, sizeof(struct vki_freebsd11_stat) );
+   PRE_MEM_WRITE( "freebsd11_fstat(sb)", ARG2, sizeof(struct vki_freebsd11_stat) );
 }
 
 POST(sys_freebsd11_fstat)
@@ -1819,9 +1819,9 @@ POST(sys_freebsd11_fstat)
 PRE(sys_freebsd11_lstat)
 {
    PRINT("sys_freebsd11_lstat ( %#" FMT_REGWORD "x(%s), %#" FMT_REGWORD "x )",ARG1,(char *)ARG1,ARG2);
-   PRE_REG_READ2(sb, "lstat", const char *, path, struct freebsd11_stat *, sb);
-   PRE_MEM_RASCIIZ( "lstat(path)", ARG1 );
-   PRE_MEM_WRITE( "lstat(sb)", ARG2, sizeof(struct vki_freebsd11_stat) );
+   PRE_REG_READ2(sb, "freebsd11_lstat", const char *, path, struct freebsd11_stat *, sb);
+   PRE_MEM_RASCIIZ( "freebsd11_lstat(path)", ARG1 );
+   PRE_MEM_WRITE( "freebsd11_lstat(sb)", ARG2, sizeof(struct vki_freebsd11_stat) );
 }
 
 POST(sys_freebsd11_lstat)
@@ -1864,15 +1864,15 @@ PRE(sys_freebsd11_getdirentries)
 {
    *flags |= SfMayBlock;
    PRINT("sys_freebsd11_getdirentries ( %" FMT_REGWORD "u, %#" FMT_REGWORD "x, %" FMT_REGWORD "u )", ARG1,ARG2,ARG3);
-   PRE_REG_READ4(int, "getdirentries",
+   PRE_REG_READ4(int, "freebsd11_getdirentries",
                  int, fd, char *, buf,
                  int, nbytes,
                  long *, basep);
-   if (!ML_(fd_allowed)(ARG1, "getdirentries", tid, False))
+   if (!ML_(fd_allowed)(ARG1, "freebsd11_getdirentries", tid, False))
       SET_STATUS_Failure(VKI_EBADF);
-   PRE_MEM_WRITE( "getdirentries(buf)", ARG2, ARG3 );
+   PRE_MEM_WRITE( "freebsd11_getdirentries(buf)", ARG2, ARG3 );
    if (ARG4) {
-      PRE_MEM_WRITE( "getdirentries(basep)", ARG4, sizeof(long) );
+      PRE_MEM_WRITE( "freebsd11_getdirentries(basep)", ARG4, sizeof(long) );
    }
 }
 
@@ -2171,7 +2171,7 @@ PRE(sys_freebsd7___semctl)
       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",
                     int, semid, int, semnum, int, cmd, union vki_semun *, arg);
-      PRE_MEM_READ("sys_freebsd7___semctl(arg)", ARG4, sizeof(union vki_semun));
+      PRE_MEM_READ("freebsd7___semctl(arg)", ARG4, sizeof(union vki_semun));
       semun = (union vki_semun*)ARG4;
       if (ML_(safe_to_deref)(semun, sizeof(*semun))) {
          ARG4 = (RegWord)semun;
@@ -2222,15 +2222,15 @@ PRE(sys_freebsd7_msgctl)
 {
    PRINT("sys_freebsd7_msgctl ( %" FMT_REGWORD "d, %" FMT_REGWORD "d, %#" FMT_REGWORD "x )", SARG1,SARG2,ARG3 );
 
-   PRE_REG_READ3(int, "msgctl", int, msqid, int, cmd, struct msqid_ds_old *, buf);
+   PRE_REG_READ3(int, "freebsd7_msgctl", int, msqid, int, cmd, struct msqid_ds_old *, buf);
 
    switch (ARG2 /* cmd */) {
    case VKI_IPC_STAT:
-      PRE_MEM_WRITE( "msgctl(IPC_STAT, buf)",
+      PRE_MEM_WRITE( "freebsd7_msgctl(IPC_STAT, buf)",
                      ARG3, sizeof(struct vki_msqid_ds_old) );
       break;
    case VKI_IPC_SET:
-      PRE_MEM_READ( "msgctl(IPC_SET, buf)",
+      PRE_MEM_READ( "freebsd7_msgctl(IPC_SET, buf)",
                     ARG3, sizeof(struct vki_msqid_ds_old) );
       break;
    }
@@ -2312,15 +2312,15 @@ POST(sys_shmat)
 PRE(sys_freebsd7_shmctl)
 {
    PRINT("sys_freebsd7_shmctl ( %" FMT_REGWORD "d, %" FMT_REGWORD "d, %#" FMT_REGWORD "x )",SARG1,SARG2,ARG3);
-   PRE_REG_READ3(int, "shmctl",
+   PRE_REG_READ3(int, "freebsd7_shmctl",
                  int, shmid, int, cmd, struct vki_shmid_ds_old *, buf);
    switch (ARG2 /* cmd */) {
    case VKI_IPC_STAT:
-      PRE_MEM_WRITE( "shmctl7(IPC_STAT, buf)",
+      PRE_MEM_WRITE( "freebsd7_shmctl7(IPC_STAT, buf)",
                      ARG3, sizeof(struct vki_shmid_ds_old) );
       break;
    case VKI_IPC_SET:
-      PRE_MEM_READ( "shmctl7(IPC_SET, buf)",
+      PRE_MEM_READ( "freebsd7_shmctl7(IPC_SET, buf)",
                     ARG3, sizeof(struct vki_shmid_ds_old) );
       break;
    }
@@ -2764,9 +2764,9 @@ POST(sys_fhopen)
 PRE(sys_freebsd11_fhstat)
 {
    PRINT("sys_freebsd11_fhstat ( %#" FMT_REGWORD "x, %#" FMT_REGWORD "x )",ARG1,ARG2);
-   PRE_REG_READ2(int, "fhstat", struct fhandle *, fhp, struct freebd11_stat *, sb);
-   PRE_MEM_READ( "fhstat(fhp)", ARG1, sizeof(struct vki_fhandle) );
-   PRE_MEM_WRITE( "fhstat(sb)", ARG2, sizeof(struct vki_freebsd11_stat) );
+   PRE_REG_READ2(int, "freebsd11_fhstat", struct fhandle *, fhp, struct freebd11_stat *, sb);
+   PRE_MEM_READ( "freebsd11_fhstat(fhp)", ARG1, sizeof(struct vki_fhandle) );
+   PRE_MEM_WRITE( "freebsd11_fhstat(sb)", ARG2, sizeof(struct vki_freebsd11_stat) );
 }
 
 POST(sys_freebsd11_fhstat)
@@ -3584,23 +3584,23 @@ POST(sys_kqueue)
 PRE(sys_freebsd11_kevent)
 {
    PRINT("sys_freebsd11_kevent ( %" FMT_REGWORD "u, %#" FMT_REGWORD "x, %" FMT_REGWORD "u, %#" FMT_REGWORD "x, %" FMT_REGWORD "u, %#" FMT_REGWORD "x )\n", ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
-   PRE_REG_READ6(int, "kevent",
+   PRE_REG_READ6(int, "freebsd11_kevent",
                  int, fd, const struct vki_kevent_freebsd11 *, changelist, int, nchanges,
                  struct vki_kevent_freebsd11 *, eventlist, int, nevents,
                  struct timespec *, timeout);
    if (!ML_(fd_allowed)(ARG1, "freebsd11_kevent", tid, False))
       SET_STATUS_Failure(VKI_EBADF);
    if (ARG2 != 0 && ARG3 != 0) {
-      PRE_MEM_READ( "kevent(changelist)", ARG2, sizeof(struct vki_kevent_freebsd11)*ARG3 );
+      PRE_MEM_READ( "freebsd11_kevent(changelist)", ARG2, sizeof(struct vki_kevent_freebsd11)*ARG3 );
    }
    if (ARG4 != 0 && ARG5 != 0) {
-      PRE_MEM_WRITE( "kevent(eventlist)", ARG4, sizeof(struct vki_kevent_freebsd11)*ARG5);
+      PRE_MEM_WRITE( "freebsd11_kevent(eventlist)", ARG4, sizeof(struct vki_kevent_freebsd11)*ARG5);
    }
    if (ARG5 != 0) {
       *flags |= SfMayBlock;
    }
    if (ARG6 != 0) {
-      PRE_MEM_READ( "kevent(timeout)",
+      PRE_MEM_READ( "freebsd11_kevent(timeout)",
                     ARG6, sizeof(struct vki_timespec));
    }
 }
@@ -3803,8 +3803,8 @@ POST(sys_uuidgen)
 PRE(sys_freebsd11_getfsstat)
 {
    PRINT("sys_freebsd11_getfsstat ( %#" FMT_REGWORD "x, %" FMT_REGWORD "u, %" FMT_REGWORD "u )",ARG1,ARG2,ARG3);
-   PRE_REG_READ3(int, "getfsstat", struct vki_freebsd11_statfs *, buf, long, bufsize, int, mode);
-   PRE_MEM_WRITE( "getfsstat(buf)", ARG1, ARG2 );
+   PRE_REG_READ3(int, "freebsd11_getfsstat", struct vki_freebsd11_statfs *, buf, long, bufsize, int, mode);
+   PRE_MEM_WRITE( "freebsd11_getfsstat(buf)", ARG1, ARG2 );
 }
 
 POST(sys_freebsd11_getfsstat)
@@ -3819,10 +3819,10 @@ POST(sys_freebsd11_getfsstat)
 // int statfs(const char *path, struct statfs *buf);
 PRE(sys_freebsd11_statfs)
 {
-   PRINT("sys_statfs ( %#" FMT_REGWORD "x(%s), %#" FMT_REGWORD "x )",ARG1,(char *)ARG1,ARG2);
-   PRE_REG_READ2(int, "statfs", const char *, path, struct statfs *, buf);
-   PRE_MEM_RASCIIZ( "statfs(path)", ARG1 );
-   PRE_MEM_WRITE( "statfs(buf)", ARG2, sizeof(struct vki_freebsd11_statfs) );
+   PRINT("sys_freebsd11_statfs ( %#" FMT_REGWORD "x(%s), %#" FMT_REGWORD "x )",ARG1,(char *)ARG1,ARG2);
+   PRE_REG_READ2(int, "freebsd11_statfs", const char *, path, struct statfs *, buf);
+   PRE_MEM_RASCIIZ( "freebsd11_statfs(path)", ARG1 );
+   PRE_MEM_WRITE( "freebsd11_statfs(buf)", ARG2, sizeof(struct vki_freebsd11_statfs) );
 }
 
 POST(sys_freebsd11_statfs)
@@ -3834,12 +3834,12 @@ POST(sys_freebsd11_statfs)
 // int fstatfs(int fd, struct statfs *buf);
 PRE(sys_freebsd11_fstatfs)
 {
-   PRINT("sys_fstatfs ( %" FMT_REGWORD "u, %#" FMT_REGWORD "x )",ARG1,ARG2);
-   PRE_REG_READ2(int, "fstatfs",
+   PRINT("sys_freebsd11_fstatfs ( %" FMT_REGWORD "u, %#" FMT_REGWORD "x )",ARG1,ARG2);
+   PRE_REG_READ2(int, "freebsd11_fstatfs",
                  unsigned int, fd, struct statfs *, buf);
    if (!ML_(fd_allowed)(ARG1, "freebsd11_fstatfs", tid, False))
       SET_STATUS_Failure(VKI_EBADF);
-   PRE_MEM_WRITE( "fstatfs(buf)", ARG2, sizeof(struct vki_freebsd11_statfs) );
+   PRE_MEM_WRITE( "freebsd11_fstatfs(buf)", ARG2, sizeof(struct vki_freebsd11_statfs) );
 }
 
 POST(sys_freebsd11_fstatfs)
@@ -3851,11 +3851,11 @@ POST(sys_freebsd11_fstatfs)
 // int fhstatfs(const fhandle_t *fhp, struct statfs *buf);
 PRE(sys_freebsd11_fhstatfs)
 {
-   PRINT("sys_fhstatfs ( %#" FMT_REGWORD "x, %#" FMT_REGWORD "x )",ARG1,ARG2);
-   PRE_REG_READ2(int, "fhstatfs",
+   PRINT("sys_freebsd11_fhstatfs ( %#" FMT_REGWORD "x, %#" FMT_REGWORD "x )",ARG1,ARG2);
+   PRE_REG_READ2(int, "freebsd11_fhstatfs",
                  struct fhandle *, fhp, struct statfs *, buf);
-   PRE_MEM_READ( "fhstatfs(fhp)", ARG1, sizeof(struct vki_fhandle) );
-   PRE_MEM_WRITE( "fhstatfs(buf)", ARG2, sizeof(struct vki_freebsd11_statfs) );
+   PRE_MEM_READ( "freebsd11_fhstatfs(fhp)", ARG1, sizeof(struct vki_fhandle) );
+   PRE_MEM_WRITE( "freebsd11_fhstatfs(buf)", ARG2, sizeof(struct vki_freebsd11_statfs) );
 }
 
 POST(sys_freebsd11_fhstatfs)
@@ -4052,8 +4052,8 @@ POST(sys_swapcontext)
 PRE(sys_freebsd13_swapoff)
 {
    PRINT("sys_freebsd13_swapoff ( %#" FMT_REGWORD "x(%s) )", ARG1,(char *)ARG1);
-   PRE_REG_READ1(int, "swapoff", const char *, special);
-   PRE_MEM_RASCIIZ( "swapoff(special)", ARG1 );
+   PRE_REG_READ1(int, "freebsd13_swapoff", const char *, special);
+   PRE_MEM_RASCIIZ( "freebsd13_swapoff(special)", ARG1 );
 }
 
 // SYS___acl_get_link   425
@@ -7257,7 +7257,7 @@ const SyscallTableEntry ML_(syscall_table)[] = {
 #if defined(VGP_arm64_freebsd)
    GENX_(__NR_freebsd10_pipe,   sys_ni_syscall),        // 42
 #else
-   BSDXY(__NR_freebsd10_pipe,   sys_pipe),              // 42
+   BSDXY(__NR_freebsd10_pipe,   sys_freebsd10_pipe),    // 42
 #endif
    GENX_(__NR_getegid,          sys_getegid),           // 43
 

diff --git a/memcheck/tests/freebsd/scalar.stderr.exp b/memcheck/tests/freebsd/scalar.stderr.exp
index 166552caf6af0457b8b6f2c232527c85db61e0f3..86ead33ff20f2b780ff09e8d8132525a9bbfdc7e 100644 (file)
--- a/memcheck/tests/freebsd/scalar.stderr.exp
+++ b/memcheck/tests/freebsd/scalar.stderr.exp
@@ -1317,47 +1317,47 @@ Syscall param seteuid(uid) contains uninitialised byte(s)
 ---------------------------------------------------------
 188:      SYS_freebsd11_stat 2s 2m
 ---------------------------------------------------------
-Syscall param stat(path) contains uninitialised byte(s)
+Syscall param freebsd11_stat(path) contains uninitialised byte(s)
    ...
 
-Syscall param stat(sb) contains uninitialised byte(s)
+Syscall param freebsd11_stat(sb) contains uninitialised byte(s)
    ...
 
-Syscall param stat(path) points to unaddressable byte(s)
+Syscall param freebsd11_stat(path) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-Syscall param stat(sb) points to unaddressable byte(s)
+Syscall param freebsd11_stat(sb) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 ---------------------------------------------------------
 189:     SYS_freebsd11_fstat 2s 1m
 ---------------------------------------------------------
-Syscall param fstat(fd) contains uninitialised byte(s)
+Syscall param freebsd11_fstat(fd) contains uninitialised byte(s)
    ...
 
-Syscall param fstat(sb) contains uninitialised byte(s)
+Syscall param freebsd11_fstat(sb) contains uninitialised byte(s)
    ...
 
-Syscall param fstat(sb) points to unaddressable byte(s)
+Syscall param freebsd11_fstat(sb) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 ---------------------------------------------------------
 190:     SYS_freebsd11_lstat 2s 2m
 ---------------------------------------------------------
-Syscall param lstat(path) contains uninitialised byte(s)
+Syscall param freebsd11_lstat(path) contains uninitialised byte(s)
    ...
 
-Syscall param lstat(sb) contains uninitialised byte(s)
+Syscall param freebsd11_lstat(sb) contains uninitialised byte(s)
    ...
 
-Syscall param lstat(path) points to unaddressable byte(s)
+Syscall param freebsd11_lstat(path) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-Syscall param lstat(sb) points to unaddressable byte(s)
+Syscall param freebsd11_lstat(sb) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -1412,23 +1412,23 @@ Syscall param setrlimit(rlim) points to unaddressable byte(s)
 ---------------------------------------------------------
 196:SYS_freebsd11_getdirentries 4s 2m
 ---------------------------------------------------------
-Syscall param getdirentries(fd) contains uninitialised byte(s)
+Syscall param freebsd11_getdirentries(fd) contains uninitialised byte(s)
    ...
 
-Syscall param getdirentries(buf) contains uninitialised byte(s)
+Syscall param freebsd11_getdirentries(buf) contains uninitialised byte(s)
    ...
 
-Syscall param getdirentries(nbytes) contains uninitialised byte(s)
+Syscall param freebsd11_getdirentries(nbytes) contains uninitialised byte(s)
    ...
 
-Syscall param getdirentries(basep) contains uninitialised byte(s)
+Syscall param freebsd11_getdirentries(basep) contains uninitialised byte(s)
    ...
 
-Syscall param getdirentries(buf) points to unaddressable byte(s)
+Syscall param freebsd11_getdirentries(buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-Syscall param getdirentries(basep) points to unaddressable byte(s)
+Syscall param freebsd11_getdirentries(basep) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -1593,7 +1593,7 @@ Syscall param semctl(cmd) contains uninitialised byte(s)
 Syscall param semctl(arg) contains uninitialised byte(s)
    ...
 
-Syscall param sys_freebsd7___semctl(arg) points to unaddressable byte(s)
+Syscall param freebsd7___semctl(arg) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -1636,32 +1636,32 @@ Syscall param semop(nops) contains uninitialised byte(s)
 ---------------------------------------------------------
 224:     SYS_freebsd7_msgctl (set) 3s 1m
 ---------------------------------------------------------
-Syscall param msgctl(msqid) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(msqid) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(cmd) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(buf) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(buf) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(IPC_SET, buf) points to unaddressable byte(s)
+Syscall param freebsd7_msgctl(IPC_SET, buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 ---------------------------------------------------------
 224:     SYS_freebsd7_msgctl (stat) 3s 1m
 ---------------------------------------------------------
-Syscall param msgctl(msqid) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(msqid) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(cmd) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(buf) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(buf) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(IPC_STAT, buf) points to unaddressable byte(s)
+Syscall param freebsd7_msgctl(IPC_STAT, buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -1734,25 +1734,25 @@ Syscall param shmat(flag) contains uninitialised byte(s)
 ---------------------------------------------------------
 229:     SYS_freebsd7_shmctl 3s 0m
 ---------------------------------------------------------
-Syscall param shmctl(shmid) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(shmid) contains uninitialised byte(s)
    ...
 
-Syscall param shmctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(cmd) contains uninitialised byte(s)
    ...
 
-Syscall param shmctl(buf) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(buf) contains uninitialised byte(s)
    ...
 
 ---------------------------------------------------------
 229:     SYS_freebsd7_shmctl (bogus cmd) 3s 0m
 ---------------------------------------------------------
-Syscall param shmctl(shmid) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(shmid) contains uninitialised byte(s)
    ...
 
-Syscall param shmctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(cmd) contains uninitialised byte(s)
    ...
 
-Syscall param shmctl(buf) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(buf) contains uninitialised byte(s)
    ...
 
 ---------------------------------------------------------
@@ -2837,33 +2837,33 @@ Syscall param getresgid(sgid) points to unaddressable byte(s)
 ---------------------------------------------------------
 363:    SYS_freebsd11_kevent 6s 3m
 ---------------------------------------------------------
-Syscall param kevent(fd) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(fd) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(changelist) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(changelist) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(nchanges) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(nchanges) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(eventlist) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(eventlist) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(nevents) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(nevents) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(timeout) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(timeout) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(changelist) points to unaddressable byte(s)
+Syscall param freebsd11_kevent(changelist) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-Syscall param kevent(eventlist) points to unaddressable byte(s)
+Syscall param freebsd11_kevent(eventlist) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-Syscall param kevent(timeout) points to unaddressable byte(s)
+Syscall param freebsd11_kevent(timeout) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -3070,16 +3070,16 @@ Syscall param sendfile(sbytes) points to unaddressable byte(s)
 ---------------------------------------------------------
 395: SYS_freebsd11_getfsstat 3s 1m
 ---------------------------------------------------------
-Syscall param getfsstat(buf) contains uninitialised byte(s)
+Syscall param freebsd11_getfsstat(buf) contains uninitialised byte(s)
    ...
 
-Syscall param getfsstat(bufsize) contains uninitialised byte(s)
+Syscall param freebsd11_getfsstat(bufsize) contains uninitialised byte(s)
    ...
 
-Syscall param getfsstat(mode) contains uninitialised byte(s)
+Syscall param freebsd11_getfsstat(mode) contains uninitialised byte(s)
    ...
 
-Syscall param getfsstat(buf) points to unaddressable byte(s)
+Syscall param freebsd11_getfsstat(buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -3284,10 +3284,10 @@ Syscall param swapcontext(oucp) points to unaddressable byte(s)
 ---------------------------------------------------------
 424:             SYS_swapoff 1s 1m
 ---------------------------------------------------------
-Syscall param swapoff(special) contains uninitialised byte(s)
+Syscall param freebsd13_swapoff(special) contains uninitialised byte(s)
    ...
 
-Syscall param swapoff(special) points to unaddressable byte(s)
+Syscall param freebsd13_swapoff(special) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 

diff --git a/memcheck/tests/freebsd/scalar.stderr.exp-x86 b/memcheck/tests/freebsd/scalar.stderr.exp-x86
index 52c7ce8c39442a0a7e6eff4d9e6be4294ef98002..6d53f938784986b3b81e3996dfca5d58a8fcc292 100644 (file)
--- a/memcheck/tests/freebsd/scalar.stderr.exp-x86
+++ b/memcheck/tests/freebsd/scalar.stderr.exp-x86
@@ -1317,47 +1317,47 @@ Syscall param seteuid(uid) contains uninitialised byte(s)
 ---------------------------------------------------------
 188:      SYS_freebsd11_stat 2s 2m
 ---------------------------------------------------------
-Syscall param stat(path) contains uninitialised byte(s)
+Syscall param freebsd11_stat(path) contains uninitialised byte(s)
    ...
 
-Syscall param stat(sb) contains uninitialised byte(s)
+Syscall param freebsd11_stat(sb) contains uninitialised byte(s)
    ...
 
-Syscall param stat(path) points to unaddressable byte(s)
+Syscall param freebsd11_stat(path) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-Syscall param stat(sb) points to unaddressable byte(s)
+Syscall param freebsd11_stat(sb) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 ---------------------------------------------------------
 189:     SYS_freebsd11_fstat 2s 1m
 ---------------------------------------------------------
-Syscall param fstat(fd) contains uninitialised byte(s)
+Syscall param freebsd11_fstat(fd) contains uninitialised byte(s)
    ...
 
-Syscall param fstat(sb) contains uninitialised byte(s)
+Syscall param freebsd11_fstat(sb) contains uninitialised byte(s)
    ...
 
-Syscall param fstat(sb) points to unaddressable byte(s)
+Syscall param freebsd11_fstat(sb) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 ---------------------------------------------------------
 190:     SYS_freebsd11_lstat 2s 2m
 ---------------------------------------------------------
-Syscall param lstat(path) contains uninitialised byte(s)
+Syscall param freebsd11_lstat(path) contains uninitialised byte(s)
    ...
 
-Syscall param lstat(sb) contains uninitialised byte(s)
+Syscall param freebsd11_lstat(sb) contains uninitialised byte(s)
    ...
 
-Syscall param lstat(path) points to unaddressable byte(s)
+Syscall param freebsd11_lstat(path) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-Syscall param lstat(sb) points to unaddressable byte(s)
+Syscall param freebsd11_lstat(sb) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -1412,23 +1412,23 @@ Syscall param setrlimit(rlim) points to unaddressable byte(s)
 ---------------------------------------------------------
 196:SYS_freebsd11_getdirentries 4s 2m
 ---------------------------------------------------------
-Syscall param getdirentries(fd) contains uninitialised byte(s)
+Syscall param freebsd11_getdirentries(fd) contains uninitialised byte(s)
    ...
 
-Syscall param getdirentries(buf) contains uninitialised byte(s)
+Syscall param freebsd11_getdirentries(buf) contains uninitialised byte(s)
    ...
 
-Syscall param getdirentries(nbytes) contains uninitialised byte(s)
+Syscall param freebsd11_getdirentries(nbytes) contains uninitialised byte(s)
    ...
 
-Syscall param getdirentries(basep) contains uninitialised byte(s)
+Syscall param freebsd11_getdirentries(basep) contains uninitialised byte(s)
    ...
 
-Syscall param getdirentries(buf) points to unaddressable byte(s)
+Syscall param freebsd11_getdirentries(buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-Syscall param getdirentries(basep) points to unaddressable byte(s)
+Syscall param freebsd11_getdirentries(basep) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -1593,7 +1593,7 @@ Syscall param semctl(cmd) contains uninitialised byte(s)
 Syscall param semctl(arg) contains uninitialised byte(s)
    ...
 
-Syscall param sys_freebsd7___semctl(arg) points to unaddressable byte(s)
+Syscall param freebsd7___semctl(arg) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -1636,32 +1636,32 @@ Syscall param semop(nops) contains uninitialised byte(s)
 ---------------------------------------------------------
 224:     SYS_freebsd7_msgctl (set) 3s 1m
 ---------------------------------------------------------
-Syscall param msgctl(msqid) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(msqid) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(cmd) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(buf) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(buf) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(IPC_SET, buf) points to unaddressable byte(s)
+Syscall param freebsd7_msgctl(IPC_SET, buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 ---------------------------------------------------------
 224:     SYS_freebsd7_msgctl (stat) 3s 1m
 ---------------------------------------------------------
-Syscall param msgctl(msqid) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(msqid) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(cmd) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(buf) contains uninitialised byte(s)
+Syscall param freebsd7_msgctl(buf) contains uninitialised byte(s)
    ...
 
-Syscall param msgctl(IPC_STAT, buf) points to unaddressable byte(s)
+Syscall param freebsd7_msgctl(IPC_STAT, buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -1734,25 +1734,25 @@ Syscall param shmat(flag) contains uninitialised byte(s)
 ---------------------------------------------------------
 229:     SYS_freebsd7_shmctl 3s 0m
 ---------------------------------------------------------
-Syscall param shmctl(shmid) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(shmid) contains uninitialised byte(s)
    ...
 
-Syscall param shmctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(cmd) contains uninitialised byte(s)
    ...
 
-Syscall param shmctl(buf) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(buf) contains uninitialised byte(s)
    ...
 
 ---------------------------------------------------------
 229:     SYS_freebsd7_shmctl (bogus cmd) 3s 0m
 ---------------------------------------------------------
-Syscall param shmctl(shmid) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(shmid) contains uninitialised byte(s)
    ...
 
-Syscall param shmctl(cmd) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(cmd) contains uninitialised byte(s)
    ...
 
-Syscall param shmctl(buf) contains uninitialised byte(s)
+Syscall param freebsd7_shmctl(buf) contains uninitialised byte(s)
    ...
 
 ---------------------------------------------------------
@@ -2843,33 +2843,33 @@ Syscall param getresgid(sgid) points to unaddressable byte(s)
 ---------------------------------------------------------
 363:    SYS_freebsd11_kevent 6s 3m
 ---------------------------------------------------------
-Syscall param kevent(fd) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(fd) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(changelist) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(changelist) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(nchanges) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(nchanges) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(eventlist) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(eventlist) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(nevents) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(nevents) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(timeout) contains uninitialised byte(s)
+Syscall param freebsd11_kevent(timeout) contains uninitialised byte(s)
    ...
 
-Syscall param kevent(changelist) points to unaddressable byte(s)
+Syscall param freebsd11_kevent(changelist) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-Syscall param kevent(eventlist) points to unaddressable byte(s)
+Syscall param freebsd11_kevent(eventlist) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-Syscall param kevent(timeout) points to unaddressable byte(s)
+Syscall param freebsd11_kevent(timeout) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -3079,16 +3079,16 @@ Syscall param sendfile(sbytes) points to unaddressable byte(s)
 ---------------------------------------------------------
 395: SYS_freebsd11_getfsstat 3s 1m
 ---------------------------------------------------------
-Syscall param getfsstat(buf) contains uninitialised byte(s)
+Syscall param freebsd11_getfsstat(buf) contains uninitialised byte(s)
    ...
 
-Syscall param getfsstat(bufsize) contains uninitialised byte(s)
+Syscall param freebsd11_getfsstat(bufsize) contains uninitialised byte(s)
    ...
 
-Syscall param getfsstat(mode) contains uninitialised byte(s)
+Syscall param freebsd11_getfsstat(mode) contains uninitialised byte(s)
    ...
 
-Syscall param getfsstat(buf) points to unaddressable byte(s)
+Syscall param freebsd11_getfsstat(buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
@@ -3293,10 +3293,10 @@ Syscall param swapcontext(oucp) points to unaddressable byte(s)
 ---------------------------------------------------------
 424:             SYS_swapoff 1s 1m
 ---------------------------------------------------------
-Syscall param swapoff(special) contains uninitialised byte(s)
+Syscall param freebsd13_swapoff(special) contains uninitialised byte(s)
    ...
 
-Syscall param swapoff(special) points to unaddressable byte(s)
+Syscall param freebsd13_swapoff(special) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd