X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39cf43e4e190f5053b971b13ff1a1d82ebea5dba..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/teshsuite/mc/dwarf/dwarf.cpp diff --git a/teshsuite/mc/dwarf/dwarf.cpp b/teshsuite/mc/dwarf/dwarf.cpp index c3f876ea74..12f90313b3 100644 --- a/teshsuite/mc/dwarf/dwarf.cpp +++ b/teshsuite/mc/dwarf/dwarf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -55,12 +55,14 @@ static simgrid::mc::Variable* find_local_variable( return nullptr; } -static void test_local_variable(simgrid::mc::ObjectInformation* info, const char* function, const char* variable, void* address, unw_cursor_t* cursor) { +static void test_local_variable(simgrid::mc::ObjectInformation* info, const char* function, const char* variable, + const void* address, unw_cursor_t* cursor) +{ simgrid::mc::Frame* subprogram = find_function_by_name(info, function); assert(subprogram); // TODO, Lookup frame by IP and test against name instead - simgrid::mc::Variable* var = find_local_variable(subprogram, variable); + const simgrid::mc::Variable* var = find_local_variable(subprogram, variable); assert(var); void* frame_base = subprogram->frame_base(*cursor); @@ -70,8 +72,8 @@ static void test_local_variable(simgrid::mc::ObjectInformation* info, const char xbt_assert(location.address() == address, "Bad resolution of local variable %s of %s", variable, function); } -static const simgrid::mc::Variable* test_global_variable(simgrid::mc::RemoteClient& process, - simgrid::mc::ObjectInformation* info, const char* name, +static const simgrid::mc::Variable* test_global_variable(const simgrid::mc::RemoteClient& process, + const simgrid::mc::ObjectInformation* info, const char* name, void* address, long byte_size) { const simgrid::mc::Variable* variable = info->find_variable(name); @@ -83,7 +85,7 @@ static const simgrid::mc::Variable* test_global_variable(simgrid::mc::RemoteClie auto i = process.binary_info->types.find(variable->type_id); xbt_assert(i != process.binary_info->types.end(), "Missing type for %s", name); - simgrid::mc::Type* type = &i->second; + const simgrid::mc::Type* type = &i->second; xbt_assert(type->byte_size == byte_size, "Byte size mismatch for %s", name); return variable; } @@ -102,7 +104,7 @@ struct s_foo { int i; }; -static void test_type_by_name(simgrid::mc::RemoteClient& process, s_foo /*my_foo*/) +static void test_type_by_name(const simgrid::mc::RemoteClient& process, s_foo /*my_foo*/) { assert(process.binary_info->full_types_by_name.find("struct s_foo") != process.binary_info->full_types_by_name.end()); }