Move fnv1() to ethash.cpp

chfast · Nov 9, 2021 · f9c5fba · f9c5fba
1 parent 10f0c63
commit f9c5fba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 34 deletions.
diff --git a/lib/ethash/CMakeLists.txt b/lib/ethash/CMakeLists.txt
@@ -11,7 +11,6 @@ set_target_properties(ethash PROPERTIES C_EXTENSIONS OFF CXX_EXTENSIONS OFF)
 target_link_libraries(ethash PRIVATE ethash::keccak)
 target_include_directories(ethash PUBLIC $<BUILD_INTERFACE:${include_dir}>$<INSTALL_INTERFACE:include>)
 target_sources(ethash PRIVATE
-    bit_manipulation.h
     builtins.h
     endianness.hpp
     ${include_dir}/ethash/ethash.h

diff --git a/lib/ethash/bit_manipulation.h b/lib/ethash/bit_manipulation.h
diff --git a/lib/ethash/ethash.cpp b/lib/ethash/ethash.cpp
@@ -4,7 +4,6 @@
 
 #include "ethash-internal.hpp"
 
-#include "bit_manipulation.h"
 #include "primes.h"
 #include <ethash/keccak.hpp>
 #include <cstdlib>
@@ -29,7 +28,15 @@ static_assert(full_dataset_item_size == ETHASH_FULL_DATASET_ITEM_SIZE, "");
 
 namespace
 {
-using ::fnv1;
+/// The core transformation of the FNV-1 hash function.
+/// https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#FNV-1_hash.
+NO_SANITIZE("unsigned-integer-overflow")
+inline uint32_t fnv1(uint32_t u, uint32_t v) noexcept
+{
+    static const uint32_t fnv_prime = 0x01000193;
+    return (u * fnv_prime) ^ v;
+}
+
 
 inline hash512 fnv1(const hash512& u, const hash512& v) noexcept
 {