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

disable cast-function-type warning of g++-8

Browse Source
pull/1/head
MITSUNARI Shigeo 6 years ago
parent d8975a2ca3
commit eb31510777
4 changed files with 30 additions and 21 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. 10
      include/mcl/fp.hpp
  2. 30
      include/mcl/fp_tower.hpp
  3. 9
      include/mcl/op.hpp
  4. 2
      src/fp_generator.hpp

10
include/mcl/fp.hpp
Unescape View File

@ -132,15 +132,15 @@ public:
} }
inv(inv2_, 2); inv(inv2_, 2);
#ifdef MCL_XBYAK_DIRECT_CALL #ifdef MCL_XBYAK_DIRECT_CALL
add = (void (*)(FpT& z, const FpT& x, const FpT& y))op_.fp_addA_; add = fp::func_ptr_cast<void (*)(FpT& z, const FpT& x, const FpT& y)>(op_.fp_addA_);
if (add == 0) add = addC; if (add == 0) add = addC;
sub = (void (*)(FpT& z, const FpT& x, const FpT& y))op_.fp_subA_; sub = fp::func_ptr_cast<void (*)(FpT& z, const FpT& x, const FpT& y)>(op_.fp_subA_);
if (sub == 0) sub = subC; if (sub == 0) sub = subC;
neg = (void (*)(FpT& y, const FpT& x))op_.fp_negA_; neg = fp::func_ptr_cast<void (*)(FpT& y, const FpT& x)>(op_.fp_negA_);
if (neg == 0) neg = negC; if (neg == 0) neg = negC;
mul = (void (*)(FpT& z, const FpT& x, const FpT& y))op_.fp_mulA_; mul = fp::func_ptr_cast<void (*)(FpT& z, const FpT& x, const FpT& y)>(op_.fp_mulA_);
if (mul == 0) mul = mulC; if (mul == 0) mul = mulC;
sqr = (void (*)(FpT& y, const FpT& x))op_.fp_sqrA_; sqr = fp::func_ptr_cast<void (*)(FpT& y, const FpT& x)>(op_.fp_sqrA_);
if (sqr == 0) sqr = sqrC; if (sqr == 0) sqr = sqrC;
#endif #endif
*pb = true; *pb = true;

30
include/mcl/fp_tower.hpp
Unescape View File

@ -151,24 +151,24 @@ public:
{ {
const mcl::fp::Op& op = Fp::getOp(); const mcl::fp::Op& op = Fp::getOp();
#ifdef MCL_XBYAK_DIRECT_CALL #ifdef MCL_XBYAK_DIRECT_CALL
add = (void (*)(FpDblT&, const FpDblT&, const FpDblT&))op.fpDbl_addA_; add = fp::func_ptr_cast<void (*)(FpDblT&, const FpDblT&, const FpDblT&)>(op.fpDbl_addA_);
if (add == 0) add = addC; if (add == 0) add = addC;
sub = (void (*)(FpDblT&, const FpDblT&, const FpDblT&))op.fpDbl_subA_; sub = fp::func_ptr_cast<void (*)(FpDblT&, const FpDblT&, const FpDblT&)>(op.fpDbl_subA_);
if (sub == 0) sub = subC; if (sub == 0) sub = subC;
mod = (void (*)(Fp&, const FpDblT&))op.fpDbl_modA_; mod = fp::func_ptr_cast<void (*)(Fp&, const FpDblT&)>(op.fpDbl_modA_);
if (mod == 0) mod = modC; if (mod == 0) mod = modC;
addPre = (void (*)(FpDblT&, const FpDblT&, const FpDblT&))op.fpDbl_addPre; addPre = fp::func_ptr_cast<void (*)(FpDblT&, const FpDblT&, const FpDblT&)>(op.fpDbl_addPre);
if (addPre == 0) addPre = addPreC; if (addPre == 0) addPre = addPreC;
subPre = (void (*)(FpDblT&, const FpDblT&, const FpDblT&))op.fpDbl_subPre; subPre = fp::func_ptr_cast<void (*)(FpDblT&, const FpDblT&, const FpDblT&)>(op.fpDbl_subPre);
if (subPre == 0) subPre = subPreC; if (subPre == 0) subPre = subPreC;
#endif #endif
if (op.fpDbl_mulPreA_) { if (op.fpDbl_mulPreA_) {
mulPre = (void (*)(FpDblT&, const Fp&, const Fp&))op.fpDbl_mulPreA_; mulPre = fp::func_ptr_cast<void (*)(FpDblT&, const Fp&, const Fp&)>(op.fpDbl_mulPreA_);
} else { } else {
mulPre = mulPreC; mulPre = mulPreC;
} }
if (op.fpDbl_sqrPreA_) { if (op.fpDbl_sqrPreA_) {
sqrPre = (void (*)(FpDblT&, const Fp&))op.fpDbl_sqrPreA_; sqrPre = fp::func_ptr_cast<void (*)(FpDblT&, const Fp&)>(op.fpDbl_sqrPreA_);
} else { } else {
sqrPre = sqrPreC; sqrPre = sqrPreC;
} }
@ -387,19 +387,19 @@ public:
mcl::fp::Op& op = Fp::op_; mcl::fp::Op& op = Fp::op_;
assert(op.xi_a); assert(op.xi_a);
#ifdef MCL_XBYAK_DIRECT_CALL #ifdef MCL_XBYAK_DIRECT_CALL
add = (void (*)(Fp2T& z, const Fp2T& x, const Fp2T& y))op.fp2_addA_; add = fp::func_ptr_cast<void (*)(Fp2T& z, const Fp2T& x, const Fp2T& y)>(op.fp2_addA_);
if (add == 0) add = addC; if (add == 0) add = addC;
sub = (void (*)(Fp2T& z, const Fp2T& x, const Fp2T& y))op.fp2_subA_; sub = fp::func_ptr_cast<void (*)(Fp2T& z, const Fp2T& x, const Fp2T& y)>(op.fp2_subA_);
if (sub == 0) sub = subC; if (sub == 0) sub = subC;
neg = (void (*)(Fp2T& y, const Fp2T& x))op.fp2_negA_; neg = fp::func_ptr_cast<void (*)(Fp2T& y, const Fp2T& x)>(op.fp2_negA_);
if (neg == 0) neg = negC; if (neg == 0) neg = negC;
mul = (void (*)(Fp2T& z, const Fp2T& x, const Fp2T& y))op.fp2_mulA_; mul = fp::func_ptr_cast<void (*)(Fp2T& z, const Fp2T& x, const Fp2T& y)>(op.fp2_mulA_);
if (mul == 0) mul = mulC; if (mul == 0) mul = mulC;
sqr = (void (*)(Fp2T& y, const Fp2T& x))op.fp2_sqrA_; sqr = fp::func_ptr_cast<void (*)(Fp2T& y, const Fp2T& x)>(op.fp2_sqrA_);
if (sqr == 0) sqr = sqrC; if (sqr == 0) sqr = sqrC;
mul_xi = fp::func_ptr_cast<void (*)(Fp2T&, const Fp2T&)>(op.fp2_mul_xiA_);
#endif #endif
op.fp2_inv = fp2_invW; op.fp2_inv = fp2_invW;
mul_xi = (void (*)(Fp2T&, const Fp2T&))op.fp2_mul_xiA_;
if (mul_xi == 0) { if (mul_xi == 0) {
if (op.xi_a == 1) { if (op.xi_a == 1) {
mul_xi = fp2_mul_xi_1_1iC; mul_xi = fp2_mul_xi_1_1iC;
@ -688,7 +688,7 @@ struct Fp2DblT {
{ {
const mcl::fp::Op& op = Fp::getOp(); const mcl::fp::Op& op = Fp::getOp();
if (op.fp2Dbl_mulPreA_) { if (op.fp2Dbl_mulPreA_) {
mulPre = (void (*)(Fp2DblT&, const Fp2&, const Fp2&))op.fp2Dbl_mulPreA_; mulPre = fp::func_ptr_cast<void (*)(Fp2DblT&, const Fp2&, const Fp2&)>(op.fp2Dbl_mulPreA_);
} else { } else {
if (op.isFullBit) { if (op.isFullBit) {
mulPre = fp2Dbl_mulPreW<true>; mulPre = fp2Dbl_mulPreW<true>;
@ -697,7 +697,7 @@ struct Fp2DblT {
} }
} }
if (op.fp2Dbl_sqrPreA_) { if (op.fp2Dbl_sqrPreA_) {
sqrPre = (void (*)(Fp2DblT&, const Fp2&))op.fp2Dbl_sqrPreA_; sqrPre = fp::func_ptr_cast<void (*)(Fp2DblT&, const Fp2&)>(op.fp2Dbl_sqrPreA_);
} else { } else {
if (op.isFullBit) { if (op.isFullBit) {
sqrPre = fp2Dbl_sqrPreW<true>; sqrPre = fp2Dbl_sqrPreW<true>;

9
include/mcl/op.hpp
Unescape View File

@ -127,6 +127,15 @@ typedef int (*int2u)(Unit*, const Unit*);
typedef Unit (*u1uII)(Unit*, Unit, Unit); typedef Unit (*u1uII)(Unit*, Unit, Unit);
typedef Unit (*u3u)(Unit*, const Unit*, const Unit*); typedef Unit (*u3u)(Unit*, const Unit*, const Unit*);
/*
disable -Wcast-function-type
the number of arguments of some JIT functions is smaller than that of T
*/
template<class T, class S>
T func_ptr_cast(S func)
{
return reinterpret_cast<T>(reinterpret_cast<void*>(func));
}
struct Block { struct Block {
const Unit *p; // pointer to original FpT.v_ const Unit *p; // pointer to original FpT.v_
size_t n; size_t n;

2
src/fp_generator.hpp
Unescape View File

@ -376,7 +376,7 @@ private:
op.fp_mulA_ = gen_mul(); op.fp_mulA_ = gen_mul();
prof_.set("Fp_mul", getCurr()); prof_.set("Fp_mul", getCurr());
if (op.fp_mulA_) { if (op.fp_mulA_) {
op.fp_mul = reinterpret_cast<void4u>(op.fp_mulA_); // used in toMont/fromMont op.fp_mul = fp::func_ptr_cast<void4u>(op.fp_mulA_); // used in toMont/fromMont
} }
op.fp_sqrA_ = gen_sqr(); op.fp_sqrA_ = gen_sqr();
prof_.set("Fp_sqr", getCurr()); prof_.set("Fp_sqr", getCurr());

Write Preview
Loading…
Cancel
Save