Skip to content

fix(avm): mac build (retry) #11197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fcarreiro merged 1 commit into from
Jan 13, 2025
Merged

fix(avm): mac build (retry) #11197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<size_t>(memory.get(ret_size_offset).value);
uint32_t size = static_cast<uint32_t>(memory.get(ret_size_offset).value);
auto [values, _] = memory.get_slice(ret_offset, size);

context_stack.pop();
Expand Down
3 changes: 1 addition & 2 deletions barretenberg/cpp/src/barretenberg/vm2/simulation/lib/serialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include <cassert>
#include <cstdint>
#include <format>
#include <iomanip>
#include <span>
#include <sstream>
Expand Down Expand Up @@ -456,7 +455,7 @@ Instruction decode_instruction(std::span<const uint8_t> 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() << " ";
}
Expand Down
Loading