Skip to content

Commit

Permalink
add segment arena to ordered builtins list
Browse files Browse the repository at this point in the history
  • Loading branch information
juanbono committed Apr 17, 2024
1 parent da0d9d0 commit 809970e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
11 changes: 10 additions & 1 deletion cairo1-run/src/cairo_run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ use cairo_vm::{
runners::{
builtin_runner::{
BITWISE_BUILTIN_NAME, EC_OP_BUILTIN_NAME, HASH_BUILTIN_NAME, OUTPUT_BUILTIN_NAME,
POSEIDON_BUILTIN_NAME, RANGE_CHECK_BUILTIN_NAME, SIGNATURE_BUILTIN_NAME,
POSEIDON_BUILTIN_NAME, RANGE_CHECK_BUILTIN_NAME, SEGMENT_ARENA_BUILTIN_NAME,
SIGNATURE_BUILTIN_NAME,
},
cairo_runner::{CairoRunner, RunResources, RunnerMode},
},
Expand Down Expand Up @@ -400,6 +401,8 @@ fn create_entry_code(
} else if generic_ty == &GasBuiltinType::ID {
casm_extend!(ctx, [ap + 0] = initial_gas, ap++;);
ap_offset += 1;
} else if generic_ty == &SegmentArenaType::ID {
continue;
} else {
let ty_size = type_sizes[ty];
let param_ap_offset_end = ap_offset + ty_size;
Expand Down Expand Up @@ -596,6 +599,11 @@ fn get_function_builtins(
let mut builtin_offset: HashMap<cairo_lang_sierra::ids::GenericTypeId, i16> = HashMap::new();
let mut current_offset = 3;
for (debug_name, builtin_name, sierra_id) in [
(
"SegmentArena",
BuiltinName::segment_arena,
SegmentArenaType::ID,
),
("Poseidon", BuiltinName::poseidon, PoseidonType::ID),
("EcOp", BuiltinName::ec_op, EcOpType::ID),
("Bitwise", BuiltinName::bitwise, BitwiseType::ID),
Expand Down Expand Up @@ -705,6 +713,7 @@ fn finalize_builtins(
"EcOp" => EC_OP_BUILTIN_NAME,
"Bitwise" => BITWISE_BUILTIN_NAME,
"Pedersen" => HASH_BUILTIN_NAME,
"SegmentArena" => SEGMENT_ARENA_BUILTIN_NAME,
"Output" => OUTPUT_BUILTIN_NAME,
"Ecdsa" => SIGNATURE_BUILTIN_NAME,
_ => {
Expand Down
1 change: 1 addition & 0 deletions vm/src/vm/runners/cairo_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ impl CairoRunner {
BuiltinName::ec_op,
BuiltinName::keccak,
BuiltinName::poseidon,
BuiltinName::segment_arena,
BuiltinName::range_check96,
BuiltinName::add_mod,
BuiltinName::mul_mod,
Expand Down

0 comments on commit 809970e

Please sign in to comment.