{"header":{"message":"feat(vm): start vm work","description":null,"timestamp":"2024-02-29T04:28:31.370233258Z","authors":[{}]},"hash":"Y26CTXMO7XJMHSZNRBCVQAPFAJZ2LOO47WI2V2LCZU6SG52VOP7QC","authors":[{"login":"Jengamon","key":"47a75hR6eVaawZfVGBs2CqZUKZbcNz5Ago5CubrCkWvZ"}],"deps":{"hashes":[["Y26CTXMO7XJMHSZNRBCVQAPFAJZ2LOO47WI2V2LCZU6SG52VOP7QC","feat(vm): start vm work"],["AA",null],["CZI7ZLGRQBWWOHFJRBMHUJ3QZH3S6XB6HFHBRD6YWWEXLMBH4PGAC","feat: add #![warn(missing_docs)] on the way to deny and eventually forbid"],["ERRF37DMR4GWXAHSLA5U4PKLK3AL3PGD4GP6YPEK3SHLN3AFY7MAC","feat(vm): create rudimentary symbol table"],["ABFTXJS57ESOF4DIRYCYDJ3DLYCU5T7UIWB7HAUUXVQZ3LANAVMQC","feat(vm): start sketching out value impl"],["I7XH6FSRMAZ2ZAZI32ALQWL4RZUZFCAXLIK6OJCJ4P7TJFAZUG2QC","feat(vm): sketch out accompanying structs"],["4CWI65HNTD3X3OP25QJOAO5B5QMCMNQFQJ4BUMQKBDUVVXKRWEOQC","feat: initial project structure"],["UEEGB37HSGJL4VCRJYIAJRVAEPREYZTDPIDG7BJIJ4DUUSRX7LOQC","feat: add bytecode module"],["Q72QDMNZQQTDFGS4LIK6PJNAL4ZW2WR3LQP7H5JPPDDAC2OYOMUAC","feat(vm): new opcodes"],["454GMMPOA3UUX43VO27KTYXHB66LCSKX6X6O4N65IDK53N46FKZAC","feat(vm): new opcodes for locals"]],"deps":["CZI7ZLGRQBWWOHFJRBMHUJ3QZH3S6XB6HFHBRD6YWWEXLMBH4PGAC"],"known":["ABFTXJS57ESOF4DIRYCYDJ3DLYCU5T7UIWB7HAUUXVQZ3LANAVMQC","I7XH6FSRMAZ2ZAZI32ALQWL4RZUZFCAXLIK6OJCJ4P7TJFAZUG2QC","ERRF37DMR4GWXAHSLA5U4PKLK3AL3PGD4GP6YPEK3SHLN3AFY7MAC"]},"hunks":[{"FileAdd":{"meta":{"basename":"vm.rs","metadata":0},"context":[{"change":7,"pos":2045}],"contents":[{"Add":"//! Provide the virtual machine"},{"Add":""},{"Add":"use std::{cell::RefCell, collections::HashMap};"},{"Add":""},{"Add":"use gc_arena::{Arena, Collect, Gc, Rootable};"},{"Add":""},{"Add":"use crate::{"},{"Add":" bytecode::{ByteCode, OpCode},"},{"Add":" value::{ListCell, Primitive, SymbolId, SymbolTable},"},{"Add":"};"},{"Add":""},{"Add":"type Memory = Rootable![Vec>];"},{"Add":""},{"Add":"/// Virtual machine"},{"Add":"pub struct Vm {"},{"Add":" mem: Arena,"},{"Add":" /// Main block for execution"},{"Add":" block: Block,"},{"Add":" // TODO Allow for \"sub-blocks\" to reference other"},{"Add":" // bytecode complied modules"},{"Add":"}"},{"Add":""},{"Add":"/// Block of bytecode that supports multiple labels"},{"Add":"pub struct Block {"},{"Add":" code: Box<[ByteCode]>,"},{"Add":" labels: HashMap,"},{"Add":" /// Symbol table for all bytecode functions in this block"},{"Add":" symbol_table: RefCell,"},{"Add":"}"},{"Add":""},{"Add":"impl Block {"},{"Add":" fn get_offset>(&self, name: S) -> Option {"},{"Add":" self.labels"},{"Add":" .get(&self.symbol_table.borrow_mut().id(name))"},{"Add":" .copied()"},{"Add":" }"},{"Add":""},{"Add":" fn get(&self, idx: usize) -> Option {"},{"Add":" self.code.get(idx).copied()"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Meant to represent a full stack frame"},{"Add":"#[derive(Debug, Collect)]"},{"Add":"#[collect(no_drop)]"},{"Add":"struct StackFrame<'gc> {"},{"Add":" stack: Vec>>,"},{"Add":" srl_registers: [Option>>; 255],"},{"Add":" inst_ptr: usize,"},{"Add":"}"},{"Add":""},{"Add":"impl Vm {"},{"Add":" /// Create a new VM using code compiled into a [`Block`]"},{"Add":" pub fn new(block: Block) -> Self {"},{"Add":" let mem = Arena::new(|_mc| {"},{"Add":" vec![StackFrame {"},{"Add":" stack: vec![],"},{"Add":" srl_registers: [None; 255],"},{"Add":" // Get the offset to a label \"_start\", or start at the first instruction"},{"Add":" inst_ptr: block.get_offset(\"_start\").unwrap_or(0),"},{"Add":" }]"},{"Add":" });"},{"Add":""},{"Add":" Self { mem, block }"},{"Add":" }"},{"Add":""},{"Add":" /// Execute from the given stack frame, where all values that would be returned from the"},{"Add":" /// top-level of the script are passed to a \"continuation\""},{"Add":" pub fn execute(&mut self, mut continuation: C) -> Result<(), ()>"},{"Add":" where"},{"Add":" C: FnMut(Primitive),"},{"Add":" {"},{"Add":" loop {"},{"Add":" let Some((inst, inst_ptr)) = self.mem.mutate(|mc, root| {"},{"Add":" root.last()"},{"Add":" .and_then(|frame| self.block.get(frame.inst_ptr).map(|i| (i, frame.inst_ptr)))"},{"Add":" }) else {"},{"Add":" // Invalid bytecode location. ERROR!!!"},{"Add":" // TODO Have an error type that can capture a VM"},{"Add":" // stack trace for debugging"},{"Add":" break Err(());"},{"Add":" };"},{"Add":""},{"Add":" let mut next_ptr = inst_ptr + 1;"},{"Add":" match inst.op_code {"},{"Add":" OpCode::NoOp => {}"},{"Add":" OpCode::PushInt => todo!(),"},{"Add":" OpCode::PushSignedInt => todo!(),"},{"Add":" OpCode::PushConst => todo!(),"},{"Add":" OpCode::PushList => todo!(),"},{"Add":" OpCode::CreateList => todo!(),"},{"Add":" OpCode::Call => {"},{"Add":" let a = inst.arguments.a() as usize;"},{"Add":" let Some(jump_ptr) = self.mem.mutate_root(|_mc, root| {"},{"Add":" root.last_mut().and_then(|frame| {"},{"Add":" if a > frame.stack.len() {"},{"Add":" None"},{"Add":" } else {"},{"Add":" let arguments: Vec<_> = frame"},{"Add":" .stack"},{"Add":" .drain(frame.stack.len().saturating_sub(a)..)"},{"Add":" .collect();"},{"Add":" let proc = frame.stack.pop();"},{"Add":" proc.map(|prim| {"},{"Add":" // If the inner primitive is a raw procedure (a procedure written in Rust),"},{"Add":" // run it."},{"Add":" // If the inner primtive is a \"bytecode reference\""},{"Add":" // - check if we're in the right block, if so, return Some(label location)"},{"Add":" // - if not, switch blocks, then return Some(label location)"},{"Add":" todo!()"},{"Add":" })"},{"Add":" }"},{"Add":" })"},{"Add":" }) else {"},{"Add":" // jump to location not found."},{"Add":" break Err(());"},{"Add":" };"},{"Add":" next_ptr = jump_ptr;"},{"Add":" }"},{"Add":" OpCode::TailCall => todo!(),"},{"Add":" OpCode::Return => todo!(),"},{"Add":" OpCode::LoadLocal => todo!(),"},{"Add":" OpCode::StoreLocal => todo!(),"},{"Add":" }"},{"Add":" // Set the current frame's inst_ptr to next_ptr"},{"Add":" if !self.mem.mutate_root(|_mc, root| {"},{"Add":" if let Some(last) = root.last_mut() {"},{"Add":" last.inst_ptr = next_ptr;"},{"Add":" true"},{"Add":" } else {"},{"Add":" false"},{"Add":" }"},{"Add":" }) {"},{"Add":" // The stack frame doesn't exist to continue executing..."},{"Add":" // For now, assume that code is done, and exit with an Ok!"},{"Add":" break Ok(());"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"}"}]}},{"Edit":{"inode":{"change":3,"pos":385},"path":"magus_core/src/value.rs","line":94,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":263},"to":{"change":3,"start":1850,"end":1852},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1850},"to":{"change":3,"start":1850,"end":1852},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1852},"to":{"change":3,"start":0,"end":183},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":183},"to":{"change":2,"start":264,"end":322},"introduced_by":2}],"inode":{"change":3,"pos":385}}},"contents":[{"Del":"}\n"},{"Del":"\n/// Meant for top-level stack manipulation and data-handling for VM\n#[derive(Debug, Collect)]\n#[collect(no_drop)]\npub struct VmMemory<'gc> {\n stack: Vec>>,\n"},{"Del":" srl_registers: [Option>>; 255],\n"}]}},{"Edit":{"inode":{"change":7,"pos":2078},"path":"magus_core/src/lib.rs","line":9,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1868}],"down_context":[],"flag":"BLOCK","start":5041,"end":5053,"inode":{"change":7,"pos":2078}}},"contents":[{"Add":"pub mod vm;"}]}},{"Edit":{"inode":{"change":8,"pos":36},"path":"magus_core/src/bytecode.rs","line":40,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":556}],"down_context":[{"change":10,"pos":0}],"flag":"BLOCK","start":5054,"end":5455,"inode":{"change":8,"pos":36}}},"contents":[{"Add":" /// Return from the current stack frame, pushing the value at the top of the"},{"Add":" /// current stack frame's stack to the stack of the stack frame below."},{"Add":" ///"},{"Add":" /// At the top-level, this stops execution (TODO)."},{"Add":" /// If the stack is empty, returns the empty list."},{"Add":" ///"},{"Add":" // NOTE(impl): A Call followed by this (a Return) should *always*"},{"Add":" // be rewritten into a TailCall."},{"Add":" Return,"}]}},{"Edit":{"inode":{"change":8,"pos":36},"path":"magus_core/src/bytecode.rs","line":87,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":819}],"down_context":[{"change":8,"pos":867}],"flag":"BLOCK","start":5456,"end":5569,"inode":{"change":8,"pos":36}}},"contents":[{"Add":" 8 => Ok(Self::Return),"},{"Add":" 9 => Ok(Self::LoadLocal),"},{"Add":" 10 => Ok(Self::StoreLocal),"}]}},{"Edit":{"inode":{"change":8,"pos":36},"path":"magus_core/src/bytecode.rs","line":214,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":1330}],"down_context":[{"change":9,"pos":1330}],"flag":"BLOCK","start":5570,"end":5699,"inode":{"change":8,"pos":36}}},"contents":[{"Add":" op_code,"},{"Add":" arguments: OpArguments::parse_a(n),"},{"Add":" },"},{"Add":" OpCode::Return => Self {"}]}}],"owner":"Jengamon","repo":"magus","token":"Xga6B4kVsJrEy+wgXh73Dqj4zjYuVUitdjei/Jbx0/M=","login":null}

…

Dependencies

Change contents