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

TIMER: Fix sim_timer_activate_time_usecs for clock units

Browse source
This commit is contained in:
Mark Pizzolato 2017-01-05 04:42:40 -08:00
parent fb8a01dad9
commit 9c89b0e08b
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sim_timer.c
View file

@ -874,9 +874,8 @@ if (rtc_hz[tmr] != ticksper) { /* changing tick rate? *
rtc_currd[tmr] = (int32)(sim_timer_inst_per_sec () / ticksper);
}
}
if (ticksper == 0) { /* running? */
if (ticksper == 0) /* running? */
return 10000;
}
if (sim_clock_unit[tmr] == NULL) { /* Not using TIMER units? */
rtc_clock_ticks[tmr] += 1;
rtc_calib_tick_time[tmr] += rtc_clock_tick_size[tmr];
@ -2106,7 +2105,7 @@ if (tmr == SIM_NTIMERS) { /* None found? */
SIM_INTERNAL_UNIT.flags = UNIT_IDLE;
sim_register_internal_device (&sim_int_timer_dev); /* Register Internal timer device */
sim_rtcn_init_unit (&SIM_INTERNAL_UNIT, (CLK_INIT*CLK_TPS)/sim_int_clk_tps, SIM_INTERNAL_CLK);
sim_activate_abs (&SIM_INTERNAL_UNIT, 0);
SIM_INTERNAL_UNIT.action (&SIM_INTERNAL_UNIT); /* Force tick to activate timer */
}
return;
}
@ -2719,6 +2718,14 @@ double sim_timer_activate_time_usecs (UNIT *uptr)
UNIT *cptr;
int32 tmr;
/* If this is a clock unit, we need to return the related clock assist unit instead */
for (tmr=0; tmr<=SIM_NTIMERS; tmr++) {
if (sim_clock_unit[tmr] == uptr) {
uptr = &sim_timer_units[tmr];
break;
}
}
#if defined(SIM_ASYNCH_CLOCKS)
if (uptr->a_is_active == &_sim_wallclock_is_active) {
double d_result;