FatalErrorCoded/invadeez
1
0
Fork 0
forked from Lea/invadeez
Code Issues Pull requests Packages Projects Releases Wiki Activity

add extra derives on structs and enums

Browse source
This commit is contained in:
Martin Löffler 2023-01-25 22:56:19 +01:00
parent 1b7b942dff
commit 4017733dce
Signed by: FatalErrorCoded
GPG key ID: FFEF368AC076566A
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/emulator/instructions/arithmetic.rs
View file

@ -20,7 +20,7 @@ fn set_cc(state: &mut EmulatorState, result: u16, flags: u8) {
/// Add values of `register` and `A` /// Add values of `register` and `A`
pub fn add(register: Register, state: &mut EmulatorState) { pub fn add(register: Register, state: &mut EmulatorState) {
let result = get_register(&register, state) as u16 + state.a as u16; let result = get_register(register, state) as u16 + state.a as u16;
set_cc(state, result, 0b1111); set_cc(state, result, 0b1111);
state.a = (result & 0xff) as u8; state.a = (result & 0xff) as u8;
} }
@ -34,7 +34,7 @@ pub fn adi(byte: u8, state: &mut EmulatorState) {
/// Add values of `register` and `A` and add +1 if carry bit is set /// Add values of `register` and `A` and add +1 if carry bit is set
pub fn adc(register: Register, state: &mut EmulatorState) { pub fn adc(register: Register, state: &mut EmulatorState) {
let result = get_register(&register, state) as u16 + state.a as u16 + u16::from(state.cc.c); let result = get_register(register, state) as u16 + state.a as u16 + u16::from(state.cc.c);
set_cc(state, result, 0b1111); set_cc(state, result, 0b1111);
state.a = (result & 0xff) as u8; state.a = (result & 0xff) as u8;
} }
@ -64,14 +64,14 @@ pub fn dad(register: Register, state: &mut EmulatorState) {
/// Increase register /// Increase register
pub fn inr(register: Register, state: &mut EmulatorState) { pub fn inr(register: Register, state: &mut EmulatorState) {
let (result, _) = get_register(&register, state).overflowing_add(1); let (result, _) = get_register(register, state).overflowing_add(1);
set_cc(state, result as u16, 0b1101); set_cc(state, result as u16, 0b1101);
set_register(&register, result, state); set_register(register, result, state);
} }
/// Decrease register /// Decrease register
pub fn dcr(register: Register, state: &mut EmulatorState) { pub fn dcr(register: Register, state: &mut EmulatorState) {
let (result, _) = get_register(&register, state).overflowing_sub(1); let (result, _) = get_register(register, state).overflowing_sub(1);
set_cc(state, result as u16, 0b1101); set_cc(state, result as u16, 0b1101);
set_register(&register, result, state); set_register(register, result, state);
} }

8
src/emulator/structs.rs
View file

@ -1,5 +1,6 @@
use crate::MEMORY_SIZE; use crate::MEMORY_SIZE;
#[derive(Clone, PartialEq, Eq, Debug)]
pub struct EmulatorState { pub struct EmulatorState {
pub a: u8, pub a: u8,
pub b: u8, pub b: u8,
@ -21,6 +22,7 @@ pub struct EmulatorState {
pub memory: [u8; MEMORY_SIZE], pub memory: [u8; MEMORY_SIZE],
} }
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
pub struct ConditionCodes { pub struct ConditionCodes {
/// Zero (Z), set if the result is zero. /// Zero (Z), set if the result is zero.
pub z: bool, pub z: bool,
@ -35,7 +37,7 @@ pub struct ConditionCodes {
// ac: bool, // ac: bool,
} }
#[derive(PartialEq, Debug)] #[derive(Clone, Copy, PartialEq, Eq, Debug)]
pub enum Register { pub enum Register {
B, B,
C, C,
@ -63,7 +65,7 @@ pub fn register_from_num(b: u8) -> Register {
} }
} }
pub fn get_register(register: &Register, state: &EmulatorState) -> u8 { pub fn get_register(register: Register, state: &EmulatorState) -> u8 {
match register { match register {
Register::B => state.b, Register::B => state.b,
Register::C => state.c, Register::C => state.c,
@ -77,7 +79,7 @@ pub fn get_register(register: &Register, state: &EmulatorState) -> u8 {
} }
} }
pub fn set_register(register: &Register, value: u8, state: &mut EmulatorState) { pub fn set_register(register: Register, value: u8, state: &mut EmulatorState) {
match register { match register {
Register::B => state.b = value, Register::B => state.b = value,
Register::C => state.c = value, Register::C => state.c = value,