From ff95fb8ec23b719440920327177417b1ac547cfe Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Fri, 18 Nov 2016 05:20:06 -0800 Subject: [PATCH] SCP: Add warning about reset when RUN command is used multiple times. The RUN command implicitly resets all devices which may have unexpected consequences for a novice user. The logic now produces a warning about this side effect when more than one RUN command is executed in the same simulator session. An explicit RESET command suppresses this warning for a subsequent RUN command. A RUN command with the -Q switch also suppresses this warning. --- doc/simh_doc.doc | Bin 260608 -> 256512 bytes scp.c | 20 ++++++++++++++++---- scp.h | 2 +- sim_console.c | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/doc/simh_doc.doc b/doc/simh_doc.doc index 91798a84517e7b87d056225acf7548a870eec6ae..a43616fdc470292cb8b77f0b23d14e37ff92e734 100644 GIT binary patch delta 22185 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 delta 25133 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 diff --git a/scp.c b/scp.c index 47e6db9d..06a9888f 100644 --- a/scp.c +++ b/scp.c @@ -5257,12 +5257,15 @@ switch (flg) { re[set] device reset specific device */ +static t_bool run_cmd_did_reset = FALSE; + t_stat reset_cmd (int32 flag, CONST char *cptr) { char gbuf[CBUFSIZE]; DEVICE *dptr; GET_SWITCHES (cptr); /* get switches */ +run_cmd_did_reset = FALSE; if (*cptr == 0) /* reset(cr) */ return (reset_all (0)); cptr = get_glyph (cptr, gbuf, 0); /* get next glyph */ @@ -6271,7 +6274,7 @@ if ((flag == RU_RUN) || (flag == RU_GO)) { /* run or go */ } } if ((flag == RU_RUN) && /* run? */ - ((r = sim_run_boot_prep ()) != SCPE_OK)) { /* reset sim */ + ((r = sim_run_boot_prep (flag)) != SCPE_OK)) { /* reset sim */ put_rval (sim_PC, 0, orig_pcv); /* restore original PC */ return r; } @@ -6363,7 +6366,7 @@ else if (flag == RU_BOOT) { /* boot */ !(uptr->flags & UNIT_ATT)) return SCPE_UNATT; unitno = (int32) (uptr - dptr->units); /* recover unit# */ - if ((r = sim_run_boot_prep ()) != SCPE_OK) /* reset sim */ + if ((r = sim_run_boot_prep (flag)) != SCPE_OK) /* reset sim */ return r; if ((r = dptr->boot (unitno, dptr)) != SCPE_OK) /* boot device */ return r; @@ -6522,9 +6525,10 @@ if (sim_deb && (sim_deb != stdout) && (sim_deb != sim_log))/* debug if enabled * /* Common setup for RUN or BOOT */ -t_stat sim_run_boot_prep (void) +t_stat sim_run_boot_prep (int32 flag) { UNIT *uptr; +t_stat r; sim_interval = 0; /* reset queue */ sim_time = sim_rtime = 0; @@ -6533,7 +6537,15 @@ for (uptr = sim_clock_queue; uptr != QUEUE_LIST_END; uptr = sim_clock_queue) { sim_clock_queue = uptr->next; uptr->next = NULL; } -return reset_all (0); +r = reset_all (0); +if ((r == SCPE_OK) && (flag == RU_RUN)) { + if ((run_cmd_did_reset) && (0 == (sim_switches & SWMASK ('Q')))) { + sim_printf ("Resetting all devices... This may not have been your intention.\n"); + sim_printf ("The GO and CONTINUE commands do not reset devices.\n"); + } + run_cmd_did_reset = TRUE; + } +return r; } /* Print stopped message diff --git a/scp.h b/scp.h index 9f7d8161..3d0b1850 100644 --- a/scp.h +++ b/scp.h @@ -128,7 +128,7 @@ t_stat _sim_activate_after_abs (UNIT *uptr, uint32 usecs_walltime); t_stat sim_cancel (UNIT *uptr); t_bool sim_is_active (UNIT *uptr); int32 sim_activate_time (UNIT *uptr); -t_stat sim_run_boot_prep (void); +t_stat sim_run_boot_prep (int32 flag); double sim_gtime (void); uint32 sim_grtime (void); int32 sim_qcount (void); diff --git a/sim_console.c b/sim_console.c index 05ed33c0..746a0d29 100644 --- a/sim_console.c +++ b/sim_console.c @@ -1233,7 +1233,7 @@ if (sim_rem_master_mode) { t_stat stat_nomessage; sim_printf ("Command input starting on Master Remote Console Session\n"); - stat = sim_run_boot_prep (); + stat = sim_run_boot_prep (0); sim_rem_master_was_enabled = TRUE; while (sim_rem_master_mode) { sim_rem_single_mode[0] = FALSE;