diff options
| author | Clifford Wolf <clifford@clifford.at> | 2017-12-09 05:26:02 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2017-12-09 05:26:02 +0100 |
| commit | fd83e3442dfe300a865a7566e012eca5df93c339 (patch) | |
| tree | bcb8400887834168317ec7bcfe71edab6788f86b | |
| parent | 68c6675130e381c67977e21f28e2057dbd71a6a5 (diff) | |
| parent | 50da3bdbccb8a51c75878787550fc3c72534ce7d (diff) | |
| download | yosys-fd83e3442dfe300a865a7566e012eca5df93c339.tar.gz yosys-fd83e3442dfe300a865a7566e012eca5df93c339.tar.bz2 yosys-fd83e3442dfe300a865a7566e012eca5df93c339.zip | |
Merge branch 'master' into btor-ng
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | frontends/ast/genrtlil.cc | 2 | ||||
| -rw-r--r-- | frontends/ast/simplify.cc | 3 | ||||
| -rw-r--r-- | techlibs/ice40/synth_ice40.cc | 2 |
4 files changed, 9 insertions, 4 deletions
@@ -101,7 +101,7 @@ OBJS = kernel/version_$(GIT_REV).o # is just a symlink to your actual ABC working directory, as 'make mrproper' # will remove the 'abc' directory and you do not want to accidentally # delete your work on ABC.. -ABCREV = f6838749f234 +ABCREV = 31fc97b0aeed ABCPULL = 1 ABCURL ?= https://bitbucket.org/alanmi/abc ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 @@ -439,8 +439,8 @@ ifneq ($(ABCREV),default) $(Q) if test "`cd abc 2> /dev/null && hg identify | cut -f1 -d' '`" != "$(ABCREV)"; then \ test $(ABCPULL) -ne 0 || { echo 'REEBE: NOP abg hc gb qngr naq NOPCHYY frg gb 0 va Znxrsvyr!' | tr 'A-Za-z' 'N-ZA-Mn-za-m'; exit 1; }; \ echo "Pulling ABC from $(ABCURL):"; set -x; \ - test -d abc || hg clone $(ABCURL) abc; \ - cd abc && $(MAKE) DEP= clean && hg pull && hg update -r $(ABCREV); \ + test -d abc || hg clone --insecure $(ABCURL) abc; \ + cd abc && $(MAKE) DEP= clean && hg pull --insecure && hg update -r $(ABCREV); \ fi endif $(Q) rm -f abc/abc-[0-9a-f]* diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc index 6c2eafacd..3b08fc28d 100644 --- a/frontends/ast/genrtlil.cc +++ b/frontends/ast/genrtlil.cc @@ -554,6 +554,8 @@ struct AST_INTERNAL::ProcessGenerator break; default: + // ast->dumpAst(NULL, "ast> "); + // current_ast_mod->dumpAst(NULL, "mod> "); log_abort(); } } diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index 74e7b4675..f61f7cf7c 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -401,6 +401,9 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage, if (type == AST_ALWAYS || type == AST_INITIAL) { + if (current_always != nullptr) + log_error("Invalid nesting of always blocks and/or initializations at %s:%d.\n", filename.c_str(), linenum); + current_always = this; current_always_clocked = false; diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc index 57f96ca1a..0bb0fb139 100644 --- a/techlibs/ice40/synth_ice40.cc +++ b/techlibs/ice40/synth_ice40.cc @@ -70,7 +70,7 @@ struct SynthIce40Pass : public ScriptPass log("\n"); log(" -vpr\n"); log(" generate an output netlist (and BLIF file) suitable for VPR\n"); - log(" (this fueature is experimental and incomplete)\n"); + log(" (this feature is experimental and incomplete)\n"); log("\n"); log("\n"); log("The following commands are executed by this synthesis command:\n"); |