1 files changed, 20 insertions, 7 deletions

diff --git a/passes/proc/proc.cc b/passes/proc/proc.cc
index 30efbab4b..d5366f266 100644
--- a/passes/proc/proc.cc
+++ b/passes/proc/proc.cc
@@ -2,11 +2,11 @@
  *  yosys -- Yosys Open SYnthesis Suite
  *
  *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at>
- *  
+ *
  *  Permission to use, copy, modify, and/or distribute this software for any
  *  purpose with or without fee is hereby granted, provided that the above
  *  copyright notice and this permission notice appear in all copies.
- *  
+ *
  *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
@@ -40,22 +40,29 @@ struct ProcPass : public Pass {
 		log("    proc_init\n");
 		log("    proc_arst\n");
 		log("    proc_mux\n");
+		log("    proc_dlatch\n");
 		log("    proc_dff\n");
 		log("    proc_clean\n");
 		log("\n");
-		log("This replaces the processes in the design with multiplexers and flip-flops.\n");
+		log("This replaces the processes in the design with multiplexers,\n");
+		log("flip-flops and latches.\n");
 		log("\n");
 		log("The following options are supported:\n");
 		log("\n");
 		log("    -global_arst [!]<netname>\n");
 		log("        This option is passed through to proc_arst.\n");
 		log("\n");
+		log("    -ifx\n");
+		log("        This option is passed through to proc_mux. proc_rmdead is not\n");
+		log("        executed in -ifx mode.\n");
+		log("\n");
 	}
 	virtual void execute(std::vector<std::string> args, RTLIL::Design *design)
 	{
 		std::string global_arst;
+		bool ifxmode = false;
 
-		log_header("Executing PROC pass (convert processes to netlists).\n");
+		log_header(design, "Executing PROC pass (convert processes to netlists).\n");
 		log_push();
 
 		size_t argidx;
@@ -65,23 +72,29 @@ struct ProcPass : public Pass {
 				global_arst = args[++argidx];
 				continue;
 			}
+			if (args[argidx] == "-ifx") {
+				ifxmode = true;
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
 
 		Pass::call(design, "proc_clean");
-		Pass::call(design, "proc_rmdead");
+		if (!ifxmode)
+			Pass::call(design, "proc_rmdead");
 		Pass::call(design, "proc_init");
 		if (global_arst.empty())
 			Pass::call(design, "proc_arst");
 		else
 			Pass::call(design, "proc_arst -global_arst " + global_arst);
-		Pass::call(design, "proc_mux");
+		Pass::call(design, ifxmode ? "proc_mux -ifx" : "proc_mux");
+		Pass::call(design, "proc_dlatch");
 		Pass::call(design, "proc_dff");
 		Pass::call(design, "proc_clean");
 
 		log_pop();
 	}
 } ProcPass;
- 
+
 PRIVATE_NAMESPACE_END