madmaurice/vgbc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cpu/cpu - Fix F register

Browse source
This commit is contained in:
madmaurice 2023-09-01 23:43:24 +02:00
parent 899cebb698
commit 243553acba
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cpu/cpu.cpp
View file

@ -8,27 +8,23 @@
void Cpu_state::setAF(u16 v) void Cpu_state::setAF(u16 v)
{ {
A = (u8)(v >> 8); A = (u8)(v >> 8);
zero = (v & 0x80 != 0); zero = ((v & F_ZERO) != 0);
subtract = (v & 0x40 != 0); subtract = ((v & F_SUB) != 0);
halfcarry = (v & 0x20 != 0); halfcarry = ((v & F_HALF) != 0);
carry = (v & 0x10 != 0); carry = ((v & F_CARRY) != 0);
} }
u16 Cpu_state::getAF() u16 Cpu_state::getAF()
{ {
return ((u16)A << 8) | return ((u16)A << 8) | getF();
(zero ? 0x80 : 0) |
(subtract ? 0x40 : 0) |
(halfcarry ? 0x20 : 0) |
(carry ? 0x10 : 0);
} }
u8 Cpu_state::getF() u8 Cpu_state::getF()
{ {
return (zero ? 0x80 : 0) | return (zero ? F_ZERO : 0) |
(subtract ? 0x40 : 0) | (subtract ? F_SUB : 0) |
(halfcarry ? 0x20 : 0) | (halfcarry ? F_HALF : 0) |
(carry ? 0x10 : 0); (carry ? F_CARRY : 0);
} }
u8& Cpu_state::reg8(Cpu& cpu, u8 idx) u8& Cpu_state::reg8(Cpu& cpu, u8 idx)

8
cpu/cpu.h
View file

@ -8,10 +8,10 @@
typedef u8 opcode_t; typedef u8 opcode_t;
enum Flags { enum Flags {
F_ZERO = 0x8, F_ZERO = 0x80,
F_SUB = 0x4, F_SUB = 0x40,
F_HALF = 0x2, F_HALF = 0x20,
F_CARRY = 0x1, F_CARRY = 0x10,
}; };
enum AluOp : int { enum AluOp : int {