aboutsummaryrefslogtreecommitdiffstats
path: root/sys/fuchsia
diff options
context:
space:
mode:
authorMarco Vanotti <mvanotti@users.noreply.github.com>2019-07-16 17:09:43 -0700
committerGitHub <noreply@github.com>2019-07-16 17:09:43 -0700
commit0d10349cf0b4a9f98490378709bd9a83bd0042d6 (patch)
tree13d71c3bddfc1af2f8fb837463430ebd7539509d /sys/fuchsia
parent4ec4ea48904fe8b1ddfe85e84ea117b9dfdc90f2 (diff)
sys/fuchsia: update zx_clock_get syscall (#1292)
* sys/fuchsia: update zx_clock_get. zx_clock_get was deprecated and replaced by zx_clock_get_new. In a recent CL[0], they replaced the zx_clock_get by zx_clock_get_new and moved all client. This commit updates syzkaller to use the new function. [0]: https://fuchsia-review.googlesource.com/c/fuchsia/+/298575 * run make extract && make generate
Diffstat (limited to 'sys/fuchsia')
-rw-r--r--sys/fuchsia/gen/amd64.go7
-rw-r--r--sys/fuchsia/gen/arm64.go7
-rw-r--r--sys/fuchsia/time.txt3
3 files changed, 5 insertions, 12 deletions
diff --git a/sys/fuchsia/gen/amd64.go b/sys/fuchsia/gen/amd64.go
index 3e1c518a5..c9d3b8b5d 100644
--- a/sys/fuchsia/gen/amd64.go
+++ b/sys/fuchsia/gen/amd64.go
@@ -6944,12 +6944,9 @@ var syscalls_amd64 = []*Syscall{
}},
{Name: "zx_clock_get", CallName: "zx_clock_get", Args: []Type{
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "clock_id", FldName: "clock_id", TypeSize: 8}}, Vals: []uint64{0, 1, 2}, BitMask: true},
- }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_time", FldName: "ret", TypeSize: 8, ArgDir: 1}}},
- {Name: "zx_clock_get_monotonic", CallName: "zx_clock_get_monotonic"},
- {Name: "zx_clock_get_new", CallName: "zx_clock_get_new", Args: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "clock_id", TypeSize: 4}}},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "zx_time", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", TypeSize: 8, ArgDir: 1}}}},
}},
+ {Name: "zx_clock_get_monotonic", CallName: "zx_clock_get_monotonic"},
{Name: "zx_cprng_add_entropy", CallName: "zx_cprng_add_entropy", Args: []Type{
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "buffer", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}},
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 8}}, Path: []string{"buffer"}},
@@ -7797,4 +7794,4 @@ var consts_amd64 = []ConstValue{
{Name: "fuchsia_power_Status_OK"},
}
-const revision_amd64 = "10ad2411f1db75aaa4971061b5f008e17d8dd923"
+const revision_amd64 = "0831ecb34bc4bfd3c444366782fdbd3fafe56026"
diff --git a/sys/fuchsia/gen/arm64.go b/sys/fuchsia/gen/arm64.go
index a8593726b..33e7c9cae 100644
--- a/sys/fuchsia/gen/arm64.go
+++ b/sys/fuchsia/gen/arm64.go
@@ -6944,12 +6944,9 @@ var syscalls_arm64 = []*Syscall{
}},
{Name: "zx_clock_get", CallName: "zx_clock_get", Args: []Type{
&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "clock_id", FldName: "clock_id", TypeSize: 8}}, Vals: []uint64{0, 1, 2}, BitMask: true},
- }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_time", FldName: "ret", TypeSize: 8, ArgDir: 1}}},
- {Name: "zx_clock_get_monotonic", CallName: "zx_clock_get_monotonic"},
- {Name: "zx_clock_get_new", CallName: "zx_clock_get_new", Args: []Type{
- &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "clock_id", TypeSize: 4}}},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "zx_time", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", TypeSize: 8, ArgDir: 1}}}},
}},
+ {Name: "zx_clock_get_monotonic", CallName: "zx_clock_get_monotonic"},
{Name: "zx_cprng_add_entropy", CallName: "zx_cprng_add_entropy", Args: []Type{
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "buffer", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}},
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 8}}, Path: []string{"buffer"}},
@@ -7797,4 +7794,4 @@ var consts_arm64 = []ConstValue{
{Name: "fuchsia_power_Status_OK"},
}
-const revision_arm64 = "8513a6093b2306314106c924eee6cb5263d85436"
+const revision_arm64 = "b643855d1cb7438abcacb87d29a4dfdd49961397"
diff --git a/sys/fuchsia/time.txt b/sys/fuchsia/time.txt
index a94ed0b21..d0372c71e 100644
--- a/sys/fuchsia/time.txt
+++ b/sys/fuchsia/time.txt
@@ -6,8 +6,7 @@ include <zircon/syscalls.h>
resource zx_time[int64]: 0, ZX_TIME_INFINITE
zx_nanosleep(deadline zx_time)
-zx_clock_get(clock_id flags[clock_id]) zx_time
-zx_clock_get_new(clock_id int32, zx_time ptr[out, intptr])
+zx_clock_get(clock_id flags[clock_id], zx_time ptr[out, intptr])
zx_clock_get_monotonic()
zx_ticks_get()
zx_ticks_per_second()