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

remove unused var

Browse Source
dev
MITSUNARI Shigeo 8 years ago
parent 8c74a0b0f0
commit 2c20ce0e34
2 changed files with 34 additions and 36 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. 2
      src/fp_generator.hpp
  2. 68
      src/fp_proto.hpp

2
src/fp_generator.hpp
Unescape View File

@ -162,7 +162,6 @@ struct FpGenerator : Xbyak::CodeGenerator {
typedef int (*int2op)(uint64_t*, const uint64_t*); typedef int (*int2op)(uint64_t*, const uint64_t*);
void4u mul_; void4u mul_;
uint3opI mulUnit_; uint3opI mulUnit_;
void *montRedRaw_;
void2op shr1_; void2op shr1_;
FpGenerator() FpGenerator()
: CodeGenerator(4096 * 8) : CodeGenerator(4096 * 8)
@ -173,7 +172,6 @@ struct FpGenerator : Xbyak::CodeGenerator {
, isFullBit_(0) , isFullBit_(0)
, mul_(0) , mul_(0)
, mulUnit_(0) , mulUnit_(0)
, montRedRaw_(0)
, shr1_(0) , shr1_(0)
{ {
useMulx_ = cpu_.has(Xbyak::util::Cpu::tBMI2); useMulx_ = cpu_.has(Xbyak::util::Cpu::tBMI2);

68
src/fp_proto.hpp
Unescape View File

@ -228,34 +228,27 @@ template<size_t N, class Tag>
const void4u DblSub<N, Tag>::f = DblSub<N, Tag>::func; const void4u DblSub<N, Tag>::f = DblSub<N, Tag>::func;
/* /*
z[N] <- Montgomery(x[N], y[N], p[N]) z[N] <- montRed(xy[N * 2], p[N])
REMARK : assume p[-1] = rp REMARK : assume p[-1] = rp
*/ */
template<size_t N, class Tag = Gtag> template<size_t N, class Tag = Gtag>
struct Mont { struct MontRed {
static inline void func(Unit *z, const Unit *x, const Unit *y, const Unit *p) static inline void func(Unit *z, const Unit *xy, const Unit *p)
{ {
#if 0
Unit xy[N * 2];
MulPre<N, Tag>::f(xy, x, y);
fpDbl_modMontC(z, xy, p);
#else
const Unit rp = p[-1]; const Unit rp = p[-1];
Unit buf[N * 2 + 2]; Unit t[N * 2];
Unit buf[N * 2 + 1];
clearArray(t, N + 1, N * 2);
Unit *c = buf; Unit *c = buf;
Mul_UnitPre<N, Tag>::f(c, x, y[0]); // x * y[0] Unit q = xy[0] * rp;
Unit q = c[0] * rp; Mul_UnitPre<N, Tag>::f(t, p, q);
Unit t[N + 2]; buf[N * 2] = AddPre<N * 2, Tag>::f(buf, xy, t);
Mul_UnitPre<N, Tag>::f(t, p, q); // p * q
t[N + 1] = 0; // always zero
c[N + 1] = AddPre<N + 1, Tag>::f(c, c, t);
c++; c++;
for (size_t i = 1; i < N; i++) { for (size_t i = 1; i < N; i++) {
Mul_UnitPre<N, Tag>::f(t, x, y[i]);
c[N + 1] = AddPre<N + 1, Tag>::f(c, c, t);
q = c[0] * rp; q = c[0] * rp;
Mul_UnitPre<N, Tag>::f(t, p, q); Mul_UnitPre<N, Tag>::f(t, p, q);
AddPre<N + 2, Tag>::f(c, c, t); // QQQ
mpn_add_n((mp_limb_t*)c, (const mp_limb_t*)c, (const mp_limb_t*)t, N * 2 + 1 - i);
c++; c++;
} }
if (c[N]) { if (c[N]) {
@ -265,36 +258,42 @@ struct Mont {
memcpy(z, c, N * sizeof(Unit)); memcpy(z, c, N * sizeof(Unit));
} }
} }
#endif
} }
static const void4u f; static const void3u f;
}; };
template<size_t N, class Tag> template<size_t N, class Tag>
const void4u Mont<N, Tag>::f = Mont<N, Tag>::func; const void3u MontRed<N, Tag>::f = MontRed<N, Tag>::func;
/* /*
z[N] <- montRed(xy[N * 2], p[N]) z[N] <- Montgomery(x[N], y[N], p[N])
REMARK : assume p[-1] = rp REMARK : assume p[-1] = rp
*/ */
template<size_t N, class Tag = Gtag> template<size_t N, class Tag = Gtag>
struct MontRed { struct Mont {
static inline void func(Unit *z, const Unit *xy, const Unit *p) static inline void func(Unit *z, const Unit *x, const Unit *y, const Unit *p)
{ {
#if 0
Unit xy[N * 2];
MulPre<N, Tag>::f(xy, x, y);
MontRed<N, Tag>::f(z, xy, p);
#else
const Unit rp = p[-1]; const Unit rp = p[-1];
Unit t[N * 2]; Unit buf[N * 2 + 2];
Unit buf[N * 2 + 1];
clearArray(t, N + 1, N * 2);
Unit *c = buf; Unit *c = buf;
Unit q = xy[0] * rp; Mul_UnitPre<N, Tag>::f(c, x, y[0]); // x * y[0]
Mul_UnitPre<N, Tag>::f(t, p, q); Unit q = c[0] * rp;
buf[N * 2] = AddPre<N * 2, Tag>::f(buf, xy, t); Unit t[N + 2];
Mul_UnitPre<N, Tag>::f(t, p, q); // p * q
t[N + 1] = 0; // always zero
c[N + 1] = AddPre<N + 1, Tag>::f(c, c, t);
c++; c++;
for (size_t i = 1; i < N; i++) { for (size_t i = 1; i < N; i++) {
Mul_UnitPre<N, Tag>::f(t, x, y[i]);
c[N + 1] = AddPre<N + 1, Tag>::f(c, c, t);
q = c[0] * rp; q = c[0] * rp;
Mul_UnitPre<N, Tag>::f(t, p, q); Mul_UnitPre<N, Tag>::f(t, p, q);
// QQQ AddPre<N + 2, Tag>::f(c, c, t);
mpn_add_n((mp_limb_t*)c, (const mp_limb_t*)c, (const mp_limb_t*)t, N * 2 + 1 - i);
c++; c++;
} }
if (c[N]) { if (c[N]) {
@ -304,12 +303,13 @@ struct MontRed {
memcpy(z, c, N * sizeof(Unit)); memcpy(z, c, N * sizeof(Unit));
} }
} }
#endif
} }
static const void3u f; static const void4u f;
}; };
template<size_t N, class Tag> template<size_t N, class Tag>
const void3u MontRed<N, Tag>::f = MontRed<N, Tag>::func; const void4u Mont<N, Tag>::f = Mont<N, Tag>::func;
// z[N] <- Montgomery(x[N], x[N], p[N]) // z[N] <- Montgomery(x[N], x[N], p[N])
template<size_t N, class Tag = Gtag> template<size_t N, class Tag = Gtag>

Write Preview
Loading…
Cancel
Save