#include "mc_object_info.h"
#include "mc_private.h"
-extern "C" {
-
/** Resolve snapshot in the process address space
*
* @param object Process address of the struct/class
* @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 *mc_member_resolve(const void *base, simgrid::mc::Type* type, simgrid::mc::Type* 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));
state.stack[0] = (uintptr_t) base;
state.process_index = process_index;
- if (mc_dwarf_execute_expression
- (member->location.size, member->location.ops, &state))
+ if (simgrid::mc::execute(
+ member->location_expression, &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];
}
-
-}