diff --git a/ALTAIR/altair_cpu.c b/ALTAIR/altair_cpu.c index e2e1d02f..70bf0144 100644 --- a/ALTAIR/altair_cpu.c +++ b/ALTAIR/altair_cpu.c @@ -310,8 +310,6 @@ t_stat sim_instr (void) while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - saved_PC = PC; if ((reason = sim_process_event ())) break; } diff --git a/GRI/gri_cpu.c b/GRI/gri_cpu.c index d16490d1..c3b35d5c 100644 --- a/GRI/gri_cpu.c +++ b/GRI/gri_cpu.c @@ -417,9 +417,6 @@ ao_update (); /* update AO */ while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - ao_update (); /* update AO */ - scq_r->qptr = scq_p; /* update sc q ptr */ if ((reason = sim_process_event ())) break; } diff --git a/H316/h316_cpu.c b/H316/h316_cpu.c index f78aa814..92e77eac 100644 --- a/H316/h316_cpu.c +++ b/H316/h316_cpu.c @@ -441,11 +441,6 @@ reason = 0; while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - saved_AR = AR & DMASK; - saved_BR = BR & DMASK; - saved_XR = XR & DMASK; - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ((reason = sim_process_event ())) break; } diff --git a/I1401/i1401_cpu.c b/I1401/i1401_cpu.c index 69e973a3..e78b624c 100644 --- a/I1401/i1401_cpu.c +++ b/I1401/i1401_cpu.c @@ -550,12 +550,6 @@ while (reason == 0) { /* loop until halted */ saved_IS = IS; /* commit prev instr */ if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - as_err = ADDR_ERR (AS); /* get addr err flags */ - bs_err = ADDR_ERR (BS); - AS = AS & ADDRMASK; /* clean addresses */ - BS = BS & ADDRMASK; - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ((reason = sim_process_event ())) break; } diff --git a/I1620/i1620_cpu.c b/I1620/i1620_cpu.c index 424d6de9..0c6fd9d4 100644 --- a/I1620/i1620_cpu.c +++ b/I1620/i1620_cpu.c @@ -488,9 +488,6 @@ while (reason == 0) { /* loop until halted */ saved_PC = PC; /* commit prev instr */ if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - pcq_r->qptr = pcq_p; /* update pc q ptr */ - upd_ind (); if ((reason = sim_process_event ())) break; } diff --git a/I7094/i7094_cpu.c b/I7094/i7094_cpu.c index ed28e833..64c406db 100644 --- a/I7094/i7094_cpu.c +++ b/I7094/i7094_cpu.c @@ -659,8 +659,6 @@ while (reason == SCPE_OK) { /* loop until error */ } if (sim_interval <= 0) { /* intv cnt expired? */ - /* make sure all useful state is in simh registers while processing events */ - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ((reason = sim_process_event ())) /* process events */ break; chtr_pend = chtr_eval (NULL); /* eval chan traps */ diff --git a/Interdata/id16_cpu.c b/Interdata/id16_cpu.c index a0b731c8..6d575deb 100644 --- a/Interdata/id16_cpu.c +++ b/Interdata/id16_cpu.c @@ -599,10 +599,6 @@ while (reason == 0) { /* loop until halted */ int32 sr, st; if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - PSW = BUILD_PSW (cc); - PC = PC & VAMASK; - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ((reason = sim_process_event ())) break; int_eval (); diff --git a/Interdata/id32_cpu.c b/Interdata/id32_cpu.c index 985b60b1..f9eb0416 100644 --- a/Interdata/id32_cpu.c +++ b/Interdata/id32_cpu.c @@ -658,11 +658,6 @@ while (reason == 0) { /* loop until halted */ int32 sr, st; if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - PSW = BUILD_PSW (cc); - PC = PC & VAMASK; - set_r_display (R); - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ((reason = sim_process_event ())) break; int_eval (); diff --git a/LGP/lgp_cpu.c b/LGP/lgp_cpu.c index 67eca5ab..b91d6b82 100644 --- a/LGP/lgp_cpu.c +++ b/LGP/lgp_cpu.c @@ -283,8 +283,6 @@ if (lgp21_sov) { /* stop sense pending? * do { if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ((r = sim_process_event ())) break; } diff --git a/NOVA/eclipse_cpu.c b/NOVA/eclipse_cpu.c index 1867d6a4..ddc0e788 100644 --- a/NOVA/eclipse_cpu.c +++ b/NOVA/eclipse_cpu.c @@ -737,8 +737,6 @@ if (MapInit == 0) { while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - saved_PC = PC; if ((reason = sim_process_event ())) break; } diff --git a/NOVA/nova_cpu.c b/NOVA/nova_cpu.c index f5afa1c4..c71b6680 100644 --- a/NOVA/nova_cpu.c +++ b/NOVA/nova_cpu.c @@ -428,9 +428,6 @@ reason = 0; while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - saved_PC = PC; - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ( (reason = sim_process_event ()) ) break; } diff --git a/PDP1/pdp1_cpu.c b/PDP1/pdp1_cpu.c index 5fdee5f3..b59c469e 100644 --- a/PDP1/pdp1_cpu.c +++ b/PDP1/pdp1_cpu.c @@ -546,8 +546,6 @@ reason = 0; while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - /* Make sure all intermediate state is visible in simh registers */ - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ((reason = sim_process_event ())) break; sbs_lvl = sbs_eval (); /* eval sbs system */ diff --git a/PDP18B/pdp18b_cpu.c b/PDP18B/pdp18b_cpu.c index 7a4a9880..3e2f0cd1 100644 --- a/PDP18B/pdp18b_cpu.c +++ b/PDP18B/pdp18b_cpu.c @@ -597,9 +597,6 @@ while (reason == 0) { /* loop until halted */ int32 link_init, fill; if (sim_interval <= 0) { /* check clock queue */ - /* Make sure all intermediate state is visible in simh registers */ - iors = upd_iors (); /* get IORS */ - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ((reason = sim_process_event ())) break; api_int = api_eval (&int_pend); /* eval API */ diff --git a/PDP8/pdp8_cpu.c b/PDP8/pdp8_cpu.c index 62b4451f..cb4471c3 100644 --- a/PDP8/pdp8_cpu.c +++ b/PDP8/pdp8_cpu.c @@ -339,12 +339,6 @@ reason = 0; while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - /* Make sure all intermediate state is visible in simh registers */ - saved_PC = IF | (PC & 07777); /* save copies */ - saved_DF = DF & 070000; - saved_LAC = LAC & 017777; - saved_MQ = MQ & 07777; - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ((reason = sim_process_event ())) break; } diff --git a/S3/s3_cpu.c b/S3/s3_cpu.c index e32f77ed..b732cbe1 100644 --- a/S3/s3_cpu.c +++ b/S3/s3_cpu.c @@ -521,8 +521,6 @@ reason = 0; while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - saved_PC = PC; if ((reason = sim_process_event ())) break; } diff --git a/SDS/sds_cpu.c b/SDS/sds_cpu.c index 665d65c0..38c47f58 100644 --- a/SDS/sds_cpu.c +++ b/SDS/sds_cpu.c @@ -382,8 +382,6 @@ while (reason == 0) { /* loop until halted */ } if (sim_interval <= 0) { /* event queue? */ - /* make sure all useful state is in simh registers while processing events */ - pcq_r->qptr = pcq_p; /* update pc q ptr */ if ((reason = sim_process_event ())) /* process */ break; int_reqhi = api_findreq (); /* recalc int req */ diff --git a/TX-0/tx0_cpu.c b/TX-0/tx0_cpu.c index 82fd2cdc..93e99b12 100644 --- a/TX-0/tx0_cpu.c +++ b/TX-0/tx0_cpu.c @@ -462,8 +462,6 @@ t_stat sim_instr (void) while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - /* make sure all useful state is in simh registers while processing events */ - pcq_r->qptr = pcq_p; /* update pc q ptr */ reason = sim_process_event (); if (reason != SCPE_OK) break; diff --git a/alpha/alpha_cpu.c b/alpha/alpha_cpu.c index 81a7e369..7a6d7c1c 100644 --- a/alpha/alpha_cpu.c +++ b/alpha/alpha_cpu.c @@ -393,11 +393,6 @@ while (reason == 0) { } if (sim_interval <= 0) { /* chk clock queue */ - /* make sure all useful state is in simh registers while processing events */ - pcc_l = pcc_l & M32; - pcq_r->qptr = pcq_p; /* update pc q ptr */ - pc_align = ((uint32) PC) & 3; /* separate PC<1:0> */ - PC = PC & 0xFFFFFFFFFFFFFFFC; if ((reason = sim_process_event ())) break; intr_summ = pal_eval_intr (1); /* eval interrupts */ } diff --git a/sigma/sigma_cpu.c b/sigma/sigma_cpu.c index b2506366..dd6d4631 100644 --- a/sigma/sigma_cpu.c +++ b/sigma/sigma_cpu.c @@ -433,10 +433,6 @@ while (reason == 0) { /* loop until stop */ } if (sim_interval <= 0) { /* event queue? */ - /* make sure all useful state is in simh registers while processing events */ - pcq_r->qptr = pcq_p; /* update pc q ptr */ - cpu_assemble_PSD (); /* visible PSD */ - set_rf_display (R); /* visible registers */ if (reason = sim_process_event ()) /* process */ break; int_hireq = io_eval_int (); /* re-evaluate intr */