X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Ftracer.c;h=33c699093b83858617d6bb5cea80ad352dd0f194;hb=2e1974975ff974509e836bc489737ea4ee597aea;hp=62225e411ed370413d55b881d91be893bb5d103d;hpb=358281a17a91451aed649d6be6c1fd4890c4cfc0;p=libside.git diff --git a/src/tracer.c b/src/tracer.c index 62225e4..33c6990 100644 --- a/src/tracer.c +++ b/src/tracer.c @@ -9,6 +9,7 @@ #include #include #include +#include #include @@ -19,11 +20,18 @@ enum tracer_display_base { TRACER_DISPLAY_BASE_16, }; +union int64_value { + uint64_t u; + int64_t s; +}; + static struct side_tracer_handle *tracer_handle; static void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec); static +void tracer_print_variant(const struct side_type *type_desc, const struct side_arg_variant *side_arg_variant); +static void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec); static void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec); @@ -41,6 +49,10 @@ uint32_t tracer_print_gather_integer_type(const struct side_type_gather *type_ga static uint32_t tracer_print_gather_float_type(const struct side_type_gather *type_gather, const void *_ptr); static +uint32_t tracer_print_gather_string_type(const struct side_type_gather *type_gather, const void *_ptr); +static +uint32_t tracer_print_gather_enum_type(const struct side_type_gather *type_gather, const void *_ptr); +static uint32_t tracer_print_gather_struct(const struct side_type_gather *type_gather, const void *_ptr); static uint32_t tracer_print_gather_array(const struct side_type_gather *type_gather, const void *_ptr); @@ -50,12 +62,131 @@ uint32_t tracer_print_gather_vla(const struct side_type_gather *type_gather, con static void tracer_print_type(const struct side_type *type_desc, const struct side_arg *item); +static +void tracer_convert_string_to_utf8(const void *p, uint8_t unit_size, enum side_type_label_byte_order byte_order, + size_t *strlen_with_null, + char **output_str) +{ + size_t ret, inbytesleft = 0, outbytesleft, bufsize; + const char *str = p, *fromcode; + char *inbuf = (char *) p, *outbuf, *buf; + iconv_t cd; + + switch (unit_size) { + case 1: + if (strlen_with_null) + *strlen_with_null = strlen(str) + 1; + *output_str = (char *) str; + return; + case 2: + { + const uint16_t *p16 = p; + + switch (byte_order) { + case SIDE_TYPE_BYTE_ORDER_LE: + { + fromcode = "UTF-16LE"; + break; + } + case SIDE_TYPE_BYTE_ORDER_BE: + { + fromcode = "UTF-16BE"; + break; + } + default: + fprintf(stderr, "Unknown byte order\n"); + abort(); + } + for (; *p16; p16++) + inbytesleft += 2; + /* + * Worse case is U+FFFF UTF-16 (2 bytes) converting to + * { ef, bf, bf } UTF-8 (3 bytes). + */ + bufsize = inbytesleft / 2 * 3 + 1; + break; + } + case 4: + { + const uint32_t *p32 = p; + + switch (byte_order) { + case SIDE_TYPE_BYTE_ORDER_LE: + { + fromcode = "UTF-32LE"; + break; + } + case SIDE_TYPE_BYTE_ORDER_BE: + { + fromcode = "UTF-32BE"; + break; + } + default: + fprintf(stderr, "Unknown byte order\n"); + abort(); + } + for (; *p32; p32++) + inbytesleft += 4; + /* + * Each 4-byte UTF-32 character converts to at most a + * 4-byte UTF-8 character. + */ + bufsize = inbytesleft + 1; + break; + } + default: + fprintf(stderr, "Unknown string unit size %" PRIu8 "\n", unit_size); + abort(); + } + + cd = iconv_open("UTF8", fromcode); + if (cd == (iconv_t) -1) { + perror("iconv_open"); + abort(); + } + buf = malloc(bufsize); + if (!buf) { + abort(); + } + outbuf = (char *) buf; + outbytesleft = bufsize; + ret = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + if (ret == (size_t) -1) { + perror("iconv"); + abort(); + } + if (inbytesleft) { + fprintf(stderr, "Buffer too small to convert string input\n"); + abort(); + } + (*outbuf++) = '\0'; + if (iconv_close(cd) == -1) { + perror("iconv_close"); + abort(); + } + if (strlen_with_null) + *strlen_with_null = outbuf - buf; + *output_str = buf; +} + +static +void tracer_print_string(const void *p, uint8_t unit_size, enum side_type_label_byte_order byte_order, + size_t *strlen_with_null) +{ + char *output_str = NULL; + + tracer_convert_string_to_utf8(p, unit_size, byte_order, strlen_with_null, &output_str); + printf("\"%s\"", output_str); + if (output_str != p) + free(output_str); +} + static int64_t get_attr_integer_value(const struct side_attr *attr) { int64_t val; - switch (attr->value.type) { + switch (side_enum_get(attr->value.type)) { case SIDE_ATTR_TYPE_U8: val = attr->value.u.integer_value.side_u8; break; @@ -95,8 +226,15 @@ enum tracer_display_base get_attr_display_base(const struct side_attr *_attr, ui for (i = 0; i < nr_attr; i++) { const struct side_attr *attr = &_attr[i]; - - if (!strcmp(attr->key, "std.integer.base")) { + char *utf8_str = NULL; + bool cmp; + + tracer_convert_string_to_utf8(side_ptr_get(attr->key.p), attr->key.unit_size, + side_enum_get(attr->key.byte_order), NULL, &utf8_str); + cmp = strcmp(utf8_str, "std.integer.base"); + if (utf8_str != side_ptr_get(attr->key.p)) + free(utf8_str); + if (!cmp) { int64_t val = get_attr_integer_value(attr); switch (val) { @@ -117,46 +255,17 @@ enum tracer_display_base get_attr_display_base(const struct side_attr *_attr, ui return default_base; /* Default */ } -static -bool type_to_host_reverse_bo(const struct side_type *type_desc) -{ - switch (type_desc->type) { - case SIDE_TYPE_U8: - case SIDE_TYPE_S8: - case SIDE_TYPE_BYTE: - return false; - case SIDE_TYPE_U16: - case SIDE_TYPE_U32: - case SIDE_TYPE_U64: - case SIDE_TYPE_S16: - case SIDE_TYPE_S32: - case SIDE_TYPE_S64: - case SIDE_TYPE_POINTER: - if (type_desc->u.side_integer.byte_order != SIDE_TYPE_BYTE_ORDER_HOST) - return true; - else - return false; - break; - case SIDE_TYPE_FLOAT_BINARY16: - case SIDE_TYPE_FLOAT_BINARY32: - case SIDE_TYPE_FLOAT_BINARY64: - case SIDE_TYPE_FLOAT_BINARY128: - if (type_desc->u.side_float.byte_order != SIDE_TYPE_FLOAT_WORD_ORDER_HOST) - return true; - else - return false; - break; - default: - fprintf(stderr, "Unexpected type\n"); - abort(); - } -} - static void tracer_print_attr_type(const char *separator, const struct side_attr *attr) { - printf("{ key%s \"%s\", value%s ", separator, attr->key, separator); - switch (attr->value.type) { + char *utf8_str = NULL; + + tracer_convert_string_to_utf8(side_ptr_get(attr->key.p), attr->key.unit_size, + side_enum_get(attr->key.byte_order), NULL, &utf8_str); + printf("{ key%s \"%s\", value%s ", separator, utf8_str, separator); + if (utf8_str != side_ptr_get(attr->key.p)) + free(utf8_str); + switch (side_enum_get(attr->value.type)) { case SIDE_ATTR_TYPE_BOOL: printf("%s", attr->value.u.bool_value ? "true" : "false"); break; @@ -217,7 +326,9 @@ void tracer_print_attr_type(const char *separator, const struct side_attr *attr) abort(); #endif case SIDE_ATTR_TYPE_STRING: - printf("\"%s\"", (const char *)(uintptr_t) attr->value.u.string_value); + tracer_print_string(side_ptr_get(attr->value.u.string_value.p), + attr->value.u.string_value.unit_size, + side_enum_get(attr->value.u.string_value.byte_order), NULL); break; default: fprintf(stderr, "ERROR: "); @@ -243,103 +354,114 @@ void print_attributes(const char *prefix_str, const char *separator, } static -void print_enum(const struct side_type *type_desc, const struct side_arg *item) +union int64_value tracer_load_integer_value(const struct side_type_integer *type_integer, + const union side_integer_value *value, + uint16_t offset_bits, uint16_t *_len_bits) { - const struct side_enum_mappings *mappings = type_desc->u.side_enum.mappings; - const struct side_type *elem_type = type_desc->u.side_enum.elem_type; - uint32_t i, print_count = 0; - int64_t value; + union int64_value v64; + uint16_t len_bits; + bool reverse_bo; - if (elem_type->type != item->type) { - fprintf(stderr, "ERROR: Unexpected enum element type\n"); + if (!type_integer->len_bits) + len_bits = type_integer->integer_size * CHAR_BIT; + else + len_bits = type_integer->len_bits; + if (len_bits + offset_bits > type_integer->integer_size * CHAR_BIT) abort(); - } - switch (item->type) { - case SIDE_TYPE_U8: - value = (int64_t) item->u.side_static.integer_value.side_u8; + reverse_bo = side_enum_get(type_integer->byte_order) != SIDE_TYPE_BYTE_ORDER_HOST; + switch (type_integer->integer_size) { + case 1: + if (type_integer->signedness) + v64.s = value->side_s8; + else + v64.u = value->side_u8; break; - case SIDE_TYPE_U16: - { - uint16_t v; + case 2: + if (type_integer->signedness) { + int16_t side_s16; - v = item->u.side_static.integer_value.side_u16; - if (type_to_host_reverse_bo(elem_type)) - v = side_bswap_16(v); - value = (int64_t) v; - break; - } - case SIDE_TYPE_U32: - { - uint32_t v; + side_s16 = value->side_s16; + if (reverse_bo) + side_s16 = side_bswap_16(side_s16); + v64.s = side_s16; + } else { + uint16_t side_u16; - v = item->u.side_static.integer_value.side_u32; - if (type_to_host_reverse_bo(elem_type)) - v = side_bswap_32(v); - value = (int64_t) v; + side_u16 = value->side_u16; + if (reverse_bo) + side_u16 = side_bswap_16(side_u16); + v64.u = side_u16; + } break; - } - case SIDE_TYPE_U64: - { - uint64_t v; + case 4: + if (type_integer->signedness) { + int32_t side_s32; - v = item->u.side_static.integer_value.side_u64; - if (type_to_host_reverse_bo(elem_type)) - v = side_bswap_64(v); - value = (int64_t) v; - break; - } - case SIDE_TYPE_S8: - value = (int64_t) item->u.side_static.integer_value.side_s8; - break; - case SIDE_TYPE_S16: - { - int16_t v; + side_s32 = value->side_s32; + if (reverse_bo) + side_s32 = side_bswap_32(side_s32); + v64.s = side_s32; + } else { + uint32_t side_u32; - v = item->u.side_static.integer_value.side_s16; - if (type_to_host_reverse_bo(elem_type)) - v = side_bswap_16(v); - value = (int64_t) v; + side_u32 = value->side_u32; + if (reverse_bo) + side_u32 = side_bswap_32(side_u32); + v64.u = side_u32; + } break; - } - case SIDE_TYPE_S32: - { - int32_t v; + case 8: + if (type_integer->signedness) { + int64_t side_s64; - v = item->u.side_static.integer_value.side_s32; - if (type_to_host_reverse_bo(elem_type)) - v = side_bswap_32(v); - value = (int64_t) v; - break; - } - case SIDE_TYPE_S64: - { - int64_t v; + side_s64 = value->side_s64; + if (reverse_bo) + side_s64 = side_bswap_64(side_s64); + v64.s = side_s64; + } else { + uint64_t side_u64; - v = item->u.side_static.integer_value.side_s64; - if (type_to_host_reverse_bo(elem_type)) - v = side_bswap_64(v); - value = v; + side_u64 = value->side_u64; + if (reverse_bo) + side_u64 = side_bswap_64(side_u64); + v64.u = side_u64; + } break; - } default: - fprintf(stderr, "ERROR: Unexpected enum element type\n"); abort(); } - print_attributes("attr", ":", mappings->attr, mappings->nr_attr); - printf("%s", mappings->nr_attr ? ", " : ""); - tracer_print_type(type_desc->u.side_enum.elem_type, item); + v64.u >>= offset_bits; + if (len_bits < 64) { + v64.u &= (1ULL << len_bits) - 1; + if (type_integer->signedness) { + /* Sign-extend. */ + if (v64.u & (1ULL << (len_bits - 1))) + v64.u |= ~((1ULL << len_bits) - 1); + } + } + if (_len_bits) + *_len_bits = len_bits; + return v64; +} + +static +void print_enum_labels(const struct side_enum_mappings *mappings, union int64_value v64) +{ + uint32_t i, print_count = 0; + printf(", labels: [ "); for (i = 0; i < mappings->nr_mappings; i++) { - const struct side_enum_mapping *mapping = &mappings->mappings[i]; + const struct side_enum_mapping *mapping = &side_ptr_get(mappings->mappings)[i]; if (mapping->range_end < mapping->range_begin) { fprintf(stderr, "ERROR: Unexpected enum range: %" PRIu64 "-%" PRIu64 "\n", mapping->range_begin, mapping->range_end); abort(); } - if (value >= mapping->range_begin && value <= mapping->range_end) { + if (v64.s >= mapping->range_begin && v64.s <= mapping->range_end) { printf("%s", print_count++ ? ", " : ""); - printf("\"%s\"", mapping->label); + tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size, + side_enum_get(mapping->label.byte_order), NULL); } } if (!print_count) @@ -348,74 +470,94 @@ void print_enum(const struct side_type *type_desc, const struct side_arg *item) } static -uint32_t enum_elem_type_to_stride(const struct side_type *elem_type) +void tracer_print_enum(const struct side_type *type_desc, const struct side_arg *item) +{ + const struct side_enum_mappings *mappings = side_ptr_get(type_desc->u.side_enum.mappings); + const struct side_type *elem_type = side_ptr_get(type_desc->u.side_enum.elem_type); + union int64_value v64; + + if (side_enum_get(elem_type->type) != side_enum_get(item->type)) { + fprintf(stderr, "ERROR: Unexpected enum element type\n"); + abort(); + } + v64 = tracer_load_integer_value(&elem_type->u.side_integer, + &item->u.side_static.integer_value, 0, NULL); + print_attributes("attr", ":", side_ptr_get(mappings->attr), mappings->nr_attr); + printf("%s", mappings->nr_attr ? ", " : ""); + tracer_print_type(elem_type, item); + print_enum_labels(mappings, v64); +} + +static +uint32_t elem_type_to_stride(const struct side_type *elem_type) { uint32_t stride_bit; - switch (elem_type->type) { - case SIDE_TYPE_U8: /* Fall-through */ + switch (side_enum_get(elem_type->type)) { case SIDE_TYPE_BYTE: stride_bit = 8; break; + + case SIDE_TYPE_U8: case SIDE_TYPE_U16: - stride_bit = 16; - break; case SIDE_TYPE_U32: - stride_bit = 32; - break; case SIDE_TYPE_U64: - stride_bit = 64; - break; + case SIDE_TYPE_S8: + case SIDE_TYPE_S16: + case SIDE_TYPE_S32: + case SIDE_TYPE_S64: + return elem_type->u.side_integer.integer_size * CHAR_BIT; default: - fprintf(stderr, "ERROR: Unexpected enum element type\n"); + fprintf(stderr, "ERROR: Unexpected enum bitmap element type\n"); abort(); } return stride_bit; } static -void print_enum_bitmap(const struct side_type *type_desc, +void tracer_print_enum_bitmap(const struct side_type *type_desc, const struct side_arg *item) { - const struct side_type *elem_type = type_desc->u.side_enum_bitmap.elem_type; - const struct side_enum_bitmap_mappings *side_enum_mappings = type_desc->u.side_enum_bitmap.mappings; + const struct side_enum_bitmap_mappings *side_enum_mappings = side_ptr_get(type_desc->u.side_enum_bitmap.mappings); + const struct side_type *enum_elem_type = side_ptr_get(type_desc->u.side_enum_bitmap.elem_type), *elem_type; uint32_t i, print_count = 0, stride_bit, nr_items; - bool reverse_byte_order = false; const struct side_arg *array_item; - switch (elem_type->type) { + switch (side_enum_get(enum_elem_type->type)) { case SIDE_TYPE_U8: /* Fall-through */ case SIDE_TYPE_BYTE: /* Fall-through */ case SIDE_TYPE_U16: /* Fall-through */ case SIDE_TYPE_U32: /* Fall-through */ - case SIDE_TYPE_U64: - stride_bit = enum_elem_type_to_stride(elem_type); - reverse_byte_order = type_to_host_reverse_bo(elem_type); + case SIDE_TYPE_U64: /* Fall-through */ + case SIDE_TYPE_S8: /* Fall-through */ + case SIDE_TYPE_S16: /* Fall-through */ + case SIDE_TYPE_S32: /* Fall-through */ + case SIDE_TYPE_S64: + elem_type = enum_elem_type; array_item = item; nr_items = 1; break; case SIDE_TYPE_ARRAY: - stride_bit = enum_elem_type_to_stride(elem_type->u.side_array.elem_type); - reverse_byte_order = type_to_host_reverse_bo(elem_type->u.side_array.elem_type); - array_item = item->u.side_static.side_array->sav; + elem_type = side_ptr_get(enum_elem_type->u.side_array.elem_type); + array_item = side_ptr_get(side_ptr_get(item->u.side_static.side_array)->sav); nr_items = type_desc->u.side_array.length; break; case SIDE_TYPE_VLA: - stride_bit = enum_elem_type_to_stride(elem_type->u.side_vla.elem_type); - reverse_byte_order = type_to_host_reverse_bo(elem_type->u.side_vla.elem_type); - array_item = item->u.side_static.side_vla->sav; - nr_items = item->u.side_static.side_vla->len; + elem_type = side_ptr_get(enum_elem_type->u.side_vla.elem_type); + array_item = side_ptr_get(side_ptr_get(item->u.side_static.side_vla)->sav); + nr_items = side_ptr_get(item->u.side_static.side_vla)->len; break; default: fprintf(stderr, "ERROR: Unexpected enum element type\n"); abort(); } + stride_bit = elem_type_to_stride(elem_type); - print_attributes("attr", ":", side_enum_mappings->attr, side_enum_mappings->nr_attr); + print_attributes("attr", ":", side_ptr_get(side_enum_mappings->attr), side_enum_mappings->nr_attr); printf("%s", side_enum_mappings->nr_attr ? ", " : ""); printf("labels: [ "); for (i = 0; i < side_enum_mappings->nr_mappings; i++) { - const struct side_enum_bitmap_mapping *mapping = &side_enum_mappings->mappings[i]; + const struct side_enum_bitmap_mapping *mapping = &side_ptr_get(side_enum_mappings->mappings)[i]; bool match = false; uint64_t bit; @@ -427,57 +569,29 @@ void print_enum_bitmap(const struct side_type *type_desc, for (bit = mapping->range_begin; bit <= mapping->range_end; bit++) { if (bit > (nr_items * stride_bit) - 1) break; - switch (stride_bit) { - case 8: - { - uint8_t v = array_item[bit / 8].u.side_static.integer_value.side_u8; + if (side_enum_get(elem_type->type) == SIDE_TYPE_BYTE) { + uint8_t v = array_item[bit / 8].u.side_static.byte_value; if (v & (1ULL << (bit % 8))) { match = true; goto match; } - break; - } - case 16: - { - uint16_t v = array_item[bit / 16].u.side_static.integer_value.side_u16; - if (reverse_byte_order) - v = side_bswap_16(v); - if (v & (1ULL << (bit % 16))) { - match = true; - goto match; - } - break; - } - case 32: - { - uint32_t v = array_item[bit / 32].u.side_static.integer_value.side_u32; - if (reverse_byte_order) - v = side_bswap_32(v); - if (v & (1ULL << (bit % 32))) { - match = true; - goto match; - } - break; - } - case 64: - { - uint64_t v = array_item[bit / 64].u.side_static.integer_value.side_u64; - if (reverse_byte_order) - v = side_bswap_64(v); - if (v & (1ULL << (bit % 64))) { + } else { + union int64_value v64; + + v64 = tracer_load_integer_value(&elem_type->u.side_integer, + &array_item[bit / stride_bit].u.side_static.integer_value, + 0, NULL); + if (v64.u & (1ULL << (bit % stride_bit))) { match = true; goto match; } - break; - } - default: - abort(); } } match: if (match) { printf("%s", print_count++ ? ", " : ""); - printf("\"%s\"", mapping->label); + tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size, + side_enum_get(mapping->label.byte_order), NULL); } } if (!print_count) @@ -523,7 +637,7 @@ void tracer_print_type_bool(const char *separator, len_bits = type_bool->len_bits; if (len_bits + offset_bits > type_bool->bool_size * CHAR_BIT) abort(); - reverse_bo = type_bool->byte_order != SIDE_TYPE_BYTE_ORDER_HOST; + reverse_bo = side_enum_get(type_bool->byte_order) != SIDE_TYPE_BYTE_ORDER_HOST; switch (type_bool->bool_size) { case 1: v = value->side_bool8; @@ -564,7 +678,7 @@ void tracer_print_type_bool(const char *separator, v >>= offset_bits; if (len_bits < 64) v &= (1ULL << len_bits) - 1; - tracer_print_type_header(separator, type_bool->attr, type_bool->nr_attr); + tracer_print_type_header(separator, side_ptr_get(type_bool->attr), type_bool->nr_attr); printf("%s", v ? "true" : "false"); } @@ -576,109 +690,33 @@ void tracer_print_type_integer(const char *separator, enum tracer_display_base default_base) { enum tracer_display_base base; - uint32_t len_bits; - bool reverse_bo; - union { - uint64_t v_unsigned; - int64_t v_signed; - } v; + union int64_value v64; + uint16_t len_bits; - if (!type_integer->len_bits) - len_bits = type_integer->integer_size * CHAR_BIT; - else - len_bits = type_integer->len_bits; - if (len_bits + offset_bits > type_integer->integer_size * CHAR_BIT) - abort(); - reverse_bo = type_integer->byte_order != SIDE_TYPE_BYTE_ORDER_HOST; - base = get_attr_display_base(type_integer->attr, - type_integer->nr_attr, - default_base); - switch (type_integer->integer_size) { - case 1: - if (type_integer->signedness) - v.v_signed = value->side_s8; - else - v.v_unsigned = value->side_u8; - break; - case 2: - if (type_integer->signedness) { - int16_t side_s16; - - side_s16 = value->side_s16; - if (reverse_bo) - side_s16 = side_bswap_16(side_s16); - v.v_signed = side_s16; - } else { - uint16_t side_u16; - - side_u16 = value->side_u16; - if (reverse_bo) - side_u16 = side_bswap_16(side_u16); - v.v_unsigned = side_u16; - } - break; - case 4: - if (type_integer->signedness) { - int32_t side_s32; - - side_s32 = value->side_s32; - if (reverse_bo) - side_s32 = side_bswap_32(side_s32); - v.v_signed = side_s32; - } else { - uint32_t side_u32; - - side_u32 = value->side_u32; - if (reverse_bo) - side_u32 = side_bswap_32(side_u32); - v.v_unsigned = side_u32; - } - break; - case 8: - if (type_integer->signedness) { - int64_t side_s64; - - side_s64 = value->side_s64; - if (reverse_bo) - side_s64 = side_bswap_64(side_s64); - v.v_signed = side_s64; - } else { - uint64_t side_u64; - - side_u64 = value->side_u64; - if (reverse_bo) - side_u64 = side_bswap_64(side_u64); - v.v_unsigned = side_u64; - } - break; - default: - abort(); - } - v.v_unsigned >>= offset_bits; - if (len_bits < 64) - v.v_unsigned &= (1ULL << len_bits) - 1; - tracer_print_type_header(separator, type_integer->attr, type_integer->nr_attr); + v64 = tracer_load_integer_value(type_integer, value, offset_bits, &len_bits); + tracer_print_type_header(separator, side_ptr_get(type_integer->attr), type_integer->nr_attr); + base = get_attr_display_base(side_ptr_get(type_integer->attr), type_integer->nr_attr, default_base); switch (base) { case TRACER_DISPLAY_BASE_2: - print_integer_binary(v.v_unsigned, len_bits); + print_integer_binary(v64.u, len_bits); break; case TRACER_DISPLAY_BASE_8: - printf("0%" PRIo64, v.v_unsigned); + /* Clear sign bits beyond len_bits */ + if (len_bits < 64) + v64.u &= (1ULL << len_bits) - 1; + printf("0%" PRIo64, v64.u); break; case TRACER_DISPLAY_BASE_10: - if (type_integer->signedness) { - /* Sign-extend. */ - if (len_bits < 64) { - if (v.v_unsigned & (1ULL << (len_bits - 1))) - v.v_unsigned |= ~((1ULL << len_bits) - 1); - } - printf("%" PRId64, v.v_signed); - } else { - printf("%" PRIu64, v.v_unsigned); - } + if (type_integer->signedness) + printf("%" PRId64, v64.s); + else + printf("%" PRIu64, v64.u); break; case TRACER_DISPLAY_BASE_16: - printf("0x%" PRIx64, v.v_unsigned); + /* Clear sign bits beyond len_bits */ + if (len_bits < 64) + v64.u &= (1ULL << len_bits) - 1; + printf("0x%" PRIx64, v64.u); break; default: abort(); @@ -692,8 +730,8 @@ void tracer_print_type_float(const char *separator, { bool reverse_bo; - reverse_bo = type_float->byte_order != SIDE_TYPE_FLOAT_WORD_ORDER_HOST; - tracer_print_type_header(separator, type_float->attr, type_float->nr_attr); + tracer_print_type_header(separator, side_ptr_get(type_float->attr), type_float->nr_attr); + reverse_bo = side_enum_get(type_float->byte_order) != SIDE_TYPE_FLOAT_WORD_ORDER_HOST; switch (type_float->float_size) { case 2: { @@ -707,7 +745,6 @@ void tracer_print_type_float(const char *separator, if (reverse_bo) float16.u = side_bswap_16(float16.u); - tracer_print_type_header(":", type_desc->u.side_float.attr, type_desc->u.side_float.nr_attr); printf("%g", (double) float16.f); break; #else @@ -783,9 +820,9 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg { enum side_type_label type; - switch (type_desc->type) { + switch (side_enum_get(type_desc->type)) { case SIDE_TYPE_ENUM: - switch (item->type) { + switch (side_enum_get(item->type)) { case SIDE_TYPE_U8: case SIDE_TYPE_U16: case SIDE_TYPE_U32: @@ -803,7 +840,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg break; case SIDE_TYPE_ENUM_BITMAP: - switch (item->type) { + switch (side_enum_get(item->type)) { case SIDE_TYPE_U8: case SIDE_TYPE_BYTE: case SIDE_TYPE_U16: @@ -819,8 +856,19 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg } break; + case SIDE_TYPE_GATHER_ENUM: + switch (side_enum_get(item->type)) { + case SIDE_TYPE_GATHER_INTEGER: + break; + default: + fprintf(stderr, "ERROR: type mismatch between description and arguments\n"); + abort(); + break; + } + break; + case SIDE_TYPE_DYNAMIC: - switch (item->type) { + switch (side_enum_get(item->type)) { case SIDE_TYPE_DYNAMIC_NULL: case SIDE_TYPE_DYNAMIC_BOOL: case SIDE_TYPE_DYNAMIC_INTEGER: @@ -841,22 +889,24 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg break; default: - if (type_desc->type != item->type) { + if (side_enum_get(type_desc->type) != side_enum_get(item->type)) { fprintf(stderr, "ERROR: type mismatch between description and arguments\n"); abort(); } break; } - if (type_desc->type == SIDE_TYPE_ENUM || type_desc->type == SIDE_TYPE_ENUM_BITMAP) - type = (enum side_type_label) type_desc->type; + if (side_enum_get(type_desc->type) == SIDE_TYPE_ENUM || side_enum_get(type_desc->type) == SIDE_TYPE_ENUM_BITMAP || side_enum_get(type_desc->type) == SIDE_TYPE_GATHER_ENUM) + type = side_enum_get(type_desc->type); else - type = (enum side_type_label) item->type; + type = side_enum_get(item->type); printf("{ "); switch (type) { + /* Stack-copy basic types */ case SIDE_TYPE_NULL: - tracer_print_type_header(":", type_desc->u.side_null.attr, type_desc->u.side_null.nr_attr); + tracer_print_type_header(":", side_ptr_get(type_desc->u.side_null.attr), + type_desc->u.side_null.nr_attr); printf(""); break; @@ -876,22 +926,14 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg TRACER_DISPLAY_BASE_10); break; - case SIDE_TYPE_POINTER: - tracer_print_type_integer(":", &type_desc->u.side_integer, &item->u.side_static.integer_value, 0, - TRACER_DISPLAY_BASE_16); - break; - case SIDE_TYPE_BYTE: - tracer_print_type_header(":", type_desc->u.side_byte.attr, type_desc->u.side_byte.nr_attr); + tracer_print_type_header(":", side_ptr_get(type_desc->u.side_byte.attr), type_desc->u.side_byte.nr_attr); printf("0x%" PRIx8, item->u.side_static.byte_value); break; - case SIDE_TYPE_ENUM: - print_enum(type_desc, item); - break; - - case SIDE_TYPE_ENUM_BITMAP: - print_enum_bitmap(type_desc, item); + case SIDE_TYPE_POINTER: + tracer_print_type_integer(":", &type_desc->u.side_integer, &item->u.side_static.integer_value, 0, + TRACER_DISPLAY_BASE_16); break; case SIDE_TYPE_FLOAT_BINARY16: @@ -901,51 +943,79 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg tracer_print_type_float(":", &type_desc->u.side_float, &item->u.side_static.float_value); break; - case SIDE_TYPE_STRING: - tracer_print_type_header(":", type_desc->u.side_string.attr, type_desc->u.side_string.nr_attr); - printf("\"%s\"", (const char *)(uintptr_t) item->u.side_static.string_value); + case SIDE_TYPE_STRING_UTF8: + case SIDE_TYPE_STRING_UTF16: + case SIDE_TYPE_STRING_UTF32: + tracer_print_type_header(":", side_ptr_get(type_desc->u.side_string.attr), type_desc->u.side_string.nr_attr); + tracer_print_string(side_ptr_get(item->u.side_static.string_value), + type_desc->u.side_string.unit_size, side_enum_get(type_desc->u.side_string.byte_order), NULL); break; + + /* Stack-copy compound types */ case SIDE_TYPE_STRUCT: - tracer_print_struct(type_desc, item->u.side_static.side_struct); + tracer_print_struct(type_desc, side_ptr_get(item->u.side_static.side_struct)); break; - case SIDE_TYPE_GATHER_STRUCT: - (void) tracer_print_gather_struct(&type_desc->u.side_gather, item->u.side_static.side_struct_gather_ptr); + case SIDE_TYPE_VARIANT: + tracer_print_variant(type_desc, side_ptr_get(item->u.side_static.side_variant)); break; - case SIDE_TYPE_GATHER_ARRAY: - (void) tracer_print_gather_array(&type_desc->u.side_gather, item->u.side_static.side_array_gather_ptr); + case SIDE_TYPE_ARRAY: + tracer_print_array(type_desc, side_ptr_get(item->u.side_static.side_array)); break; - case SIDE_TYPE_GATHER_VLA: - (void) tracer_print_gather_vla(&type_desc->u.side_gather, item->u.side_static.side_vla_gather.ptr, - item->u.side_static.side_vla_gather.length_ptr); + case SIDE_TYPE_VLA: + tracer_print_vla(type_desc, side_ptr_get(item->u.side_static.side_vla)); + break; + case SIDE_TYPE_VLA_VISITOR: + tracer_print_vla_visitor(type_desc, item->u.side_static.side_vla_app_visitor_ctx); + break; + + /* Stack-copy enumeration types */ + case SIDE_TYPE_ENUM: + tracer_print_enum(type_desc, item); + break; + case SIDE_TYPE_ENUM_BITMAP: + tracer_print_enum_bitmap(type_desc, item); break; + + /* Gather basic types */ case SIDE_TYPE_GATHER_BOOL: - (void) tracer_print_gather_bool_type(&type_desc->u.side_gather, item->u.side_static.side_bool_gather_ptr); + (void) tracer_print_gather_bool_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_bool_gather_ptr)); + break; + case SIDE_TYPE_GATHER_INTEGER: + (void) tracer_print_gather_integer_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_integer_gather_ptr), + TRACER_DISPLAY_BASE_10); break; case SIDE_TYPE_GATHER_BYTE: - (void) tracer_print_gather_byte_type(&type_desc->u.side_gather, item->u.side_static.side_byte_gather_ptr); + (void) tracer_print_gather_byte_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_byte_gather_ptr)); break; case SIDE_TYPE_GATHER_POINTER: - (void) tracer_print_gather_integer_type(&type_desc->u.side_gather, item->u.side_static.side_integer_gather_ptr, + (void) tracer_print_gather_integer_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_integer_gather_ptr), TRACER_DISPLAY_BASE_16); break; - case SIDE_TYPE_GATHER_INTEGER: - (void) tracer_print_gather_integer_type(&type_desc->u.side_gather, item->u.side_static.side_integer_gather_ptr, - TRACER_DISPLAY_BASE_10); - break; case SIDE_TYPE_GATHER_FLOAT: - (void) tracer_print_gather_float_type(&type_desc->u.side_gather, item->u.side_static.side_float_gather_ptr); + (void) tracer_print_gather_float_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_float_gather_ptr)); break; - case SIDE_TYPE_ARRAY: - tracer_print_array(type_desc, item->u.side_static.side_array); + case SIDE_TYPE_GATHER_STRING: + (void) tracer_print_gather_string_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_string_gather_ptr)); break; - case SIDE_TYPE_VLA: - tracer_print_vla(type_desc, item->u.side_static.side_vla); + + /* Gather compound type */ + case SIDE_TYPE_GATHER_STRUCT: + (void) tracer_print_gather_struct(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_struct_gather_ptr)); break; - case SIDE_TYPE_VLA_VISITOR: - tracer_print_vla_visitor(type_desc, item->u.side_static.side_vla_app_visitor_ctx); + case SIDE_TYPE_GATHER_ARRAY: + (void) tracer_print_gather_array(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_array_gather_ptr)); + break; + case SIDE_TYPE_GATHER_VLA: + (void) tracer_print_gather_vla(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_vla_gather.ptr), + side_ptr_get(item->u.side_static.side_vla_gather.length_ptr)); + break; + + /* Gather enumeration types */ + case SIDE_TYPE_GATHER_ENUM: + (void) tracer_print_gather_enum_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_integer_gather_ptr)); break; - /* Dynamic types */ + /* Dynamic basic types */ case SIDE_TYPE_DYNAMIC_NULL: case SIDE_TYPE_DYNAMIC_BOOL: case SIDE_TYPE_DYNAMIC_INTEGER: @@ -953,6 +1023,8 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg case SIDE_TYPE_DYNAMIC_POINTER: case SIDE_TYPE_DYNAMIC_FLOAT: case SIDE_TYPE_DYNAMIC_STRING: + + /* Dynamic compound types */ case SIDE_TYPE_DYNAMIC_STRUCT: case SIDE_TYPE_DYNAMIC_STRUCT_VISITOR: case SIDE_TYPE_DYNAMIC_VLA: @@ -969,47 +1041,88 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg static void tracer_print_field(const struct side_event_field *item_desc, const struct side_arg *item) { - printf("%s: ", item_desc->field_name); + printf("%s: ", side_ptr_get(item_desc->field_name)); tracer_print_type(&item_desc->side_type, item); } static void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec) { - const struct side_arg *sav = side_arg_vec->sav; + const struct side_arg *sav = side_ptr_get(side_arg_vec->sav); + const struct side_type_struct *side_struct = side_ptr_get(type_desc->u.side_struct); uint32_t i, side_sav_len = side_arg_vec->len; - if (type_desc->u.side_struct->nr_fields != side_sav_len) { + if (side_struct->nr_fields != side_sav_len) { fprintf(stderr, "ERROR: number of fields mismatch between description and arguments of structure\n"); abort(); } - print_attributes("attr", ":", type_desc->u.side_struct->attr, type_desc->u.side_struct->nr_attr); - printf("%s", type_desc->u.side_struct->nr_attr ? ", " : ""); + print_attributes("attr", ":", side_ptr_get(side_struct->attr), side_struct->nr_attr); + printf("%s", side_struct->nr_attr ? ", " : ""); printf("fields: { "); for (i = 0; i < side_sav_len; i++) { printf("%s", i ? ", " : ""); - tracer_print_field(&type_desc->u.side_struct->fields[i], &sav[i]); + tracer_print_field(&side_ptr_get(side_struct->fields)[i], &sav[i]); } printf(" }"); } +static +void tracer_print_variant(const struct side_type *type_desc, const struct side_arg_variant *side_arg_variant) +{ + const struct side_type_variant *side_type_variant = side_ptr_get(type_desc->u.side_variant); + const struct side_type *selector_type = &side_type_variant->selector; + union int64_value v64; + uint32_t i; + + if (side_enum_get(selector_type->type) != side_enum_get(side_arg_variant->selector.type)) { + fprintf(stderr, "ERROR: Unexpected variant selector type\n"); + abort(); + } + switch (side_enum_get(selector_type->type)) { + case SIDE_TYPE_U8: + case SIDE_TYPE_U16: + case SIDE_TYPE_U32: + case SIDE_TYPE_U64: + case SIDE_TYPE_S8: + case SIDE_TYPE_S16: + case SIDE_TYPE_S32: + case SIDE_TYPE_S64: + break; + default: + fprintf(stderr, "ERROR: Expecting integer variant selector type\n"); + abort(); + } + v64 = tracer_load_integer_value(&selector_type->u.side_integer, + &side_arg_variant->selector.u.side_static.integer_value, 0, NULL); + for (i = 0; i < side_type_variant->nr_options; i++) { + const struct side_variant_option *option = &side_ptr_get(side_type_variant->options)[i]; + + if (v64.s >= option->range_begin && v64.s <= option->range_end) { + tracer_print_type(&option->side_type, &side_arg_variant->option); + return; + } + } + fprintf(stderr, "ERROR: Variant selector value unknown %" PRId64 "\n", v64.s); + abort(); +} + static void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec) { - const struct side_arg *sav = side_arg_vec->sav; + const struct side_arg *sav = side_ptr_get(side_arg_vec->sav); uint32_t i, side_sav_len = side_arg_vec->len; if (type_desc->u.side_array.length != side_sav_len) { fprintf(stderr, "ERROR: length mismatch between description and arguments of array\n"); abort(); } - print_attributes("attr", ":", type_desc->u.side_array.attr, type_desc->u.side_array.nr_attr); + print_attributes("attr", ":", side_ptr_get(type_desc->u.side_array.attr), type_desc->u.side_array.nr_attr); printf("%s", type_desc->u.side_array.nr_attr ? ", " : ""); printf("elements: "); printf("[ "); for (i = 0; i < side_sav_len; i++) { printf("%s", i ? ", " : ""); - tracer_print_type(type_desc->u.side_array.elem_type, &sav[i]); + tracer_print_type(side_ptr_get(type_desc->u.side_array.elem_type), &sav[i]); } printf(" ]"); } @@ -1017,16 +1130,16 @@ void tracer_print_array(const struct side_type *type_desc, const struct side_arg static void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec) { - const struct side_arg *sav = side_arg_vec->sav; + const struct side_arg *sav = side_ptr_get(side_arg_vec->sav); uint32_t i, side_sav_len = side_arg_vec->len; - print_attributes("attr", ":", type_desc->u.side_vla.attr, type_desc->u.side_vla.nr_attr); + print_attributes("attr", ":", side_ptr_get(type_desc->u.side_vla.attr), type_desc->u.side_vla.nr_attr); printf("%s", type_desc->u.side_vla.nr_attr ? ", " : ""); printf("elements: "); printf("[ "); for (i = 0; i < side_sav_len; i++) { printf("%s", i ? ", " : ""); - tracer_print_type(type_desc->u.side_vla.elem_type, &sav[i]); + tracer_print_type(side_ptr_get(type_desc->u.side_vla.elem_type), &sav[i]); } printf(" ]"); } @@ -1039,7 +1152,7 @@ const char *tracer_gather_access(enum side_type_gather_access_mode access_mode, return ptr; case SIDE_TYPE_GATHER_ACCESS_POINTER: /* Dereference pointer */ - memcpy(&ptr, ptr, sizeof(ptr)); + memcpy(&ptr, ptr, sizeof(const char *)); return ptr; default: abort(); @@ -1060,28 +1173,19 @@ uint32_t tracer_gather_size(enum side_type_gather_access_mode access_mode, uint3 } static -uint64_t tracer_load_gather_integer_type(const struct side_type_gather *type_gather, const void *_ptr) +union int64_value tracer_load_gather_integer_value(const struct side_type_gather_integer *side_integer, + const void *_ptr) { enum side_type_gather_access_mode access_mode = - (enum side_type_gather_access_mode) type_gather->u.side_integer.access_mode; - uint32_t integer_size_bytes = type_gather->u.side_integer.type.integer_size; + (enum side_type_gather_access_mode) side_integer->access_mode; + uint32_t integer_size_bytes = side_integer->type.integer_size; const char *ptr = (const char *) _ptr; union side_integer_value value; - ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_integer.offset); + ptr = tracer_gather_access(access_mode, ptr + side_integer->offset); memcpy(&value, ptr, integer_size_bytes); - switch (type_gather->u.side_integer.type.integer_size) { - case 1: - return (uint64_t) value.side_u8; - case 2: - return (uint64_t) value.side_u16; - case 4: - return (uint64_t) value.side_u32; - case 8: - return (uint64_t) value.side_u64; - default: - abort(); - } + return tracer_load_integer_value(&side_integer->type, &value, + side_integer->offset_bits, NULL); } static @@ -1119,7 +1223,7 @@ uint32_t tracer_print_gather_byte_type(const struct side_type_gather *type_gathe ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_byte.offset); memcpy(&value, ptr, 1); - tracer_print_type_header(":", type_gather->u.side_byte.type.attr, + tracer_print_type_header(":", side_ptr_get(type_gather->u.side_byte.type.attr), type_gather->u.side_byte.type.nr_attr); printf("0x%" PRIx8, value); return tracer_gather_size(access_mode, 1); @@ -1175,16 +1279,42 @@ uint32_t tracer_print_gather_float_type(const struct side_type_gather *type_gath return tracer_gather_size(access_mode, float_size_bytes); } +static +uint32_t tracer_print_gather_string_type(const struct side_type_gather *type_gather, const void *_ptr) +{ + enum side_type_gather_access_mode access_mode = + (enum side_type_gather_access_mode) type_gather->u.side_string.access_mode; + const char *ptr = (const char *) _ptr; + size_t string_len; + + ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_string.offset); + tracer_print_type_header(":", side_ptr_get(type_gather->u.side_string.type.attr), + type_gather->u.side_string.type.nr_attr); + if (ptr) { + tracer_print_string(ptr, type_gather->u.side_string.type.unit_size, + side_enum_get(type_gather->u.side_string.type.byte_order), &string_len); + } else { + printf(""); + string_len = type_gather->u.side_string.type.unit_size; + } + return tracer_gather_size(access_mode, string_len); +} + static uint32_t tracer_print_gather_type(const struct side_type *type_desc, const void *ptr) { uint32_t len; printf("{ "); - switch (type_desc->type) { + switch (side_enum_get(type_desc->type)) { + /* Gather basic types */ case SIDE_TYPE_GATHER_BOOL: len = tracer_print_gather_bool_type(&type_desc->u.side_gather, ptr); break; + case SIDE_TYPE_GATHER_INTEGER: + len = tracer_print_gather_integer_type(&type_desc->u.side_gather, ptr, + TRACER_DISPLAY_BASE_10); + break; case SIDE_TYPE_GATHER_BYTE: len = tracer_print_gather_byte_type(&type_desc->u.side_gather, ptr); break; @@ -1192,13 +1322,19 @@ uint32_t tracer_print_gather_type(const struct side_type *type_desc, const void len = tracer_print_gather_integer_type(&type_desc->u.side_gather, ptr, TRACER_DISPLAY_BASE_16); break; - case SIDE_TYPE_GATHER_INTEGER: - len = tracer_print_gather_integer_type(&type_desc->u.side_gather, ptr, - TRACER_DISPLAY_BASE_10); - break; case SIDE_TYPE_GATHER_FLOAT: len = tracer_print_gather_float_type(&type_desc->u.side_gather, ptr); break; + case SIDE_TYPE_GATHER_STRING: + len = tracer_print_gather_string_type(&type_desc->u.side_gather, ptr); + break; + + /* Gather enum types */ + case SIDE_TYPE_GATHER_ENUM: + len = tracer_print_gather_enum_type(&type_desc->u.side_gather, ptr); + break; + + /* Gather compound types */ case SIDE_TYPE_GATHER_STRUCT: len = tracer_print_gather_struct(&type_desc->u.side_gather, ptr); break; @@ -1216,10 +1352,42 @@ uint32_t tracer_print_gather_type(const struct side_type *type_desc, const void return len; } +static +uint32_t tracer_print_gather_enum_type(const struct side_type_gather *type_gather, const void *_ptr) +{ + const struct side_enum_mappings *mappings = side_ptr_get(type_gather->u.side_enum.mappings); + const struct side_type *enum_elem_type = side_ptr_get(type_gather->u.side_enum.elem_type); + const struct side_type_gather_integer *side_integer = &enum_elem_type->u.side_gather.u.side_integer; + enum side_type_gather_access_mode access_mode = + (enum side_type_gather_access_mode) side_integer->access_mode; + uint32_t integer_size_bytes = side_integer->type.integer_size; + const char *ptr = (const char *) _ptr; + union side_integer_value value; + union int64_value v64; + + switch (integer_size_bytes) { + case 1: + case 2: + case 4: + case 8: + break; + default: + abort(); + } + ptr = tracer_gather_access(access_mode, ptr + side_integer->offset); + memcpy(&value, ptr, integer_size_bytes); + v64 = tracer_load_gather_integer_value(side_integer, &value); + print_attributes("attr", ":", side_ptr_get(mappings->attr), mappings->nr_attr); + printf("%s", mappings->nr_attr ? ", " : ""); + tracer_print_gather_type(enum_elem_type, ptr); + print_enum_labels(mappings, v64); + return tracer_gather_size(access_mode, integer_size_bytes); +} + static void tracer_print_gather_field(const struct side_event_field *field, const void *ptr) { - printf("%s: ", field->field_name); + printf("%s: ", side_ptr_get(field->field_name)); (void) tracer_print_gather_type(&field->side_type, ptr); } @@ -1228,16 +1396,17 @@ uint32_t tracer_print_gather_struct(const struct side_type_gather *type_gather, { enum side_type_gather_access_mode access_mode = (enum side_type_gather_access_mode) type_gather->u.side_struct.access_mode; + const struct side_type_struct *side_struct = side_ptr_get(type_gather->u.side_struct.type); const char *ptr = (const char *) _ptr; uint32_t i; ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_struct.offset); - print_attributes("attr", ":", type_gather->u.side_struct.type->attr, type_gather->u.side_struct.type->nr_attr); - printf("%s", type_gather->u.side_struct.type->nr_attr ? ", " : ""); + print_attributes("attr", ":", side_ptr_get(side_struct->attr), side_struct->nr_attr); + printf("%s", side_struct->nr_attr ? ", " : ""); printf("fields: { "); - for (i = 0; i < type_gather->u.side_struct.type->nr_fields; i++) { + for (i = 0; i < side_struct->nr_fields; i++) { printf("%s", i ? ", " : ""); - tracer_print_gather_field(&type_gather->u.side_struct.type->fields[i], ptr); + tracer_print_gather_field(&side_ptr_get(side_struct->fields)[i], ptr); } printf(" }"); return tracer_gather_size(access_mode, type_gather->u.side_struct.size); @@ -1253,12 +1422,14 @@ uint32_t tracer_print_gather_array(const struct side_type_gather *type_gather, c ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_array.offset); orig_ptr = ptr; - print_attributes("attr", ":", type_gather->u.side_array.type.attr, type_gather->u.side_array.type.nr_attr); + print_attributes("attr", ":", side_ptr_get(type_gather->u.side_array.type.attr), type_gather->u.side_array.type.nr_attr); printf("%s", type_gather->u.side_array.type.nr_attr ? ", " : ""); printf("elements: "); printf("[ "); for (i = 0; i < type_gather->u.side_array.type.length; i++) { - switch (type_gather->u.side_array.type.elem_type->type) { + const struct side_type *elem_type = side_ptr_get(type_gather->u.side_array.type.elem_type); + + switch (side_enum_get(elem_type->type)) { case SIDE_TYPE_GATHER_VLA: fprintf(stderr, "\n"); abort(); @@ -1266,7 +1437,7 @@ uint32_t tracer_print_gather_array(const struct side_type_gather *type_gather, c break; } printf("%s", i ? ", " : ""); - ptr += tracer_print_gather_type(type_gather->u.side_array.type.elem_type, ptr); + ptr += tracer_print_gather_type(elem_type, ptr); } printf(" ]"); return tracer_gather_size(access_mode, ptr - orig_ptr); @@ -1278,27 +1449,33 @@ uint32_t tracer_print_gather_vla(const struct side_type_gather *type_gather, con { enum side_type_gather_access_mode access_mode = (enum side_type_gather_access_mode) type_gather->u.side_vla.access_mode; + const struct side_type *length_type = side_ptr_get(type_gather->u.side_vla.length_type); const char *ptr = (const char *) _ptr, *orig_ptr; const char *length_ptr = (const char *) _length_ptr; + union int64_value v64; uint32_t i, length; /* Access length */ - switch (type_gather->u.side_vla.length_type->type) { + switch (side_enum_get(length_type->type)) { case SIDE_TYPE_GATHER_INTEGER: break; default: fprintf(stderr, "\n"); abort(); } - length = (uint32_t) tracer_load_gather_integer_type(&type_gather->u.side_vla.length_type->u.side_gather, length_ptr); + v64 = tracer_load_gather_integer_value(&length_type->u.side_gather.u.side_integer, + length_ptr); + length = (uint32_t) v64.u; ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_vla.offset); orig_ptr = ptr; - print_attributes("attr", ":", type_gather->u.side_vla.type.attr, type_gather->u.side_vla.type.nr_attr); + print_attributes("attr", ":", side_ptr_get(type_gather->u.side_vla.type.attr), type_gather->u.side_vla.type.nr_attr); printf("%s", type_gather->u.side_vla.type.nr_attr ? ", " : ""); printf("elements: "); printf("[ "); for (i = 0; i < length; i++) { - switch (type_gather->u.side_vla.type.elem_type->type) { + const struct side_type *elem_type = side_ptr_get(type_gather->u.side_vla.type.elem_type); + + switch (side_enum_get(elem_type->type)) { case SIDE_TYPE_GATHER_VLA: fprintf(stderr, "\n"); abort(); @@ -1306,7 +1483,7 @@ uint32_t tracer_print_gather_vla(const struct side_type_gather *type_gather, con break; } printf("%s", i ? ", " : ""); - ptr += tracer_print_gather_type(type_gather->u.side_vla.type.elem_type, ptr); + ptr += tracer_print_gather_type(elem_type, ptr); } printf(" ]"); return tracer_gather_size(access_mode, ptr - orig_ptr); @@ -1333,19 +1510,21 @@ void tracer_print_vla_visitor(const struct side_type *type_desc, void *app_ctx) { enum side_visitor_status status; struct tracer_visitor_priv tracer_priv = { - .elem_type = type_desc->u.side_vla_visitor.elem_type, + .elem_type = side_ptr_get(type_desc->u.side_vla_visitor.elem_type), .i = 0, }; const struct side_tracer_visitor_ctx tracer_ctx = { .write_elem = tracer_write_elem_cb, .priv = &tracer_priv, }; + side_visitor_func func; - print_attributes("attr", ":", type_desc->u.side_vla_visitor.attr, type_desc->u.side_vla_visitor.nr_attr); + print_attributes("attr", ":", side_ptr_get(type_desc->u.side_vla_visitor.attr), type_desc->u.side_vla_visitor.nr_attr); printf("%s", type_desc->u.side_vla_visitor.nr_attr ? ", " : ""); printf("elements: "); printf("[ "); - status = type_desc->u.side_vla_visitor.visitor(&tracer_ctx, app_ctx); + func = side_ptr_get(type_desc->u.side_vla_visitor.visitor); + status = func(&tracer_ctx, app_ctx); switch (status) { case SIDE_VISITOR_STATUS_OK: break; @@ -1359,16 +1538,16 @@ void tracer_print_vla_visitor(const struct side_type *type_desc, void *app_ctx) static void tracer_print_dynamic_struct(const struct side_arg_dynamic_struct *dynamic_struct) { - const struct side_arg_dynamic_field *fields = dynamic_struct->fields; + const struct side_arg_dynamic_field *fields = side_ptr_get(dynamic_struct->fields); uint32_t i, len = dynamic_struct->len; - print_attributes("attr", "::", dynamic_struct->attr, dynamic_struct->nr_attr); + print_attributes("attr", "::", side_ptr_get(dynamic_struct->attr), dynamic_struct->nr_attr); printf("%s", dynamic_struct->nr_attr ? ", " : ""); printf("fields:: "); printf("[ "); for (i = 0; i < len; i++) { printf("%s", i ? ", " : ""); - printf("%s:: ", fields[i].field_name); + printf("%s:: ", side_ptr_get(fields[i].field_name)); tracer_print_dynamic(&fields[i].elem); } printf(" ]"); @@ -1387,7 +1566,7 @@ enum side_visitor_status tracer_dynamic_struct_write_elem_cb( (struct tracer_dynamic_struct_visitor_priv *) tracer_ctx->priv; printf("%s", tracer_priv->i++ ? ", " : ""); - printf("%s:: ", dynamic_field->field_name); + printf("%s:: ", side_ptr_get(dynamic_field->field_name)); tracer_print_dynamic(&dynamic_field->elem); return SIDE_VISITOR_STATUS_OK; } @@ -1403,13 +1582,13 @@ void tracer_print_dynamic_struct_visitor(const struct side_arg *item) .write_field = tracer_dynamic_struct_write_elem_cb, .priv = &tracer_priv, }; - void *app_ctx = item->u.side_dynamic.side_dynamic_struct_visitor.app_ctx; + void *app_ctx = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.app_ctx); - print_attributes("attr", "::", item->u.side_dynamic.side_dynamic_struct_visitor.attr, item->u.side_dynamic.side_dynamic_struct_visitor.nr_attr); + print_attributes("attr", "::", side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.attr), item->u.side_dynamic.side_dynamic_struct_visitor.nr_attr); printf("%s", item->u.side_dynamic.side_dynamic_struct_visitor.nr_attr ? ", " : ""); printf("fields:: "); printf("[ "); - status = item->u.side_dynamic.side_dynamic_struct_visitor.visitor(&tracer_ctx, app_ctx); + status = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.visitor)(&tracer_ctx, app_ctx); switch (status) { case SIDE_VISITOR_STATUS_OK: break; @@ -1423,10 +1602,10 @@ void tracer_print_dynamic_struct_visitor(const struct side_arg *item) static void tracer_print_dynamic_vla(const struct side_arg_dynamic_vla *vla) { - const struct side_arg *sav = vla->sav; + const struct side_arg *sav = side_ptr_get(vla->sav); uint32_t i, side_sav_len = vla->len; - print_attributes("attr", "::", vla->attr, vla->nr_attr); + print_attributes("attr", "::", side_ptr_get(vla->attr), vla->nr_attr); printf("%s", vla->nr_attr ? ", " : ""); printf("elements:: "); printf("[ "); @@ -1465,13 +1644,13 @@ void tracer_print_dynamic_vla_visitor(const struct side_arg *item) .write_elem = tracer_dynamic_vla_write_elem_cb, .priv = &tracer_priv, }; - void *app_ctx = item->u.side_dynamic.side_dynamic_vla_visitor.app_ctx; + void *app_ctx = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.app_ctx); - print_attributes("attr", "::", item->u.side_dynamic.side_dynamic_vla_visitor.attr, item->u.side_dynamic.side_dynamic_vla_visitor.nr_attr); + print_attributes("attr", "::", side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.attr), item->u.side_dynamic.side_dynamic_vla_visitor.nr_attr); printf("%s", item->u.side_dynamic.side_dynamic_vla_visitor.nr_attr ? ", " : ""); printf("elements:: "); printf("[ "); - status = item->u.side_dynamic.side_dynamic_vla_visitor.visitor(&tracer_ctx, app_ctx); + status = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.visitor)(&tracer_ctx, app_ctx); switch (status) { case SIDE_VISITOR_STATUS_OK: break; @@ -1486,47 +1665,48 @@ static void tracer_print_dynamic(const struct side_arg *item) { printf("{ "); - switch (item->type) { + switch (side_enum_get(item->type)) { + /* Dynamic basic types */ case SIDE_TYPE_DYNAMIC_NULL: - tracer_print_type_header("::", item->u.side_dynamic.side_null.attr, item->u.side_dynamic.side_null.nr_attr); + tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_null.attr), + item->u.side_dynamic.side_null.nr_attr); printf(""); break; - case SIDE_TYPE_DYNAMIC_BOOL: tracer_print_type_bool("::", &item->u.side_dynamic.side_bool.type, &item->u.side_dynamic.side_bool.value, 0); break; - case SIDE_TYPE_DYNAMIC_INTEGER: tracer_print_type_integer("::", &item->u.side_dynamic.side_integer.type, &item->u.side_dynamic.side_integer.value, 0, TRACER_DISPLAY_BASE_10); break; case SIDE_TYPE_DYNAMIC_BYTE: - tracer_print_type_header("::", item->u.side_dynamic.side_byte.type.attr, item->u.side_dynamic.side_byte.type.nr_attr); + tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_byte.type.attr), item->u.side_dynamic.side_byte.type.nr_attr); printf("0x%" PRIx8, item->u.side_dynamic.side_byte.value); break; - case SIDE_TYPE_DYNAMIC_POINTER: tracer_print_type_integer("::", &item->u.side_dynamic.side_integer.type, &item->u.side_dynamic.side_integer.value, 0, TRACER_DISPLAY_BASE_16); break; - case SIDE_TYPE_DYNAMIC_FLOAT: tracer_print_type_float("::", &item->u.side_dynamic.side_float.type, &item->u.side_dynamic.side_float.value); break; - case SIDE_TYPE_DYNAMIC_STRING: - tracer_print_type_header("::", item->u.side_dynamic.side_string.type.attr, item->u.side_dynamic.side_string.type.nr_attr); - printf("\"%s\"", (const char *)(uintptr_t) item->u.side_dynamic.side_string.value); + tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_string.type.attr), item->u.side_dynamic.side_string.type.nr_attr); + tracer_print_string((const char *)(uintptr_t) item->u.side_dynamic.side_string.value, + item->u.side_dynamic.side_string.type.unit_size, + side_enum_get(item->u.side_dynamic.side_string.type.byte_order), NULL); break; + + /* Dynamic compound types */ case SIDE_TYPE_DYNAMIC_STRUCT: - tracer_print_dynamic_struct(item->u.side_dynamic.side_dynamic_struct); + tracer_print_dynamic_struct(side_ptr_get(item->u.side_dynamic.side_dynamic_struct)); break; case SIDE_TYPE_DYNAMIC_STRUCT_VISITOR: tracer_print_dynamic_struct_visitor(item); break; case SIDE_TYPE_DYNAMIC_VLA: - tracer_print_dynamic_vla(item->u.side_dynamic.side_dynamic_vla); + tracer_print_dynamic_vla(side_ptr_get(item->u.side_dynamic.side_dynamic_vla)); break; case SIDE_TYPE_DYNAMIC_VLA_VISITOR: tracer_print_dynamic_vla_visitor(item); @@ -1543,19 +1723,19 @@ void tracer_print_static_fields(const struct side_event_description *desc, const struct side_arg_vec *side_arg_vec, uint32_t *nr_items) { - const struct side_arg *sav = side_arg_vec->sav; + const struct side_arg *sav = side_ptr_get(side_arg_vec->sav); uint32_t i, side_sav_len = side_arg_vec->len; - printf("provider: %s, event: %s", desc->provider_name, desc->event_name); + printf("provider: %s, event: %s", side_ptr_get(desc->provider_name), side_ptr_get(desc->event_name)); if (desc->nr_fields != side_sav_len) { fprintf(stderr, "ERROR: number of fields mismatch between description and arguments\n"); abort(); } - print_attributes(", attr", ":", desc->attr, desc->nr_attr); + print_attributes(", attr", ":", side_ptr_get(desc->attr), desc->nr_attr); printf("%s", side_sav_len ? ", fields: [ " : ""); for (i = 0; i < side_sav_len; i++) { printf("%s", i ? ", " : ""); - tracer_print_field(&desc->fields[i], &sav[i]); + tracer_print_field(&side_ptr_get(desc->fields)[i], &sav[i]); } if (nr_items) *nr_items = i; @@ -1563,6 +1743,7 @@ void tracer_print_static_fields(const struct side_event_description *desc, printf(" ]"); } +static void tracer_call(const struct side_event_description *desc, const struct side_arg_vec *side_arg_vec, void *priv __attribute__((unused))) @@ -1573,6 +1754,7 @@ void tracer_call(const struct side_event_description *desc, printf("\n"); } +static void tracer_call_variadic(const struct side_event_description *desc, const struct side_arg_vec *side_arg_vec, const struct side_arg_dynamic_struct *var_struct, @@ -1586,20 +1768,22 @@ void tracer_call_variadic(const struct side_event_description *desc, fprintf(stderr, "ERROR: unexpected non-variadic event description\n"); abort(); } - print_attributes(", attr ", "::", var_struct->attr, var_struct->nr_attr); + print_attributes(", attr ", "::", side_ptr_get(var_struct->attr), var_struct->nr_attr); printf("%s", var_struct_len ? ", fields:: [ " : ""); for (i = 0; i < var_struct_len; i++, nr_fields++) { printf("%s", i ? ", " : ""); - printf("%s:: ", var_struct->fields[i].field_name); - tracer_print_dynamic(&var_struct->fields[i].elem); + printf("%s:: ", side_ptr_get(side_ptr_get(var_struct->fields)[i].field_name)); + tracer_print_dynamic(&side_ptr_get(var_struct->fields)[i].elem); } if (i) printf(" ]"); printf("\n"); } +static void tracer_event_notification(enum side_tracer_notification notif, - struct side_event_description **events, uint32_t nr_events, void *priv) + struct side_event_description **events, uint32_t nr_events, + void *priv __attribute__((unused))) { uint32_t i; int ret; @@ -1614,8 +1798,8 @@ void tracer_event_notification(enum side_tracer_notification notif, if (!event) continue; printf("provider: %s, event: %s\n", - event->provider_name, event->event_name); - if (notif == SIDE_TRACER_NOTIFICATION_INSERT_EVENTS) { + side_ptr_get(event->provider_name), side_ptr_get(event->event_name)); + if (notif == SIDE_TRACER_NOTIFICATION_INSERT_EVENTS) { if (event->flags & SIDE_EVENT_FLAG_VARIADIC) { ret = side_tracer_callback_variadic_register(event, tracer_call_variadic, NULL); if (ret)