static int compare_heap_area_with_type(void *real_area1, void *real_area2, void *area1, void *area2,
xbt_dynar_t previous, xbt_dict_t all_types, xbt_dict_t other_types, char *type_id,
int area_size, int check_ignore, int pointer_level){
static int compare_heap_area_with_type(void *real_area1, void *real_area2, void *area1, void *area2,
xbt_dynar_t previous, xbt_dict_t all_types, xbt_dict_t other_types, char *type_id,
int area_size, int check_ignore, int pointer_level){
break;
case e_dw_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_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);
type_desc = get_type_description(all_types, subtype->name);
if(type_desc){
subtype = xbt_dict_get_or_null(all_types, type_desc);
type_desc = get_type_description(all_types, subtype->name);
if(type_desc){
subtype = xbt_dict_get_or_null(all_types, type_desc);
type_desc = get_type_description(all_types, subsubtype->name);
if(type_desc){
subsubtype = xbt_dict_get_or_null(all_types, type_desc);
type_desc = get_type_description(all_types, subsubtype->name);
if(type_desc){
subsubtype = xbt_dict_get_or_null(all_types, type_desc);
- res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, other_types, all_types, type->dw_type_id, type->size, check_ignore, pointer_level);
+ res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, other_types, all_types, type->dw_type_id, subtype->byte_size, check_ignore, pointer_level);
- res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, all_types, other_types, type->dw_type_id, type->size, check_ignore, pointer_level);
+ res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, all_types, other_types, type->dw_type_id, subtype->byte_size, check_ignore, pointer_level);
type_desc = get_type_description(all_types, type->name);
if(type_desc){
type = xbt_dict_get_or_null(all_types, type_desc);
type_desc = get_type_description(all_types, type->name);
if(type_desc){
type = xbt_dict_get_or_null(all_types, type_desc);
- if(area_size != -1 && type->size != area_size){
- if(area_size>type->size && area_size%type->size == 0){
- for(i=0; i<(area_size/type->size); i++){
+ if(area_size != -1 && type->byte_size != area_size){
+ if(area_size>type->byte_size && area_size%type->byte_size == 0){
+ for(i=0; i<(area_size/type->byte_size); i++){
- res = compare_heap_area_with_type((char *)real_area1 + (i*type->size), (char *)real_area2 + (i*type->size), (char *)area1 + (i*type->size), (char *)area2 + (i*type->size), previous, other_types, all_types, type_id, -1, check_ignore, 0);
+ res = compare_heap_area_with_type((char *)real_area1 + (i*type->byte_size), (char *)real_area2 + (i*type->byte_size), (char *)area1 + (i*type->byte_size), (char *)area2 + (i*type->byte_size), previous, other_types, all_types, type_id, -1, check_ignore, 0);
- res = compare_heap_area_with_type((char *)real_area1 + (i*type->size), (char *)real_area2 + (i*type->size), (char *)area1 + (i*type->size), (char *)area2 + (i*type->size), previous, all_types, other_types, type_id, -1, check_ignore, 0);
+ res = compare_heap_area_with_type((char *)real_area1 + (i*type->byte_size), (char *)real_area2 + (i*type->byte_size), (char *)area1 + (i*type->byte_size), (char *)area2 + (i*type->byte_size), previous, all_types, other_types, type_id, -1, check_ignore, 0);
- return compare_heap_area_without_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->size, check_ignore);
+ 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:
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_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);
- if(area_size != -1 && type->size != area_size){
- if(area_size>type->size && area_size%type->size == 0)
+ if(area_size != -1 && type->byte_size != area_size){
+ if(area_size>type->byte_size && area_size%type->byte_size == 0)
if(type->dw_type_id == NULL){
type_desc = get_type_description(all_types, type->name);
if(type_desc)
if(type->dw_type_id == NULL){
type_desc = get_type_description(all_types, type->name);
if(type_desc)
if(new_type_id1 != NULL && new_type_id2 != NULL && !strcmp(new_type_id1, new_type_id2)){
if(switch_type){
type = xbt_dict_get_or_null(other_types, new_type_id1);
if(new_type_id1 != NULL && new_type_id2 != NULL && !strcmp(new_type_id1, new_type_id2)){
if(switch_type){
type = xbt_dict_get_or_null(other_types, new_type_id1);
dw_type_t type;
xbt_dict_foreach(types, dict_cursor, type_origin, type){
dw_type_t type;
xbt_dict_foreach(types, dict_cursor, type_origin, type){