Skip to content

Cleanup read_bin_goto_object #7642

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 1 commit into from
Apr 3, 2023
Merged

Cleanup read_bin_goto_object #7642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
93 changes: 43 additions & 50 deletions src/goto-programs/read_bin_goto_object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,70 +214,63 @@ bool read_bin_goto_object(
{
messaget message(message_handler);

{
char hdr[4];
hdr[0]=static_cast<char>(in.get());
hdr[1]=static_cast<char>(in.get());
hdr[2]=static_cast<char>(in.get());
char hdr[4];
hdr[0] = static_cast<char>(in.get());
hdr[1] = static_cast<char>(in.get());
hdr[2] = static_cast<char>(in.get());

if(hdr[0]=='G' && hdr[1]=='B' && hdr[2]=='F')
if(hdr[0] == 'G' && hdr[1] == 'B' && hdr[2] == 'F')
{
// OK!
}
else
{
hdr[3] = static_cast<char>(in.get());
if(hdr[0] == 0x7f && hdr[1] == 'G' && hdr[2] == 'B' && hdr[3] == 'F')
{
// OK!
}
else
else if(hdr[0] == 0x7f && hdr[1] == 'E' && hdr[2] == 'L' && hdr[3] == 'F')
{
hdr[3]=static_cast<char>(in.get());
if(hdr[0]==0x7f && hdr[1]=='G' && hdr[2]=='B' && hdr[3]=='F')
{
// OK!
}
else if(hdr[0]==0x7f && hdr[1]=='E' && hdr[2]=='L' && hdr[3]=='F')
{
if(!filename.empty())
message.error() << "Sorry, but I can't read ELF binary '" << filename
<< "'" << messaget::eom;
else
message.error() << "Sorry, but I can't read ELF binaries"
<< messaget::eom;

return true;
}
if(!filename.empty())
message.error() << "Sorry, but I can't read ELF binary '" << filename
<< "'" << messaget::eom;
else
{
message.error() << "'" << filename << "' is not a goto-binary"
message.error() << "Sorry, but I can't read ELF binaries"
<< messaget::eom;
return true;
}
}
}

irep_serializationt::ireps_containert ic;
irep_serializationt irepconverter(ic);
// symbol_serializationt symbolconverter(ic);

{
const std::size_t version = irepconverter.read_gb_word(in);

if(version < GOTO_BINARY_VERSION)
{
message.error() <<
"The input was compiled with an old version of "
"goto-cc; please recompile" << messaget::eom;
return true;
}
else if(version == GOTO_BINARY_VERSION)
{
read_bin_goto_object(in, symbol_table, functions, irepconverter);
return false;
}
else
{
message.error() <<
"The input was compiled with an unsupported version of "
"goto-cc; please recompile" << messaget::eom;
message.error() << "'" << filename << "' is not a goto-binary"
<< messaget::eom;
return true;
}
}

UNREACHABLE;
irep_serializationt::ireps_containert ic;
irep_serializationt irepconverter(ic);

const std::size_t version = irepconverter.read_gb_word(in);

if(version < GOTO_BINARY_VERSION)
{
message.error() << "The input was compiled with an old version of "
"goto-cc; please recompile"
<< messaget::eom;
return true;
}
else if(version == GOTO_BINARY_VERSION)
{
read_bin_goto_object(in, symbol_table, functions, irepconverter);
return false;
}
else
{
message.error() << "The input was compiled with an unsupported version of "
"goto-cc; please recompile"
<< messaget::eom;
return true;
}
}