tatami
/
ttgb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ld from hmem and basic cmp
/ build (push) Successful in 26s Details

This commit is contained in:
45Tatami 2024-04-13 22:20:42 +02:00
parent 0638bcf635
commit 34de965cd5
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/emu.rs
View File

@ -21,13 +21,16 @@ pub struct GameBoy {
bp_manager: BreakPointManager,
}
#[derive(Clone, Copy, Debug)]
#[derive(Clone, Copy, Debug, PartialEq)]
enum Flag {
Z, N, H ,CY
}
fn flag_set(f: Flag, v: u8) -> bool {
use Flag::*;
if f == CY || f == H || f == N {
println!("FIXME reading unimplemented flag {f:?}");
}
match f {
Z => v << 0 >> 7 == 1,
N => v << 1 >> 7 == 1,
@ -120,6 +123,15 @@ impl GameBoy {
// no checks for special registers
}
fn get_value(&mut self, src: ValSrc) -> u8 {
match src {
ValSrc::Direct => self.mem[self.pc as usize + 1],
ValSrc::Reg(_) => todo!(),
ValSrc::Mem(_) => todo!(),
ValSrc::HMem(_) => todo!()
}
}
pub fn load<T: io::Read>(&mut self, mut src: T) {
let mut buf = Vec::<u8>::new();
let _ = src.read_to_end(&mut buf);
@ -199,7 +211,14 @@ impl GameBoy {
}
AddrLoc::Direct => todo!(),
}
ValSrc::HMem(_) => todo!(),
ValSrc::HMem(ref src) => match src {
AddrLoc::Direct => {
println!("FIXME reading from hmem, possibly using an unimplemented feature");
let offs = self.mem[pc + 1];
(&mut self.mem[0xFF00 + offs as usize], 0)
}
AddrLoc::Reg(_) => todo!()
}
};
let val = *src_ref;
@ -306,7 +325,7 @@ impl GameBoy {
};
let regs = &self.reg[..8];
println!("\u{1B}[1;31mpc:{pc:#08x}:{win:02x?} {op:?} {regs:?}\u{1B}[0m");
println!("\u{1B}[1;31mpc:{pc:#08x}\u{1B}[0m:{win:02x?} {op:?} {regs:?}");
match op.inst {
Unimpl(instr) => {
@ -397,6 +416,13 @@ impl GameBoy {
}
println!("Dec {dst:?}");
}
Cmp(src) => {
let a = self.reg[Register::A];
let b = self.get_value(src);
self.set_flag(Flag::N, true);
if a == b {
}
}
Ld(dst, src, post_op) => self.op_ld(dst, src, post_op),
Ld16(dst, src) => self.op_ld16(dst, src),
Bit(bit_op, src) => {

8
src/op.rs
View File

@ -29,6 +29,7 @@ pub enum Instr {
Inc(ValSrc),
Dec(ValSrc),
Bit(BitOp, ValSrc),
Cmp(ValSrc),
// CPU ctl
Di,
@ -209,6 +210,8 @@ impl TryFrom<u8> for Operation {
(Ld(Mem(AddrLoc::Direct), Reg(A), PostOp::None), 4, 3),
0b11_100_000 =>
(Ld(HMem(AddrLoc::Direct), Reg(A), PostOp::None), 3, 2),
0b11_110_000 =>
(Ld(Reg(A), HMem(AddrLoc::Direct), PostOp::None), 3, 2),
0b00_100_010 =>
(Ld(Mem(AddrLoc::Reg(HL)), Reg(A), PostOp::Inc(HL)), 2, 1),
0b00_101_010 =>
@ -217,6 +220,8 @@ impl TryFrom<u8> for Operation {
(Ld(Mem(AddrLoc::Reg(HL)), Reg(A), PostOp::Dec(HL)), 2, 1),
0b00_111_010 =>
(Ld(Reg(A), Mem(AddrLoc::Reg(HL)), PostOp::Dec(HL)), 2, 1),
0b10_111_110 => (Cmp(Mem(AddrLoc::Reg(HL))), 2, 1),
0b11_111_110 => (Cmp(Direct), 2, 2),
0b10_110_110 => (Bit(Or, Mem(AddrLoc::Reg(HL))), 2, 1),
0b10_101_110 => (Bit(Xor, Mem(AddrLoc::Reg(HL))), 2, 1),
0b10_100_110 => (Bit(And, Mem(AddrLoc::Reg(HL))), 2, 1),
@ -251,6 +256,8 @@ impl TryFrom<u8> for Operation {
(Dec(Reg(Register::try_from((value & T1_MSK) >> 3)?)), 1, 1)
}
}
_ if (value & (HD_MSK | T1_MSK) == 0b10_111_000) =>
(Cmp(Reg(Register::try_from(value & T2_MSK)?)), 1, 1),
_ if (value & (HD_MSK | 0b1_000 | T2_MSK) == 0b11_000_101) =>
(Psh(Register::repr_psh(payload(value))), 4, 1),
_ if (value & (HD_MSK | 0b1_000 | T2_MSK) == 0b11_000_001) =>
@ -274,6 +281,7 @@ impl TryFrom<u8> for Operation {
};
(Ld16(Reg(reg), Direct), 3, 3)
}
_ => (Unimpl(value), 0, 0),
};