cpu/decoder - Fix build errors
This commit is contained in:
parent
517577d546
commit
ef2615c1a7
1 changed files with 14 additions and 11 deletions
|
@ -176,7 +176,7 @@ void Cpu::executeInstruction()
|
||||||
{
|
{
|
||||||
u16 rhs = state.reg16((op >> 4) & 0x3);
|
u16 rhs = state.reg16((op >> 4) & 0x3);
|
||||||
u16 res12 = (state.HL & 0x0FFF) + (rhs & 0x0FFF);
|
u16 res12 = (state.HL & 0x0FFF) + (rhs & 0x0FFF);
|
||||||
state.halfcarry = (res11 & 0x1000);
|
state.halfcarry = (res12 & 0x1000);
|
||||||
u32 res32 = (u32)state.HL + (u32)rhs;
|
u32 res32 = (u32)state.HL + (u32)rhs;
|
||||||
state.carry = (res32 & 0x10000);
|
state.carry = (res32 & 0x10000);
|
||||||
state.subtract = false;
|
state.subtract = false;
|
||||||
|
@ -457,16 +457,19 @@ void Cpu::executeInstruction()
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 0xE8: // ADD SP, e8
|
case 0xE8: // ADD SP, e8
|
||||||
u32 lhs = state.SP;
|
{
|
||||||
s32 rhs = (s8)readPC8();
|
u32 lhs = state.SP;
|
||||||
u32 low_add = (lhs & 0x0FFF) + (rhs & 0x0FFF);
|
s32 rhs = (s8)readPC8();
|
||||||
state.halfcarry = (low_add & 0x1000);
|
u32 low_add = (lhs & 0x0FFF) + (rhs & 0x0FFF);
|
||||||
u32 res32 = lhs + rhs;
|
state.halfcarry = (low_add & 0x1000);
|
||||||
state.carry = (res32 & 0x10000);
|
u32 res32 = lhs + rhs;
|
||||||
state.SP = (u16)res32;
|
state.carry = (res32 & 0x10000);
|
||||||
state.subtract = false;
|
state.SP = (u16)res32;
|
||||||
state.zero = false;
|
state.subtract = false;
|
||||||
mcycles = 4;
|
state.zero = false;
|
||||||
|
mcycles = 4;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
panic("Unknown opcode 0x%x\n",op);
|
panic("Unknown opcode 0x%x\n",op);
|
||||||
|
|
Loading…
Reference in a new issue