From 8364f509e31c187351bbc193a351aad90480c725 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 2 Dec 2017 18:52:05 +0100
Subject: [PATCH 1/4] Fix error handling for nested always/initial

---
 frontends/ast/genrtlil.cc | 2 ++
 frontends/ast/simplify.cc | 3 +++
 2 files changed, 5 insertions(+)

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;
 

From d5e6a73c8afb8c2e36073f9084b968e838506cc9 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 2 Dec 2017 21:24:12 +0100
Subject: [PATCH 2/4] Update ABC to hg rev 31fc97b0aeed

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 924fd88b7..e87f0d153 100644
--- a/Makefile
+++ b/Makefile
@@ -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

From 8f2638ae2f12a48dcad14f24b0211c16ac724762 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 3 Dec 2017 06:11:11 +0100
Subject: [PATCH 3/4] Use "hg ... --insecure" for cloning/pulling ABC

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e87f0d153..234791b86 100644
--- a/Makefile
+++ b/Makefile
@@ -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]*

From 3cc31f197cf69b6644928a58bf58028d65e38e60 Mon Sep 17 00:00:00 2001
From: Tim Ansell <mithro@mithis.com>
Date: Fri, 8 Dec 2017 18:44:45 -0800
Subject: [PATCH 4/4] Fix spelling in -vpr help for synth_ice40

---
 techlibs/ice40/synth_ice40.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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");