chief/rustyboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix writing to F register

Browse Source
This commit is contained in:
Kevin Hamacher 2016-05-29 14:34:34 +02:00
parent 47a4b0c720
commit 691147631a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cpu.rs
View File

@ -79,7 +79,7 @@ impl CPU {
if reg_id == REG_N_A { if reg_id == REG_N_A {
self.regs[REG_A] = value; self.regs[REG_A] = value;
} else if reg_id == REG_N_F { } else if reg_id == REG_N_F {
self.flags = value; self.flags = value & 0xF0;
} else if reg_id == REG_N_HL { } else if reg_id == REG_N_HL {
let addr: u16 = self.get_pair_value(REG_N_H, REG_N_L); let addr: u16 = self.get_pair_value(REG_N_H, REG_N_L);
self.interconnect.write_byte(addr, value); self.interconnect.write_byte(addr, value);
@ -1192,9 +1192,8 @@ impl CPU {
println!("AND {}", REG_NAMES[reg_id]); println!("AND {}", REG_NAMES[reg_id]);
} }
self.regs[REG_A] &= self.get_8bit_reg(reg_id); self.regs[REG_A] &= self.get_8bit_reg(reg_id);
self.clear_flag(FLAG_N);
let v = self.regs[REG_A]; let v = self.regs[REG_A];
self.set_clear_flag(FLAG_Z, v == 0); self.set_clear_flag(FLAG_Z, v == 0);
self.clear_flag(FLAG_N); self.clear_flag(FLAG_N);
self.set_flag(FLAG_H); self.set_flag(FLAG_H);