Skip to content

Commit

Permalink
Update fidlgen to keep current with upstream.
Browse files Browse the repository at this point in the history
The Syzkaller IR upstream has been updated, so we can properly update
consts/fidl descriptions now.
  • Loading branch information
flowerhack authored and dvyukov committed Oct 10, 2018
1 parent f37861d commit 5b11ac2
Show file tree
Hide file tree
Showing 19 changed files with 2,183 additions and 446 deletions.
4 changes: 2 additions & 2 deletions executor/defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#if GOARCH_amd64
#define GOARCH "amd64"
#define SYZ_REVISION "3571a2f7f80027a975be3d8ac724b374715e7834"
#define SYZ_REVISION "10918eaa4696a9df4961ecf0e72042e805e814f6"
#define SYZ_EXECUTOR_USES_FORK_SERVER 0
#define SYZ_EXECUTOR_USES_SHMEM 0
#define SYZ_PAGE_SIZE 4096
Expand All @@ -45,7 +45,7 @@

#if GOARCH_arm64
#define GOARCH "arm64"
#define SYZ_REVISION "1e3edab159d14634f4649a11cb4f7060f2b3be25"
#define SYZ_REVISION "0921e5c7c43e273ab8675658a8ff52a08f56e244"
#define SYZ_EXECUTOR_USES_FORK_SERVER 0
#define SYZ_EXECUTOR_USES_SHMEM 0
#define SYZ_PAGE_SIZE 4096
Expand Down
70 changes: 62 additions & 8 deletions executor/syscalls.h

Large diffs are not rendered by default.

42 changes: 38 additions & 4 deletions sys/fuchsia/fidl_cobalt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,24 @@ fuchsia_cobalt_HistogramBucketHandles {
void void
} [packed]

fuchsia_cobalt_ExperimentInLine {
experiment_id int64
arm_id int32
} [packed]

fuchsia_cobalt_ExperimentOutOfLine {
void void
} [packed]

fuchsia_cobalt_ExperimentHandles {
void void
} [packed]

fuchsia_cobalt_ValueInLine [
string_valueInLine fidl_union_member[fuchsia_cobalt_ValueTagstring_value, fidl_string]
int_value fidl_union_member[fuchsia_cobalt_ValueTagint_value, int64]
double_value fidl_union_member[fuchsia_cobalt_ValueTagdouble_value, int64]
index_value fidl_union_member[fuchsia_cobalt_ValueTagindex_value, int32]
string_valueInLine fidl_union_member[fuchsia_cobalt_ValueTag_string_value, fidl_string]
int_value fidl_union_member[fuchsia_cobalt_ValueTag_int_value, int64]
double_value fidl_union_member[fuchsia_cobalt_ValueTag_double_value, int64]
index_value fidl_union_member[fuchsia_cobalt_ValueTag_index_value, int32]
]

fuchsia_cobalt_LoggerFactoryCreateLoggerRequest {
Expand Down Expand Up @@ -592,6 +605,27 @@ zx_channel_call$fuchsia_cobalt_LoggerSimpleStartTimer(handle zx_chan_fuchsia_cob
zx_channel_call$fuchsia_cobalt_LoggerSimpleEndTimer(handle zx_chan_fuchsia_cobalt_LoggerSimple_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_cobalt_LoggerSimpleEndTimerRequest, fuchsia_cobalt_LoggerSimpleEndTimerRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_cobalt_LoggerSimpleEndTimerResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32])
zx_channel_call$fuchsia_cobalt_LoggerSimpleLogIntHistogram(handle zx_chan_fuchsia_cobalt_LoggerSimple_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_cobalt_LoggerSimpleLogIntHistogramRequest, fuchsia_cobalt_LoggerSimpleLogIntHistogramRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_cobalt_LoggerSimpleLogIntHistogramResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32])

fuchsia_cobalt_SystemDataUpdaterSetExperimentStateRequest {
hdr fidl_message_header[1]
experimentsInLine fidl_vector
experimentsOutOfLine parallel_array[fuchsia_cobalt_ExperimentInLine, fuchsia_cobalt_ExperimentOutOfLine]
} [packed]

fuchsia_cobalt_SystemDataUpdaterSetExperimentStateRequestHandles {
experiments array[fuchsia_cobalt_ExperimentHandles]
} [packed]

fuchsia_cobalt_SystemDataUpdaterSetExperimentStateResponseHandles {
void void
} [packed]

resource zx_chan_fuchsia_cobalt_SystemDataUpdater_client[zx_chan]
resource zx_chan_fuchsia_cobalt_SystemDataUpdater_server[zx_chan]

zx_channel_create$fuchsia_cobalt_SystemDataUpdater(options const[0], out0 ptr[out, zx_chan_fuchsia_cobalt_SystemDataUpdater_client], out1 ptr[out, zx_chan_fuchsia_cobalt_SystemDataUpdater_server])
fdio_service_connect$fuchsia_cobalt_SystemDataUpdater(path ptr[in, string["/svc/fuchsia.cobalt.SystemDataUpdater"]], handle zx_chan_fuchsia_cobalt_SystemDataUpdater_server)
zx_channel_call$fuchsia_cobalt_SystemDataUpdaterSetExperimentState(handle zx_chan_fuchsia_cobalt_SystemDataUpdater_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_cobalt_SystemDataUpdaterSetExperimentStateRequest, fuchsia_cobalt_SystemDataUpdaterSetExperimentStateRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_cobalt_SystemDataUpdaterSetExperimentStateResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32])

fuchsia_cobalt_ControllerRequestSendSoonRequest {
hdr fidl_message_header[1]
} [packed]
Expand Down
8 changes: 4 additions & 4 deletions sys/fuchsia/fidl_cobalt_amd64.const
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fuchsia_cobalt_ReleaseStage_DEBUG = 99
fuchsia_cobalt_ReleaseStage_DOGFOOD = 10
fuchsia_cobalt_ReleaseStage_FISHFOOD = 20
fuchsia_cobalt_ReleaseStage_GA = 0
fuchsia_cobalt_ValueTagdouble_value = 2
fuchsia_cobalt_ValueTagindex_value = 3
fuchsia_cobalt_ValueTagint_value = 1
fuchsia_cobalt_ValueTagstring_value = 0
fuchsia_cobalt_ValueTag_double_value = 2
fuchsia_cobalt_ValueTag_index_value = 3
fuchsia_cobalt_ValueTag_int_value = 1
fuchsia_cobalt_ValueTag_string_value = 0
8 changes: 4 additions & 4 deletions sys/fuchsia/fidl_cobalt_arm64.const
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fuchsia_cobalt_ReleaseStage_DEBUG = 99
fuchsia_cobalt_ReleaseStage_DOGFOOD = 10
fuchsia_cobalt_ReleaseStage_FISHFOOD = 20
fuchsia_cobalt_ReleaseStage_GA = 0
fuchsia_cobalt_ValueTagdouble_value = 2
fuchsia_cobalt_ValueTagindex_value = 3
fuchsia_cobalt_ValueTagint_value = 1
fuchsia_cobalt_ValueTagstring_value = 0
fuchsia_cobalt_ValueTag_double_value = 2
fuchsia_cobalt_ValueTag_index_value = 3
fuchsia_cobalt_ValueTag_int_value = 1
fuchsia_cobalt_ValueTag_string_value = 0
Loading

0 comments on commit 5b11ac2

Please sign in to comment.