From 11c256cdcd601b67fcf5611fe8aed55b9ff00143 Mon Sep 17 00:00:00 2001 From: Dokyung Song Date: Thu, 6 Sep 2018 15:49:23 -0700 Subject: sys/fuchsia: prune unused structs in syscall description generated by fidlgen After generating syscall description for fidl files using fidlgen, prune all unused structs using the exact same mechanism used by the compiler's check for unused structs. This allows the FIDL compiler to support modular compilation; it does not need to have global knowledge of whether each struct is used or not. --- executor/defs.h | 4 +-- executor/syscalls.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) (limited to 'executor') diff --git a/executor/defs.h b/executor/defs.h index f5322ae6b..23389279c 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -35,7 +35,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "ee62749ce0e69fd29de1864a220e909a18613438" +#define SYZ_REVISION "6cdbdf7c4071faca2094bf2150ea2a90384bb008" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 @@ -45,7 +45,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "80d5b2ce01d8c9deca31efaa1a61da313eaa44e6" +#define SYZ_REVISION "59de262e4cd9e36f40a7767839877a47372efa54" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 diff --git a/executor/syscalls.h b/executor/syscalls.h index a75e216d2..a49dc1cb6 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -505,11 +505,19 @@ const call_t syscalls[] = { {"fchown", 0, (syscall_t)fchown}, {"fchownat", 0, (syscall_t)fchownat}, {"fdatasync", 0, (syscall_t)fdatasync}, + {"fdio_service_connect$fuchsia_cobalt_Controller", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_Encoder", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_EncoderFactory", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_Logger", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_LoggerExt", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_LoggerFactory", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_LoggerSimple", 0, (syscall_t)fdio_service_connect}, {"fdio_service_connect$fuchsia_io_Directory", 0, (syscall_t)fdio_service_connect}, {"fdio_service_connect$fuchsia_io_File", 0, (syscall_t)fdio_service_connect}, {"fdio_service_connect$fuchsia_io_Node", 0, (syscall_t)fdio_service_connect}, {"fdio_service_connect$fuchsia_io_Object", 0, (syscall_t)fdio_service_connect}, {"fdio_service_connect$fuchsia_process_Launcher", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_process_Resolver", 0, (syscall_t)fdio_service_connect}, {"fstat", 0, (syscall_t)fstat}, {"fsync", 0, (syscall_t)fsync}, {"ftruncate", 0, (syscall_t)ftruncate}, @@ -561,6 +569,37 @@ const call_t syscalls[] = { {"writev", 0, (syscall_t)writev}, {"zx_cache_flush", 0, (syscall_t)zx_cache_flush}, {"zx_channel_call", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_ControllerBlockUntilEmpty", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_ControllerGetFailedSendAttempts", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_ControllerGetNumSendAttempts", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_ControllerRequestSendSoon", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddDoubleObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddIndexObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddIntBucketDistribution", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddIntObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddMultipartObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddStringObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderEndTimer", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderEndTimerMultiPart", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderFactoryGetEncoderForProject", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderSendObservations", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderStartTimer", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerEndTimer", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerExtLogCustomEvent", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerExtLogIntHistogram", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerFactoryCreateLogger", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerFactoryCreateLoggerExt", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerFactoryCreateLoggerSimple", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogElapsedTime", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogEvent", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogEventCount", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogFrameRate", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogMemoryUsage", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogString", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerSimpleLogCustomEvent", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerSimpleLogIntHistogram", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerStartTimer", 0, (syscall_t)zx_channel_call}, {"zx_channel_call$fuchsia_io_DirectoryClose", 0, (syscall_t)zx_channel_call}, {"zx_channel_call$fuchsia_io_DirectoryDescribe", 0, (syscall_t)zx_channel_call}, {"zx_channel_call$fuchsia_io_DirectoryGetAttr", 0, (syscall_t)zx_channel_call}, @@ -599,12 +638,21 @@ const call_t syscalls[] = { {"zx_channel_call$fuchsia_io_ObjectDescribe", 0, (syscall_t)zx_channel_call}, {"zx_channel_call$fuchsia_process_LauncherCreateWithoutStarting", 0, (syscall_t)zx_channel_call}, {"zx_channel_call$fuchsia_process_LauncherLaunch", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_process_ResolverResolve", 0, (syscall_t)zx_channel_call}, {"zx_channel_create", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_Controller", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_Encoder", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_EncoderFactory", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_Logger", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_LoggerExt", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_LoggerFactory", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_LoggerSimple", 0, (syscall_t)zx_channel_create}, {"zx_channel_create$fuchsia_io_Directory", 0, (syscall_t)zx_channel_create}, {"zx_channel_create$fuchsia_io_File", 0, (syscall_t)zx_channel_create}, {"zx_channel_create$fuchsia_io_Node", 0, (syscall_t)zx_channel_create}, {"zx_channel_create$fuchsia_io_Object", 0, (syscall_t)zx_channel_create}, {"zx_channel_create$fuchsia_process_Launcher", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_process_Resolver", 0, (syscall_t)zx_channel_create}, {"zx_channel_read", 0, (syscall_t)zx_channel_read}, {"zx_channel_read$fuchsia_io_DirectoryOnOpen", 0, (syscall_t)zx_channel_read}, {"zx_channel_read$fuchsia_io_FileOnOpen", 0, (syscall_t)zx_channel_read}, @@ -753,11 +801,19 @@ const call_t syscalls[] = { {"fchown", 0, (syscall_t)fchown}, {"fchownat", 0, (syscall_t)fchownat}, {"fdatasync", 0, (syscall_t)fdatasync}, + {"fdio_service_connect$fuchsia_cobalt_Controller", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_Encoder", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_EncoderFactory", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_Logger", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_LoggerExt", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_LoggerFactory", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_cobalt_LoggerSimple", 0, (syscall_t)fdio_service_connect}, {"fdio_service_connect$fuchsia_io_Directory", 0, (syscall_t)fdio_service_connect}, {"fdio_service_connect$fuchsia_io_File", 0, (syscall_t)fdio_service_connect}, {"fdio_service_connect$fuchsia_io_Node", 0, (syscall_t)fdio_service_connect}, {"fdio_service_connect$fuchsia_io_Object", 0, (syscall_t)fdio_service_connect}, {"fdio_service_connect$fuchsia_process_Launcher", 0, (syscall_t)fdio_service_connect}, + {"fdio_service_connect$fuchsia_process_Resolver", 0, (syscall_t)fdio_service_connect}, {"fstat", 0, (syscall_t)fstat}, {"fsync", 0, (syscall_t)fsync}, {"ftruncate", 0, (syscall_t)ftruncate}, @@ -809,6 +865,37 @@ const call_t syscalls[] = { {"writev", 0, (syscall_t)writev}, {"zx_cache_flush", 0, (syscall_t)zx_cache_flush}, {"zx_channel_call", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_ControllerBlockUntilEmpty", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_ControllerGetFailedSendAttempts", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_ControllerGetNumSendAttempts", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_ControllerRequestSendSoon", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddDoubleObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddIndexObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddIntBucketDistribution", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddIntObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddMultipartObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderAddStringObservation", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderEndTimer", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderEndTimerMultiPart", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderFactoryGetEncoderForProject", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderSendObservations", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_EncoderStartTimer", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerEndTimer", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerExtLogCustomEvent", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerExtLogIntHistogram", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerFactoryCreateLogger", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerFactoryCreateLoggerExt", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerFactoryCreateLoggerSimple", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogElapsedTime", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogEvent", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogEventCount", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogFrameRate", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogMemoryUsage", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerLogString", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerSimpleLogCustomEvent", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerSimpleLogIntHistogram", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_cobalt_LoggerStartTimer", 0, (syscall_t)zx_channel_call}, {"zx_channel_call$fuchsia_io_DirectoryClose", 0, (syscall_t)zx_channel_call}, {"zx_channel_call$fuchsia_io_DirectoryDescribe", 0, (syscall_t)zx_channel_call}, {"zx_channel_call$fuchsia_io_DirectoryGetAttr", 0, (syscall_t)zx_channel_call}, @@ -847,12 +934,21 @@ const call_t syscalls[] = { {"zx_channel_call$fuchsia_io_ObjectDescribe", 0, (syscall_t)zx_channel_call}, {"zx_channel_call$fuchsia_process_LauncherCreateWithoutStarting", 0, (syscall_t)zx_channel_call}, {"zx_channel_call$fuchsia_process_LauncherLaunch", 0, (syscall_t)zx_channel_call}, + {"zx_channel_call$fuchsia_process_ResolverResolve", 0, (syscall_t)zx_channel_call}, {"zx_channel_create", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_Controller", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_Encoder", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_EncoderFactory", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_Logger", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_LoggerExt", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_LoggerFactory", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_cobalt_LoggerSimple", 0, (syscall_t)zx_channel_create}, {"zx_channel_create$fuchsia_io_Directory", 0, (syscall_t)zx_channel_create}, {"zx_channel_create$fuchsia_io_File", 0, (syscall_t)zx_channel_create}, {"zx_channel_create$fuchsia_io_Node", 0, (syscall_t)zx_channel_create}, {"zx_channel_create$fuchsia_io_Object", 0, (syscall_t)zx_channel_create}, {"zx_channel_create$fuchsia_process_Launcher", 0, (syscall_t)zx_channel_create}, + {"zx_channel_create$fuchsia_process_Resolver", 0, (syscall_t)zx_channel_create}, {"zx_channel_read", 0, (syscall_t)zx_channel_read}, {"zx_channel_read$fuchsia_io_DirectoryOnOpen", 0, (syscall_t)zx_channel_read}, {"zx_channel_read$fuchsia_io_FileOnOpen", 0, (syscall_t)zx_channel_read}, -- cgit mrf-deployment