From 046e1a52147dd4a0e1f23e4aa7cb71b0a4d1b497 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 6 Aug 2019 16:22:47 -0700
Subject: Use State::S{0,1}

---
 passes/sat/eval.cc  | 4 ++--
 passes/sat/miter.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'passes/sat')

diff --git a/passes/sat/eval.cc b/passes/sat/eval.cc
index 008cd2dfa..e0bb439f4 100644
--- a/passes/sat/eval.cc
+++ b/passes/sat/eval.cc
@@ -47,8 +47,8 @@ struct BruteForceEquivChecker
 	{
 		if (inputs.size() < mod1_inputs.size()) {
 			RTLIL::SigSpec inputs0 = inputs, inputs1 = inputs;
-			inputs0.append(RTLIL::Const(0, 1));
-			inputs1.append(RTLIL::Const(1, 1));
+			inputs0.append(State::S0);
+			inputs1.append(State::S1);
 			run_checker(inputs0);
 			run_checker(inputs1);
 			return;
diff --git a/passes/sat/miter.cc b/passes/sat/miter.cc
index 1a886af70..e1da1a9e6 100644
--- a/passes/sat/miter.cc
+++ b/passes/sat/miter.cc
@@ -236,7 +236,7 @@ void create_miter_equiv(struct Pass *that, std::vector<std::string> args, RTLIL:
 	if (flag_make_assert) {
 		RTLIL::Cell *assert_cell = miter_module->addCell(NEW_ID, "$assert");
 		assert_cell->setPort("\\A", all_conditions);
-		assert_cell->setPort("\\EN", RTLIL::SigSpec(1, 1));
+		assert_cell->setPort("\\EN", State::S1);
 	}
 
 	RTLIL::Wire *w_trigger = miter_module->addWire("\\trigger");
-- 
cgit v1.2.3


From c11ad24fd7d961432cfdbca7497ba229d3b4f38d Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 6 Aug 2019 16:45:48 -0700
Subject: Use std::stoi instead of atoi(<str>.c_str())

---
 passes/sat/freduce.cc |  2 +-
 passes/sat/mutate.cc  | 34 +++++++++++++++++-----------------
 passes/sat/sat.cc     | 26 +++++++++++++-------------
 passes/sat/sim.cc     |  4 ++--
 4 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'passes/sat')

diff --git a/passes/sat/freduce.cc b/passes/sat/freduce.cc
index f29631639..781b5e3cc 100644
--- a/passes/sat/freduce.cc
+++ b/passes/sat/freduce.cc
@@ -816,7 +816,7 @@ struct FreducePass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-stop" && argidx+1 < args.size()) {
-				reduce_stop_at = atoi(args[++argidx].c_str());
+				reduce_stop_at = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-dump" && argidx+1 < args.size()) {
diff --git a/passes/sat/mutate.cc b/passes/sat/mutate.cc
index b53bbfeb2..a4b2f5eb5 100644
--- a/passes/sat/mutate.cc
+++ b/passes/sat/mutate.cc
@@ -803,7 +803,7 @@ struct MutatePass : public Pass {
 		for (argidx = 1; argidx < args.size(); argidx++)
 		{
 			if (args[argidx] == "-list" && argidx+1 < args.size()) {
-				N = atoi(args[++argidx].c_str());
+				N = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-o" && argidx+1 < args.size()) {
@@ -815,7 +815,7 @@ struct MutatePass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-seed" && argidx+1 < args.size()) {
-				opts.seed = atoi(args[++argidx].c_str());
+				opts.seed = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-none") {
@@ -828,8 +828,8 @@ struct MutatePass : public Pass {
 			}
 			if (args[argidx] == "-ctrl" && argidx+3 < args.size()) {
 				opts.ctrl_name = RTLIL::escape_id(args[++argidx]);
-				opts.ctrl_width = atoi(args[++argidx].c_str());
-				opts.ctrl_value = atoi(args[++argidx].c_str());
+				opts.ctrl_width = std::stoi(args[++argidx]);
+				opts.ctrl_value = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-module" && argidx+1 < args.size()) {
@@ -845,11 +845,11 @@ struct MutatePass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-portbit" && argidx+1 < args.size()) {
-				opts.portbit = atoi(args[++argidx].c_str());
+				opts.portbit = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-ctrlbit" && argidx+1 < args.size()) {
-				opts.ctrlbit = atoi(args[++argidx].c_str());
+				opts.ctrlbit = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-wire" && argidx+1 < args.size()) {
@@ -857,7 +857,7 @@ struct MutatePass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-wirebit" && argidx+1 < args.size()) {
-				opts.wirebit = atoi(args[++argidx].c_str());
+				opts.wirebit = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-src" && argidx+1 < args.size()) {
@@ -866,52 +866,52 @@ struct MutatePass : public Pass {
 			}
 			if (args[argidx] == "-cfg" && argidx+2 < args.size()) {
 				if (args[argidx+1] == "pick_cover_prcnt") {
-					opts.pick_cover_prcnt = atoi(args[argidx+2].c_str());
+					opts.pick_cover_prcnt = std::stoi(args[argidx+2]);
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_cover") {
-					opts.weight_cover = atoi(args[argidx+2].c_str());
+					opts.weight_cover = std::stoi(args[argidx+2]);
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_w") {
-					opts.weight_pq_w = atoi(args[argidx+2].c_str());
+					opts.weight_pq_w = std::stoi(args[argidx+2]);
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_b") {
-					opts.weight_pq_b = atoi(args[argidx+2].c_str());
+					opts.weight_pq_b = std::stoi(args[argidx+2]);
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_c") {
-					opts.weight_pq_c = atoi(args[argidx+2].c_str());
+					opts.weight_pq_c = std::stoi(args[argidx+2]);
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_s") {
-					opts.weight_pq_s = atoi(args[argidx+2].c_str());
+					opts.weight_pq_s = std::stoi(args[argidx+2]);
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_mw") {
-					opts.weight_pq_mw = atoi(args[argidx+2].c_str());
+					opts.weight_pq_mw = std::stoi(args[argidx+2]);
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_mb") {
-					opts.weight_pq_mb = atoi(args[argidx+2].c_str());
+					opts.weight_pq_mb = std::stoi(args[argidx+2]);
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_mc") {
-					opts.weight_pq_mc = atoi(args[argidx+2].c_str());
+					opts.weight_pq_mc = std::stoi(args[argidx+2]);
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_ms") {
-					opts.weight_pq_ms = atoi(args[argidx+2].c_str());
+					opts.weight_pq_ms = std::stoi(args[argidx+2]);
 					argidx += 2;
 					continue;
 				}
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index e4654d835..847ca0e1d 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -1102,23 +1102,23 @@ struct SatPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-timeout" && argidx+1 < args.size()) {
-				timeout = atoi(args[++argidx].c_str());
+				timeout = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-max" && argidx+1 < args.size()) {
-				loopcount = atoi(args[++argidx].c_str());
+				loopcount = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-maxsteps" && argidx+1 < args.size()) {
-				maxsteps = atoi(args[++argidx].c_str());
+				maxsteps = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-initsteps" && argidx+1 < args.size()) {
-				initsteps = atoi(args[++argidx].c_str());
+				initsteps = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-stepsize" && argidx+1 < args.size()) {
-				stepsize = max(1, atoi(args[++argidx].c_str()));
+				stepsize = max(1, std::stoi(args[++argidx]));
 				continue;
 			}
 			if (args[argidx] == "-ignore_div_by_zero") {
@@ -1185,7 +1185,7 @@ struct SatPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-tempinduct-skip" && argidx+1 < args.size()) {
-				tempinduct_skip = atoi(args[++argidx].c_str());
+				tempinduct_skip = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-prove" && argidx+2 < args.size()) {
@@ -1206,39 +1206,39 @@ struct SatPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-prove-skip" && argidx+1 < args.size()) {
-				prove_skip = atoi(args[++argidx].c_str());
+				prove_skip = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-seq" && argidx+1 < args.size()) {
-				seq_len = atoi(args[++argidx].c_str());
+				seq_len = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-set-at" && argidx+3 < args.size()) {
-				int timestep = atoi(args[++argidx].c_str());
+				int timestep = std::stoi(args[++argidx]);
 				std::string lhs = args[++argidx];
 				std::string rhs = args[++argidx];
 				sets_at[timestep].push_back(std::pair<std::string, std::string>(lhs, rhs));
 				continue;
 			}
 			if (args[argidx] == "-unset-at" && argidx+2 < args.size()) {
-				int timestep = atoi(args[++argidx].c_str());
+				int timestep = std::stoi(args[++argidx]);
 				unsets_at[timestep].push_back(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-set-def-at" && argidx+2 < args.size()) {
-				int timestep = atoi(args[++argidx].c_str());
+				int timestep = std::stoi(args[++argidx]);
 				sets_def_at[timestep].push_back(args[++argidx]);
 				enable_undef = true;
 				continue;
 			}
 			if (args[argidx] == "-set-any-undef-at" && argidx+2 < args.size()) {
-				int timestep = atoi(args[++argidx].c_str());
+				int timestep = std::stoi(args[++argidx]);
 				sets_any_undef_at[timestep].push_back(args[++argidx]);
 				enable_undef = true;
 				continue;
 			}
 			if (args[argidx] == "-set-all-undef-at" && argidx+2 < args.size()) {
-				int timestep = atoi(args[++argidx].c_str());
+				int timestep = std::stoi(args[++argidx]);
 				sets_all_undef_at[timestep].push_back(args[++argidx]);
 				enable_undef = true;
 				continue;
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index 4c3022c70..cb102e8bf 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -803,11 +803,11 @@ struct SimPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-n" && argidx+1 < args.size()) {
-				numcycles = atoi(args[++argidx].c_str());
+				numcycles = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-rstlen" && argidx+1 < args.size()) {
-				worker.rstlen = atoi(args[++argidx].c_str());
+				worker.rstlen = std::stoi(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-clock" && argidx+1 < args.size()) {
-- 
cgit v1.2.3


From 48d0f994064557dc0832748e17133ee2eac88cbf Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Wed, 7 Aug 2019 11:09:17 -0700
Subject: stoi -> atoi

---
 passes/sat/freduce.cc |  2 +-
 passes/sat/mutate.cc  | 34 +++++++++++++++++-----------------
 passes/sat/sat.cc     | 26 +++++++++++++-------------
 passes/sat/sim.cc     |  4 ++--
 4 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'passes/sat')

diff --git a/passes/sat/freduce.cc b/passes/sat/freduce.cc
index 781b5e3cc..f29631639 100644
--- a/passes/sat/freduce.cc
+++ b/passes/sat/freduce.cc
@@ -816,7 +816,7 @@ struct FreducePass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-stop" && argidx+1 < args.size()) {
-				reduce_stop_at = std::stoi(args[++argidx]);
+				reduce_stop_at = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-dump" && argidx+1 < args.size()) {
diff --git a/passes/sat/mutate.cc b/passes/sat/mutate.cc
index a4b2f5eb5..b53bbfeb2 100644
--- a/passes/sat/mutate.cc
+++ b/passes/sat/mutate.cc
@@ -803,7 +803,7 @@ struct MutatePass : public Pass {
 		for (argidx = 1; argidx < args.size(); argidx++)
 		{
 			if (args[argidx] == "-list" && argidx+1 < args.size()) {
-				N = std::stoi(args[++argidx]);
+				N = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-o" && argidx+1 < args.size()) {
@@ -815,7 +815,7 @@ struct MutatePass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-seed" && argidx+1 < args.size()) {
-				opts.seed = std::stoi(args[++argidx]);
+				opts.seed = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-none") {
@@ -828,8 +828,8 @@ struct MutatePass : public Pass {
 			}
 			if (args[argidx] == "-ctrl" && argidx+3 < args.size()) {
 				opts.ctrl_name = RTLIL::escape_id(args[++argidx]);
-				opts.ctrl_width = std::stoi(args[++argidx]);
-				opts.ctrl_value = std::stoi(args[++argidx]);
+				opts.ctrl_width = atoi(args[++argidx].c_str());
+				opts.ctrl_value = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-module" && argidx+1 < args.size()) {
@@ -845,11 +845,11 @@ struct MutatePass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-portbit" && argidx+1 < args.size()) {
-				opts.portbit = std::stoi(args[++argidx]);
+				opts.portbit = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-ctrlbit" && argidx+1 < args.size()) {
-				opts.ctrlbit = std::stoi(args[++argidx]);
+				opts.ctrlbit = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-wire" && argidx+1 < args.size()) {
@@ -857,7 +857,7 @@ struct MutatePass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-wirebit" && argidx+1 < args.size()) {
-				opts.wirebit = std::stoi(args[++argidx]);
+				opts.wirebit = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-src" && argidx+1 < args.size()) {
@@ -866,52 +866,52 @@ struct MutatePass : public Pass {
 			}
 			if (args[argidx] == "-cfg" && argidx+2 < args.size()) {
 				if (args[argidx+1] == "pick_cover_prcnt") {
-					opts.pick_cover_prcnt = std::stoi(args[argidx+2]);
+					opts.pick_cover_prcnt = atoi(args[argidx+2].c_str());
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_cover") {
-					opts.weight_cover = std::stoi(args[argidx+2]);
+					opts.weight_cover = atoi(args[argidx+2].c_str());
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_w") {
-					opts.weight_pq_w = std::stoi(args[argidx+2]);
+					opts.weight_pq_w = atoi(args[argidx+2].c_str());
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_b") {
-					opts.weight_pq_b = std::stoi(args[argidx+2]);
+					opts.weight_pq_b = atoi(args[argidx+2].c_str());
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_c") {
-					opts.weight_pq_c = std::stoi(args[argidx+2]);
+					opts.weight_pq_c = atoi(args[argidx+2].c_str());
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_s") {
-					opts.weight_pq_s = std::stoi(args[argidx+2]);
+					opts.weight_pq_s = atoi(args[argidx+2].c_str());
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_mw") {
-					opts.weight_pq_mw = std::stoi(args[argidx+2]);
+					opts.weight_pq_mw = atoi(args[argidx+2].c_str());
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_mb") {
-					opts.weight_pq_mb = std::stoi(args[argidx+2]);
+					opts.weight_pq_mb = atoi(args[argidx+2].c_str());
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_mc") {
-					opts.weight_pq_mc = std::stoi(args[argidx+2]);
+					opts.weight_pq_mc = atoi(args[argidx+2].c_str());
 					argidx += 2;
 					continue;
 				}
 				if (args[argidx+1] == "weight_pq_ms") {
-					opts.weight_pq_ms = std::stoi(args[argidx+2]);
+					opts.weight_pq_ms = atoi(args[argidx+2].c_str());
 					argidx += 2;
 					continue;
 				}
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index 847ca0e1d..80498f5b4 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -1102,23 +1102,23 @@ struct SatPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-timeout" && argidx+1 < args.size()) {
-				timeout = std::stoi(args[++argidx]);
+				timeout = std::atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-max" && argidx+1 < args.size()) {
-				loopcount = std::stoi(args[++argidx]);
+				loopcount = std::atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-maxsteps" && argidx+1 < args.size()) {
-				maxsteps = std::stoi(args[++argidx]);
+				maxsteps = std::atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-initsteps" && argidx+1 < args.size()) {
-				initsteps = std::stoi(args[++argidx]);
+				initsteps = std::atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-stepsize" && argidx+1 < args.size()) {
-				stepsize = max(1, std::stoi(args[++argidx]));
+				stepsize = max(1, std::atoi(args[++argidx].c_str()));
 				continue;
 			}
 			if (args[argidx] == "-ignore_div_by_zero") {
@@ -1185,7 +1185,7 @@ struct SatPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-tempinduct-skip" && argidx+1 < args.size()) {
-				tempinduct_skip = std::stoi(args[++argidx]);
+				tempinduct_skip = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-prove" && argidx+2 < args.size()) {
@@ -1206,39 +1206,39 @@ struct SatPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-prove-skip" && argidx+1 < args.size()) {
-				prove_skip = std::stoi(args[++argidx]);
+				prove_skip = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-seq" && argidx+1 < args.size()) {
-				seq_len = std::stoi(args[++argidx]);
+				seq_len = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-set-at" && argidx+3 < args.size()) {
-				int timestep = std::stoi(args[++argidx]);
+				int timestep = atoi(args[++argidx].c_str());
 				std::string lhs = args[++argidx];
 				std::string rhs = args[++argidx];
 				sets_at[timestep].push_back(std::pair<std::string, std::string>(lhs, rhs));
 				continue;
 			}
 			if (args[argidx] == "-unset-at" && argidx+2 < args.size()) {
-				int timestep = std::stoi(args[++argidx]);
+				int timestep = atoi(args[++argidx].c_str());
 				unsets_at[timestep].push_back(args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-set-def-at" && argidx+2 < args.size()) {
-				int timestep = std::stoi(args[++argidx]);
+				int timestep = atoi(args[++argidx].c_str());
 				sets_def_at[timestep].push_back(args[++argidx]);
 				enable_undef = true;
 				continue;
 			}
 			if (args[argidx] == "-set-any-undef-at" && argidx+2 < args.size()) {
-				int timestep = std::stoi(args[++argidx]);
+				int timestep = atoi(args[++argidx].c_str());
 				sets_any_undef_at[timestep].push_back(args[++argidx]);
 				enable_undef = true;
 				continue;
 			}
 			if (args[argidx] == "-set-all-undef-at" && argidx+2 < args.size()) {
-				int timestep = std::stoi(args[++argidx]);
+				int timestep = atoi(args[++argidx].c_str());
 				sets_all_undef_at[timestep].push_back(args[++argidx]);
 				enable_undef = true;
 				continue;
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index cb102e8bf..4c3022c70 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -803,11 +803,11 @@ struct SimPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-n" && argidx+1 < args.size()) {
-				numcycles = std::stoi(args[++argidx]);
+				numcycles = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-rstlen" && argidx+1 < args.size()) {
-				worker.rstlen = std::stoi(args[++argidx]);
+				worker.rstlen = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-clock" && argidx+1 < args.size()) {
-- 
cgit v1.2.3


From 0c78c62d6c043925293c0ff934c41f2df6932b85 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Wed, 7 Aug 2019 11:11:14 -0700
Subject: Remove std:: namespace

---
 passes/sat/sat.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'passes/sat')

diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index 80498f5b4..e4654d835 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -1102,23 +1102,23 @@ struct SatPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-timeout" && argidx+1 < args.size()) {
-				timeout = std::atoi(args[++argidx].c_str());
+				timeout = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-max" && argidx+1 < args.size()) {
-				loopcount = std::atoi(args[++argidx].c_str());
+				loopcount = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-maxsteps" && argidx+1 < args.size()) {
-				maxsteps = std::atoi(args[++argidx].c_str());
+				maxsteps = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-initsteps" && argidx+1 < args.size()) {
-				initsteps = std::atoi(args[++argidx].c_str());
+				initsteps = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-stepsize" && argidx+1 < args.size()) {
-				stepsize = max(1, std::atoi(args[++argidx].c_str()));
+				stepsize = max(1, atoi(args[++argidx].c_str()));
 				continue;
 			}
 			if (args[argidx] == "-ignore_div_by_zero") {
-- 
cgit v1.2.3


From 6d77236f3845cd8785e7bdd4da3c5ef966be6043 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Wed, 7 Aug 2019 12:20:08 -0700
Subject: substr() -> compare()

---
 passes/sat/expose.cc | 2 +-
 passes/sat/miter.cc  | 4 ++--
 passes/sat/sat.cc    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'passes/sat')

diff --git a/passes/sat/expose.cc b/passes/sat/expose.cc
index 71ce1683d..7631d87e6 100644
--- a/passes/sat/expose.cc
+++ b/passes/sat/expose.cc
@@ -151,7 +151,7 @@ void create_dff_dq_map(std::map<RTLIL::IdString, dff_map_info_t> &map, RTLIL::De
 			continue;
 		}
 
-		if (info.cell->type.size() == 10 && info.cell->type.substr(0, 6) == "$_DFF_") {
+		if (info.cell->type.size() == 10 && info.cell->type.begins_with("$_DFF_")) {
 			info.bit_clk = sigmap(info.cell->getPort("\\C")).as_bit();
 			info.bit_arst = sigmap(info.cell->getPort("\\R")).as_bit();
 			info.clk_polarity = info.cell->type[6] == 'P';
diff --git a/passes/sat/miter.cc b/passes/sat/miter.cc
index e1da1a9e6..49ef40061 100644
--- a/passes/sat/miter.cc
+++ b/passes/sat/miter.cc
@@ -59,7 +59,7 @@ void create_miter_equiv(struct Pass *that, std::vector<std::string> args, RTLIL:
 		}
 		break;
 	}
-	if (argidx+3 != args.size() || args[argidx].substr(0, 1) == "-")
+	if (argidx+3 != args.size() || args[argidx].compare(0, 1, "-") == 0)
 		that->cmd_error(args, argidx, "command argument error");
 
 	RTLIL::IdString gold_name = RTLIL::escape_id(args[argidx++]);
@@ -279,7 +279,7 @@ void create_miter_assert(struct Pass *that, std::vector<std::string> args, RTLIL
 		}
 		break;
 	}
-	if ((argidx+1 != args.size() && argidx+2 != args.size()) || args[argidx].substr(0, 1) == "-")
+	if ((argidx+1 != args.size() && argidx+2 != args.size()) || args[argidx].compare(0, 1, "-") == 0)
 		that->cmd_error(args, argidx, "command argument error");
 
 	IdString module_name = RTLIL::escape_id(args[argidx++]);
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index e4654d835..dd56d8c71 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -519,7 +519,7 @@ struct SatHelper
 					for (auto &p : d->connections()) {
 						if (d->type == "$dff" && p.first == "\\CLK")
 							continue;
-						if (d->type.substr(0, 6) == "$_DFF_" && p.first == "\\C")
+						if (d->type.begins_with("$_DFF_") && p.first == "\\C")
 							continue;
 						queued_signals.add(handled_signals.remove(sigmap(p.second)));
 					}
@@ -797,7 +797,7 @@ struct SatHelper
 
 			vector<string> data;
 			string name = wd.first.c_str();
-			while (name.substr(0, 1) == "\\")
+			while (name.compare(0, 1, "\\") == 0)
 				name = name.substr(1);
 
 			fprintf(f, "    { \"name\": \"%s\", \"wave\": \"", name.c_str());
@@ -1353,7 +1353,7 @@ struct SatPass : public Pass {
 		if (show_regs) {
 			pool<Wire*> reg_wires;
 			for (auto cell : module->cells()) {
-				if (cell->type == "$dff" || cell->type.substr(0, 6) == "$_DFF_")
+				if (cell->type == "$dff" || cell->type.begins_with("$_DFF_"))
 					for (auto bit : cell->getPort("\\Q"))
 						if (bit.wire)
 							reg_wires.insert(bit.wire);
-- 
cgit v1.2.3