diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2017-05-08 10:08:12 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2017-05-08 10:08:12 +0800 |
| commit | be85bac5a625b7abba5800c7695e43525b75aa0a (patch) | |
| tree | a0fcb838fbe99d8441deeb5d77af60cded32ec43 | |
| parent | 7849c6d82dc939f9b65170f512f9bcc75f4c3c5b (diff) | |
| download | dexon-mcl-be85bac5a625b7abba5800c7695e43525b75aa0a.tar.gz dexon-mcl-be85bac5a625b7abba5800c7695e43525b75aa0a.tar.zst dexon-mcl-be85bac5a625b7abba5800c7695e43525b75aa0a.zip | |
rename maxOpUnitSize to maxUnitSize
| -rw-r--r-- | include/mcl/op.hpp | 16 | ||||
| -rw-r--r-- | src/fp.cpp | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/mcl/op.hpp b/include/mcl/op.hpp index 9638f25..5e7a1fa 100644 --- a/include/mcl/op.hpp +++ b/include/mcl/op.hpp @@ -96,7 +96,7 @@ typedef uint64_t Unit; #endif const size_t UnitBitSize = sizeof(Unit) * 8; -const size_t maxOpUnitSize = (MCL_MAX_BIT_SIZE + UnitBitSize - 1) / UnitBitSize; +const size_t maxUnitSize = (MCL_MAX_BIT_SIZE + UnitBitSize - 1) / UnitBitSize; #define MCL_MAX_UNIT_SIZE ((MCL_MAX_BIT_SIZE + CYBOZU_OS_BIT - 1) / CYBOZU_OS_BIT) struct FpGenerator; @@ -117,7 +117,7 @@ typedef Unit (*u3u)(Unit*, const Unit*, const Unit*); struct Block { const Unit *p; // pointer to original FpT.v_ size_t n; - Unit v_[maxOpUnitSize]; + Unit v_[maxUnitSize]; }; enum Mode { @@ -141,12 +141,12 @@ struct Op { asm code assumes &rp + 1 == p */ Unit rp; - Unit p[maxOpUnitSize]; + Unit p[maxUnitSize]; mpz_class mp; mcl::SquareRoot sq; FpGenerator *fg; - Unit half[maxOpUnitSize]; // (p + 1) / 2 - Unit oneRep[maxOpUnitSize]; // 1(=inv R if Montgomery) + Unit half[maxUnitSize]; // (p + 1) / 2 + Unit oneRep[maxUnitSize]; // 1(=inv R if Montgomery) /* for Montgomery one = 1 @@ -154,9 +154,9 @@ struct Op { R2 = (R * R) % p R3 = RR^3 */ - Unit one[maxOpUnitSize]; - Unit R2[maxOpUnitSize]; - Unit R3[maxOpUnitSize]; + Unit one[maxUnitSize]; + Unit R2[maxUnitSize]; + Unit R3[maxUnitSize]; std::vector<Unit> invTbl; size_t N; size_t bitSize; @@ -297,7 +297,7 @@ void setOp(Op& op, Mode mode) #ifdef MCL_USE_XBYAK inline void invOpForMontC(Unit *y, const Unit *x, const Op& op) { - Unit r[maxOpUnitSize]; + Unit r[maxUnitSize]; int k = op.fp_preInv(r, x); /* S = UnitBitSize @@ -315,7 +315,7 @@ static void initInvTbl(Op& op) const size_t invTblN = N * sizeof(Unit) * 8 * 2; op.invTbl.resize(invTblN * N); Unit *tbl = op.invTbl.data() + (invTblN - 1) * N; - Unit t[maxOpUnitSize] = {}; + Unit t[maxUnitSize] = {}; t[0] = 2; op.toMont(tbl, t); for (size_t i = 0; i < invTblN - 1; i++) { @@ -367,7 +367,7 @@ void Op::init(const std::string& mstr, size_t maxBitSize, Mode mode) } if (mp == 0) throw cybozu::Exception("Op:init:mstr is zero") << mstr; } - gmp::getArray(p, maxOpUnitSize, mp); + gmp::getArray(p, maxUnitSize, mp); bitSize = gmp::getBitSize(mp); /* priority : MCL_USE_XBYAK > MCL_USE_LLVM > none |