X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..e6ca184e99d50d0ee8fe405a83ee5277e2ecfce6:/src/mc/mc_unw.cpp diff --git a/src/mc/mc_unw.cpp b/src/mc/mc_unw.cpp index aab93dd702..ab43771ab2 100644 --- a/src/mc/mc_unw.cpp +++ b/src/mc/mc_unw.cpp @@ -18,7 +18,6 @@ #include -#include "src/mc/mc_object_info.h" #include "src/mc/Process.hpp" #include "src/mc/mc_unw.h" #include "src/mc/Frame.hpp" @@ -110,10 +109,10 @@ static void* get_reg(unw_context_t* context, unw_regnum_t regnum) case UNW_X86_64_R14: return &mcontext->gregs[REG_R14]; case UNW_X86_64_R15: return &mcontext->gregs[REG_R15]; case UNW_X86_64_RIP: return &mcontext->gregs[REG_RIP]; - default: return NULL; + default: return nullptr; } #else - return NULL; + return nullptr; #endif } @@ -168,7 +167,7 @@ static int get_proc_name(unw_addr_space_t as, simgrid::mc::Frame* frame = context->process->find_function(remote(addr)); if (!frame) return - UNW_ENOINFO; - *offp = (unw_word_t) frame->low_pc - addr; + *offp = (unw_word_t) frame->range.begin() - addr; strncpy(bufp, frame->name.c_str(), buf_len); if (bufp[buf_len - 1]) {