syntaxAlchemist/lib-tisc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: syntaxAlchemist:b94723f1baf8e3096681489ff2a2d7e4eb81900a
Branches Tags
syntaxAlchemist:dev
..
compare: syntaxAlchemist:92fc7ff44b9130c5c72786d64ff6a2c5d9371968
Branches Tags
syntaxAlchemist:dev

No commits in common. "b94723f1baf8e3096681489ff2a2d7e4eb81900a" and "92fc7ff44b9130c5c72786d64ff6a2c5d9371968" have entirely different histories.
b94723f1ba ... 92fc7ff44b

2 changed files with 3 additions and 38 deletions
Show stats Expand all files Collapse all files

18
src/assembler.rs
View file

@ -42,24 +42,6 @@ impl Assembler {
self self
} }
pub fn while_loop(mut self, mut condition: Assembler, mut body: Assembler) -> Assembler {
let cond_len = condition.instructions.len();
let body_len = body.instructions.len();
self.instructions.append( &mut condition.instructions );
// jump to end
self.instructions.push( VM_Instruction::Branch as VM_Word );
self.instructions.push( body_len as VM_Word + 2 );
self.instructions.append( &mut body.instructions );
// jump back to condition
self.instructions.push( VM_Instruction::Jmp as VM_Word );
self.instructions.push( -2-(body_len as VM_Word)-2-(cond_len as VM_Word) );
self
}
pub fn branch(mut self, mut if_branch: Assembler, mut else_branch: Assembler) -> Assembler { pub fn branch(mut self, mut if_branch: Assembler, mut else_branch: Assembler) -> Assembler {
self.instructions.push(VM_Instruction::Branch as VM_Word ); self.instructions.push(VM_Instruction::Branch as VM_Word );
self.instructions.push( if_branch.instructions.len() as VM_Word + 2); self.instructions.push( if_branch.instructions.len() as VM_Word + 2);

19
src/vm.rs
View file

@ -4,7 +4,7 @@ pub type VM_Word = i64;
#[repr(u64)] #[repr(u64)]
pub enum VM_Instruction { pub enum VM_Instruction {
Nop, Jmp, Call, Branch, Ret, Nop, Jmp, Call, Branch, Ret,
Lit, Pick, Roll, Dup, Drop, Swap, Rot, Lit, Dup, Drop, Swap, Rot,
Fetch, Store, Fetch, Store,
Accept, Emit, Accept, Emit,
Add, //Sub, Mul, Div, Rem, Add, //Sub, Mul, Div, Rem,
@ -103,23 +103,6 @@ impl VM {
let val = char::from(self.data_stack.pop().expect("emit expects value") as u8); let val = char::from(self.data_stack.pop().expect("emit expects value") as u8);
print!("{}", val); print!("{}", val);
} }
VM_Instruction::Pick => {
let n = self.data_stack.pop().expect("pick requires index") as usize;
self.data_stack.push( *self.data_stack.get( self.data_stack.len() - n ).expect("pick invalid index") );
}
VM_Instruction::Roll => {
let n = self.data_stack.pop().expect("pick requires index") as usize;
let l = self.data_stack.len();
if n <= l {
if n > 1 {
let val = self.data_stack.remove( l-n );
self.data_stack.push( val );
}
} else {
eprintln!("stack = {:?}", self.data_stack);
eprintln!("roll invalid index");
}
}
VM_Instruction::Dup => { VM_Instruction::Dup => {
self.data_stack.push( *self.data_stack.last().expect("dup expect val") ); self.data_stack.push( *self.data_stack.last().expect("dup expect val") );
} }