refactor(avm): avm memory trace building

barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/AvmMini_helper.hpp → barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_common.hpp

@@ -1,17 +1,17 @@
 #pragma once
 
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include "barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp"
-
-#include "barretenberg/flavor/generated/AvmMini_flavor.hpp"
 #include "barretenberg/proof_system/circuit_builder/generated/AvmMini_circuit_builder.hpp"
 
-namespace proof_system {
-
 using Flavor = proof_system::honk::flavor::AvmMiniFlavor;
 using FF = Flavor::FF;
 using Row = proof_system::AvmMiniFullRow<barretenberg::fr>;
 
-void log_avmMini_trace(std::vector<Row> const& trace, size_t beg, size_t end);
+namespace avm_trace {
+
+// Number of rows
+static const size_t AVM_TRACE_SIZE = 256;
+enum class IntermRegister : uint32_t { ia = 0, ib = 1, ic = 2 };
+enum class AvmMemoryTag : uint32_t { u0 = 0, u8 = 1, u16 = 2, u32 = 3, u64 = 4, u128 = 5, ff = 6 };
 
-} // namespace proof_system
+} // namespace avm_trace

barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/AvmMini_helper.cpp → barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_helper.cpp

@@ -1,11 +1,6 @@
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp"
+#include "AvmMini_helper.hpp"
 
-#include "./AvmMini_helper.hpp"
-#include "barretenberg/flavor/generated/AvmMini_flavor.hpp"
-#include "barretenberg/relations/generated/AvmMini/avm_mini.hpp"
-
-namespace proof_system {
+namespace avm_trace {
 
 /**
  * @brief Routine to log some slice of a trace of the AVM. Used to debug or in some unit tests.
@@ -70,4 +65,4 @@ void log_avmMini_trace(std::vector<Row> const& trace, size_t beg, size_t end)
     }
 }
 
-} // namespace proof_system
+} // namespace avm_trace

barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_helper.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "AvmMini_common.hpp"
+
+namespace avm_trace {
+
+void log_avmMini_trace(std::vector<Row> const& trace, size_t beg, size_t end);
+
+} // namespace avm_trace