X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Fside%2Ftrace.h;h=830137f9dd9d4c5e70e99179689d78eb616d8128;hb=e65f9ce5cedcb9476f214501f35a4b82f6d947e7;hp=309ab267846be26e6c7909a1c9bea2b38ce73322;hpb=984bcab78fb30608f6fbf8fa349831b2011e97c2;p=libside.git diff --git a/include/side/trace.h b/include/side/trace.h index 309ab26..830137f 100644 --- a/include/side/trace.h +++ b/include/side/trace.h @@ -20,22 +20,22 @@ //fixed forever, or think of a scheme that would allow their binary //representation to be extended if need be. +struct side_arg; struct side_arg_vec; -struct side_arg_vec_description; -struct side_arg_dynamic_vec; -struct side_arg_dynamic_vec_vla; -struct side_type_description; +struct side_arg_dynamic; +struct side_arg_dynamic_field; +struct side_arg_dynamic_vla; +struct side_type; struct side_event_field; -struct side_event_field_sg; struct side_tracer_visitor_ctx; struct side_tracer_dynamic_struct_visitor_ctx; -struct side_tracer_dynamic_vla_visitor_ctx; struct side_event_description; -struct side_arg_dynamic_event_struct; +struct side_arg_dynamic_struct; struct side_events_register_handle; -enum side_type { - /* Basic types */ +enum side_type_label { + /* Statically declared types */ + SIDE_TYPE_NULL, SIDE_TYPE_BOOL, SIDE_TYPE_U8, SIDE_TYPE_U16, @@ -54,9 +54,8 @@ enum side_type { SIDE_TYPE_FLOAT_BINARY128, SIDE_TYPE_STRING, - /* Compound types */ + /* Statically declared compound types */ SIDE_TYPE_STRUCT, - SIDE_TYPE_STRUCT_SG, SIDE_TYPE_ARRAY, SIDE_TYPE_VLA, SIDE_TYPE_VLA_VISITOR, @@ -85,40 +84,43 @@ enum side_type { SIDE_TYPE_VLA_POINTER32, SIDE_TYPE_VLA_POINTER64, - /* Enumeration types */ + /* Statically declared enumeration types */ SIDE_TYPE_ENUM, SIDE_TYPE_ENUM_BITMAP, - /* Dynamic type */ SIDE_TYPE_DYNAMIC, -}; -enum side_dynamic_type { - /* Basic types */ - SIDE_DYNAMIC_TYPE_NULL, - SIDE_DYNAMIC_TYPE_BOOL, - SIDE_DYNAMIC_TYPE_U8, - SIDE_DYNAMIC_TYPE_U16, - SIDE_DYNAMIC_TYPE_U32, - SIDE_DYNAMIC_TYPE_U64, - SIDE_DYNAMIC_TYPE_S8, - SIDE_DYNAMIC_TYPE_S16, - SIDE_DYNAMIC_TYPE_S32, - SIDE_DYNAMIC_TYPE_S64, - SIDE_DYNAMIC_TYPE_BYTE, - SIDE_DYNAMIC_TYPE_POINTER32, - SIDE_DYNAMIC_TYPE_POINTER64, - SIDE_DYNAMIC_TYPE_FLOAT_BINARY16, - SIDE_DYNAMIC_TYPE_FLOAT_BINARY32, - SIDE_DYNAMIC_TYPE_FLOAT_BINARY64, - SIDE_DYNAMIC_TYPE_FLOAT_BINARY128, - SIDE_DYNAMIC_TYPE_STRING, - - /* Compound types */ - SIDE_DYNAMIC_TYPE_STRUCT, - SIDE_DYNAMIC_TYPE_STRUCT_VISITOR, - SIDE_DYNAMIC_TYPE_VLA, - SIDE_DYNAMIC_TYPE_VLA_VISITOR, + /* Scatter-gather types */ + SIDE_TYPE_SG_UNSIGNED_INT, + SIDE_TYPE_SG_SIGNED_INT, + SIDE_TYPE_SG_FLOAT, + SIDE_TYPE_SG_STRUCT, + + /* Dynamic types */ + SIDE_TYPE_DYNAMIC_NULL, + SIDE_TYPE_DYNAMIC_BOOL, + SIDE_TYPE_DYNAMIC_U8, + SIDE_TYPE_DYNAMIC_U16, + SIDE_TYPE_DYNAMIC_U32, + SIDE_TYPE_DYNAMIC_U64, + SIDE_TYPE_DYNAMIC_S8, + SIDE_TYPE_DYNAMIC_S16, + SIDE_TYPE_DYNAMIC_S32, + SIDE_TYPE_DYNAMIC_S64, + SIDE_TYPE_DYNAMIC_BYTE, + SIDE_TYPE_DYNAMIC_POINTER32, + SIDE_TYPE_DYNAMIC_POINTER64, + SIDE_TYPE_DYNAMIC_FLOAT_BINARY16, + SIDE_TYPE_DYNAMIC_FLOAT_BINARY32, + SIDE_TYPE_DYNAMIC_FLOAT_BINARY64, + SIDE_TYPE_DYNAMIC_FLOAT_BINARY128, + SIDE_TYPE_DYNAMIC_STRING, + + /* Dynamic compound types */ + SIDE_TYPE_DYNAMIC_STRUCT, + SIDE_TYPE_DYNAMIC_STRUCT_VISITOR, + SIDE_TYPE_DYNAMIC_VLA, + SIDE_TYPE_DYNAMIC_VLA_VISITOR, }; enum side_attr_type { @@ -141,11 +143,6 @@ enum side_attr_type { SIDE_ATTR_TYPE_STRING, }; -enum side_type_sg { - SIDE_TYPE_SG_UNSIGNED_INT, - SIDE_TYPE_SG_SIGNED_INT, -}; - enum side_loglevel { SIDE_LOGLEVEL_EMERG = 0, SIDE_LOGLEVEL_ALERT = 1, @@ -171,7 +168,7 @@ enum side_error { SIDE_ERROR_EXITING = 5, }; -enum side_type_byte_order { +enum side_type_label_byte_order { SIDE_TYPE_BYTE_ORDER_LE = 0, SIDE_TYPE_BYTE_ORDER_BE = 1, }; @@ -188,17 +185,14 @@ enum side_type_byte_order { # define SIDE_TYPE_FLOAT_WORD_ORDER_HOST SIDE_TYPE_BYTE_ORDER_BE #endif -typedef enum side_visitor_status (*side_visitor)( +typedef enum side_visitor_status (*side_visitor_func)( const struct side_tracer_visitor_ctx *tracer_ctx, void *app_ctx); -typedef enum side_visitor_status (*side_dynamic_struct_visitor)( +typedef enum side_visitor_status (*side_dynamic_struct_visitor_func)( const struct side_tracer_dynamic_struct_visitor_ctx *tracer_ctx, void *app_ctx); -typedef enum side_visitor_status (*side_dynamic_vla_visitor)( - const struct side_tracer_dynamic_vla_visitor_ctx *tracer_ctx, - void *app_ctx); -struct side_integer_value { +union side_integer_value { uint8_t side_u8; uint16_t side_u16; uint32_t side_u32; @@ -207,167 +201,184 @@ struct side_integer_value { int16_t side_s16; int32_t side_s32; int64_t side_s64; -}; +} SIDE_PACKED; -struct side_float_value { +union side_float_value { #if __HAVE_FLOAT16 - _Float16 side_float_binary16; + _Float16 side_float_binary16; #endif #if __HAVE_FLOAT32 - _Float32 side_float_binary32; + _Float32 side_float_binary32; #endif #if __HAVE_FLOAT64 - _Float64 side_float_binary64; + _Float64 side_float_binary64; #endif #if __HAVE_FLOAT128 - _Float128 side_float_binary128; + _Float128 side_float_binary128; #endif -}; +} SIDE_PACKED; struct side_attr_value { uint32_t type; /* enum side_attr_type */ union { - struct side_integer_value integer_value; - struct side_float_value float_value; - uint8_t side_bool; - uint64_t string; /* const char * */ - } u; + uint8_t bool_value; + uint64_t string_value; /* const char * */ + union side_integer_value integer_value; + union side_float_value float_value; + } SIDE_PACKED u; }; /* User attributes. */ struct side_attr { const char *key; const struct side_attr_value value; -}; +} SIDE_PACKED; + +/* Type descriptions */ +struct side_type_null { + const struct side_attr *attr; + uint32_t nr_attr; +} SIDE_PACKED; + +struct side_type_bool { + const struct side_attr *attr; + uint32_t nr_attr; +} SIDE_PACKED; + +struct side_type_byte { + const struct side_attr *attr; + uint32_t nr_attr; +} SIDE_PACKED; + +struct side_type_string { + const struct side_attr *attr; + uint32_t nr_attr; +} SIDE_PACKED; + +struct side_type_integer { + const struct side_attr *attr; + uint32_t nr_attr; + uint16_t integer_size_bits; /* bits */ + uint16_t len_bits; /* bits */ + uint8_t signedness; /* true/false */ + uint8_t byte_order; /* enum side_type_label_byte_order */ +} SIDE_PACKED; + +struct side_type_float { + const struct side_attr *attr; + uint32_t nr_attr; + uint16_t float_size_bits; /* bits */ + uint8_t byte_order; /* enum side_type_label_byte_order */ +} SIDE_PACKED; struct side_enum_mapping { int64_t range_begin; int64_t range_end; const char *label; -}; +} SIDE_PACKED; struct side_enum_mappings { const struct side_enum_mapping *mappings; const struct side_attr *attr; uint32_t nr_mappings; uint32_t nr_attr; -}; +} SIDE_PACKED; struct side_enum_bitmap_mapping { uint64_t range_begin; uint64_t range_end; const char *label; -}; +} SIDE_PACKED; struct side_enum_bitmap_mappings { const struct side_enum_bitmap_mapping *mappings; const struct side_attr *attr; uint32_t nr_mappings; uint32_t nr_attr; -}; +} SIDE_PACKED; struct side_type_struct { - uint32_t nr_fields; - uint32_t nr_attr; const struct side_event_field *fields; const struct side_attr *attr; -}; - -struct side_type_sg_description { - uint32_t type; /* enum side_type_sg */ - union { - /* Basic types */ - struct { - uint64_t integer_offset; /* bytes */ - const struct side_attr *attr; - uint32_t nr_attr; - uint32_t byte_order; /* enum side_type_byte_order */ - uint8_t integer_size_bits; /* bits */ - uint8_t offset_bits; /* bits */ - uint8_t len_bits; /* bits */ - } side_basic; - } u; -}; - -struct side_struct_field_sg { - const char *field_name; - struct side_type_sg_description side_type; -}; - -/* Structure fields scatter-gather. */ -struct side_type_struct_sg { uint32_t nr_fields; uint32_t nr_attr; - const struct side_struct_field_sg *fields_sg; +} SIDE_PACKED; + +struct side_type_array { + const struct side_type *elem_type; const struct side_attr *attr; -}; + uint32_t length; + uint32_t nr_attr; +} SIDE_PACKED; -struct side_type_integer { +struct side_type_vla { + const struct side_type *elem_type; const struct side_attr *attr; uint32_t nr_attr; - uint16_t integer_size_bits; /* bits */ - uint16_t len_bits; /* bits */ - uint8_t signedness; /* true/false */ - uint8_t byte_order; /* enum side_type_byte_order */ -}; +} SIDE_PACKED; -struct side_type_float { +struct side_type_vla_visitor { + const struct side_type *elem_type; + side_visitor_func visitor; const struct side_attr *attr; uint32_t nr_attr; - uint32_t byte_order; /* enum side_type_byte_order */ - uint16_t float_size_bits; /* bits */ -}; +} SIDE_PACKED; + +struct side_type_enum { + const struct side_enum_mappings *mappings; + const struct side_type *elem_type; +} SIDE_PACKED; + +struct side_type_enum_bitmap { + const struct side_enum_bitmap_mappings *mappings; + const struct side_type *elem_type; +} SIDE_PACKED; + +struct side_type_sg_integer { + struct side_type_integer type; + uint16_t offset_bits; /* bits */ +} SIDE_PACKED; -struct side_type_description { - uint32_t type; /* enum side_type */ +struct side_type_sg { + uint64_t offset; /* bytes */ union { - /* Basic types */ - struct { - const struct side_attr *attr; - uint32_t nr_attr; - uint32_t byte_order; /* enum side_type_byte_order */ - } side_basic; + struct side_type_sg_integer side_integer; + struct side_type_float side_float; + const struct side_type_struct *side_struct; + } SIDE_PACKED u; +} SIDE_PACKED; +/* Statically defined types. */ +struct side_type { + uint32_t type; /* enum side_type_label */ + union { + /* Basic types */ + struct side_type_null side_null; + struct side_type_bool side_bool; + struct side_type_byte side_byte; + struct side_type_string side_string; struct side_type_integer side_integer; struct side_type_float side_float; /* Compound types */ - struct { - const struct side_type_description *elem_type; - const struct side_attr *attr; - uint32_t length; - uint32_t nr_attr; - } side_array; - struct { - const struct side_type_description *elem_type; - const struct side_attr *attr; - uint32_t nr_attr; - } side_vla; - struct { - const struct side_type_description *elem_type; - side_visitor visitor; - const struct side_attr *attr; - uint32_t nr_attr; - } side_vla_visitor; + struct side_type_array side_array; + struct side_type_vla side_vla; + struct side_type_vla_visitor side_vla_visitor; const struct side_type_struct *side_struct; - const struct side_type_struct_sg *side_struct_sg; /* Enumeration types */ - struct { - const struct side_enum_mappings *mappings; - const struct side_type_description *elem_type; - } side_enum; - struct { - const struct side_enum_bitmap_mappings *mappings; - const struct side_type_description *elem_type; - } side_enum_bitmap; - } u; -}; + struct side_type_enum side_enum; + struct side_type_enum_bitmap side_enum_bitmap; + + /* Scatter-gather types */ + struct side_type_sg side_sg; + } SIDE_PACKED u; +} SIDE_PACKED; struct side_event_field { const char *field_name; - struct side_type_description side_type; -}; + struct side_type side_type; +} SIDE_PACKED; enum side_event_flags { SIDE_EVENT_FLAG_VARIADIC = (1 << 0), @@ -376,140 +387,153 @@ enum side_event_flags { struct side_callback { union { void (*call)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *side_arg_vec, void *priv); void (*call_variadic)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, - const struct side_arg_dynamic_event_struct *var_struct, + const struct side_arg_vec *side_arg_vec, + const struct side_arg_dynamic_struct *var_struct, void *priv); - } u; + } SIDE_PACKED u; void *priv; -}; +} SIDE_PACKED; -struct side_event_description { - uintptr_t *enabled; - const char *provider_name; - const char *event_name; - const struct side_event_field *fields; +struct side_arg_static { + /* Basic types */ + uint8_t bool_value; + uint8_t byte_value; + uint64_t string_value; /* const char * */ + union side_integer_value integer_value; + union side_float_value float_value; + + /* Compound types */ + const struct side_arg_vec *side_struct; + const struct side_arg_vec *side_array; + const struct side_arg_vec *side_vla; + void *side_vla_app_visitor_ctx; + void *side_array_fixint; + struct { + void *p; + uint32_t length; + } SIDE_PACKED side_vla_fixint; + + /* Scatter-gather */ + void *side_integer_sg_ptr; + void *side_float_sg_ptr; + void *side_struct_sg_ptr; +} SIDE_PACKED; + +struct side_arg_dynamic_vla { + const struct side_arg *sav; const struct side_attr *attr; - const struct side_callback *callbacks; - uint64_t flags; - uint32_t version; - uint32_t loglevel; /* enum side_loglevel */ - uint32_t nr_fields; + uint32_t len; uint32_t nr_attr; - uint32_t nr_callbacks; -}; - -struct side_arg_dynamic_vec { - uint32_t dynamic_type; /* enum side_dynamic_type */ - union { - /* Basic types */ - struct { - const struct side_attr *attr; - uint32_t nr_attr; - uint32_t byte_order; /* enum side_type_byte_order */ - union { - struct side_integer_value integer_value; - struct side_float_value float_value; - uint8_t side_bool; - uint8_t side_byte; - uint64_t string; /* const char * */ - } u; - } side_basic; - - /* Compound types */ - const struct side_arg_dynamic_event_struct *side_dynamic_struct; - struct { - void *app_ctx; - side_dynamic_struct_visitor visitor; - const struct side_attr *attr; - uint32_t nr_attr; - } side_dynamic_struct_visitor; - const struct side_arg_dynamic_vec_vla *side_dynamic_vla; - struct { - void *app_ctx; - side_dynamic_vla_visitor visitor; - const struct side_attr *attr; - uint32_t nr_attr; - } side_dynamic_vla_visitor; - } u; -}; +} SIDE_PACKED; -struct side_arg_dynamic_vec_vla { - const struct side_arg_dynamic_vec *sav; +struct side_arg_dynamic_struct { + const struct side_arg_dynamic_field *fields; const struct side_attr *attr; uint32_t len; uint32_t nr_attr; -}; +} SIDE_PACKED; -struct side_arg_dynamic_event_field { - const char *field_name; - const struct side_arg_dynamic_vec elem; -}; +struct side_dynamic_struct_visitor { + void *app_ctx; + side_dynamic_struct_visitor_func visitor; + const struct side_attr *attr; + uint32_t nr_attr; +} SIDE_PACKED; -struct side_arg_dynamic_event_struct { - const struct side_arg_dynamic_event_field *fields; +struct side_dynamic_vla_visitor { + void *app_ctx; + side_visitor_func visitor; const struct side_attr *attr; - uint32_t len; uint32_t nr_attr; -}; +} SIDE_PACKED; -struct side_arg_vec { - enum side_type type; - union { - /* Integer types */ - struct side_integer_value integer_value; +struct side_arg_dynamic { + /* Basic types */ + struct side_type_null side_null; + struct { + struct side_type_bool type; + uint8_t value; + } SIDE_PACKED side_bool; + + struct { + struct side_type_byte type; + uint8_t value; + } SIDE_PACKED side_byte; + + struct { + struct side_type_string type; + uint64_t value; /* const char * */ + } SIDE_PACKED side_string; + + /* Integer type */ + struct { + struct side_type_integer type; + union side_integer_value value; + } SIDE_PACKED side_integer; + + struct { + struct side_type_float type; + union side_float_value value; + } SIDE_PACKED side_float; - /* Basic types */ - struct side_float_value float_value; - uint8_t side_bool; - uint8_t side_byte; - uint64_t string; /* const char * */ + /* Compound types */ + const struct side_arg_dynamic_struct *side_dynamic_struct; + const struct side_arg_dynamic_vla *side_dynamic_vla; - /* Compound types */ - const struct side_arg_vec_description *side_struct; - const struct side_arg_vec_description *side_array; - const struct side_arg_vec_description *side_vla; - void *side_vla_app_visitor_ctx; - void *side_array_fixint; - struct { - void *p; - uint32_t length; - } side_vla_fixint; - void *side_struct_sg_ptr; - - /* Dynamic type */ - struct side_arg_dynamic_vec dynamic; - } u; -}; + struct side_dynamic_struct_visitor side_dynamic_struct_visitor; + struct side_dynamic_vla_visitor side_dynamic_vla_visitor; +} SIDE_PACKED; + +struct side_arg { + enum side_type_label type; + union { + struct side_arg_static side_static; + struct side_arg_dynamic side_dynamic; + } SIDE_PACKED u; +} SIDE_PACKED; -struct side_arg_vec_description { - const struct side_arg_vec *sav; +struct side_arg_vec { + const struct side_arg *sav; uint32_t len; -}; +} SIDE_PACKED; + +struct side_arg_dynamic_field { + const char *field_name; + const struct side_arg elem; +} SIDE_PACKED; /* The visitor pattern is a double-dispatch visitor. */ struct side_tracer_visitor_ctx { enum side_visitor_status (*write_elem)( const struct side_tracer_visitor_ctx *tracer_ctx, - const struct side_arg_vec *elem); + const struct side_arg *elem); void *priv; /* Private tracer context. */ -}; +} SIDE_PACKED; struct side_tracer_dynamic_struct_visitor_ctx { enum side_visitor_status (*write_field)( const struct side_tracer_dynamic_struct_visitor_ctx *tracer_ctx, - const struct side_arg_dynamic_event_field *dynamic_field); + const struct side_arg_dynamic_field *dynamic_field); void *priv; /* Private tracer context. */ -}; +} SIDE_PACKED; -struct side_tracer_dynamic_vla_visitor_ctx { - enum side_visitor_status (*write_elem)( - const struct side_tracer_dynamic_vla_visitor_ctx *tracer_ctx, - const struct side_arg_dynamic_vec *elem); - void *priv; /* Private tracer context. */ -}; +struct side_event_description { + uintptr_t *enabled; + const char *provider_name; + const char *event_name; + const struct side_event_field *fields; + const struct side_attr *attr; + const struct side_callback *callbacks; + uint64_t flags; + uint32_t version; + uint32_t loglevel; /* enum side_loglevel */ + uint32_t nr_fields; + uint32_t nr_attr; + uint32_t nr_callbacks; +} SIDE_PACKED; /* Event and type attributes */ @@ -517,16 +541,16 @@ struct side_tracer_dynamic_vla_visitor_ctx { # define SIDE_TYPE_POINTER_HOST SIDE_TYPE_POINTER64 # define SIDE_TYPE_ARRAY_POINTER_HOST SIDE_TYPE_ARRAY_POINTER64 # define SIDE_TYPE_VLA_POINTER_HOST SIDE_TYPE_VLA_POINTER64 -# define SIDE_DYNAMIC_TYPE_POINTER_HOST SIDE_DYNAMIC_TYPE_POINTER64 +# define SIDE_TYPE_DYNAMIC_POINTER_HOST SIDE_TYPE_DYNAMIC_POINTER64 # define SIDE_ATTR_TYPE_POINTER_HOST SIDE_ATTR_TYPE_POINTER64 -# define SIDE_PTR_HOST .integer_value.side_u64 +# define SIDE_PTR_HOST .side_u64 #else # define SIDE_TYPE_POINTER_HOST SIDE_TYPE_POINTER32 # define SIDE_TYPE_ARRAY_POINTER_HOST SIDE_TYPE_ARRAY_POINTER32 # define SIDE_TYPE_VLA_POINTER_HOST SIDE_TYPE_VLA_POINTER32 -# define SIDE_DYNAMIC_TYPE_POINTER_HOST SIDE_DYNAMIC_TYPE_POINTER32 +# define SIDE_TYPE_DYNAMIC_POINTER_HOST SIDE_TYPE_DYNAMIC_POINTER32 # define SIDE_ATTR_TYPE_POINTER_HOST SIDE_ATTR_TYPE_POINTER32 -# define SIDE_PTR_HOST .integer_value.side_u32 +# define SIDE_PTR_HOST .side_u32 #endif #define side_attr(_key, _value) \ @@ -539,36 +563,73 @@ struct side_tracer_dynamic_vla_visitor_ctx { SIDE_COMPOUND_LITERAL(const struct side_attr, __VA_ARGS__) #define side_attr_null(_val) { .type = SIDE_ATTR_TYPE_NULL } -#define side_attr_bool(_val) { .type = SIDE_ATTR_TYPE_BOOL, .u = { .side_bool = !!(_val) } } -#define side_attr_u8(_val) { .type = SIDE_ATTR_TYPE_U8, .u = { .integer_value.side_u8 = (_val) } } -#define side_attr_u16(_val) { .type = SIDE_ATTR_TYPE_U16, .u = { .integer_value.side_u16 = (_val) } } -#define side_attr_u32(_val) { .type = SIDE_ATTR_TYPE_U32, .u = { .integer_value.side_u32 = (_val) } } -#define side_attr_u64(_val) { .type = SIDE_ATTR_TYPE_U64, .u = { .integer_value.side_u64 = (_val) } } -#define side_attr_s8(_val) { .type = SIDE_ATTR_TYPE_S8, .u = { .integer_value.side_s8 = (_val) } } -#define side_attr_s16(_val) { .type = SIDE_ATTR_TYPE_S16, .u = { .integer_value.side_s16 = (_val) } } -#define side_attr_s32(_val) { .type = SIDE_ATTR_TYPE_S32, .u = { .integer_value.side_s32 = (_val) } } -#define side_attr_s64(_val) { .type = SIDE_ATTR_TYPE_S64, .u = { .integer_value.side_s64 = (_val) } } -#define side_attr_pointer(_val) { .type = SIDE_ATTR_TYPE_POINTER_HOST, .u = { SIDE_PTR_HOST = (uintptr_t) (_val) } } -#define side_attr_float_binary16(_val) { .type = SIDE_ATTR_TYPE_FLOAT_BINARY16, .u = { .float_value.side_float_binary16 = (_val) } } -#define side_attr_float_binary32(_val) { .type = SIDE_ATTR_TYPE_FLOAT_BINARY32, .u = { .float_value.side_float_binary32 = (_val) } } -#define side_attr_float_binary64(_val) { .type = SIDE_ATTR_TYPE_FLOAT_BINARY64, .u = { .float_value.side_float_binary64 = (_val) } } -#define side_attr_float_binary128(_val) { .type = SIDE_ATTR_TYPE_FLOAT_BINARY128, .u = { .float_value.side_float_binary128 = (_val) } } -#define side_attr_string(_val) { .type = SIDE_ATTR_TYPE_STRING, .u = { .string = (uintptr_t) (_val) } } +#define side_attr_bool(_val) { .type = SIDE_ATTR_TYPE_BOOL, .u = { .bool_value = !!(_val) } } +#define side_attr_u8(_val) { .type = SIDE_ATTR_TYPE_U8, .u = { .integer_value = { .side_u8 = (_val) } } } +#define side_attr_u16(_val) { .type = SIDE_ATTR_TYPE_U16, .u = { .integer_value = { .side_u16 = (_val) } } } +#define side_attr_u32(_val) { .type = SIDE_ATTR_TYPE_U32, .u = { .integer_value = { .side_u32 = (_val) } } } +#define side_attr_u64(_val) { .type = SIDE_ATTR_TYPE_U64, .u = { .integer_value = { .side_u64 = (_val) } } } +#define side_attr_s8(_val) { .type = SIDE_ATTR_TYPE_S8, .u = { .integer_value = { .side_s8 = (_val) } } } +#define side_attr_s16(_val) { .type = SIDE_ATTR_TYPE_S16, .u = { .integer_value = { .side_s16 = (_val) } } } +#define side_attr_s32(_val) { .type = SIDE_ATTR_TYPE_S32, .u = { .integer_value = { .side_s32 = (_val) } } } +#define side_attr_s64(_val) { .type = SIDE_ATTR_TYPE_S64, .u = { .integer_value = { .side_s64 = (_val) } } } +#define side_attr_pointer(_val) { .type = SIDE_ATTR_TYPE_POINTER_HOST, .u = { .integer_value = { SIDE_PTR_HOST = (uintptr_t) (_val) } } } +#define side_attr_float_binary16(_val) { .type = SIDE_ATTR_TYPE_FLOAT_BINARY16, .u = { .float_value = { .side_float_binary16 = (_val) } } } +#define side_attr_float_binary32(_val) { .type = SIDE_ATTR_TYPE_FLOAT_BINARY32, .u = { .float_value = { .side_float_binary32 = (_val) } } } +#define side_attr_float_binary64(_val) { .type = SIDE_ATTR_TYPE_FLOAT_BINARY64, .u = { .float_value = { .side_float_binary64 = (_val) } } } +#define side_attr_float_binary128(_val) { .type = SIDE_ATTR_TYPE_FLOAT_BINARY128, .u = { .float_value = { .side_float_binary128 = (_val) } } } +#define side_attr_string(_val) { .type = SIDE_ATTR_TYPE_STRING, .u = { .string_value = (uintptr_t) (_val) } } /* Static field definition */ -#define _side_type_basic(_type, _byte_order, _attr) \ +#define side_type_null(_attr) \ { \ - .type = _type, \ + .type = SIDE_TYPE_NULL, \ .u = { \ - .side_basic = { \ + .side_null = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ + }, \ + } + +#define side_type_bool(_attr) \ + { \ + .type = SIDE_TYPE_BOOL, \ + .u = { \ + .side_bool = { \ .attr = _attr, \ .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ }, \ }, \ } +#define side_type_byte(_attr) \ + { \ + .type = SIDE_TYPE_BYTE, \ + .u = { \ + .side_byte = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ + }, \ + } + +#define side_type_string(_attr) \ + { \ + .type = SIDE_TYPE_STRING, \ + .u = { \ + .side_string = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ + }, \ + } + +#define side_type_dynamic() \ + { \ + .type = SIDE_TYPE_DYNAMIC, \ + } + #define _side_type_integer(_type, _signedness, _byte_order, _integer_size_bits, _len_bits, _attr) \ { \ .type = _type, \ @@ -591,8 +652,8 @@ struct side_tracer_dynamic_vla_visitor_ctx { .side_float = { \ .attr = _attr, \ .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ .float_size_bits = _float_size_bits, \ + .byte_order = _byte_order, \ }, \ }, \ } @@ -604,7 +665,6 @@ struct side_tracer_dynamic_vla_visitor_ctx { } /* Host endian */ -#define side_type_bool(_attr) _side_type_basic(SIDE_TYPE_BOOL, SIDE_TYPE_BYTE_ORDER_HOST, SIDE_PARAM(_attr)) #define side_type_u8(_attr) _side_type_integer(SIDE_TYPE_U8, false, SIDE_TYPE_BYTE_ORDER_HOST, 8, 8, SIDE_PARAM(_attr)) #define side_type_u16(_attr) _side_type_integer(SIDE_TYPE_U16, false, SIDE_TYPE_BYTE_ORDER_HOST, 16, 16, SIDE_PARAM(_attr)) #define side_type_u32(_attr) _side_type_integer(SIDE_TYPE_U32, false, SIDE_TYPE_BYTE_ORDER_HOST, 32, 32, SIDE_PARAM(_attr)) @@ -613,15 +673,14 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_type_s16(_attr) _side_type_integer(SIDE_TYPE_S16, true, SIDE_TYPE_BYTE_ORDER_HOST, 16, 16, SIDE_PARAM(_attr)) #define side_type_s32(_attr) _side_type_integer(SIDE_TYPE_S32, true, SIDE_TYPE_BYTE_ORDER_HOST, 32, 32, SIDE_PARAM(_attr)) #define side_type_s64(_attr) _side_type_integer(SIDE_TYPE_S64, true, SIDE_TYPE_BYTE_ORDER_HOST, 64, 64, SIDE_PARAM(_attr)) -#define side_type_byte(_attr) _side_type_basic(SIDE_TYPE_BYTE, SIDE_TYPE_BYTE_ORDER_HOST, SIDE_PARAM(_attr)) -#define side_type_pointer(_attr) _side_type_basic(SIDE_TYPE_POINTER_HOST, SIDE_TYPE_BYTE_ORDER_HOST, SIDE_PARAM(_attr)) +#define side_type_pointer(_attr) _side_type_integer(SIDE_TYPE_POINTER_HOST, false, SIDE_TYPE_BYTE_ORDER_HOST, SIDE_BITS_PER_LONG, \ + SIDE_BITS_PER_LONG, SIDE_PARAM(_attr)) #define side_type_float_binary16(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY16, SIDE_TYPE_FLOAT_WORD_ORDER_HOST, 16, SIDE_PARAM(_attr)) #define side_type_float_binary32(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY32, SIDE_TYPE_FLOAT_WORD_ORDER_HOST, 32, SIDE_PARAM(_attr)) #define side_type_float_binary64(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY64, SIDE_TYPE_FLOAT_WORD_ORDER_HOST, 64, SIDE_PARAM(_attr)) #define side_type_float_binary128(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY128, SIDE_TYPE_FLOAT_WORD_ORDER_HOST, 128, SIDE_PARAM(_attr)) -#define side_type_string(_attr) _side_type_basic(SIDE_TYPE_STRING, SIDE_TYPE_BYTE_ORDER_HOST, SIDE_PARAM(_attr)) -#define side_type_dynamic(_attr) _side_type_basic(SIDE_TYPE_DYNAMIC, SIDE_TYPE_BYTE_ORDER_HOST, SIDE_PARAM(_attr)) +#define side_field_null(_name, _attr) _side_field(_name, side_type_null(SIDE_PARAM(_attr))) #define side_field_bool(_name, _attr) _side_field(_name, side_type_bool(SIDE_PARAM(_attr))) #define side_field_u8(_name, _attr) _side_field(_name, side_type_u8(SIDE_PARAM(_attr))) #define side_field_u16(_name, _attr) _side_field(_name, side_type_u16(SIDE_PARAM(_attr))) @@ -638,7 +697,7 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_field_float_binary64(_name, _attr) _side_field(_name, side_type_float_binary64(SIDE_PARAM(_attr))) #define side_field_float_binary128(_name, _attr) _side_field(_name, side_type_float_binary128(SIDE_PARAM(_attr))) #define side_field_string(_name, _attr) _side_field(_name, side_type_string(SIDE_PARAM(_attr))) -#define side_field_dynamic(_name, _attr) _side_field(_name, side_type_dynamic(SIDE_PARAM(_attr))) +#define side_field_dynamic(_name) _side_field(_name, side_type_dynamic()) /* Little endian */ #define side_type_u16_le(_attr) _side_type_integer(SIDE_TYPE_U16, false, SIDE_TYPE_BYTE_ORDER_LE, 16, 16, SIDE_PARAM(_attr)) @@ -647,7 +706,8 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_type_s16_le(_attr) _side_type_integer(SIDE_TYPE_S16, true, SIDE_TYPE_BYTE_ORDER_LE, 16, 16, SIDE_PARAM(_attr)) #define side_type_s32_le(_attr) _side_type_integer(SIDE_TYPE_S32, true, SIDE_TYPE_BYTE_ORDER_LE, 32, 32, SIDE_PARAM(_attr)) #define side_type_s64_le(_attr) _side_type_integer(SIDE_TYPE_S64, true, SIDE_TYPE_BYTE_ORDER_LE, 64, 64, SIDE_PARAM(_attr)) -#define side_type_pointer_le(_attr) _side_type_basic(SIDE_TYPE_POINTER_HOST, SIDE_TYPE_BYTE_ORDER_LE, SIDE_PARAM(_attr)) +#define side_type_pointer_le(_attr) _side_type_integer(SIDE_TYPE_POINTER_HOST, false, SIDE_TYPE_BYTE_ORDER_LE, SIDE_BITS_PER_LONG, \ + SIDE_BITS_PER_LONG, SIDE_PARAM(_attr)) #define side_type_float_binary16_le(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY16, SIDE_TYPE_BYTE_ORDER_LE, 16, SIDE_PARAM(_attr)) #define side_type_float_binary32_le(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY32, SIDE_TYPE_BYTE_ORDER_LE, 32, SIDE_PARAM(_attr)) #define side_type_float_binary64_le(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY64, SIDE_TYPE_BYTE_ORDER_LE, 64, SIDE_PARAM(_attr)) @@ -672,7 +732,8 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_type_s16_be(_attr) _side_type_integer(SIDE_TYPE_S16, false, SIDE_TYPE_BYTE_ORDER_BE, 16, 16, SIDE_PARAM(_attr)) #define side_type_s32_be(_attr) _side_type_integer(SIDE_TYPE_S32, false, SIDE_TYPE_BYTE_ORDER_BE, 32, 32, SIDE_PARAM(_attr)) #define side_type_s64_be(_attr) _side_type_integer(SIDE_TYPE_S64, false, SIDE_TYPE_BYTE_ORDER_BE, 64, 64, SIDE_PARAM(_attr)) -#define side_type_pointer_be(_attr) _side_type_basic(SIDE_TYPE_POINTER_HOST, SIDE_TYPE_BYTE_ORDER_BE, SIDE_PARAM(_attr)) +#define side_type_pointer_be(_attr) _side_type_integer(SIDE_TYPE_POINTER_HOST, false, SIDE_TYPE_BYTE_ORDER_BE, SIDE_BITS_PER_LONG, \ + SIDE_BITS_PER_LONG, SIDE_PARAM(_attr)) #define side_type_float_binary16_be(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY16, SIDE_TYPE_BYTE_ORDER_BE, 16, SIDE_PARAM(_attr)) #define side_type_float_binary32_be(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY32, SIDE_TYPE_BYTE_ORDER_BE, 32, SIDE_PARAM(_attr)) #define side_type_float_binary64_be(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY64, SIDE_TYPE_BYTE_ORDER_BE, 64, SIDE_PARAM(_attr)) @@ -728,10 +789,10 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define _side_type_struct_define(_fields, _attr) \ { \ - .nr_fields = SIDE_ARRAY_SIZE(SIDE_PARAM(_fields)), \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ .fields = _fields, \ .attr = _attr, \ + .nr_fields = SIDE_ARRAY_SIZE(SIDE_PARAM(_fields)), \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ } #define side_define_struct(_identifier, _fields, _attr) \ @@ -741,66 +802,113 @@ struct side_tracer_dynamic_vla_visitor_ctx { SIDE_COMPOUND_LITERAL(const struct side_type_struct, \ _side_type_struct_define(SIDE_PARAM(_fields), SIDE_PARAM(_attr))) -/* Scatter-gather struct */ +/* Scatter-gather fields */ -#define _side_type_sg_integer(_type, _byte_order, _integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ +#define _side_type_sg_integer(_type, _signedness, _byte_order, _offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ { \ .type = _type, \ .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .integer_offset = _integer_offset, \ - .integer_size_bits = _integer_size_bits, \ - .offset_bits = _offset_bits, \ - .len_bits = _len_bits, \ + .side_sg = { \ + .offset = _offset, \ + .u = { \ + .side_integer = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .integer_size_bits = _integer_size_bits, \ + .len_bits = _len_bits, \ + .signedness = _signedness, \ + .byte_order = _byte_order, \ + }, \ + .offset_bits = _offset_bits, \ + }, \ + }, \ }, \ }, \ } -#define _side_field_sg(_name, _type) \ - { \ - .field_name = _name, \ - .side_type = _type, \ - } - #define side_type_sg_unsigned_integer(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ - _side_type_sg_integer(SIDE_TYPE_SG_UNSIGNED_INT, SIDE_TYPE_BYTE_ORDER_HOST, \ + _side_type_sg_integer(SIDE_TYPE_SG_UNSIGNED_INT, false, SIDE_TYPE_BYTE_ORDER_HOST, \ _integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr)) #define side_type_sg_signed_integer(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ - _side_type_sg_integer(SIDE_TYPE_SG_SIGNED_INT, SIDE_TYPE_BYTE_ORDER_HOST, \ + _side_type_sg_integer(SIDE_TYPE_SG_SIGNED_INT, true, SIDE_TYPE_BYTE_ORDER_HOST, \ + _integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr)) + +#define side_type_sg_unsigned_integer_le(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ + _side_type_sg_integer(SIDE_TYPE_SG_UNSIGNED_INT, false, SIDE_TYPE_BYTE_ORDER_LE, \ + _integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr)) +#define side_type_sg_signed_integer_le(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ + _side_type_sg_integer(SIDE_TYPE_SG_SIGNED_INT, true, SIDE_TYPE_BYTE_ORDER_LE, \ + _integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr)) + +#define side_type_sg_unsigned_integer_be(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ + _side_type_sg_integer(SIDE_TYPE_SG_UNSIGNED_INT, false, SIDE_TYPE_BYTE_ORDER_BE, \ + _integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr)) +#define side_type_sg_signed_integer_be(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ + _side_type_sg_integer(SIDE_TYPE_SG_SIGNED_INT, true, SIDE_TYPE_BYTE_ORDER_BE, \ _integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr)) #define side_field_sg_unsigned_integer(_name, _integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ - _side_field_sg(_name, side_type_sg_unsigned_integer(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr))) + _side_field(_name, side_type_sg_unsigned_integer(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr))) #define side_field_sg_signed_integer(_name, _integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ - _side_field_sg(_name, side_type_sg_signed_integer(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr))) + _side_field(_name, side_type_sg_signed_integer(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr))) -#define side_type_struct_sg(_struct_sg) \ +#define side_field_sg_unsigned_integer_le(_name, _integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ + _side_field(_name, side_type_sg_unsigned_integer_le(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr))) +#define side_field_sg_signed_integer_le(_name, _integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ + _side_field(_name, side_type_sg_signed_integer_le(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr))) + +#define side_field_sg_unsigned_integer_be(_name, _integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ + _side_field(_name, side_type_sg_unsigned_integer_be(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr))) +#define side_field_sg_signed_integer_be(_name, _integer_offset, _integer_size_bits, _offset_bits, _len_bits, _attr) \ + _side_field(_name, side_type_sg_signed_integer_be(_integer_offset, _integer_size_bits, _offset_bits, _len_bits, SIDE_PARAM(_attr))) + +#define _side_type_sg_float(_byte_order, _offset, _float_size_bits, _attr) \ { \ - .type = SIDE_TYPE_STRUCT_SG, \ + .type = SIDE_TYPE_SG_FLOAT, \ .u = { \ - .side_struct_sg = _struct_sg, \ + .side_sg = { \ + .offset = _offset, \ + .u = { \ + .side_float = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .float_size_bits = _float_size_bits, \ + .byte_order = _byte_order, \ + }, \ + }, \ + }, \ }, \ } -#define side_field_struct_sg(_name, _struct_sg) \ - _side_field(_name, side_type_struct_sg(SIDE_PARAM(_struct_sg))) -#define _side_type_struct_sg_define(_fields_sg, _attr) \ +#define side_type_sg_float(_offset, _float_size_bits, _attr) \ + _side_type_sg_float(SIDE_TYPE_FLOAT_WORD_ORDER_HOST, _offset, _float_size_bits, _attr) +#define side_type_sg_float_le(_offset, _float_size_bits, _attr) \ + _side_type_sg_float(SIDE_TYPE_BYTE_ORDER_LE, _offset, _float_size_bits, _attr) +#define side_type_sg_float_be(_offset, _float_size_bits, _attr) \ + _side_type_sg_float(SIDE_TYPE_BYTE_ORDER_BE, _offset, _float_size_bits, _attr) + +#define side_field_sg_float(_name, _offset, _float_size_bits, _attr) \ + _side_field(_name, side_type_sg_float(_offset, _float_size_bits, _attr)) +#define side_field_sg_float_le(_name, _offset, _float_size_bits, _attr) \ + _side_field(_name, side_type_sg_float_le(_offset, _float_size_bits, _attr)) +#define side_field_sg_float_be(_name, _offset, _float_size_bits, _attr) \ + _side_field(_name, side_type_sg_float_be(_offset, _float_size_bits, _attr)) + +#define side_type_sg_struct(_struct_sg, _offset) \ { \ - .nr_fields = SIDE_ARRAY_SIZE(SIDE_PARAM(_fields_sg)), \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .fields_sg = _fields_sg, \ - .attr = _attr, \ + .type = SIDE_TYPE_SG_STRUCT, \ + .u = { \ + .side_sg = { \ + .offset = _offset, \ + .u = { \ + .side_struct = _struct_sg, \ + }, \ + }, \ + }, \ } - -#define side_define_struct_sg(_identifier, _fields_sg, _attr) \ - const struct side_type_struct_sg _identifier = _side_type_struct_sg_define(SIDE_PARAM(_fields_sg), SIDE_PARAM(_attr)) - -#define side_struct_sg_literal(_fields_sg, _attr) \ - SIDE_COMPOUND_LITERAL(const struct side_type_struct_sg, \ - _side_type_struct_sg_define(SIDE_PARAM(_fields_sg), SIDE_PARAM(_attr))) +#define side_field_sg_struct(_name, _struct_sg, _offset) \ + _side_field(_name, side_type_sg_struct(SIDE_PARAM(_struct_sg), _offset)) #define side_type_array(_elem_type, _length, _attr) \ { \ @@ -847,316 +955,204 @@ struct side_tracer_dynamic_vla_visitor_ctx { _side_field(_name, side_type_vla_visitor(SIDE_PARAM(_elem_type), _visitor, SIDE_PARAM(_attr))) #define side_elem(...) \ - SIDE_COMPOUND_LITERAL(const struct side_type_description, __VA_ARGS__) + SIDE_COMPOUND_LITERAL(const struct side_type, __VA_ARGS__) #define side_field_list(...) \ SIDE_COMPOUND_LITERAL(const struct side_event_field, __VA_ARGS__) -#define side_field_sg_list(...) \ - SIDE_COMPOUND_LITERAL(const struct side_struct_field_sg, __VA_ARGS__) - /* Static field arguments */ -#define side_arg_bool(_val) { .type = SIDE_TYPE_BOOL, .u = { .side_bool = !!(_val) } } -#define side_arg_u8(_val) { .type = SIDE_TYPE_U8, .u = { .integer_value.side_u8 = (_val) } } -#define side_arg_u16(_val) { .type = SIDE_TYPE_U16, .u = { .integer_value.side_u16 = (_val) } } -#define side_arg_u32(_val) { .type = SIDE_TYPE_U32, .u = { .integer_value.side_u32 = (_val) } } -#define side_arg_u64(_val) { .type = SIDE_TYPE_U64, .u = { .integer_value.side_u64 = (_val) } } -#define side_arg_s8(_val) { .type = SIDE_TYPE_S8, .u = { .integer_value.side_s8 = (_val) } } -#define side_arg_s16(_val) { .type = SIDE_TYPE_S16, .u = { .integer_value.side_s16 = (_val) } } -#define side_arg_s32(_val) { .type = SIDE_TYPE_S32, .u = { .integer_value.side_s32 = (_val) } } -#define side_arg_s64(_val) { .type = SIDE_TYPE_S64, .u = { .integer_value.side_s64 = (_val) } } -#define side_arg_byte(_val) { .type = SIDE_TYPE_BYTE, .u = { .side_byte = (_val) } } -#define side_arg_pointer(_val) { .type = SIDE_TYPE_POINTER_HOST, .u = { SIDE_PTR_HOST = (uintptr_t) (_val) } } -#define side_arg_enum_bitmap8(_val) { .type = SIDE_TYPE_ENUM_BITMAP8, .u = { .integer_value.side_u8 = (_val) } } -#define side_arg_enum_bitmap16(_val) { .type = SIDE_TYPE_ENUM_BITMAP16, .u = { .integer_value.side_u16 = (_val) } } -#define side_arg_enum_bitmap32(_val) { .type = SIDE_TYPE_ENUM_BITMAP32, .u = { .integer_value.side_u32 = (_val) } } -#define side_arg_enum_bitmap64(_val) { .type = SIDE_TYPE_ENUM_BITMAP64, .u = { .integer_value.side_u64 = (_val) } } -#define side_arg_enum_bitmap_array(_side_type) { .type = SIDE_TYPE_ENUM_BITMAP_ARRAY, .u = { .side_array = (_side_type) } } -#define side_arg_enum_bitmap_vla(_side_type) { .type = SIDE_TYPE_ENUM_BITMAP_VLA, .u = { .side_vla = (_side_type) } } -#define side_arg_float_binary16(_val) { .type = SIDE_TYPE_FLOAT_BINARY16, .u = { .float_value.side_float_binary16 = (_val) } } -#define side_arg_float_binary32(_val) { .type = SIDE_TYPE_FLOAT_BINARY32, .u = { .float_value.side_float_binary32 = (_val) } } -#define side_arg_float_binary64(_val) { .type = SIDE_TYPE_FLOAT_BINARY64, .u = { .float_value.side_float_binary64 = (_val) } } -#define side_arg_float_binary128(_val) { .type = SIDE_TYPE_FLOAT_BINARY128, .u = { .float_value.side_float_binary128 = (_val) } } - -#define side_arg_string(_val) { .type = SIDE_TYPE_STRING, .u = { .string = (uintptr_t) (_val) } } -#define side_arg_struct(_side_type) { .type = SIDE_TYPE_STRUCT, .u = { .side_struct = (_side_type) } } -#define side_arg_struct_sg(_ptr) { .type = SIDE_TYPE_STRUCT_SG, .u = { .side_struct_sg_ptr = (_ptr) } } -#define side_arg_array(_side_type) { .type = SIDE_TYPE_ARRAY, .u = { .side_array = (_side_type) } } -#define side_arg_vla(_side_type) { .type = SIDE_TYPE_VLA, .u = { .side_vla = (_side_type) } } -#define side_arg_vla_visitor(_ctx) { .type = SIDE_TYPE_VLA_VISITOR, .u = { .side_vla_app_visitor_ctx = (_ctx) } } - -#define side_arg_array_u8(_ptr) { .type = SIDE_TYPE_ARRAY_U8, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_u16(_ptr) { .type = SIDE_TYPE_ARRAY_U16, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_u32(_ptr) { .type = SIDE_TYPE_ARRAY_U32, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_u64(_ptr) { .type = SIDE_TYPE_ARRAY_U64, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_s8(_ptr) { .type = SIDE_TYPE_ARRAY_S8, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_s16(_ptr) { .type = SIDE_TYPE_ARRAY_S16, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_s32(_ptr) { .type = SIDE_TYPE_ARRAY_S32, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_s64(_ptr) { .type = SIDE_TYPE_ARRAY_S64, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_byte(_ptr) { .type = SIDE_TYPE_ARRAY_BYTE, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_pointer(_ptr) { .type = SIDE_TYPE_ARRAY_POINTER_HOST, .u = { .side_array_fixint = (_ptr) } } - -#define side_arg_vla_u8(_ptr, _length) { .type = SIDE_TYPE_VLA_U8, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } -#define side_arg_vla_u16(_ptr, _length) { .type = SIDE_TYPE_VLA_U16, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_u32(_ptr, _length) { .type = SIDE_TYPE_VLA_U32, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_u64(_ptr, _length) { .type = SIDE_TYPE_VLA_U64, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_s8(_ptr, _length) { .type = SIDE_TYPE_VLA_S8, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_s16(_ptr, _length) { .type = SIDE_TYPE_VLA_S16, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_s32(_ptr, _length) { .type = SIDE_TYPE_VLA_S32, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_s64(_ptr, _length) { .type = SIDE_TYPE_VLA_S64, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_byte(_ptr, _length) { .type = SIDE_TYPE_VLA_BYTE, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_pointer(_ptr, _length) { .type = SIDE_TYPE_VLA_POINTER_HOST, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } - -#define side_arg_dynamic(_dynamic_arg_type) \ - { \ - .type = SIDE_TYPE_DYNAMIC, \ - .u = { \ - .dynamic = _dynamic_arg_type, \ - }, \ - } +#define side_arg_null(_val) { .type = SIDE_TYPE_NULL } +#define side_arg_bool(_val) { .type = SIDE_TYPE_BOOL, .u = { .side_static = { .bool_value = !!(_val) } } } +#define side_arg_byte(_val) { .type = SIDE_TYPE_BYTE, .u = { .side_static = { .byte_value = (_val) } } } +#define side_arg_string(_val) { .type = SIDE_TYPE_STRING, .u = { .side_static = { .string_value = (uintptr_t) (_val) } } } + +#define side_arg_u8(_val) { .type = SIDE_TYPE_U8, .u = { .side_static = { .integer_value = { .side_u8 = (_val) } } } } +#define side_arg_u16(_val) { .type = SIDE_TYPE_U16, .u = { .side_static = { .integer_value = { .side_u16 = (_val) } } } } +#define side_arg_u32(_val) { .type = SIDE_TYPE_U32, .u = { .side_static = { .integer_value = { .side_u32 = (_val) } } } } +#define side_arg_u64(_val) { .type = SIDE_TYPE_U64, .u = { .side_static = { .integer_value = { .side_u64 = (_val) } } } } +#define side_arg_s8(_val) { .type = SIDE_TYPE_S8, .u = { .side_static = { .integer_value = { .side_s8 = (_val) } } } } +#define side_arg_s16(_val) { .type = SIDE_TYPE_S16, .u = { .side_static = { .integer_value = { .side_s16 = (_val) } } } } +#define side_arg_s32(_val) { .type = SIDE_TYPE_S32, .u = { .side_static = { .integer_value = { .side_s32 = (_val) } } } } +#define side_arg_s64(_val) { .type = SIDE_TYPE_S64, .u = { .side_static = { .integer_value = { .side_s64 = (_val) } } } } +#define side_arg_pointer(_val) { .type = SIDE_TYPE_POINTER_HOST, .u = { .side_static = { .integer_value = { SIDE_PTR_HOST = (uintptr_t) (_val) } } } } +#define side_arg_enum_bitmap8(_val) { .type = SIDE_TYPE_ENUM_BITMAP8, .u = { .side_static = { .integer_value = { .side_u8 = (_val) } } } } +#define side_arg_enum_bitmap16(_val) { .type = SIDE_TYPE_ENUM_BITMAP16, .u = { .side_static = { .integer_value = { .side_u16 = (_val) } } } } +#define side_arg_enum_bitmap32(_val) { .type = SIDE_TYPE_ENUM_BITMAP32, .u = { .side_static = { .integer_value = { .side_u32 = (_val) } } } } +#define side_arg_enum_bitmap64(_val) { .type = SIDE_TYPE_ENUM_BITMAP64, .u = { .side_static = { .integer_value = { .side_u64 = (_val) } } } } +#define side_arg_enum_bitmap_array(_side_type) { .type = SIDE_TYPE_ENUM_BITMAP_ARRAY, .u = { .side_static = { .side_array = (_side_type) } } } +#define side_arg_enum_bitmap_vla(_side_type) { .type = SIDE_TYPE_ENUM_BITMAP_VLA, .u = { .side_static = { .side_vla = (_side_type) } } } +#define side_arg_float_binary16(_val) { .type = SIDE_TYPE_FLOAT_BINARY16, .u = { .side_static = { .float_value = { .side_float_binary16 = (_val) } } } } +#define side_arg_float_binary32(_val) { .type = SIDE_TYPE_FLOAT_BINARY32, .u = { .side_static = { .float_value = { .side_float_binary32 = (_val) } } } } +#define side_arg_float_binary64(_val) { .type = SIDE_TYPE_FLOAT_BINARY64, .u = { .side_static = { .float_value = { .side_float_binary64 = (_val) } } } } +#define side_arg_float_binary128(_val) { .type = SIDE_TYPE_FLOAT_BINARY128, .u = { .side_static = { .float_value = { .side_float_binary128 = (_val) } } } } + +#define side_arg_struct(_side_type) { .type = SIDE_TYPE_STRUCT, .u = { .side_static = { .side_struct = (_side_type) } } } +#define side_arg_sg_struct(_ptr) { .type = SIDE_TYPE_SG_STRUCT, .u = { .side_static = { .side_struct_sg_ptr = (_ptr) } } } +#define side_arg_sg_unsigned_integer(_ptr) { .type = SIDE_TYPE_SG_UNSIGNED_INT, .u = { .side_static = { .side_integer_sg_ptr = (_ptr) } } } +#define side_arg_sg_signed_integer(_ptr) { .type = SIDE_TYPE_SG_SIGNED_INT, .u = { .side_static = { .side_integer_sg_ptr = (_ptr) } } } +#define side_arg_sg_float(_ptr) { .type = SIDE_TYPE_SG_FLOAT, .u = { .side_static = { .side_float_sg_ptr = (_ptr) } } } +#define side_arg_array(_side_type) { .type = SIDE_TYPE_ARRAY, .u = { .side_static = { .side_array = (_side_type) } } } +#define side_arg_vla(_side_type) { .type = SIDE_TYPE_VLA, .u = { .side_static = { .side_vla = (_side_type) } } } +#define side_arg_vla_visitor(_ctx) { .type = SIDE_TYPE_VLA_VISITOR, .u = { .side_static = { .side_vla_app_visitor_ctx = (_ctx) } } } + +#define side_arg_array_u8(_ptr) { .type = SIDE_TYPE_ARRAY_U8, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_u16(_ptr) { .type = SIDE_TYPE_ARRAY_U16, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_u32(_ptr) { .type = SIDE_TYPE_ARRAY_U32, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_u64(_ptr) { .type = SIDE_TYPE_ARRAY_U64, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_s8(_ptr) { .type = SIDE_TYPE_ARRAY_S8, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_s16(_ptr) { .type = SIDE_TYPE_ARRAY_S16, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_s32(_ptr) { .type = SIDE_TYPE_ARRAY_S32, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_s64(_ptr) { .type = SIDE_TYPE_ARRAY_S64, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_byte(_ptr) { .type = SIDE_TYPE_ARRAY_BYTE, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_pointer(_ptr) { .type = SIDE_TYPE_ARRAY_POINTER_HOST, .u = { .side_static = { .side_array_fixint = (_ptr) } } } + +#define side_arg_vla_u8(_ptr, _length) { .type = SIDE_TYPE_VLA_U8, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } +#define side_arg_vla_u16(_ptr, _length) { .type = SIDE_TYPE_VLA_U16, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_u32(_ptr, _length) { .type = SIDE_TYPE_VLA_U32, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_u64(_ptr, _length) { .type = SIDE_TYPE_VLA_U64, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_s8(_ptr, _length) { .type = SIDE_TYPE_VLA_S8, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_s16(_ptr, _length) { .type = SIDE_TYPE_VLA_S16, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_s32(_ptr, _length) { .type = SIDE_TYPE_VLA_S32, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_s64(_ptr, _length) { .type = SIDE_TYPE_VLA_S64, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_byte(_ptr, _length) { .type = SIDE_TYPE_VLA_BYTE, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_pointer(_ptr, _length) { .type = SIDE_TYPE_VLA_POINTER_HOST, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } /* Dynamic field arguments */ #define side_arg_dynamic_null(_attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_NULL, \ + .type = SIDE_TYPE_DYNAMIC_NULL, \ .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \ + .side_dynamic = { \ + .side_null = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ }, \ }, \ } #define side_arg_dynamic_bool(_val, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_BOOL, \ + .type = SIDE_TYPE_DYNAMIC_BOOL, \ .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \ - .u = { \ - .side_bool = !!(_val), \ + .side_dynamic = { \ + .side_bool = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ + .value = !!(_val), \ }, \ }, \ }, \ } -#define side_arg_dynamic_u8(_val, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_U8, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \ - .u = { \ - .integer_value.side_u8 = (_val), \ - }, \ - }, \ - }, \ - } -#define side_arg_dynamic_s8(_val, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_S8, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \ - .u = { \ - .integer_value.side_s8 = (_val), \ - }, \ - }, \ - }, \ - } #define side_arg_dynamic_byte(_val, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_BYTE, \ + .type = SIDE_TYPE_DYNAMIC_BYTE, \ .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \ - .u = { \ - .side_byte = (_val), \ + .side_dynamic = { \ + .side_byte = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ + .value = (_val), \ }, \ }, \ }, \ } #define side_arg_dynamic_string(_val, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_STRING, \ + .type = SIDE_TYPE_DYNAMIC_STRING, \ .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \ - .u = { \ - .string = (uintptr_t) (_val), \ + .side_dynamic = { \ + .side_string = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ + .value = (uintptr_t) (_val), \ }, \ }, \ }, \ } -#define _side_arg_dynamic_u16(_val, _byte_order, _attr) \ +#define _side_arg_dynamic_integer(_field, _val, _type, _signedness, _byte_order, _integer_size_bits, _len_bits, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_U16, \ + .type = _type, \ .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - .integer_value.side_u16 = (_val), \ + .side_dynamic = { \ + .side_integer = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .integer_size_bits = _integer_size_bits, \ + .len_bits = _len_bits, \ + .signedness = _signedness, \ + .byte_order = _byte_order, \ + }, \ + .value = { \ + _field = (_val), \ + }, \ }, \ }, \ }, \ } + +#define side_arg_dynamic_u8(_val, _attr) \ + _side_arg_dynamic_integer(.side_u8, _val, SIDE_TYPE_DYNAMIC_U8, false, SIDE_TYPE_BYTE_ORDER_HOST, 8, 8, SIDE_PARAM(_attr)) +#define side_arg_dynamic_s8(_val, _attr) \ + _side_arg_dynamic_integer(.side_s8, _val, SIDE_TYPE_DYNAMIC_S8, true, SIDE_TYPE_BYTE_ORDER_HOST, 8, 8, SIDE_PARAM(_attr)) + +#define _side_arg_dynamic_u16(_val, _byte_order, _attr) \ + _side_arg_dynamic_integer(.side_u16, _val, SIDE_TYPE_DYNAMIC_U16, false, _byte_order, 16, 16, SIDE_PARAM(_attr)) #define _side_arg_dynamic_u32(_val, _byte_order, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_U32, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - .integer_value.side_u32 = (_val), \ - }, \ - }, \ - }, \ - } + _side_arg_dynamic_integer(.side_u32, _val, SIDE_TYPE_DYNAMIC_U32, false, _byte_order, 32, 32, SIDE_PARAM(_attr)) #define _side_arg_dynamic_u64(_val, _byte_order, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_U64, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - .integer_value.side_u64 = (_val), \ - }, \ - }, \ - }, \ - } + _side_arg_dynamic_integer(.side_u64, _val, SIDE_TYPE_DYNAMIC_U64, false, _byte_order, 64, 64, SIDE_PARAM(_attr)) #define _side_arg_dynamic_s16(_val, _byte_order, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_S16, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - .integer_value.side_s16 = (_val), \ - }, \ - }, \ - }, \ - } + _side_arg_dynamic_integer(.side_s16, _val, SIDE_TYPE_DYNAMIC_S16, true, _byte_order, 16, 16, SIDE_PARAM(_attr)) #define _side_arg_dynamic_s32(_val, _byte_order, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_S32, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - .integer_value.side_s32 = (_val), \ - }, \ - }, \ - }, \ - } + _side_arg_dynamic_integer(.side_s32, _val, SIDE_TYPE_DYNAMIC_S32, true, _byte_order, 32, 32, SIDE_PARAM(_attr)) #define _side_arg_dynamic_s64(_val, _byte_order, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_S64, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - .integer_value.side_s64 = (_val), \ - }, \ - }, \ - }, \ - } + _side_arg_dynamic_integer(.side_s64, _val, SIDE_TYPE_DYNAMIC_S64, true, _byte_order, 64, 64, SIDE_PARAM(_attr)) + #define _side_arg_dynamic_pointer(_val, _byte_order, _attr) \ + _side_arg_dynamic_integer(SIDE_PTR_HOST, (uintptr_t) (_val), SIDE_TYPE_DYNAMIC_POINTER_HOST, false, _byte_order, \ + SIDE_BITS_PER_LONG, SIDE_BITS_PER_LONG, SIDE_PARAM(_attr)) + +#define _side_arg_dynamic_float(_field, _val, _type, _byte_order, _float_size_bits, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_POINTER_HOST, \ + .type = _type, \ .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - SIDE_PTR_HOST = (uintptr_t) (_val), \ + .side_dynamic = { \ + .side_float = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .float_size_bits = _float_size_bits, \ + .byte_order = _byte_order, \ + }, \ + .value = { \ + _field = (_val), \ + }, \ }, \ }, \ }, \ } + #define _side_arg_dynamic_float_binary16(_val, _byte_order, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_FLOAT_BINARY16, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - .float_value.side_float_binary16 = (_val), \ - }, \ - }, \ - }, \ - } + _side_arg_dynamic_float(.side_float_binary16, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY16, _byte_order, 16, SIDE_PARAM(_attr)) #define _side_arg_dynamic_float_binary32(_val, _byte_order, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_FLOAT_BINARY32, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - .float_value.side_float_binary32 = (_val), \ - }, \ - }, \ - }, \ - } + _side_arg_dynamic_float(.side_float_binary32, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY32, _byte_order, 32, SIDE_PARAM(_attr)) #define _side_arg_dynamic_float_binary64(_val, _byte_order, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_FLOAT_BINARY64, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - .float_value.side_float_binary64 = (_val), \ - }, \ - }, \ - }, \ - } + _side_arg_dynamic_float(.side_float_binary64, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY64, _byte_order, 64, SIDE_PARAM(_attr)) #define _side_arg_dynamic_float_binary128(_val, _byte_order, _attr) \ - { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_FLOAT_BINARY128, \ - .u = { \ - .side_basic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .u = { \ - .float_value.side_float_binary128 = (_val), \ - }, \ - }, \ - }, \ - } + _side_arg_dynamic_float(.side_float_binary128, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY128, _byte_order, 128, SIDE_PARAM(_attr)) /* Host endian */ #define side_arg_dynamic_u16(_val, _attr) _side_arg_dynamic_u16(_val, SIDE_TYPE_BYTE_ORDER_HOST, SIDE_PARAM(_attr)) @@ -1199,49 +1195,57 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_arg_dynamic_vla(_vla) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_VLA, \ + .type = SIDE_TYPE_DYNAMIC_VLA, \ .u = { \ - .side_dynamic_vla = (_vla), \ + .side_dynamic = { \ + .side_dynamic_vla = (_vla), \ + }, \ }, \ } #define side_arg_dynamic_vla_visitor(_dynamic_vla_visitor, _ctx, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_VLA_VISITOR, \ + .type = SIDE_TYPE_DYNAMIC_VLA_VISITOR, \ .u = { \ - .side_dynamic_vla_visitor = { \ - .app_ctx = _ctx, \ - .visitor = _dynamic_vla_visitor, \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .side_dynamic = { \ + .side_dynamic_vla_visitor = { \ + .app_ctx = _ctx, \ + .visitor = _dynamic_vla_visitor, \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ }, \ }, \ } #define side_arg_dynamic_struct(_struct) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_STRUCT, \ + .type = SIDE_TYPE_DYNAMIC_STRUCT, \ .u = { \ - .side_dynamic_struct = (_struct), \ + .side_dynamic = { \ + .side_dynamic_struct = (_struct), \ + }, \ }, \ } #define side_arg_dynamic_struct_visitor(_dynamic_struct_visitor, _ctx, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_STRUCT_VISITOR, \ + .type = SIDE_TYPE_DYNAMIC_STRUCT_VISITOR, \ .u = { \ - .side_dynamic_struct_visitor = { \ - .app_ctx = _ctx, \ - .visitor = _dynamic_struct_visitor, \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .side_dynamic = { \ + .side_dynamic_struct_visitor = { \ + .app_ctx = _ctx, \ + .visitor = _dynamic_struct_visitor, \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ }, \ }, \ } #define side_arg_dynamic_define_vec(_identifier, _sav, _attr) \ - const struct side_arg_dynamic_vec _identifier##_vec[] = { _sav }; \ - const struct side_arg_dynamic_vec_vla _identifier = { \ + const struct side_arg _identifier##_vec[] = { _sav }; \ + const struct side_arg_dynamic_vla _identifier = { \ .sav = _identifier##_vec, \ .attr = _attr, \ .len = SIDE_ARRAY_SIZE(_identifier##_vec), \ @@ -1249,8 +1253,8 @@ struct side_tracer_dynamic_vla_visitor_ctx { } #define side_arg_dynamic_define_struct(_identifier, _struct_fields, _attr) \ - const struct side_arg_dynamic_event_field _identifier##_fields[] = { _struct_fields }; \ - const struct side_arg_dynamic_event_struct _identifier = { \ + const struct side_arg_dynamic_field _identifier##_fields[] = { _struct_fields }; \ + const struct side_arg_dynamic_struct _identifier = { \ .fields = _identifier##_fields, \ .attr = _attr, \ .len = SIDE_ARRAY_SIZE(_identifier##_fields), \ @@ -1258,8 +1262,8 @@ struct side_tracer_dynamic_vla_visitor_ctx { } #define side_arg_define_vec(_identifier, _sav) \ - const struct side_arg_vec _identifier##_vec[] = { _sav }; \ - const struct side_arg_vec_description _identifier = { \ + const struct side_arg _identifier##_vec[] = { _sav }; \ + const struct side_arg_vec _identifier = { \ .sav = _identifier##_vec, \ .len = SIDE_ARRAY_SIZE(_identifier##_vec), \ } @@ -1328,12 +1332,12 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_event_call(_identifier, _sav) \ { \ - const struct side_arg_vec side_sav[] = { _sav }; \ - const struct side_arg_vec_description sav_desc = { \ + const struct side_arg side_sav[] = { _sav }; \ + const struct side_arg_vec side_arg_vec = { \ .sav = side_sav, \ .len = SIDE_ARRAY_SIZE(side_sav), \ }; \ - side_call(&(_identifier), &sav_desc); \ + side_call(&(_identifier), &side_arg_vec); \ } #define side_event(_identifier, _sav) \ @@ -1342,19 +1346,19 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_event_call_variadic(_identifier, _sav, _var_fields, _attr) \ { \ - const struct side_arg_vec side_sav[] = { _sav }; \ - const struct side_arg_vec_description sav_desc = { \ + const struct side_arg side_sav[] = { _sav }; \ + const struct side_arg_vec side_arg_vec = { \ .sav = side_sav, \ .len = SIDE_ARRAY_SIZE(side_sav), \ }; \ - const struct side_arg_dynamic_event_field side_fields[] = { _var_fields }; \ - const struct side_arg_dynamic_event_struct var_struct = { \ + const struct side_arg_dynamic_field side_fields[] = { _var_fields }; \ + const struct side_arg_dynamic_struct var_struct = { \ .fields = side_fields, \ .attr = _attr, \ .len = SIDE_ARRAY_SIZE(side_fields), \ .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ }; \ - side_call_variadic(&(_identifier), &sav_desc, &var_struct); \ + side_call_variadic(&(_identifier), &side_arg_vec, &var_struct); \ } #define side_event_variadic(_identifier, _sav, _var, _attr) \ @@ -1390,20 +1394,20 @@ struct side_tracer_dynamic_vla_visitor_ctx { SIDE_PARAM(_attr), SIDE_EVENT_FLAG_VARIADIC) #define side_hidden_event(_identifier, _provider, _event, _loglevel, _fields, _attr) \ - _side_define_event(__attribute__((visibility("hidden"))), _identifier, _provider, _event, _loglevel, SIDE_PARAM(_fields), \ - SIDE_PARAM(_attr), 0) + _side_define_event(__attribute__((visibility("hidden"))), _identifier, _provider, _event, \ + _loglevel, SIDE_PARAM(_fields), SIDE_PARAM(_attr), 0) #define side_hidden_event_variadic(_identifier, _provider, _event, _loglevel, _fields, _attr) \ - _side_define_event(__attribute__((visibility("hidden"))), _identifier, _provider, _event, _loglevel, SIDE_PARAM(_fields), \ - SIDE_PARAM(_attr), SIDE_EVENT_FLAG_VARIADIC) + _side_define_event(__attribute__((visibility("hidden"))), _identifier, _provider, _event, \ + _loglevel, SIDE_PARAM(_fields), SIDE_PARAM(_attr), SIDE_EVENT_FLAG_VARIADIC) #define side_export_event(_identifier, _provider, _event, _loglevel, _fields, _attr) \ - _side_define_event(__attribute__((visibility("default"))), _identifier, _provider, _event, _loglevel, SIDE_PARAM(_fields), \ - SIDE_PARAM(_attr), 0) + _side_define_event(__attribute__((visibility("default"))), _identifier, _provider, _event, \ + _loglevel, SIDE_PARAM(_fields), SIDE_PARAM(_attr), 0) #define side_export_event_variadic(_identifier, _provider, _event, _loglevel, _fields, _attr) \ - _side_define_event(__attribute__((visibility("default"))), _identifier, _provider, _event, _loglevel, SIDE_PARAM(_fields), \ - SIDE_PARAM(_attr), SIDE_EVENT_FLAG_VARIADIC) + _side_define_event(__attribute__((visibility("default"))), _identifier, _provider, _event, \ + _loglevel, SIDE_PARAM(_fields), SIDE_PARAM(_attr), SIDE_EVENT_FLAG_VARIADIC) #define side_declare_event(_identifier) \ extern uintptr_t side_event_enable_##_identifier; \ @@ -1412,35 +1416,36 @@ struct side_tracer_dynamic_vla_visitor_ctx { extern const struct side_callback side_empty_callback; void side_call(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc); + const struct side_arg_vec *side_arg_vec); void side_call_variadic(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, - const struct side_arg_dynamic_event_struct *var_struct); + const struct side_arg_vec *side_arg_vec, + const struct side_arg_dynamic_struct *var_struct); int side_tracer_callback_register(struct side_event_description *desc, void (*call)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *side_arg_vec, void *priv), void *priv); int side_tracer_callback_variadic_register(struct side_event_description *desc, void (*call_variadic)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, - const struct side_arg_dynamic_event_struct *var_struct, + const struct side_arg_vec *side_arg_vec, + const struct side_arg_dynamic_struct *var_struct, void *priv), void *priv); int side_tracer_callback_unregister(struct side_event_description *desc, void (*call)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *side_arg_vec, void *priv), void *priv); int side_tracer_callback_variadic_unregister(struct side_event_description *desc, void (*call_variadic)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, - const struct side_arg_dynamic_event_struct *var_struct, + const struct side_arg_vec *side_arg_vec, + const struct side_arg_dynamic_struct *var_struct, void *priv), void *priv); -struct side_events_register_handle *side_events_register(struct side_event_description **events, uint32_t nr_events); +struct side_events_register_handle *side_events_register(struct side_event_description **events, + uint32_t nr_events); void side_events_unregister(struct side_events_register_handle *handle); enum side_tracer_notification {