Merge remote-tracking branch 'origin/master' into feature/python_bindings

diff --cc Makefile
index de1e2c404d2128f74b62744441bfc2a9f489cf17,8586e9766a4e5727547b0af04fafab49985db76f..80b12c826ba15f6dc628fb27872f7a5dd9257114
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -14,15 -16,11 +16,16 @@@ ENABLE_READLINE := 
  ENABLE_EDITLINE := 0
  ENABLE_VERIFIC := 0
  ENABLE_COVER := 1
 -ENABLE_LIBYOSYS := 0
 +ENABLE_LIBYOSYS := 1
  ENABLE_PROTOBUF := 0
  
 +# python wrappers
 +ENABLE_PYOSYS := 1
 +PYTHON_VERSION := 3.5
 +PYTHON_DESTDIR := /usr/local/lib/python$(PYTHON_VERSION)/dist-packages
 +
  # other configuration flags
+ ENABLE_GCOV := 0
  ENABLE_GPROF := 0
  ENABLE_DEBUG := 0
  ENABLE_NDEBUG := 0

diff --cc kernel/driver.cc
Simple merge

diff --cc kernel/rtlil.cc
index 93b138071a935eef4fa66dd79030e68dc86aba47,b3214579dbfff260f5b329ce0c8eaa56bde7d494..efe2c355959d38a62ff3eab5b8489ee95c2d1a04
--- 1/kernel/rtlil.cc
--- 2/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@@ -663,19 -639,13 +665,24 @@@ RTLIL::Module::~Module(
                delete it->second;
        for (auto it = processes.begin(); it != processes.end(); ++it)
                delete it->second;
 +#ifdef WITH_PYTHON
 +      RTLIL::Module::get_all_modules()->erase(hashidx_);
 +#endif
 +}
 +
 +#ifdef WITH_PYTHON
 +static std::map<unsigned int, RTLIL::Module*> *all_modules = new std::map<unsigned int, RTLIL::Module*>();
 +std::map<unsigned int, RTLIL::Module*> *RTLIL::Module::get_all_modules(void)
 +{
 +      return all_modules;
  }
 +#endif
  
+ void RTLIL::Module::reprocess_module(RTLIL::Design *, dict<RTLIL::IdString, RTLIL::Module *>)
+ {
+       log_error("Cannot reprocess_module module `%s' !\n", id2cstr(name));
+ }
+ 
  RTLIL::IdString RTLIL::Module::derive(RTLIL::Design*, dict<RTLIL::IdString, RTLIL::Const>, bool mayfail)
  {
        if (mayfail)

diff --cc kernel/rtlil.h
Simple merge

diff --cc kernel/yosys.cc
Simple merge

diff --cc kernel/yosys.h
Simple merge

diff --cc passes/cmds/plugin.cc
Simple merge