[mc] Remote xbt_dynar_foreach() in MC_request_testany_fail()

[simgrid.git] / src / mc / mc_member.c

diff --git a/src/mc/mc_member.c b/src/mc/mc_member.c
index a3c2c4b..666a246 100644 (file)
--- a/src/mc/mc_member.c
+++ b/src/mc/mc_member.c
@@ -4,6 +4,7 @@
 /* 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. */
 
+#include "mc_object_info.h"
 #include "mc_private.h"
 
 /** Resolve snapshot in the process address space
@@ -14,44 +15,27 @@
  * @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_snapshot_t snapshot) {
-  if(!member->location.size) {
-    return ((char*) base) + member->offset;
+void *mc_member_resolve(const void *base, dw_type_t type, dw_type_t member,
+                        mc_address_space_t address_space, int process_index)
+{
+  if (!member->location.size) {
+    return ((char *) base) + member->offset;
   }
 
   s_mc_expression_state_t state;
   memset(&state, 0, sizeof(s_mc_expression_state_t));
   state.frame_base = NULL;
   state.cursor = NULL;
-  state.snapshot = snapshot;
+  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))
+  if (mc_dwarf_execute_expression
+      (member->location.size, member->location.ops, &state))
     xbt_die("Error evaluating DWARF expression");
-  if(state.stack_size==0)
+  if (state.stack_size == 0)
     xbt_die("No value on the stack");
   else
-    return (void*) state.stack[state.stack_size-1];
-}
-
-/** Resolve snapshot in the snapshot address space
- *
- * @param  object Snapshot address of the struct/class
- * @param  type Type of the struct/class
- * @param  member Member description
- * @param  snapshot Snapshot (or NULL)
- * @return Snapshot address of the given member of the 'object' struct/class
- */
-void* mc_member_snapshot_resolve(const void* object, dw_type_t type, dw_type_t member, mc_snapshot_t snapshot) {
-  if(!member->location.size) {
-    return (char*) object + member->offset;
-  } else {
-    // Translate the problem in the process address space:
-    void* real_area = (void*) mc_untranslate_address((void *)object, snapshot);
-    // Resolve the member in the process address space:
-    void* real_member = mc_member_resolve(real_area, type, member, snapshot);
-    // Translate back in the snapshot address space:
-    return mc_translate_address((uintptr_t)real_member, snapshot);
-  }
+    return (void *) state.stack[state.stack_size - 1];
 }