mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-05 21:53:24 +00:00
Code Activity

ezsat: Rename files and class for ezCmdlineSat

Browse source
This commit is contained in:
Gabriel Gouvine 2024-03-28 17:25:19 +00:00
parent 316ec3b0b4
commit e16cf967fd
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -633,7 +633,7 @@ $(eval $(call add_include_file,kernel/yosys_common.h))
$(eval $(call add_include_file,kernel/yw.h)) $(eval $(call add_include_file,kernel/yw.h))
$(eval $(call add_include_file,libs/ezsat/ezsat.h)) $(eval $(call add_include_file,libs/ezsat/ezsat.h))
$(eval $(call add_include_file,libs/ezsat/ezminisat.h)) $(eval $(call add_include_file,libs/ezsat/ezminisat.h))
$(eval $(call add_include_file,libs/ezsat/ezcommand.h)) $(eval $(call add_include_file,libs/ezsat/ezcmdline.h))
ifeq ($(ENABLE_ZLIB),1) ifeq ($(ENABLE_ZLIB),1)
$(eval $(call add_include_file,libs/fst/fstapi.h)) $(eval $(call add_include_file,libs/fst/fstapi.h))
endif endif
@ -674,7 +674,7 @@ OBJS += libs/json11/json11.o
OBJS += libs/ezsat/ezsat.o OBJS += libs/ezsat/ezsat.o
OBJS += libs/ezsat/ezminisat.o OBJS += libs/ezsat/ezminisat.o
OBJS += libs/ezsat/ezcommand.o OBJS += libs/ezsat/ezcmdline.o
OBJS += libs/minisat/Options.o OBJS += libs/minisat/Options.o
OBJS += libs/minisat/SimpSolver.o OBJS += libs/minisat/SimpSolver.o

10
libs/ezsat/ezcommand.cc → libs/ezsat/ezcmdline.cc
View file

@ -1,13 +1,13 @@
#include "ezcommand.h" #include "ezcmdline.h"
#include "../../kernel/yosys.h" #include "../../kernel/yosys.h"
ezSATCommand::ezSATCommand(const std::string &cmd) : command(cmd) {} ezCmdlineSAT::ezCmdlineSAT(const std::string &cmd) : command(cmd) {}
ezSATCommand::~ezSATCommand() {} ezCmdlineSAT::~ezCmdlineSAT() {}
bool ezSATCommand::solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions) bool ezCmdlineSAT::solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions)
{ {
#if !defined(YOSYS_DISABLE_SPAWN) #if !defined(YOSYS_DISABLE_SPAWN)
const std::string tempdir_name = Yosys::make_temp_dir(Yosys::get_base_tmpdir() + "/yosys-sat-XXXXXX"); const std::string tempdir_name = Yosys::make_temp_dir(Yosys::get_base_tmpdir() + "/yosys-sat-XXXXXX");
@ -85,4 +85,4 @@ bool ezSATCommand::solver(const std::vector<int> &modelExpressions, std::vector<
#else #else
Yosys::log_error("SAT solver command not available in this build!\n"); Yosys::log_error("SAT solver command not available in this build!\n");
#endif #endif
} }

6
libs/ezsat/ezcommand.h → libs/ezsat/ezcmdline.h
View file

@ -22,14 +22,14 @@
#include "ezsat.h" #include "ezsat.h"
class ezSATCommand : public ezSAT class ezCmdlineSAT : public ezSAT
{ {
private: private:
std::string command; std::string command;
public: public:
ezSATCommand(const std::string &cmd); ezCmdlineSAT(const std::string &cmd);
virtual ~ezSATCommand(); virtual ~ezCmdlineSAT();
bool solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions) override; bool solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions) override;
}; };