diff --git a/VAX/vax730_stddev.c b/VAX/vax730_stddev.c index d40e0341..0eb8e89c 100644 --- a/VAX/vax730_stddev.c +++ b/VAX/vax730_stddev.c @@ -939,7 +939,7 @@ sim_rtcn_get_time(&now, TMR_CLK); /* get curr time */ base.tv_sec = (time_t)toy->toy_gmtbase; base.tv_nsec = toy->toy_gmtbasemsec * 1000000; sim_timespec_diff (&val, &now, &base); /* val = now - base */ -sim_debug (TMR_DB_TODR, &clk_dev, "todr_rd() - TODR=0x%X - %s\n", (int32)(val.tv_sec*100 + val.tv_nsec/10000000), todr_fmt_vms_todr ((int32)(val.tv_sec*100 + val.tv_nsec/10000000))); +sim_debug (TMR_DB_TODR, &clk_dev, "todr_rd() - TODR=0x%X - %s\n", (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000), todr_fmt_vms_todr ((int32)(val.tv_sec*100 + val.tv_nsec/10000000))); return (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000); /* 100hz Clock rounded Ticks */ } diff --git a/VAX/vax750_stddev.c b/VAX/vax750_stddev.c index 63b791b1..18712237 100644 --- a/VAX/vax750_stddev.c +++ b/VAX/vax750_stddev.c @@ -935,7 +935,7 @@ sim_rtcn_get_time(&now, TMR_CLK); /* get curr time */ base.tv_sec = (time_t)toy->toy_gmtbase; base.tv_nsec = toy->toy_gmtbasemsec * 1000000; sim_timespec_diff (&val, &now, &base); /* val = now - base */ -sim_debug (TMR_DB_TODR, &clk_dev, "todr_rd() - TODR=0x%X - %s\n", (int32)(val.tv_sec*100 + val.tv_nsec/10000000), todr_fmt_vms_todr ((int32)(val.tv_sec*100 + val.tv_nsec/10000000))); +sim_debug (TMR_DB_TODR, &clk_dev, "todr_rd() - TODR=0x%X - %s\n", (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000), todr_fmt_vms_todr ((int32)(val.tv_sec*100 + val.tv_nsec/10000000))); return (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000); /* 100hz Clock rounded Ticks */ } diff --git a/VAX/vax780_stddev.c b/VAX/vax780_stddev.c index 90df8c8f..8bf2dae4 100644 --- a/VAX/vax780_stddev.c +++ b/VAX/vax780_stddev.c @@ -923,7 +923,7 @@ sim_rtcn_get_time(&now, TMR_CLK); /* get curr time */ base.tv_sec = (time_t)toy->toy_gmtbase; base.tv_nsec = toy->toy_gmtbasemsec * 1000000; sim_timespec_diff (&val, &now, &base); /* val = now - base */ -sim_debug (TMR_DB_TODR, &clk_dev, "todr_rd() - TODR=0x%X - %s\n", (int32)(val.tv_sec*100 + val.tv_nsec/10000000), todr_fmt_vms_todr ((int32)(val.tv_sec*100 + val.tv_nsec/10000000))); +sim_debug (TMR_DB_TODR, &clk_dev, "todr_rd() - TODR=0x%X - %s\n", (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000), todr_fmt_vms_todr ((int32)(val.tv_sec*100 + val.tv_nsec/10000000))); return (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000); /* 100hz Clock rounded Ticks */ } diff --git a/VAX/vax820_stddev.c b/VAX/vax820_stddev.c index 4a89032b..3a7962a2 100644 --- a/VAX/vax820_stddev.c +++ b/VAX/vax820_stddev.c @@ -944,7 +944,7 @@ sim_rtcn_get_time(&now, TMR_CLK); /* get curr time */ base.tv_sec = toy->toy_gmtbase; base.tv_nsec = toy->toy_gmtbasemsec * 1000000; sim_timespec_diff (&val, &now, &base); -sim_debug (TMR_DB_TODR, &clk_dev, "todr_rd() - TODR=0x%X - %s\n", (int32)(val.tv_sec*100 + val.tv_nsec/10000000), todr_fmt_vms_todr ((int32)(val.tv_sec*100 + val.tv_nsec/10000000))); +sim_debug (TMR_DB_TODR, &clk_dev, "todr_rd() - TODR=0x%X - %s\n", (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000), todr_fmt_vms_todr ((int32)(val.tv_sec*100 + val.tv_nsec/10000000))); return (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000); /* 100hz Clock rounded Ticks */ } diff --git a/VAX/vax860_stddev.c b/VAX/vax860_stddev.c index e52003a7..6ea341ad 100644 --- a/VAX/vax860_stddev.c +++ b/VAX/vax860_stddev.c @@ -1042,7 +1042,7 @@ sim_rtcn_get_time(&now, TMR_CLK); /* get curr time */ base.tv_sec = (time_t)toy->toy_gmtbase; base.tv_nsec = toy->toy_gmtbasemsec * 1000000; sim_timespec_diff (&val, &now, &base); /* val = now - base */ -sim_debug (TMR_DB_TODR, &clk_dev, "todr_rd() - TODR=0x%X - %s\n", (int32)(val.tv_sec*100 + val.tv_nsec/10000000), todr_fmt_vms_todr ((int32)(val.tv_sec*100 + val.tv_nsec/10000000))); +sim_debug (TMR_DB_TODR, &clk_dev, "todr_rd() - TODR=0x%X - %s\n", (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000), todr_fmt_vms_todr ((int32)(val.tv_sec*100 + val.tv_nsec/10000000))); return (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000); /* 100hz Clock rounded Ticks */ } diff --git a/VAX/vax_cpu.c b/VAX/vax_cpu.c index 2cc473b3..45befe4b 100644 --- a/VAX/vax_cpu.c +++ b/VAX/vax_cpu.c @@ -3300,6 +3300,12 @@ return 0; /* set new cc's */ void cpu_idle (void) { +/* Normal use of sim_idle would specify FALSE (0) as the sim_interval */ +/* adjustment parameter since this simullator doesn't have a WAIT */ +/* instruction and merely detects instruction patterns that reflect */ +/* the system idling. However, a TRUE (1) value for this parameter */ +/* produces clock calibration results while idling which closer */ +/* the actual simulator instruction execution rate. */ sim_idle (TMR_CLK, TRUE); } diff --git a/VAX/vax_stddev.c b/VAX/vax_stddev.c index 5732be6e..f4a98ee3 100644 --- a/VAX/vax_stddev.c +++ b/VAX/vax_stddev.c @@ -494,7 +494,7 @@ if (val.tv_sec >= TOY_MAX_SECS) { /* todr overflowed? */ return todr_reg = 0; /* stop counting */ } -sim_debug (DBG_REG, &clk_dev, "todr_rd() - TODR=0x%X\n", (int32)(val.tv_sec*100 + val.tv_nsec/10000000)); +sim_debug (DBG_REG, &clk_dev, "todr_rd() - TODR=0x%X\n", (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000)); return (int32)(val.tv_sec*100 + (val.tv_nsec + 5000000)/10000000); /* 100hz Clock rounded Ticks */ } diff --git a/doc/simh.doc b/doc/simh.doc index 9848ebe2..091d7fe7 100644 Binary files a/doc/simh.doc and b/doc/simh.doc differ