Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 16:19:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

i8085: fix problem with daa opcode

Browse Source
This commit is contained in:
hap 2023-01-04 23:06:31 +01:00
parent a0bbc5cf9f
commit f44b3ca90c
2 changed files with 60 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/devices/cpu/i8085/i8085.cpp
View File

@ -9,8 +9,8 @@
* Partially based on information out of Z80Em by Marcel De Kogel * Partially based on information out of Z80Em by Marcel De Kogel
* *
* TODO: * TODO:
* - 8085 DAA fails on 8080/8085 CPU Exerciser
* - not sure if 8085 DSUB H flag is correct * - not sure if 8085 DSUB H flag is correct
* - accurate 8085 undocumented V/K flags
* - most of those is_8085 can probably be done better, like function overrides * - most of those is_8085 can probably be done better, like function overrides
* *
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
@ -102,8 +102,8 @@
* October 2012, hap * October 2012, hap
* - fixed H flag on subtraction opcodes * - fixed H flag on subtraction opcodes
* - on 8080, don't push the unsupported flags(X5, X3, V) to stack * - on 8080, don't push the unsupported flags(X5, X3, V) to stack
* - 8080 passes on 8080/8085 CPU Exerciser, 8085 errors only on the DAA test * - it passes on 8080/8085 CPU Exerciser (ref: http://www.idb.me.uk/sunhillow/8080.html
* (ref: http://www.idb.me.uk/sunhillow/8080.html - tests only 8080 opcodes) * tests only 8080 opcodes, link is dead so go via archive.org)
* *
*****************************************************************************/ *****************************************************************************/
@ -121,7 +121,7 @@
constexpr u8 SF = 0x80; constexpr u8 SF = 0x80;
constexpr u8 ZF = 0x40; constexpr u8 ZF = 0x40;
constexpr u8 X5F = 0x20; constexpr u8 KF = 0x20;
constexpr u8 HF = 0x10; constexpr u8 HF = 0x10;
constexpr u8 X3F = 0x08; constexpr u8 X3F = 0x08;
constexpr u8 PF = 0x04; constexpr u8 PF = 0x04;
@ -456,12 +456,11 @@ void i8085a_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index()) switch (entry.index())
{ {
case STATE_GENFLAGS: case STATE_GENFLAGS:
str = string_format("%c%c%c%c%c%c%c%c", str = string_format("%c%c%c%c.%c%c%c",
m_AF.b.l & 0x80 ? 'S':'.', m_AF.b.l & 0x80 ? 'S':'.',
m_AF.b.l & 0x40 ? 'Z':'.', m_AF.b.l & 0x40 ? 'Z':'.',
m_AF.b.l & 0x20 ? 'X':'.', // X5 m_AF.b.l & 0x20 ? 'K':'.', // X5
m_AF.b.l & 0x10 ? 'H':'.', m_AF.b.l & 0x10 ? 'H':'.',
m_AF.b.l & 0x08 ? '?':'.',
m_AF.b.l & 0x04 ? 'P':'.', m_AF.b.l & 0x04 ? 'P':'.',
m_AF.b.l & 0x02 ? 'V':'.', m_AF.b.l & 0x02 ? 'V':'.',
m_AF.b.l & 0x01 ? 'C':'.'); m_AF.b.l & 0x01 ? 'C':'.');
@ -469,6 +468,21 @@ void i8085a_cpu_device::state_string_export(const device_state_entry &entry, std
} }
} }
void i8080_cpu_device::state_string_export(const device_state_entry &entry, std::string &str) const
{
switch (entry.index())
{
case STATE_GENFLAGS:
str = string_format("%c%c.%c.%c.%c",
m_AF.b.l & 0x80 ? 'S':'.',
m_AF.b.l & 0x40 ? 'Z':'.',
m_AF.b.l & 0x10 ? 'H':'.',
m_AF.b.l & 0x04 ? 'P':'.',
m_AF.b.l & 0x01 ? 'C':'.');
break;
}
}
std::unique_ptr<util::disasm_interface> i8085a_cpu_device::create_disassembler() std::unique_ptr<util::disasm_interface> i8085a_cpu_device::create_disassembler()
{ {
return std::make_unique<i8085_disassembler>(); return std::make_unique<i8085_disassembler>();
@ -819,7 +833,7 @@ void i8085a_cpu_device::op_jmp(int cond)
if (cond) if (cond)
{ {
m_PC = read_arg16(); m_PC = read_arg16();
m_icount -= extra_jmp(); m_icount -= jmp_taken();
} }
else else
{ {
@ -832,7 +846,7 @@ void i8085a_cpu_device::op_call(int cond)
if (cond) if (cond)
{ {
PAIR p = read_arg16(); PAIR p = read_arg16();
m_icount -= extra_call(); m_icount -= call_taken();
op_push(m_PC); op_push(m_PC);
m_PC = p; m_PC = p;
} }
@ -847,7 +861,7 @@ void i8085a_cpu_device::op_ret(int cond)
// conditional RET only // conditional RET only
if (cond) if (cond)
{ {
m_icount -= extra_ret(); m_icount -= ret_taken();
m_PC = op_pop(); m_PC = op_pop();
} }
} }
@ -904,9 +918,9 @@ void i8085a_cpu_device::execute_one(int opcode)
if (is_8085()) if (is_8085())
{ {
if (m_BC.w.l == 0x0000) if (m_BC.w.l == 0x0000)
m_AF.b.l |= X5F; m_AF.b.l |= KF;
else else
m_AF.b.l &= ~X5F; m_AF.b.l &= ~KF;
} }
break; break;
case 0x04: // INR B case 0x04: // INR B
@ -946,9 +960,9 @@ void i8085a_cpu_device::execute_one(int opcode)
if (is_8085()) if (is_8085())
{ {
if (m_BC.w.l == 0xffff) if (m_BC.w.l == 0xffff)
m_AF.b.l |= X5F; m_AF.b.l |= KF;
else else
m_AF.b.l &= ~X5F; m_AF.b.l &= ~KF;
} }
break; break;
case 0x0c: // INR C case 0x0c: // INR C
@ -983,9 +997,9 @@ void i8085a_cpu_device::execute_one(int opcode)
if (is_8085()) if (is_8085())
{ {
if (m_DE.w.l == 0x0000) if (m_DE.w.l == 0x0000)
m_AF.b.l |= X5F; m_AF.b.l |= KF;
else else
m_AF.b.l &= ~X5F; m_AF.b.l &= ~KF;
} }
break; break;
case 0x14: // INR D case 0x14: // INR D
@ -1025,9 +1039,9 @@ void i8085a_cpu_device::execute_one(int opcode)
if (is_8085()) if (is_8085())
{ {
if (m_DE.w.l == 0xffff) if (m_DE.w.l == 0xffff)
m_AF.b.l |= X5F; m_AF.b.l |= KF;
else else
m_AF.b.l &= ~X5F; m_AF.b.l &= ~KF;
} }
break; break;
case 0x1c: // INR E case 0x1c: // INR E
@ -1072,9 +1086,9 @@ void i8085a_cpu_device::execute_one(int opcode)
if (is_8085()) if (is_8085())
{ {
if (m_HL.w.l == 0x0000) if (m_HL.w.l == 0x0000)
m_AF.b.l |= X5F; m_AF.b.l |= KF;
else else
m_AF.b.l &= ~X5F; m_AF.b.l &= ~KF;
} }
break; break;
case 0x24: // INR H case 0x24: // INR H
@ -1088,22 +1102,12 @@ void i8085a_cpu_device::execute_one(int opcode)
break; break;
case 0x27: // DAA case 0x27: // DAA
m_WZ.b.h = m_AF.b.h; m_WZ.b.h = m_AF.b.h;
if (is_8085() && m_AF.b.l & VF) if ((m_AF.b.l & HF) || ((m_AF.b.h & 0xf) > 9))
{ m_WZ.b.h += 6;
if ((m_AF.b.l & HF) || ((m_AF.b.h & 0xf) > 9)) if ((m_AF.b.l & CF) || (m_AF.b.h > 0x99))
m_WZ.b.h -= 6; m_WZ.b.h += 0x60;
if ((m_AF.b.l & CF) || (m_AF.b.h > 0x99))
m_WZ.b.h -= 0x60;
}
else
{
if ((m_AF.b.l & HF) || ((m_AF.b.h & 0xf) > 9))
m_WZ.b.h += 6;
if ((m_AF.b.l & CF) || (m_AF.b.h > 0x99))
m_WZ.b.h += 0x60;
}
m_AF.b.l = (m_AF.b.l & 3) | (m_AF.b.h & 0x28) | ((m_AF.b.h > 0x99) ? 1 : 0) | ((m_AF.b.h ^ m_WZ.b.h) & 0x10) | lut_zsp[m_WZ.b.h]; m_AF.b.l = (m_AF.b.l & 0x23) | ((m_AF.b.h > 0x99) ? 1 : 0) | ((m_AF.b.h ^ m_WZ.b.h) & 0x10) | lut_zsp[m_WZ.b.h];
m_AF.b.h = m_WZ.b.h; m_AF.b.h = m_WZ.b.h;
break; break;
@ -1128,9 +1132,9 @@ void i8085a_cpu_device::execute_one(int opcode)
if (is_8085()) if (is_8085())
{ {
if (m_HL.w.l == 0xffff) if (m_HL.w.l == 0xffff)
m_AF.b.l |= X5F; m_AF.b.l |= KF;
else else
m_AF.b.l &= ~X5F; m_AF.b.l &= ~KF;
} }
break; break;
case 0x2c: // INR L case 0x2c: // INR L
@ -1145,7 +1149,7 @@ void i8085a_cpu_device::execute_one(int opcode)
case 0x2f: // CMA case 0x2f: // CMA
m_AF.b.h ^= 0xff; m_AF.b.h ^= 0xff;
if (is_8085()) if (is_8085())
m_AF.b.l |= HF | VF; m_AF.b.l |= VF;
break; break;
case 0x30: // 8085: SIM, otherwise undocumented NOP case 0x30: // 8085: SIM, otherwise undocumented NOP
@ -1188,9 +1192,9 @@ void i8085a_cpu_device::execute_one(int opcode)
if (is_8085()) if (is_8085())
{ {
if (m_SP.w.l == 0x0000) if (m_SP.w.l == 0x0000)
m_AF.b.l |= X5F; m_AF.b.l |= KF;
else else
m_AF.b.l &= ~X5F; m_AF.b.l &= ~KF;
} }
break; break;
case 0x34: // INR M case 0x34: // INR M
@ -1228,9 +1232,9 @@ void i8085a_cpu_device::execute_one(int opcode)
if (is_8085()) if (is_8085())
{ {
if (m_SP.w.l == 0xffff) if (m_SP.w.l == 0xffff)
m_AF.b.l |= X5F; m_AF.b.l |= KF;
else else
m_AF.b.l &= ~X5F; m_AF.b.l &= ~KF;
} }
break; break;
case 0x3c: // INR A case 0x3c: // INR A
@ -1437,7 +1441,7 @@ void i8085a_cpu_device::execute_one(int opcode)
if (m_AF.b.l & VF) if (m_AF.b.l & VF)
{ {
// RST taken = 6 more cycles // RST taken = 6 more cycles
m_icount -= extra_ret(); m_icount -= ret_taken();
op_rst(8); op_rst(8);
} }
} }
@ -1513,7 +1517,7 @@ void i8085a_cpu_device::execute_one(int opcode)
break; break;
case 0xdd: // 8085: JNX nnnn, otherwise undocumented CALL nnnn case 0xdd: // 8085: JNX nnnn, otherwise undocumented CALL nnnn
if (is_8085()) if (is_8085())
op_jmp(!(m_AF.b.l & X5F)); op_jmp(!(m_AF.b.l & KF));
else else
op_call(1); op_call(1);
break; break;
@ -1605,9 +1609,11 @@ void i8085a_cpu_device::execute_one(int opcode)
op_call(!(m_AF.b.l & SF)); op_call(!(m_AF.b.l & SF));
break; break;
case 0xf5: // PUSH A case 0xf5: // PUSH A
// on 8080, VF=1 and X3F=0 and X5F=0 always! (we don't have to check for it elsewhere) // X3F is always 0, and on 8080, VF=1 and KF=0
// (we don't have to check for it elsewhere)
m_AF.b.l &= ~X3F;
if (!is_8085()) if (!is_8085())
m_AF.b.l = (m_AF.b.l & ~(X3F | X5F)) | VF; m_AF.b.l = (m_AF.b.l & ~KF) | VF;
op_push(m_AF); op_push(m_AF);
break; break;
case 0xf6: // ORI nn case 0xf6: // ORI nn
@ -1636,7 +1642,7 @@ void i8085a_cpu_device::execute_one(int opcode)
break; break;
case 0xfd: // 8085: JX nnnn, otherwise undocumented CALL nnnn case 0xfd: // 8085: JX nnnn, otherwise undocumented CALL nnnn
if (is_8085()) if (is_8085())
op_jmp(m_AF.b.l & X5F); op_jmp(m_AF.b.l & KF);
else else
op_call(1); op_call(1);
break; break;

13
src/devices/cpu/i8085/i8085.h
View File

@ -91,7 +91,6 @@ protected:
// device_disasm_interface overrides // device_disasm_interface overrides
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
private:
address_space_config m_program_config; address_space_config m_program_config;
address_space_config m_io_config; address_space_config m_io_config;
address_space_config m_opcode_config; address_space_config m_opcode_config;
@ -131,9 +130,9 @@ private:
u8 lut_zs[256]; u8 lut_zs[256];
u8 lut_zsp[256]; u8 lut_zsp[256];
virtual int extra_ret() { return 6; } virtual int ret_taken() { return 6; }
virtual int extra_jmp() { return 3; } virtual int jmp_taken() { return 3; }
virtual int extra_call() { return 9; } virtual int call_taken() { return 9; }
virtual bool is_8085() { return true; } virtual bool is_8085() { return true; }
void set_sod(int state); void set_sod(int state);
@ -182,8 +181,10 @@ protected:
virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return clocks; } virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return clocks; }
virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return cycles; } virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return cycles; }
virtual int extra_jmp() override { return 0; } virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;
virtual int extra_call() override { return 6; }
virtual int jmp_taken() override { return 0; }
virtual int call_taken() override { return 6; }
virtual bool is_8085() override { return false; } virtual bool is_8085() override { return false; }
}; };