diff options
Diffstat (limited to 'crates/sloth_bytecode')
| -rw-r--r-- | crates/sloth_bytecode/macros/src/lib.rs | 4 | ||||
| -rw-r--r-- | crates/sloth_bytecode/src/lib.rs | 23 |
2 files changed, 14 insertions, 13 deletions
diff --git a/crates/sloth_bytecode/macros/src/lib.rs b/crates/sloth_bytecode/macros/src/lib.rs index 15a09d0..31f462f 100644 --- a/crates/sloth_bytecode/macros/src/lib.rs +++ b/crates/sloth_bytecode/macros/src/lib.rs @@ -142,12 +142,12 @@ pub fn instructions(input: proc_macro::TokenStream) -> proc_macro::TokenStream { quote! { #[repr(u8)] #[derive(Clone, Debug, Eq, PartialEq)] - enum #enum_name { + pub enum #enum_name { #( #enum_fields ),* } impl #enum_name { - fn disassemble(chunk: &[u8], offset: &mut usize) -> #enum_name { + pub fn disassemble(chunk: &[u8], offset: &mut usize) -> #enum_name { let opcode = chunk[*offset]; *offset += 1; diff --git a/crates/sloth_bytecode/src/lib.rs b/crates/sloth_bytecode/src/lib.rs index 3593f3c..e499597 100644 --- a/crates/sloth_bytecode/src/lib.rs +++ b/crates/sloth_bytecode/src/lib.rs @@ -16,7 +16,7 @@ pub enum Error { } instructions! { - Instructions; + Instruction; 0x00 Constant [u64] "Push a constant value onto the stack", 0x01 Load [u64] "Load a value from a variable", @@ -31,12 +31,13 @@ instructions! { 0x23 Div [] "Divide the last 2 values on the stack", 0x24 Mod [] "Modulo the last 2 values on the stack", - 0xF0 Print [] "[DEBUG] Pop value from stack and print it" + 0xF0 VMReturn [] "[DEBUG] Pop value from stack and return it from the program", + 0xF1 VMExit [] "[DEBUG] Exit from the VM", } #[cfg(test)] mod tests { - use crate::Instructions; + use crate::Instruction; #[test] #[rustfmt::skip] @@ -50,13 +51,13 @@ mod tests { let mut offset = 0; - assert_eq!(Instructions::disassemble(&code, &mut offset), Instructions::Constant(0)); - assert_eq!(Instructions::disassemble(&code, &mut offset), Instructions::Dup); - assert_eq!(Instructions::disassemble(&code, &mut offset), Instructions::Pop); - assert_eq!(Instructions::disassemble(&code, &mut offset), Instructions::Add); - assert_eq!(Instructions::disassemble(&code, &mut offset), Instructions::Sub); - assert_eq!(Instructions::disassemble(&code, &mut offset), Instructions::Mul); - assert_eq!(Instructions::disassemble(&code, &mut offset), Instructions::Div); - assert_eq!(Instructions::disassemble(&code, &mut offset), Instructions::Mod); + assert_eq!(Instruction::disassemble(&code, &mut offset), Instruction::Constant(0)); + assert_eq!(Instruction::disassemble(&code, &mut offset), Instruction::Dup); + assert_eq!(Instruction::disassemble(&code, &mut offset), Instruction::Pop); + assert_eq!(Instruction::disassemble(&code, &mut offset), Instruction::Add); + assert_eq!(Instruction::disassemble(&code, &mut offset), Instruction::Sub); + assert_eq!(Instruction::disassemble(&code, &mut offset), Instruction::Mul); + assert_eq!(Instruction::disassemble(&code, &mut offset), Instruction::Div); + assert_eq!(Instruction::disassemble(&code, &mut offset), Instruction::Mod); } } |