X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/126597feb03d318d3d70a351ae0adff9bab8f59c..341cb255f174254622d3ab6c52dd6d3256b46465:/src/mc/LocationList.cpp diff --git a/src/mc/LocationList.cpp b/src/mc/LocationList.cpp index fdf5cd536c..0ad937520a 100644 --- a/src/mc/LocationList.cpp +++ b/src/mc/LocationList.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include "xbt/asserts.h" +#include "xbt/sysdep.h" #include @@ -35,13 +35,9 @@ Location resolve( context.object_info = object_info; context.process_index = process_index; - if (!expression.empty() - && expression[0].atom >= DW_OP_reg0 - && expression[0].atom <= DW_OP_reg31) { + if (not expression.empty() && expression[0].atom >= DW_OP_reg0 && expression[0].atom <= DW_OP_reg31) { int dwarf_register = expression[0].atom - DW_OP_reg0; - xbt_assert(c, - "Missing frame context for register operation DW_OP_reg%i", - dwarf_register); + xbt_assert(c, "Missing frame context for register operation DW_OP_reg%i", dwarf_register); return Location(dwarf_register_to_libunwind(dwarf_register)); } @@ -73,7 +69,7 @@ Location resolve( xbt_die("Could not resolve IP"); simgrid::dwarf::DwarfExpression const* expression = find_expression(locations, ip); - if (!expression) + if (not expression) xbt_die("Could not resolve location"); return simgrid::dwarf::resolve( *expression, object_info, c, @@ -87,13 +83,13 @@ LocationList location_list( LocationList locations; std::ptrdiff_t offset = 0; while (1) { - - Dwarf_Addr base, start, end; + Dwarf_Addr base; + Dwarf_Addr start; + Dwarf_Addr end; Dwarf_Op *ops; std::size_t len; - offset = dwarf_getlocations( - &attr, offset, &base, &start, &end, &ops, &len); + offset = dwarf_getlocations(&attr, offset, &base, &start, &end, &ops, &len); if (offset == 0) break; @@ -114,7 +110,5 @@ LocationList location_list( return locations; } - - } -} \ No newline at end of file +}