folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AltairZ80: M68K: Fix hang with 'expect'

Browse source
This commit is contained in:
Peter Schorn 2022-10-08 00:25:15 -07:00 • committed by Howard M. Harte
parent 1110802bb1
commit 3a7ec4788f
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AltairZ80/altairz80_sio.c
View file

@ -210,9 +210,9 @@ static int32 markTimeSP = 0; /* stack pointer for timer stack
/* default time in milliseconds to sleep for SIMHSleepCmd */ /* default time in milliseconds to sleep for SIMHSleepCmd */
#if defined (__MWERKS__) && defined (macintosh) #if defined (__MWERKS__) && defined (macintosh)
static uint32 SIMHSleep = 0; /* no sleep on Macintosh OS9 */ uint32 SIMHSleep = 0; /* no sleep on Macintosh OS9 */
#else #else
static uint32 SIMHSleep = 1; /* default value is one millisecond */ uint32 SIMHSleep = 1; /* default value is one millisecond */
#endif #endif
static uint32 sleepAllowedCounter = 0; /* only sleep on no character available when == 0 */ static uint32 sleepAllowedCounter = 0; /* only sleep on no character available when == 0 */
static uint32 sleepAllowedStart = SLEEP_ALLOWED_START_DEFAULT; /* default start for above counter */ static uint32 sleepAllowedStart = SLEEP_ALLOWED_START_DEFAULT; /* default start for above counter */

11
AltairZ80/m68ksim.c
View file

@ -121,6 +121,7 @@
#define IRQ_MC6850 5 #define IRQ_MC6850 5
extern uint32 PCX; extern uint32 PCX;
extern uint32 SIMHSleep;
/* Prototypes */ /* Prototypes */
static void MC6850_reset(void); static void MC6850_reset(void);
@ -268,7 +269,6 @@ static void MC6850_reset(void) {
} }
#define INITIAL_IDLE 100 #define INITIAL_IDLE 100
#define IDLE_SLEEP 20
static uint32 idleCount = INITIAL_IDLE; static uint32 idleCount = INITIAL_IDLE;
static void m68k_input_device_update(void) { static void m68k_input_device_update(void) {
@ -281,8 +281,8 @@ static void m68k_input_device_update(void) {
} else if (--idleCount == 0) { } else if (--idleCount == 0) {
const t_stat ch = sim_poll_kbd(); const t_stat ch = sim_poll_kbd();
idleCount = INITIAL_IDLE; idleCount = INITIAL_IDLE;
if (IDLE_SLEEP) if (SIMHSleep)
sim_os_ms_sleep(IDLE_SLEEP); sim_os_ms_sleep(SIMHSleep);
if (ch) { if (ch) {
characterAvailable = TRUE; characterAvailable = TRUE;
keyboardCharacter = ch; keyboardCharacter = ch;
@ -301,8 +301,9 @@ static uint32 MC6850_data_read(void) {
} else } else
ch = sim_poll_kbd(); ch = sim_poll_kbd();
while ((ch <= 0) && (!stop_cpu)) { while ((ch <= 0) && (!stop_cpu)) {
if (IDLE_SLEEP) sim_interval -= KBD_POLL_WAIT; // ensure progress
sim_os_ms_sleep(IDLE_SLEEP); if (SIMHSleep)
sim_os_ms_sleep(SIMHSleep);
ch = sim_poll_kbd(); ch = sim_poll_kbd();
} }
if (ch == SCPE_STOP) if (ch == SCPE_STOP)