X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/00e73cde9763ace0823328ea4f8811b966c1ff37..4fd2f97dd395fdec3a097054bb19ab70e7e99380:/testsuite/mc/dwarf.c

diff --git a/testsuite/mc/dwarf.c b/testsuite/mc/dwarf.c
index 08b93a39e6..c935a1205c 100644
--- a/testsuite/mc/dwarf.c
+++ b/testsuite/mc/dwarf.c
@@ -38,9 +38,10 @@ static dw_variable_t find_global_variable_by_name(mc_object_info_t info, const c
 }
 
 static dw_frame_t find_function_by_name(mc_object_info_t info, const char* name) {
-  unsigned int cursor = 0;
+  xbt_dict_cursor_t cursor = 0;
   dw_frame_t subprogram;
-  xbt_dynar_foreach(info->subprograms, cursor, subprogram){
+  char* key;
+  xbt_dict_foreach(info->subprograms, cursor, key, subprogram){
     if(!strcmp(name, subprogram->name))
       return subprogram;
   }
@@ -67,8 +68,8 @@ static void test_local_variable(mc_object_info_t info, const char* function, con
   dw_variable_t var = find_local_variable(subprogram, variable);
   assert(var);
 
-  void* frame_base = mc_find_frame_base(subprogram, cursor);
-  xbt_assert((void*)mc_dwarf_resolve_locations(&var->locations, cursor, frame_base, NULL) == address,
+  void* frame_base = mc_find_frame_base(subprogram, info, cursor);
+  xbt_assert((void*)mc_dwarf_resolve_locations(&var->locations, info, cursor, frame_base, NULL) == address,
     "Bad resolution of local variable %s of %s", variable, function);
 
 }
@@ -87,7 +88,7 @@ static dw_variable_t test_global_variable(mc_object_info_t info, const char* nam
   return variable;
 }
 
-static dw_type_t find_type(mc_object_info_t info, const char* name, dw_type_t type) {
+static dw_type_t find_member(mc_object_info_t info, const char* name, dw_type_t type) {
   unsigned int cursor = 0;
   dw_type_t member;
   xbt_dynar_foreach(type->members, cursor, member){
@@ -99,6 +100,12 @@ static dw_type_t find_type(mc_object_info_t info, const char* name, dw_type_t ty
 
 int some_local_variable = 0;
 
+typedef struct foo {int i;} s_foo;
+
+static void test_type_by_name(s_foo my_foo) {
+  assert(xbt_dict_get_or_null(mc_binary_info->full_types_by_name, "struct foo"));
+}
+
 int main(int argc, char** argv) {
 
   // xbt_init(&argc, argv);
@@ -117,8 +124,8 @@ int main(int argc, char** argv) {
 
   var = test_global_variable(mc_binary_info, "test_some_struct", &test_some_struct, sizeof(test_some_struct));
   type = xbt_dict_get_or_null(mc_binary_info->types, var->type_origin);
-  assert(find_type(mc_binary_info, "first", type)->offset == 0);
-  assert(find_type(mc_binary_info, "second", type)->offset
+  assert(find_member(mc_binary_info, "first", type)->offset == 0);
+  assert(find_member(mc_binary_info, "second", type)->offset
       == ((const char*)&test_some_struct.second) - (const char*)&test_some_struct);
 
   unw_context_t context;
@@ -128,5 +135,8 @@ int main(int argc, char** argv) {
 
   test_local_variable(mc_binary_info, "main", "argc", &argc, &cursor);
 
+  s_foo my_foo;
+  test_type_by_name(my_foo);
+
   _exit(0);
 }