prog: add ignore_return and breaks_returns call attribtues

We had these hard-coded for fuchsia and linux accordingly.
Replace with call attributes.

5 files changed, 13 insertions, 22 deletions

diff --git a/sys/test/gen/32_fork_shmem.go b/sys/test/gen/32_fork_shmem.go
index 907a58ef1..afddfbd95 100644
--- a/sys/test/gen/32_fork_shmem.go
+++ b/sys/test/gen/32_fork_shmem.go
@@ -945,6 +945,7 @@ var structDescs_32_fork_shmem = []*KeyedStruct{
 }
 
 var syscalls_32_fork_shmem = []*Syscall{
+	{Name: "breaks_returns", CallName: "breaks_returns", Attrs: SyscallAttrs{BreaksReturns: true}},
 	{Name: "fallback$0", CallName: "fallback", MissingArgs: 1, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}},
 	{Name: "fallback$1", CallName: "fallback", Args: []Type{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "a", TypeSize: 4}},
@@ -1055,8 +1056,6 @@ var syscalls_32_fork_shmem = []*Syscall{
 	{Name: "mutate_union", CallName: "mutate_union", Args: []Type{
 		&PtrType{TypeCommon{TypeName: "ptr", FldName: "p", TypeSize: 4}, &UnionType{Key: StructKey{Name: "syz_union0"}}},
 	}},
-	{Name: "prctl$PR_SET_SECCOMP", CallName: "prctl"},
-	{Name: "seccomp", CallName: "seccomp"},
 	{Name: "serialize0", CallName: "serialize0", Args: []Type{
 		&PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 4}, &StructType{Key: StructKey{Name: "serialize0_struct"}}},
 	}},
@@ -1417,6 +1416,7 @@ var consts_32_fork_shmem = []ConstValue{
 	{"IPPROTO_TCP", 6},
 	{"IPPROTO_UDP", 17},
 	{"ONLY_32BITS_CONST", 1},
+	{Name: "SYS_breaks_returns"},
 	{Name: "SYS_fallback"},
 	{Name: "SYS_foo"},
 	{Name: "SYS_minimize"},
@@ -1439,8 +1439,6 @@ var consts_32_fork_shmem = []ConstValue{
 	{Name: "SYS_mutate_integer2"},
 	{Name: "SYS_mutate_rangedbuffer"},
 	{Name: "SYS_mutate_union"},
-	{Name: "SYS_prctl"},
-	{Name: "SYS_seccomp"},
 	{Name: "SYS_serialize0"},
 	{Name: "SYS_serialize1"},
 	{Name: "SYS_test"},
@@ -1450,4 +1448,4 @@ var consts_32_fork_shmem = []ConstValue{
 	{Name: "SYS_unsupported"},
 }
 
-const revision_32_fork_shmem = "42febc260062ff9c4c73371e46dcc2ade4e32b36"
+const revision_32_fork_shmem = "ab8275b5cfc2a37c9a8ab35108e25a9998325f38"
diff --git a/sys/test/gen/32_shmem.go b/sys/test/gen/32_shmem.go
index 03c356e20..40738ec38 100644
--- a/sys/test/gen/32_shmem.go
+++ b/sys/test/gen/32_shmem.go
@@ -939,6 +939,7 @@ var structDescs_32_shmem = []*KeyedStruct{
 }
 
 var syscalls_32_shmem = []*Syscall{
+	{Name: "breaks_returns", CallName: "breaks_returns", Attrs: SyscallAttrs{BreaksReturns: true}},
 	{Name: "fallback$0", CallName: "fallback", MissingArgs: 1, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}},
 	{Name: "fallback$1", CallName: "fallback", Args: []Type{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "a", TypeSize: 4}},
@@ -1049,8 +1050,6 @@ var syscalls_32_shmem = []*Syscall{
 	{Name: "mutate_union", CallName: "mutate_union", Args: []Type{
 		&PtrType{TypeCommon{TypeName: "ptr", FldName: "p", TypeSize: 4}, &UnionType{Key: StructKey{Name: "syz_union0"}}},
 	}},
-	{Name: "prctl$PR_SET_SECCOMP", CallName: "prctl"},
-	{Name: "seccomp", CallName: "seccomp"},
 	{Name: "serialize0", CallName: "serialize0", Args: []Type{
 		&PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 4}, &StructType{Key: StructKey{Name: "serialize0_struct"}}},
 	}},
@@ -1411,6 +1410,7 @@ var consts_32_shmem = []ConstValue{
 	{"IPPROTO_TCP", 6},
 	{"IPPROTO_UDP", 17},
 	{"ONLY_32BITS_CONST", 1},
+	{Name: "SYS_breaks_returns"},
 	{Name: "SYS_fallback"},
 	{Name: "SYS_foo"},
 	{Name: "SYS_minimize"},
@@ -1433,8 +1433,6 @@ var consts_32_shmem = []ConstValue{
 	{Name: "SYS_mutate_integer2"},
 	{Name: "SYS_mutate_rangedbuffer"},
 	{Name: "SYS_mutate_union"},
-	{Name: "SYS_prctl"},
-	{Name: "SYS_seccomp"},
 	{Name: "SYS_serialize0"},
 	{Name: "SYS_serialize1"},
 	{Name: "SYS_test"},
@@ -1444,4 +1442,4 @@ var consts_32_shmem = []ConstValue{
 	{Name: "SYS_unsupported"},
 }
 
-const revision_32_shmem = "ce7401e2afc658220944c84887758eb703c23b7c"
+const revision_32_shmem = "46c71bcde42c5b69098cfd8d518c66b2b0af8163"
diff --git a/sys/test/gen/64.go b/sys/test/gen/64.go
index 51bfcb0b5..6cff498da 100644
--- a/sys/test/gen/64.go
+++ b/sys/test/gen/64.go
@@ -946,6 +946,7 @@ var structDescs_64 = []*KeyedStruct{
 }
 
 var syscalls_64 = []*Syscall{
+	{Name: "breaks_returns", CallName: "breaks_returns", Attrs: SyscallAttrs{BreaksReturns: true}},
 	{Name: "fallback$0", CallName: "fallback", MissingArgs: 1, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}},
 	{Name: "fallback$1", CallName: "fallback", Args: []Type{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "a", TypeSize: 4}},
@@ -1059,8 +1060,6 @@ var syscalls_64 = []*Syscall{
 	{Name: "mutate_union", CallName: "mutate_union", Args: []Type{
 		&PtrType{TypeCommon{TypeName: "ptr", FldName: "p", TypeSize: 8}, &UnionType{Key: StructKey{Name: "syz_union0"}}},
 	}},
-	{Name: "prctl$PR_SET_SECCOMP", CallName: "prctl"},
-	{Name: "seccomp", CallName: "seccomp"},
 	{Name: "serialize0", CallName: "serialize0", Args: []Type{
 		&PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 8}, &StructType{Key: StructKey{Name: "serialize0_struct"}}},
 	}},
@@ -1421,6 +1420,7 @@ var consts_64 = []ConstValue{
 	{"IPPROTO_ICMPV6", 58},
 	{"IPPROTO_TCP", 6},
 	{"IPPROTO_UDP", 17},
+	{Name: "SYS_breaks_returns"},
 	{Name: "SYS_fallback"},
 	{Name: "SYS_foo"},
 	{Name: "SYS_minimize"},
@@ -1443,8 +1443,6 @@ var consts_64 = []ConstValue{
 	{Name: "SYS_mutate_integer2"},
 	{Name: "SYS_mutate_rangedbuffer"},
 	{Name: "SYS_mutate_union"},
-	{Name: "SYS_prctl"},
-	{Name: "SYS_seccomp"},
 	{Name: "SYS_serialize0"},
 	{Name: "SYS_serialize1"},
 	{Name: "SYS_test"},
@@ -1454,4 +1452,4 @@ var consts_64 = []ConstValue{
 	{Name: "SYS_unsupported"},
 }
 
-const revision_64 = "5ebd7e76e815125be242b5a31d8ab9a335aab451"
+const revision_64 = "d29ff4a36a0307a7520352f7fc08e9cb2184fe67"
diff --git a/sys/test/gen/64_fork.go b/sys/test/gen/64_fork.go
index 8053b1fa4..436bd9f60 100644
--- a/sys/test/gen/64_fork.go
+++ b/sys/test/gen/64_fork.go
@@ -946,6 +946,7 @@ var structDescs_64_fork = []*KeyedStruct{
 }
 
 var syscalls_64_fork = []*Syscall{
+	{Name: "breaks_returns", CallName: "breaks_returns", Attrs: SyscallAttrs{BreaksReturns: true}},
 	{Name: "fallback$0", CallName: "fallback", MissingArgs: 1, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}},
 	{Name: "fallback$1", CallName: "fallback", Args: []Type{
 		&ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "a", TypeSize: 4}},
@@ -1056,8 +1057,6 @@ var syscalls_64_fork = []*Syscall{
 	{Name: "mutate_union", CallName: "mutate_union", Args: []Type{
 		&PtrType{TypeCommon{TypeName: "ptr", FldName: "p", TypeSize: 8}, &UnionType{Key: StructKey{Name: "syz_union0"}}},
 	}},
-	{Name: "prctl$PR_SET_SECCOMP", CallName: "prctl"},
-	{Name: "seccomp", CallName: "seccomp"},
 	{Name: "serialize0", CallName: "serialize0", Args: []Type{
 		&PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 8}, &StructType{Key: StructKey{Name: "serialize0_struct"}}},
 	}},
@@ -1417,6 +1416,7 @@ var consts_64_fork = []ConstValue{
 	{"IPPROTO_ICMPV6", 58},
 	{"IPPROTO_TCP", 6},
 	{"IPPROTO_UDP", 17},
+	{Name: "SYS_breaks_returns"},
 	{Name: "SYS_fallback"},
 	{Name: "SYS_foo"},
 	{Name: "SYS_minimize"},
@@ -1439,8 +1439,6 @@ var consts_64_fork = []ConstValue{
 	{Name: "SYS_mutate_integer2"},
 	{Name: "SYS_mutate_rangedbuffer"},
 	{Name: "SYS_mutate_union"},
-	{Name: "SYS_prctl"},
-	{Name: "SYS_seccomp"},
 	{Name: "SYS_serialize0"},
 	{Name: "SYS_serialize1"},
 	{Name: "SYS_test"},
@@ -1450,4 +1448,4 @@ var consts_64_fork = []ConstValue{
 	{Name: "SYS_unsupported"},
 }
 
-const revision_64_fork = "4c2768ec4faaf99b5ed9e013acab8304244e4262"
+const revision_64_fork = "eb6f5aaad384aba1748935015c3b4d25fb43f0a1"
diff --git a/sys/test/test.txt b/sys/test/test.txt
index 3fe67d905..1fa8406d1 100644
--- a/sys/test/test.txt
+++ b/sys/test/test.txt
@@ -786,8 +786,7 @@ foo$arch_specific_const_as_array_size(a ptr[in, array[int8, ARCH_64_SPECIFIC_CON
 
 fallback$0() fd
 fallback$1(a fd)
-seccomp()
-prctl$PR_SET_SECCOMP()
+breaks_returns() (breaks_returns)
 
 # AUTO