From 33edbf882891b9be62698e8e989ea444d51334c3 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Mon, 6 Jan 2014 12:20:56 +0100 Subject: [PATCH] [mc] Use DWARF constants for type tags --- src/include/mc/datatypes.h | 15 +++------------ src/mc/mc_compare.c | 36 ++++++++++++++++++------------------ src/mc/mc_global.c | 24 ++++++++++++------------ src/xbt/mmalloc/mm_diff.c | 38 +++++++++++++++++++------------------- 4 files changed, 52 insertions(+), 61 deletions(-) diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h index 7802ec1e2d..028a89192d 100644 --- a/src/include/mc/datatypes.h +++ b/src/include/mc/datatypes.h @@ -10,6 +10,8 @@ #include "xbt/swag.h" #include "xbt/fifo.h" +#include + SG_BEGIN_DECL() /******************************* Transitions **********************************/ @@ -39,18 +41,7 @@ void heap_ignore_region_free_voidp(void *r); /************ DWARF structures *************/ -typedef enum{ - e_dw_base_type = 0, - e_dw_enumeration_type, - e_dw_typedef, - e_dw_const_type, - e_dw_array_type, - e_dw_pointer_type, - e_dw_structure_type, - e_dw_union_type, - e_dw_subroutine_type, - e_dw_volatile_type -}e_dw_type_type; +typedef int e_dw_type_type; typedef struct s_dw_type{ e_dw_type_type type; diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c index 5301ebecb4..f9feecf980 100644 --- a/src/mc/mc_compare.c +++ b/src/mc/mc_compare.c @@ -131,26 +131,26 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x void *addr_pointed1, *addr_pointed2; switch(type->type){ - case e_dw_base_type: - case e_dw_enumeration_type: - case e_dw_union_type: + case DW_TAG_base_type: + case DW_TAG_enumeration_type: + case DW_TAG_union_type: return (memcmp(area1, area2, type->byte_size) != 0); break; - case e_dw_typedef: - case e_dw_volatile_type: + case DW_TAG_typedef: + case DW_TAG_volatile_type: return compare_areas_with_type(area1, area2, types, other_types, type->dw_type_id, region_size, region_type, start_data, pointer_level); break; - case e_dw_const_type: /* Const variable cannot be modified */ + case DW_TAG_const_type: /* Const variable cannot be modified */ return -1; break; - case e_dw_array_type: + case DW_TAG_array_type: subtype = xbt_dict_get_or_null(types, type->dw_type_id); switch(subtype->type){ - case e_dw_base_type: - case e_dw_enumeration_type: - case e_dw_pointer_type: - case e_dw_structure_type: - case e_dw_union_type: + case DW_TAG_base_type: + case DW_TAG_enumeration_type: + case DW_TAG_pointer_type: + case DW_TAG_structure_type: + case DW_TAG_union_type: if(subtype->byte_size == 0){ /*declaration of the type, need the complete description */ subtype = xbt_dict_get_or_null(types, get_type_description(types, subtype->name)); if(subtype == NULL){ @@ -160,8 +160,8 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x } elm_size = subtype->byte_size; break; - case e_dw_typedef: - case e_dw_volatile_type: + case DW_TAG_typedef: + case DW_TAG_volatile_type: subsubtype = xbt_dict_get_or_null(types, subtype->dw_type_id); if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */ subsubtype = xbt_dict_get_or_null(types, get_type_description(types, subsubtype->name)); @@ -185,8 +185,8 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x return res; } break; - case e_dw_pointer_type: - if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(types, type->dw_type_id))->type == e_dw_subroutine_type){ + case DW_TAG_pointer_type: + if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(types, type->dw_type_id))->type == DW_TAG_subroutine_type){ addr_pointed1 = *((void **)(area1)); addr_pointed2 = *((void **)(area2)); return (addr_pointed1 != addr_pointed2); @@ -214,14 +214,14 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x } } break; - case e_dw_structure_type: + case DW_TAG_structure_type: xbt_dynar_foreach(type->members, cursor, member){ res = compare_areas_with_type((char *)area1 + member->offset, (char *)area2 + member->offset, types, other_types, member->dw_type_id, region_size, region_type, start_data, pointer_level); if(res == 1) return res; } break; - case e_dw_subroutine_type: + case DW_TAG_subroutine_type: return -1; break; default: diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 59a4b7e325..8164ac35b3 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -929,19 +929,19 @@ void MC_dwarf_get_variables(mc_object_info_t info) { /* Create the and add it to the types dictionnary */ if(strcmp(node_type, "(DW_TAG_base_type)") == 0) - type_type = e_dw_base_type; + type_type = DW_TAG_base_type; else if(strcmp(node_type, "(DW_TAG_enumeration_type)") == 0) - type_type = e_dw_enumeration_type; + type_type = DW_TAG_enumeration_type; else if(strcmp(node_type, "(DW_TAG_typedef)") == 0) - type_type = e_dw_typedef; + type_type = DW_TAG_typedef; else if(strcmp(node_type, "(DW_TAG_const_type)") == 0) - type_type = e_dw_const_type; + type_type = DW_TAG_const_type; else if(strcmp(node_type, "(DW_TAG_pointer_type)") == 0) - type_type = e_dw_pointer_type; + type_type = DW_TAG_pointer_type; else if(strcmp(node_type, "(DW_TAG_subroutine_type)") == 0) - type_type = e_dw_subroutine_type; + type_type = DW_TAG_subroutine_type; else if(strcmp(node_type, "(DW_TAG_volatile_type)") == 0) - type_type = e_dw_volatile_type; + type_type = DW_TAG_volatile_type; strtok(xbt_dynar_get_as(split, 0, char *), "<"); origin = strdup(strtok(NULL, "<")); @@ -971,7 +971,7 @@ void MC_dwarf_get_variables(mc_object_info_t info) { if(strcmp(node_type, "DW_AT_byte_size") == 0){ size = strtol(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*), NULL, 10); - if(type_type == e_dw_enumeration_type) + if(type_type == DW_TAG_enumeration_type) enumeration_size = size; }else if(strcmp(node_type, "DW_AT_name") == 0){ end = xbt_str_join(split, " "); @@ -1120,9 +1120,9 @@ void MC_dwarf_get_variables(mc_object_info_t info) { if(struct_decl || union_decl){ type = xbt_new0(s_dw_type_t, 1); if(struct_decl) - type->type = e_dw_structure_type; + type->type = DW_TAG_structure_type; else - type->type = e_dw_union_type; + type->type = DW_TAG_union_type; type->name = xbt_strdup(name); type->byte_size = size; type->element_count = -1; @@ -1232,7 +1232,7 @@ void MC_dwarf_get_variables(mc_object_info_t info) { }else { type = xbt_new0(s_dw_type_t, 1); - type->type = e_dw_array_type; + type->type = DW_TAG_array_type; type->name = xbt_strdup(name); type->is_pointer_type = is_pointer; type->id = (void *)strtoul(origin, NULL, 16); @@ -1289,7 +1289,7 @@ static void MC_post_process_types(mc_object_info_t info) { char *origin; dw_type_t type; xbt_dict_foreach(info->types, cursor, origin, type){ - if(type->type==e_dw_array_type) { + if(type->type==DW_TAG_array_type) { xbt_assert(type->dw_type_id, "No base type for array <%p>%s", type->id, type->name); dw_type_t subtype = xbt_dict_get_or_null(info->types, type->dw_type_id); xbt_assert(subtype, "Unkown base type for array <%p>%s", type->id, type->name); diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index d18e6ede19..52792d692a 100644 --- a/src/xbt/mmalloc/mm_diff.c +++ b/src/xbt/mmalloc/mm_diff.c @@ -777,7 +777,7 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void char *type_desc; switch(type->type){ - case e_dw_base_type: + case DW_TAG_base_type: if(strcmp(type->name, "char") == 0){ /* String, hence random (arbitrary ?) size */ if(real_area1 == real_area2) return -1; @@ -791,26 +791,26 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } } break; - case e_dw_enumeration_type: + case DW_TAG_enumeration_type: if(area_size != -1 && type->byte_size != area_size) return -1; else return (memcmp(area1, area2, type->byte_size) != 0); break; - case e_dw_typedef: + case DW_TAG_typedef: return compare_heap_area_with_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->dw_type_id, area_size, check_ignore, pointer_level); break; - case e_dw_const_type: + case DW_TAG_const_type: return 0; break; - case e_dw_array_type: + case DW_TAG_array_type: subtype = xbt_dict_get_or_null(all_types, type->dw_type_id); switch(subtype->type){ - case e_dw_base_type: - case e_dw_enumeration_type: - case e_dw_pointer_type: - case e_dw_structure_type: - case e_dw_union_type: + case DW_TAG_base_type: + case DW_TAG_enumeration_type: + case DW_TAG_pointer_type: + case DW_TAG_structure_type: + case DW_TAG_union_type: if(subtype->byte_size == 0){ /*declaration of the type, need the complete description */ type_desc = get_type_description(all_types, subtype->name); if(type_desc){ @@ -823,8 +823,8 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void elm_size = subtype->byte_size; break; // TODO, just remove the type indirection? - case e_dw_typedef: - case e_dw_volatile_type: + case DW_TAG_typedef: + case DW_TAG_volatile_type: subsubtype = xbt_dict_get_or_null(all_types, subtype->dw_type_id); if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */ type_desc = get_type_description(all_types, subsubtype->name); @@ -851,8 +851,8 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void return res; } break; - case e_dw_pointer_type: - if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(all_types, type->dw_type_id))->type == e_dw_subroutine_type){ + case DW_TAG_pointer_type: + if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(all_types, type->dw_type_id))->type == DW_TAG_subroutine_type){ addr_pointed1 = *((void **)(area1)); addr_pointed2 = *((void **)(area2)); return (addr_pointed1 != addr_pointed2);; @@ -879,7 +879,7 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } } break; - case e_dw_structure_type: + case DW_TAG_structure_type: if(type->byte_size == 0){ /*declaration of the structure, need the complete description */ type_desc = get_type_description(all_types, type->name); if(type_desc){ @@ -915,10 +915,10 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } } break; - case e_dw_union_type: + case DW_TAG_union_type: return compare_heap_area_without_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->byte_size, check_ignore); break; - case e_dw_volatile_type: + case DW_TAG_volatile_type: return compare_heap_area_with_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->dw_type_id, area_size, check_ignore, pointer_level); break; default: @@ -937,7 +937,7 @@ static char* get_offset_type(char* type_id, int offset, xbt_dict_t all_types, xb } char* type_desc; switch(type->type){ - case e_dw_structure_type : + case DW_TAG_structure_type : if(type->byte_size == 0){ /*declaration of the structure, need the complete description */ if(*switch_type == 0){ type_desc = get_type_description(all_types, type->name); @@ -1042,7 +1042,7 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t type = xbt_dict_get_or_null(all_types, type->dw_type_id); } } - if((type->byte_size == e_dw_pointer_type) || ((type->type == e_dw_base_type) && (!strcmp(type->name, "char")))) + if((type->byte_size == DW_TAG_pointer_type) || ((type->type == DW_TAG_base_type) && (!strcmp(type->name, "char")))) type_size = -1; else type_size = type->byte_size; -- 2.20.1