FreeBSD regtest: add syscall 9999 to scalar

This provokes an unhandled syscall message, as is done on other
platforms. Update filter since scalar runs on all FreeBSD
platforms.

diff --git a/coregrind/pub_core_aspacemgr.h b/coregrind/pub_core_aspacemgr.h
index b867108a2264467dbfdef94b9982a7f34e9f94a8..56c5b8dd10daf0c34bfb91334328eff426b2ddf1 100644 (file)
--- a/coregrind/pub_core_aspacemgr.h
+++ b/coregrind/pub_core_aspacemgr.h
@@ -340,7 +340,7 @@ extern Bool VG_(am_relocate_nooverlap_client)( /*OUT*/Bool* need_discard,
 #else
 # define VG_STACK_GUARD_SZB  8192   // 2 pages
 #endif
-# define VG_DEFAULT_STACK_ACTIVE_SZB 1048576 // (4096 * 256) = 1Mb 
+# define VG_DEFAULT_STACK_ACTIVE_SZB 1048576 // (4096 * 256) = 1Mb
 
 typedef struct _VgStack VgStack;
 

diff --git a/memcheck/tests/freebsd/filter_scalar b/memcheck/tests/freebsd/filter_scalar
index 1e4f2d753edf7cfd10bd18539534f42cafe92279..2741038d1da066fd6b9ea636d60be1ff0f9ed40e 100755 (executable)
--- a/memcheck/tests/freebsd/filter_scalar
+++ b/memcheck/tests/freebsd/filter_scalar
@@ -16,6 +16,7 @@ sed '/at 0x........: syscall (in \/...libc...)/d' |
 sed 's/SYS_freebsd12/          SYS/' |
 sed 's/SYS_freebsd13/          SYS/' |
 sed 's/SYS_freebsd14/          SYS/' |
+sed 's/arm64-freebsd/amd64-freebsd/' |
 
 # get rid of error limit message
 

diff --git a/memcheck/tests/freebsd/scalar.c b/memcheck/tests/freebsd/scalar.c
index d327609ac7c9739ad5278cc5c8a94d36096b664b..acb4b662e7864b5ca7a6c3246cbd8ee2a6def162 100644 (file)
--- a/memcheck/tests/freebsd/scalar.c
+++ b/memcheck/tests/freebsd/scalar.c
@@ -2594,6 +2594,11 @@ int main(void)
    FAKE_SY("\n");
 #endif
 
+   // no such syscall...
+   GO(9999, "1e");
+   SY(9999); FAIL;
+
+
    /* SYS_exit                    1 */
    GO(SYS_exit, "1s 0m");
    SY(SYS_exit, x0); FAIL;

diff --git a/memcheck/tests/freebsd/scalar.stderr.exp b/memcheck/tests/freebsd/scalar.stderr.exp
index 638e87bd62bdcd76d5df95b8f14b9e713d910807..2acb864e7366db3f8b4b4d3fb84e0ad19e4d1235 100644 (file)
--- a/memcheck/tests/freebsd/scalar.stderr.exp
+++ b/memcheck/tests/freebsd/scalar.stderr.exp
@@ -5854,6 +5854,14 @@ Syscall param setgroups(list) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
+---------------------------------------------------------
+9999:                    9999 1e
+---------------------------------------------------------
+WARNING: unhandled amd64-freebsd syscall: 9999
+You may be able to write your own handler.
+Read the file README_MISSING_SYSCALL_OR_IOCTL.
+Nevertheless we consider this a bug.  Please report
+it at http://valgrind.org/support/bug_reports.html.
 ---------------------------------------------------------
   1:                SYS_exit 1s 0m
 ---------------------------------------------------------

diff --git a/memcheck/tests/freebsd/scalar.stderr.exp-x86 b/memcheck/tests/freebsd/scalar.stderr.exp-x86
index 7304090f5ccbdf6e528ed61b01cc9439a6e7d11a..957ffb2058564f363a981176478ccc36f8e97715 100644 (file)
--- a/memcheck/tests/freebsd/scalar.stderr.exp-x86
+++ b/memcheck/tests/freebsd/scalar.stderr.exp-x86
@@ -5926,6 +5926,14 @@ Syscall param setgroups(list) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
+---------------------------------------------------------
+9999:                    9999 1e
+---------------------------------------------------------
+WARNING: unhandled x86-freebsd syscall: 9999
+You may be able to write your own handler.
+Read the file README_MISSING_SYSCALL_OR_IOCTL.
+Nevertheless we consider this a bug.  Please report
+it at http://valgrind.org/support/bug_reports.html.
 ---------------------------------------------------------
   1:                SYS_exit 1s 0m
 ---------------------------------------------------------