diff --git a/PDP10/ks10_dup.c b/PDP10/ks10_dup.c index 0b25626..c70e2a6 100644 --- a/PDP10/ks10_dup.c +++ b/PDP10/ks10_dup.c @@ -982,7 +982,7 @@ sim_debug(DBG_TRC, DUPDPTR, "dup_svc(dup=%d)\n", dup); if (!(dup_txcsr[dup] & TXCSR_M_TXDONE) && (!tmxr_tpbusyln (lp))) { uint8 data = dup_txdbuf[dup] & TXDBUF_M_TXDBUF; - dup_put_msg_bytes (dup, &data, (dup_txdbuf[dup] & TXDBUF_M_TEOM) && (dptr == &dup_dev) ? 0 : 1, dup_txdbuf[dup] & TXDBUF_M_TSOM, (dup_txdbuf[dup] & TXDBUF_M_TEOM)); + dup_put_msg_bytes (dup, &data, 0, dup_txdbuf[dup] & TXDBUF_M_TSOM, (dup_txdbuf[dup] & TXDBUF_M_TEOM)); if (tmxr_tpbusyln (lp)) { /* Packet ready to send? */ sim_debug(DBG_TRC, DUPDPTR, "dup_svc(dup=%d) - Packet Done %d bytes\n", dup, dup_xmtpkoffset[dup]); } @@ -1152,7 +1152,6 @@ return SCPE_OK; static t_stat dup_reset (DEVICE *dptr) { -t_stat r; int32 i, ndev, attached = 0; sim_debug(DBG_TRC, dptr, "dup_reset()\n"); @@ -1190,7 +1189,7 @@ sim_cancel (dup_units+dup_desc.lines); /* stop poll */ ndev = ((dptr->flags & DEV_DIS)? 0: dup_desc.lines ); if (attached) sim_activate_after (dup_units+dup_desc.lines, DUP_CONNECT_POLL*1000000);/* start poll */ -return r; +return SCPE_OK; } static t_stat dup_attach (UNIT *uptr, CONST char *cptr) diff --git a/PDP10/kx10_cpu.c b/PDP10/kx10_cpu.c index cf2ed5e..5c7184d 100644 --- a/PDP10/kx10_cpu.c +++ b/PDP10/kx10_cpu.c @@ -495,7 +495,9 @@ REG cpu_reg[] = { #if KL | KI | ITS | BBN | KS { FLDATAD (PAGE_ENABLE, page_enable, 0, "Paging enabled")}, { FLDATAD (PAGE_FAULT, page_fault, 0, "Page fault"), REG_RO}, +#if KI | ITS | BBN { ORDATAD (AC_STACK, ac_stack, 18, "AC Stack"), REG_RO}, +#endif { ORDATAD (PAGE_RELOAD, pag_reload, 18, "Page reload"), REG_HRO}, { ORDATAD (FAULT_DATA, fault_data, 36, "Page fault data"), REG_RO}, { FLDATAD (TRP_FLG, trap_flag, 0, "Trap flag"), REG_HRO}, @@ -8810,7 +8812,7 @@ jrstf: #endif #if KL if (QKLB && t20_page) - pc_sect = AR >> 18; + pc_sect = (AR >> 18) & 0037; #endif PC = AR & RMASK; PC_CHANGE @@ -13419,9 +13421,12 @@ pi_pending = pi_enc = apr_irq = 0; ov_irq =fov_irq =clk_en =clk_irq = 0; pi_restore = pi_hold = 0; FLAGS = 0; +#if KI | ITS | BBN +ac_stack = 0; +#endif #if KI | KL | KS ub_ptr = eb_ptr = 0; -pag_reload = ac_stack = 0; +pag_reload = 0; #if KI fm_sel = small_user = user_addr_cmp = page_enable = 0; #else