diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2018-07-30 18:41:34 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2018-07-30 18:41:34 +0800 |
| commit | 67a1f0cfafbe1ab3b0ebe1ee770429cf03cb306d (patch) | |
| tree | 41d2a747904691ed111a41ef2afbf6cd87004e73 | |
| parent | e29218ac58705621a56680edc300fec9969a71ac (diff) | |
| download | dexon-mcl-67a1f0cfafbe1ab3b0ebe1ee770429cf03cb306d.tar.gz dexon-mcl-67a1f0cfafbe1ab3b0ebe1ee770429cf03cb306d.tar.zst dexon-mcl-67a1f0cfafbe1ab3b0ebe1ee770429cf03cb306d.zip | |
fix test
| -rw-r--r-- | src/fp_generator.hpp | 16 | ||||
| -rw-r--r-- | test/fp_generator_test.cpp | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/fp_generator.hpp b/src/fp_generator.hpp index 250b08e..8750d54 100644 --- a/src/fp_generator.hpp +++ b/src/fp_generator.hpp @@ -2903,24 +2903,24 @@ private: struct FpGenerator { static const size_t codeSize = 4096 * 8; static const size_t pageSize = 4096; - uint8_t *mem_; - Code code_; + uint8_t *mem; + Code code; FpGenerator() - : mem_((uint8_t*)cybozu::AlignedMalloc(codeSize, pageSize)) - , code_(mem_, codeSize) + : mem((uint8_t*)cybozu::AlignedMalloc(codeSize, pageSize)) + , code(mem, codeSize) { } void init(Op& op) { - code_.init(op); - if (!Xbyak::CodeArray::protect(mem_, codeSize, Xbyak::CodeArray::PROTECT_RE)) { + code.init(op); + if (!Xbyak::CodeArray::protect(mem, codeSize, Xbyak::CodeArray::PROTECT_RE)) { throw cybozu::Exception("err protect read/exec"); } } ~FpGenerator() { - Xbyak::CodeArray::protect(mem_, codeSize, Xbyak::CodeArray::PROTECT_RW); - cybozu::AlignedFree(mem_); + Xbyak::CodeArray::protect(mem, codeSize, Xbyak::CodeArray::PROTECT_RW); + cybozu::AlignedFree(mem); } }; diff --git a/test/fp_generator_test.cpp b/test/fp_generator_test.cpp index 6edee91..384e78b 100644 --- a/test/fp_generator_test.cpp +++ b/test/fp_generator_test.cpp @@ -152,7 +152,7 @@ void testMulI(const mcl::fp::FpGenerator& fg, int pn) mpz_class my; mcl::gmp::set(my, y); mx *= my; - uint64_t d = fg.mulUnit_(z, x, y); + uint64_t d = fg.code.mulUnit_(z, x, y); z[pn] = d; mcl::gmp::setArray(my, z, pn + 1); CYBOZU_TEST_EQUAL(mx, my); @@ -162,7 +162,7 @@ void testMulI(const mcl::fp::FpGenerator& fg, int pn) uint64_t z[MAX_N + 1]; rg.read(x, pn); uint64_t y = rg.get64(); - CYBOZU_BENCH_C("mulUnit", 10000000, fg.mulUnit_, z, x, y); + CYBOZU_BENCH_C("mulUnit", 10000000, fg.code.mulUnit_, z, x, y); } } |