[mc] C++ location lists and expressions

[simgrid.git] / src / mc / mc_checkpoint.cpp

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 5b16ad1..13c9397 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -260,7 +260,7 @@ void MC_find_object_address(std::vector<simgrid::mc::VmMap> const& maps, mc_obje
  *  \param ip    Instruction pointer
  *  \return      true if the variable is valid
  * */
-static bool mc_valid_variable(dw_variable_t var, dw_frame_t scope,
+static bool mc_valid_variable(mc_variable_t var, mc_frame_t scope,
                               const void *ip)
 {
   // The variable is not yet valid:
@@ -271,7 +271,7 @@ static bool mc_valid_variable(dw_variable_t var, dw_frame_t scope,
 }
 
 static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
-                                           dw_frame_t scope, int process_index,
+                                           mc_frame_t scope, int process_index,
                                            std::vector<s_local_variable>& result)
 {
   mc_process_t process = &mc_model_checker->process();
@@ -281,7 +281,7 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
     return;
 
   unsigned cursor = 0;
-  dw_variable_t current_variable;
+  mc_variable_t current_variable;
   xbt_dynar_foreach(scope->variables, cursor, current_variable) {
 
     if (!mc_valid_variable(current_variable, scope, (void *) stack_frame->ip))
@@ -304,10 +304,10 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
 
     if (current_variable->address != NULL) {
       new_var.address = current_variable->address;
-    } else if (current_variable->locations.size != 0) {
+    } else if (!current_variable->location_list.empty()) {
       s_mc_location_t location;
       mc_dwarf_resolve_locations(
-        &location, &current_variable->locations,
+        &location, &current_variable->location_list,
         current_variable->object_info,
         &(stack_frame->unw_cursor),
         (void *) stack_frame->frame_base,
@@ -330,7 +330,7 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
   }
 
   // Recursive processing of nested scopes:
-  dw_frame_t nested_scope = NULL;
+  mc_frame_t nested_scope = nullptr;
   xbt_dynar_foreach(scope->scopes, cursor, nested_scope) {
     mc_fill_local_variables_values(stack_frame, nested_scope, process_index, result);
   }
@@ -380,7 +380,7 @@ static std::vector<s_mc_stack_frame_t> MC_unwind_stack_frames(mc_unw_context_t s
 
       // TODO, use real addresses in frame_t instead of fixing it here
 
-      dw_frame_t frame = process->find_function(remote(ip));
+      mc_frame_t frame = process->find_function(remote(ip));
       stack_frame.frame = frame;
 
       if (frame) {
@@ -395,8 +395,8 @@ static std::vector<s_mc_stack_frame_t> MC_unwind_stack_frames(mc_unw_context_t s
       result.push_back(std::move(stack_frame));
 
       /* Stop before context switch with maestro */
-      if (frame != NULL && frame->name != NULL
-          && !strcmp(frame->name, "smx_ctx_sysv_wrapper"))
+      if (frame != nullptr &&
+          frame->name == "smx_ctx_sysv_wrapper")
         break;
 
       int ret = unw_step(&c);