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 flag updates

This commit is contained in:
Jeffrey Pfau 2016-01-20 23:44:46 -08:00
parent 9de8576e71
commit d1763869c6
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,38 +263,38 @@ static void _LR35902InstructionLDA_Bus(struct LR35902Core*);
#define DEFINE_ADD_INSTRUCTION_LR35902(NAME, OPERAND) \ #define DEFINE_ADD_INSTRUCTION_LR35902(NAME, OPERAND) \
DEFINE_INSTRUCTION_LR35902(ADD ## NAME, \ DEFINE_INSTRUCTION_LR35902(ADD ## NAME, \
int diff = cpu->a + OPERAND; \ int diff = cpu->a + OPERAND; \
cpu->a = diff; \
cpu->f.n = 0; \ cpu->f.n = 0; \
cpu->f.z = !cpu->a; \
cpu->f.h = (cpu->a & 0xF) + (OPERAND & 0xF) >= 0x10; \ cpu->f.h = (cpu->a & 0xF) + (OPERAND & 0xF) >= 0x10; \
cpu->f.c = diff >= 0x100;) cpu->f.c = diff >= 0x100; \
cpu->a = diff; \
cpu->f.z = !cpu->a;)
#define DEFINE_ADC_INSTRUCTION_LR35902(NAME, OPERAND) \ #define DEFINE_ADC_INSTRUCTION_LR35902(NAME, OPERAND) \
DEFINE_INSTRUCTION_LR35902(ADC ## NAME, \ DEFINE_INSTRUCTION_LR35902(ADC ## NAME, \
int diff = cpu->a + OPERAND + cpu->f.c; \ int diff = cpu->a + OPERAND + cpu->f.c; \
cpu->a = diff; \
cpu->f.n = 0; \ cpu->f.n = 0; \
cpu->f.z = !cpu->a; \ cpu->f.h = (cpu->a & 0xF) + (OPERAND & 0xF) + cpu->f.c >= 0x10; \
cpu->f.h = (cpu->a & 0xF) + ((OPERAND + cpu->f.c) & 0xF) >= 0x10; \ cpu->f.c = diff >= 0x100; \
cpu->f.c = diff > 0x100;) cpu->a = diff; \
cpu->f.z = !cpu->a;)
#define DEFINE_SUB_INSTRUCTION_LR35902(NAME, OPERAND) \ #define DEFINE_SUB_INSTRUCTION_LR35902(NAME, OPERAND) \
DEFINE_INSTRUCTION_LR35902(SUB ## NAME, \ DEFINE_INSTRUCTION_LR35902(SUB ## NAME, \
int diff = cpu->a - OPERAND; \ int diff = cpu->a - OPERAND; \
cpu->a = diff; \
cpu->f.n = 1; \ cpu->f.n = 1; \
cpu->f.z = !cpu->a; \
cpu->f.h = (cpu->a & 0xF) - (OPERAND & 0xF) < 0; \ cpu->f.h = (cpu->a & 0xF) - (OPERAND & 0xF) < 0; \
cpu->f.c = diff < 0;) cpu->f.c = diff < 0; \
cpu->a = diff; \
cpu->f.z = !cpu->a;)
#define DEFINE_SBC_INSTRUCTION_LR35902(NAME, OPERAND) \ #define DEFINE_SBC_INSTRUCTION_LR35902(NAME, OPERAND) \
DEFINE_INSTRUCTION_LR35902(SBC ## NAME, \ DEFINE_INSTRUCTION_LR35902(SBC ## NAME, \
int diff = cpu->a - OPERAND - cpu->f.c; \ int diff = cpu->a - OPERAND - cpu->f.c; \
cpu->a = diff; \
cpu->f.n = 1; \ cpu->f.n = 1; \
cpu->f.z = !cpu->a; \ cpu->f.h = (cpu->a & 0xF) - (OPERAND & 0xF) - cpu->f.c < 0; \
cpu->f.h = (cpu->a & 0xF) - ((OPERAND + cpu->f.c) & 0xF) < 0; \ cpu->f.c = diff < 0; \
cpu->f.c = diff < 0;) cpu->a = diff; \
cpu->f.z = !cpu->a;)
DEFINE_ALU_INSTRUCTION_LR35902(LDB_); DEFINE_ALU_INSTRUCTION_LR35902(LDB_);
DEFINE_ALU_INSTRUCTION_LR35902(LDC_); DEFINE_ALU_INSTRUCTION_LR35902(LDC_);
@ -502,9 +502,9 @@ 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->h = diff; \
cpu->f.c = diff >= 0x100; \ cpu->f.c = diff >= 0x100; \
cpu->f.n = 0; \ cpu->f.n = 0; \
cpu->h = diff; \
/* TODO: Find explanation of H flag */) \ /* TODO: Find explanation of H flag */) \
DEFINE_INSTRUCTION_LR35902(ADDHL_ ## REG, \ DEFINE_INSTRUCTION_LR35902(ADDHL_ ## REG, \
int diff = L + cpu->l; \ int diff = L + cpu->l; \
@ -522,28 +522,28 @@ DEFINE_ADD_HL_INSTRUCTION_LR35902(SP, (cpu->sp & 0xFF), (cpu->sp >> 8));
#define DEFINE_INC_INSTRUCTION_LR35902(NAME, OPERAND) \ #define DEFINE_INC_INSTRUCTION_LR35902(NAME, OPERAND) \
DEFINE_INSTRUCTION_LR35902(INC ## NAME, \ DEFINE_INSTRUCTION_LR35902(INC ## NAME, \
int diff = OPERAND + 1; \ int diff = OPERAND + 1; \
cpu->f.h = (OPERAND & 0xF) == 0xF; \
OPERAND = diff; \ OPERAND = diff; \
cpu->f.n = 0; \ cpu->f.n = 0; \
cpu->f.z = !OPERAND; \ cpu->f.z = !OPERAND;)
/* TODO: Find explanation of H flag */)
#define DEFINE_DEC_INSTRUCTION_LR35902(NAME, OPERAND) \ #define DEFINE_DEC_INSTRUCTION_LR35902(NAME, OPERAND) \
DEFINE_INSTRUCTION_LR35902(DEC ## NAME, \ DEFINE_INSTRUCTION_LR35902(DEC ## NAME, \
int diff = OPERAND - 1; \ int diff = OPERAND - 1; \
cpu->f.h = (OPERAND & 0xF) == 0x0; \
OPERAND = diff; \ OPERAND = diff; \
cpu->f.n = 1; \ cpu->f.n = 1; \
cpu->f.z = !OPERAND; \ cpu->f.z = !OPERAND;)
/* TODO: Find explanation of H flag */)
DEFINE_ALU_INSTRUCTION_LR35902_NOHL(INC); DEFINE_ALU_INSTRUCTION_LR35902_NOHL(INC);
DEFINE_ALU_INSTRUCTION_LR35902_NOHL(DEC); DEFINE_ALU_INSTRUCTION_LR35902_NOHL(DEC);
DEFINE_INSTRUCTION_LR35902(INC_HLDelay, DEFINE_INSTRUCTION_LR35902(INC_HLDelay,
int diff = cpu->bus + 1; int diff = cpu->bus + 1;
cpu->bus = diff;
cpu->f.n = 0; cpu->f.n = 0;
cpu->f.z = !cpu->bus;
cpu->f.h = (cpu->bus & 0xF) == 0xF; cpu->f.h = (cpu->bus & 0xF) == 0xF;
cpu->bus = diff;
cpu->f.z = !cpu->bus;
cpu->instruction = _LR35902InstructionNOP; cpu->instruction = _LR35902InstructionNOP;
cpu->executionState = LR35902_CORE_MEMORY_STORE;) cpu->executionState = LR35902_CORE_MEMORY_STORE;)
@ -554,10 +554,10 @@ DEFINE_INSTRUCTION_LR35902(INC_HL,
DEFINE_INSTRUCTION_LR35902(DEC_HLDelay, DEFINE_INSTRUCTION_LR35902(DEC_HLDelay,
int diff = cpu->bus - 1; int diff = cpu->bus - 1;
cpu->bus = diff;
cpu->f.n = 1; cpu->f.n = 1;
cpu->f.z = !cpu->bus;
cpu->f.h = (cpu->bus & 0xF) == 0; cpu->f.h = (cpu->bus & 0xF) == 0;
cpu->bus = diff;
cpu->f.z = !cpu->bus;
cpu->instruction = _LR35902InstructionNOP; cpu->instruction = _LR35902InstructionNOP;
cpu->executionState = LR35902_CORE_MEMORY_STORE;) cpu->executionState = LR35902_CORE_MEMORY_STORE;)
@ -705,7 +705,7 @@ DEFINE_INSTRUCTION_LR35902(RRA_,
cpu->f.z = 0; cpu->f.z = 0;
cpu->f.h = 0; cpu->f.h = 0;
cpu->f.n = 0; cpu->f.n = 0;
cpu->f.c = cpu->f.c = low;) cpu->f.c = low;)
DEFINE_INSTRUCTION_LR35902(RRCA_, DEFINE_INSTRUCTION_LR35902(RRCA_,
int low = cpu->a & 1; int low = cpu->a & 1;