ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LR35902: Fix a bunch of flags

This commit is contained in:
Jeffrey Pfau 2016-01-21 23:10:32 -08:00
parent 02132b2cac
commit 564810425e
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lr35902/isa-lr35902.c
View File

@ -216,13 +216,14 @@ DEFINE_INSTRUCTION_LR35902(LDHL_, \
cpu->instruction = _LR35902InstructionLDHL_Bus;) cpu->instruction = _LR35902InstructionLDHL_Bus;)
DEFINE_INSTRUCTION_LR35902(LDHL_SPDelay, DEFINE_INSTRUCTION_LR35902(LDHL_SPDelay,
int diff = cpu->sp + (int8_t) cpu->bus; int diff = (int8_t) cpu->bus;
LR35902WriteHL(cpu, diff); int sum = cpu->sp + diff;
LR35902WriteHL(cpu, sum);
cpu->executionState = LR35902_CORE_STALL; cpu->executionState = LR35902_CORE_STALL;
cpu->f.z = 0; cpu->f.z = 0;
cpu->f.n = 0; cpu->f.n = 0;
cpu->f.c = !!(diff & 0xFFFF0000); cpu->f.c = (diff & 0xFF) + (cpu->sp & 0xFF) >= 0x100;
/* Figure out h flag*/) cpu->f.h = (diff & 0xF) + (cpu->sp & 0xF) >= 0x10;)
DEFINE_INSTRUCTION_LR35902(LDHL_SP, DEFINE_INSTRUCTION_LR35902(LDHL_SP,
cpu->executionState = LR35902_CORE_READ_PC; cpu->executionState = LR35902_CORE_READ_PC;
@ -316,14 +317,15 @@ DEFINE_INSTRUCTION_LR35902(ADDSPFinish,
cpu->executionState = LR35902_CORE_STALL;) cpu->executionState = LR35902_CORE_STALL;)
DEFINE_INSTRUCTION_LR35902(ADDSPDelay, DEFINE_INSTRUCTION_LR35902(ADDSPDelay,
int diff = cpu->sp + (int8_t) cpu->bus; int diff = (int8_t) cpu->bus;
cpu->index = diff; int sum = cpu->sp + diff;
cpu->index = sum;
cpu->executionState = LR35902_CORE_OP2; cpu->executionState = LR35902_CORE_OP2;
cpu->instruction = _LR35902InstructionADDSPFinish; cpu->instruction = _LR35902InstructionADDSPFinish;
cpu->f.z = 0; cpu->f.z = 0;
cpu->f.n = 0; cpu->f.n = 0;
cpu->f.c = !!(diff & 0xFFFF0000); cpu->f.c = (diff & 0xFF) + (cpu->sp & 0xFF) >= 0x100;
/* Figure out h flag*/) cpu->f.h = (diff & 0xF) + (cpu->sp & 0xF) >= 0x10;)
DEFINE_INSTRUCTION_LR35902(ADDSP, DEFINE_INSTRUCTION_LR35902(ADDSP,
cpu->executionState = LR35902_CORE_READ_PC; cpu->executionState = LR35902_CORE_READ_PC;
@ -502,10 +504,10 @@ DEFINE_INCDEC_WIDE_INSTRUCTION_LR35902(HL);
#define DEFINE_ADD_HL_INSTRUCTION_LR35902(REG, L, H) \ #define DEFINE_ADD_HL_INSTRUCTION_LR35902(REG, L, H) \
DEFINE_INSTRUCTION_LR35902(ADDHL_ ## REG ## Finish, \ DEFINE_INSTRUCTION_LR35902(ADDHL_ ## REG ## Finish, \
int diff = H + cpu->h + cpu->f.c; \ int diff = H + cpu->h + cpu->f.c; \
cpu->f.c = diff >= 0x100; \
cpu->f.n = 0; \ cpu->f.n = 0; \
cpu->h = diff; \ cpu->f.h = (H & 0xF) + (cpu->h & 0xF) + cpu->f.c >= 0x10; \
/* TODO: Find explanation of H flag */) \ cpu->f.c = diff >= 0x100; \
cpu->h = diff;) \
DEFINE_INSTRUCTION_LR35902(ADDHL_ ## REG, \ DEFINE_INSTRUCTION_LR35902(ADDHL_ ## REG, \
int diff = L + cpu->l; \ int diff = L + cpu->l; \
cpu->l = diff; \ cpu->l = diff; \