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

Use take for TakeRegister

Browse Source
This commit is contained in:
Andrew Morris
2023-06-21 17:20:45 +10:00
parent b33ef2b5b0
commit 910f6684f5
3 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
valuescript_vm/src/bytecode_decoder.rs
View File

@@ -1,4 +1,5 @@
use std::collections::BTreeMap;
use std::mem::take;
use std::rc::Rc;
use num_bigint::BigInt;
@@ -96,7 +97,7 @@ impl BytecodeDecoder {
return BytecodeType::from_byte(self.peek_byte());
}
pub fn decode_val(&mut self, registers: &Vec<Val>) -> Val {
pub fn decode_val(&mut self, registers: &mut Vec<Val>) -> Val {
return match self.decode_type() {
BytecodeType::End => panic!("Cannot decode end"),
BytecodeType::Void => Val::Void,
@@ -138,12 +139,10 @@ impl BytecodeDecoder {
Val::Void => Val::Undefined,
val => val,
},
BytecodeType::TakeRegister => {
match registers[self.decode_register_index().unwrap()].clone() {
Val::Void => Val::Undefined,
val => val,
}
}
BytecodeType::TakeRegister => match &mut registers[self.decode_register_index().unwrap()] {
Val::Void => Val::Undefined,
val => take(val),
},
BytecodeType::Builtin => BUILTIN_VALS[self.decode_varsize_uint()](),
BytecodeType::Class => VsClass {
constructor: self.decode_val(registers),
@@ -156,7 +155,7 @@ impl BytecodeDecoder {
};
}
pub fn decode_vec_val(&mut self, registers: &Vec<Val>) -> Vec<Val> {
pub fn decode_vec_val(&mut self, registers: &mut Vec<Val>) -> Vec<Val> {
let mut vals: Vec<Val> = Vec::new();
while self.peek_type() != BytecodeType::End {
@@ -248,7 +247,7 @@ impl BytecodeDecoder {
};
}
pub fn decode_pointer(&mut self, registers: &Vec<Val>) -> Val {
pub fn decode_pointer(&mut self, registers: &mut Vec<Val>) -> Val {
let from_pos = self.pos;
let pos = self.decode_pos();

56
valuescript_vm/src/bytecode_stack_frame.rs
View File

@@ -35,7 +35,7 @@ pub struct CatchSetting {
impl BytecodeStackFrame {
pub fn apply_unary_op(&mut self, op: fn(input: &Val) -> Val) {
let input = self.decoder.decode_val(&self.registers);
let input = self.decoder.decode_val(&mut self.registers);
let register_index = self.decoder.decode_register_index();
@@ -48,8 +48,8 @@ impl BytecodeStackFrame {
&mut self,
op: fn(left: &Val, right: &Val) -> Result<Val, Val>,
) -> Result<(), Val> {
let left = self.decoder.decode_val(&self.registers);
let right = self.decoder.decode_val(&self.registers);
let left = self.decoder.decode_val(&mut self.registers);
let right = self.decoder.decode_val(&mut self.registers);
if let Some(register_index) = self.decoder.decode_register_index() {
self.registers[register_index] = op(&left, &right)?;
@@ -65,7 +65,7 @@ impl BytecodeStackFrame {
self.decoder.decode_type();
while self.decoder.peek_type() != BytecodeType::End {
let p = self.decoder.decode_val(&self.registers);
let p = self.decoder.decode_val(&mut self.registers);
new_frame.write_param(p);
}
@@ -74,7 +74,7 @@ impl BytecodeStackFrame {
return;
}
let params = self.decoder.decode_val(&self.registers);
let params = self.decoder.decode_val(&mut self.registers);
match params {
Val::Array(array_data) => {
@@ -95,7 +95,7 @@ impl BytecodeStackFrame {
self.decoder.decode_type();
while self.decoder.peek_type() != BytecodeType::End {
res.push(self.decoder.decode_val(&self.registers));
res.push(self.decoder.decode_val(&mut self.registers));
}
self.decoder.decode_type(); // End (TODO: assert)
@@ -103,7 +103,7 @@ impl BytecodeStackFrame {
return res;
}
let params = self.decoder.decode_val(&self.registers);
let params = self.decoder.decode_val(&mut self.registers);
match params {
Val::Array(array_data) => array_data.elements.clone(),
@@ -140,7 +140,7 @@ impl StackFrameTrait for BytecodeStackFrame {
}
Mov => {
let val = self.decoder.decode_val(&self.registers);
let val = self.decoder.decode_val(&mut self.registers);
let register_index = self.decoder.decode_register_index();
if register_index.is_some() {
@@ -191,8 +191,8 @@ impl StackFrameTrait for BytecodeStackFrame {
OpGreaterEq => self.apply_binary_op(operations::op_greater_eq)?,
OpNullishCoalesce => self.apply_binary_op(operations::op_nullish_coalesce)?,
OpOptionalChain => {
let mut left = self.decoder.decode_val(&self.registers);
let right = self.decoder.decode_val(&self.registers);
let mut left = self.decoder.decode_val(&mut self.registers);
let right = self.decoder.decode_val(&mut self.registers);
if let Some(register_index) = self.decoder.decode_register_index() {
self.registers[register_index] = operations::op_optional_chain(&mut left, &right)?;
@@ -214,7 +214,7 @@ impl StackFrameTrait for BytecodeStackFrame {
In => self.apply_binary_op(operations::op_in)?,
Call => {
let fn_ = self.decoder.decode_val(&self.registers);
let fn_ = self.decoder.decode_val(&mut self.registers);
match fn_.load_function() {
LoadFunctionResult::NotAFunction => {
@@ -245,7 +245,7 @@ impl StackFrameTrait for BytecodeStackFrame {
}
Apply => {
let fn_ = self.decoder.decode_val(&self.registers);
let fn_ = self.decoder.decode_val(&mut self.registers);
match fn_.load_function() {
LoadFunctionResult::NotAFunction => {
@@ -262,7 +262,7 @@ impl StackFrameTrait for BytecodeStackFrame {
}
} else {
self.this_target = None;
new_frame.write_this(true, self.decoder.decode_val(&self.registers))?;
new_frame.write_this(true, self.decoder.decode_val(&mut self.registers))?;
}
self.transfer_parameters(&mut new_frame);
@@ -278,8 +278,8 @@ impl StackFrameTrait for BytecodeStackFrame {
}
Bind => {
let fn_val = self.decoder.decode_val(&self.registers);
let params = self.decoder.decode_val(&self.registers);
let fn_val = self.decoder.decode_val(&mut self.registers);
let params = self.decoder.decode_val(&mut self.registers);
let register_index = self.decoder.decode_register_index();
let params_array = params.as_array_data();
@@ -304,8 +304,8 @@ impl StackFrameTrait for BytecodeStackFrame {
}
Sub => {
let mut left = self.decoder.decode_val(&self.registers);
let right = self.decoder.decode_val(&self.registers);
let mut left = self.decoder.decode_val(&mut self.registers);
let right = self.decoder.decode_val(&mut self.registers);
if let Some(register_index) = self.decoder.decode_register_index() {
self.registers[register_index] = operations::op_sub(&mut left, &right)?;
@@ -318,9 +318,9 @@ impl StackFrameTrait for BytecodeStackFrame {
// theory, this should still be possible because we only need a mutable borrow to an
// element, not the vec itself. vec.get_many_mut has been considered, but it's not yet
// stable.
let subscript = self.decoder.decode_val(&self.registers);
let subscript = self.decoder.decode_val(&mut self.registers);
let value = self.decoder.decode_val(&self.registers);
let value = self.decoder.decode_val(&mut self.registers);
let target_index = self.decoder.decode_register_index().unwrap();
@@ -337,10 +337,10 @@ impl StackFrameTrait for BytecodeStackFrame {
ThisArg::Register(self.decoder.decode_register_index().unwrap())
}
_ => ThisArg::Val(self.decoder.decode_val(&self.registers)),
_ => ThisArg::Val(self.decoder.decode_val(&mut self.registers)),
};
let subscript = self.decoder.decode_val(&self.registers);
let subscript = self.decoder.decode_val(&mut self.registers);
let fn_ = match &obj {
ThisArg::Register(reg_i) => self.registers[*reg_i].sub(&subscript)?,
@@ -398,7 +398,7 @@ impl StackFrameTrait for BytecodeStackFrame {
}
JmpIf => {
let cond = self.decoder.decode_val(&self.registers);
let cond = self.decoder.decode_val(&mut self.registers);
let dst = self.decoder.decode_pos();
if cond.is_truthy() {
@@ -412,7 +412,7 @@ impl StackFrameTrait for BytecodeStackFrame {
New => {
// TODO: new Array
let class = match self.decoder.decode_val(&self.registers).as_class_data() {
let class = match self.decoder.decode_val(&mut self.registers).as_class_data() {
Some(class) => class,
None => {
return Err("value is not a constructor".to_type_error());
@@ -429,7 +429,7 @@ impl StackFrameTrait for BytecodeStackFrame {
match class.constructor {
Val::Void => {
// Ignore parameters
self.decoder.decode_val(&self.registers);
self.decoder.decode_val(&mut self.registers);
let target_register = self.decoder.decode_register_index();
match target_register {
@@ -480,7 +480,7 @@ impl StackFrameTrait for BytecodeStackFrame {
_ => Err(error),
}
}
_ => Err(self.decoder.decode_val(&self.registers)),
_ => Err(self.decoder.decode_val(&mut self.registers)),
};
}
@@ -558,7 +558,7 @@ impl StackFrameTrait for BytecodeStackFrame {
"TODO: cat non-inline arrays"
);
let cat_frame = CatStackFrame::from_args(self.decoder.decode_vec_val(&self.registers));
let cat_frame = CatStackFrame::from_args(self.decoder.decode_vec_val(&mut self.registers));
self.this_target = None;
self.return_target = self.decoder.decode_register_index();
@@ -567,14 +567,14 @@ impl StackFrameTrait for BytecodeStackFrame {
}
Yield => {
let val = self.decoder.decode_val(&self.registers);
let val = self.decoder.decode_val(&mut self.registers);
self.decoder.decode_register_index(); // TODO: Use this
return Ok(FrameStepOk::Yield(val));
}
YieldStar => {
let val = self.decoder.decode_val(&self.registers);
let val = self.decoder.decode_val(&mut self.registers);
self.decoder.decode_register_index(); // TODO: Use this
return Ok(FrameStepOk::YieldStar(val));

4
valuescript_vm/src/virtual_machine.rs
View File

@@ -22,7 +22,7 @@ impl VirtualMachine {
) -> Result<Val, Val> {
let mut bd = bytecode.decoder(0);
let main_fn = bd.decode_val(&Vec::new());
let main_fn = bd.decode_val(&mut Vec::new());
let mut frame = match main_fn.load_function() {
LoadFunctionResult::StackFrame(f) => f,
@@ -124,6 +124,6 @@ impl VirtualMachine {
}
pub fn read_default_export(bytecode: Rc<Bytecode>) -> Val {
bytecode.decoder(0).decode_val(&Vec::new())
bytecode.decoder(0).decode_val(&mut Vec::new())
}
}