6502
/
mre-mos6502
mirror of https://github.com/mre/mos6502.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

get rid of silly xextend function; just use the .into()

This commit is contained in:
Sam M W 2023-04-03 21:00:17 +01:00
parent 3accd8ce40
commit 7222388c5e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpu.rs
View File

@ -30,10 +30,6 @@ use crate::memory::Bus;
use crate::registers::{Registers, StackPointer, Status, StatusArgs};
fn xextend(x: u8) -> u16 {
u16::from(x)
}
fn arr_to_addr(arr: &[u8]) -> u16 {
debug_assert!(arr.len() == 2);
@ -141,12 +137,12 @@ impl<M: Bus> CPU<M> {
AddressingMode::AbsoluteX => {
// Use [u8, ..2] from instruction as address, add X
// (Output: a 16-bit address)
OpInput::UseAddress(arr_to_addr(&slice).wrapping_add(xextend(x)))
OpInput::UseAddress(arr_to_addr(&slice).wrapping_add(x.into()))
}
AddressingMode::AbsoluteY => {
// Use [u8, ..2] from instruction as address, add Y
// (Output: a 16-bit address)
OpInput::UseAddress(arr_to_addr(&slice).wrapping_add(xextend(y)))
OpInput::UseAddress(arr_to_addr(&slice).wrapping_add(y.into()))
}
AddressingMode::Indirect => {
// Use [u8, ..2] from instruction as an address. Interpret the
@ -171,7 +167,7 @@ impl<M: Bus> CPU<M> {
// (Output: a 16-bit address)
let start = slice[0];
let slice = read_address(memory, u16::from(start));
OpInput::UseAddress(arr_to_addr(&slice).wrapping_add(xextend(y)))
OpInput::UseAddress(arr_to_addr(&slice).wrapping_add(y.into()))
}
};