aboutsummaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2017-09-04 19:53:03 +0200
committerDmitry Vyukov <dvyukov@google.com>2017-09-04 20:25:22 +0200
commitd878c4ff43fe76b2c85851a627a4bcf51da51f41 (patch)
treed5636fb74833f238984a3d0c9e2cfdf78ea5924d /sys
parentb5c52176235863a60c343e60d63421e9872b4810 (diff)
sys: minor fixes for statx and sigevent
Diffstat (limited to 'sys')
-rw-r--r--sys/sys.txt6
-rw-r--r--sys/sys_386.go6
-rw-r--r--sys/sys_amd64.go6
-rw-r--r--sys/sys_arm.go6
-rw-r--r--sys/sys_arm64.go6
-rw-r--r--sys/sys_ppc64le.go6
6 files changed, 18 insertions, 18 deletions
diff --git a/sys/sys.txt b/sys/sys.txt
index fed6e6aab..9c67cdc45 100644
--- a/sys/sys.txt
+++ b/sys/sys.txt
@@ -87,7 +87,7 @@ vmsplice(fd fd, vec ptr[in, array[iovec_in]], vlen len[vec], f flags[splice_flag
sendfile(fdout fd, fdin fd, off ptr[inout, fileoff[int64], opt], count int64)
stat(file ptr[in, filename], statbuf ptr[out, stat])
-statx(dfd int64, file ptr[in, filename], flags flags[statx_flags], mask flags[statx_mask], statxbuf ptr[out, statx])
+statx(fd fd_dir, file ptr[in, filename], flags flags[statx_flags], mask flags[statx_mask], statxbuf ptr[out, statx])
lstat(file ptr[in, filename], statbuf ptr[out, stat])
fstat(fd fd, statbuf ptr[out, stat])
@@ -625,14 +625,14 @@ iocb {
}
sigevent {
- val intptr
+ val const[0, intptr]
signo signalno
notify flags[sigev_notify, int32]
u sigevent_u
+ pad array[const[0, int64], 8]
}
sigevent_u [
- pad array[int64, 8]
tid pid
thr sigevent_thread
]
diff --git a/sys/sys_386.go b/sys/sys_386.go
index 61d65f2c1..0bb09cf16 100644
--- a/sys/sys_386.go
+++ b/sys/sys_386.go
@@ -3854,17 +3854,17 @@ var structFields = []*StructFields{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "restor", ArgDir: 1}, TypeSize: 4}},
}},
{Key: StructKey{Name: "sigevent"}, Fields: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "val"}, TypeSize: 4}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "val"}, TypeSize: 4}},
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "signalno", FldName: "signo"}, TypeSize: 4}, Kind: 1},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "sigev_notify", FldName: "notify"}, TypeSize: 4}, Vals: []uint64{1, 0, 2, 4}},
&UnionType{TypeCommon: TypeCommon{TypeName: "sigevent_u", FldName: "u"}},
+ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad"}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const"}, TypeSize: 8}}, Kind: 1, RangeBegin: 8, RangeEnd: 8},
}},
{Key: StructKey{Name: "sigevent_thread"}, Fields: []Type{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "func"}, TypeSize: 4, Type: &BufferType{}},
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "attr"}, TypeSize: 4, Type: &BufferType{}},
}},
{Key: StructKey{Name: "sigevent_u"}, Fields: []Type{
- &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad"}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64"}, TypeSize: 8}}, Kind: 1, RangeBegin: 8, RangeEnd: 8},
&ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "tid"}},
&StructType{TypeCommon: TypeCommon{TypeName: "sigevent_thread", FldName: "thr"}},
}},
@@ -13377,7 +13377,7 @@ var Calls = []*Call{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "buf"}, TypeSize: 4, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1}}},
}},
{NR: 383, Name: "statx", CallName: "statx", Args: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "dfd"}, TypeSize: 8}},
+ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_dir", FldName: "fd"}},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "file"}, TypeSize: 4, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "filename"}, Kind: 3}},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "statx_flags", FldName: "flags"}, TypeSize: 4}, Vals: []uint64{256, 1024, 2048, 4096, 24576, 0, 8192, 16384}},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "statx_mask", FldName: "mask"}, TypeSize: 4}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2047, 2048, 4095}},
diff --git a/sys/sys_amd64.go b/sys/sys_amd64.go
index 5a0403a84..a497b3efb 100644
--- a/sys/sys_amd64.go
+++ b/sys/sys_amd64.go
@@ -3854,17 +3854,17 @@ var structFields = []*StructFields{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "restor", ArgDir: 1}, TypeSize: 8}},
}},
{Key: StructKey{Name: "sigevent"}, Fields: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "val"}, TypeSize: 8}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "val"}, TypeSize: 8}},
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "signalno", FldName: "signo"}, TypeSize: 4}, Kind: 1},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "sigev_notify", FldName: "notify"}, TypeSize: 4}, Vals: []uint64{1, 0, 2, 4}},
&UnionType{TypeCommon: TypeCommon{TypeName: "sigevent_u", FldName: "u"}},
+ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad"}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const"}, TypeSize: 8}}, Kind: 1, RangeBegin: 8, RangeEnd: 8},
}},
{Key: StructKey{Name: "sigevent_thread"}, Fields: []Type{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "func"}, TypeSize: 8, Type: &BufferType{}},
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "attr"}, TypeSize: 8, Type: &BufferType{}},
}},
{Key: StructKey{Name: "sigevent_u"}, Fields: []Type{
- &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad"}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64"}, TypeSize: 8}}, Kind: 1, RangeBegin: 8, RangeEnd: 8},
&ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "tid"}},
&StructType{TypeCommon: TypeCommon{TypeName: "sigevent_thread", FldName: "thr"}},
}},
@@ -13377,7 +13377,7 @@ var Calls = []*Call{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "buf"}, TypeSize: 8, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1}}},
}},
{NR: 332, Name: "statx", CallName: "statx", Args: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "dfd"}, TypeSize: 8}},
+ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_dir", FldName: "fd"}},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "file"}, TypeSize: 8, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "filename"}, Kind: 3}},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "statx_flags", FldName: "flags"}, TypeSize: 8}, Vals: []uint64{256, 1024, 2048, 4096, 24576, 0, 8192, 16384}},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "statx_mask", FldName: "mask"}, TypeSize: 8}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2047, 2048, 4095}},
diff --git a/sys/sys_arm.go b/sys/sys_arm.go
index b46740a5f..745563d9b 100644
--- a/sys/sys_arm.go
+++ b/sys/sys_arm.go
@@ -3854,17 +3854,17 @@ var structFields = []*StructFields{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "restor", ArgDir: 1}, TypeSize: 4}},
}},
{Key: StructKey{Name: "sigevent"}, Fields: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "val"}, TypeSize: 4}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "val"}, TypeSize: 4}},
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "signalno", FldName: "signo"}, TypeSize: 4}, Kind: 1},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "sigev_notify", FldName: "notify"}, TypeSize: 4}, Vals: []uint64{1, 0, 2, 4}},
&UnionType{TypeCommon: TypeCommon{TypeName: "sigevent_u", FldName: "u"}},
+ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad"}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const"}, TypeSize: 8}}, Kind: 1, RangeBegin: 8, RangeEnd: 8},
}},
{Key: StructKey{Name: "sigevent_thread"}, Fields: []Type{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "func"}, TypeSize: 4, Type: &BufferType{}},
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "attr"}, TypeSize: 4, Type: &BufferType{}},
}},
{Key: StructKey{Name: "sigevent_u"}, Fields: []Type{
- &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad"}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64"}, TypeSize: 8}}, Kind: 1, RangeBegin: 8, RangeEnd: 8},
&ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "tid"}},
&StructType{TypeCommon: TypeCommon{TypeName: "sigevent_thread", FldName: "thr"}},
}},
@@ -13377,7 +13377,7 @@ var Calls = []*Call{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "buf"}, TypeSize: 4, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1}}},
}},
{NR: 9437581, Name: "statx", CallName: "statx", Args: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "dfd"}, TypeSize: 8}},
+ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_dir", FldName: "fd"}},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "file"}, TypeSize: 4, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "filename"}, Kind: 3}},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "statx_flags", FldName: "flags"}, TypeSize: 4}, Vals: []uint64{256, 1024, 2048, 4096, 24576, 0, 8192, 16384}},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "statx_mask", FldName: "mask"}, TypeSize: 4}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2047, 2048, 4095}},
diff --git a/sys/sys_arm64.go b/sys/sys_arm64.go
index 35f037ae0..940503ac5 100644
--- a/sys/sys_arm64.go
+++ b/sys/sys_arm64.go
@@ -3854,17 +3854,17 @@ var structFields = []*StructFields{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "restor", ArgDir: 1}, TypeSize: 8}},
}},
{Key: StructKey{Name: "sigevent"}, Fields: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "val"}, TypeSize: 8}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "val"}, TypeSize: 8}},
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "signalno", FldName: "signo"}, TypeSize: 4}, Kind: 1},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "sigev_notify", FldName: "notify"}, TypeSize: 4}, Vals: []uint64{1, 0, 2, 4}},
&UnionType{TypeCommon: TypeCommon{TypeName: "sigevent_u", FldName: "u"}},
+ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad"}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const"}, TypeSize: 8}}, Kind: 1, RangeBegin: 8, RangeEnd: 8},
}},
{Key: StructKey{Name: "sigevent_thread"}, Fields: []Type{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "func"}, TypeSize: 8, Type: &BufferType{}},
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "attr"}, TypeSize: 8, Type: &BufferType{}},
}},
{Key: StructKey{Name: "sigevent_u"}, Fields: []Type{
- &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad"}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64"}, TypeSize: 8}}, Kind: 1, RangeBegin: 8, RangeEnd: 8},
&ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "tid"}},
&StructType{TypeCommon: TypeCommon{TypeName: "sigevent_thread", FldName: "thr"}},
}},
@@ -13377,7 +13377,7 @@ var Calls = []*Call{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "buf"}, TypeSize: 8, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1}}},
}},
{NR: 291, Name: "statx", CallName: "statx", Args: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "dfd"}, TypeSize: 8}},
+ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_dir", FldName: "fd"}},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "file"}, TypeSize: 8, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "filename"}, Kind: 3}},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "statx_flags", FldName: "flags"}, TypeSize: 8}, Vals: []uint64{256, 1024, 2048, 4096, 24576, 0, 8192, 16384}},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "statx_mask", FldName: "mask"}, TypeSize: 8}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2047, 2048, 4095}},
diff --git a/sys/sys_ppc64le.go b/sys/sys_ppc64le.go
index c99c07297..a38decf42 100644
--- a/sys/sys_ppc64le.go
+++ b/sys/sys_ppc64le.go
@@ -3854,17 +3854,17 @@ var structFields = []*StructFields{
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "restor", ArgDir: 1}, TypeSize: 8}},
}},
{Key: StructKey{Name: "sigevent"}, Fields: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "val"}, TypeSize: 8}},
+ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "val"}, TypeSize: 8}},
&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "signalno", FldName: "signo"}, TypeSize: 4}, Kind: 1},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "sigev_notify", FldName: "notify"}, TypeSize: 4}, Vals: []uint64{1, 0, 2, 4}},
&UnionType{TypeCommon: TypeCommon{TypeName: "sigevent_u", FldName: "u"}},
+ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad"}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const"}, TypeSize: 8}}, Kind: 1, RangeBegin: 8, RangeEnd: 8},
}},
{Key: StructKey{Name: "sigevent_thread"}, Fields: []Type{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "func"}, TypeSize: 8, Type: &BufferType{}},
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "attr"}, TypeSize: 8, Type: &BufferType{}},
}},
{Key: StructKey{Name: "sigevent_u"}, Fields: []Type{
- &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "pad"}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64"}, TypeSize: 8}}, Kind: 1, RangeBegin: 8, RangeEnd: 8},
&ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "tid"}},
&StructType{TypeCommon: TypeCommon{TypeName: "sigevent_thread", FldName: "thr"}},
}},
@@ -13377,7 +13377,7 @@ var Calls = []*Call{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "buf"}, TypeSize: 8, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1}}},
}},
{NR: 383, Name: "statx", CallName: "statx", Args: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "dfd"}, TypeSize: 8}},
+ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_dir", FldName: "fd"}},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "file"}, TypeSize: 8, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "filename"}, Kind: 3}},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "statx_flags", FldName: "flags"}, TypeSize: 8}, Vals: []uint64{256, 1024, 2048, 4096, 24576, 0, 8192, 16384}},
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "statx_mask", FldName: "mask"}, TypeSize: 8}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2047, 2048, 4095}},