jeff/dust
1
0
Fork 0
Code Issues

Fix minor bug in VM

Browse Source
This commit is contained in:
Jeff 2025-01-21 10:50:32 -05:00
parent 8c7b5d9959
commit 9cf873bd39
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dust-lang/src/vm/action.rs
View File

@ -46,7 +46,9 @@ impl ActionSequence {
data: ActionData { data: ActionData {
name: "LOOP_OPTIMIZED", name: "LOOP_OPTIMIZED",
instruction: InstructionBuilder::from(instruction), instruction: InstructionBuilder::from(instruction),
pointers: [ptr::null_mut(); 3], integer_pointers: [ptr::null_mut(); 3],
boolean_register_pointers: [ptr::null_mut(); 2],
integer_register_pointers: [ptr::null_mut(); 2],
runs: 0, runs: 0,
condensed_actions: loop_actions.take().unwrap(), condensed_actions: loop_actions.take().unwrap(),
}, },
@ -109,7 +111,9 @@ impl From<&Instruction> for Action {
data: ActionData { data: ActionData {
name: operation.name(), name: operation.name(),
instruction: builder, instruction: builder,
pointers: [ptr::null_mut(); 3], integer_pointers: [ptr::null_mut(); 3],
boolean_register_pointers: [ptr::null_mut(); 2],
integer_register_pointers: [ptr::null_mut(); 2],
runs: 0, runs: 0,
condensed_actions: Vec::new(), condensed_actions: Vec::new(),
}, },
@ -134,7 +138,9 @@ pub struct ActionData {
pub name: &'static str, pub name: &'static str,
pub instruction: InstructionBuilder, pub instruction: InstructionBuilder,
pub pointers: [*mut i64; 3], pub boolean_register_pointers: [*mut Register<bool>; 2],
pub integer_register_pointers: [*mut Register<i64>; 2],
pub integer_pointers: [*mut i64; 3],
pub runs: usize, pub runs: usize,
pub condensed_actions: Vec<Action>, pub condensed_actions: Vec<Action>,
} }
@ -169,23 +175,23 @@ fn loop_optimized(thread_data: &mut ThreadData, action_data: &mut ActionData) {
"jns 2f", "jns 2f",
"add {2}, 1", "add {2}, 1",
"2:", "2:",
in(reg) *action.data.pointers[0], in(reg) *action.data.integer_pointers[0],
in(reg) *action.data.pointers[1], in(reg) *action.data.integer_pointers[1],
inout(reg) local_ip, inout(reg) local_ip,
) )
}, },
"ADD" => unsafe { "ADD" => unsafe {
asm!( asm!(
"add {0}, {1}", "add {0}, {1}",
inout(reg) *action.data.pointers[1] => *action.data.pointers[0], inout(reg) *action.data.integer_pointers[1] => *action.data.integer_pointers[0],
in(reg) *action.data.pointers[2], in(reg) *action.data.integer_pointers[2],
) )
}, },
"MOVE" => unsafe { "MOVE" => unsafe {
asm!( asm!(
"mov {0}, {1}", "mov {0}, {1}",
inout(reg) *action.data.pointers[1] => *action.data.pointers[0], out(reg) action.data.integer_register_pointers[0],
in(reg) *action.data.pointers[2], in(reg) action.data.integer_register_pointers[1],
) )
}, },
"JUMP" => { "JUMP" => {
@ -214,19 +220,25 @@ fn r#move(thread_data: &mut ThreadData, action_data: &mut ActionData) {
match r#type { match r#type {
TypeCode::BOOLEAN => { TypeCode::BOOLEAN => {
let new_register = Register::Pointer(Pointer::RegisterBoolean(source)); let mut source = current_frame.registers.get_boolean_mut(source).clone();
let old_register = current_frame.registers.get_boolean_mut(destination); let destination = current_frame.registers.get_boolean_mut(destination);
*old_register = new_register; action_data.boolean_register_pointers[0] = destination;
action_data.boolean_register_pointers[1] = &mut source;
*destination = source;
} }
TypeCode::INTEGER => { TypeCode::INTEGER => {
let new_register = Register::Pointer(Pointer::RegisterInteger(source)); let mut source = current_frame.registers.get_integer_mut(source).clone();
let old_register = current_frame.registers.get_integer_mut(destination); let destination = current_frame.registers.get_integer_mut(destination);
*old_register = new_register; action_data.integer_register_pointers[0] = destination;
action_data.integer_register_pointers[1] = &mut source;
*destination = source;
} }
_ => todo!(), _ => todo!(),
} }
action_data.runs += 1;
} }
#[allow(clippy::single_range_in_vec_init)] #[allow(clippy::single_range_in_vec_init)]
@ -353,7 +365,7 @@ fn add(thread_data: &mut ThreadData, action_data: &mut ActionData) {
let ActionData { let ActionData {
instruction, instruction,
runs, runs,
pointers, integer_pointers: pointers,
.. ..
} = action_data; } = action_data;
@ -451,7 +463,7 @@ fn less(thread_data: &mut ThreadData, action_data: &mut ActionData) {
let ActionData { let ActionData {
instruction, instruction,
runs, runs,
pointers, integer_pointers: pointers,
.. ..
} = action_data; } = action_data;
let current_frame = thread_data.current_frame_mut(); let current_frame = thread_data.current_frame_mut();