6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-07-28 00:29:09 +00:00
Code Issues Projects Releases Wiki Activity

Some small simplifications of the 16-bit arithmetic operators.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2018-06-11 23:01:48 +01:00
parent 2d8c3d4b12
commit 7cb5e137f4
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Z80/inc/Z80.h
View File

@ -389,9 +389,9 @@ namespace EightBit {
bool jumpConditionalFlag(int flag);
bool callConditionalFlag(int flag);
void sbc(register16_t& operand, register16_t value);
void adc(register16_t& operand, register16_t value);
void add(register16_t& operand, register16_t value);
void sbc(register16_t value);
void adc(register16_t value);
void add(register16_t value);
void add(uint8_t value, int carry = 0);
void adc(uint8_t value);

44
Z80/src/Z80.cpp
View File

@ -191,64 +191,64 @@ bool EightBit::Z80::callConditionalFlag(const int flag) {
}
}
void EightBit::Z80::sbc(register16_t& operand, const register16_t value) {
void EightBit::Z80::sbc(const register16_t value) {
MEMPTR() = operand;
MEMPTR() = HL2();
const auto beforeNegative = MEMPTR().high & SF;
const auto valueNegative = value.high & SF;
const auto result = MEMPTR().word - value.word - (F() & CF);
operand.word = result;
HL2().word = result;
const auto afterNegative = operand.high & SF;
const auto afterNegative = HL2().high & SF;
setFlag(F(), SF, afterNegative);
clearFlag(F(), ZF, operand.word);
adjustHalfCarrySub(F(), MEMPTR().high, value.high, operand.high);
clearFlag(F(), ZF, HL2().word);
adjustHalfCarrySub(F(), MEMPTR().high, value.high, HL2().high);
adjustOverflowSub(F(), beforeNegative, valueNegative, afterNegative);
setFlag(F(), NF);
setFlag(F(), CF, result & Bit16);
adjustXY<Z80>(F(), operand.high);
adjustXY<Z80>(F(), HL2().high);
++MEMPTR().word;
}
void EightBit::Z80::adc(register16_t& operand, const register16_t value) {
void EightBit::Z80::adc(const register16_t value) {
MEMPTR() = operand;
MEMPTR() = HL2();
const auto beforeNegative = MEMPTR().high & SF;
const auto valueNegative = value.high & SF;
const auto result = MEMPTR().word + value.word + (F() & CF);
operand.word = result;
HL2().word = result;
const auto afterNegative = operand.high & SF;
const auto afterNegative = HL2().high & SF;
setFlag(F(), SF, afterNegative);
clearFlag(F(), ZF, operand.word);
adjustHalfCarryAdd(F(), MEMPTR().high, value.high, operand.high);
clearFlag(F(), ZF, HL2().word);
adjustHalfCarryAdd(F(), MEMPTR().high, value.high, HL2().high);
adjustOverflowAdd(F(), beforeNegative, valueNegative, afterNegative);
clearFlag(F(), NF);
setFlag(F(), CF, result & Bit16);
adjustXY<Z80>(F(), operand.high);
adjustXY<Z80>(F(), HL2().high);
++MEMPTR().word;
}
void EightBit::Z80::add(register16_t& operand, const register16_t value) {
void EightBit::Z80::add(const register16_t value) {
MEMPTR() = operand;
MEMPTR() = HL2();
const auto result = MEMPTR().word + value.word;
operand.word = result;
HL2().word = result;
clearFlag(F(), NF);
setFlag(F(), CF, result & Bit16);
adjustHalfCarryAdd(F(), MEMPTR().high, value.high, operand.high);
adjustXY<Z80>(F(), operand.high);
adjustHalfCarryAdd(F(), MEMPTR().high, value.high, HL2().high);
adjustXY<Z80>(F(), HL2().high);
++MEMPTR().word;
}
@ -868,10 +868,10 @@ void EightBit::Z80::executeED(const int x, const int y, const int z, const int p
case 2: // 16-bit add/subtract with carry
switch (q) {
case 0: // SBC HL, rp[p]
sbc(HL2(), RP(p));
sbc(RP(p));
break;
case 1: // ADC HL, rp[p]
adc(HL2(), RP(p));
adc(RP(p));
break;
default:
UNREACHABLE;
@ -1128,7 +1128,7 @@ void EightBit::Z80::executeOther(const int x, const int y, const int z, const in
addCycles(10);
break;
case 1: // ADD HL,rp
add(HL2(), RP(p));
add(RP(p));
addCycles(11);
break;
default: