1 files changed, 35 insertions, 4 deletions

diff --git a/passes/cmds/design.cc b/passes/cmds/design.cc
index 4fd43329f..cfe97067d 100644
--- a/passes/cmds/design.cc
+++ b/passes/cmds/design.cc
@@ -60,6 +60,11 @@ struct DesignPass : public Pass {
 		log("Push the current design to the stack and then clear the current design.\n");
 		log("\n");
 		log("\n");
+		log("    design -push-copy\n");
+		log("\n");
+		log("Push the current design to the stack without clearing the current design.\n");
+		log("\n");
+		log("\n");
 		log("    design -pop\n");
 		log("\n");
 		log("Reset the current design and pop the last design from the stack.\n");
@@ -94,6 +99,11 @@ struct DesignPass : public Pass {
 		log("The Verilog front-end remembers defined macros and top-level declarations\n");
 		log("between calls to 'read_verilog'. This command resets this memory.\n");
 		log("\n");
+		log("    design -delete <name>\n");
+		log("\n");
+		log("Delete the design previously saved under the given name.\n");
+		log("\n");
+
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
 	{
@@ -101,10 +111,11 @@ struct DesignPass : public Pass {
 		bool reset_mode = false;
 		bool reset_vlog_mode = false;
 		bool push_mode = false;
+		bool push_copy_mode = false;
 		bool pop_mode = false;
 		bool import_mode = false;
 		RTLIL::Design *copy_from_design = NULL, *copy_to_design = NULL;
-		std::string save_name, load_name, as_name;
+		std::string save_name, load_name, as_name, delete_name;
 		std::vector<RTLIL::Module*> copy_src_modules;
 
 		size_t argidx;
@@ -126,6 +137,11 @@ struct DesignPass : public Pass {
 				push_mode = true;
 				continue;
 			}
+			if (!got_mode && args[argidx] == "-push-copy") {
+				got_mode = true;
+				push_copy_mode = true;
+				continue;
+			}
 			if (!got_mode && args[argidx] == "-pop") {
 				got_mode = true;
 				pop_mode = true;
@@ -179,6 +195,13 @@ struct DesignPass : public Pass {
 				as_name = args[++argidx];
 				continue;
 			}
+			if (!got_mode && args[argidx] == "-delete" && argidx+1 < args.size()) {
+				got_mode = true;
+				delete_name = args[++argidx];
+				if (saved_designs.count(delete_name) == 0)
+					log_cmd_error("No saved design '%s' found!\n", delete_name.c_str());
+				continue;
+			}
 			break;
 		}
 
@@ -307,7 +330,7 @@ struct DesignPass : public Pass {
 			}
 		}
 
-		if (!save_name.empty() || push_mode)
+		if (!save_name.empty() || push_mode || push_copy_mode)
 		{
 			RTLIL::Design *design_copy = new RTLIL::Design;
 
@@ -321,7 +344,7 @@ struct DesignPass : public Pass {
 			if (saved_designs.count(save_name))
 				delete saved_designs.at(save_name);
 
-			if (push_mode)
+			if (push_mode || push_copy_mode)
 				pushed_designs.push_back(design_copy);
 			else
 				saved_designs[save_name] = design_copy;
@@ -329,7 +352,7 @@ struct DesignPass : public Pass {
 
 		if (reset_mode || !load_name.empty() || push_mode || pop_mode)
 		{
-			for (auto mod : design->modules())
+			for (auto mod : design->modules().to_vector())
 				design->remove(mod);
 
 			design->selection_stack.clear();
@@ -368,6 +391,14 @@ struct DesignPass : public Pass {
 				pushed_designs.pop_back();
 			}
 		}
+
+		if (!delete_name.empty())
+		{
+			auto it = saved_designs.find(delete_name);
+			log_assert(it != saved_designs.end());
+			delete it->second;
+			saved_designs.erase(it);
+		}
 	}
 } DesignPass;