From e450edd6ce01541094204e2bf6d8a4f491a61d74 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 5 Jan 2017 06:24:25 -0800
Subject: [PATCH] SCP: Display most recent instruction execution rate in SHOW
 QUEUE output

---
 scp.c       | 8 ++++----
 sim_timer.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scp.c b/scp.c
index 380bab0d..e29feac3 100644
--- a/scp.c
+++ b/scp.c
@@ -4702,13 +4702,13 @@ int32 accum;
 if (cptr && (*cptr != 0))
     return SCPE_2MARG;
 if (sim_clock_queue == QUEUE_LIST_END)
-    fprintf (st, "%s event queue empty, time = %.0f, executing %.0f instructios/sec\n",
-             sim_name, sim_time, sim_timer_inst_per_sec ());
+    fprintf (st, "%s event queue empty, time = %.0f, executing %s instructios/sec\n",
+             sim_name, sim_time, sim_fmt_numeric (sim_timer_inst_per_sec ()));
 else {
     const char *tim;
 
-    fprintf (st, "%s event queue status, time = %.0f, executing %.0f instructions/sec\n",
-             sim_name, sim_time, sim_timer_inst_per_sec ());
+    fprintf (st, "%s event queue status, time = %.0f, executing %s instructions/sec\n",
+             sim_name, sim_time, sim_fmt_numeric (sim_timer_inst_per_sec ()));
     accum = 0;
     for (uptr = sim_clock_queue; uptr != QUEUE_LIST_END; uptr = uptr->next) {
         if (uptr == &sim_step_unit)
diff --git a/sim_timer.c b/sim_timer.c
index e6502e8c..0bb684e7 100644
--- a/sim_timer.c
+++ b/sim_timer.c
@@ -1064,7 +1064,7 @@ int tmr, clocks;
 struct timespec now;
 time_t time_t_now;
 int32 calb_tmr = (sim_calb_tmr == -1) ? sim_calb_tmr_last : sim_calb_tmr;
-double inst_per_sec = (sim_calb_tmr == -1) ? sim_inst_per_sec_last : sim_timer_inst_per_sec ();
+double inst_per_sec = sim_timer_inst_per_sec ();
 
 fprintf (st, "Minimum Host Sleep Time:       %d ms (%dHz)\n", sim_os_sleep_min_ms, sim_os_tick_hz);
 if (sim_os_sleep_min_ms != sim_os_sleep_inc_ms)
@@ -2270,7 +2270,7 @@ return SCPE_OK;
 
 double sim_timer_inst_per_sec (void)
 {
-double inst_per_sec = SIM_INITIAL_IPS;
+double inst_per_sec = sim_inst_per_sec_last;
 
 if (sim_calb_tmr == -1)
     return inst_per_sec;