X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40334ce6fe520b2fa7d1e240716e4f34a5fdc74e..756df47074b2d7b0721f234077f5ef8d75e13932:/src/mc/mc_member.cpp

diff --git a/src/mc/mc_member.cpp b/src/mc/mc_member.cpp
index a75a9afdb5..683f82f9ca 100644
--- a/src/mc/mc_member.cpp
+++ b/src/mc/mc_member.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,10 +6,14 @@
 
 #include <xbt/misc.h>
 
-#include "mc_object_info.h"
-#include "mc_private.h"
+#include "src/mc/mc_object_info.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/Type.hpp"
+#include "src/mc/mc_dwarf.hpp"
 
-extern "C" {
+
+namespace simgrid {
+namespace dwarf {
 
 /** Resolve snapshot in the process address space
  *
@@ -19,29 +23,25 @@ extern "C" {
  * @param snapshot Snapshot (or NULL)
  * @return Process address of the given member of the 'object' struct/class
  */
-void *mc_member_resolve(const void *base, dw_type_t type, dw_type_t member,
-                        mc_address_space_t address_space, int process_index)
+void *resolve_member(
+    const void *base, simgrid::mc::Type* type, simgrid::mc::Member* member,
+    simgrid::mc::AddressSpace* address_space, int process_index)
 {
-  if (!member->location.size) {
-    return ((char *) base) + member->offset;
-  }
+  // TODO, get rid of this?
+  if (!member->has_offset_location())
+    return ((char *) base) + member->offset();
 
-  s_mc_expression_state_t state;
-  memset(&state, 0, sizeof(s_mc_expression_state_t));
+  ExpressionContext state;
   state.frame_base = NULL;
   state.cursor = NULL;
   state.address_space = address_space;
-  state.stack_size = 1;
-  state.stack[0] = (uintptr_t) base;
   state.process_index = process_index;
 
-  if (mc_dwarf_execute_expression
-      (member->location.size, member->location.ops, &state))
-    xbt_die("Error evaluating DWARF expression");
-  if (state.stack_size == 0)
-    xbt_die("No value on the stack");
-  else
-    return (void *) state.stack[state.stack_size - 1];
+  ExpressionStack stack;
+  stack.push((ExpressionStack::value_type) base);
+  simgrid::dwarf::execute(member->location_expression, state, stack);
+  return (void*) stack.top();
 }
 
 }
+}