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

LR35902: Implement DAA

This commit is contained in:
Jeffrey Pfau 2016-01-20 22:35:34 -08:00
parent f8469822d7
commit 6c399882f9
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lr35902/emitter-lr35902.h
View File

@ -49,7 +49,7 @@
DECLARE_INSTRUCTION_LR35902(EMITTER, INCH), \ DECLARE_INSTRUCTION_LR35902(EMITTER, INCH), \
DECLARE_INSTRUCTION_LR35902(EMITTER, DECH), \ DECLARE_INSTRUCTION_LR35902(EMITTER, DECH), \
DECLARE_INSTRUCTION_LR35902(EMITTER, LDH_), \ DECLARE_INSTRUCTION_LR35902(EMITTER, LDH_), \
DECLARE_INSTRUCTION_LR35902(EMITTER, STUB), \ DECLARE_INSTRUCTION_LR35902(EMITTER, DAA), \
DECLARE_INSTRUCTION_LR35902(EMITTER, JRZ), \ DECLARE_INSTRUCTION_LR35902(EMITTER, JRZ), \
DECLARE_INSTRUCTION_LR35902(EMITTER, ADDHL_HL), \ DECLARE_INSTRUCTION_LR35902(EMITTER, ADDHL_HL), \
DECLARE_INSTRUCTION_LR35902(EMITTER, LDA_IHL), \ DECLARE_INSTRUCTION_LR35902(EMITTER, LDA_IHL), \

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

@ -159,8 +159,8 @@ DEFINE_CONDITIONAL_INSTRUCTION_LR35902(RET)
int diff = cpu->a - OPERAND; \ int diff = cpu->a - OPERAND; \
cpu->f.n = 1; \ cpu->f.n = 1; \
cpu->f.z = !diff; \ cpu->f.z = !diff; \
cpu->f.c = diff < 0; \ cpu->f.h = (cpu->a & 0xF) - (OPERAND & 0xF) < 0; \
/* TODO: Find explanation of H flag */) cpu->f.c = diff < 0;)
#define DEFINE_LDB__INSTRUCTION_LR35902(NAME, OPERAND) \ #define DEFINE_LDB__INSTRUCTION_LR35902(NAME, OPERAND) \
DEFINE_INSTRUCTION_LR35902(LDB_ ## NAME, \ DEFINE_INSTRUCTION_LR35902(LDB_ ## NAME, \
@ -266,8 +266,8 @@ static void _LR35902InstructionLDA_Bus(struct LR35902Core*);
cpu->a = diff; \ cpu->a = diff; \
cpu->f.n = 0; \ cpu->f.n = 0; \
cpu->f.z = !diff; \ cpu->f.z = !diff; \
cpu->f.c = diff >= 0x100; \ cpu->f.h = (cpu->a & 0xF) + (OPERAND & 0xF) >= 0x10; \
/* TODO: Find explanation of H flag */) cpu->f.c = diff >= 0x100;)
#define DEFINE_ADC_INSTRUCTION_LR35902(NAME, OPERAND) \ #define DEFINE_ADC_INSTRUCTION_LR35902(NAME, OPERAND) \
DEFINE_INSTRUCTION_LR35902(ADC ## NAME, \ DEFINE_INSTRUCTION_LR35902(ADC ## NAME, \
@ -275,8 +275,8 @@ static void _LR35902InstructionLDA_Bus(struct LR35902Core*);
cpu->a = diff; \ cpu->a = diff; \
cpu->f.n = 0; \ cpu->f.n = 0; \
cpu->f.z = !diff; \ cpu->f.z = !diff; \
cpu->f.c = diff > 0x100; \ cpu->f.h = (cpu->a & 0xF) + ((OPERAND + cpu->f.c) & 0xF) >= 0x10; \
/* TODO: Find explanation of H flag */) cpu->f.c = diff > 0x100;)
#define DEFINE_SUB_INSTRUCTION_LR35902(NAME, OPERAND) \ #define DEFINE_SUB_INSTRUCTION_LR35902(NAME, OPERAND) \
DEFINE_INSTRUCTION_LR35902(SUB ## NAME, \ DEFINE_INSTRUCTION_LR35902(SUB ## NAME, \
@ -284,8 +284,8 @@ static void _LR35902InstructionLDA_Bus(struct LR35902Core*);
cpu->a = diff; \ cpu->a = diff; \
cpu->f.n = 1; \ cpu->f.n = 1; \
cpu->f.z = !diff; \ cpu->f.z = !diff; \
cpu->f.c = diff < 0; \ cpu->f.h = (cpu->a & 0xF) - (OPERAND & 0xF) < 0; \
/* TODO: Find explanation of H flag */) cpu->f.c = diff < 0;)
#define DEFINE_SBC_INSTRUCTION_LR35902(NAME, OPERAND) \ #define DEFINE_SBC_INSTRUCTION_LR35902(NAME, OPERAND) \
DEFINE_INSTRUCTION_LR35902(SBC ## NAME, \ DEFINE_INSTRUCTION_LR35902(SBC ## NAME, \
@ -293,8 +293,8 @@ static void _LR35902InstructionLDA_Bus(struct LR35902Core*);
cpu->a = diff; \ cpu->a = diff; \
cpu->f.n = 1; \ cpu->f.n = 1; \
cpu->f.z = !diff; \ cpu->f.z = !diff; \
cpu->f.c = diff < 0; \ cpu->f.h = (cpu->a & 0xF) - ((OPERAND + cpu->f.c) & 0xF) < 0; \
/* TODO: Find explanation of H flag */) cpu->f.c = diff < 0;)
DEFINE_ALU_INSTRUCTION_LR35902(LDB_); DEFINE_ALU_INSTRUCTION_LR35902(LDB_);
DEFINE_ALU_INSTRUCTION_LR35902(LDC_); DEFINE_ALU_INSTRUCTION_LR35902(LDC_);
@ -543,7 +543,7 @@ DEFINE_INSTRUCTION_LR35902(INC_HLDelay,
cpu->bus = diff; cpu->bus = diff;
cpu->f.n = 0; cpu->f.n = 0;
cpu->f.z = !diff; cpu->f.z = !diff;
/* TODO: Find explanation of H flag */ cpu->f.h = (cpu->bus & 0xF) == 0xF;
cpu->instruction = _LR35902InstructionNOP; cpu->instruction = _LR35902InstructionNOP;
cpu->executionState = LR35902_CORE_MEMORY_STORE;) cpu->executionState = LR35902_CORE_MEMORY_STORE;)
@ -557,7 +557,7 @@ DEFINE_INSTRUCTION_LR35902(DEC_HLDelay,
cpu->bus = diff; cpu->bus = diff;
cpu->f.n = 1; cpu->f.n = 1;
cpu->f.z = !diff; cpu->f.z = !diff;
/* TODO: Find explanation of H flag */ cpu->f.h = (cpu->bus & 0xF) == 0;
cpu->instruction = _LR35902InstructionNOP; cpu->instruction = _LR35902InstructionNOP;
cpu->executionState = LR35902_CORE_MEMORY_STORE;) cpu->executionState = LR35902_CORE_MEMORY_STORE;)
@ -589,6 +589,19 @@ DEFINE_INSTRUCTION_LR35902(CPL_,
cpu->f.h = 1; cpu->f.h = 1;
cpu->f.n = 1;) cpu->f.n = 1;)
DEFINE_INSTRUCTION_LR35902(DAA,
if ((cpu->a & 0xF) > 0x9 || cpu->f.h) {
cpu->a += 0x6;
}
if ((cpu->a & 0xF0) > 0x90 || cpu->f.c) {
cpu->a += 0x60;
cpu->f.c = 1;
} else {
cpu->f.c = 0;
}
cpu->f.h = 0;
cpu->f.z = !cpu->a;)
#define DEFINE_POPPUSH_INSTRUCTION_LR35902(REG, HH, H, L) \ #define DEFINE_POPPUSH_INSTRUCTION_LR35902(REG, HH, H, L) \
DEFINE_INSTRUCTION_LR35902(POP ## REG ## Delay, \ DEFINE_INSTRUCTION_LR35902(POP ## REG ## Delay, \
cpu-> L = cpu->bus; \ cpu-> L = cpu->bus; \