changed lbi skip testing again, previous solution didnt work properly

This commit is contained in:
hap 2015-05-03 18:05:20 +02:00
parent f73fe34db7
commit 49e9ffd008
3 changed files with 8 additions and 8 deletions

View File

@ -1003,6 +1003,7 @@ void cop400_cpu_device::device_start()
save_item(NAME(m_skl));
save_item(NAME(m_t));
save_item(NAME(m_skip));
save_item(NAME(m_skip_lbi));
save_item(NAME(m_skt_latch));
save_item(NAME(m_si));
save_item(NAME(m_last_skip));
@ -1070,6 +1071,7 @@ void cop400_cpu_device::device_start()
m_il = 0;
m_in[0] = m_in[1] = m_in[2] = m_in[3] = 0;
m_si = 0;
m_skip_lbi = 0;
m_last_skip = 0;
m_microbus_int = 0;
m_skip = 0;
@ -1094,7 +1096,6 @@ void cop400_cpu_device::device_reset()
T = 0;
m_skt_latch = 1;
m_last_opcode_function = INST(nop);
m_halt = 0;
m_idle = 0;
}
@ -1128,8 +1129,8 @@ void cop400_cpu_device::execute_run()
PC++;
(this->*(m_opcode_map[opcode].function))(opcode);
m_last_opcode_function = m_opcode_map[opcode].function;
m_icount -= inst_cycles;
if (m_skip_lbi > 0) m_skip_lbi--;
// check for interrupt
@ -1138,7 +1139,7 @@ void cop400_cpu_device::execute_run()
cop400_opcode_func function = m_opcode_map[ROM(PC)].function;
// all successive transfer of control instructions and successive LBIs have been completed
if ((function != INST(jp)) && (function != INST(jmp)) && (function != INST(jsr)) && !(m_last_opcode_function == INST(lbi) && function == INST(lbi)))
if ((function != INST(jp)) && (function != INST(jmp)) && (function != INST(jsr)) && !m_skip_lbi)
{
// store skip logic
m_last_skip = m_skip;

View File

@ -239,6 +239,7 @@ protected:
/* skipping logic */
int m_skip; /* skip next instruction */
int m_skip_lbi; /* skip until next non-LBI instruction */
int m_last_skip; /* last value of skip */
int m_halt; /* halt mode */
int m_idle; /* idle mode */
@ -265,7 +266,6 @@ protected:
};
const cop400_opcode_map *m_opcode_map;
cop400_opcode_func m_last_opcode_function;
static const cop400_opcode_map COP410_OPCODE_23_MAP[256];
static const cop400_opcode_map COP410_OPCODE_33_MAP[256];

View File

@ -913,10 +913,9 @@ INSTRUCTION( cba )
INSTRUCTION( lbi )
{
if (m_last_opcode_function == INST(lbi))
{
return;
}
m_skip_lbi++;
if (m_skip_lbi > 1) return;
m_skip_lbi++;
if (opcode & 0x80)
{