struct side_arg_dynamic_struct;
struct side_events_register_handle;
struct side_arg_variant;
+struct side_event_state;
enum side_type_label {
/* Stack-copy basic types */
SIDE_VISITOR_STATUS_ERROR = -1,
};
+//TODO: side_error enum is currently unused.
enum side_error {
SIDE_ERROR_OK = 0,
SIDE_ERROR_INVAL = 1,
struct side_type_raw_string {
side_ptr_t(const void) p; /* pointer to string */
uint8_t unit_size; /* 1, 2, or 4 bytes */
- uint8_t byte_order; /* enum side_type_label_byte_order */
+ side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order;
} SIDE_PACKED;
struct side_attr_value {
- uint32_t type; /* enum side_attr_type */
+ side_enum_t(enum side_attr_type, uint32_t) type;
union {
uint8_t bool_value;
struct side_type_raw_string string_value;
uint32_t nr_attr;
uint16_t bool_size; /* bytes */
uint16_t len_bits; /* bits. 0 for (bool_size * CHAR_BITS) */
- uint8_t byte_order; /* enum side_type_label_byte_order */
+ side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order;
} SIDE_PACKED;
struct side_type_byte {
side_ptr_t(const struct side_attr) attr;
uint32_t nr_attr;
uint8_t unit_size; /* 1, 2, or 4 bytes */
- uint8_t byte_order; /* enum side_type_label_byte_order */
+ side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order;
} SIDE_PACKED;
struct side_type_integer {
uint16_t integer_size; /* bytes */
uint16_t len_bits; /* bits. 0 for (integer_size * CHAR_BITS) */
uint8_t signedness; /* true/false */
- uint8_t byte_order; /* enum side_type_label_byte_order */
+ side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order;
} SIDE_PACKED;
struct side_type_float {
side_ptr_t(const struct side_attr) attr;
uint32_t nr_attr;
uint16_t float_size; /* bytes */
- uint8_t byte_order; /* enum side_type_label_byte_order */
+ side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order;
} SIDE_PACKED;
struct side_enum_mapping {
} SIDE_PACKED;
struct side_type_struct {
- const struct side_event_field *fields;
+ side_ptr_t(const struct side_event_field) fields;
side_ptr_t(const struct side_attr) attr;
uint32_t nr_fields;
uint32_t nr_attr;
} SIDE_PACKED;
struct side_type_array {
- const struct side_type *elem_type;
+ side_ptr_t(const struct side_type) elem_type;
side_ptr_t(const struct side_attr) attr;
uint32_t length;
uint32_t nr_attr;
} SIDE_PACKED;
struct side_type_vla {
- const struct side_type *elem_type;
+ side_ptr_t(const struct side_type) elem_type;
side_ptr_t(const struct side_attr) attr;
uint32_t nr_attr;
} SIDE_PACKED;
struct side_type_vla_visitor {
- const struct side_type *elem_type;
+ side_ptr_t(const struct side_type) elem_type;
side_visitor_func visitor;
side_ptr_t(const struct side_attr) attr;
uint32_t nr_attr;
struct side_type_enum {
side_ptr_t(const struct side_enum_mappings) mappings;
- const struct side_type *elem_type;
+ side_ptr_t(const struct side_type) elem_type;
} SIDE_PACKED;
struct side_type_enum_bitmap {
side_ptr_t(const struct side_enum_bitmap_mappings) mappings;
- const struct side_type *elem_type;
+ side_ptr_t(const struct side_type) elem_type;
} SIDE_PACKED;
struct side_type_gather_bool {
struct side_type_gather_enum {
side_ptr_t(const struct side_enum_mappings) mappings;
- const struct side_type *elem_type;
+ side_ptr_t(const struct side_type) elem_type;
} SIDE_PACKED;
struct side_type_gather_struct {
uint64_t offset; /* bytes */
uint8_t access_mode; /* enum side_type_gather_access_mode */
- const struct side_type_struct *type;
+ side_ptr_t(const struct side_type_struct) type;
uint32_t size; /* bytes */
} SIDE_PACKED;
} SIDE_PACKED;
struct side_type_gather_vla {
- const struct side_type *length_type; /* side_length() */
+ side_ptr_t(const struct side_type) length_type; /* side_length() */
uint64_t offset; /* bytes */
uint8_t access_mode; /* enum side_type_gather_access_mode */
} SIDE_PACKED;
struct side_type {
- uint32_t type; /* enum side_type_label */
+ side_enum_t(enum side_type_label, uint32_t) type;
union {
/* Stack-copy basic types */
struct side_type_null side_null;
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_variant *side_variant;
+ side_ptr_t(const struct side_type_struct) side_struct;
+ side_ptr_t(const struct side_type_variant) side_variant;
/* Stack-copy enumeration types */
struct side_type_enum side_enum;
struct side_type_variant {
const struct side_type selector;
- const struct side_variant_option *options;
+ side_ptr_t(const struct side_variant_option) options;
side_ptr_t(const struct side_attr) attr;
uint32_t nr_options;
uint32_t nr_attr;
} SIDE_PACKED;
struct side_event_field {
- const char *field_name;
+ side_ptr_t(const char) field_name;
struct side_type side_type;
} SIDE_PACKED;
/* Stack-copy basic types */
union side_bool_value bool_value;
uint8_t byte_value;
- uint64_t string_value; /* const {uint8_t, uint16_t, uint32_t} * */
+ side_ptr_t(const void) string_value; /* const {uint8_t, uint16_t, uint32_t} * */
union side_integer_value integer_value;
union side_float_value float_value;
/* Stack-copy compound types */
- const struct side_arg_vec *side_struct;
- const struct side_arg_variant *side_variant;
- const struct side_arg_vec *side_array;
- const struct side_arg_vec *side_vla;
+ side_ptr_t(const struct side_arg_vec) side_struct;
+ side_ptr_t(const struct side_arg_variant) side_variant;
+ side_ptr_t(const struct side_arg_vec) side_array;
+ side_ptr_t(const struct side_arg_vec) side_vla;
void *side_vla_app_visitor_ctx;
/* Gather basic types */
- const void *side_bool_gather_ptr;
- const void *side_byte_gather_ptr;
- const void *side_integer_gather_ptr;
- const void *side_float_gather_ptr;
- const void *side_string_gather_ptr;
+ side_ptr_t(const void) side_bool_gather_ptr;
+ side_ptr_t(const void) side_byte_gather_ptr;
+ side_ptr_t(const void) side_integer_gather_ptr;
+ side_ptr_t(const void) side_float_gather_ptr;
+ side_ptr_t(const void) side_string_gather_ptr;
/* Gather compound types */
- const void *side_array_gather_ptr;
- const void *side_struct_gather_ptr;
+ side_ptr_t(const void) side_array_gather_ptr;
+ side_ptr_t(const void) side_struct_gather_ptr;
struct {
- const void *ptr;
- const void *length_ptr;
+ side_ptr_t(const void) ptr;
+ side_ptr_t(const void) length_ptr;
} SIDE_PACKED side_vla_gather;
} SIDE_PACKED;
struct side_arg_dynamic_vla {
- const struct side_arg *sav;
+ side_ptr_t(const struct side_arg) sav;
side_ptr_t(const struct side_attr) attr;
uint32_t len;
uint32_t nr_attr;
} SIDE_PACKED;
struct side_arg_dynamic_struct {
- const struct side_arg_dynamic_field *fields;
+ side_ptr_t(const struct side_arg_dynamic_field) fields;
side_ptr_t(const struct side_attr) attr;
uint32_t len;
uint32_t nr_attr;
} SIDE_PACKED side_float;
/* Dynamic compound types */
- const struct side_arg_dynamic_struct *side_dynamic_struct;
- const struct side_arg_dynamic_vla *side_dynamic_vla;
+ side_ptr_t(const struct side_arg_dynamic_struct) side_dynamic_struct;
+ side_ptr_t(const struct side_arg_dynamic_vla) side_dynamic_vla;
struct side_dynamic_struct_visitor side_dynamic_struct_visitor;
struct side_dynamic_vla_visitor side_dynamic_vla_visitor;
} SIDE_PACKED;
struct side_arg {
- uint32_t type; /* enum side_type_label */
+ side_enum_t(enum side_type_label, uint32_t) type;
union {
union side_arg_static side_static;
union side_arg_dynamic side_dynamic;
} SIDE_PACKED;
struct side_arg_vec {
- const struct side_arg *sav;
+ side_ptr_t(const struct side_arg) sav;
uint32_t len;
} SIDE_PACKED;
struct side_arg_dynamic_field {
- const char *field_name;
+ side_ptr_t(const char) field_name;
const struct side_arg elem;
} SIDE_PACKED;
void *priv; /* Private tracer context. */
} SIDE_PACKED;
+struct side_event_description {
+ side_ptr_t(struct side_event_state) state;
+ side_ptr_t(const char) provider_name;
+ side_ptr_t(const char) event_name;
+ side_ptr_t(const struct side_event_field) fields;
+ side_ptr_t(const struct side_attr) attr;
+ uint64_t flags;
+ uint32_t version;
+ side_enum_t(enum side_loglevel, uint32_t) loglevel;
+ uint32_t nr_fields;
+ uint32_t nr_attr;
+ uint32_t nr_callbacks;
+} SIDE_PACKED;
+
/*
* This structure is _not_ packed to allow atomic operations on its
* fields.
struct side_event_state {
uintptr_t enabled;
const struct side_callback *callbacks;
- uint32_t nr_callbacks;
+ struct side_event_description *desc;
};
-struct side_event_description {
- struct side_event_state *state;
- const char *provider_name;
- const char *event_name;
- const struct side_event_field *fields;
- side_ptr_t(const struct side_attr) attr;
- uint64_t flags;
- uint32_t version;
- uint32_t loglevel; /* enum side_loglevel */
- uint32_t nr_fields;
- uint32_t nr_attr;
-} SIDE_PACKED;
-
/* Event and type attributes */
#define side_attr(_key, _value) \
.key = { \
.p = SIDE_PTR_INIT(_key), \
.unit_size = sizeof(uint8_t), \
- .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \
+ .byte_order = SIDE_ENUM_INIT(SIDE_TYPE_BYTE_ORDER_HOST), \
}, \
.value = SIDE_PARAM(_value), \
}
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 = { .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_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_bool(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_BOOL), .u = { .bool_value = !!(_val) } }
+#define side_attr_u8(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_U8), .u = { .integer_value = { .side_u8 = (_val) } } }
+#define side_attr_u16(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_U16), .u = { .integer_value = { .side_u16 = (_val) } } }
+#define side_attr_u32(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_U32), .u = { .integer_value = { .side_u32 = (_val) } } }
+#define side_attr_u64(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_U64), .u = { .integer_value = { .side_u64 = (_val) } } }
+#define side_attr_s8(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_S8), .u = { .integer_value = { .side_s8 = (_val) } } }
+#define side_attr_s16(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_S16), .u = { .integer_value = { .side_s16 = (_val) } } }
+#define side_attr_s32(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_S32), .u = { .integer_value = { .side_s32 = (_val) } } }
+#define side_attr_s64(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_S64), .u = { .integer_value = { .side_s64 = (_val) } } }
+#define side_attr_float_binary16(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_FLOAT_BINARY16), .u = { .float_value = { .side_float_binary16 = (_val) } } }
+#define side_attr_float_binary32(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_FLOAT_BINARY32), .u = { .float_value = { .side_float_binary32 = (_val) } } }
+#define side_attr_float_binary64(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_FLOAT_BINARY64), .u = { .float_value = { .side_float_binary64 = (_val) } } }
+#define side_attr_float_binary128(_val) { .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_FLOAT_BINARY128), .u = { .float_value = { .side_float_binary128 = (_val) } } }
#define _side_attr_string(_val, _byte_order, _unit_size) \
{ \
- .type = SIDE_ATTR_TYPE_STRING, \
+ .type = SIDE_ENUM_INIT(SIDE_ATTR_TYPE_STRING), \
.u = { \
.string_value = { \
.p = SIDE_PTR_INIT(_val), \
.unit_size = _unit_size, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
}, \
}
.label = { \
.p = SIDE_PTR_INIT(_label), \
.unit_size = sizeof(uint8_t), \
- .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \
+ .byte_order = SIDE_ENUM_INIT(SIDE_TYPE_BYTE_ORDER_HOST), \
}, \
}
.label = { \
.p = SIDE_PTR_INIT(_label), \
.unit_size = sizeof(uint8_t), \
- .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \
+ .byte_order = SIDE_ENUM_INIT(SIDE_TYPE_BYTE_ORDER_HOST), \
}, \
}
.label = { \
.p = SIDE_PTR_INIT(_label), \
.unit_size = sizeof(uint8_t), \
- .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \
+ .byte_order = SIDE_ENUM_INIT(SIDE_TYPE_BYTE_ORDER_HOST), \
}, \
}
.label = { \
.p = SIDE_PTR_INIT(_label), \
.unit_size = sizeof(uint8_t), \
- .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \
+ .byte_order = SIDE_ENUM_INIT(SIDE_TYPE_BYTE_ORDER_HOST), \
}, \
}
#define side_type_null(_attr...) \
{ \
- .type = SIDE_TYPE_NULL, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_NULL), \
.u = { \
.side_null = { \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
#define side_type_bool(_attr...) \
{ \
- .type = SIDE_TYPE_BOOL, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_BOOL), \
.u = { \
.side_bool = { \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.bool_size = sizeof(uint8_t), \
.len_bits = 0, \
- .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \
+ .byte_order = SIDE_ENUM_INIT(SIDE_TYPE_BYTE_ORDER_HOST), \
}, \
}, \
}
#define side_type_byte(_attr...) \
{ \
- .type = SIDE_TYPE_BYTE, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_BYTE), \
.u = { \
.side_byte = { \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
#define _side_type_string(_type, _byte_order, _unit_size, _attr) \
{ \
- .type = _type, \
+ .type = SIDE_ENUM_INIT(_type), \
.u = { \
.side_string = { \
.attr = SIDE_PTR_INIT(_attr), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \
.unit_size = _unit_size, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
}, \
}
#define side_type_dynamic() \
{ \
- .type = SIDE_TYPE_DYNAMIC, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_DYNAMIC), \
}
#define _side_type_integer(_type, _signedness, _byte_order, _integer_size, _len_bits, _attr) \
{ \
- .type = _type, \
+ .type = SIDE_ENUM_INIT(_type), \
.u = { \
.side_integer = { \
.attr = SIDE_PTR_INIT(_attr), \
.integer_size = _integer_size, \
.len_bits = _len_bits, \
.signedness = _signedness, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
}, \
}
#define _side_type_float(_type, _byte_order, _float_size, _attr) \
{ \
- .type = _type, \
+ .type = SIDE_ENUM_INIT(_type), \
.u = { \
.side_float = { \
.attr = SIDE_PTR_INIT(_attr), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \
.float_size = _float_size, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
}, \
}
#define _side_field(_name, _type) \
{ \
- .field_name = _name, \
+ .field_name = SIDE_PTR_INIT(_name), \
.side_type = _type, \
}
#define side_type_enum(_mappings, _elem_type) \
{ \
- .type = SIDE_TYPE_ENUM, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_ENUM), \
.u = { \
.side_enum = { \
.mappings = SIDE_PTR_INIT(_mappings), \
- .elem_type = _elem_type, \
+ .elem_type = SIDE_PTR_INIT(_elem_type), \
}, \
}, \
}
#define side_type_enum_bitmap(_mappings, _elem_type) \
{ \
- .type = SIDE_TYPE_ENUM_BITMAP, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_ENUM_BITMAP), \
.u = { \
.side_enum_bitmap = { \
.mappings = SIDE_PTR_INIT(_mappings), \
- .elem_type = _elem_type, \
+ .elem_type = SIDE_PTR_INIT(_elem_type), \
}, \
}, \
}
#define side_type_struct(_struct) \
{ \
- .type = SIDE_TYPE_STRUCT, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_STRUCT), \
.u = { \
- .side_struct = _struct, \
+ .side_struct = SIDE_PTR_INIT(_struct), \
}, \
}
#define side_field_struct(_name, _struct) \
#define _side_type_struct_define(_fields, _attr) \
{ \
- .fields = _fields, \
+ .fields = SIDE_PTR_INIT(_fields), \
.attr = SIDE_PTR_INIT(_attr), \
.nr_fields = SIDE_ARRAY_SIZE(SIDE_PARAM(_fields)), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \
#define side_type_variant(_variant) \
{ \
- .type = SIDE_TYPE_VARIANT, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_VARIANT), \
.u = { \
- .side_variant = _variant, \
+ .side_variant = SIDE_PTR_INIT(_variant), \
}, \
}
#define side_field_variant(_name, _variant) \
#define _side_type_variant_define(_selector, _options, _attr) \
{ \
.selector = _selector, \
- .options = _options, \
+ .options = SIDE_PTR_INIT(_options), \
.attr = SIDE_PTR_INIT(_attr), \
.nr_options = SIDE_ARRAY_SIZE(SIDE_PARAM(_options)), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \
#define side_type_array(_elem_type, _length, _attr...) \
{ \
- .type = SIDE_TYPE_ARRAY, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_ARRAY), \
.u = { \
.side_array = { \
- .elem_type = _elem_type, \
+ .elem_type = SIDE_PTR_INIT(_elem_type), \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.length = _length, \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
#define side_type_vla(_elem_type, _attr...) \
{ \
- .type = SIDE_TYPE_VLA, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_VLA), \
.u = { \
.side_vla = { \
- .elem_type = _elem_type, \
+ .elem_type = SIDE_PTR_INIT(_elem_type), \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
}, \
#define side_type_vla_visitor(_elem_type, _visitor, _attr...) \
{ \
- .type = SIDE_TYPE_VLA_VISITOR, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_VLA_VISITOR), \
.u = { \
.side_vla_visitor = { \
- .elem_type = SIDE_PARAM(_elem_type), \
+ .elem_type = SIDE_PTR_INIT(_elem_type), \
.visitor = _visitor, \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
#define side_type_gather_byte(_offset, _access_mode, _attr...) \
{ \
- .type = SIDE_TYPE_GATHER_BYTE, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_BYTE), \
.u = { \
.side_gather = { \
.u = { \
#define _side_type_gather_bool(_byte_order, _offset, _bool_size, _offset_bits, _len_bits, _access_mode, _attr...) \
{ \
- .type = SIDE_TYPE_GATHER_BOOL, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_BOOL), \
.u = { \
.side_gather = { \
.u = { \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.bool_size = _bool_size, \
.len_bits = _len_bits, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
.offset_bits = _offset_bits, \
}, \
#define _side_type_gather_integer(_type, _signedness, _byte_order, _offset, \
_integer_size, _offset_bits, _len_bits, _access_mode, _attr...) \
{ \
- .type = _type, \
+ .type = SIDE_ENUM_INIT(_type), \
.u = { \
.side_gather = { \
.u = { \
.integer_size = _integer_size, \
.len_bits = _len_bits, \
.signedness = _signedness, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
.offset_bits = _offset_bits, \
}, \
#define _side_type_gather_float(_byte_order, _offset, _float_size, _access_mode, _attr...) \
{ \
- .type = SIDE_TYPE_GATHER_FLOAT, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_FLOAT), \
.u = { \
.side_gather = { \
.u = { \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.float_size = _float_size, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
}, \
}, \
#define _side_type_gather_string(_offset, _byte_order, _unit_size, _access_mode, _attr...) \
{ \
- .type = SIDE_TYPE_GATHER_STRING, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_STRING), \
.u = { \
.side_gather = { \
.u = { \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.unit_size = _unit_size, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
}, \
}, \
#define side_type_gather_enum(_mappings, _elem_type) \
{ \
- .type = SIDE_TYPE_GATHER_ENUM, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_ENUM), \
.u = { \
.side_enum = { \
.mappings = SIDE_PTR_INIT(_mappings), \
- .elem_type = _elem_type, \
+ .elem_type = SIDE_PTR_INIT(_elem_type), \
}, \
}, \
}
#define side_type_gather_struct(_struct_gather, _offset, _size, _access_mode) \
{ \
- .type = SIDE_TYPE_GATHER_STRUCT, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_STRUCT), \
.u = { \
.side_gather = { \
.u = { \
.side_struct = { \
.offset = _offset, \
.access_mode = _access_mode, \
- .type = _struct_gather, \
+ .type = SIDE_PTR_INIT(_struct_gather), \
.size = _size, \
}, \
}, \
#define side_type_gather_array(_elem_type_gather, _length, _offset, _access_mode, _attr...) \
{ \
- .type = SIDE_TYPE_GATHER_ARRAY, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_ARRAY), \
.u = { \
.side_gather = { \
.u = { \
.offset = _offset, \
.access_mode = _access_mode, \
.type = { \
- .elem_type = _elem_type_gather, \
+ .elem_type = SIDE_PTR_INIT(_elem_type_gather), \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.length = _length, \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
#define side_type_gather_vla(_elem_type_gather, _offset, _access_mode, _length_type_gather, _attr...) \
{ \
- .type = SIDE_TYPE_GATHER_VLA, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_VLA), \
.u = { \
.side_gather = { \
.u = { \
.side_vla = { \
- .length_type = _length_type_gather, \
+ .length_type = SIDE_PTR_INIT(_length_type_gather), \
.offset = _offset, \
.access_mode = _access_mode, \
.type = { \
- .elem_type = _elem_type_gather, \
+ .elem_type = SIDE_PTR_INIT(_elem_type_gather), \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
}, \
/* Stack-copy field arguments */
-#define side_arg_null(_val) { .type = SIDE_TYPE_NULL }
-#define side_arg_bool(_val) { .type = SIDE_TYPE_BOOL, .u = { .side_static = { .bool_value = { .side_bool8 = !!(_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_UTF8, .u = { .side_static = { .string_value = (uintptr_t) (_val) } } }
-#define side_arg_string16(_val) { .type = SIDE_TYPE_STRING_UTF16, .u = { .side_static = { .string_value = (uintptr_t) (_val) } } }
-#define side_arg_string32(_val) { .type = SIDE_TYPE_STRING_UTF32, .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, .u = { .side_static = { .integer_value = { .side_uptr = (uintptr_t) (_val) } } } }
-#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_null(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_NULL) }
+#define side_arg_bool(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_BOOL), .u = { .side_static = { .bool_value = { .side_bool8 = !!(_val) } } } }
+#define side_arg_byte(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_BYTE), .u = { .side_static = { .byte_value = (_val) } } }
+#define side_arg_string(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_STRING_UTF8), .u = { .side_static = { .string_value = SIDE_PTR_INIT(_val) } } }
+#define side_arg_string16(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_STRING_UTF16), .u = { .side_static = { .string_value = SIDE_PTR_INIT(_val) } } }
+#define side_arg_string32(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_STRING_UTF32), .u = { .side_static = { .string_value = SIDE_PTR_INIT(_val) } } }
+
+#define side_arg_u8(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_U8), .u = { .side_static = { .integer_value = { .side_u8 = (_val) } } } }
+#define side_arg_u16(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_U16), .u = { .side_static = { .integer_value = { .side_u16 = (_val) } } } }
+#define side_arg_u32(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_U32), .u = { .side_static = { .integer_value = { .side_u32 = (_val) } } } }
+#define side_arg_u64(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_U64), .u = { .side_static = { .integer_value = { .side_u64 = (_val) } } } }
+#define side_arg_s8(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_S8), .u = { .side_static = { .integer_value = { .side_s8 = (_val) } } } }
+#define side_arg_s16(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_S16), .u = { .side_static = { .integer_value = { .side_s16 = (_val) } } } }
+#define side_arg_s32(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_S32), .u = { .side_static = { .integer_value = { .side_s32 = (_val) } } } }
+#define side_arg_s64(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_S64), .u = { .side_static = { .integer_value = { .side_s64 = (_val) } } } }
+#define side_arg_pointer(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_POINTER), .u = { .side_static = { .integer_value = { .side_uptr = (uintptr_t) (_val) } } } }
+#define side_arg_float_binary16(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_FLOAT_BINARY16), .u = { .side_static = { .float_value = { .side_float_binary16 = (_val) } } } }
+#define side_arg_float_binary32(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_FLOAT_BINARY32), .u = { .side_static = { .float_value = { .side_float_binary32 = (_val) } } } }
+#define side_arg_float_binary64(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_FLOAT_BINARY64), .u = { .side_static = { .float_value = { .side_float_binary64 = (_val) } } } }
+#define side_arg_float_binary128(_val) { .type = SIDE_ENUM_INIT(SIDE_TYPE_FLOAT_BINARY128), .u = { .side_static = { .float_value = { .side_float_binary128 = (_val) } } } }
+
+#define side_arg_struct(_side_type) { .type = SIDE_ENUM_INIT(SIDE_TYPE_STRUCT), .u = { .side_static = { .side_struct = SIDE_PTR_INIT(_side_type) } } }
#define side_arg_define_variant(_identifier, _selector_val, _option) \
const struct side_arg_variant _identifier = { \
}
#define side_arg_variant(_side_variant) \
{ \
- .type = SIDE_TYPE_VARIANT, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_VARIANT), \
.u = { \
.side_static = { \
- .side_variant = (_side_variant), \
+ .side_variant = SIDE_PTR_INIT(_side_variant), \
}, \
}, \
}
-#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(_side_type) { .type = SIDE_ENUM_INIT(SIDE_TYPE_ARRAY), .u = { .side_static = { .side_array = SIDE_PTR_INIT(_side_type) } } }
+#define side_arg_vla(_side_type) { .type = SIDE_ENUM_INIT(SIDE_TYPE_VLA), .u = { .side_static = { .side_vla = SIDE_PTR_INIT(_side_type) } } }
+#define side_arg_vla_visitor(_ctx) { .type = SIDE_ENUM_INIT(SIDE_TYPE_VLA_VISITOR), .u = { .side_static = { .side_vla_app_visitor_ctx = (_ctx) } } }
/* Gather field arguments */
-#define side_arg_gather_bool(_ptr) { .type = SIDE_TYPE_GATHER_BOOL, .u = { .side_static = { .side_bool_gather_ptr = (_ptr) } } }
-#define side_arg_gather_byte(_ptr) { .type = SIDE_TYPE_GATHER_BYTE, .u = { .side_static = { .side_byte_gather_ptr = (_ptr) } } }
-#define side_arg_gather_pointer(_ptr) { .type = SIDE_TYPE_GATHER_POINTER, .u = { .side_static = { .side_integer_gather_ptr = (_ptr) } } }
-#define side_arg_gather_integer(_ptr) { .type = SIDE_TYPE_GATHER_INTEGER, .u = { .side_static = { .side_integer_gather_ptr = (_ptr) } } }
-#define side_arg_gather_float(_ptr) { .type = SIDE_TYPE_GATHER_FLOAT, .u = { .side_static = { .side_float_gather_ptr = (_ptr) } } }
-#define side_arg_gather_string(_ptr) { .type = SIDE_TYPE_GATHER_STRING, .u = { .side_static = { .side_string_gather_ptr = (_ptr) } } }
-#define side_arg_gather_struct(_ptr) { .type = SIDE_TYPE_GATHER_STRUCT, .u = { .side_static = { .side_struct_gather_ptr = (_ptr) } } }
-#define side_arg_gather_array(_ptr) { .type = SIDE_TYPE_GATHER_ARRAY, .u = { .side_static = { .side_array_gather_ptr = (_ptr) } } }
-#define side_arg_gather_vla(_ptr, _length_ptr) { .type = SIDE_TYPE_GATHER_VLA, .u = { .side_static = { .side_vla_gather = { .ptr = (_ptr), .length_ptr = (_length_ptr) } } } }
+#define side_arg_gather_bool(_ptr) { .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_BOOL), .u = { .side_static = { .side_bool_gather_ptr = SIDE_PTR_INIT(_ptr) } } }
+#define side_arg_gather_byte(_ptr) { .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_BYTE), .u = { .side_static = { .side_byte_gather_ptr = SIDE_PTR_INIT(_ptr) } } }
+#define side_arg_gather_pointer(_ptr) { .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_POINTER), .u = { .side_static = { .side_integer_gather_ptr = SIDE_PTR_INIT(_ptr) } } }
+#define side_arg_gather_integer(_ptr) { .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_INTEGER), .u = { .side_static = { .side_integer_gather_ptr = SIDE_PTR_INIT(_ptr) } } }
+#define side_arg_gather_float(_ptr) { .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_FLOAT), .u = { .side_static = { .side_float_gather_ptr = SIDE_PTR_INIT(_ptr) } } }
+#define side_arg_gather_string(_ptr) { .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_STRING), .u = { .side_static = { .side_string_gather_ptr = SIDE_PTR_INIT(_ptr) } } }
+#define side_arg_gather_struct(_ptr) { .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_STRUCT), .u = { .side_static = { .side_struct_gather_ptr = SIDE_PTR_INIT(_ptr) } } }
+#define side_arg_gather_array(_ptr) { .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_ARRAY), .u = { .side_static = { .side_array_gather_ptr = SIDE_PTR_INIT(_ptr) } } }
+#define side_arg_gather_vla(_ptr, _length_ptr) { .type = SIDE_ENUM_INIT(SIDE_TYPE_GATHER_VLA), .u = { .side_static = { .side_vla_gather = { .ptr = SIDE_PTR_INIT(_ptr), .length_ptr = SIDE_PTR_INIT(_length_ptr) } } } }
/* Dynamic field arguments */
#define side_arg_dynamic_null(_attr...) \
{ \
- .type = SIDE_TYPE_DYNAMIC_NULL, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_DYNAMIC_NULL), \
.u = { \
.side_dynamic = { \
.side_null = { \
#define side_arg_dynamic_bool(_val, _attr...) \
{ \
- .type = SIDE_TYPE_DYNAMIC_BOOL, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_DYNAMIC_BOOL), \
.u = { \
.side_dynamic = { \
.side_bool = { \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.bool_size = sizeof(uint8_t), \
.len_bits = 0, \
- .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, \
+ .byte_order = SIDE_ENUM_INIT(SIDE_TYPE_BYTE_ORDER_HOST), \
}, \
.value = { \
.side_bool8 = !!(_val), \
#define side_arg_dynamic_byte(_val, _attr...) \
{ \
- .type = SIDE_TYPE_DYNAMIC_BYTE, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_DYNAMIC_BYTE), \
.u = { \
.side_dynamic = { \
.side_byte = { \
#define _side_arg_dynamic_string(_val, _byte_order, _unit_size, _attr...) \
{ \
- .type = SIDE_TYPE_DYNAMIC_STRING, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_DYNAMIC_STRING), \
.u = { \
.side_dynamic = { \
.side_string = { \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.unit_size = _unit_size, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
.value = (uintptr_t) (_val), \
}, \
#define _side_arg_dynamic_integer(_field, _val, _type, _signedness, _byte_order, _integer_size, _len_bits, _attr...) \
{ \
- .type = _type, \
+ .type = SIDE_ENUM_INIT(_type), \
.u = { \
.side_dynamic = { \
.side_integer = { \
.integer_size = _integer_size, \
.len_bits = _len_bits, \
.signedness = _signedness, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
.value = { \
_field = (_val), \
#define _side_arg_dynamic_float(_field, _val, _type, _byte_order, _float_size, _attr...) \
{ \
- .type = _type, \
+ .type = SIDE_ENUM_INIT(_type), \
.u = { \
.side_dynamic = { \
.side_float = { \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.float_size = _float_size, \
- .byte_order = _byte_order, \
+ .byte_order = SIDE_ENUM_INIT(_byte_order), \
}, \
.value = { \
_field = (_val), \
#define side_arg_dynamic_vla(_vla) \
{ \
- .type = SIDE_TYPE_DYNAMIC_VLA, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_DYNAMIC_VLA), \
.u = { \
.side_dynamic = { \
- .side_dynamic_vla = (_vla), \
+ .side_dynamic_vla = SIDE_PTR_INIT(_vla), \
}, \
}, \
}
#define side_arg_dynamic_vla_visitor(_dynamic_vla_visitor, _ctx, _attr...) \
{ \
- .type = SIDE_TYPE_DYNAMIC_VLA_VISITOR, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_DYNAMIC_VLA_VISITOR), \
.u = { \
.side_dynamic = { \
.side_dynamic_vla_visitor = { \
#define side_arg_dynamic_struct(_struct) \
{ \
- .type = SIDE_TYPE_DYNAMIC_STRUCT, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_DYNAMIC_STRUCT), \
.u = { \
.side_dynamic = { \
- .side_dynamic_struct = (_struct), \
+ .side_dynamic_struct = SIDE_PTR_INIT(_struct), \
}, \
}, \
}
#define side_arg_dynamic_struct_visitor(_dynamic_struct_visitor, _ctx, _attr...) \
{ \
- .type = SIDE_TYPE_DYNAMIC_STRUCT_VISITOR, \
+ .type = SIDE_ENUM_INIT(SIDE_TYPE_DYNAMIC_STRUCT_VISITOR), \
.u = { \
.side_dynamic = { \
.side_dynamic_struct_visitor = { \
#define side_arg_dynamic_define_vec(_identifier, _sav, _attr...) \
const struct side_arg _identifier##_vec[] = { _sav }; \
const struct side_arg_dynamic_vla _identifier = { \
- .sav = _identifier##_vec, \
+ .sav = SIDE_PTR_INIT(_identifier##_vec), \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.len = SIDE_ARRAY_SIZE(_identifier##_vec), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
#define side_arg_dynamic_define_struct(_identifier, _struct_fields, _attr...) \
const struct side_arg_dynamic_field _identifier##_fields[] = { _struct_fields }; \
const struct side_arg_dynamic_struct _identifier = { \
- .fields = _identifier##_fields, \
+ .fields = SIDE_PTR_INIT(_identifier##_fields), \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.len = SIDE_ARRAY_SIZE(_identifier##_fields), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
#define side_arg_define_vec(_identifier, _sav) \
const struct side_arg _identifier##_vec[] = { _sav }; \
const struct side_arg_vec _identifier = { \
- .sav = _identifier##_vec, \
+ .sav = SIDE_PTR_INIT(_identifier##_vec), \
.len = SIDE_ARRAY_SIZE(_identifier##_vec), \
}
#define side_arg_dynamic_field(_name, _elem) \
{ \
- .field_name = _name, \
+ .field_name = SIDE_PTR_INIT(_name), \
.elem = _elem, \
}
{ \
const struct side_arg side_sav[] = { _sav }; \
const struct side_arg_vec side_arg_vec = { \
- .sav = side_sav, \
+ .sav = SIDE_PTR_INIT(side_sav), \
.len = SIDE_ARRAY_SIZE(side_sav), \
}; \
- side_call(&(_identifier), &side_arg_vec); \
+ side_call(&(side_event_state__##_identifier), &side_arg_vec); \
}
#define side_event(_identifier, _sav) \
{ \
const struct side_arg side_sav[] = { _sav }; \
const struct side_arg_vec side_arg_vec = { \
- .sav = side_sav, \
+ .sav = SIDE_PTR_INIT(side_sav), \
.len = SIDE_ARRAY_SIZE(side_sav), \
}; \
const struct side_arg_dynamic_field side_fields[] = { _var_fields }; \
const struct side_arg_dynamic_struct var_struct = { \
- .fields = side_fields, \
+ .fields = SIDE_PTR_INIT(side_fields), \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.len = SIDE_ARRAY_SIZE(side_fields), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
}; \
- side_call_variadic(&(_identifier), &side_arg_vec, &var_struct); \
+ side_call_variadic(&(side_event_state__##_identifier), &side_arg_vec, &var_struct); \
}
#define side_event_variadic(_identifier, _sav, _var, _attr...) \
side_event_call_variadic(_identifier, SIDE_PARAM(_sav), SIDE_PARAM(_var), SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list()))
#define _side_define_event(_linkage, _identifier, _provider, _event, _loglevel, _fields, _flags, _attr...) \
+ _linkage struct side_event_description __attribute__((section("side_event_description"))) \
+ _identifier; \
_linkage struct side_event_state __attribute__((section("side_event_state"))) \
side_event_state__##_identifier = { \
.enabled = 0, \
.callbacks = &side_empty_callback, \
- .nr_callbacks = 0, \
+ .desc = &_identifier, \
}; \
_linkage struct side_event_description __attribute__((section("side_event_description"))) \
_identifier = { \
- .state = &(side_event_state__##_identifier), \
- .provider_name = _provider, \
- .event_name = _event, \
- .fields = _fields, \
+ .state = SIDE_PTR_INIT(&(side_event_state__##_identifier)), \
+ .provider_name = SIDE_PTR_INIT(_provider), \
+ .event_name = SIDE_PTR_INIT(_event), \
+ .fields = SIDE_PTR_INIT(_fields), \
.attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
.flags = (_flags), \
.version = 0, \
- .loglevel = _loglevel, \
+ .loglevel = SIDE_ENUM_INIT(_loglevel), \
.nr_fields = SIDE_ARRAY_SIZE(SIDE_PARAM(_fields)), \
.nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
+ .nr_callbacks = 0, \
}; \
static const struct side_event_description *side_event_ptr__##_identifier \
__attribute__((section("side_event_description_ptr"), used)) = &(_identifier);
extern const struct side_callback side_empty_callback;
-void side_call(const struct side_event_description *desc,
+void side_call(const struct side_event_state *state,
const struct side_arg_vec *side_arg_vec);
-void side_call_variadic(const struct side_event_description *desc,
+void side_call_variadic(const struct side_event_state *state,
const struct side_arg_vec *side_arg_vec,
const struct side_arg_dynamic_struct *var_struct);
projects / libside.git / blobdiff