Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

mcs96: Add save state and miscellaneous other stuff (nw)

Browse Source
This commit is contained in:
AJR 2018-10-26 13:42:31 -04:00
parent 9bcf933bcc
commit aa88c67ee7
4 changed files with 68 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/devices/cpu/mcs96/i8x9x.cpp
View File

@ -42,7 +42,7 @@ std::unique_ptr<util::disasm_interface> i8x9x_device::create_disassembler()
void i8x9x_device::device_resolve_objects()
{
for (auto &cb : m_ach_cb)
cb.resolve_safe(0);
cb.resolve();
m_hso_cb.resolve_safe();
m_serial_tx_cb.resolve_safe();
m_in_p0_cb.resolve_safe(0);
@ -67,10 +67,38 @@ void i8x9x_device::device_start()
state_add(I8X9X_SBUF_TX, "SBUF_TX", serial_send_buf);
state_add(I8X9X_SP_CON, "SP_CON", sp_con).mask(0x1f);
state_add(I8X9X_SP_STAT, "SP_STAT", sp_stat).mask(0xe0);
state_add(I8X9X_IOC0, "IOC0", ioc0);
state_add(I8X9X_IOC0, "IOC0", ioc0).mask(0xfd);
state_add(I8X9X_IOC1, "IOC1", ioc1);
state_add(I8X9X_IOS0, "IOS0", ios0);
state_add(I8X9X_IOS1, "IOS1", ios1);
for(int i = 0; i < 8; i++)
{
save_item(NAME(hso_info[i].active), i);
save_item(NAME(hso_info[i].command), i);
save_item(NAME(hso_info[i].time), i);
}
save_item(NAME(hso_cam_hold.active));
save_item(NAME(hso_cam_hold.command));
save_item(NAME(hso_cam_hold.time));
save_item(NAME(base_timer2));
save_item(NAME(ad_done));
save_item(NAME(hsi_mode));
save_item(NAME(hso_command));
save_item(NAME(ad_command));
save_item(NAME(hso_time));
save_item(NAME(ad_result));
save_item(NAME(pwm_control));
save_item(NAME(ios0));
save_item(NAME(ios1));
save_item(NAME(ioc0));
save_item(NAME(ioc1));
save_item(NAME(sbuf));
save_item(NAME(sp_con));
save_item(NAME(sp_stat));
save_item(NAME(serial_send_buf));
save_item(NAME(serial_send_timer));
}
void i8x9x_device::device_reset()
@ -81,7 +109,7 @@ void i8x9x_device::device_reset()
hso_cam_hold.active = false;
hso_command = 0;
hso_time = 0;
base_timer2 = 0;
timer2_reset(total_cycles());
ios0 = ios1 = 0x00;
ioc0 &= 0xaa;
ioc1 = (ioc1 & 0xae) | 0x01;
@ -98,8 +126,7 @@ void i8x9x_device::commit_hso_cam()
{
for(int i=0; i<8; i++)
if(!hso_info[i].active) {
if(hso_command != 0x18 && hso_command != 0x19)
logerror("%s: hso cam %02x %04x in slot %d (%04x)\n", tag(), hso_command, hso_time, i, PPC);
//logerror("hso cam %02x %04x in slot %d (%04x)\n", hso_command, hso_time, i, PPC);
hso_info[i].active = true;
hso_info[i].command = hso_command;
hso_info[i].time = hso_time;
@ -113,7 +140,11 @@ void i8x9x_device::commit_hso_cam()
void i8x9x_device::ad_start(u64 current_time)
{
ad_result = (m_ach_cb[ad_command & 7]() << 6) | 8 | (ad_command & 7);
ad_result = 8 | (ad_command & 7);
if (m_ach_cb[ad_command & 7].isnull())
logerror("Analog input on ACH%d not configured\n", ad_command & 7);
else
ad_result |= m_ach_cb[ad_command & 7]() << 6;
ad_done = current_time + 88;
internal_update(current_time);
}
@ -290,7 +321,9 @@ u8 i8x9x_device::sp_stat_r()
void i8x9x_device::ioc0_w(u8 data)
{
ioc0 = data;
ioc0 = data & 0xfd;
if (BIT(data, 1))
timer2_reset(total_cycles());
}
u8 i8x9x_device::ios0_r()
@ -345,6 +378,11 @@ u64 i8x9x_device::timer_time_until(int timer, u64 current_time, u16 timer_value)
return timer_base + ((delta + tdelta) << 3);
}
void i8x9x_device::timer2_reset(u64 current_time)
{
base_timer2 = current_time;
}
void i8x9x_device::trigger_cam(int id, u64 current_time)
{
hso_cam_entry &cam = hso_info[id];
@ -366,12 +404,16 @@ void i8x9x_device::trigger_cam(int id, u64 current_time)
ios1 |= 1 << (cam.command & 3);
break;
case 0xe:
timer2_reset(current_time);
break;
case 0xf:
ad_start(current_time);
break;
default:
logerror("%s: Action %x unimplemented\n", tag(), cam.command & 0x0f);
logerror("HSO action %x undefined\n", cam.command & 0x0f);
break;
}
@ -402,9 +444,7 @@ void i8x9x_device::internal_update(u64 current_time)
u16 t = hso_info[i].time;
if(((cmd & 0x40) && t == current_timer2) ||
(!(cmd & 0x40) && t == current_timer1)) {
if(cmd != 0x18 && cmd != 0x19)
logerror("%s: hso cam %02x %04x in slot %d triggered\n",
tag(), cmd, t, i);
//logerror("hso cam %02x %04x in slot %d triggered\n", cmd, t, i);
trigger_cam(i, current_time);
}
}

1
src/devices/cpu/mcs96/i8x9x.h
View File

@ -135,6 +135,7 @@ private:
u16 timer_value(int timer, u64 current_time) const;
u64 timer_time_until(int timer, u64 current_time, u16 timer_value) const;
void timer2_reset(u64 current_time);
void commit_hso_cam();
void trigger_cam(int id, u64 current_time);
void set_hso(u8 mask, bool state);

11
src/devices/cpu/mcs96/mcs96.cpp
View File

@ -56,6 +56,17 @@ void mcs96_device::device_start()
state_add(MCS96_BH, "BH", reinterpret_cast<u8 *>(&register_file[4])[BYTE_XOR_LE(1)]).noshow();
state_add(MCS96_CL, "CL", reinterpret_cast<u8 *>(&register_file[5])[BYTE_XOR_LE(0)]).noshow();
state_add(MCS96_CH, "CH", reinterpret_cast<u8 *>(&register_file[5])[BYTE_XOR_LE(1)]).noshow();
save_item(NAME(inst_state));
save_item(NAME(PC));
save_item(NAME(PPC));
save_item(NAME(PSW));
save_item(NAME(OP1));
save_item(NAME(OP2));
save_item(NAME(OP3));
save_item(NAME(OPI));
save_item(NAME(TMP));
save_item(NAME(irq_requested));
}
void mcs96_device::device_reset()

8
src/mame/drivers/pntnpuzl.cpp
View File

@ -354,7 +354,7 @@ static INPUT_PORTS_START( pntnpuzl )
INPUT_PORTS_END
MACHINE_CONFIG_START(pntnpuzl_state::pntnpuzl)
MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000))
MCFG_DEVICE_ADD("maincpu", M68000, 12_MHz_XTAL)
MCFG_DEVICE_PROGRAM_MAP(pntnpuzl_map)
EEPROM_93C46_16BIT(config, "eeprom");
@ -367,8 +367,10 @@ MACHINE_CONFIG_START(pntnpuzl_state::pntnpuzl)
m_via->writepb_handler().append("eeprom", FUNC(eeprom_serial_93cxx_device::clk_write)).bit(5);
// CB2 used for serial communication with 8798
MCFG_DEVICE_ADD("mcu", P8098, XTAL(12'000'000))
MCFG_DEVICE_PROGRAM_MAP(mcu_map) // FIXME: this is all internal
i8x9x_device &mcu(P8098(config, "mcu", 12_MHz_XTAL)); // clock generated by ASIC
mcu.set_addrmap(AS_PROGRAM, &pntnpuzl_state::mcu_map); // FIXME: this is all internal
mcu.ach6_cb().set_constant(0x180); // ?
mcu.ach7_cb().set_constant(0x180); // ?
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)