logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-02-13 10:23:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

in %stack, treat identifiers as 1-length blocks

Browse Source
This commit is contained in:
Nicholas Ward 2022-09-14 11:20:24 -07:00
parent 7eadfee580
commit 78a4b92e83
4 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
evm/src/cpu/kernel/ast.rs
View File

@ -38,10 +38,7 @@ pub(crate) enum Item {
/// The left hand side of a %stack stack-manipulation macro.
#[derive(Eq, PartialEq, Clone, Debug)]
pub(crate) enum StackPlaceholder {
Identifier(String),
Block(String, usize),
}
pub(crate) struct StackPlaceholder(pub String, pub usize);
/// The right hand side of a %stack stack-manipulation macro.
#[derive(Eq, PartialEq, Clone, Debug)]

4
evm/src/cpu/kernel/parser.rs
View File

@ -119,12 +119,12 @@ fn parse_stack_placeholder(target: Pair<Rule>) -> StackPlaceholder {
assert_eq!(target.as_rule(), Rule::stack_placeholder);
let inner = target.into_inner().next().unwrap();
match inner.as_rule() {
Rule::identifier => StackPlaceholder::Identifier(inner.as_str().into()),
Rule::identifier => StackPlaceholder(inner.as_str().into(), 1),
Rule::stack_block => {
let mut block = inner.into_inner();
let identifier = block.next().unwrap().as_str();
let length = block.next().unwrap().as_str().parse().unwrap();
StackPlaceholder::Block(identifier.to_string(), length)
StackPlaceholder(identifier.to_string(), length)
}
_ => panic!("Unexpected {:?}", inner.as_rule()),
}

39
evm/src/cpu/kernel/stack/stack_manipulation.rs
View File

@ -31,20 +31,14 @@ fn expand(names: Vec<StackPlaceholder>, replacements: Vec<StackReplacement>) ->
let mut src = names
.iter()
.cloned()
.flat_map(|item| match item {
StackPlaceholder::Identifier(name) => {
stack_blocks.insert(name.clone(), 1);
vec![StackItem::NamedItem(name)]
}
StackPlaceholder::Block(name, n) => {
stack_blocks.insert(name.clone(), n);
(0..n)
.map(|i| {
let literal_name = format!("@{}.{}", name, i);
StackItem::NamedItem(literal_name)
})
.collect_vec()
}
.flat_map(|StackPlaceholder(name, n)| {
stack_blocks.insert(name.clone(), n);
(0..n)
.map(|i| {
let literal_name = format!("@{}.{}", name, i);
StackItem::NamedItem(literal_name)
})
.collect_vec()
})
.collect_vec();
@ -56,17 +50,12 @@ fn expand(names: Vec<StackPlaceholder>, replacements: Vec<StackReplacement>) ->
// May be either a named item or a label. Named items have precedence.
if stack_blocks.contains_key(&name) {
let n = *stack_blocks.get(&name).unwrap();
if n == 1 {
// A name, not an actual block.
vec![StackItem::NamedItem(name)]
} else {
(0..n)
.map(|i| {
let literal_name = format!("@{}.{}", name, i);
StackItem::NamedItem(literal_name)
})
.collect_vec()
}
(0..n)
.map(|i| {
let literal_name = format!("@{}.{}", name, i);
StackItem::NamedItem(literal_name)
})
.collect_vec()
} else {
vec![StackItem::PushTarget(PushTarget::Label(name))]
}

4
evm/src/cpu/kernel/tests/sha2.rs
View File

@ -20,7 +20,7 @@ fn test_sha2() -> Result<()> {
let mut hasher = Sha256::new();
hasher.update(message.clone());
let expected = format!("{:02X}", hasher.finalize());
let expected = format!("{:X}", hasher.finalize());
let bytes: Vec<U256> = message.iter().map(|&x| U256::from(x as u32)).collect();
@ -32,7 +32,7 @@ fn test_sha2() -> Result<()> {
let after_sha2 = run(&kernel.code, sha2, initial_stack, &kernel.prover_inputs)?;
let stack_after_sha2 = after_sha2.stack();
let result = stack_after_sha2[1];
let actual = format!("{:02X}", result);
let actual = format!("{:X}", result);
assert_eq!(expected, actual);