sys: implement fixed-size arrays

4 files changed, 16 insertions, 56 deletions

diff --git a/sys/sctp.txt b/sys/sctp.txt
index 5209e8c69..3bc24f011 100644
--- a/sys/sctp.txt
+++ b/sys/sctp.txt
@@ -170,16 +170,7 @@ sctp_assoc_value {
 
 
 sctp_event_subscribe {
-	ev0	int8
-	ev1	int8
-	ev2	int8
-	ev3	int8
-	ev4	int8
-	ev5	int8
-	ev6	int8
-	ev7	int8
-	ev8	int8
-	ev9	int8
+	ev	array[int8, 10]
 }
 
 sctp_paddrparams {
diff --git a/sys/socket.txt b/sys/socket.txt
index 63ac3c61e..f65bc94cd 100644
--- a/sys/socket.txt
+++ b/sys/socket.txt
@@ -18,8 +18,8 @@ recvmsg(fd fd[sock], msg ptr[in, recv_msghdr], f flags[recv_flags])
 recvmmsg(fd fd[sock], mmsg ptr[in, array[recv_msghdr]], vlen len[mmsg], f flags[recv_flags])
 getsockname(fd fd[sock], addr ptr[out, sockaddr], addrlen ptr[inout, len[addr, int32]])
 getpeername(fd fd[sock], peer ptr[out, sockaddr], peerlen ptr[inout, len[peer, int32]])
-getsockopt(fd fd[sock], level int32, optname int32, optval ptr[out, ioctl_arg], optlen ptr[inout, len[optval, int32]])
-setsockopt(fd fd[sock], level int32, optname int32, optval ptr[in, ioctl_arg], optlen len[optval])
+getsockopt(fd fd[sock], level int32, optname int32, optval buffer[out], optlen ptr[inout, len[optval, int32]])
+setsockopt(fd fd[sock], level int32, optname int32, optval buffer[in], optlen len[optval])
 ioctl$SIOCOUTQ(fd fd[sock], cmd const[SIOCOUTQ], arg ptr[out, int32])
 ioctl$SIOCINQ(fd fd[sock], cmd const[SIOCINQ], arg ptr[out, int32])
 
@@ -360,26 +360,7 @@ sockaddr_nfc_llcp {
 	proto	flags[nfc_proto, int32]
 	dsap	int8
 	ssap	int8
-# TODO: need fixed-length arrays
-# char service_name[63]
-	serv0	int8
-	serv1	int8
-	serv2	int32
-	serv3	int32
-	serv4	int32
-	serv5	int32
-	serv6	int32
-	serv7	int32
-	serv8	int32
-	serv9	int32
-	serv10	int32
-	serv11	int32
-	serv12	int32
-	serv13	int32
-	serv14	int32
-	serv15	int32
-	serv16	int32
-	serv17	int8
+	serv	array[int8, 63]
 	servlen	intptr
 }
 
diff --git a/sys/sys.go b/sys/sys.go
index e1d7c7b96..ea0ac3e25 100644
--- a/sys/sys.go
+++ b/sys/sys.go
@@ -233,7 +233,7 @@ func initCalls() {
 		Calls = append(Calls, &Call{ID: 75, Name: "restart_syscall", CallName: "restart_syscall", Args: []Type{}})
 	}()
 	func() {
-		Calls = append(Calls, &Call{ID: 76, Name: "ioctl", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: ResAny}, IntType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 8}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "ioctl_arg", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "a0", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a1", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a2", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a3", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a4", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a5", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a6", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a7", IsOptional: false}, TypeSize: 8}}}, Dir: DirInOut}}})
+		Calls = append(Calls, &Call{ID: 76, Name: "ioctl", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: ResAny}, IntType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 8}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Dir: DirIn, Type: BufferType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Kind: BufferBlob}}}})
 	}()
 	func() {
 		Calls = append(Calls, &Call{ID: 77, Name: "ioctl$void", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: ResAny}, FlagsType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Vals: []uintptr{21585, 21584, 3221510263, 3221510264}}}})
@@ -383,7 +383,7 @@ func initCalls() {
 		Calls = append(Calls, &Call{ID: 125, Name: "prctl$setmm", CallName: "prctl", Args: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "option", IsOptional: false}, TypeSize: 0, Val: uintptr(35)}, FlagsType{TypeCommon: TypeCommon{TypeName: "option", IsOptional: false}, TypeSize: 0, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, VmaType{TypeCommon: TypeCommon{TypeName: "val", IsOptional: false}}}})
 	}()
 	func() {
-		Calls = append(Calls, &Call{ID: 126, Name: "arch_prctl", CallName: "arch_prctl", Args: []Type{FlagsType{TypeCommon: TypeCommon{TypeName: "code", IsOptional: false}, TypeSize: 0, Vals: []uintptr{4098, 4099, 4097, 4100}}, PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "ioctl_arg", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "a0", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a1", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a2", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a3", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a4", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a5", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a6", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a7", IsOptional: false}, TypeSize: 8}}}, Dir: DirIn}}})
+		Calls = append(Calls, &Call{ID: 126, Name: "arch_prctl", CallName: "arch_prctl", Args: []Type{FlagsType{TypeCommon: TypeCommon{TypeName: "code", IsOptional: false}, TypeSize: 0, Vals: []uintptr{4098, 4099, 4097, 4100}}, PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Dir: DirIn, Type: BufferType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Kind: BufferBlob}}}})
 	}()
 	func() {
 		Calls = append(Calls, &Call{ID: 127, Name: "seccomp", CallName: "seccomp", Args: []Type{FlagsType{TypeCommon: TypeCommon{TypeName: "op", IsOptional: false}, TypeSize: 0, Vals: []uintptr{0, 1}}, FlagsType{TypeCommon: TypeCommon{TypeName: "flags", IsOptional: false}, TypeSize: 0, Vals: []uintptr{0, 1}}, PtrType{TypeCommon: TypeCommon{TypeName: "prog", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sock_fprog", IsOptional: false}, Fields: []Type{LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "filter", TypeSize: 2}, PtrType{TypeCommon: TypeCommon{TypeName: "filter", IsOptional: false}, Type: ArrayType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sock_filter", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "code", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "jt", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "kf", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "k", IsOptional: false}, TypeSize: 4}}}, Len: 0}, Dir: DirIn}}}, Dir: DirIn}}})
@@ -991,10 +991,10 @@ func initCalls() {
 		Calls = append(Calls, &Call{ID: 329, Name: "getpeername", CallName: "getpeername", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSock}, PtrType{TypeCommon: TypeCommon{TypeName: "peer", IsOptional: false}, Type: BufferType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Kind: BufferSockaddr}, Dir: DirOut}, PtrType{TypeCommon: TypeCommon{TypeName: "peerlen", IsOptional: false}, Type: LenType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Buf: "peer", TypeSize: 4}, Dir: DirInOut}}})
 	}()
 	func() {
-		Calls = append(Calls, &Call{ID: 330, Name: "getsockopt", CallName: "getsockopt", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSock}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "optname", IsOptional: false}, TypeSize: 4}, PtrType{TypeCommon: TypeCommon{TypeName: "optval", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "ioctl_arg", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "a0", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a1", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a2", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a3", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a4", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a5", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a6", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a7", IsOptional: false}, TypeSize: 8}}}, Dir: DirOut}, PtrType{TypeCommon: TypeCommon{TypeName: "optlen", IsOptional: false}, Type: LenType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Buf: "optval", TypeSize: 4}, Dir: DirInOut}}})
+		Calls = append(Calls, &Call{ID: 330, Name: "getsockopt", CallName: "getsockopt", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSock}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "optname", IsOptional: false}, TypeSize: 4}, PtrType{TypeCommon: TypeCommon{TypeName: "optval", IsOptional: false}, Dir: DirOut, Type: BufferType{TypeCommon: TypeCommon{TypeName: "optval", IsOptional: false}, Kind: BufferBlob}}, PtrType{TypeCommon: TypeCommon{TypeName: "optlen", IsOptional: false}, Type: LenType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Buf: "optval", TypeSize: 4}, Dir: DirInOut}}})
 	}()
 	func() {
-		Calls = append(Calls, &Call{ID: 331, Name: "setsockopt", CallName: "setsockopt", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSock}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "optname", IsOptional: false}, TypeSize: 4}, PtrType{TypeCommon: TypeCommon{TypeName: "optval", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "ioctl_arg", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "a0", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a1", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a2", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a3", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a4", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a5", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a6", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "a7", IsOptional: false}, TypeSize: 8}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "optlen", IsOptional: false}, Buf: "optval", TypeSize: 0}}})
+		Calls = append(Calls, &Call{ID: 331, Name: "setsockopt", CallName: "setsockopt", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSock}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "optname", IsOptional: false}, TypeSize: 4}, PtrType{TypeCommon: TypeCommon{TypeName: "optval", IsOptional: false}, Dir: DirIn, Type: BufferType{TypeCommon: TypeCommon{TypeName: "optval", IsOptional: false}, Kind: BufferBlob}}, LenType{TypeCommon: TypeCommon{TypeName: "optlen", IsOptional: false}, Buf: "optval", TypeSize: 0}}})
 	}()
 	func() {
 		Calls = append(Calls, &Call{ID: 332, Name: "ioctl$SIOCOUTQ", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSock}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(21521)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 4}, Dir: DirOut}}})
@@ -1204,13 +1204,13 @@ func initCalls() {
 		Calls = append(Calls, &Call{ID: 400, Name: "socket$nfc_llcp", CallName: "socket", Ret: ResourceType{TypeCommon: TypeCommon{TypeName: "ret", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, Args: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "domain", IsOptional: false}, TypeSize: 0, Val: uintptr(39)}, FlagsType{TypeCommon: TypeCommon{TypeName: "type", IsOptional: false}, TypeSize: 0, Vals: []uintptr{1, 2, 3}}, ConstType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 0, Val: uintptr(1)}}})
 	}()
 	func() {
-		Calls = append(Calls, &Call{ID: 401, Name: "bind$nfc_llcp", CallName: "bind", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sockaddr_nfc_llcp", IsOptional: false}, Fields: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "family", IsOptional: false}, TypeSize: 2, Val: uintptr(39)}, IntType{TypeCommon: TypeCommon{TypeName: "devidx", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "target", IsOptional: false}, TypeSize: 4}, FlagsType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 4, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, IntType{TypeCommon: TypeCommon{TypeName: "dsap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ssap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv0", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv1", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv2", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv3", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv4", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv5", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv6", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv7", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv8", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv9", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv10", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv11", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv12", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv13", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv14", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv15", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv16", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv17", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "servlen", IsOptional: false}, TypeSize: 8}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "addrlen", IsOptional: false}, Buf: "addr", TypeSize: 0}}})
+		Calls = append(Calls, &Call{ID: 401, Name: "bind$nfc_llcp", CallName: "bind", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sockaddr_nfc_llcp", IsOptional: false}, Fields: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "family", IsOptional: false}, TypeSize: 2, Val: uintptr(39)}, IntType{TypeCommon: TypeCommon{TypeName: "devidx", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "target", IsOptional: false}, TypeSize: 4}, FlagsType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 4, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, IntType{TypeCommon: TypeCommon{TypeName: "dsap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ssap", IsOptional: false}, TypeSize: 1}, ArrayType{TypeCommon: TypeCommon{TypeName: "serv", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 63}, IntType{TypeCommon: TypeCommon{TypeName: "servlen", IsOptional: false}, TypeSize: 8}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "addrlen", IsOptional: false}, Buf: "addr", TypeSize: 0}}})
 	}()
 	func() {
-		Calls = append(Calls, &Call{ID: 402, Name: "connect$nfc_llcp", CallName: "connect", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sockaddr_nfc_llcp", IsOptional: false}, Fields: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "family", IsOptional: false}, TypeSize: 2, Val: uintptr(39)}, IntType{TypeCommon: TypeCommon{TypeName: "devidx", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "target", IsOptional: false}, TypeSize: 4}, FlagsType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 4, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, IntType{TypeCommon: TypeCommon{TypeName: "dsap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ssap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv0", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv1", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv2", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv3", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv4", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv5", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv6", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv7", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv8", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv9", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv10", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv11", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv12", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv13", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv14", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv15", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv16", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv17", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "servlen", IsOptional: false}, TypeSize: 8}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "addrlen", IsOptional: false}, Buf: "addr", TypeSize: 0}}})
+		Calls = append(Calls, &Call{ID: 402, Name: "connect$nfc_llcp", CallName: "connect", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sockaddr_nfc_llcp", IsOptional: false}, Fields: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "family", IsOptional: false}, TypeSize: 2, Val: uintptr(39)}, IntType{TypeCommon: TypeCommon{TypeName: "devidx", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "target", IsOptional: false}, TypeSize: 4}, FlagsType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 4, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, IntType{TypeCommon: TypeCommon{TypeName: "dsap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ssap", IsOptional: false}, TypeSize: 1}, ArrayType{TypeCommon: TypeCommon{TypeName: "serv", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 63}, IntType{TypeCommon: TypeCommon{TypeName: "servlen", IsOptional: false}, TypeSize: 8}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "addrlen", IsOptional: false}, Buf: "addr", TypeSize: 0}}})
 	}()
 	func() {
-		Calls = append(Calls, &Call{ID: 403, Name: "accept$nfc_llcp", CallName: "accept", Ret: ResourceType{TypeCommon: TypeCommon{TypeName: "ret", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, PtrType{TypeCommon: TypeCommon{TypeName: "peer", IsOptional: true}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sockaddr_nfc_llcp", IsOptional: false}, Fields: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "family", IsOptional: false}, TypeSize: 2, Val: uintptr(39)}, IntType{TypeCommon: TypeCommon{TypeName: "devidx", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "target", IsOptional: false}, TypeSize: 4}, FlagsType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 4, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, IntType{TypeCommon: TypeCommon{TypeName: "dsap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ssap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv0", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv1", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv2", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv3", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv4", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv5", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv6", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv7", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv8", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv9", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv10", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv11", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv12", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv13", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv14", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv15", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv16", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv17", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "servlen", IsOptional: false}, TypeSize: 8}}}, Dir: DirOut}, PtrType{TypeCommon: TypeCommon{TypeName: "peerlen", IsOptional: false}, Type: LenType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Buf: "peer", TypeSize: 4}, Dir: DirInOut}}})
+		Calls = append(Calls, &Call{ID: 403, Name: "accept$nfc_llcp", CallName: "accept", Ret: ResourceType{TypeCommon: TypeCommon{TypeName: "ret", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, PtrType{TypeCommon: TypeCommon{TypeName: "peer", IsOptional: true}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sockaddr_nfc_llcp", IsOptional: false}, Fields: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "family", IsOptional: false}, TypeSize: 2, Val: uintptr(39)}, IntType{TypeCommon: TypeCommon{TypeName: "devidx", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "target", IsOptional: false}, TypeSize: 4}, FlagsType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 4, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, IntType{TypeCommon: TypeCommon{TypeName: "dsap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ssap", IsOptional: false}, TypeSize: 1}, ArrayType{TypeCommon: TypeCommon{TypeName: "serv", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 63}, IntType{TypeCommon: TypeCommon{TypeName: "servlen", IsOptional: false}, TypeSize: 8}}}, Dir: DirOut}, PtrType{TypeCommon: TypeCommon{TypeName: "peerlen", IsOptional: false}, Type: LenType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Buf: "peer", TypeSize: 4}, Dir: DirInOut}}})
 	}()
 	func() {
 		Calls = append(Calls, &Call{ID: 404, Name: "setsockopt$NFC_LLCP_RW", CallName: "setsockopt", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, ConstType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 0, Val: uintptr(280)}, ConstType{TypeCommon: TypeCommon{TypeName: "opt", IsOptional: false}, TypeSize: 0, Val: uintptr(0)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 4}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "arglen", IsOptional: false}, Buf: "arg", TypeSize: 0}}})
@@ -1222,10 +1222,10 @@ func initCalls() {
 		Calls = append(Calls, &Call{ID: 406, Name: "getsockopt$nfc_llcp", CallName: "getsockopt", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, ConstType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 0, Val: uintptr(280)}, FlagsType{TypeCommon: TypeCommon{TypeName: "opt", IsOptional: false}, TypeSize: 0, Vals: []uintptr{0, 1, 2, 3, 4}}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Dir: DirOut, Type: BufferType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Kind: BufferBlob}}, LenType{TypeCommon: TypeCommon{TypeName: "arglen", IsOptional: false}, Buf: "arg", TypeSize: 0}}})
 	}()
 	func() {
-		Calls = append(Calls, &Call{ID: 407, Name: "sendmsg$nfc_llcp", CallName: "sendmsg", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, PtrType{TypeCommon: TypeCommon{TypeName: "msg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "nfc_llcp_send_msghdr", IsOptional: false}, Fields: []Type{PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sockaddr_nfc_llcp", IsOptional: false}, Fields: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "family", IsOptional: false}, TypeSize: 2, Val: uintptr(39)}, IntType{TypeCommon: TypeCommon{TypeName: "devidx", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "target", IsOptional: false}, TypeSize: 4}, FlagsType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 4, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, IntType{TypeCommon: TypeCommon{TypeName: "dsap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ssap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv0", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv1", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv2", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv3", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv4", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv5", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv6", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv7", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv8", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv9", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv10", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv11", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv12", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv13", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv14", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv15", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv16", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv17", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "servlen", IsOptional: false}, TypeSize: 8}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "addrlen", IsOptional: false}, Buf: "addr", TypeSize: 4}, PtrType{TypeCommon: TypeCommon{TypeName: "vec", IsOptional: false}, Type: ArrayType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "iovec_in", IsOptional: false}, Fields: []Type{PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Dir: DirIn, Type: BufferType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Kind: BufferBlob}}, LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "addr", TypeSize: 8}}}, Len: 0}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "vlen", IsOptional: false}, Buf: "vec", TypeSize: 8}, PtrType{TypeCommon: TypeCommon{TypeName: "ctrl", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "cmsghdr", IsOptional: false}, Fields: []Type{LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "parent", TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "type", IsOptional: false}, TypeSize: 4}, ArrayType{TypeCommon: TypeCommon{TypeName: "data", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 0}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "ctrllen", IsOptional: false}, Buf: "ctrl", TypeSize: 8}, FlagsType{TypeCommon: TypeCommon{TypeName: "f", IsOptional: false}, TypeSize: 4, Vals: []uintptr{2048, 4, 64, 128, 32768, 16384, 1}}}}, Dir: DirIn}, FlagsType{TypeCommon: TypeCommon{TypeName: "f", IsOptional: false}, TypeSize: 0, Vals: []uintptr{2048, 4, 64, 128, 32768, 16384, 1}}}})
+		Calls = append(Calls, &Call{ID: 407, Name: "sendmsg$nfc_llcp", CallName: "sendmsg", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, PtrType{TypeCommon: TypeCommon{TypeName: "msg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "nfc_llcp_send_msghdr", IsOptional: false}, Fields: []Type{PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sockaddr_nfc_llcp", IsOptional: false}, Fields: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "family", IsOptional: false}, TypeSize: 2, Val: uintptr(39)}, IntType{TypeCommon: TypeCommon{TypeName: "devidx", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "target", IsOptional: false}, TypeSize: 4}, FlagsType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 4, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, IntType{TypeCommon: TypeCommon{TypeName: "dsap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ssap", IsOptional: false}, TypeSize: 1}, ArrayType{TypeCommon: TypeCommon{TypeName: "serv", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 63}, IntType{TypeCommon: TypeCommon{TypeName: "servlen", IsOptional: false}, TypeSize: 8}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "addrlen", IsOptional: false}, Buf: "addr", TypeSize: 4}, PtrType{TypeCommon: TypeCommon{TypeName: "vec", IsOptional: false}, Type: ArrayType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "iovec_in", IsOptional: false}, Fields: []Type{PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Dir: DirIn, Type: BufferType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Kind: BufferBlob}}, LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "addr", TypeSize: 8}}}, Len: 0}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "vlen", IsOptional: false}, Buf: "vec", TypeSize: 8}, PtrType{TypeCommon: TypeCommon{TypeName: "ctrl", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "cmsghdr", IsOptional: false}, Fields: []Type{LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "parent", TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "type", IsOptional: false}, TypeSize: 4}, ArrayType{TypeCommon: TypeCommon{TypeName: "data", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 0}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "ctrllen", IsOptional: false}, Buf: "ctrl", TypeSize: 8}, FlagsType{TypeCommon: TypeCommon{TypeName: "f", IsOptional: false}, TypeSize: 4, Vals: []uintptr{2048, 4, 64, 128, 32768, 16384, 1}}}}, Dir: DirIn}, FlagsType{TypeCommon: TypeCommon{TypeName: "f", IsOptional: false}, TypeSize: 0, Vals: []uintptr{2048, 4, 64, 128, 32768, 16384, 1}}}})
 	}()
 	func() {
-		Calls = append(Calls, &Call{ID: 408, Name: "sendmmsg$nfc_llcp", CallName: "sendmmsg", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, PtrType{TypeCommon: TypeCommon{TypeName: "mmsg", IsOptional: false}, Type: ArrayType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "nfc_llcp_send_msghdr", IsOptional: false}, Fields: []Type{PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sockaddr_nfc_llcp", IsOptional: false}, Fields: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "family", IsOptional: false}, TypeSize: 2, Val: uintptr(39)}, IntType{TypeCommon: TypeCommon{TypeName: "devidx", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "target", IsOptional: false}, TypeSize: 4}, FlagsType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 4, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, IntType{TypeCommon: TypeCommon{TypeName: "dsap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ssap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv0", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv1", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "serv2", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv3", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv4", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv5", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv6", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv7", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv8", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv9", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv10", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv11", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv12", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv13", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv14", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv15", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv16", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "serv17", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "servlen", IsOptional: false}, TypeSize: 8}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "addrlen", IsOptional: false}, Buf: "addr", TypeSize: 4}, PtrType{TypeCommon: TypeCommon{TypeName: "vec", IsOptional: false}, Type: ArrayType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "iovec_in", IsOptional: false}, Fields: []Type{PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Dir: DirIn, Type: BufferType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Kind: BufferBlob}}, LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "addr", TypeSize: 8}}}, Len: 0}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "vlen", IsOptional: false}, Buf: "vec", TypeSize: 8}, PtrType{TypeCommon: TypeCommon{TypeName: "ctrl", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "cmsghdr", IsOptional: false}, Fields: []Type{LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "parent", TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "type", IsOptional: false}, TypeSize: 4}, ArrayType{TypeCommon: TypeCommon{TypeName: "data", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 0}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "ctrllen", IsOptional: false}, Buf: "ctrl", TypeSize: 8}, FlagsType{TypeCommon: TypeCommon{TypeName: "f", IsOptional: false}, TypeSize: 4, Vals: []uintptr{2048, 4, 64, 128, 32768, 16384, 1}}}}, Len: 0}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "vlen", IsOptional: false}, Buf: "mmsg", TypeSize: 0}, FlagsType{TypeCommon: TypeCommon{TypeName: "f", IsOptional: false}, TypeSize: 0, Vals: []uintptr{2048, 4, 64, 128, 32768, 16384, 1}}}})
+		Calls = append(Calls, &Call{ID: 408, Name: "sendmmsg$nfc_llcp", CallName: "sendmmsg", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdNfcLlcp}, PtrType{TypeCommon: TypeCommon{TypeName: "mmsg", IsOptional: false}, Type: ArrayType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "nfc_llcp_send_msghdr", IsOptional: false}, Fields: []Type{PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sockaddr_nfc_llcp", IsOptional: false}, Fields: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "family", IsOptional: false}, TypeSize: 2, Val: uintptr(39)}, IntType{TypeCommon: TypeCommon{TypeName: "devidx", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "target", IsOptional: false}, TypeSize: 4}, FlagsType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 4, Vals: []uintptr{1, 2, 3, 4, 5, 6, 7}}, IntType{TypeCommon: TypeCommon{TypeName: "dsap", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ssap", IsOptional: false}, TypeSize: 1}, ArrayType{TypeCommon: TypeCommon{TypeName: "serv", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 63}, IntType{TypeCommon: TypeCommon{TypeName: "servlen", IsOptional: false}, TypeSize: 8}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "addrlen", IsOptional: false}, Buf: "addr", TypeSize: 4}, PtrType{TypeCommon: TypeCommon{TypeName: "vec", IsOptional: false}, Type: ArrayType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "iovec_in", IsOptional: false}, Fields: []Type{PtrType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Dir: DirIn, Type: BufferType{TypeCommon: TypeCommon{TypeName: "addr", IsOptional: false}, Kind: BufferBlob}}, LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "addr", TypeSize: 8}}}, Len: 0}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "vlen", IsOptional: false}, Buf: "vec", TypeSize: 8}, PtrType{TypeCommon: TypeCommon{TypeName: "ctrl", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "cmsghdr", IsOptional: false}, Fields: []Type{LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "parent", TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "type", IsOptional: false}, TypeSize: 4}, ArrayType{TypeCommon: TypeCommon{TypeName: "data", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 0}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "ctrllen", IsOptional: false}, Buf: "ctrl", TypeSize: 8}, FlagsType{TypeCommon: TypeCommon{TypeName: "f", IsOptional: false}, TypeSize: 4, Vals: []uintptr{2048, 4, 64, 128, 32768, 16384, 1}}}}, Len: 0}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "vlen", IsOptional: false}, Buf: "mmsg", TypeSize: 0}, FlagsType{TypeCommon: TypeCommon{TypeName: "f", IsOptional: false}, TypeSize: 0, Vals: []uintptr{2048, 4, 64, 128, 32768, 16384, 1}}}})
 	}()
 	func() {
 		Calls = append(Calls, &Call{ID: 409, Name: "socket$nfc_raw", CallName: "socket", Ret: ResourceType{TypeCommon: TypeCommon{TypeName: "ret", IsOptional: false}, Kind: ResFD, Subkind: FdNfcRaw}, Args: []Type{ConstType{TypeCommon: TypeCommon{TypeName: "domain", IsOptional: false}, TypeSize: 0, Val: uintptr(39)}, FlagsType{TypeCommon: TypeCommon{TypeName: "type", IsOptional: false}, TypeSize: 0, Vals: []uintptr{1, 3}}, ConstType{TypeCommon: TypeCommon{TypeName: "proto", IsOptional: false}, TypeSize: 0, Val: uintptr(0)}}})
@@ -2014,7 +2014,7 @@ func initCalls() {
 		Calls = append(Calls, &Call{ID: 670, Name: "setsockopt$SCTP_DISABLE_FRAGMENTS", CallName: "setsockopt", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSctp}, ConstType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 0, Val: uintptr(132)}, ConstType{TypeCommon: TypeCommon{TypeName: "opt", IsOptional: false}, TypeSize: 0, Val: uintptr(8)}, PtrType{TypeCommon: TypeCommon{TypeName: "val", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 4}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "val", TypeSize: 0}}})
 	}()
 	func() {
-		Calls = append(Calls, &Call{ID: 671, Name: "setsockopt$SCTP_EVENTS", CallName: "setsockopt", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSctp}, ConstType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 0, Val: uintptr(132)}, ConstType{TypeCommon: TypeCommon{TypeName: "opt", IsOptional: false}, TypeSize: 0, Val: uintptr(11)}, PtrType{TypeCommon: TypeCommon{TypeName: "val", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sctp_event_subscribe", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "ev0", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ev1", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ev2", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ev3", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ev4", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ev5", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ev6", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ev7", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ev8", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "ev9", IsOptional: false}, TypeSize: 1}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "val", TypeSize: 0}}})
+		Calls = append(Calls, &Call{ID: 671, Name: "setsockopt$SCTP_EVENTS", CallName: "setsockopt", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSctp}, ConstType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 0, Val: uintptr(132)}, ConstType{TypeCommon: TypeCommon{TypeName: "opt", IsOptional: false}, TypeSize: 0, Val: uintptr(11)}, PtrType{TypeCommon: TypeCommon{TypeName: "val", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "sctp_event_subscribe", IsOptional: false}, Fields: []Type{ArrayType{TypeCommon: TypeCommon{TypeName: "ev", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 10}}}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "val", TypeSize: 0}}})
 	}()
 	func() {
 		Calls = append(Calls, &Call{ID: 672, Name: "setsockopt$SCTP_AUTOCLOSE", CallName: "setsockopt", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSctp}, ConstType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 0, Val: uintptr(132)}, ConstType{TypeCommon: TypeCommon{TypeName: "opt", IsOptional: false}, TypeSize: 0, Val: uintptr(4)}, PtrType{TypeCommon: TypeCommon{TypeName: "val", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 4}, Dir: DirIn}, LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "val", TypeSize: 0}}})
diff --git a/sys/sys.txt b/sys/sys.txt
index acf97dd71..6436f61da 100644
--- a/sys/sys.txt
+++ b/sys/sys.txt
@@ -187,7 +187,7 @@ get_robust_list(pid pid, head ptr[in, ptr[out, robust_list]], len ptr[inout, len
 restart_syscall()
 
 # Almighty!
-ioctl(fd fd, cmd intptr, arg ptr[inout, ioctl_arg])
+ioctl(fd fd, cmd intptr, arg buffer[in])
 
 ioctl$void(fd fd, cmd flags[ioctl_void])
 ioctl$int_in(fd fd, cmd flags[ioctl_int_in], v ptr[in, int64])
@@ -245,7 +245,7 @@ prctl$setptracer(option const[PR_SET_PTRACER], pid pid)
 prctl$seccomp(option const[PR_SET_SECCOMP], mode flags[prctl_seccomp_mode], prog ptr[in, sock_fprog])
 prctl$setmm(option const[PR_SET_MM], option flags[prctl_mm_option], val vma)
 
-arch_prctl(code flags[arch_prctl_code], addr ptr[in, ioctl_arg])
+arch_prctl(code flags[arch_prctl_code], addr buffer[in])
 seccomp(op flags[seccomp_op], flags flags[seccomp_flags], prog ptr[in, sock_fprog])
 
 mq_open(name string, flags flags[mq_open_flags], mode flags[open_mode], attr ptr[in, mq_attr]) fd[mq]
@@ -463,18 +463,6 @@ membarrier(cmd const[1], flags const[0])
 
 
 
-# TODO: need something better
-ioctl_arg {
-	a0	intptr
-	a1	intptr
-	a2	intptr
-	a3	intptr
-	a4	intptr
-	a5	intptr
-	a6	intptr
-	a7	intptr
-}
-
 pipefd {
 	rfd	fd
 	wfd	fd