From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 7 Jan 2020 21:08:59 +0000 (-0800)
Subject: Fix {C} substitution
X-Git-Tag: working-ls180~870^2~20
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e230fd8afef6483d546cb38616e63b05d4d9b42a;p=yosys.git

Fix {C} substitution
---

diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc
index 486b9313b..d03c24fdb 100644
--- a/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@ -292,8 +292,11 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *module, std::string scrip
 	for (size_t pos = abc9_script.find("{W}"); pos != std::string::npos; pos = abc9_script.find("{W}", pos))
 		abc9_script = abc9_script.substr(0, pos) + wire_delay + abc9_script.substr(pos+3);
 
+	std::string C;
+	if (design->scratchpad.count("abc9.if.C"))
+		C = "-C " + design->scratchpad_get_string("abc9.if.C");
 	for (size_t pos = abc9_script.find("{C}"); pos != std::string::npos; pos = abc9_script.find("{C}", pos))
-		abc9_script = abc9_script.substr(0, pos) + design->scratchpad_get_string("abc9.if.C", "") + abc9_script.substr(pos+3);
+		abc9_script = abc9_script.substr(0, pos) + C + abc9_script.substr(pos+3);
 
 	if (nomfs)
 		for (size_t pos = abc9_script.find("&mfs"); pos != std::string::npos; pos = abc9_script.find("&mfs", pos))