logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-05 15:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Nicholas Ward 2022-06-17 16:52:42 -07:00
parent 398e75de4e
commit 5707732b75
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
evm/src/all_stark.rs
View File

@ -206,7 +206,6 @@ mod tests {
cpu_stark.generate(&mut row);
cpu_trace_rows.push(row);
}
for i in 0..num_memory_ops {
let mem_timestamp: usize = memory_trace[memory::registers::TIMESTAMP].values[i]
.to_canonical_u64()

22
evm/src/memory/memory_stark.rs
View File

@ -90,7 +90,7 @@ pub fn sort_memory_ops<F: RichField>(
context: &[F],
segment: &[F],
virtuals: &[F],
values: &Vec<[F; 8]>,
values: &[[F; 8]],
) -> (Vec<F>, Vec<F>, Vec<F>, Vec<F>, Vec<F>, Vec<[F; 8]>) {
let mut ops: Vec<(F, F, F, F, F, [F; 8])> = izip!(
timestamp.iter().cloned(),
@ -115,9 +115,9 @@ pub fn sort_memory_ops<F: RichField>(
}
pub fn generate_first_change_flags<F: RichField>(
context: &Vec<F>,
segment: &Vec<F>,
virtuals: &Vec<F>,
context: &[F],
segment: &[F],
virtuals: &[F],
) -> (Vec<F>, Vec<F>, Vec<F>) {
let num_ops = context.len();
let mut context_first_change = Vec::new();
@ -157,13 +157,13 @@ pub fn generate_first_change_flags<F: RichField>(
}
pub fn generate_range_check_value<F: RichField>(
context: &Vec<F>,
segment: &Vec<F>,
virtuals: &Vec<F>,
timestamp: &Vec<F>,
context_first_change: &Vec<F>,
segment_first_change: &Vec<F>,
virtual_first_change: &Vec<F>,
context: &[F],
segment: &[F],
virtuals: &[F],
timestamp: &[F],
context_first_change: &[F],
segment_first_change: &[F],
virtual_first_change: &[F],
) -> Vec<F> {
let num_ops = context.len();
let mut range_check = Vec::new();

9
evm/src/memory/registers.rs
View File

@ -8,8 +8,8 @@ pub(crate) const IS_READ: usize = TIMESTAMP + 1;
pub(crate) const ADDR_CONTEXT: usize = IS_READ + 1;
pub(crate) const ADDR_SEGMENT: usize = ADDR_CONTEXT + 1;
pub(crate) const ADDR_VIRTUAL: usize = ADDR_SEGMENT + 1;
pub(crate) const VALUE_START: usize = ADDR_VIRTUAL + 1;
const VALUE_START: usize = ADDR_VIRTUAL + 1;
pub(crate) const fn value_limb(i: usize) -> usize {
debug_assert!(i < NUM_MEMORY_VALUE_LIMBS);
VALUE_START + i
@ -20,8 +20,8 @@ pub(crate) const SORTED_IS_READ: usize = SORTED_TIMESTAMP + 1;
pub(crate) const SORTED_ADDR_CONTEXT: usize = SORTED_IS_READ + 1;
pub(crate) const SORTED_ADDR_SEGMENT: usize = SORTED_ADDR_CONTEXT + 1;
pub(crate) const SORTED_ADDR_VIRTUAL: usize = SORTED_ADDR_SEGMENT + 1;
pub(crate) const SORTED_VALUE_START: usize = SORTED_ADDR_VIRTUAL + 1;
const SORTED_VALUE_START: usize = SORTED_ADDR_VIRTUAL + 1;
pub(crate) const fn sorted_value_limb(i: usize) -> usize {
debug_assert!(i < NUM_MEMORY_VALUE_LIMBS);
SORTED_VALUE_START + i
@ -36,9 +36,10 @@ pub(crate) const COUNTER: usize = RANGE_CHECK + 1;
pub(crate) const RANGE_CHECK_PERMUTED: usize = COUNTER + 1;
pub(crate) const COUNTER_PERMUTED: usize = RANGE_CHECK_PERMUTED + 1;
const IS_MEMOP_START: usize = COUNTER_PERMUTED + 1;
pub(crate) const fn is_memop(i: usize) -> usize {
debug_assert!(i < NUM_MEMORY_OPS);
COUNTER_PERMUTED + i
IS_MEMOP_START + i
}
pub(crate) const NUM_REGISTERS: usize = COUNTER_PERMUTED + NUM_MEMORY_OPS;
pub(crate) const NUM_REGISTERS: usize = IS_MEMOP_START + NUM_MEMORY_OPS;