PDP11: RF11: Fix DAE computation in service routine; log WC naturally

open-simh · Jun 7, 2023 · ade7ff9 · ade7ff9
1 parent 8b6c0b6
commit ade7ff9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/PDP11/pdp11_rf.c b/PDP11/pdp11_rf.c
@@ -270,8 +270,8 @@ switch ((PA >> 1) & 07) {                               /* decode PA<3:1> */
             rf_cs &= ~(RFCS_WCHK|RFCS_DPAR|RFCS_NED|RFCS_WLK|RFCS_MXFR|RFCS_DONE);
             CLR_INT (RF);
             if (DEBUG_PRS (rf_dev))
-                fprintf (sim_deb, ">>RF start: cs = %o, da = %o, ma = %o\n",
-                    update_rfcs (0, 0), GET_DEX (rf_dae) | rf_da, GET_MEX (rf_cs) | rf_cma);
+                fprintf (sim_deb, ">>RF start: cs = %o, da = %o, ma = %o, wc = %o\n",
+                    update_rfcs (0, 0), GET_DEX (rf_dae) | rf_da, GET_MEX (rf_cs) | rf_cma, -((short) rf_wc));
             }
         break;
 
@@ -382,16 +382,16 @@ do {
     } while ((rf_wc != 0) && (rf_burst != 0));          /* brk if wc, no brst */
 
 rf_da = da & DMASK;                                     /* split da */
-rf_dae = (rf_dae & ~RFDAE_DAE) | ((rf_da >> 16) & RFDAE_DAE);
+rf_dae = (rf_dae & ~RFDAE_DAE) | ((da >> 16) & RFDAE_DAE);
 rf_cma = ma & DMASK;                                    /* split ma */
 rf_cs = (rf_cs & ~RFCS_MEX) | ((ma >> (16 - RFCS_V_MEX)) & RFCS_MEX); 
 if ((rf_wc != 0) && ((rf_cs & RFCS_ERR) == 0))          /* more to do? */
     sim_activate (&rf_unit, rf_time);                   /* sched next */
 else {
     update_rfcs (RFCS_DONE, 0);
     if (DEBUG_PRS (rf_dev))
-        fprintf (sim_deb, ">>RF done: cs = %o, dae = %o, da = %o, ma = %o, wc = %o\n",
-            rf_cs, rf_dae, rf_da, rf_cma, rf_wc);
+        fprintf (sim_deb, ">>RF  done: cs = %o, da = %o, ma = %o, wc = %o\n",
+            rf_cs, GET_DEX (rf_dae) | rf_da, GET_MEX (rf_cs) | rf_cma, -((short) rf_wc));
     }
 return SCPE_OK;
 }