return -1;
}
+static bool is_on_heap(const void* address)
+{
+ const xbt_mheap_t heap = mc_model_checker->process().get_heap();
+ return address >= heap->heapbase && address < heap->breakval;
+}
+
static bool is_stack(const void *address)
{
for (auto const& stack : mc_model_checker->process().stack_areas())
continue;
}
- if (addr_pointed1 > state.std_heap_copy.heapbase
- && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)
- && addr_pointed2 > state.std_heap_copy.heapbase
- && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) {
+ if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2)) {
// Both addresses are in the heap:
int res_compare =
compare_heap_area(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0);
if (pointer_level <= 1) {
addr_pointed1 = snapshot1->read(remote((void* const*)real_area1));
addr_pointed2 = snapshot2->read(remote((void* const*)real_area2));
- if (addr_pointed1 > state.std_heap_copy.heapbase && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) &&
- addr_pointed2 > state.std_heap_copy.heapbase && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2))
+ if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2))
return compare_heap_area(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype,
pointer_level);
else
addr_pointed1 = snapshot1->read(remote((void* const*)((const char*)real_area1 + i * sizeof(void*))));
addr_pointed2 = snapshot2->read(remote((void* const*)((const char*)real_area2 + i * sizeof(void*))));
int res;
- if (addr_pointed1 > state.std_heap_copy.heapbase && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) &&
- addr_pointed2 > state.std_heap_copy.heapbase && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2))
+ if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2))
res = compare_heap_area(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype,
pointer_level);
else
const void* real_area2, simgrid::mc::Snapshot* snapshot2,
simgrid::mc::Region* region2, simgrid::mc::Type* type, int pointer_level)
{
- simgrid::mc::RemoteClient* process = &mc_model_checker->process();
-
simgrid::mc::Type* subtype;
simgrid::mc::Type* subsubtype;
int elm_size;
// * a pointer leads to the read-only segment of the current object
// * a pointer lead to a different ELF object
- if (addr_pointed1 > process->heap_address && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)) {
- if (not(addr_pointed2 > process->heap_address && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)))
+ if (is_on_heap(addr_pointed1)) {
+ if (not is_on_heap(addr_pointed2))
return 1;
// The pointers are both in the heap:
return simgrid::mc::compare_heap_area(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, nullptr,