X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/340cf8df326e4bbb67c046172f8a73eecc6a3583..38f7ddbf61f574a934f191ef2d8358d9f8be1f96:/src/mc/LocationList.hpp diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp index 9759836e50..58b9fe24b8 100644 --- a/src/mc/LocationList.hpp +++ b/src/mc/LocationList.hpp @@ -15,32 +15,30 @@ #include #include -#include -#include +#include "xbt/base.h" +#include "xbt/range.hpp" #include "src/mc/mc_base.h" #include "src/mc/mc_forward.hpp" -#include "src/mc/AddressSpace.hpp" #include "src/mc/DwarfExpression.hpp" namespace simgrid { namespace dwarf { -/** \brief A DWARF expression with optional validity contraints */ +/** A DWARF expression with optional validity constraints */ class LocationListEntry { public: typedef simgrid::xbt::Range range_type; private: DwarfExpression expression_; + // By default, the expression is always valid: range_type range_ = {0, UINT64_MAX}; public: LocationListEntry() {} LocationListEntry(DwarfExpression expression, range_type range) : expression_(std::move(expression)), range_(range) {} - LocationListEntry(DwarfExpression expression) - : expression_(std::move(expression)), range_({0, UINT64_MAX}) - {} + LocationListEntry(DwarfExpression expression) : expression_(std::move(expression)), range_({0, UINT64_MAX}) {} DwarfExpression& expression() { @@ -67,9 +65,8 @@ private: void* memory_; int register_id_; public: - Location(void* x) :memory_(x) {} - Location(int register_id) : - memory_(nullptr), register_id_(register_id) {} + explicit Location(void* x) : memory_(x) {} + explicit Location(int register_id) : memory_(nullptr), register_id_(register_id) {} // Type of location: bool in_register() const { return memory_ == nullptr; } bool in_memory() const { return memory_ != nullptr; }