From 3224331ac09c6f7323ffc2c5ead78e2fed5e4f37 Mon Sep 17 00:00:00 2001 From: fcarreiro Date: Mon, 13 Jan 2025 19:01:10 +0000 Subject: [PATCH] fix(avm): mac build (retry) --- barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp | 2 +- .../cpp/src/barretenberg/vm2/simulation/lib/serialization.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp b/barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp index a0500e1de263..f856b740f0b1 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp +++ b/barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp @@ -53,7 +53,7 @@ void Execution::ret(ContextInterface& context, MemoryAddress ret_offset, MemoryA auto& memory = context.get_memory(); // TODO: check tags and types (only for size, the return data is converted to FF). - size_t size = static_cast(memory.get(ret_size_offset).value); + uint32_t size = static_cast(memory.get(ret_size_offset).value); auto [values, _] = memory.get_slice(ret_offset, size); context_stack.pop(); diff --git a/barretenberg/cpp/src/barretenberg/vm2/simulation/lib/serialization.cpp b/barretenberg/cpp/src/barretenberg/vm2/simulation/lib/serialization.cpp index 619f5db9ff8b..524c60a2c0a5 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/simulation/lib/serialization.cpp +++ b/barretenberg/cpp/src/barretenberg/vm2/simulation/lib/serialization.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include #include @@ -456,7 +455,7 @@ Instruction decode_instruction(std::span bytecode, size_t pos) std::string Instruction::to_string() const { std::ostringstream oss; - oss << opcode << " indirect: " << std::format("{:b}", indirect) << ", operands: [ "; + oss << opcode << " indirect: " << indirect << ", operands: [ "; for (const auto& operand : operands) { oss << operand.to_string() << " "; }