sys/fuchsia: updated object syscalls definitions

3 files changed, 54 insertions, 30 deletions

diff --git a/sys/fuchsia/object.txt b/sys/fuchsia/object.txt
index 0c00c3ba8..526374bd6 100644
--- a/sys/fuchsia/object.txt
+++ b/sys/fuchsia/object.txt
@@ -12,6 +12,7 @@ include <zircon/syscalls/profile.h>
 resource koid[int64]: 0
 
 zx_object_get_child(handle zx_handle, koid koid, rights flags[zx_rights], out ptr[out, zx_handle])
+
 zx_object_get_info$ZX_INFO_HANDLE_VALID(handle zx_handle, topic const[ZX_INFO_HANDLE_VALID], buffer const[0], buffer_size const[0], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_HANDLE_BASIC(handle zx_handle, topic const[ZX_INFO_HANDLE_BASIC], buffer ptr[out, zx_info_handle_basic], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_HANDLE_TABLE(handle zx_handle, topic const[ZX_INFO_HANDLE_TABLE], buffer ptr[out, zx_info_handle_extended], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
@@ -20,13 +21,13 @@ zx_object_get_info$ZX_INFO_PROCESS_HANDLE_STATS(handle zx_process, topic const[Z
 zx_object_get_info$ZX_INFO_JOB(handle zx_process, topic const[ZX_INFO_JOB], buffer ptr[out, zx_info_job], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_PROCESS(handle zx_process, topic const[ZX_INFO_PROCESS], buffer ptr[out, zx_info_process], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_PROCESS_THREADS(handle zx_process, topic const[ZX_INFO_PROCESS_THREADS], buffer ptr[out, array[koid]], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
-zx_object_get_info$ZX_INFO_THREAD(handle zx_process, topic const[ZX_INFO_THREAD], buffer ptr[out, zx_info_thread], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
+zx_object_get_info$ZX_INFO_THREAD(handle zx_thread, topic const[ZX_INFO_THREAD], buffer ptr[out, zx_info_thread], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_THREAD_EXCEPTION_REPORT(handle zx_thread, topic const[ZX_INFO_THREAD_EXCEPTION_REPORT], buffer ptr[out, zx_exception_report], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_THREAD_STATS(handle zx_thread, topic const[ZX_INFO_THREAD_STATS], buffer ptr[out, zx_info_thread_stats], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_CPU_STATS(root_resource zx_root_resource, topic const[ZX_INFO_CPU_STATS], buffer ptr[out, array[zx_info_cpu_stats]], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_VMAR(handle zx_vmar, topic const[ZX_INFO_VMAR], buffer ptr[out, zx_info_vmar], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_VMO(handle zx_vmar, topic const[ZX_INFO_VMO], buffer ptr[out, zx_info_vmo], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
-zx_object_get_info$ZX_INFO_SOCKET(handle zx_vmar, topic const[ZX_INFO_SOCKET], buffer ptr[out, zx_info_socket], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
+zx_object_get_info$ZX_INFO_SOCKET(handle zx_socket, topic const[ZX_INFO_SOCKET], buffer ptr[out, zx_info_socket], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_JOB_CHILDREN(handle zx_job, topic const[ZX_INFO_JOB_CHILDREN], buffer ptr[out, array[koid]], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_JOB_PROCESSES(handle zx_job, topic const[ZX_INFO_JOB_PROCESSES], buffer ptr[out, array[koid]], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_TASK_STATS(handle zx_process, topic const[ZX_INFO_TASK_STATS], buffer ptr[out, zx_info_task_stats], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
@@ -34,25 +35,40 @@ zx_object_get_info$ZX_INFO_PROCESS_MAPS(handle zx_process, topic const[ZX_INFO_P
 zx_object_get_info$ZX_INFO_PROCESS_VMOS(handle zx_process, topic const[ZX_INFO_PROCESS_VMOS], buffer ptr[out, array[zx_info_vmo]], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_KMEM_STATS(root_resource zx_root_resource, topic const[ZX_INFO_KMEM_STATS], buffer ptr[out, zx_info_kmem_stats], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_KMEM_STATS_EXTENDED(root_resource zx_root_resource, topic const[ZX_INFO_KMEM_STATS_EXTENDED], buffer ptr[out, zx_info_kmem_stats_extended], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
-zx_object_get_info$ZX_INFO_TIMER(handle zx_handle, topic const[ZX_INFO_TIMER], buffer ptr[out, zx_info_timer], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
+zx_object_get_info$ZX_INFO_TIMER(handle zx_timer, topic const[ZX_INFO_TIMER], buffer ptr[out, zx_info_timer], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_GUEST_STATS(handle zx_handle, topic const[ZX_INFO_GUEST_STATS], buffer ptr[out, zx_info_handle_basic], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
 zx_object_get_info$ZX_INFO_TASK_RUNTIME(handle zx_handle, topic const[ZX_INFO_TASK_RUNTIME], buffer ptr[out, zx_info_handle_basic], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
-
-# TODO: what is handle type here?
-zx_object_get_info$ZX_INFO_RESOURCE(resource_handle zx_handle, topic const[ZX_INFO_RESOURCE], buffer ptr[out, zx_info_resource], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
-zx_object_get_info$ZX_INFO_BTI(resource_handle zx_handle, topic const[ZX_INFO_BTI], buffer ptr[out, zx_info_bti], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
-
-zx_object_get_property$ZX_PROP_PROCESS_DEBUG_ADDR(handle zx_process, property const[ZX_PROP_PROCESS_DEBUG_ADDR], value ptr[out, array[int8]], size len[value])
-zx_object_get_property$ZX_PROP_PROCESS_BREAK_ON_LOAD(handle zx_process, property const[ZX_PROP_PROCESS_BREAK_ON_LOAD], value ptr[out, array[int8]], size len[value])
-zx_object_get_property$ZX_PROP_PROCESS_VDSO_BASE_ADDRESS(handle zx_process, property const[ZX_PROP_PROCESS_VDSO_BASE_ADDRESS], value ptr[out, array[int8]], size len[value])
-zx_object_get_property$ZX_PROP_SOCKET_RX_THRESHOLD(handle zx_socket, property const[ZX_PROP_SOCKET_RX_THRESHOLD], value ptr[out, array[int8]], size len[value])
-zx_object_get_property$ZX_PROP_SOCKET_TX_THRESHOLD(handle zx_socket, property const[ZX_PROP_SOCKET_TX_THRESHOLD], value ptr[out, array[int8]], size len[value])
-
-zx_object_set_property$ZX_PROP_JOB_KILL_ON_OOM(handle zx_job, property const[ZX_PROP_JOB_KILL_ON_OOM], value ptr[in, array[int8]], size len[value])
-zx_object_set_property$ZX_PROP_PROCESS_BREAK_ON_LOAD(handle zx_process, property const[ZX_PROP_PROCESS_BREAK_ON_LOAD], value ptr[in, array[int8]], size len[value])
-zx_object_set_property$ZX_PROP_PROCESS_DEBUG_ADDR(handle zx_process, property const[ZX_PROP_PROCESS_DEBUG_ADDR], value ptr[in, array[int8]], size len[value])
-zx_object_set_property$ZX_PROP_SOCKET_RX_THRESHOLD(handle zx_socket, property const[ZX_PROP_SOCKET_RX_THRESHOLD], value ptr[in, array[int8]], size len[value])
-zx_object_set_property$ZX_PROP_SOCKET_TX_THRESHOLD(handle zx_socket, property const[ZX_PROP_SOCKET_TX_THRESHOLD], value ptr[in, array[int8]], size len[value])
+zx_object_get_info$ZX_INFO_RESOURCE(handle zx_resource, topic const[ZX_INFO_RESOURCE], buffer ptr[out, zx_info_resource], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
+zx_object_get_info$ZX_INFO_BTI(handle zx_bti, topic const[ZX_INFO_BTI], buffer ptr[out, zx_info_bti], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr])
+
+zx_object_get_property$ZX_PROP_NAME(handle zx_handle, property const[ZX_PROP_NAME], value ptr[out, array[int8]], size len[value])
+zx_object_get_property$ZX_PROP_REGISTER_FS(handle zx_thread, property const[ZX_PROP_REGISTER_FS], value ptr[out, intptr], size len[value])
+zx_object_get_property$ZX_PROP_REGISTER_GS(handle zx_thread, property const[ZX_PROP_REGISTER_GS], value ptr[out, intptr], size len[value])
+zx_object_get_property$ZX_PROP_PROCESS_DEBUG_ADDR(handle zx_process, property const[ZX_PROP_PROCESS_DEBUG_ADDR], value ptr[out, intptr], size len[value])
+zx_object_get_property$ZX_PROP_PROCESS_BREAK_ON_LOAD(handle zx_process, property const[ZX_PROP_PROCESS_BREAK_ON_LOAD], value ptr[out, intptr], size len[value])
+zx_object_get_property$ZX_PROP_PROCESS_VDSO_BASE_ADDRESS(handle zx_process, property const[ZX_PROP_PROCESS_VDSO_BASE_ADDRESS], value ptr[out, intptr], size len[value])
+zx_object_get_property$ZX_PROP_PROCESS_HW_TRACE_CONTEXT_ID(handle zx_process, property const[ZX_PROP_PROCESS_HW_TRACE_CONTEXT_ID], value ptr[out, intptr], size len[value])
+zx_object_get_property$ZX_PROP_SOCKET_RX_THRESHOLD(handle zx_socket, property const[ZX_PROP_SOCKET_RX_THRESHOLD], value ptr[out, int64], size len[value])
+zx_object_get_property$ZX_PROP_SOCKET_TX_THRESHOLD(handle zx_socket, property const[ZX_PROP_SOCKET_TX_THRESHOLD], value ptr[out, int64], size len[value])
+zx_object_get_property$ZX_PROP_STREAM_MODE_APPEND(handle zx_stream, property const[ZX_PROP_STREAM_MODE_APPEND], value ptr[out, int8], size len[value])
+zx_object_get_property$ZX_PROP_VMO_CONTENT_SIZE(handle zx_vmo, property const[ZX_PROP_VMO_CONTENT_SIZE], value ptr[out, int64], size len[value])
+# zx_exception not defined because never generated by a syscall
+zx_object_get_property$ZX_PROP_EXCEPTION_STATE(handle zx_handle, property const[ZX_PROP_EXCEPTION_STATE], value ptr[out, int32], size len[value])
+zx_object_get_property$ZX_PROP_EXCEPTION_STRATEGY(handle zx_handle, property const[ZX_PROP_EXCEPTION_STRATEGY], value ptr[out, int32], size len[value])
+
+zx_object_set_property$ZX_PROP_NAME(handle zx_handle, property const[ZX_PROP_NAME], value ptr[in, array[int8]], size len[value])
+zx_object_set_property$ZX_PROP_REGISTER_FS(handle zx_thread, property const[ZX_PROP_REGISTER_FS], value ptr[in, intptr], size len[value])
+zx_object_set_property$ZX_PROP_REGISTER_GS(handle zx_thread, property const[ZX_PROP_REGISTER_GS], value ptr[in, intptr], size len[value])
+zx_object_set_property$ZX_PROP_PROCESS_DEBUG_ADDR(handle zx_process, property const[ZX_PROP_PROCESS_DEBUG_ADDR], value ptr[in, intptr], size len[value])
+zx_object_set_property$ZX_PROP_PROCESS_BREAK_ON_LOAD(handle zx_process, property const[ZX_PROP_PROCESS_BREAK_ON_LOAD], value ptr[in, intptr], size len[value])
+zx_object_set_property$ZX_PROP_JOB_KILL_ON_OOM(handle zx_job, property const[ZX_PROP_JOB_KILL_ON_OOM], value ptr[in, int64], size len[value])
+zx_object_set_property$ZX_PROP_SOCKET_RX_THRESHOLD(handle zx_socket, property const[ZX_PROP_SOCKET_RX_THRESHOLD], value ptr[in, int64], size len[value])
+zx_object_set_property$ZX_PROP_SOCKET_TX_THRESHOLD(handle zx_socket, property const[ZX_PROP_SOCKET_TX_THRESHOLD], value ptr[in, int64], size len[value])
+zx_object_set_property$ZX_PROP_STREAM_MODE_APPEND(handle zx_stream, property const[ZX_PROP_STREAM_MODE_APPEND], value ptr[in, int8], size len[value])
+zx_object_set_property$ZX_PROP_VMO_CONTENT_SIZE(handle zx_vmo, property const[ZX_PROP_VMO_CONTENT_SIZE], value ptr[in, int64], size len[value])
+# zx_exception not defined because never generated by a syscall
+zx_object_set_property$ZX_PROP_EXCEPTION_STATE(handle zx_handle, property const[ZX_PROP_EXCEPTION_STATE], value ptr[in, int32], size len[value])
+zx_object_set_property$ZX_PROP_EXCEPTION_STRATEGY(handle zx_handle, property const[ZX_PROP_EXCEPTION_STRATEGY], value ptr[in, int32], size len[value])
 
 zx_object_signal(handle zx_handle, clear_mask int32, set_mask int32)
 zx_object_signal_peer(handle zx_handle, clear_mask int32, set_mask int32)
diff --git a/sys/fuchsia/object_amd64.const b/sys/fuchsia/object_amd64.const
index 17e4d2a33..841c0110b 100644
--- a/sys/fuchsia/object_amd64.const
+++ b/sys/fuchsia/object_amd64.const
@@ -12,21 +12,17 @@ ZX_INFO_PROCESS = 3
 ZX_INFO_PROCESS_HANDLE_STATS = 21
 ZX_INFO_PROCESS_MAPS = 13
 ZX_INFO_PROCESS_THREADS = 4
-ZX_INFO_PROCESS_VMOS = 14
 ZX_INFO_RESOURCE = 18
 ZX_INFO_SOCKET = 22
 ZX_INFO_TASK_STATS = 12
 ZX_INFO_THREAD = 10
-ZX_INFO_THREAD_EXCEPTION_REPORT = 11
 ZX_INFO_THREAD_STATS = 15
 ZX_INFO_VMAR = 7
-ZX_INFO_VMO = 23
 ZX_INFO_TIMER = 25
 ZX_INFO_STREAM = 26
 ZX_INFO_HANDLE_TABLE = 27
 ZX_INFO_MSI = 28
 ZX_INFO_GUEST_STATS = 29
-ZX_INFO_TASK_RUNTIME = 30
 ZX_INFO_KMEM_STATS_EXTENDED = 31
 ZX_INFO_VCPU = 32
 ZX_MAX_NAME_LEN = 32
@@ -45,4 +41,12 @@ ZX_PROP_REGISTER_GS = 2
 ZX_PROP_SOCKET_RX_THRESHOLD = 12
 ZX_PROP_SOCKET_TX_THRESHOLD = 13
 ZX_PROP_STREAM_MODE_APPEND = 19
-ZX_PROP_VMO_CONTENT_SIZE = 17
\ No newline at end of file
+ZX_PROP_VMO_CONTENT_SIZE = 17
+ZX_INFO_THREAD_EXCEPTION_REPORT_V1 = 11
+ZX_INFO_THREAD_EXCEPTION_REPORT = 0x1000000B
+ZX_INFO_PROCESS_VMOS_V1 = 14
+ZX_INFO_PROCESS_VMOS = 0x1000000E
+ZX_INFO_VMO_V1 = 23
+ZX_INFO_VMO = 0x10000017
+ZX_INFO_TASK_RUNTIME_V1 = 30
+ZX_INFO_TASK_RUNTIME = 0x1000001E
\ No newline at end of file
diff --git a/sys/fuchsia/object_arm64.const b/sys/fuchsia/object_arm64.const
index 17e4d2a33..dd52736cf 100644
--- a/sys/fuchsia/object_arm64.const
+++ b/sys/fuchsia/object_arm64.const
@@ -8,25 +8,21 @@ ZX_INFO_JOB = 24
 ZX_INFO_JOB_CHILDREN = 8
 ZX_INFO_JOB_PROCESSES = 9
 ZX_INFO_KMEM_STATS = 17
-ZX_INFO_PROCESS = 3
+ZX_INFO_PROCESS = 0x10000003
 ZX_INFO_PROCESS_HANDLE_STATS = 21
 ZX_INFO_PROCESS_MAPS = 13
 ZX_INFO_PROCESS_THREADS = 4
-ZX_INFO_PROCESS_VMOS = 14
 ZX_INFO_RESOURCE = 18
 ZX_INFO_SOCKET = 22
 ZX_INFO_TASK_STATS = 12
 ZX_INFO_THREAD = 10
-ZX_INFO_THREAD_EXCEPTION_REPORT = 11
 ZX_INFO_THREAD_STATS = 15
 ZX_INFO_VMAR = 7
-ZX_INFO_VMO = 23
 ZX_INFO_TIMER = 25
 ZX_INFO_STREAM = 26
 ZX_INFO_HANDLE_TABLE = 27
 ZX_INFO_MSI = 28
 ZX_INFO_GUEST_STATS = 29
-ZX_INFO_TASK_RUNTIME = 30
 ZX_INFO_KMEM_STATS_EXTENDED = 31
 ZX_INFO_VCPU = 32
 ZX_MAX_NAME_LEN = 32
@@ -45,4 +41,12 @@ ZX_PROP_REGISTER_GS = 2
 ZX_PROP_SOCKET_RX_THRESHOLD = 12
 ZX_PROP_SOCKET_TX_THRESHOLD = 13
 ZX_PROP_STREAM_MODE_APPEND = 19
-ZX_PROP_VMO_CONTENT_SIZE = 17
\ No newline at end of file
+ZX_PROP_VMO_CONTENT_SIZE = 17
+ZX_INFO_THREAD_EXCEPTION_REPORT_V1 = 11
+ZX_INFO_THREAD_EXCEPTION_REPORT = 0x1000000B
+ZX_INFO_PROCESS_VMOS_V1 = 14
+ZX_INFO_PROCESS_VMOS = 0x1000000E
+ZX_INFO_VMO_V1 = 23
+ZX_INFO_VMO = 0x10000017
+ZX_INFO_TASK_RUNTIME_V1 = 30
+ZX_INFO_TASK_RUNTIME = 0x1000001E
\ No newline at end of file