Added copy opcode

This commit is contained in:
2022-08-06 01:18:14 -05:00
parent fa5dc84ad2
commit 25afdb8890
2 changed files with 92 additions and 12 deletions
+80 -2
View File
@@ -208,8 +208,11 @@ impl CPU {
} else {
match instruction.opcode {
Opcode::Nop => { /* No action required */ }
Opcode::Rand => {
todo!()
Opcode::Copy => {
let dest = self.pop_data();
let src = self.pop_data();
let len = self.pop_data();
self.copy_region(len, dest, src);
}
Opcode::Not => {
let x = self.pop_data();
@@ -417,6 +420,25 @@ impl CPU {
);
}
fn copy_region(&mut self, len: Word, dest: Word, src: Word) {
// Degenerate cases:
if dest == src || len == 0 { return }
// Now, check if we're moving to a greater or lesser address:
if dest > src {
// If the dest is greater, we need to move from the end of the range backwards,
// in case there's overlap:
for offset in (0..len.into()).rev() {
self.memory.poke(dest + offset, self.memory.peek(src + offset))
}
} else {
// Dest is before src, so we'll move from low index to high, in case of overlap:
for offset in 0..len.into() {
self.memory.poke(dest + offset, self.memory.peek(src + offset))
}
}
}
pub fn interrupt(&mut self, irq: usize, arg: Option<Word>) {
if irq >= self.iv.len() {
panic!("Invalid interrupt: {}", irq)
@@ -685,6 +707,62 @@ mod tests {
simple_opcode_test(vec![0x800010, 2], Arshift, vec![0xe00004]);
}
#[test]
fn test_cpu_copy() {
// No overlap, forwards
memory_opcode_test(
vec![3, 2048, 2051],
vec![1, 2, 3, 4, 5, 6],
Copy,
vec![],
Some(vec![1, 2, 3, 1, 2, 3]),
);
// No overlap, backwards
memory_opcode_test(
vec![3, 2051, 2048],
vec![1, 2, 3, 4, 5, 6],
Copy,
vec![],
Some(vec![4, 5, 6, 4, 5, 6]),
);
// Overlap, move forward
memory_opcode_test(
vec![3, 2048, 2050],
vec![1, 2, 3, 4, 5, 6],
Copy,
vec![],
Some(vec![1, 2, 1, 2, 3, 6]),
);
// Overlap, move backwards
memory_opcode_test(
vec![3, 2051, 2049],
vec![1, 2, 3, 4, 5, 6],
Copy,
vec![],
Some(vec![1, 4, 5, 6, 5, 6]),
);
// Degenerate cases
memory_opcode_test(
vec![0, 2051, 2049],
vec![1, 2, 3, 4, 5, 6],
Copy,
vec![],
Some(vec![1, 2, 3, 4, 5, 6]),
);
memory_opcode_test(
vec![5, 2048, 2048],
vec![1, 2, 3, 4, 5, 6],
Copy,
vec![],
Some(vec![1, 2, 3, 4, 5, 6]),
);
}
#[test]
fn test_cpu_call_stack() {
call_stack_opcode_test(vec![5000], vec![], Call, vec![], vec![1025], 5000.into());