[mc] Fix type of expression resolution methods (uintpt_t and not Dwarf_Off)

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

diff --git a/src/mc/mc_dwarf_expression.c b/src/mc/mc_dwarf_expression.c
index 0bc9dcc..ec9d978 100644 (file)
--- a/src/mc/mc_dwarf_expression.c
+++ b/src/mc/mc_dwarf_expression.c
@@ -43,28 +43,23 @@ int mc_dwarf_execute_expression(
         break;
       }
 
-    // Push the CFA (Call Frame Addresse):
+    // Push the CFA (Canonical Frame Addresse):
     case DW_OP_call_frame_cfa:
     {
-      unw_word_t res;
-
-      int register_id =
-#if defined(UNW_TARGET_X86_64)
-          UNW_X86_64_CFA
-#elif defined(UNW_TARGET_X86)
-          UNW_X86_CFA
-#else
-          -1;
-#endif
-        ;
-      if(register_id<0)
-        xbt_die("Support for CFA not implemented for this achitecture.");
+      // UNW_X86_64_CFA does not return the CFA DWARF expects
+      // (it is a synonym for UNW_X86_64_RSP) so copy the cursor,
+      // unwind it once in order to find the parent SP:
 
       if(!state->cursor)
         return MC_EXPRESSION_E_MISSING_STACK_CONTEXT;
 
-      unw_get_reg(state->cursor, register_id, &res);
-      error = mc_dwarf_push_value(state, res + op->number);
+      // Get frame:
+      unw_cursor_t cursor = *(state->cursor);
+      unw_step(&cursor);
+
+      unw_word_t res;
+      unw_get_reg(&cursor, UNW_TDEP_SP, &res);
+      error = mc_dwarf_push_value(state, res);
       break;
     }
 
@@ -78,6 +73,7 @@ int mc_dwarf_execute_expression(
         break;
       }
 
+
     // Constants:
 
     case DW_OP_lit0: case DW_OP_lit1: case DW_OP_lit2: case DW_OP_lit3:
@@ -92,6 +88,13 @@ int mc_dwarf_execute_expression(
       break;
 
     case DW_OP_addr:
+      if(!state->object_info)
+        return MC_EXPRESSION_E_NO_BASE_ADDRESS;
+      if(state->stack_size==MC_EXPRESSION_STACK_SIZE)
+        return MC_EXPRESSION_E_STACK_OVERFLOW;
+      error = mc_dwarf_push_value(state,  (Dwarf_Off)MC_object_base_address(state->object_info) + op->number);
+      break;
+
     case DW_OP_const1u:
     case DW_OP_const2u:
     case DW_OP_const4u:
@@ -257,22 +260,23 @@ int mc_dwarf_execute_expression(
 /** \brief Resolve a location expression
  *  \deprecated Use mc_dwarf_resolve_expression
  */
-Dwarf_Off mc_dwarf_resolve_location(mc_expression_t expression, unw_cursor_t* c, void* frame_pointer_address, mc_snapshot_t snapshot) {
+uintptr_t mc_dwarf_resolve_location(mc_expression_t expression, mc_object_info_t object_info, unw_cursor_t* c, void* frame_pointer_address, mc_snapshot_t snapshot) {
   s_mc_expression_state_t state;
   memset(&state, 0, sizeof(s_mc_expression_state_t));
   state.frame_base = frame_pointer_address;
   state.cursor = c;
   state.snapshot = snapshot;
+  state.object_info = object_info;
 
   if(mc_dwarf_execute_expression(expression->size, expression->ops, &state))
     xbt_die("Error evaluating DWARF expression");
   if(state.stack_size==0)
     xbt_die("No value on the stack");
   else
-    return (Dwarf_Off) state.stack[state.stack_size-1];
+    return state.stack[state.stack_size-1];
 }
 
-Dwarf_Off mc_dwarf_resolve_locations(mc_location_list_t locations, unw_cursor_t* c, void* frame_pointer_address, mc_snapshot_t snapshot) {
+uintptr_t mc_dwarf_resolve_locations(mc_location_list_t locations, mc_object_info_t object_info, unw_cursor_t* c, void* frame_pointer_address, mc_snapshot_t snapshot) {
 
   unw_word_t ip;
   if(c) {
@@ -284,7 +288,7 @@ Dwarf_Off mc_dwarf_resolve_locations(mc_location_list_t locations, unw_cursor_t*
     mc_expression_t expression = locations->locations + i;
     if( (expression->lowpc==NULL && expression->highpc==NULL)
       || (c && ip >= (unw_word_t) expression->lowpc && ip < (unw_word_t) expression->highpc)) {
-      return mc_dwarf_resolve_location(expression, c, frame_pointer_address, snapshot);
+      return mc_dwarf_resolve_location(expression, object_info, c, frame_pointer_address, snapshot);
     }
   }
   xbt_die("Could not resolve location");
@@ -295,8 +299,8 @@ Dwarf_Off mc_dwarf_resolve_locations(mc_location_list_t locations, unw_cursor_t*
  *  \param frame
  *  \param unw_cursor
  */
-void* mc_find_frame_base(dw_frame_t frame, unw_cursor_t* unw_cursor) {
-  return (void*) mc_dwarf_resolve_locations(&frame->frame_base, unw_cursor, NULL, NULL);
+void* mc_find_frame_base(dw_frame_t frame, mc_object_info_t object_info, unw_cursor_t* unw_cursor) {
+  return (void*) mc_dwarf_resolve_locations(&frame->frame_base, object_info, unw_cursor, NULL, NULL);
 }
 
 void mc_dwarf_expression_clear(mc_expression_t expression) {