github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-05-04 06:58:38 +00:00
Code Releases Activity

SIGMA: Fix three kinds of error in I/O modules.

Browse Source 
Discovered while getting standalone System Exerciser to run:

IO: DVT_NOTDEV macro incorrect, Device mapping algorithm creates false
      dispatch points.
      This mapped Multi Unit Controller and Single Unit Controller to same
      device.
DP, DP, MT, RAD:  Test for non-existent device returns wrong status.
DP, DK, MT: TIO status should return non-operational for unattached device.
This commit is contained in:
ken rector
2024-03-20 09:13:38 -10:00
committed by Mark Pizzolato
parent b523caac82
commit 93fe10c1e2
6 changed files with 103 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sigma/sigma_io.c Executable file → Normal file
View File

@@ -1,6 +1,6 @@
/* sigma_io.c: XDS Sigma IO simulator
/* sigma_io.c: XDS Sigma IO simulator
Copyright (c) 2007-2022, Robert M Supnik
Copyright (c) 2007-2024, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -23,6 +23,9 @@
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Robert M Supnik.
11-Feb-2024 RMS Fixed false dispatch bug (Ken Rector)
04-May-2023 RMS Fixed location 21 usage in even register case (Ken Rector)
15-Dec-2022 RMS Moved SIO interrupt test to devices
23-Jul-2022 RMS Made chan_ctl_time accessible as a register
21-Jul-2022 RMS Added numeric channel numbers to SET/SHOW
07-Jul-2022 RMS Fixed dangling else in read/write direct (Ken Rector)
@@ -473,14 +476,27 @@ CC |= CC1|CC2; /* no recognition */
return 0;
}
/* Initiate I/O instruction */
/* Initiate I/O instruction
False dispatch problem. Although device numbers are not permitted to overlap,
there is nothing to stop programs from issuing IO instructions to a multi-
unit device address using its single-unit counterpart, or vice-versa.
For example, an IO address of 0x00 will map to the dispatch used for
0x80, and vice versa. This routine must detect that the device
address actually agrees with the type of device in that dispatch slot.
*/
t_bool io_init_inst (uint32 rn, uint32 ad, uint32 ch, uint32 dev, uint32 r0)
{
uint32 loc20;
t_bool ch_mu, dva_mu;
if (ch >= chan_num) /* bad chan? */
if ((dev >= CHAN_N_DEV) || (ch >= chan_num)) /* bad dev or chan? */
return FALSE;
ch_mu = (chan[ch].chsf[dev] & CHSF_MU) != 0; /* does chan think MU? */
dva_mu = (ad & DVA_MU) != 0; /* is dva MU? */
if (ch_mu != dva_mu) /* not the same? */
return FALSE; /* dev not there */
loc20 = ((ad & 0xFF) << 24) | /* <0:7> = dev ad */
((rn & 1) | (rn? 3: 0) << 22) | /* <8:9> = reg ind */
(r0 & (cpu_tab[cpu_model].pamask >> 1)); /* <14/16:31> = r0 */
@@ -493,7 +509,6 @@ return (chan[ch].disp[dev] != NULL)? TRUE: FALSE;
uint32 io_set_status (uint32 rn, uint32 ch, uint32 dev, uint32 dvst, t_bool tdv)
{
uint32 mrgst;
uint32 odd = rn & 1;
if ((rn != 0) && !(dvst & DVT_NOST)) { /* return status? */
if (tdv)