From 474aae2a3e2d30016b2a9253b652dc82e66f3e3d Mon Sep 17 00:00:00 2001 From: jeanmon Date: Thu, 20 Jun 2024 17:38:20 +0000 Subject: [PATCH] 7080: fixes after rebase to master --- .../src/barretenberg/relations/generated/avm/mem.hpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/mem.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/mem.hpp index 12425cc0c5b..6e4c4fdd982 100644 --- a/barretenberg/cpp/src/barretenberg/relations/generated/avm/mem.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/mem.hpp @@ -365,8 +365,9 @@ template class memImpl { { Avm_DECLARE_VIEWS(27); - auto tmp = (((-mem_skip_check_tag + FF(1)) * (-mem_rw + FF(1))) * - (((mem_r_in_tag - mem_tag) * (-mem_one_min_inv + FF(1))) - mem_tag_err)); + auto tmp = ((((mem_tag * (-mem_skip_check_tag + FF(1))) * (-mem_rw + FF(1))) * + (((mem_r_in_tag - mem_tag) * (-mem_one_min_inv + FF(1))) - mem_tag_err)) - + FF(0)); tmp *= scaling_factor; std::get<27>(evals) += tmp; } @@ -374,11 +375,7 @@ template class memImpl { { Avm_DECLARE_VIEWS(28); -<<<<<<< HEAD - auto tmp = (((-mem_tag_err + FF(1)) * mem_one_min_inv) - FF(0)); -======= - auto tmp = ((mem_tag * (-mem_tag_err + FF(1))) * mem_one_min_inv); ->>>>>>> ed5b34d52f (7080: repair unit tests related to unitialized indirect memory in a MOV) + auto tmp = (((mem_tag * (-mem_tag_err + FF(1))) * mem_one_min_inv) - FF(0)); tmp *= scaling_factor; std::get<28>(evals) += tmp; }