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

TIMER: Fix missing catchup ticks for VAX simulators when idling

Browse source 
- MicroVAX I, II and 3900 don't have a DONE bit in the clock status
  register, so sim_rtcn_tick_ack() wasn't being called to acknowledge
  clock ticks.
- Timer catchup tick criteria didn't work unless the host had a slow
  clock tick.

As discussed in #705
This commit is contained in:
Mark Pizzolato 2019-05-30 01:51:52 -07:00
parent 45d8c908ba
commit 0195bbda4b
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VAX/vax610_stddev.c
View file

@ -248,7 +248,7 @@ void iccs_wr (int32 data)
{ {
if ((data & CSR_IE) == 0) if ((data & CSR_IE) == 0)
CLR_INT (CLK); CLR_INT (CLK);
if ((clk_csr & CSR_DONE) && (data & CSR_DONE)) /* Interrupt Acked? */ if (data & CSR_DONE) /* Interrupt Acked? */
sim_rtcn_tick_ack (20, TMR_CLK); /* Let timers know */ sim_rtcn_tick_ack (20, TMR_CLK); /* Let timers know */
clk_csr = (clk_csr & ~CLKCSR_RW) | (data & CLKCSR_RW); clk_csr = (clk_csr & ~CLKCSR_RW) | (data & CLKCSR_RW);
return; return;

2
VAX/vax630_stddev.c
View file

@ -226,7 +226,7 @@ void iccs_wr (int32 data)
{ {
if ((data & CSR_IE) == 0) if ((data & CSR_IE) == 0)
CLR_INT (CLK); CLR_INT (CLK);
if ((clk_csr & CSR_DONE) && (data & CSR_DONE)) /* Interrupt Acked? */ if (data & CSR_DONE) /* Interrupt Acked? */
sim_rtcn_tick_ack (20, TMR_CLK); /* Let timers know */ sim_rtcn_tick_ack (20, TMR_CLK); /* Let timers know */
clk_csr = (clk_csr & ~CLKCSR_RW) | (data & CLKCSR_RW); clk_csr = (clk_csr & ~CLKCSR_RW) | (data & CLKCSR_RW);
return; return;

2
VAX/vax_stddev.c
View file

@ -300,7 +300,7 @@ void iccs_wr (int32 data)
{ {
if ((data & CSR_IE) == 0) if ((data & CSR_IE) == 0)
CLR_INT (CLK); CLR_INT (CLK);
if ((clk_csr & CSR_DONE) && (data & CSR_DONE)) /* Interrupt Acked? */ if (data & CSR_DONE) /* Interrupt Acked? */
sim_rtcn_tick_ack (20, TMR_CLK); /* Let timers know */ sim_rtcn_tick_ack (20, TMR_CLK); /* Let timers know */
clk_csr = (clk_csr & ~CLKCSR_RW) | (data & CLKCSR_RW); clk_csr = (clk_csr & ~CLKCSR_RW) | (data & CLKCSR_RW);
return; return;

8
sim_timer.c
View file

@ -1548,7 +1548,7 @@ if ((!sim_idle_enab) || /* idling disabled */
sim_interval -= sin_cyc; sim_interval -= sin_cyc;
return FALSE; return FALSE;
} }
if (_rtcn_tick_catchup_check(tmr, 0)) { if (_rtcn_tick_catchup_check (tmr, -1)) {
sim_debug (DBG_CAL, &sim_timer_dev, "sim_idle(tmr=%d, sin_cyc=%d) - rescheduling catchup tick for %s\n", tmr, sin_cyc, sim_uname (sim_clock_unit[tmr])); sim_debug (DBG_CAL, &sim_timer_dev, "sim_idle(tmr=%d, sin_cyc=%d) - rescheduling catchup tick for %s\n", tmr, sin_cyc, sim_uname (sim_clock_unit[tmr]));
sim_interval -= sin_cyc; sim_interval -= sin_cyc;
return FALSE; return FALSE;
@ -2104,6 +2104,9 @@ clock_gettime (CLOCK_REALTIME, now);
* *
* catchup ticks are only scheduled (eligible to happen) under these * catchup ticks are only scheduled (eligible to happen) under these
* conditions after at least one tick has been acknowledged. * conditions after at least one tick has been acknowledged.
*
* The clock tick UNIT that will be scheduled to run for catchup ticks
* must be specified with sim_rtcn_init_unit().
*/ */
/* _rtcn_tick_catchup_check - idle simulator until next event or for specified interval /* _rtcn_tick_catchup_check - idle simulator until next event or for specified interval
@ -2120,8 +2123,7 @@ static t_bool _rtcn_tick_catchup_check (int32 tmr, int32 time)
if ((!sim_catchup_ticks) || if ((!sim_catchup_ticks) ||
((tmr < 0) || (tmr >= SIM_NTIMERS))) ((tmr < 0) || (tmr >= SIM_NTIMERS)))
return FALSE; return FALSE;
if ((rtc_hz[tmr] > sim_os_tick_hz) && /* faster than host tick */ if ((!rtc_clock_catchup_eligible[tmr]) && /* not eligible yet? */
(!rtc_clock_catchup_eligible[tmr]) && /* not eligible yet? */
(time != -1)) { /* called from ack? */ (time != -1)) { /* called from ack? */
rtc_clock_catchup_base_time[tmr] = sim_timenow_double(); rtc_clock_catchup_base_time[tmr] = sim_timenow_double();
rtc_clock_ticks_tot[tmr] += rtc_clock_ticks[tmr]; rtc_clock_ticks_tot[tmr] += rtc_clock_ticks[tmr];