From 452329a6767c0a0673420e1985766991765296fe Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 8 Nov 2022 16:41:51 -0500 Subject: [PATCH] Remove useless pointer 32 vs 64 distinction Now the integer type contains information about the integer size, which makes this 32/64 bit information redundant. Signed-off-by: Mathieu Desnoyers --- include/side/trace.h | 24 +++++++----------------- src/tracer.c | 15 +++++---------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/include/side/trace.h b/include/side/trace.h index 5babd3e..96c51f5 100644 --- a/include/side/trace.h +++ b/include/side/trace.h @@ -96,8 +96,7 @@ enum side_type_label { SIDE_TYPE_S32, SIDE_TYPE_S64, SIDE_TYPE_BYTE, - SIDE_TYPE_POINTER32, - SIDE_TYPE_POINTER64, + SIDE_TYPE_POINTER, SIDE_TYPE_FLOAT_BINARY16, SIDE_TYPE_FLOAT_BINARY32, SIDE_TYPE_FLOAT_BINARY64, @@ -142,8 +141,7 @@ enum side_type_label { SIDE_TYPE_DYNAMIC_S32, SIDE_TYPE_DYNAMIC_S64, SIDE_TYPE_DYNAMIC_BYTE, - SIDE_TYPE_DYNAMIC_POINTER32, - SIDE_TYPE_DYNAMIC_POINTER64, + SIDE_TYPE_DYNAMIC_POINTER, SIDE_TYPE_DYNAMIC_FLOAT_BINARY16, SIDE_TYPE_DYNAMIC_FLOAT_BINARY32, SIDE_TYPE_DYNAMIC_FLOAT_BINARY64, @@ -630,17 +628,9 @@ struct side_event_description { /* Event and type attributes */ #if SIDE_BITS_PER_LONG == 64 -# define SIDE_TYPE_POINTER_HOST SIDE_TYPE_POINTER64 -# define SIDE_TYPE_ARRAY_POINTER_HOST SIDE_TYPE_ARRAY_POINTER64 -# define SIDE_TYPE_VLA_POINTER_HOST SIDE_TYPE_VLA_POINTER64 -# define SIDE_TYPE_DYNAMIC_POINTER_HOST SIDE_TYPE_DYNAMIC_POINTER64 # define SIDE_ATTR_TYPE_POINTER_HOST SIDE_ATTR_TYPE_POINTER64 # define SIDE_PTR_HOST .side_u64 #else -# define SIDE_TYPE_POINTER_HOST SIDE_TYPE_POINTER32 -# define SIDE_TYPE_ARRAY_POINTER_HOST SIDE_TYPE_ARRAY_POINTER32 -# define SIDE_TYPE_VLA_POINTER_HOST SIDE_TYPE_VLA_POINTER32 -# define SIDE_TYPE_DYNAMIC_POINTER_HOST SIDE_TYPE_DYNAMIC_POINTER32 # define SIDE_ATTR_TYPE_POINTER_HOST SIDE_ATTR_TYPE_POINTER32 # define SIDE_PTR_HOST .side_u32 #endif @@ -820,7 +810,7 @@ struct side_event_description { #define side_type_s16(_attr) _side_type_integer(SIDE_TYPE_S16, true, SIDE_TYPE_BYTE_ORDER_HOST, sizeof(int16_t), 0, SIDE_PARAM(_attr)) #define side_type_s32(_attr) _side_type_integer(SIDE_TYPE_S32, true, SIDE_TYPE_BYTE_ORDER_HOST, sizeof(int32_t), 0, SIDE_PARAM(_attr)) #define side_type_s64(_attr) _side_type_integer(SIDE_TYPE_S64, true, SIDE_TYPE_BYTE_ORDER_HOST, sizeof(int64_t), 0, SIDE_PARAM(_attr)) -#define side_type_pointer(_attr) _side_type_integer(SIDE_TYPE_POINTER_HOST, false, SIDE_TYPE_BYTE_ORDER_HOST, sizeof(uintptr_t), 0, SIDE_PARAM(_attr)) +#define side_type_pointer(_attr) _side_type_integer(SIDE_TYPE_POINTER, false, SIDE_TYPE_BYTE_ORDER_HOST, sizeof(uintptr_t), 0, SIDE_PARAM(_attr)) #define side_type_float_binary16(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY16, SIDE_TYPE_FLOAT_WORD_ORDER_HOST, sizeof(_Float16), SIDE_PARAM(_attr)) #define side_type_float_binary32(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY32, SIDE_TYPE_FLOAT_WORD_ORDER_HOST, sizeof(_Float32), SIDE_PARAM(_attr)) #define side_type_float_binary64(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY64, SIDE_TYPE_FLOAT_WORD_ORDER_HOST, sizeof(_Float64), SIDE_PARAM(_attr)) @@ -852,7 +842,7 @@ struct side_event_description { #define side_type_s16_le(_attr) _side_type_integer(SIDE_TYPE_S16, true, SIDE_TYPE_BYTE_ORDER_LE, sizeof(int16_t), 0, SIDE_PARAM(_attr)) #define side_type_s32_le(_attr) _side_type_integer(SIDE_TYPE_S32, true, SIDE_TYPE_BYTE_ORDER_LE, sizeof(int32_t), 0, SIDE_PARAM(_attr)) #define side_type_s64_le(_attr) _side_type_integer(SIDE_TYPE_S64, true, SIDE_TYPE_BYTE_ORDER_LE, sizeof(int64_t), 0, SIDE_PARAM(_attr)) -#define side_type_pointer_le(_attr) _side_type_integer(SIDE_TYPE_POINTER_HOST, false, SIDE_TYPE_BYTE_ORDER_LE, sizeof(uintptr_t), 0, SIDE_PARAM(_attr)) +#define side_type_pointer_le(_attr) _side_type_integer(SIDE_TYPE_POINTER, false, SIDE_TYPE_BYTE_ORDER_LE, sizeof(uintptr_t), 0, SIDE_PARAM(_attr)) #define side_type_float_binary16_le(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY16, SIDE_TYPE_BYTE_ORDER_LE, sizeof(_Float16), SIDE_PARAM(_attr)) #define side_type_float_binary32_le(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY32, SIDE_TYPE_BYTE_ORDER_LE, sizeof(_Float32), SIDE_PARAM(_attr)) #define side_type_float_binary64_le(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY64, SIDE_TYPE_BYTE_ORDER_LE, sizeof(_Float64), SIDE_PARAM(_attr)) @@ -877,7 +867,7 @@ struct side_event_description { #define side_type_s16_be(_attr) _side_type_integer(SIDE_TYPE_S16, false, SIDE_TYPE_BYTE_ORDER_BE, sizeof(int16_t), 0, SIDE_PARAM(_attr)) #define side_type_s32_be(_attr) _side_type_integer(SIDE_TYPE_S32, false, SIDE_TYPE_BYTE_ORDER_BE, sizeof(int32_t), 0, SIDE_PARAM(_attr)) #define side_type_s64_be(_attr) _side_type_integer(SIDE_TYPE_S64, false, SIDE_TYPE_BYTE_ORDER_BE, sizeof(int64_t), 0, SIDE_PARAM(_attr)) -#define side_type_pointer_be(_attr) _side_type_integer(SIDE_TYPE_POINTER_HOST, false, SIDE_TYPE_BYTE_ORDER_BE, sizeof(uintptr_t), 0, SIDE_PARAM(_attr)) +#define side_type_pointer_be(_attr) _side_type_integer(SIDE_TYPE_POINTER, false, SIDE_TYPE_BYTE_ORDER_BE, sizeof(uintptr_t), 0, SIDE_PARAM(_attr)) #define side_type_float_binary16_be(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY16, SIDE_TYPE_BYTE_ORDER_BE, sizeof(_Float16), SIDE_PARAM(_attr)) #define side_type_float_binary32_be(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY32, SIDE_TYPE_BYTE_ORDER_BE, sizeof(_Float32), SIDE_PARAM(_attr)) #define side_type_float_binary64_be(_attr) _side_type_float(SIDE_TYPE_FLOAT_BINARY64, SIDE_TYPE_BYTE_ORDER_BE, sizeof(_Float64), SIDE_PARAM(_attr)) @@ -1252,7 +1242,7 @@ struct side_event_description { #define side_arg_s16(_val) { .type = SIDE_TYPE_S16, .u = { .side_static = { .integer_value = { .side_s16 = (_val) } } } } #define side_arg_s32(_val) { .type = SIDE_TYPE_S32, .u = { .side_static = { .integer_value = { .side_s32 = (_val) } } } } #define side_arg_s64(_val) { .type = SIDE_TYPE_S64, .u = { .side_static = { .integer_value = { .side_s64 = (_val) } } } } -#define side_arg_pointer(_val) { .type = SIDE_TYPE_POINTER_HOST, .u = { .side_static = { .integer_value = { SIDE_PTR_HOST = (uintptr_t) (_val) } } } } +#define side_arg_pointer(_val) { .type = SIDE_TYPE_POINTER, .u = { .side_static = { .integer_value = { SIDE_PTR_HOST = (uintptr_t) (_val) } } } } #define side_arg_enum_bitmap8(_val) { .type = SIDE_TYPE_ENUM_BITMAP8, .u = { .side_static = { .integer_value = { .side_u8 = (_val) } } } } #define side_arg_enum_bitmap16(_val) { .type = SIDE_TYPE_ENUM_BITMAP16, .u = { .side_static = { .integer_value = { .side_u16 = (_val) } } } } #define side_arg_enum_bitmap32(_val) { .type = SIDE_TYPE_ENUM_BITMAP32, .u = { .side_static = { .integer_value = { .side_u32 = (_val) } } } } @@ -1390,7 +1380,7 @@ struct side_event_description { _side_arg_dynamic_integer(.side_s64, _val, SIDE_TYPE_DYNAMIC_S64, true, _byte_order, sizeof(int64_t), 0, SIDE_PARAM(_attr)) #define _side_arg_dynamic_pointer(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(SIDE_PTR_HOST, (uintptr_t) (_val), SIDE_TYPE_DYNAMIC_POINTER_HOST, false, _byte_order, \ + _side_arg_dynamic_integer(SIDE_PTR_HOST, (uintptr_t) (_val), SIDE_TYPE_DYNAMIC_POINTER, false, _byte_order, \ sizeof(uintptr_t), 0, SIDE_PARAM(_attr)) #define _side_arg_dynamic_float(_field, _val, _type, _byte_order, _float_size, _attr) \ diff --git a/src/tracer.c b/src/tracer.c index 8d01890..d097387 100644 --- a/src/tracer.c +++ b/src/tracer.c @@ -131,8 +131,7 @@ bool type_to_host_reverse_bo(const struct side_type *type_desc) case SIDE_TYPE_S16: case SIDE_TYPE_S32: case SIDE_TYPE_S64: - case SIDE_TYPE_POINTER32: - case SIDE_TYPE_POINTER64: + case SIDE_TYPE_POINTER: if (type_desc->u.side_integer.byte_order != SIDE_TYPE_BYTE_ORDER_HOST) return true; else @@ -839,8 +838,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg case SIDE_TYPE_DYNAMIC_S32: case SIDE_TYPE_DYNAMIC_S64: case SIDE_TYPE_DYNAMIC_BYTE: - case SIDE_TYPE_DYNAMIC_POINTER32: - case SIDE_TYPE_DYNAMIC_POINTER64: + case SIDE_TYPE_DYNAMIC_POINTER: case SIDE_TYPE_DYNAMIC_FLOAT_BINARY16: case SIDE_TYPE_DYNAMIC_FLOAT_BINARY32: case SIDE_TYPE_DYNAMIC_FLOAT_BINARY64: @@ -894,8 +892,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg TRACER_DISPLAY_BASE_10); break; - case SIDE_TYPE_POINTER32: - case SIDE_TYPE_POINTER64: + 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; @@ -977,8 +974,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg case SIDE_TYPE_DYNAMIC_S32: case SIDE_TYPE_DYNAMIC_S64: case SIDE_TYPE_DYNAMIC_BYTE: - case SIDE_TYPE_DYNAMIC_POINTER32: - case SIDE_TYPE_DYNAMIC_POINTER64: + case SIDE_TYPE_DYNAMIC_POINTER: case SIDE_TYPE_DYNAMIC_FLOAT_BINARY16: case SIDE_TYPE_DYNAMIC_FLOAT_BINARY32: case SIDE_TYPE_DYNAMIC_FLOAT_BINARY64: @@ -1537,8 +1533,7 @@ void tracer_print_dynamic(const struct side_arg *item) printf("0x%" PRIx8, item->u.side_dynamic.side_byte.value); break; - case SIDE_TYPE_DYNAMIC_POINTER32: - case SIDE_TYPE_DYNAMIC_POINTER64: + 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; -- 2.34.1