From be82c40703d267184ee07bf7be71002122c86656 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Mon, 7 Oct 2019 19:24:57 +0000 Subject: Support median block size > 4 GB add a 128/64 division routine so we can use a > 32 bit median block size in calculations --- src/cryptonote_basic/cryptonote_basic_impl.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/cryptonote_basic/cryptonote_basic_impl.cpp') diff --git a/src/cryptonote_basic/cryptonote_basic_impl.cpp b/src/cryptonote_basic/cryptonote_basic_impl.cpp index d8de65b81..9bafcfc86 100644 --- a/src/cryptonote_basic/cryptonote_basic_impl.cpp +++ b/src/cryptonote_basic/cryptonote_basic_impl.cpp @@ -110,9 +110,6 @@ namespace cryptonote { return false; } - assert(median_weight < std::numeric_limits::max()); - assert(current_block_weight < std::numeric_limits::max()); - uint64_t product_hi; // BUGFIX: 32-bit saturation bug (e.g. ARM7), the result was being // treated as 32-bit by default. @@ -122,8 +119,8 @@ namespace cryptonote { uint64_t reward_hi; uint64_t reward_lo; - div128_32(product_hi, product_lo, static_cast(median_weight), &reward_hi, &reward_lo); - div128_32(reward_hi, reward_lo, static_cast(median_weight), &reward_hi, &reward_lo); + div128_64(product_hi, product_lo, median_weight, &reward_hi, &reward_lo, NULL, NULL); + div128_64(reward_hi, reward_lo, median_weight, &reward_hi, &reward_lo, NULL, NULL); assert(0 == reward_hi); assert(reward_lo < base_reward); -- cgit v1.2.3