From e5b6a8ce90e3a9545a90530ad850ba425aff2dbf Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 8 Nov 2022 20:03:59 -0500 Subject: [PATCH] Dynamic type: remove repeated type size in type enum Signed-off-by: Mathieu Desnoyers --- include/side/trace.h | 39 +++++++++++++++----------------------- src/tracer.c | 45 +++++++++----------------------------------- 2 files changed, 24 insertions(+), 60 deletions(-) diff --git a/include/side/trace.h b/include/side/trace.h index ef7545d..0441afe 100644 --- a/include/side/trace.h +++ b/include/side/trace.h @@ -132,20 +132,11 @@ enum side_type_label { /* Dynamic basic types */ SIDE_TYPE_DYNAMIC_NULL, SIDE_TYPE_DYNAMIC_BOOL, - SIDE_TYPE_DYNAMIC_U8, - SIDE_TYPE_DYNAMIC_U16, - SIDE_TYPE_DYNAMIC_U32, - SIDE_TYPE_DYNAMIC_U64, - SIDE_TYPE_DYNAMIC_S8, - SIDE_TYPE_DYNAMIC_S16, - SIDE_TYPE_DYNAMIC_S32, - SIDE_TYPE_DYNAMIC_S64, + SIDE_TYPE_DYNAMIC_UNSIGNED_INT, + SIDE_TYPE_DYNAMIC_SIGNED_INT, SIDE_TYPE_DYNAMIC_BYTE, SIDE_TYPE_DYNAMIC_POINTER, - SIDE_TYPE_DYNAMIC_FLOAT_BINARY16, - SIDE_TYPE_DYNAMIC_FLOAT_BINARY32, - SIDE_TYPE_DYNAMIC_FLOAT_BINARY64, - SIDE_TYPE_DYNAMIC_FLOAT_BINARY128, + SIDE_TYPE_DYNAMIC_FLOAT, SIDE_TYPE_DYNAMIC_STRING, /* Dynamic compound types */ @@ -1351,23 +1342,23 @@ struct side_event_description { } #define side_arg_dynamic_u8(_val, _attr) \ - _side_arg_dynamic_integer(.side_u8, _val, SIDE_TYPE_DYNAMIC_U8, false, SIDE_TYPE_BYTE_ORDER_HOST, sizeof(uint8_t), 0, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_u8, _val, SIDE_TYPE_DYNAMIC_UNSIGNED_INT, false, SIDE_TYPE_BYTE_ORDER_HOST, sizeof(uint8_t), 0, SIDE_PARAM(_attr)) #define side_arg_dynamic_s8(_val, _attr) \ - _side_arg_dynamic_integer(.side_s8, _val, SIDE_TYPE_DYNAMIC_S8, true, SIDE_TYPE_BYTE_ORDER_HOST, sizeof(int8_t), 0, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_s8, _val, SIDE_TYPE_DYNAMIC_SIGNED_INT, true, SIDE_TYPE_BYTE_ORDER_HOST, sizeof(int8_t), 0, SIDE_PARAM(_attr)) #define _side_arg_dynamic_u16(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_u16, _val, SIDE_TYPE_DYNAMIC_U16, false, _byte_order, sizeof(uint16_t), 0, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_u16, _val, SIDE_TYPE_DYNAMIC_UNSIGNED_INT, false, _byte_order, sizeof(uint16_t), 0, SIDE_PARAM(_attr)) #define _side_arg_dynamic_u32(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_u32, _val, SIDE_TYPE_DYNAMIC_U32, false, _byte_order, sizeof(uint32_t), 0, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_u32, _val, SIDE_TYPE_DYNAMIC_UNSIGNED_INT, false, _byte_order, sizeof(uint32_t), 0, SIDE_PARAM(_attr)) #define _side_arg_dynamic_u64(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_u64, _val, SIDE_TYPE_DYNAMIC_U64, false, _byte_order, sizeof(uint64_t), 0, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_u64, _val, SIDE_TYPE_DYNAMIC_UNSIGNED_INT, false, _byte_order, sizeof(uint64_t), 0, SIDE_PARAM(_attr)) #define _side_arg_dynamic_s16(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_s16, _val, SIDE_TYPE_DYNAMIC_S16, true, _byte_order, sizeof(int16_t), 0, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_s16, _val, SIDE_TYPE_DYNAMIC_SIGNED_INT, true, _byte_order, sizeof(int16_t), 0, SIDE_PARAM(_attr)) #define _side_arg_dynamic_s32(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_s32, _val, SIDE_TYPE_DYNAMIC_S32, true, _byte_order, sizeof(int32_t), 0, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_s32, _val, SIDE_TYPE_DYNAMIC_SIGNED_INT, true, _byte_order, sizeof(int32_t), 0, SIDE_PARAM(_attr)) #define _side_arg_dynamic_s64(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_s64, _val, SIDE_TYPE_DYNAMIC_S64, true, _byte_order, sizeof(int64_t), 0, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_s64, _val, SIDE_TYPE_DYNAMIC_SIGNED_INT, true, _byte_order, sizeof(int64_t), 0, SIDE_PARAM(_attr)) #define _side_arg_dynamic_pointer(_val, _byte_order, _attr) \ _side_arg_dynamic_integer(.side_uptr, (uintptr_t) (_val), SIDE_TYPE_DYNAMIC_POINTER, false, _byte_order, \ @@ -1394,13 +1385,13 @@ struct side_event_description { } #define _side_arg_dynamic_float_binary16(_val, _byte_order, _attr) \ - _side_arg_dynamic_float(.side_float_binary16, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY16, _byte_order, sizeof(_Float16), SIDE_PARAM(_attr)) + _side_arg_dynamic_float(.side_float_binary16, _val, SIDE_TYPE_DYNAMIC_FLOAT, _byte_order, sizeof(_Float16), SIDE_PARAM(_attr)) #define _side_arg_dynamic_float_binary32(_val, _byte_order, _attr) \ - _side_arg_dynamic_float(.side_float_binary32, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY32, _byte_order, sizeof(_Float32), SIDE_PARAM(_attr)) + _side_arg_dynamic_float(.side_float_binary32, _val, SIDE_TYPE_DYNAMIC_FLOAT, _byte_order, sizeof(_Float32), SIDE_PARAM(_attr)) #define _side_arg_dynamic_float_binary64(_val, _byte_order, _attr) \ - _side_arg_dynamic_float(.side_float_binary64, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY64, _byte_order, sizeof(_Float64), SIDE_PARAM(_attr)) + _side_arg_dynamic_float(.side_float_binary64, _val, SIDE_TYPE_DYNAMIC_FLOAT, _byte_order, sizeof(_Float64), SIDE_PARAM(_attr)) #define _side_arg_dynamic_float_binary128(_val, _byte_order, _attr) \ - _side_arg_dynamic_float(.side_float_binary128, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY128, _byte_order, sizeof(_Float128), SIDE_PARAM(_attr)) + _side_arg_dynamic_float(.side_float_binary128, _val, SIDE_TYPE_DYNAMIC_FLOAT, _byte_order, sizeof(_Float128), SIDE_PARAM(_attr)) /* Host endian */ #define side_arg_dynamic_u16(_val, _attr) _side_arg_dynamic_u16(_val, SIDE_TYPE_BYTE_ORDER_HOST, SIDE_PARAM(_attr)) diff --git a/src/tracer.c b/src/tracer.c index 87d25b5..5fa1650 100644 --- a/src/tracer.c +++ b/src/tracer.c @@ -823,20 +823,11 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg switch (item->type) { case SIDE_TYPE_DYNAMIC_NULL: case SIDE_TYPE_DYNAMIC_BOOL: - case SIDE_TYPE_DYNAMIC_U8: - case SIDE_TYPE_DYNAMIC_U16: - case SIDE_TYPE_DYNAMIC_U32: - case SIDE_TYPE_DYNAMIC_U64: - case SIDE_TYPE_DYNAMIC_S8: - case SIDE_TYPE_DYNAMIC_S16: - case SIDE_TYPE_DYNAMIC_S32: - case SIDE_TYPE_DYNAMIC_S64: + case SIDE_TYPE_DYNAMIC_UNSIGNED_INT: + case SIDE_TYPE_DYNAMIC_SIGNED_INT: case SIDE_TYPE_DYNAMIC_BYTE: case SIDE_TYPE_DYNAMIC_POINTER: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY16: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY32: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY64: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY128: + case SIDE_TYPE_DYNAMIC_FLOAT: case SIDE_TYPE_DYNAMIC_STRING: case SIDE_TYPE_DYNAMIC_STRUCT: case SIDE_TYPE_DYNAMIC_STRUCT_VISITOR: @@ -959,20 +950,11 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg /* Dynamic types */ case SIDE_TYPE_DYNAMIC_NULL: case SIDE_TYPE_DYNAMIC_BOOL: - case SIDE_TYPE_DYNAMIC_U8: - case SIDE_TYPE_DYNAMIC_U16: - case SIDE_TYPE_DYNAMIC_U32: - case SIDE_TYPE_DYNAMIC_U64: - case SIDE_TYPE_DYNAMIC_S8: - case SIDE_TYPE_DYNAMIC_S16: - case SIDE_TYPE_DYNAMIC_S32: - case SIDE_TYPE_DYNAMIC_S64: + case SIDE_TYPE_DYNAMIC_UNSIGNED_INT: + case SIDE_TYPE_DYNAMIC_SIGNED_INT: case SIDE_TYPE_DYNAMIC_BYTE: case SIDE_TYPE_DYNAMIC_POINTER: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY16: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY32: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY64: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY128: + case SIDE_TYPE_DYNAMIC_FLOAT: case SIDE_TYPE_DYNAMIC_STRING: case SIDE_TYPE_DYNAMIC_STRUCT: case SIDE_TYPE_DYNAMIC_STRUCT_VISITOR: @@ -1511,14 +1493,8 @@ void tracer_print_dynamic(const struct side_arg *item) tracer_print_type_bool("::", &item->u.side_dynamic.side_bool.type, &item->u.side_dynamic.side_bool.value, 0); break; - case SIDE_TYPE_DYNAMIC_U8: - case SIDE_TYPE_DYNAMIC_U16: - case SIDE_TYPE_DYNAMIC_U32: - case SIDE_TYPE_DYNAMIC_U64: - case SIDE_TYPE_DYNAMIC_S8: - case SIDE_TYPE_DYNAMIC_S16: - case SIDE_TYPE_DYNAMIC_S32: - case SIDE_TYPE_DYNAMIC_S64: + case SIDE_TYPE_DYNAMIC_UNSIGNED_INT: + case SIDE_TYPE_DYNAMIC_SIGNED_INT: tracer_print_type_integer("::", &item->u.side_dynamic.side_integer.type, &item->u.side_dynamic.side_integer.value, 0, TRACER_DISPLAY_BASE_10); break; @@ -1532,10 +1508,7 @@ void tracer_print_dynamic(const struct side_arg *item) TRACER_DISPLAY_BASE_16); break; - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY16: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY32: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY64: - case SIDE_TYPE_DYNAMIC_FLOAT_BINARY128: + case SIDE_TYPE_DYNAMIC_FLOAT: tracer_print_type_float("::", &item->u.side_dynamic.side_float.type, &item->u.side_dynamic.side_float.value); break; -- 2.34.1