represent numerical values in CBMC trace in hex

polgreen · polgreen · commit d5bbdd8af0b4 · 2018-07-05T10:42:28.000+02:00
diff --git a/regression/cbmc/hex_trace/main.c b/regression/cbmc/hex_trace/main.c
@@ -0,0 +1,12 @@
+int main()
+{
+	int a;
+	unsigned int b;
+	a = 0;
+	a = -100;
+	a = 2147483647;
+	b = a*2;
+	a = -2147483647;
+	__CPROVER_assert(0,"");
+
+}
diff --git a/regression/cbmc/hex_trace/test.desc b/regression/cbmc/hex_trace/test.desc
@@ -0,0 +1,14 @@
+CORE
+main.c
+--trace-hex --trace
+^EXIT=10$
+^SIGNAL=0$
+a=0 \s*\(0x0\)
+b=0u \s*\(0x0\)
+a=-100 \s*\(0xFFFFFF9C\)
+a=2147483647 \s*\(0x7FFFFFFF\)
+b=4294967294u \s*\(0xFFFFFFFE\)
+a=-2147483647 \s*\(0x80000001\)
+^VERIFICATION FAILED$
+--
+^warning: ignoring
diff --git a/src/cbmc/all_properties.cpp b/src/cbmc/all_properties.cpp
@@ -175,7 +175,8 @@ void bmc_all_propertiest::report(const cover_goalst &cover_goals)
           if(g.second.status==goalt::statust::FAILURE)
           {
             result() << "\n" << "Trace for " << g.first << ":" << "\n";
-            show_goto_trace(result(), bmc.ns, g.second.goto_trace);
+            show_goto_trace(
+              result(), bmc.ns, g.second.goto_trace, bmc.trace_options());
           }
       }
       result() << eom;
diff --git a/src/cbmc/bmc.cpp b/src/cbmc/bmc.cpp
@@ -55,7 +55,7 @@ void bmct::error_trace()
   {
   case ui_message_handlert::uit::PLAIN:
     result() << "Counterexample:" << eom;
-    show_goto_trace(result(), ns, goto_trace);
+    show_goto_trace(result(), ns, goto_trace, trace_options());
     result() << eom;
     break;
 
diff --git a/src/goto-programs/goto_trace.cpp b/src/goto-programs/goto_trace.cpp
@@ -103,10 +103,50 @@ void goto_trace_stept::output(
 
   out << '\n';
 }
+/// Returns the numeric representation of an expression, based on
+/// options. The default is binary without a base-prefix. Setting
+/// options.hex_representation to be true outputs hex format. Setting
+/// options.base_prefix to be true appends either 0b or 0x to the number
+/// to indicate the base
+/// \param expr: expression to get numeric representation from
+/// \param options: configuration options
+/// \return a string with the numeric representation
+static std::string
+numeric_representation(const exprt &expr, const trace_optionst &options)
+{
+  std::string result;
+  std::string prefix;
+  if(options.hex_representation)
+  {
+    mp_integer value_int =
+      binary2integer(id2string(to_constant_expr(expr).get_value()), false);
+    result = integer2string(value_int, 16);
+    prefix = "0x";
+  }
+  else
+  {
+    prefix = "0b";
+    result = expr.get_string(ID_value);
+  }
 
-std::string trace_value_binary(
+  std::ostringstream oss;
+  std::string::size_type i = 0;
+  for(const auto c : result)
+  {
+    oss << c;
+    if(++i % 8 == 0 && result.size() != i)
+      oss << ' ';
+  }
+  if(options.base_prefix)
+    return prefix + oss.str();
+  else
+    return oss.str();
+}
+
+std::string trace_numeric_value(
   const exprt &expr,
-  const namespacet &ns)
+  const namespacet &ns,
+  const trace_optionst &options)
 {
   const typet &type=ns.follow(expr.type());
 
@@ -123,18 +163,8 @@ std::string trace_value_binary(
        type.id()==ID_c_enum ||
        type.id()==ID_c_enum_tag)
     {
-      const std::string & str = expr.get_string(ID_value);
-
-      std::ostringstream oss;
-      std::string::size_type i = 0;
-      for(const auto c : str)
-      {
-        oss << c;
-        if(++i % 8 == 0 && str.size() != i)
-          oss << ' ';
-      }
-
-      return oss.str();
+      const std::string &str = numeric_representation(expr, options);
+      return str;
     }
     else if(type.id()==ID_bool)
     {
@@ -157,7 +187,7 @@ std::string trace_value_binary(
         result="{ ";
       else
         result+=", ";
-      result+=trace_value_binary(*it, ns);
+      result+=trace_numeric_value(*it, ns, options);
     }
 
     return result+" }";
@@ -170,15 +200,15 @@ std::string trace_value_binary(
     {
       if(it!=expr.operands().begin())
         result+=", ";
-      result+=trace_value_binary(*it, ns);
+      result+=trace_numeric_value(*it, ns, options);
     }
 
     return result+" }";
   }
   else if(expr.id()==ID_union)
   {
-    assert(expr.operands().size()==1);
-    return trace_value_binary(expr.op0(), ns);
+    PRECONDITION(expr.operands().size()==1);
+    return trace_numeric_value(expr.op0(), ns, options);
   }
 
   return "?";
@@ -189,7 +219,8 @@ void trace_value(
   const namespacet &ns,
   const ssa_exprt &lhs_object,
   const exprt &full_lhs,
-  const exprt &value)
+  const exprt &value,
+  const trace_optionst &options)
 {
   irep_idt identifier;
 
@@ -205,7 +236,7 @@ void trace_value(
     value_string=from_expr(ns, identifier, value);
 
     // the binary representation
-    value_string+=" ("+trace_value_binary(value, ns)+")";
+    value_string += " (" + trace_numeric_value(value, ns, options) + ")";
   }
 
   out << "  "
@@ -247,7 +278,8 @@ bool is_index_member_symbol(const exprt &src)
 void show_goto_trace(
   std::ostream &out,
   const namespacet &ns,
-  const goto_tracet &goto_trace)
+  const goto_tracet &goto_trace,
+  const trace_optionst &options)
 {
   unsigned prev_step_nr=0;
   bool first_step=true;
@@ -315,10 +347,20 @@ void show_goto_trace(
         // see if the full lhs is something clean
         if(is_index_member_symbol(step.full_lhs))
           trace_value(
-            out, ns, step.lhs_object, step.full_lhs, step.full_lhs_value);
+            out,
+            ns,
+            step.lhs_object,
+            step.full_lhs,
+            step.full_lhs_value,
+            options);
         else
           trace_value(
-            out, ns, step.lhs_object, step.lhs_object, step.lhs_object_value);
+            out,
+            ns,
+            step.lhs_object,
+            step.lhs_object,
+            step.lhs_object_value,
+            options);
       }
       break;
 
@@ -330,7 +372,8 @@ void show_goto_trace(
         show_state_header(out, step, step.pc->source_location, step.step_nr);
       }
 
-      trace_value(out, ns, step.lhs_object, step.full_lhs, step.full_lhs_value);
+      trace_value(
+        out, ns, step.lhs_object, step.full_lhs, step.full_lhs_value, options);
       break;
 
     case goto_trace_stept::typet::OUTPUT:
@@ -356,7 +399,7 @@ void show_goto_trace(
           out << " " << from_expr(ns, step.pc->function, *l_it);
 
           // the binary representation
-          out << " (" << trace_value_binary(*l_it, ns) << ")";
+          out << " (" << trace_numeric_value(*l_it, ns, options) << ")";
         }
 
         out << "\n";
@@ -377,7 +420,7 @@ void show_goto_trace(
         out << " " << from_expr(ns, step.pc->function, *l_it);
 
         // the binary representation
-        out << " (" << trace_value_binary(*l_it, ns) << ")";
+        out << " (" << trace_numeric_value(*l_it, ns, options) << ")";
       }
 
       out << "\n";
@@ -401,5 +444,12 @@ void show_goto_trace(
   }
 }
 
+void show_goto_trace(
+  std::ostream &out,
+  const namespacet &ns,
+  const goto_tracet &goto_trace)
+{
+  show_goto_trace(out, ns, goto_trace, trace_optionst::default_options);
+}
 
 const trace_optionst trace_optionst::default_options = trace_optionst();
diff --git a/src/goto-programs/goto_trace.h b/src/goto-programs/goto_trace.h
@@ -195,45 +195,61 @@ class goto_tracet
   }
 };
 
-void show_goto_trace(
-  std::ostream &out,
-  const namespacet &,
-  const goto_tracet &);
-
-void trace_value(
-  std::ostream &out,
-  const namespacet &,
-  const ssa_exprt &lhs_object,
-  const exprt &full_lhs,
-  const exprt &value);
-
-
 struct trace_optionst
 {
   bool json_full_lhs;
+  bool hex_representation;
+  bool base_prefix;
 
   static const trace_optionst default_options;
 
   explicit trace_optionst(const optionst &options)
   {
     json_full_lhs = options.get_bool_option("trace-json-extended");
+    hex_representation = options.get_bool_option("trace-hex");
+    base_prefix = hex_representation;
   };
 
 private:
   trace_optionst()
   {
     json_full_lhs = false;
+    hex_representation = false;
+    base_prefix = false;
   };
 };
 
-#define OPT_GOTO_TRACE "(trace-json-extended)"
+void show_goto_trace(
+  std::ostream &out,
+  const namespacet &,
+  const goto_tracet &);
+
+void show_goto_trace(
+  std::ostream &out,
+  const namespacet &,
+  const goto_tracet &,
+  const trace_optionst &);
+
+void trace_value(
+  std::ostream &out,
+  const namespacet &,
+  const ssa_exprt &lhs_object,
+  const exprt &full_lhs,
+  const exprt &value);
+
+
+#define OPT_GOTO_TRACE "(trace-json-extended)" \
+                       "(trace-hex)"
 
 #define HELP_GOTO_TRACE                                                        \
-  " --trace-json-extended        add rawLhs property to trace\n"
+  " --trace-json-extended        add rawLhs property to trace\n"              \
+  " --trace-hex                  represent plain trace values in hex\n"
 
 #define PARSE_OPTIONS_GOTO_TRACE(cmdline, options)                             \
   if(cmdline.isset("trace-json-extended"))                                     \
-    options.set_option("trace-json-extended", true);
+    options.set_option("trace-json-extended", true);                           \
+  if(cmdline.isset("trace-hex"))                                               \
+    options.set_option("trace-hex", true);
 
 
 #endif // CPROVER_GOTO_PROGRAMS_GOTO_TRACE_H

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,8 @@ void bmc_all_propertiest::report(const cover_goalst &cover_goals)`
`175`	`175`	`if(g.second.status==goalt::statust::FAILURE)`
`176`	`176`	`{`
`177`	`177`	`result() << "\n" << "Trace for " << g.first << ":" << "\n";`
`178`		`- show_goto_trace(result(), bmc.ns, g.second.goto_trace);`
	`178`	`+ show_goto_trace(`
	`179`	`+ result(), bmc.ns, g.second.goto_trace, bmc.trace_options());`
`179`	`180`	`}`
`180`	`181`	`}`
`181`	`182`	`result() << eom;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void bmct::error_trace()`
`55`	`55`	`{`
`56`	`56`	`case ui_message_handlert::uit::PLAIN:`
`57`	`57`	`result() << "Counterexample:" << eom;`
`58`		`- show_goto_trace(result(), ns, goto_trace);`
	`58`	`+ show_goto_trace(result(), ns, goto_trace, trace_options());`
`59`	`59`	`result() << eom;`
`60`	`60`	`break;`
`61`	`61`