github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-01-15 00:18:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix SubMov copying

Browse Source
This commit is contained in:
Andrew Morris
2023-06-20 14:58:23 +10:00
parent 7e16156933
commit 4e91cf3b20
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
valuescript_vm/src/bytecode_stack_frame.rs
View File

@@ -302,14 +302,18 @@ impl StackFrameTrait for BytecodeStackFrame {
Sub => self.apply_binary_op(operations::op_sub)?,
SubMov => {
let subscript = self.decoder.decode_vallish(&self.registers);
// TODO: Ideally we would use a reference for the subscript (decode_vallish), but that would
// be an immutable borrow and it conflicts with the mutable borrow for the target. In
// 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 value = self.decoder.decode_val(&self.registers);
let register_index = self.decoder.decode_register_index().unwrap();
let mut target = self.registers[register_index].clone(); // TODO: Lift
let target_index = self.decoder.decode_register_index().unwrap();
operations::op_submov(&mut target, subscript.get_ref(), value)?;
self.registers[register_index] = target;
operations::op_submov(&mut self.registers[target_index], &subscript, value)?;
}
SubCall | ConstSubCall | ThisSubCall => {