From 5804e6d3fca4a7e0761a441596041bf05eb68878 Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 19 May 2023 16:13:40 -0400 Subject: [PATCH] fix: bbmalloc linker error (https://github.com/AztecProtocol/barretenberg/pull/459) --- .../barretenberg/cpp/src/barretenberg/env/crs.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/crs.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/env/crs.cpp index 80561d1c091..1c8b12d68a1 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/crs.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/env/crs.cpp @@ -7,13 +7,13 @@ const int NUM_POINTS_IN_TRANSCRIPT = 5040001; - extern "C" { /** * @brief In WASM, loads the verifier reference string. * Used in native code to quickly create an in-memory reference string. */ -uint8_t* env_load_verifier_crs() { +uint8_t* env_load_verifier_crs() +{ std::ifstream transcript; transcript.open("../srs_db/ignition/monomial/transcript00.dat", std::ifstream::binary); // We need two g2 points, each 64 bytes. @@ -22,7 +22,7 @@ uint8_t* env_load_verifier_crs() { transcript.seekg(28 + NUM_POINTS_IN_TRANSCRIPT * 64); transcript.read((char*)g2_points.data(), (std::streamsize)g2_points_size); transcript.close(); - auto* g2_points_copy = (uint8_t*)bbmalloc(g2_points_size); + auto* g2_points_copy = (uint8_t*)aligned_alloc(64, g2_points_size); memcpy(g2_points_copy, g2_points.data(), g2_points_size); return g2_points_copy; } @@ -33,20 +33,20 @@ uint8_t* env_load_verifier_crs() { * In native code, not intended to be used. * @param num_points The number of points to load. */ -uint8_t* env_load_prover_crs(size_t num_points) { +uint8_t* env_load_prover_crs(size_t num_points) +{ // Note: This implementation is only meant to be instructive. // This should only be used in c-binds to implement the C++ abstractions. std::ifstream transcript; transcript.open("../srs_db/ignition/monomial/transcript00.dat", std::ifstream::binary); // Each g1 point is 64 bytes. - size_t g1_points_size = (num_points) * 64; + size_t g1_points_size = (num_points)*64; std::vector g1_points(g1_points_size); transcript.seekg(28); transcript.read((char*)g1_points.data(), (std::streamsize)g1_points_size); transcript.close(); - auto* g1_points_copy = (uint8_t*)bbmalloc(g1_points_size); + auto* g1_points_copy = (uint8_t*)aligned_alloc(64, g1_points_size); memcpy(g1_points_copy, g1_points.data(), g1_points_size); return g1_points_copy; } - } \ No newline at end of file