github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-04-18 03:00:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enable decoding registers

Browse Source
This commit is contained in:
Andrew Morris
2022-05-02 16:00:41 +10:00
parent 35e0dd3688
commit 93f338bbc4
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vstc/virtual_machine/bytecode_decoder.rs
View File

@@ -60,7 +60,7 @@ impl BytecodeDecoder {
};
}
pub fn decode_val(&mut self) -> Val {
pub fn decode_val(&mut self, registers: &Vec<Val>) -> Val {
use BytecodeType::*;
return match self.decode_type() {
@@ -82,7 +82,7 @@ impl BytecodeDecoder {
Function => self.decode_function_header(),
Instance => std::panic!("Not implemented"),
Pointer => self.decode_pointer(),
Register => std::panic!("Not implemented"),
Register => registers[self.decode_register_index().unwrap()].clone(),
}
}
@@ -129,7 +129,7 @@ impl BytecodeDecoder {
return self.decode_byte() as usize;
}
pub fn decode_register(&mut self) -> Option<usize> {
pub fn decode_register_index(&mut self) -> Option<usize> {
// TODO: Handle multi-byte registers
let byte = self.decode_byte();

29
src/vstc/virtual_machine/virtual_machine.rs
View File

@@ -3,7 +3,6 @@ use std::rc::Rc;
use super::vs_value::Val;
use super::vs_undefined::VsUndefined;
use super::vs_number::VsNumber;
use super::vs_string::VsString;
use super::operations;
use super::bytecode_decoder::BytecodeDecoder;
use super::instruction::Instruction;
@@ -28,7 +27,7 @@ impl VirtualMachine {
pos: 0,
};
let main_fn = bd.decode_val();
let main_fn = bd.decode_val(&Vec::new());
if !main_fn.push_frame(self) {
std::panic!("bytecode does start with function")
@@ -58,8 +57,8 @@ impl VirtualMachine {
},
Mov => {
let val = frame.decoder.decode_val();
let register_index = frame.decoder.decode_register();
let val = frame.decoder.decode_val(&frame.registers);
let register_index = frame.decoder.decode_register_index();
if register_index.is_some() {
frame.registers[register_index.unwrap()] = val;
@@ -67,9 +66,9 @@ impl VirtualMachine {
},
OpInc => {
let mut val = frame.decoder.decode_val();
let mut val = frame.decoder.decode_val(&frame.registers);
val = operations::op_plus(&val, &VsNumber::from_f64(1_f64));
let register_index = frame.decoder.decode_register();
let register_index = frame.decoder.decode_register_index();
if register_index.is_some() {
frame.registers[register_index.unwrap()] = val;
@@ -77,10 +76,10 @@ impl VirtualMachine {
},
OpPlus => {
let left = frame.decoder.decode_val();
let right = frame.decoder.decode_val();
let left = frame.decoder.decode_val(&frame.registers);
let right = frame.decoder.decode_val(&frame.registers);
let register_index = frame.decoder.decode_register();
let register_index = frame.decoder.decode_register_index();
if register_index.is_some() {
frame.registers[register_index.unwrap()] = operations::op_plus(&left, &right);
@@ -88,10 +87,10 @@ impl VirtualMachine {
},
OpMul => {
let left = frame.decoder.decode_val();
let right = frame.decoder.decode_val();
let left = frame.decoder.decode_val(&frame.registers);
let right = frame.decoder.decode_val(&frame.registers);
let register_index = frame.decoder.decode_register();
let register_index = frame.decoder.decode_register_index();
if register_index.is_some() {
frame.registers[register_index.unwrap()] = operations::op_mul(&left, &right);
@@ -99,10 +98,10 @@ impl VirtualMachine {
},
OpMod => {
let left = frame.decoder.decode_val();
let right = frame.decoder.decode_val();
let left = frame.decoder.decode_val(&frame.registers);
let right = frame.decoder.decode_val(&frame.registers);
let register_index = frame.decoder.decode_register();
let register_index = frame.decoder.decode_register_index();
if register_index.is_some() {
frame.registers[register_index.unwrap()] = operations::op_mod(&left, &right);

2
src/vstc/virtual_machine/vs_pointer.rs
View File

@@ -35,7 +35,7 @@ impl VsPointer {
pos: self.pos,
};
let val = bd.decode_val();
let val = bd.decode_val(&Vec::new());
// TODO: Check that this actually inserts into the cell and not just a copy
// somehow