precompiles: Split "evmone" and "gmp" modexp implementations

Author: chfast

test/precompiles_bench/precompiles_bench.cpp

@@ -310,7 +310,7 @@ void modexp(benchmark::State& state)
         ->Args({128 * 8, 8, 2048})                \
         ->Args({128 * 8, 4096, 2048})             \
         ->Args({128 * 8, 8190, 2048})
-BENCHMARK(modexp<expmod_execute>) MODEXP_ARGS;
+BENCHMARK(modexp<expmod_execute_evmone>) MODEXP_ARGS;
 #ifdef EVMONE_PRECOMPILES_GMP
 BENCHMARK(modexp<expmod_execute_gmp>) MODEXP_ARGS;
 #endif
@@ -334,7 +334,7 @@ BENCHMARK_TEMPLATE(precompile, PrecompileId::ecrecover, silkpre_libsecp256k1);
 
 namespace bench_expmod
 {
-constexpr auto evmone = expmod_execute;
+constexpr auto evmone = expmod_execute_evmone;
 BENCHMARK(precompile<PrecompileId::expmod, evmone>);
 #ifdef EVMONE_PRECOMPILES_GMP
 constexpr auto gmp = expmod_execute_gmp;

test/state/precompiles.cpp

@@ -451,18 +451,14 @@ expmod_parse_input(
     return {base, exp, mod};
 }
 
-ExecutionResult expmod_execute(
+ExecutionResult expmod_execute_evmone(
     const uint8_t* input, size_t input_size, uint8_t* output, size_t output_size) noexcept
 {
     const auto [base, exp, mod] = expmod_parse_input(input, input_size, output, output_size);
     if (mod.empty())
         return {EVMC_SUCCESS, output_size};
 
-#ifdef EVMONE_PRECOMPILES_GMP
-    expmod_gmp(base, exp, mod, output);
-#else
     crypto::modexp(base, exp, mod, output);
-#endif
     return {EVMC_SUCCESS, output_size};
 }
 
@@ -475,10 +471,20 @@ ExecutionResult expmod_execute_gmp(
         return {EVMC_SUCCESS, output_size};
 
     expmod_gmp(base, exp, mod, output);
-    return {EVMC_SUCCESS, mod.size()};
+    return {EVMC_SUCCESS, output_size};
 }
 #endif
 
+ExecutionResult expmod_execute(
+    const uint8_t* input, size_t input_size, uint8_t* output, size_t output_size) noexcept
+{
+#ifdef EVMONE_PRECOMPILES_GMP
+    return expmod_execute_gmp(input, input_size, output, output_size);
+#else
+    return expmod_execute_evmone(input, input_size, output, output_size);
+#endif
+}
+
 ExecutionResult ecadd_execute(const uint8_t* input, size_t input_size, uint8_t* output,
     [[maybe_unused]] size_t output_size) noexcept
 {

test/state/precompiles_internal.hpp

@@ -50,6 +50,8 @@ ExecutionResult identity_execute(
     const uint8_t* input, size_t input_size, uint8_t* output, size_t output_size) noexcept;
 ExecutionResult expmod_execute(
     const uint8_t* input, size_t input_size, uint8_t* output, size_t output_size) noexcept;
+ExecutionResult expmod_execute_evmone(
+    const uint8_t* input, size_t input_size, uint8_t* output, size_t output_size) noexcept;
 ExecutionResult ecadd_execute(
     const uint8_t* input, size_t input_size, uint8_t* output, size_t output_size) noexcept;
 ExecutionResult ecmul_execute(