nathan/quark-libmalloc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flattened out if blocks in trim_map

Browse Source
This commit is contained in:
Nathan Giddings
2023-03-04 04:25:38 -06:00
parent 851b31ad2d
commit 11d55ab2c6
1 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/memmap.c
View File

@@ -68,53 +68,44 @@ static int trim_map(memory_map_t *map, int index)
} }
memory_region_t *left = &map->array[index]; memory_region_t *left = &map->array[index];
memory_region_t *right = &map->array[index + 1]; memory_region_t *right = &map->array[index + 1];
if(region_overlaps(left, right)) if(region_overlaps(left, right) && left->type == right->type)
{ {
if(left->type == right->type) left->size = (right->location + right->size > left->location + left->size ? right->location + right->size : left->location + left->size) - left->location;
{ remove_map_entry(map, index + 1);
left->size = (right->location + right->size > left->location + left->size ? right->location + right->size : left->location + left->size) - left->location; return index;
remove_map_entry(map, index + 1); }
return index; else if(region_overlaps(left, right) && left->type < right->type && region_contains(right, left))
} {
else if(left->type < right->type) remove_map_entry(map, index);
{ return index;
if(region_contains(right, left)) }
{ else if(region_overlaps(left, right) && left->type < right->type && left->location + left->size <= right->location + right->size)
remove_map_entry(map, index); {
return index; left->size = (right->location > left->location) ? right->location - left->location : 0;
} return index + 1;
else if(left->location + left->size <= right->location + right->size) }
{ else if(region_overlaps(left, right) && left->type < right->type)
left->size = (right->location > left->location) ? right->location - left->location : 0; {
return index + 1; memory_region_t new_right = {
} .location = right->location + right->size,
else .size = (left->location + left->size) - (right->location + right->size),
{ .type = left->type};
memory_region_t new_right = { left->size = (right->location > left->location) ? right->location - left->location : 0;
.location = right->location + right->size, if (left->size == 0)
.size = (left->location + left->size) - (right->location + right->size), remove_map_entry(map, index);
.type = left->type}; insert_map_entry(map, new_right.location, new_right.size, new_right.type);
left->size = (right->location > left->location) ? right->location - left->location : 0; return index + 2;
if(left->size == 0) }
remove_map_entry(map, index); else if(region_overlaps(left, right) && region_contains(left, right))
insert_map_entry(map, new_right.location, new_right.size, new_right.type); {
return index + 2; remove_map_entry(map, index + 1);
} return index;
} }
else else if(region_overlaps(left, right))
{ {
if(region_contains(left, right)) right->size = (right->location + right->size) - (left->location + left->size);
{ right->location = left->location + left->size;
remove_map_entry(map, index + 1); return index + 1;
return index;
}
else
{
right->size = (right->location + right->size) - (left->location + left->size);
right->location = left->location + left->size;
return index + 1;
}
}
} }
else if((left->location + left->size == right->location) && left->type == right->type) else if((left->location + left->size == right->location) && left->type == right->type)
{ {
@@ -122,7 +113,10 @@ static int trim_map(memory_map_t *map, int index)
remove_map_entry(map, index + 1); remove_map_entry(map, index + 1);
return index; return index;
} }
return index + 1; else
{
return index + 1;
}
} }
int memmap_insert_region(memory_map_t *map, unsigned long location, unsigned long size, memory_type_t type) int memmap_insert_region(memory_map_t *map, unsigned long location, unsigned long size, memory_type_t type)