Skip to content

Commit f9387c1

Browse files
author
Daniel Kroening
committed
fixes
1 parent e6e409c commit f9387c1

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

src/hw-cbmc/hw_cbmc_parse_options.cpp

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Author: Daniel Kroening, [email protected]
2020
#include <langapi/mode.h>
2121

2222
#include "hw_cbmc_parse_options.h"
23-
#include "hw_bmc.h"
23+
//#include "hw_bmc.h"
2424
#include "map_vars.h"
2525
#include "gen_interface.h"
2626

@@ -50,7 +50,9 @@ int hw_cbmc_parse_optionst::doit()
5050

5151
optionst options;
5252
get_command_line_options(options);
53-
eval_verbosity();
53+
54+
eval_verbosity(
55+
cmdline.get_value("verbosity"), messaget::M_STATISTICS, ui_message_handler);
5456

5557
//
5658
// Print a banner
@@ -68,8 +70,10 @@ int hw_cbmc_parse_optionst::doit()
6870
if(cmdline.isset("vcd"))
6971
options.set_option("vcd", cmdline.get_value("vcd"));
7072

73+
symbol_tablet symbol_table;
74+
7175
cbmc_solverst cbmc_solvers(options, symbol_table, ui_message_handler);
72-
cbmc_solvers.set_ui(get_ui());
76+
cbmc_solvers.set_ui(ui_message_handler.get_ui());
7377
std::unique_ptr<cbmc_solverst::solvert> cbmc_solver;
7478

7579
try
@@ -83,6 +87,7 @@ int hw_cbmc_parse_optionst::doit()
8387
return 1;
8488
}
8589

90+
#if 0
8691
prop_convt &prop_conv=cbmc_solver->prop_conv();
8792
hw_bmct hw_bmc(options, symbol_table, ui_message_handler, prop_conv);
8893

@@ -110,6 +115,7 @@ int hw_cbmc_parse_optionst::doit()
110115

111116
// do actual BMC
112117
return do_bmc(hw_bmc, goto_functions);
118+
#endif
113119
}
114120

115121
/*******************************************************************\
@@ -172,7 +178,8 @@ Function: hw_cbmc_parse_optionst::get_modules
172178
173179
\*******************************************************************/
174180

175-
int hw_cbmc_parse_optionst::get_modules(std::list<exprt> &bmc_constraints)
181+
int hw_cbmc_parse_optionst::get_modules(
182+
std::list<exprt> &bmc_constraints)
176183
{
177184
//
178185
// unwinding of transition systems
@@ -229,7 +236,7 @@ int hw_cbmc_parse_optionst::get_modules(std::list<exprt> &bmc_constraints)
229236
}
230237
else if(cmdline.isset("show-modules"))
231238
{
232-
show_modules(symbol_table, get_ui());
239+
show_modules(symbol_table, ui_message_handler.get_ui());
233240
return 0; // done
234241
}
235242

0 commit comments

Comments
 (0)