From 6433203b39f830a5c0d80347f14ab341ef3921ce Mon Sep 17 00:00:00 2001
From: William Speirs <bill.speirs@gmail.com>
Date: Tue, 14 Oct 2014 17:10:53 -0400
Subject: Wrapped init in std::set constructor

---
 passes/opt/wreduce.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'passes')

diff --git a/passes/opt/wreduce.cc b/passes/opt/wreduce.cc
index 89b1f8856..8f59a041e 100644
--- a/passes/opt/wreduce.cc
+++ b/passes/opt/wreduce.cc
@@ -32,14 +32,14 @@ struct WreduceConfig
 
 	WreduceConfig()
 	{
-		supported_cell_types = {
+		supported_cell_types = std::set<IdString>({
 			"$not", "$pos", "$neg",
 			"$and", "$or", "$xor", "$xnor",
 			"$shl", "$shr", "$sshl", "$sshr", "$shift", "$shiftx",
 			"$lt", "$le", "$eq", "$ne", "$eqx", "$nex", "$ge", "$gt",
 			"$add", "$sub", // "$mul", "$div", "$mod", "$pow",
 			"$mux", "$pmux"
-		};
+		});
 	}
 };
 
-- 
cgit v1.2.3


From e5b8390f44be7d300fdf32193fa58b76ba448072 Mon Sep 17 00:00:00 2001
From: William Speirs <bill.speirs@gmail.com>
Date: Tue, 14 Oct 2014 17:15:35 -0400
Subject: Changed from "and" to "&&"

---
 passes/fsm/fsm_opt.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'passes')

diff --git a/passes/fsm/fsm_opt.cc b/passes/fsm/fsm_opt.cc
index 6685e8e0e..4b93d79f9 100644
--- a/passes/fsm/fsm_opt.cc
+++ b/passes/fsm/fsm_opt.cc
@@ -342,7 +342,7 @@ struct FsmOptPass : public Pass {
 		for (auto &mod_it : design->modules_) {
 			if (design->selected(mod_it.second))
 				for (auto &cell_it : mod_it.second->cells_)
-					if (cell_it.second->type == "$fsm" and design->selected(mod_it.second, cell_it.second))
+					if (cell_it.second->type == "$fsm" && design->selected(mod_it.second, cell_it.second))
 						FsmData::optimize_fsm(cell_it.second, mod_it.second);
 		}
 	}
-- 
cgit v1.2.3


From c3e9922b5d871269bf4ee33da24318d3b5199ac3 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 15 Oct 2014 01:12:53 +0200
Subject: Replaced readsome() with read() and gcount()

---
 passes/cmds/write_file.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'passes')

diff --git a/passes/cmds/write_file.cc b/passes/cmds/write_file.cc
index 3f4419724..9bf1a75a8 100644
--- a/passes/cmds/write_file.cc
+++ b/passes/cmds/write_file.cc
@@ -68,10 +68,13 @@ struct WriteFileFrontend : public Frontend {
 
 		FILE *of = fopen(output_filename.c_str(), append_mode ? "a" : "w");
 		char buffer[64 * 1024];
-		size_t bytes;
 
-		while (0 < (bytes = readsome(*f, buffer, sizeof(buffer))))
-			fwrite(buffer, bytes, 1, of);
+		while (1) {
+			f->read(buffer, sizeof(buffer));
+			if (f->gcount() <= 0)
+				break;
+			fwrite(buffer, f->gcount(), 1, of);
+		}
 
 		fclose(of);
 	}
-- 
cgit v1.2.3