1 files changed, 17 insertions, 17 deletions

diff --git a/passes/opt/pmux2shiftx.cc b/passes/opt/pmux2shiftx.cc
index a7fefc291..11b80b6b3 100644
--- a/passes/opt/pmux2shiftx.cc
+++ b/passes/opt/pmux2shiftx.cc
@@ -46,7 +46,7 @@ struct OnehotDatabase
 
 		for (auto wire : module->wires())
 		{
-			auto it = wire->attributes.find(ID(init));
+			auto it = wire->attributes.find(ID::init);
 			if (it == wire->attributes.end())
 				continue;
 
@@ -65,10 +65,10 @@ struct OnehotDatabase
 
 			if (cell->type.in(ID($adff), ID($dff), ID($dffe), ID($dlatch), ID($ff)))
 			{
-				output = cell->getPort(ID(Q));
+				output = cell->getPort(ID::Q);
 				if (cell->type == ID($adff))
-					inputs.push_back(cell->getParam(ID(ARST_VALUE)));
-				inputs.push_back(cell->getPort(ID(D)));
+					inputs.push_back(cell->getParam(ID::ARST_VALUE));
+				inputs.push_back(cell->getPort(ID::D));
 			}
 
 			if (cell->type.in(ID($mux), ID($pmux)))
@@ -299,16 +299,16 @@ struct Pmux2ShiftxPass : public Pass {
 					SigSpec A = sigmap(cell->getPort(ID::A));
 					SigSpec B = sigmap(cell->getPort(ID::B));
 
-					int a_width = cell->getParam(ID(A_WIDTH)).as_int();
-					int b_width = cell->getParam(ID(B_WIDTH)).as_int();
+					int a_width = cell->getParam(ID::A_WIDTH).as_int();
+					int b_width = cell->getParam(ID::B_WIDTH).as_int();
 
 					if (a_width < b_width) {
-						bool a_signed = cell->getParam(ID(A_SIGNED)).as_int();
+						bool a_signed = cell->getParam(ID::A_SIGNED).as_int();
 						A.extend_u0(b_width, a_signed);
 					}
 
 					if (b_width < a_width) {
-						bool b_signed = cell->getParam(ID(B_SIGNED)).as_int();
+						bool b_signed = cell->getParam(ID::B_SIGNED).as_int();
 						B.extend_u0(a_width, b_signed);
 					}
 
@@ -368,7 +368,7 @@ struct Pmux2ShiftxPass : public Pass {
 					continue;
 
 				string src = cell->get_src_attribute();
-				int width = cell->getParam(ID(WIDTH)).as_int();
+				int width = cell->getParam(ID::WIDTH).as_int();
 				int width_bits = ceil_log2(width);
 				int extwidth = width;
 
@@ -379,7 +379,7 @@ struct Pmux2ShiftxPass : public Pass {
 
 				SigSpec A = cell->getPort(ID::A);
 				SigSpec B = cell->getPort(ID::B);
-				SigSpec S = sigmap(cell->getPort(ID(S)));
+				SigSpec S = sigmap(cell->getPort(ID::S));
 				for (int i = 0; i < GetSize(S); i++)
 				{
 					if (!eqdb.count(S[i]))
@@ -400,7 +400,7 @@ struct Pmux2ShiftxPass : public Pass {
 					log("  data width: %d (next power-of-2 = %d, log2 = %d)\n", width, extwidth, width_bits);
 				}
 
-				SigSpec updated_S = cell->getPort(ID(S));
+				SigSpec updated_S = cell->getPort(ID::S);
 				SigSpec updated_B = cell->getPort(ID::B);
 
 				while (!seldb.empty())
@@ -727,9 +727,9 @@ struct Pmux2ShiftxPass : public Pass {
 				}
 
 				// update $pmux cell
-				cell->setPort(ID(S), updated_S);
+				cell->setPort(ID::S, updated_S);
 				cell->setPort(ID::B, updated_B);
-				cell->setParam(ID(S_WIDTH), GetSize(updated_S));
+				cell->setParam(ID::S_WIDTH, GetSize(updated_S));
 			}
 		}
 	}
@@ -785,16 +785,16 @@ struct OnehotPass : public Pass {
 				SigSpec A = sigmap(cell->getPort(ID::A));
 				SigSpec B = sigmap(cell->getPort(ID::B));
 
-				int a_width = cell->getParam(ID(A_WIDTH)).as_int();
-				int b_width = cell->getParam(ID(B_WIDTH)).as_int();
+				int a_width = cell->getParam(ID::A_WIDTH).as_int();
+				int b_width = cell->getParam(ID::B_WIDTH).as_int();
 
 				if (a_width < b_width) {
-					bool a_signed = cell->getParam(ID(A_SIGNED)).as_int();
+					bool a_signed = cell->getParam(ID::A_SIGNED).as_int();
 					A.extend_u0(b_width, a_signed);
 				}
 
 				if (b_width < a_width) {
-					bool b_signed = cell->getParam(ID(B_SIGNED)).as_int();
+					bool b_signed = cell->getParam(ID::B_SIGNED).as_int();
 					B.extend_u0(a_width, b_signed);
 				}