logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-08 16:53:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Constrain MSTORE_32BYTES new offset limbs (#1415)

Browse Source
This commit is contained in:
Hamy Ratoanina 2023-12-13 18:35:17 -05:00 committed by GitHub
parent bc1a3c4851
commit 71dff6e982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
evm/src/cpu/byte_unpacking.rs
View File

@ -16,7 +16,7 @@ pub(crate) fn eval_packed<P: PackedField>(
// The MSTORE_32BYTES opcodes are differentiated from MLOAD_32BYTES // The MSTORE_32BYTES opcodes are differentiated from MLOAD_32BYTES
// by the 5th bit set to 0. // by the 5th bit set to 0.
let filter = lv.op.m_op_32bytes * (lv.opcode_bits[5] - P::ONES); let filter = lv.op.m_op_32bytes * (lv.opcode_bits[5] - P::ONES);
let new_offset = nv.mem_channels[0].value[0]; let new_offset = nv.mem_channels[0].value;
let virt = lv.mem_channels[2].value[0]; let virt = lv.mem_channels[2].value[0];
// Read len from opcode bits and constrain the pushed new offset. // Read len from opcode bits and constrain the pushed new offset.
let len_bits: P = lv.opcode_bits[..5] let len_bits: P = lv.opcode_bits[..5]
@ -25,7 +25,10 @@ pub(crate) fn eval_packed<P: PackedField>(
.map(|(i, &bit)| bit * P::Scalar::from_canonical_u64(1 << i)) .map(|(i, &bit)| bit * P::Scalar::from_canonical_u64(1 << i))
.sum(); .sum();
let len = len_bits + P::ONES; let len = len_bits + P::ONES;
yield_constr.constraint(filter * (new_offset - virt - len)); yield_constr.constraint(filter * (new_offset[0] - virt - len));
for &limb in &new_offset[1..] {
yield_constr.constraint(filter * limb);
}
} }
pub(crate) fn eval_ext_circuit<F: RichField + Extendable<D>, const D: usize>( pub(crate) fn eval_ext_circuit<F: RichField + Extendable<D>, const D: usize>(
@ -38,7 +41,7 @@ pub(crate) fn eval_ext_circuit<F: RichField + Extendable<D>, const D: usize>(
// by the 5th bit set to 0. // by the 5th bit set to 0.
let filter = let filter =
builder.mul_sub_extension(lv.op.m_op_32bytes, lv.opcode_bits[5], lv.op.m_op_32bytes); builder.mul_sub_extension(lv.op.m_op_32bytes, lv.opcode_bits[5], lv.op.m_op_32bytes);
let new_offset = nv.mem_channels[0].value[0]; let new_offset = nv.mem_channels[0].value;
let virt = lv.mem_channels[2].value[0]; let virt = lv.mem_channels[2].value[0];
// Read len from opcode bits and constrain the pushed new offset. // Read len from opcode bits and constrain the pushed new offset.
let len_bits = lv.opcode_bits[..5].iter().enumerate().fold( let len_bits = lv.opcode_bits[..5].iter().enumerate().fold(
@ -47,8 +50,12 @@ pub(crate) fn eval_ext_circuit<F: RichField + Extendable<D>, const D: usize>(
builder.mul_const_add_extension(F::from_canonical_u64(1 << i), bit, cumul) builder.mul_const_add_extension(F::from_canonical_u64(1 << i), bit, cumul)
}, },
); );
let diff = builder.sub_extension(new_offset, virt); let diff = builder.sub_extension(new_offset[0], virt);
let diff = builder.sub_extension(diff, len_bits); let diff = builder.sub_extension(diff, len_bits);
let constr = builder.mul_sub_extension(filter, diff, filter); let constr = builder.mul_sub_extension(filter, diff, filter);
yield_constr.constraint(builder, constr); yield_constr.constraint(builder, constr);
for &limb in &new_offset[1..] {
let constr = builder.mul_extension(filter, limb);
yield_constr.constraint(builder, constr);
}
} }