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

Support macro overloading

Browse Source
This commit is contained in:
Daniel Lubarov 2022-09-22 20:22:43 -07:00
parent c27e40e7bb
commit dbb0503d3e
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
evm/src/cpu/kernel/assembler.rs
View File

@ -52,6 +52,12 @@ impl Kernel {
} }
} }
#[derive(Eq, PartialEq, Hash, Clone, Debug)]
struct MacroSignature {
name: String,
num_params: usize,
}
struct Macro { struct Macro {
params: Vec<String>, params: Vec<String>,
items: Vec<Item>, items: Vec<Item>,
@ -105,17 +111,21 @@ pub(crate) fn assemble(
Kernel::new(code, global_labels, prover_inputs) Kernel::new(code, global_labels, prover_inputs)
} }
fn find_macros(files: &[File]) -> HashMap<String, Macro> { fn find_macros(files: &[File]) -> HashMap<MacroSignature, Macro> {
let mut macros = HashMap::new(); let mut macros = HashMap::new();
for file in files { for file in files {
for item in &file.body { for item in &file.body {
if let Item::MacroDef(name, params, items) = item { if let Item::MacroDef(name, params, items) = item {
let _macro = Macro { let signature = MacroSignature {
name: name.clone(),
num_params: params.len(),
};
let macro_ = Macro {
params: params.clone(), params: params.clone(),
items: items.clone(), items: items.clone(),
}; };
let old = macros.insert(name.clone(), _macro); let old = macros.insert(signature.clone(), macro_);
assert!(old.is_none(), "Duplicate macro: {name}"); assert!(old.is_none(), "Duplicate macro signature: {:?}", signature);
} }
} }
} }
@ -124,7 +134,7 @@ fn find_macros(files: &[File]) -> HashMap<String, Macro> {
fn expand_macros( fn expand_macros(
body: Vec<Item>, body: Vec<Item>,
macros: &HashMap<String, Macro>, macros: &HashMap<MacroSignature, Macro>,
macro_counter: &mut u32, macro_counter: &mut u32,
) -> Vec<Item> { ) -> Vec<Item> {
let mut expanded = vec![]; let mut expanded = vec![];
@ -147,30 +157,25 @@ fn expand_macros(
fn expand_macro_call( fn expand_macro_call(
name: String, name: String,
args: Vec<PushTarget>, args: Vec<PushTarget>,
macros: &HashMap<String, Macro>, macros: &HashMap<MacroSignature, Macro>,
macro_counter: &mut u32, macro_counter: &mut u32,
) -> Vec<Item> { ) -> Vec<Item> {
let _macro = macros let signature = MacroSignature {
.get(&name)
.unwrap_or_else(|| panic!("No such macro: {}", name));
assert_eq!(
args.len(),
_macro.params.len(),
"Macro `{}`: expected {} arguments, got {}",
name, name,
_macro.params.len(), num_params: args.len(),
args.len() };
); let macro_ = macros
.get(&signature)
.unwrap_or_else(|| panic!("No such macro: {:?}", signature));
let get_actual_label = |macro_label| format!("@{}.{}", macro_counter, macro_label); let get_actual_label = |macro_label| format!("@{}.{}", macro_counter, macro_label);
let get_arg = |var| { let get_arg = |var| {
let param_index = _macro.get_param_index(var); let param_index = macro_.get_param_index(var);
args[param_index].clone() args[param_index].clone()
}; };
let expanded_item = _macro let expanded_item = macro_
.items .items
.iter() .iter()
.map(|item| match item { .map(|item| match item {
@ -518,6 +523,18 @@ mod tests {
parse_and_assemble(&["%macro repeat %endmacro", "%repeat"]); parse_and_assemble(&["%macro repeat %endmacro", "%repeat"]);
} }
#[test]
fn overloaded_macros() {
let kernel = parse_and_assemble(&[
"%macro push(x) PUSH $x %endmacro",
"%macro push(x, y) PUSH $x PUSH $y %endmacro",
"%push(5)",
"%push(6, 7)",
]);
let push1 = get_push_opcode(1);
assert_eq!(kernel.code, vec![push1, 5, push1, 6, push1, 7]);
}
#[test] #[test]
#[should_panic] #[should_panic]
fn macro_with_wrong_vars() { fn macro_with_wrong_vars() {