Address comments in analyze_symbol.cpp

With a small change in the parser (string->irep_idt).

Author: petr-bauch

src/memory-analyzer/analyze_symbol.cpp

@@ -22,22 +22,21 @@ gdb_value_extractort::gdb_value_extractort(
     symbol_table(symbol_table),
     ns(symbol_table),
     c_converter(ns, expr2c_configurationt::clean_configuration),
-    allocate_objects(ID_C, source_locationt(), "", this->symbol_table)
+    allocate_objects(ID_C, source_locationt(), irep_idt{}, this->symbol_table)
 {
 }
 
-void gdb_value_extractort::analyze_symbols(
-  const std::vector<std::string> &symbols)
+void gdb_value_extractort::analyze_symbols(const std::vector<irep_idt> &symbols)
 {
   // record addresses of given symbols
   for(const auto &id : symbols)
   {
-    const symbol_exprt symbol_expr(id, typet());
+    const symbol_exprt &symbol_expr = ns.lookup(id).symbol_expr();
     const address_of_exprt aoe(symbol_expr);
 
     const std::string c_expr = c_converter.convert(aoe);
     const pointer_valuet &value = gdb_api.get_memory(c_expr);
-    CHECK_RETURN(value.pointee.empty() || (value.pointee == id));
+    CHECK_RETURN(value.pointee.empty() || (id == value.pointee));
 
     values.insert({value.address, symbol_expr});
   }
@@ -143,12 +142,11 @@ exprt gdb_value_extractort::get_char_pointer_value(
     std::string c_expr = c_converter.convert(expr);
     pointer_valuet value = gdb_api.get_memory(c_expr);
     CHECK_RETURN(value.string);
-    std::string string = *value.string;
 
-    string_constantt init(string);
+    string_constantt init(*value.string);
     CHECK_RETURN(to_array_type(init.type()).is_complete());
 
-    symbol_exprt dummy(pointer_typet(init.type(), config.ansi_c.pointer_width));
+    symbol_exprt dummy("tmp", pointer_type(init.type()));
     code_blockt assignments;
 
     const symbol_exprt new_symbol =
@@ -184,7 +182,7 @@ exprt gdb_value_extractort::get_non_char_pointer_value(
 
     const typet target_type = expr.type().subtype();
 
-    symbol_exprt dummy(expr.type());
+    symbol_exprt dummy("tmp", expr.type());
     code_blockt assignments;
 
     const symbol_exprt new_symbol =
@@ -284,6 +282,7 @@ exprt gdb_value_extractort::get_expr_value(
   PRECONDITION(expr.type() == zero_expr.type());
 
   const typet &type = expr.type();
+  PRECONDITION(type.id() != ID_struct);
 
   if(is_c_integral_type(type))
   {
@@ -310,7 +309,7 @@ exprt gdb_value_extractort::get_expr_value(
     return convert_member_name_to_enum_value(
       get_gdb_value(expr), to_c_enum_type(type));
   }
-  else if(type.id() == ID_struct || type.id() == ID_struct_tag)
+  else if(type.id() == ID_struct_tag)
   {
     return get_struct_value(expr, zero_expr, location);
   }
@@ -324,7 +323,7 @@ exprt gdb_value_extractort::get_expr_value(
 
     return get_pointer_value(expr, zero_expr, location);
   }
-  UNREACHABLE;
+  UNIMPLEMENTED;
 }
 
 exprt gdb_value_extractort::get_struct_value(

src/memory-analyzer/analyze_symbol.h

@@ -40,7 +40,7 @@ class gdb_value_extractort
   ///   \ref symbol_exprt (via the `values` map) and then call
   ///   \ref analyze_symbol on it.
   /// \param symbols: names of symbols to be analysed
-  void analyze_symbols(const std::vector<std::string> &symbols);
+  void analyze_symbols(const std::vector<irep_idt> &symbols);
 
   /// Get memory snapshot as C code
   /// \return converted block of code with the collected assignments

src/memory-analyzer/memory_analyzer_parse_options.cpp

@@ -14,6 +14,7 @@ Author: Malte Mues <[email protected]>
 #include "analyze_symbol.h"
 #include "gdb_api.h"
 
+#include <algorithm>
 #include <fstream>
 
 #include <ansi-c/ansi_c_language.h>
@@ -123,7 +124,13 @@ int memory_analyzer_parse_optionst::doit()
     std::string breakpoint = cmdline.get_value("breakpoint");
     gdb_value_extractor.run_gdb_to_breakpoint(breakpoint);
   }
-  gdb_value_extractor.analyze_symbols(result);
+
+  std::vector<irep_idt> result_ids(result.size());
+  std::transform(
+    result.begin(), result.end(), result_ids.begin(), [](std::string &name) {
+      return irep_idt{name};
+    });
+  gdb_value_extractor.analyze_symbols(result_ids);
 
   std::ofstream file;
 
@@ -169,9 +176,11 @@ void memory_analyzer_parse_optionst::help()
     << '\n'
     << "Usage:                       Purpose:\n"
     << '\n'
-    << " memory-analyzer [-?] [-h] [--help]  show help\n"
-    << " memory-analyzer --version           show version\n"
-    << " memory-analyzer <options> <binary>  analyze binary"
+    << " memory-analyzer [-?] [-h] [--help]                         show help\n"
+    << " memory-analyzer --version                                  show"
+    << " version\n"
+    << " memory-analyzer --symbols <symbol-list> <options> <binary> analyze"
+    << " binary\n"
     << "\n"
     << " --core-file <file>           analyze from core file\n"
     << " --breakpoint <breakpoint>    analyze from breakpoint\n"