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

SCP: Migrate to use SCP internal timer base reference

Browse source
This commit is contained in:
Mark Pizzolato 2020-10-29 13:06:36 -07:00
parent a41f081e81
commit 9c1f4beae3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scp.c
View file

@ -1127,12 +1127,12 @@ static const char simh_help1[] =
"++RUNLIMIT n {%C|MICROSECONDS|SECONDS|MINUTES|HOURS}\n" "++RUNLIMIT n {%C|MICROSECONDS|SECONDS|MINUTES|HOURS}\n"
"++NORUNLIMIT\n\n" "++NORUNLIMIT\n\n"
" Equivalently:\n\n" " Equivalently:\n\n"
"++SET RUNLIMIT n {CYCLES|MICROSECONDS|SECONDS|MINUTES|HOURS}\n" "++SET RUNLIMIT n {%C|MICROSECONDS|SECONDS|MINUTES|HOURS}\n"
"++SET NORUNLIMIT\n\n" "++SET NORUNLIMIT\n\n"
" The run limit state can be examined with:\n\n" " The run limit state can be examined with:\n\n"
"++SHOW RUNLIMIT\n\n" "++SHOW RUNLIMIT\n\n"
" If the units of the run limit are not specified, the default units are\n" " If the units of the run limit are not specified, the default units are\n"
" %C. Once an execution run limit has beenn reached, any subsequent\n" " %C. Once an execution run limit has been reached, any subsequent\n"
" GO, RUN, CONTINUE, STEP or BOOT commands will cause the simulator to\n" " GO, RUN, CONTINUE, STEP or BOOT commands will cause the simulator to\n"
" exit. A previously defined RUNLIMIT can be cleared with the NORUNLIMIT\n" " exit. A previously defined RUNLIMIT can be cleared with the NORUNLIMIT\n"
" command or the establishment of a new run limit.\n" " command or the establishment of a new run limit.\n"
@ -4405,7 +4405,7 @@ int i;
size_t outstr_off = 0; size_t outstr_off = 0;
sim_exp_argv = do_arg; sim_exp_argv = do_arg;
clock_gettime(CLOCK_REALTIME, &cmd_time); sim_rtcn_get_time (&cmd_time, 0);
tmpbuf = (char *)malloc(instr_size); tmpbuf = (char *)malloc(instr_size);
op = tmpbuf; op = tmpbuf;
oend = tmpbuf + instr_size - 2; oend = tmpbuf + instr_size - 2;
@ -13287,7 +13287,7 @@ char pc_s[64] = "";
struct timespec time_now; struct timespec time_now;
if (sim_deb_switches & (SWMASK ('T') | SWMASK ('R') | SWMASK ('A'))) { if (sim_deb_switches & (SWMASK ('T') | SWMASK ('R') | SWMASK ('A'))) {
clock_gettime(CLOCK_REALTIME, &time_now); sim_rtcn_get_time(&time_now, 0);
if (sim_deb_switches & SWMASK ('R')) if (sim_deb_switches & SWMASK ('R'))
sim_timespec_diff (&time_now, &time_now, &sim_deb_basetime); sim_timespec_diff (&time_now, &time_now, &sim_deb_basetime);
if (sim_deb_switches & SWMASK ('T')) { if (sim_deb_switches & SWMASK ('T')) {

2
sim_console.c
View file

@ -2315,7 +2315,7 @@ if (sim_deb_switches & SWMASK ('R')) {
struct tm loc_tm, gmt_tm; struct tm loc_tm, gmt_tm;
time_t time_t_now; time_t time_t_now;
clock_gettime(CLOCK_REALTIME, &sim_deb_basetime); sim_rtcn_get_time(&sim_deb_basetime, 0);
time_t_now = (time_t)sim_deb_basetime.tv_sec; time_t_now = (time_t)sim_deb_basetime.tv_sec;
/* Adjust the relative timebase to reflect the localtime GMT offset */ /* Adjust the relative timebase to reflect the localtime GMT offset */
loc_tm = *localtime (&time_t_now); loc_tm = *localtime (&time_t_now);