summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2015-03-16 21:32:30 +0100
committer hap <happppp@users.noreply.github.com>2015-03-16 21:32:30 +0100
commitbbffffe91e221c7e70f278e15a21d8589f269675 (patch)
tree0e7edab1c7b09fa0b97b465a699249e60dfb6e68
parent71bff813e4ecaf3303ee9f6479519f1bb4770733 (diff)
fix hmcs40 interrupt bug
-rw-r--r--src/emu/cpu/hmcs40/hmcs40.c4
-rw-r--r--src/mess/drivers/hh_tms1k.c13
2 files changed, 9 insertions, 8 deletions
diff --git a/src/emu/cpu/hmcs40/hmcs40.c b/src/emu/cpu/hmcs40/hmcs40.c
index bbf4b4327bd..66663da73c0 100644
--- a/src/emu/cpu/hmcs40/hmcs40.c
+++ b/src/emu/cpu/hmcs40/hmcs40.c
@@ -556,8 +556,8 @@ void hmcs40_cpu_device::execute_run()
if ((m_prev_op & 0x3e0) == 0x340)
m_pc = ((m_page << 6) | (m_pc & 0x3f)) & m_pcmask;
- // check/handle interrupt
- else if (m_ie && (m_iri || m_irt))
+ // check/handle interrupt, but not in the middle of a long jump
+ if (m_ie && (m_iri || m_irt) && (m_op & 0x3e0) != 0x340)
do_interrupt();
// remember previous state
diff --git a/src/mess/drivers/hh_tms1k.c b/src/mess/drivers/hh_tms1k.c
index da9218581e3..6e86d6489f3 100644
--- a/src/mess/drivers/hh_tms1k.c
+++ b/src/mess/drivers/hh_tms1k.c
@@ -17,8 +17,10 @@
@MP0914 TMS1000 1979, Entex Baseball 1
*MP0923 TMS1000? 1979, Entex Baseball 2
@MP1030 TMS1100 1980, APF Mathemagician
+ *MP1133 ? 1979, Kosmos Astro
@MP1204 TMS1100 1980, Entex Baseball 3
*MP1221 TMS1100 1980, Entex Raise The Devil
+ *MP1312 TMS1100 198?, Tandy/RadioShack Science Fair Microcomputer Trainer
*MP2139 ? 1982, Gakken Galaxy Invader 1000
*MP2788 ? 1980, Bandai Flight Time
@MP3226 TMS1000 1978, Milton Bradley Simon
@@ -33,10 +35,13 @@
MP3457 TMS1100 1979, MicroVision cartridge: Mindbuster
MP3474 TMS1100 1979, MicroVision cartridge: Vegas Slots
MP3475 TMS1100 1979, MicroVision cartridge: Bowling
- *MP3476 TMS1100? 1979, Milton Bradley Super Simon
+ *MP3476 TMS1100 1979, Milton Bradley Super Simon
MP3479 TMS1100 1980, MicroVision cartridge: Baseball
MP3481 TMS1100 1979, MicroVision cartridge: Connect Four
MP3496 TMS1100 1980, MicroVision cartridge: Sea Duel
+ M34009 TMS1100 1981, MicroVision cartridge: Alien Raiders (note: MP3498, MP3499, M34000, ..)
+ M34017 TMS1100 1981, MicroVision cartridge: Cosmic Hunter
+ M34047 TMS1100 1982, MicroVision cartridge: Super Blockbuster
@MP6100A TMS0980 1979, Ideal Electronic Detective
@MP6101B TMS0980 1979, Parker Brothers Stop Thief
*MP6361 ? 1983, Defender Strikes
@@ -48,11 +53,7 @@
inconsistent:
- M34009 TMS1100 1981, MicroVision cartridge: Alien Raiders
- M34017 TMS1100 1981, MicroVision cartridge: Cosmic Hunter
- M34047 TMS1100 1982, MicroVision cartridge: Super Blockbuster
-
- @CD7282SL TMS1100 1981, Tandy-12 (serial is similar to TI Speak & Spell series?)
+ @CD7282SL TMS1100 1981, Tandy/RadioShack Tandy-12 (serial is similar to TI Speak & Spell series?)
(* denotes not yet emulated by MESS, @ denotes it's in this driver)