X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c587485ee2aae6b2c54ed80656cbdc4e3ba8d157..9a4ec91cc24a9a54ff3a060cc2828ac54d0c0c26:/src/mc/inspect/LocationList.hpp diff --git a/src/mc/inspect/LocationList.hpp b/src/mc/inspect/LocationList.hpp index adb4b4e90b..9504a98f73 100644 --- a/src/mc/inspect/LocationList.hpp +++ b/src/mc/inspect/LocationList.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2023. 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. */ @@ -10,19 +10,18 @@ #include "xbt/range.hpp" #include "src/mc/inspect/DwarfExpression.hpp" -#include "src/mc/mc_base.h" +#include "src/mc/mc_base.hpp" #include "src/mc/mc_forward.hpp" #include #include -namespace simgrid { -namespace dwarf { +namespace simgrid::dwarf { /** A DWARF expression with optional validity constraints */ class LocationListEntry { public: - typedef simgrid::xbt::Range range_type; + using range_type = simgrid::xbt::Range; private: DwarfExpression expression_; @@ -32,16 +31,14 @@ private: public: LocationListEntry() = default; LocationListEntry(DwarfExpression expression, range_type range) : expression_(std::move(expression)), range_(range) {} - explicit LocationListEntry(DwarfExpression expression) : expression_(std::move(expression)), range_({0, UINT64_MAX}) - { - } + explicit LocationListEntry(DwarfExpression expression) : expression_(std::move(expression)) {} DwarfExpression& expression() { return expression_; } DwarfExpression const& expression() const { return expression_; } bool valid_for_ip(unw_word_t ip) const { return range_.contain(ip); } }; -typedef std::vector LocationList; +using LocationList = std::vector; /** Location of some variable in memory * @@ -66,15 +63,14 @@ public: XBT_PRIVATE Location resolve(simgrid::dwarf::DwarfExpression const& expression, simgrid::mc::ObjectInformation* object_info, - unw_cursor_t* c, void* frame_pointer_address, simgrid::mc::AddressSpace* address_space); + unw_cursor_t* c, void* frame_pointer_address, const simgrid::mc::AddressSpace* address_space); Location resolve(simgrid::dwarf::LocationList const& locations, simgrid::mc::ObjectInformation* object_info, - unw_cursor_t* c, void* frame_pointer_address, simgrid::mc::AddressSpace* address_space); + unw_cursor_t* c, void* frame_pointer_address, const simgrid::mc::AddressSpace* address_space); XBT_PRIVATE -simgrid::dwarf::LocationList location_list(simgrid::mc::ObjectInformation& info, Dwarf_Attribute& attr); +simgrid::dwarf::LocationList location_list(const simgrid::mc::ObjectInformation& info, Dwarf_Attribute& attr); -} // namespace dwarf -} // namespace simgrid +} // namespace simgrid::dwarf #endif