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

VAX: Added detail to interval timer debug output

Browse source
This commit is contained in:
Mark Pizzolato 2017-08-01 06:49:59 -07:00
parent a02e9c1111
commit 9f7519b886
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
VAX/vax_sysdev.c
View file

@ -214,7 +214,7 @@ static BITFIELD tmr_csr_bits[] = {
/* SSC timer intervals */ /* SSC timer intervals */
#define TMR_INC 10000 /* usec/interval */ #define TMR_INC 10000U /* usec/interval */
/* SSC timer vector */ /* SSC timer vector */
@ -1485,14 +1485,19 @@ int32 tmr_tir_rd (int32 tmr)
{ {
if (tmr_csr[tmr] & TMR_CSR_RUN) { /* running? then interpolate */ if (tmr_csr[tmr] & TMR_CSR_RUN) { /* running? then interpolate */
uint32 usecs_remaining, cur_tir; uint32 usecs_remaining, cur_tir;
const char *tmr_units = NULL;
if ((ADDR_IS_ROM(fault_PC)) && /* running from ROM and */ if ((ADDR_IS_ROM(fault_PC)) && /* running from ROM and */
(tmr_inst[tmr])) /* waiting instructions? */ (tmr_inst[tmr])) { /* waiting instructions? */
usecs_remaining = sim_activate_time (&sysd_dev.units[tmr]) - 1; usecs_remaining = sim_activate_time (&sysd_dev.units[tmr]) - 1;
else tmr_units = "Instructions";
usecs_remaining = (uint32)sim_activate_time_usecs (&sysd_dev.units[tmr]); }
else {
usecs_remaining = (uint32)(0xFFFFFFFFLL & (t_uint64)sim_activate_time_usecs (&sysd_dev.units[tmr]));
tmr_units = "Microseconds";
}
cur_tir = ~usecs_remaining + 1; cur_tir = ~usecs_remaining + 1;
sim_debug (DBG_REGR, &sysd_dev, "tmr_tir_rd(tmr=%d) - 0x%X, Interpolated while running\n", tmr, cur_tir); sim_debug (DBG_REGR, &sysd_dev, "tmr_tir_rd(tmr=%d) - 0x%X %s - %u usecs, Interpolated while running\n", tmr, cur_tir, tmr_units, usecs_remaining);
return cur_tir; return cur_tir;
} }