From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 16 Oct 2013 04:32:35 +0000 (+0200)
Subject: Fixed parsing or liberty file statements such as 'clocked_on : "(!CLK)";'
X-Git-Tag: yosys-0.2.0~472
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=845590aa8e3a7994b7082b5f0b4ab39c377163ba;p=yosys.git

Fixed parsing or liberty file statements such as 'clocked_on : "(!CLK)";'
Patch by Tim Edwards
---

diff --git a/passes/dfflibmap/dfflibmap.cc b/passes/dfflibmap/dfflibmap.cc
index dd873cadd..5e3219d55 100644
--- a/passes/dfflibmap/dfflibmap.cc
+++ b/passes/dfflibmap/dfflibmap.cc
@@ -69,12 +69,15 @@ static bool parse_pin(LibertyAst *cell, LibertyAst *attr, std::string &pin_name,
 	
 	std::string value = attr->value;
 
-	for (size_t pos = value.find_first_of("\" \t"); pos != std::string::npos; pos = value.find_first_of("\" \t"))
+	for (size_t pos = value.find_first_of("\" \t()"); pos != std::string::npos; pos = value.find_first_of("\" \t()"))
 		value.erase(pos, 1);
 
 	if (value[value.size()-1] == '\'') {
 		pin_name = value.substr(0, value.size()-1);
 		pin_pol = false;
+	} else if (value[0] == '!') {
+		pin_name = value.substr(1, value.size()-1);
+		pin_pol = false;
 	} else {
 		pin_name = value;
 		pin_pol = true;