X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b81d0b9c9c365d2b195c8a189e2315adbdaa6af6..debe4e5871c0c3d1c714bbb1bd28ba7147454aa5:/src/mc/Type.hpp

diff --git a/src/mc/Type.hpp b/src/mc/Type.hpp
index 7e68c5432f..7bc14644c1 100644
--- a/src/mc/Type.hpp
+++ b/src/mc/Type.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2019. 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. */
@@ -7,77 +6,107 @@
 #ifndef SIMGRID_MC_TYPE_HPP
 #define SIMGRID_MC_TYPE_HPP
 
+#include <cstddef>
+
 #include <vector>
 #include <string>
 
-#include "mc_forward.h"
-#include "mc_location.h"
+#include "xbt/asserts.h"
+#include "xbt/base.h"
+
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/LocationList.hpp"
 
 namespace simgrid {
 namespace mc {
 
-/** Represents a type in the program
+/** A member of a structure, union
  *
- *  It is currently used to represent members of structs and unions as well.
+ *  Inheritance is seen as a special member as well.
  */
-class Type {
+class Member {
 public:
-  Type();
-  Type(Type const& type) = default;
-  Type& operator=(Type const&) = default;
-  Type(Type&& type) = default;
-  Type& operator=(Type&&) = default;
+  typedef int flags_type;
+  static constexpr flags_type INHERITANCE_FLAG = 1;
+  static constexpr flags_type VIRTUAL_POINTER_FLAG = 2;
 
-  /** The DWARF TAG of the type (e.g. DW_TAG_array_type) */
-  int type;
-  unsigned id; /* Offset in the section (in hexadecimal form) */
-  std::string name; /* Name of the type */
-  int byte_size; /* Size in bytes */
-  int element_count; /* Number of elements for array type */
-  unsigned type_id; /* DW_AT_type id */
-  std::vector<Type> members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/
-  int is_pointer_type;
+  Member() = default;
+
+  /** Whether this member represent some inherited part of the object */
+  flags_type flags = 0;
 
-  // Location (for members) is either of:
-  simgrid::mc::DwarfExpression location_expression;
+  /** Name of the member (if any) */
+  std::string name;
 
-  simgrid::mc::Type* subtype; // DW_AT_type
-  simgrid::mc::Type* full_type; // The same (but more complete) type
+  /** DWARF location expression for locating the location of the member */
+  simgrid::dwarf::DwarfExpression location_expression;
+
+  std::size_t byte_size = 0; // Do we really need this?
+
+  unsigned type_id = 0;
+  simgrid::mc::Type* type = nullptr;
+
+  bool isInheritance() const
+  {
+    return this->flags & INHERITANCE_FLAG;
+  }
+  bool isVirtualPointer() const
+  {
+    return this->flags & VIRTUAL_POINTER_FLAG;
+  }
 
+  /** Whether the member is at a fixed offset from the base address */
   bool has_offset_location() const
   {
+    // Recognize the expression `DW_OP_plus_uconst(offset)`:
     return location_expression.size() == 1 &&
       location_expression[0].atom == DW_OP_plus_uconst;
   }
 
-  // TODO, check if this shortcut is really necessary
+  /** Get the offset of the member
+  *
+  *  This is only valid is the member is at a fixed offset from the base.
+  *  This is often the case (for C types, C++ type without virtual
+  *  inheritance).
+  *
+  *  If the location is more complex, the location expression has
+  *  to be evaluated (which might need accessing the memory).
+  */
   int offset() const
   {
     xbt_assert(this->has_offset_location());
     return this->location_expression[0].number;
   }
 
+  /** Set the location of the member as a fixed offset */
   void offset(int new_offset)
   {
-    DwarfInstruction op;
+    // Set the expression to be `DW_OP_plus_uconst(offset)`:
+    Dwarf_Op op;
     op.atom = DW_OP_plus_uconst;
     op.number = new_offset;
     this->location_expression = { op };
   }
+
 };
 
-inline
-Type::Type()
-{
-  this->type = 0;
-  this->id = 0;
-  this->byte_size = 0;
-  this->element_count = 0;
-  this->is_pointer_type = 0;
-  this->type_id = 0;
-  this->subtype = nullptr;
-  this->full_type = nullptr;
-}
+/** A type in the model-checked program */
+class Type {
+public:
+  Type() = default;
+
+  /** The DWARF TAG of the type (e.g. DW_TAG_array_type) */
+  int type = 0;
+  unsigned id = 0; /* Offset in the section (in hexadecimal form) */
+  std::string name; /* Name of the type */
+  int byte_size = 0; /* Size in bytes */
+  int element_count = 0; /* Number of elements for array type */
+  unsigned type_id = 0; /* DW_AT_type id */
+  std::vector<Member> members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/
+
+  simgrid::mc::Type* subtype = nullptr; // DW_AT_type
+  simgrid::mc::Type* full_type = nullptr; // The same (but more complete) type
+};
 
 }
 }