PoS_EVM
/
mcl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move some functions to src

Browse Source
dev
MITSUNARI Shigeo 10 years ago
parent 7ed8bfa947
commit 4367516645
3 changed files with 82 additions and 81 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      include/mcl/fp.hpp
  2. 96
      include/mcl/fp_base.hpp
  3. 64
      src/fp.cpp

3
include/mcl/fp.hpp
Unescape View File

@ -89,9 +89,6 @@ public:
const Unit *p = op_.p; const Unit *p = op_.p;
op_.bitLen = bitLen; op_.bitLen = bitLen;
fp::setOp(op_, p, bitLen); fp::setOp(op_, p, bitLen);
#ifdef USE_MONT_FP
fp::initForMont(op_, p);
#endif
op_.sq.set(op_.mp); op_.sq.set(op_.mp);
} }
static inline void getModulo(std::string& pstr) static inline void getModulo(std::string& pstr)

96
include/mcl/fp_base.hpp
Unescape View File

@ -41,12 +41,12 @@ typedef uint64_t Unit;
struct Op; struct Op;
typedef void (*void1op)(Unit*); typedef void (*void1u)(Unit*);
typedef void (*void2op)(Unit*, const Unit*); typedef void (*void2u)(Unit*, const Unit*);
typedef void (*void2opOp)(Unit*, const Unit*, const Op&); typedef void (*void2uOp)(Unit*, const Unit*, const Op&);
typedef void (*void3op)(Unit*, const Unit*, const Unit*); typedef void (*void3u)(Unit*, const Unit*, const Unit*);
typedef void (*void4op)(Unit*, const Unit*, const Unit*, const Unit*); typedef void (*void4u)(Unit*, const Unit*, const Unit*, const Unit*);
typedef int (*int2op)(Unit*, const Unit*); typedef int (*int2u)(Unit*, const Unit*);
} } // mcl::fp } } // mcl::fp
@ -165,23 +165,23 @@ struct Op {
size_t bitLen; size_t bitLen;
// independent from p // independent from p
bool (*isZero)(const Unit*); bool (*isZero)(const Unit*);
void1op clear; void1u clear;
void2op copy; void2u copy;
// not require p(function having p) // not require p(function having p)
void2op neg; void2u neg;
void3op add; void3u add;
void3op sub; void3u sub;
void3op mul; void3u mul;
// for Montgomery // for Montgomery
bool useMont; bool useMont;
int2op preInv; int2u preInv;
// require p // require p
void3op negP; void3u negP;
void2opOp invOp; void2uOp invOp;
void4op addP; void4u addP;
void4op subP; void4u subP;
void3op mulPreP; void3u mulPreP;
void3op modP; void3u modP;
FpGenerator *fg; FpGenerator *fg;
Op() Op()
: p(), N(0), bitLen(0) : p(), N(0), bitLen(0)
@ -204,65 +204,7 @@ struct Op {
{ {
mul(y, x, RR); mul(y, x, RR);
} }
void initInvTbl(size_t N)
{
assert(N <= maxUnitN);
const size_t invTblN = N * sizeof(Unit) * 8 * 2;
invTbl.resize(invTblN * N);
Unit *tbl = invTbl.data() + (invTblN - 1) * N;
Unit t[maxUnitN] = {};
t[0] = 2;
toMont(tbl, t);
for (size_t i = 0; i < invTblN - 1; i++) {
add(tbl - N, tbl, tbl);
tbl -= N;
}
}
}; };
#ifdef USE_MONT_FP
const size_t UnitByteN = sizeof(Unit);
const size_t maxUnitN = (MCL_FP_BLOCK_MAX_BIT_N + UnitByteN * 8 - 1) / (UnitByteN * 8);
inline void invOpForMont(Unit *y, const Unit *x, const Op& op)
{
Unit r[maxUnitN];
int k = op.preInv(r, x);
/*
xr = 2^k
R = 2^(N * 64)
get r2^(-k)R^2 = r 2^(N * 64 * 2 - k)
*/
op.mul(y, r, op.invTbl.data() + k * op.N);
}
inline void fromRawGmp(Unit *y, size_t n, const mpz_class& x)
{
local::toArray(y, n, x.get_mpz_t());
}
inline void initForMont(Op& op, const Unit *p)
{
size_t N = (op.bitLen + sizeof(Unit) * 8 - 1) / (sizeof(Unit) * 8);
if (N < 2) N = 2;
mpz_class t = 1;
fromRawGmp(op.one, N, t);
t = (t << (N * 64)) % op.mp;
t = (t * t) % op.mp;
fromRawGmp(op.RR, N, t);
FpGenerator *fg = op.fg;
if (fg == 0) return;
fg->init(p, N);
op.neg = Xbyak::CastTo<void2op>(fg->neg_);
op.add = Xbyak::CastTo<void3op>(fg->add_);
op.sub = Xbyak::CastTo<void3op>(fg->sub_);
op.mul = Xbyak::CastTo<void3op>(fg->mul_);
op.preInv = Xbyak::CastTo<int2op>(op.fg->preInv_);
op.invOp = &invOpForMont;
op.useMont = true;
op.initInvTbl(N);
}
#endif
} } // mcl::fp } } // mcl::fp

64
src/fp.cpp
Unescape View File

@ -144,7 +144,66 @@ struct OpeFunc {
op.modP = OpeFunc<n>::modC; \ op.modP = OpeFunc<n>::modC; \
SET_OP_LLVM(n) SET_OP_LLVM(n)
void setOp(mcl::fp::Op& op, const Unit* /*p*/, size_t bitLen) #ifdef USE_MONT_FP
const size_t UnitByteN = sizeof(Unit);
const size_t maxUnitN = (MCL_FP_BLOCK_MAX_BIT_N + UnitByteN * 8 - 1) / (UnitByteN * 8);
inline void invOpForMont(Unit *y, const Unit *x, const Op& op)
{
Unit r[maxUnitN];
int k = op.preInv(r, x);
/*
xr = 2^k
R = 2^(N * 64)
get r2^(-k)R^2 = r 2^(N * 64 * 2 - k)
*/
op.mul(y, r, op.invTbl.data() + k * op.N);
}
inline void fromRawGmp(Unit *y, size_t n, const mpz_class& x)
{
local::toArray(y, n, x.get_mpz_t());
}
inline void initInvTbl(Op& op, size_t N)
{
assert(N <= maxUnitN);
const size_t invTblN = N * sizeof(Unit) * 8 * 2;
op.invTbl.resize(invTblN * N);
Unit *tbl = op.invTbl.data() + (invTblN - 1) * N;
Unit t[maxUnitN] = {};
t[0] = 2;
op.toMont(tbl, t);
for (size_t i = 0; i < invTblN - 1; i++) {
op.add(tbl - N, tbl, tbl);
tbl -= N;
}
}
inline void initForMont(Op& op, const Unit *p)
{
size_t N = (op.bitLen + sizeof(Unit) * 8 - 1) / (sizeof(Unit) * 8);
if (N < 2) N = 2;
mpz_class t = 1;
fromRawGmp(op.one, N, t);
t = (t << (N * 64)) % op.mp;
t = (t * t) % op.mp;
fromRawGmp(op.RR, N, t);
FpGenerator *fg = op.fg;
if (fg == 0) return;
fg->init(p, N);
op.neg = Xbyak::CastTo<void2u>(fg->neg_);
op.add = Xbyak::CastTo<void3u>(fg->add_);
op.sub = Xbyak::CastTo<void3u>(fg->sub_);
op.mul = Xbyak::CastTo<void3u>(fg->mul_);
op.preInv = Xbyak::CastTo<int2u>(op.fg->preInv_);
op.invOp = &invOpForMont;
op.useMont = true;
initInvTbl(op, N);
}
#endif
void setOp(mcl::fp::Op& op, const Unit* p, size_t bitLen)
{ {
assert(sizeof(mp_limb_t) == sizeof(Unit)); assert(sizeof(mp_limb_t) == sizeof(Unit));
const size_t UnitBitN = sizeof(Unit) * 8; const size_t UnitBitN = sizeof(Unit) * 8;
@ -186,6 +245,9 @@ void setOp(mcl::fp::Op& op, const Unit* /*p*/, size_t bitLen)
op.mul = &mcl_fp_mul_NIST_P192; // slower than MontFp192 op.mul = &mcl_fp_mul_NIST_P192; // slower than MontFp192
} }
#endif #endif
#ifdef USE_MONT_FP
fp::initForMont(op, p);
#endif
} }
} } // mcl::fp } } // mcl::fp

Write Preview
Loading…
Cancel
Save