Merge pull request #1858 from YosysHQ/eddie/fix1856

kernel: include "kernel/constids.inc"
This commit is contained in:
Eddie Hung 2020-04-09 14:23:47 -07:00 committed by GitHub
commit 371af7da38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 3 deletions

View File

@ -42,7 +42,7 @@ int RTLIL::IdString::last_created_idx_ptr_;
#endif
#define X(_id) IdString RTLIL::ID::_id;
#include "constids.inc"
#include "kernel/constids.inc"
#undef X
dict<std::string, std::string> RTLIL::constpad;

View File

@ -377,7 +377,7 @@ namespace RTLIL
namespace ID {
#define X(_id) extern IdString _id;
#include "constids.inc"
#include "kernel/constids.inc"
#undef X
};

View File

@ -516,7 +516,7 @@ void yosys_setup()
already_setup = true;
#define X(_id) RTLIL::ID::_id = "\\" # _id;
#include "constids.inc"
#include "kernel/constids.inc"
#undef X
#ifdef WITH_PYTHON

View File

@ -3,3 +3,4 @@
/write_gzip.v
/write_gzip.v.gz
/run-test.mk
/plugin.so

15
tests/various/plugin.cc Normal file
View File

@ -0,0 +1,15 @@
#include "kernel/rtlil.h"
YOSYS_NAMESPACE_BEGIN
struct TestPass : public Pass {
TestPass() : Pass("test", "test") { }
void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
{
size_t argidx = 1;
extra_args(args, argidx, design);
log("Plugin test passed!\n");
}
} TestPass;
YOSYS_NAMESPACE_END

6
tests/various/plugin.sh Normal file
View File

@ -0,0 +1,6 @@
set -e
rm -f plugin.so
CXXFLAGS=$(../../yosys-config --cxxflags)
CXXFLAGS=${CXXFLAGS// -I\/usr\/local\/share\/yosys\/include/ -I..\/..\/share\/include}
../../yosys-config --exec --cxx ${CXXFLAGS} --ldflags -shared -o plugin.so plugin.cc
../../yosys -m ./plugin.so -p "test" | grep -q "Plugin test passed!"