From: Clifford Wolf <clifford@clifford.at>
Date: Fri, 8 Aug 2014 12:49:06 +0000 (+0200)
Subject: Fixed "fsm -export"
X-Git-Tag: yosys-0.4~289
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7067c43ec09cca176ad72378aa9ad868171c2471;p=yosys.git

Fixed "fsm -export"
---

diff --git a/passes/fsm/fsm.cc b/passes/fsm/fsm.cc
index 13e90910b..2fae76091 100644
--- a/passes/fsm/fsm.cc
+++ b/passes/fsm/fsm.cc
@@ -127,12 +127,12 @@ struct FsmPass : public Pass {
 			Pass::call(design, "fsm_recode" + fm_set_fsm_file_opt + encoding_opt);
 		Pass::call(design, "fsm_info");
 
-		if (!flag_nomap)
-			Pass::call(design, "fsm_map");
-
 		if (flag_export)
 			Pass::call(design, "fsm_export");
 
+		if (!flag_nomap)
+			Pass::call(design, "fsm_map");
+
 		log_pop();
 	}
 } FsmPass;
diff --git a/passes/fsm/fsm_export.cc b/passes/fsm/fsm_export.cc
index cb762dc1a..b4a6b3f7b 100644
--- a/passes/fsm/fsm_export.cc
+++ b/passes/fsm/fsm_export.cc
@@ -56,13 +56,12 @@ void write_kiss2(struct RTLIL::Module *module, struct RTLIL::Cell *cell, std::st
 
 	attr_it = cell->attributes.find("\\fsm_export");
 	if (!filename.empty()) {
-	  kiss_name.assign(filename);
+		kiss_name.assign(filename);
 	} else if (attr_it != cell->attributes.end() && attr_it->second.decode_string() != "") {
 		kiss_name.assign(attr_it->second.decode_string());
 	}
 	else {
-		kiss_name.assign(module->name.str());
-		kiss_name.append('-' + cell->name.str() + ".kiss2");
+		kiss_name.assign(log_id(module) + std::string("-") + log_id(cell) + ".kiss2");
 	}
 
 	log("\n");