Skip to content

Add binary representation to all bitvector values in the xml trace #5425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 21, 2020
Merged

Add binary representation to all bitvector values in the xml trace #5425

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
33d9e32
Add binary representation to all bitvector values in the xml trace
thomasspriggs Jul 20, 2020
4db7ed0
Add test of binary inclusion in xml trace for integer values
thomasspriggs Jul 20, 2020
98f139d
Rename `full_lhs_value` to `value_xml`
thomasspriggs Jul 20, 2020
e6174e4
Refactor to extract `step.full_lhs_value` into `value` variable
thomasspriggs Jul 20, 2020
9827dc9
Explain why it is ok to use `false` for `is_signed`
thomasspriggs Jul 20, 2020
a1eeb59
Move nil check to top of function
thomasspriggs Jul 20, 2020
d744e2d
Document the additional binary in the xml file
thomasspriggs Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/goto-programs/xml_goto_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ Author: Daniel Kroening

xmlt full_lhs_value(const goto_trace_stept &step, const namespacet &ns)
{
xmlt full_lhs_value{"full_lhs_value"};
xmlt value_xml{"full_lhs_value"};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if I agree with the reasoning of this rename. I’d probably have gone for full_lhs_value_xml instead.


const auto &lhs_object = step.get_lhs_object();
const irep_idt identifier =
lhs_object.has_value() ? lhs_object->get_identifier() : irep_idt();

if(step.full_lhs_value.is_nil())
return full_lhs_value;
full_lhs_value.data = from_expr(ns, identifier, step.full_lhs_value);
return value_xml;
value_xml.data = from_expr(ns, identifier, step.full_lhs_value);

const auto &bv_type =
type_try_dynamic_cast<bitvector_typet>(step.full_lhs_value.type());
Expand All @@ -46,9 +46,9 @@ xmlt full_lhs_value(const goto_trace_stept &step, const namespacet &ns)
const auto width = bv_type->get_width();
const auto binary_representation =
integer2binary(bvrep2integer(constant->get_value(), width, false), width);
full_lhs_value.set_attribute("binary", binary_representation);
value_xml.set_attribute("binary", binary_representation);
}
return full_lhs_value;
return value_xml;
}

void convert(
Expand Down