warning fix for Mx

Author: ladnir

cryptoTools/Circuit/MxBit.h

@@ -389,7 +389,7 @@ namespace osuCrypto
 					throw RTE_LOC;
 
 				for (u64 i = 0; i < d.size(); ++i)
-					*d[i] = *bZero[i] ^ (*bZero[i] ^ *bOne[i]) & *this;
+					*d[i] = *bZero[i] ^ ((*bZero[i] ^ *bOne[i]) & *this);
 
 				return ret;
 			}

cryptoTools/Circuit/MxCircuit.cpp

@@ -25,7 +25,7 @@ namespace osuCrypto
 
 			void map(u64 key, u64 val) {
 				if (mMap.size() <= key)
-					mMap.resize(std::max<u64>(key + 1, mMap.size() * 2), -1);
+					mMap.resize(std::max<u64>(key + 1, mMap.size() * 2), ~0ull);
 				mMap[key] = val;
 			};
 
@@ -190,7 +190,7 @@ namespace osuCrypto
 				{
 
 					auto s = node.mInput.size();
-					if (s && node.mInput.back().offset() == -1)
+					if (s && node.mInput.back().offset() == ~0ull)
 						--s;
 
 					BetaBundle b(s);

cryptoTools/Circuit/MxCircuit.h

@@ -287,15 +287,15 @@ namespace osuCrypto
 
 			Arena<Address> mArena;
 			std::vector<Gate> mGates;
-			u64 mPrevPrintIdx = -1;
+			u64 mPrevPrintIdx = ~0ull;
 
 			void addPrint(span<const Bit*> elems,
 				std::function<std::string(const BitVector& b)>&& p)
 			{
 				Gate g;
 				g.mType = OpType::Print;
 
-				u64 s = (mPrevPrintIdx != -1);
+				u64 s = (mPrevPrintIdx != ~0ull);
 				for (u64 i = 0; i < elems.size(); ++i)
 					s += elems[i]->isConst() == false;
 
@@ -311,9 +311,9 @@ namespace osuCrypto
 						consts[i] = elems[i]->constValue();
 				}
 
-				if (mPrevPrintIdx != -1)
+				if (mPrevPrintIdx != ~0ull)
 				{
-					g.mInput[j++] = Address(mPrevPrintIdx, -1);
+					g.mInput[j++] = Address(mPrevPrintIdx, ~0ull);
 				}
 
 				assert(j == s);
@@ -418,13 +418,13 @@ namespace osuCrypto
 					throw std::runtime_error("MxCircuit::evaluate(...), number of inputs provided is not correct. " LOCATION);
 				out.resize(mOutputs.size());
 
-				std::vector<u64> map(mGates.size(), -1);
+				std::vector<u64> map(mGates.size(), ~0ull);
 				u64 nc = std::accumulate(mGates.begin(), mGates.end(), 0ull, [](auto&& c, auto&& g) {
 					return g.mNumOutputs + c;
 					});
 				std::unique_ptr<u8[]>vals_(new u8[nc]);
 				auto vals = [&](const Address& a) -> auto& {
-					assert(map[a.gate()] != -1);
+					assert(map[a.gate()] != ~0ull);
 					return vals_[map[a.gate()] + a.offset()];
 					};
 
@@ -489,7 +489,7 @@ namespace osuCrypto
 						Print* p = dynamic_cast<Print*>(gate.mData.get());
 
 						auto s = gate.mInput.size();
-						if (s && gate.mInput.back().offset() == -1)
+						if (s && gate.mInput.back().offset() == ~0ull)
 							--s;
 						BitVector v(s);
 						for (u64 j = 0; j < v.size(); ++j)

cryptoTools/Circuit/MxCircuitLibrary.cpp

@@ -124,7 +124,7 @@ namespace osuCrypto
 					else
 					{
 						G[i] =
-							!signExtend(a1_, i, it) &
+							(!signExtend(a1_, i, it)) &
 							signExtend(a2_, i, it);
 					}
 				}
@@ -626,7 +626,7 @@ namespace osuCrypto
 				throw RTE_LOC;
 
 			for (u64 i = 0; i < ret.size(); ++i)
-				ret[i] = bZero[i] ^ (bZero[i] ^ bOne[i]) & b;
+				ret[i] = bZero[i] ^ ((bZero[i] ^ bOne[i]) & b);
 		}
 
 		void negate(
@@ -764,7 +764,7 @@ namespace osuCrypto
 				//         001110
 				//        ----------------
 				//   011 |   101101
-				//         011                  \
+				//         011                  \. 
 				//       - 000             0    |
 				//         --------             | 
 				//           101101             | 
@@ -786,7 +786,7 @@ namespace osuCrypto
 				//              001             | 
 				//              011             | 
 				//           -  000         0   |
-				//             ----             /
+				//             ----             / 
 				//              001        <==== remainder
 				//
 

tests_cryptoTools/MxCircuit_Tests.cpp

@@ -424,7 +424,7 @@ void MxCircuit_asBetaCircuit_Test(const oc::CLP& cmd)
 
 	bool verbose = cmd.isSet("verbose");
 	PRNG prng(ZeroBlock);
-	auto trials = cmd.getOr("trials", 1);
+	auto trials = cmd.getOr("trials", 1ull);
 	for (u64 t = 0; t < trials; ++t)
 	{