Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / mc / Variable.hpp

diff --git a/src/mc/Variable.hpp b/src/mc/Variable.hpp
index 5b82b6c..5f43e5c 100644 (file)
--- a/src/mc/Variable.hpp
+++ b/src/mc/Variable.hpp
@@ -7,11 +7,11 @@
 #ifndef SIMGRID_MC_VARIABLE_HPP
 #define SIMGRID_MC_VARIABLE_HPP
 
-#include <string>
+#include <cstddef>
 
-#include <xbt/base.h>
+#include <string>
 
-#include "src/mc/mc_forward.h"
+#include "src/mc/mc_forward.hpp"
 #include "src/mc/LocationList.hpp"
 
 namespace simgrid {
@@ -21,15 +21,25 @@ namespace mc {
 class Variable {
 public:
   Variable() {}
-  unsigned dwarf_offset = 0; /* Global offset of the field. */
-  int global = 0;
+  std::uint32_t id = 0;
+  bool global = false;
   std::string name;
   unsigned type_id = 0;
   simgrid::mc::Type* type = nullptr;
-  // Use either of:
-  simgrid::dwarf::LocationList location_list;
+
+  /** Address of the variable (if it is fixed) */
   void* address = nullptr;
-  size_t start_scope = 0;
+
+  /** Description of the location of the variable (if it's not fixed) */
+  simgrid::dwarf::LocationList location_list;
+
+  /** Offset of validity of the variable (DW_AT_start_scope)
+   *
+   *  This is an offset from the variable scope beginning. This variable
+   *  is only valid starting from this offset.
+   */
+  std::size_t start_scope = 0;
+
   simgrid::mc::ObjectInformation* object_info = nullptr;
 };