9131: Addressing review feedback

AztecProtocol · Nov 19, 2024 · 79b2573 · 79b2573
1 parent 66d0f63
commit 79b2573
Show file tree

Hide file tree

Showing 8 changed files with 160 additions and 146 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/addressing_mode.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/addressing_mode.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "barretenberg/vm/avm/trace/common.hpp"
+#include "barretenberg/vm/avm/trace/errors.hpp"
 #include "barretenberg/vm/avm/trace/mem_trace.hpp"
 #include <cstdint>
 

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/common.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/common.hpp
@@ -49,18 +49,6 @@ enum class AvmMemoryTag : uint32_t {
 
 static const uint32_t MAX_MEM_TAG = MEM_TAG_U128;
 
-enum class AvmError : uint32_t {
-    NO_ERROR,
-    TAG_ERROR,
-    ADDR_RES_TAG_ERROR,
-    REL_ADDR_OUT_OF_RANGE,
-    DIV_ZERO,
-    PARSING_ERROR,
-    ENV_VAR_UNKNOWN,
-    CONTRACT_INST_MEM_UNKNOWN,
-    RADIX_OUT_OF_BOUNDS,
-};
-
 static const size_t NUM_MEM_SPACES = 256;
 static const uint8_t INTERNAL_CALL_SPACE_ID = 255;
 static const uint32_t MAX_SIZE_INTERNAL_STACK = 1 << 16;

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/errors.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/errors.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <cstdint>
+
+namespace bb::avm_trace {
+
+enum class AvmError : uint32_t {
+    NO_ERROR,
+    TAG_ERROR,
+    ADDR_RES_TAG_ERROR,
+    REL_ADDR_OUT_OF_RANGE,
+    DIV_ZERO,
+    PARSING_ERROR,
+    ENV_VAR_UNKNOWN,
+    CONTRACT_INST_MEM_UNKNOWN,
+    RADIX_OUT_OF_BOUNDS,
+};
+
+} // namespace bb::avm_trace
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/helper.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/helper.cpp
@@ -124,7 +124,7 @@ std::string to_name(AvmError error)
     }
 }
 
-bool is_valid(AvmError error)
+bool is_ok(AvmError error)
 {
     return error == AvmError::NO_ERROR;
 }

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/helper.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/helper.hpp
@@ -233,7 +233,7 @@ std::string to_hex(bb::avm_trace::AvmMemoryTag tag);
 std::string to_name(bb::avm_trace::AvmMemoryTag tag);
 
 std::string to_name(AvmError error);
-bool is_valid(AvmError error);
+bool is_ok(AvmError error);
 
 // Mutate the inputs
 void inject_end_gas_values(VmPublicInputs& public_inputs, std::vector<Row>& trace);

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp
diff --git a/yarn-project/simulator/src/avm/avm_memory_types.ts b/yarn-project/simulator/src/avm/avm_memory_types.ts
@@ -241,6 +241,10 @@ export class TaggedMemory implements TaggedMemoryInterface {
     this._mem = [];
   }
 
+  public getMaxMemorySize(): number {
+    return TaggedMemory.MAX_MEMORY_SIZE;
+  }
+
   /** Returns a MeteredTaggedMemory instance to track the number of reads and writes if TRACK_MEMORY_ACCESSES is set. */
   public track(type: string = 'instruction'): TaggedMemoryInterface {
     return TaggedMemory.TRACK_MEMORY_ACCESSES ? new MeteredTaggedMemory(this, type) : this;
@@ -475,6 +479,10 @@ export class MeteredTaggedMemory implements TaggedMemoryInterface {
     }
   }
 
+  public getMaxMemorySize(): number {
+    return this.wrapped.getMaxMemorySize();
+  }
+
   public track(type: string = 'instruction'): MeteredTaggedMemory {
     return new MeteredTaggedMemory(this.wrapped, type);
   }

diff --git a/yarn-project/simulator/src/avm/opcodes/addressing_mode.ts b/yarn-project/simulator/src/avm/opcodes/addressing_mode.ts
@@ -1,5 +1,4 @@
 import { strict as assert } from 'assert';
-import { maxUint32 } from 'viem';
 
 import { type TaggedMemoryInterface } from '../avm_memory_types.js';
 import { AddressOutOfRangeError } from '../errors.js';
@@ -67,7 +66,7 @@ export class Addressing {
         mem.checkIsValidMemoryOffsetTag(0);
         const baseAddr = Number(mem.get(0).toBigInt());
         resolved[i] += baseAddr;
-        if (resolved[i] > maxUint32) {
+        if (resolved[i] >= mem.getMaxMemorySize()) {
           throw new AddressOutOfRangeError(baseAddr, offset);
         }
       }