Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-23 12:58:37 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

cop400: Fixed COP444 disassembly. [Curt Coder]

Browse Source
This commit is contained in:
Curt Coder 2017-01-16 20:41:09 +02:00
parent f926784aed
commit 028fd8563a
2 changed files with 31 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/devices/cpu/cop400/cop400.cpp
View File

@ -48,7 +48,6 @@
TODO: TODO:
- COP444/445 opcode support for 2048x8 and 128x4 memory size
- CKO sync input - CKO sync input
- save internal RAM when CKO is RAM power supply pin - save internal RAM when CKO is RAM power supply pin
- COP413/COP414/COP415/COP405 - COP413/COP414/COP415/COP405
@ -178,37 +177,39 @@ cop400_cpu_device::cop400_cpu_device(const machine_config &mconfig, device_type
, m_d_mask(d_mask) , m_d_mask(d_mask)
, m_in_mask(in_mask) , m_in_mask(in_mask)
{ {
int i; for (int i = 0; i < 256; i++) {
m_InstLen[i] = 1;
}
/* initialize instruction length array */ m_InstLen[0x33] = m_InstLen[0x23] = 2;
for (i=0; i<256; i++) m_InstLen[i]=1;
switch (featuremask) switch (featuremask)
{ {
case COP410_FEATURE: case COP410_FEATURE:
/* select opcode map */
m_opcode_map = COP410_OPCODE_MAP; m_opcode_map = COP410_OPCODE_MAP;
/* initialize instruction length array */
m_InstLen[0x60] = m_InstLen[0x61] = m_InstLen[0x68] = for (int r = 0; r < 2; r++) {
m_InstLen[0x69] = m_InstLen[0x33] = m_InstLen[0x23] = 2; m_InstLen[0x60 + r] = 2; // JMP
m_InstLen[0x68 + r] = 2; // JSR
}
break; break;
case COP420_FEATURE: case COP420_FEATURE:
/* select opcode map */
m_opcode_map = COP420_OPCODE_MAP; m_opcode_map = COP420_OPCODE_MAP;
/* initialize instruction length array */
m_InstLen[0x60] = m_InstLen[0x61] = m_InstLen[0x62] = m_InstLen[0x63] = for (int r = 0; r < 4; r++) {
m_InstLen[0x68] = m_InstLen[0x69] = m_InstLen[0x6a] = m_InstLen[0x6b] = m_InstLen[0x60 + r] = 2; // JMP
m_InstLen[0x33] = m_InstLen[0x23] = 2; m_InstLen[0x68 + r] = 2; // JSR
}
break; break;
case COP444_FEATURE: case COP444_FEATURE:
/* select opcode map */
m_opcode_map = COP444_OPCODE_MAP; m_opcode_map = COP444_OPCODE_MAP;
/* initialize instruction length array */
m_InstLen[0x60] = m_InstLen[0x61] = m_InstLen[0x62] = m_InstLen[0x63] = for (int r = 0; r < 8; r++) {
m_InstLen[0x68] = m_InstLen[0x69] = m_InstLen[0x6a] = m_InstLen[0x6b] = m_InstLen[0x60 + r] = 2; // JMP
m_InstLen[0x33] = m_InstLen[0x23] = 2; m_InstLen[0x68 + r] = 2; // JSR
}
break; break;
default: default:
@ -863,13 +864,11 @@ void cop400_cpu_device::device_timer(emu_timer &timer, device_timer_id id, int p
void cop400_cpu_device::device_start() void cop400_cpu_device::device_start()
{ {
/* find address spaces */ /* find address spaces */
m_program = &space(AS_PROGRAM); m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct(); m_direct = &m_program->direct();
m_data = &space(AS_DATA); m_data = &space(AS_DATA);
/* find i/o handlers */ /* find i/o handlers */
m_read_l.resolve_safe(0); m_read_l.resolve_safe(0);
m_read_l_tristate.resolve_safe(0); m_read_l_tristate.resolve_safe(0);
m_write_l.resolve_safe(); m_write_l.resolve_safe();
@ -883,12 +882,10 @@ void cop400_cpu_device::device_start()
m_read_cko.resolve_safe(0); m_read_cko.resolve_safe(0);
/* allocate serial timer */ /* allocate serial timer */
m_serial_timer = timer_alloc(TIMER_SERIAL); m_serial_timer = timer_alloc(TIMER_SERIAL);
m_serial_timer->adjust(attotime::zero, 0, attotime::from_ticks(m_cki, clock())); m_serial_timer->adjust(attotime::zero, 0, attotime::from_ticks(m_cki, clock()));
/* allocate counter timer */ /* allocate counter timer */
m_counter_timer = nullptr; m_counter_timer = nullptr;
if (m_has_counter) if (m_has_counter)
{ {
@ -897,7 +894,6 @@ void cop400_cpu_device::device_start()
} }
/* allocate IN latch timer */ /* allocate IN latch timer */
m_inil_timer = nullptr; m_inil_timer = nullptr;
if (m_has_inil) if (m_has_inil)
{ {
@ -906,7 +902,6 @@ void cop400_cpu_device::device_start()
} }
/* register for state saving */ /* register for state saving */
save_item(NAME(m_pc)); save_item(NAME(m_pc));
save_item(NAME(m_prevpc)); save_item(NAME(m_prevpc));
save_item(NAME(m_sa)); save_item(NAME(m_sa));

40
src/devices/cpu/cop400/cop444ds.cpp
View File

@ -62,15 +62,15 @@ CPU_DISASSEMBLE(cop444)
{ {
util::stream_format(stream, "AISC %u", opcode & 0xF); util::stream_format(stream, "AISC %u", opcode & 0xF);
} }
else if (opcode >= 0x60 && opcode <= 0x63) else if (opcode >= 0x60 && opcode <= 0x67)
{ {
address = ((opcode & 0x03) << 8) | next_opcode; address = ((opcode & 0x07) << 8) | next_opcode;
util::stream_format(stream, "JMP %03x", address); util::stream_format(stream, "JMP %03x", address);
bytes = 2; bytes = 2;
} }
else if (opcode >= 0x68 && opcode <= 0x6B) else if (opcode >= 0x68 && opcode <= 0x6f)
{ {
address = ((opcode & 0x03) << 8) | next_opcode; address = ((opcode & 0x07) << 8) | next_opcode;
util::stream_format(stream, "JSR %03x", address); util::stream_format(stream, "JSR %03x", address);
flags = DASMFLAG_STEP_OVER; flags = DASMFLAG_STEP_OVER;
bytes = 2; bytes = 2;
@ -162,19 +162,15 @@ CPU_DISASSEMBLE(cop444)
case 0x23: case 0x23:
bytes = 2; bytes = 2;
if (next_opcode <= 0x3f) if (next_opcode <= 0x7f)
{ {
address = (uint16_t)(next_opcode & 0x3F); address = (uint16_t)(next_opcode & 0x7F);
util::stream_format(stream, "LDD %u,%u", ((address & 0x30) >> 4),address & 0x0F); util::stream_format(stream, "LDD %u,%u", address >> 4, address & 0x0F);
} }
else if (next_opcode >= 0x80 && next_opcode <= 0xbf) else if (next_opcode >= 0x80)
{ {
address = (uint16_t)(next_opcode & 0x3F); address = (uint16_t)(next_opcode & 0x7f);
util::stream_format(stream, "XAD %u,%u", ((address & 0x30) >> 4),address & 0x0F); util::stream_format(stream, "XAD %u,%u", address >> 4, address & 0x0F);
}
else
{
util::stream_format(stream, "Invalid");
} }
break; break;
@ -217,21 +213,9 @@ CPU_DISASSEMBLE(cop444)
{ {
util::stream_format(stream, "LEI %u", next_opcode & 0xF); util::stream_format(stream, "LEI %u", next_opcode & 0xF);
} }
else if (next_opcode >= 0x80 && next_opcode <= 0x8F) else if (next_opcode >= 0x80)
{ {
util::stream_format(stream, "LBI 0,%u", next_opcode & 0xF); util::stream_format(stream, "LBI %u,%u", (next_opcode >> 4) & 0x07, next_opcode & 0xF);
}
else if (next_opcode >= 0x90 && next_opcode <= 0x9F)
{
util::stream_format(stream, "LBI 1,%u", next_opcode & 0xF);
}
else if (next_opcode >= 0xA0 && next_opcode <= 0xAF)
{
util::stream_format(stream, "LBI 2,%u", next_opcode & 0xF);
}
else if (next_opcode >= 0xB0 && next_opcode <= 0xBF)
{
util::stream_format(stream, "LBI 3,%u", next_opcode & 0xF);
} }
else else
{ {