mirror of
https://github.com/simh/simh.git
synced 2026-01-26 04:01:38 +00:00
Notes For V3.1-0
RESTRICTION: The FP15 and XVM features of the PDP-15 are only partially debugged. Do NOT enable these features for normal operations. 1. New Features in 3.1-0 1.1 SCP and libraries - Added simulated Ethernet support for VMS, FreeBSD, Mac OS/X. - Added status return to tmxr_putc_ln. - Added sim_putchar_s to handle possible output stalls. 1.2 All DECtapes - Added "DECtape off reel" error stop. 1.3 All Asynchronous Consoles - Added support for output congestion stall if using a Telnet connection. 1.4 PDP-1 - Added Type 23 parallel drum support. 1.5 PDP-8 - Added instruction history. - Added TSC8-75 option support for ETOS. - Added TD8E DECtape support. 1.6 PDP-18b - Added instruction history. - Changed PDP-9, PDP-15 API default to enabled. 1.7 PDP-11 - Added support for 18b only Qbus devices. - Formalized bus and addressing definitions. - Added control to enable/disable autoconfiguration. - Added stub support for second Unibus Ethernet controller. 1.7 Interdata 32b - Added instruction history. 1.8 Eclipse - Added floating point support. - Added programmable interval timer support. 1.9 H316 - Added DMA/DMC support. - Added fixed head disk support. - Added moving head disk support. - Added magtape support. 1.10 IBM 1130 (Brian Knittel) - Added support for physical card reader, using the Cardread interface (www.ibm1130.org/sim/downloads). - Added support for physical printer (flushes output buffer after each line). 2. Bugs Fixed in 3.1-0 2.1 SCP and libraries - Fixed numerous bugs in Ethernet library. 2.2 All DECtapes - Fixed reverse checksum value in 'read all' mode. - Simplified (and sped up) timing. 2.3 PDP-8 - Fixed bug in RX28 read status (found by Charles Dickman). - Fixed RX28 double density write. 2.4 PDP-18b - Fixed autoincrement bug in PDP-4, PDP-7, PDP-9. 2.5 PDP-11/VAX - Revised RQ MB->LBN conversion for greater accuracy. - Fixed bug in IO configuration (found by David Hittner). - Fixed bug with multiple RQ RAUSER drives. - Fixed bug in second Qbus Ethernet controller interrupts. 2.6 Nova/Eclipse - Fixed bugs in DKP flag clear, map setup, map usage (Charles Owen). - Fixed bug in MT, reset completes despite I/O reset (Charles Owen). - Fixed bug in MT, space operations return word count (Charles Owen). 2.7 IBM 1130 (Brian Knittel) - Fixed bug in setting carry bit in subtract and subtract double. - Fixed timing problem in console printer simulation. 2.8 1620 - Fixed bug in branch digit (found by Dave Babcock). 3. New Features in 3.0 vs prior releases 3.1 SCP and Libraries - Added ASSIGN/DEASSIGN (logical name) commands. - Changed RESTORE to unconditionally detach files. - Added E11 and TPC format support to magtape library. - Fixed bug in SHOW CONNECTIONS. - Added USE_ADDR64 support. 3.2 All magtapes - Magtapes support SIMH format, E11 format, and TPC format (read only). - SET <tape_unit> FORMAT=format sets the specified tape unit's format. - SHOW <tape_unit> FORMAT displays the specified tape unit's format. - Tape format can also be set as part of the ATTACH command, using the -F switch. 3.3 VAX - VAX can be compiled without USE_INT64. - If compiled with USE_INT64 and USE_ADDR64, RQ and TQ controllers support files > 2GB. - VAX ROM has speed control (SET ROM DELAY/NODELAY). 3.4 PDP-1 - Added block loader format support to LOAD. - Changed BOOT PTR to allow loading of all of the first bank of memory. - The LOAD command takes an optional argument specifying the memory field to be loaded. - The PTR BOOT command takes its starting memory field from the TA (address switch) register. 3.5 PDP-18b Family - Added PDP-4 EAE support. - Added PDP-15 FP15 support. - Added PDP-15 XVM support. - Added PDP-15 "re-entrancy ECO". - Added PDP-7, PDP-9, PDP-15 hardware RIM loader support in BOOT PTR. 4. Bugs Fixed in 3.0 vs prior releases 4.1 SCP and Libraries - Fixed end of file problem in dep, idep. - Fixed handling of trailing spaces in dep, idep. 4.2 VAX - Fixed CVTfi bug: integer overflow not set if exponent out of range - Fixed EMODx bugs: o First and second operands reversed o Separated fraction received wrong exponent o Overflow calculation on separated integer incorrect o Fraction not set to zero if exponent out of range - Fixed interval timer and ROM access to pass power-up self-test even on very fast host processors (fixes from Mark Pizzolato). - Fixed bug in user disk size (found by Chaskiel M Grundman). 4.3 1401 - Fixed mnemonic, instruction lengths, and reverse scan length check bug for MCS. - Fixed MCE bug, BS off by 1 if zero suppress. - Fixed chaining bug, D lost if return to SCP. - Fixed H branch, branch occurs after continue. - Added check for invalid 8 character MCW, LCA. - Fixed magtape load-mode end of record response. - Revised fetch to model hardware more closely. - Fixed tape read end-of-record handling based on real 1401. - Added diagnostic read (space forward). 4.4 Nova - Fixed DSK variable size interaction with restore. - Fixed bug in DSK set size routine. 4.5 PDP-1 - Fixed DT variable size interaction with restore. - Updated CPU, line printer, standard devices to detect indefinite I/O wait. - Fixed incorrect logical, missing activate, break in drum simulator. - Fixed bugs in instruction decoding, overprinting for line printer. - Fixed system hang if continue after PTR error. - Fixed PTR to start/stop on successive rpa instructions. 4.6 PDP-11 - Fixed DT variable size interaction with restore. - Fixed bug in MMR1 update (found by Tim Stark). - Added XQ features and fixed bugs: o Corrected XQ interrupts on IE state transition (code by Tom Evans). o Added XQ interrupt clear on soft reset. o Removed XQ interrupt when setting XL or RL (multiple people). o Added SET/SHOW XQ STATS. o Added SHOW XQ FILTERS. o Added ability to split received packet into multiple buffers. o Added explicit runt and giant packet processing. - Fixed bug in user disk size (found by Chaskiel M Grundman). 4.7 PDP-18B - Fixed DT, RF variable size interaction with restore. - Fixed MT bug in MTTR. - Fixed bug in PDP-4 line printer overprinting. - Fixed bug in PDP-15 memory protect/skip interaction. - Fixed bug in RF set size routine. - Increased PTP TIME for PDP-15 operating systems. - Fixed priorities in PDP-15 API (differs from PDP-9). - Fixed sign handling in PDP-15 EAE unsigned mul/div (differs from PDP-9). - Fixed bug in CAF, clears API subsystem. 4.8 PDP-8 - Fixed DT, DF, RF, RX variable size interaction with restore. - Fixed MT bug in SKTR. - Fixed bug in DF, RF set size routine. 4.9 HP2100 - Fixed bug in DP (13210A controller only), DQ read status. - Fixed bug in DP, DQ seek complete. - Fixed DR drum sizes. - Fixed DR variable capacity interaction with SAVE/RESTORE. 4.10 GRI - Fixed bug in SC queue pointer management. 4.11 PDP-10 - Fixed bug in RP read header. 4.12 Ibm1130 - Fixed bugs found by APL 1130. 4.13 Altairz80 - Fixed bug in real-time clock on Windows host. 4.14 1620 - Fixed bug in immediate index add (found by Michael Short).
This commit is contained in:
committed by
Mark Pizzolato
parent
b2101ecdd4
commit
1da2d9452d
3743
NOVA/eclipse_cpu.c
3743
NOVA/eclipse_cpu.c
File diff suppressed because it is too large
Load Diff
@@ -23,6 +23,7 @@
|
||||
be used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from Robert M Supnik.
|
||||
|
||||
22-Nov-03 CEO Added support for PIT device
|
||||
19-Jan-03 RMS Changed CMASK to CDMASK for Apple Dev kit conflict
|
||||
03-Oct-02 RMS Added device information structure
|
||||
22-Dec-00 RMS Added Bruce Ray's second terminal support
|
||||
@@ -174,6 +175,7 @@
|
||||
#define DEV_ADCV 030 /* A/D converter */
|
||||
#define DEV_DKP 033 /* disk pack */
|
||||
#define DEV_CAS 034 /* cassette */
|
||||
#define DEV_PIT 043 /* programmable interval timer */
|
||||
#define DEV_TTI1 050 /* second console input */
|
||||
#define DEV_TTO1 051 /* second console output */
|
||||
#define DEV_CPU 077 /* CPU control */
|
||||
@@ -211,6 +213,7 @@ typedef struct nova_dib DIB;
|
||||
Priority (for INTA) runs from low numbers to high
|
||||
*/
|
||||
|
||||
#define INT_V_PIT 2 /* PIT */
|
||||
#define INT_V_DKP 3 /* moving head disk */
|
||||
#define INT_V_DSK 4 /* fixed head disk */
|
||||
#define INT_V_MTA 5 /* magnetic tape */
|
||||
@@ -227,6 +230,7 @@ typedef struct nova_dib DIB;
|
||||
#define INT_V_NO_ION_PENDING 16 /* ion delay */
|
||||
#define INT_V_ION 17 /* interrupts on */
|
||||
|
||||
#define INT_PIT (1 << INT_V_PIT)
|
||||
#define INT_DKP (1 << INT_V_DKP)
|
||||
#define INT_DSK (1 << INT_V_DSK)
|
||||
#define INT_MTA (1 << INT_V_MTA)
|
||||
@@ -247,6 +251,7 @@ typedef struct nova_dib DIB;
|
||||
|
||||
/* PI disable bits */
|
||||
|
||||
#define PI_PIT 0001000
|
||||
#define PI_DKP 0000400
|
||||
#define PI_DSK 0000100
|
||||
#define PI_MTA 0000040
|
||||
|
||||
@@ -25,6 +25,9 @@
|
||||
|
||||
dkp moving head disk
|
||||
|
||||
28-Nov-03 CEO Boot from DP now puts device address in SR
|
||||
24-Nov-03 CEO Added support for disk sizing on 6099/6103
|
||||
19-Nov-03 CEO Corrected major DMA Mapping bug
|
||||
25-Apr-03 RMS Revised autosizing
|
||||
08-Oct-02 RMS Added DIB
|
||||
06-Jan-02 RMS Revised enable/disable support
|
||||
@@ -225,7 +228,7 @@
|
||||
#define TYPE_6070 8
|
||||
#define SECT_6070 24
|
||||
#define SURF_6070 4
|
||||
#define CYL_6070 408
|
||||
#define CYL_6070 408
|
||||
#define SIZE_6070 (SECT_6070 * SURF_6070 * CYL_6070 * DKP_NUMWD)
|
||||
#define NFMT_6070 TRUE
|
||||
|
||||
@@ -278,11 +281,13 @@ extern UNIT cpu_unit;
|
||||
extern int32 int_req, dev_busy, dev_done, dev_disable;
|
||||
|
||||
int32 dkp_ma = 0; /* memory address */
|
||||
int32 dkp_map = 0; /* DCH map 0=A 3=B */
|
||||
int32 dkp_ussc = 0; /* unit/sf/sc/cnt */
|
||||
int32 dkp_fccy = 0; /* flags/cylinder */
|
||||
int32 dkp_sta = 0; /* status register */
|
||||
int32 dkp_swait = 100; /* seek latency */
|
||||
int32 dkp_rwait = 100; /* rotate latency */
|
||||
int32 dkp_diagmode = 0; /* diagnostic mode */
|
||||
|
||||
DEVICE dkp_dev;
|
||||
int32 dkp (int32 pulse, int32 code, int32 AC);
|
||||
@@ -322,6 +327,8 @@ REG dkp_reg[] = {
|
||||
{ FLDATA (BUSY, dev_busy, INT_V_DKP) },
|
||||
{ FLDATA (DONE, dev_done, INT_V_DKP) },
|
||||
{ FLDATA (DISABLE, dev_disable, INT_V_DKP) },
|
||||
{ FLDATA (DIAG, dkp_diagmode, 0) },
|
||||
{ ORDATA (MAP, dkp_map, 2) },
|
||||
{ DRDATA (STIME, dkp_swait, 24), PV_LEFT },
|
||||
{ DRDATA (RTIME, dkp_rwait, 24), PV_LEFT },
|
||||
{ URDATA (CAPAC, dkp_unit[0].capac, 10, T_ADDR_W, 0,
|
||||
@@ -452,22 +459,32 @@ case ioDIA: /* DIA */
|
||||
rval = dkp_sta;
|
||||
break;
|
||||
case ioDOA: /* DOA */
|
||||
if (AC & 0100000) /* clear rw done? */
|
||||
dkp_sta = dkp_sta & ~(STA_CYL|STA_XCY|STA_UNS|STA_CRC);
|
||||
if ((dev_busy & INT_DKP) == 0) {
|
||||
dkp_fccy = AC; /* save cmd, cyl */
|
||||
dkp_sta = dkp_sta & ~(AC & FCCY_FLAGS); }
|
||||
if ((dkp_sta & STA_DFLGS) == 0) /* done flags = 0? */
|
||||
dev_done = dev_done & ~INT_DKP; /* clear intr */
|
||||
break;
|
||||
case ioDIB: /* DIB */
|
||||
rval = dkp_ma; /* return buf addr */
|
||||
break;
|
||||
case ioDOB: /* DOB */
|
||||
if ((dev_busy & INT_DKP) == 0) dkp_ma =
|
||||
AC & (drv_tab[dtype].newf? DMASK: AMASK);
|
||||
if ((dev_busy & INT_DKP) == 0) {
|
||||
dkp_ma = AC & (drv_tab[dtype].newf? DMASK: AMASK);
|
||||
if (AC & 0100000) dkp_map = 3; /* high bit is map */
|
||||
else dkp_map = 0;
|
||||
}
|
||||
break;
|
||||
case ioDIC: /* DIC */
|
||||
rval = dkp_ussc; /* return unit, sect */
|
||||
break;
|
||||
case ioDOC: /* DOC */
|
||||
if ((dev_busy & INT_DKP) == 0) dkp_ussc = AC; /* save unit, sect */
|
||||
if (((dtype == TYPE_6099) || /* for 6099 and 6103 */
|
||||
(dtype == TYPE_6103)) && /* if data<0> set, */
|
||||
AC & 010000) dkp_diagmode = 1; /* set diagnostic mode */
|
||||
break; } /* end switch code */
|
||||
|
||||
/* IOT, continued */
|
||||
@@ -478,7 +495,14 @@ case iopS: /* start */
|
||||
dev_busy = dev_busy | INT_DKP; /* set busy */
|
||||
dev_done = dev_done & ~INT_DKP; /* clear done */
|
||||
int_req = int_req & ~INT_DKP; /* clear int */
|
||||
if (dkp_go ()) break; /* new cmd, error? */
|
||||
if (dkp_diagmode) { /* in diagnostic mode? */
|
||||
dkp_diagmode = 0; /* reset it */
|
||||
if (dtype == TYPE_6099) dkp_ussc = 010002; /* return size bits */
|
||||
if (dtype == TYPE_6103) dkp_ussc = 010003; /* for certain types */
|
||||
}
|
||||
else { /* normal mode ... */
|
||||
if (dkp_go ()) break; /* new cmd, error? */
|
||||
}
|
||||
dev_busy = dev_busy & ~INT_DKP; /* clear busy */
|
||||
dev_done = dev_done | INT_DKP; /* set done */
|
||||
int_req = (int_req & ~INT_DEV) | (dev_done & ~dev_disable);
|
||||
@@ -558,6 +582,13 @@ static uint16 tbuf[DKP_NUMWD]; /* transfer buffer */
|
||||
|
||||
rval = SCPE_OK;
|
||||
dtype = GET_DTYPE (uptr->flags); /* get drive type */
|
||||
if (dkp_diagmode) { /* diagnostic mode? */
|
||||
dkp_sta = (dkp_sta | STA_DONE); /* Set error bit only */
|
||||
dev_busy = dev_busy & ~INT_DKP; /* clear busy */
|
||||
dev_done = dev_done | INT_DKP; /* set done */
|
||||
int_req = (int_req & ~INT_DEV) | (dev_done & ~dev_disable);
|
||||
return SCPE_OK; /* do not do function */
|
||||
}
|
||||
if (uptr->FUNC == FCCY_SEEK) { /* seek? */
|
||||
if (uptr->CYL >= drv_tab[dtype].cyl) /* bad cylinder? */
|
||||
dkp_sta = dkp_sta | STA_ERR | STA_CYL;
|
||||
@@ -597,14 +628,14 @@ else { sc = 16 - GET_COUNT (dkp_ussc); /* get sector count */
|
||||
for ( ; awc < DKP_NUMWD; awc++) tbuf[awc] = 0;
|
||||
if (err = ferror (uptr->fileref)) break;
|
||||
for (dx = 0; dx < DKP_NUMWD; dx++) { /* loop thru buffer */
|
||||
pa = MapAddr (0, dkp_ma);
|
||||
pa = MapAddr (dkp_map, (dkp_ma & AMASK));
|
||||
if (MEM_ADDR_OK (pa)) M[pa] = tbuf[dx];
|
||||
dkp_ma = (dkp_ma + 1) & AMASK; } } }
|
||||
|
||||
if (uptr->FUNC == FCCY_WRITE) { /* write? */
|
||||
for (sx = 0; sx < sc; sx++) { /* loop thru sectors */
|
||||
for (dx = 0; dx < DKP_NUMWD; dx++) { /* loop into buffer */
|
||||
pa = MapAddr (0, dkp_ma);
|
||||
pa = MapAddr (dkp_map, (dkp_ma & AMASK));
|
||||
tbuf[dx] = M[pa];
|
||||
dkp_ma = (dkp_ma + 1) & AMASK; }
|
||||
fxwrite (tbuf, sizeof(int16), DKP_NUMWD, uptr->fileref);
|
||||
@@ -641,6 +672,8 @@ dev_busy = dev_busy & ~INT_DKP; /* clear busy */
|
||||
dev_done = dev_done & ~INT_DKP; /* clear done, int */
|
||||
int_req = int_req & ~INT_DKP;
|
||||
dkp_fccy = dkp_ussc = dkp_ma = dkp_sta = 0; /* clear registers */
|
||||
dkp_diagmode = 0; /* clear diagnostic mode */
|
||||
dkp_map = 0;
|
||||
for (u = 0; u < DKP_NUMDR; u++) { /* loop thru units */
|
||||
uptr = dkp_dev.units + u;
|
||||
sim_cancel (uptr); /* cancel activity */
|
||||
@@ -685,33 +718,33 @@ return SCPE_OK;
|
||||
#define BOOT_LEN (sizeof (boot_rom) / sizeof (int))
|
||||
|
||||
static const int32 boot_rom[] = {
|
||||
060233, /* NIOC 0,DKP ; clear disk */
|
||||
020420, /* LDA 0,USSC ; unit, sfc, sec, cnt */
|
||||
063033, /* DOC 0,DKP ; select disk */
|
||||
020417, /* LDA 0,SEKCMD ; command, cylinder */
|
||||
061333, /* DOAP 0,DKP ; start seek */
|
||||
024415, /* LDA 1,SEKDN */
|
||||
060433, /* DIA 0,DKP ; get status */
|
||||
0060233, /* NIOC 0,DKP ; clear disk */
|
||||
0020420, /* LDA 0,USSC ; unit, sfc, sec, cnt */
|
||||
0063033, /* DOC 0,DKP ; select disk */
|
||||
0020417, /* LDA 0,SEKCMD ; command, cylinder */
|
||||
0061333, /* DOAP 0,DKP ; start seek */
|
||||
0024415, /* LDA 1,SEKDN */
|
||||
0060433, /* DIA 0,DKP ; get status */
|
||||
0123415, /* AND# 1,0,SZR ; skip if done */
|
||||
000776, /* JMP .-2 */
|
||||
0000776, /* JMP .-2 */
|
||||
0102400, /* SUB 0,0 ; mem addr = 0 */
|
||||
062033, /* DOB 0,DKP */
|
||||
020411, /* LDA 0,REDCMD ; command, cylinder */
|
||||
061133, /* DOAS 0,DKP ; start read */
|
||||
060433, /* DIA 0, DKP ; get status */
|
||||
0062033, /* DOB 0,DKP */
|
||||
0020411, /* LDA 0,REDCMD ; command, cylinder */
|
||||
0061133, /* DOAS 0,DKP ; start read */
|
||||
0060433, /* DIA 0, DKP ; get status */
|
||||
0101113, /* MOVL# 0,0,SNC ; skip if done */
|
||||
000776, /* JMP .-2 */
|
||||
000377, /* JMP 377 */
|
||||
000016, /* USSC: 0.B1+0.B7+0.B11+16 */
|
||||
0000776, /* JMP .-2 */
|
||||
0000377, /* JMP 377 */
|
||||
0000016, /* USSC: 0.B1+0.B7+0.B11+16 */
|
||||
0175000, /* SEKCMD: 175000 */
|
||||
074000, /* SEKDN: 074000 */
|
||||
0074000, /* SEKDN: 074000 */
|
||||
0174000 /* REDCMD: 174000 */
|
||||
};
|
||||
|
||||
t_stat dkp_boot (int32 unitno, DEVICE *dptr)
|
||||
{
|
||||
int32 i, dtype;
|
||||
extern int32 saved_PC;
|
||||
extern int32 saved_PC, SR;
|
||||
|
||||
for (i = 0; i < BOOT_LEN; i++) M[BOOT_START + i] = boot_rom[i];
|
||||
unitno = unitno & USSC_M_UNIT;
|
||||
@@ -719,5 +752,6 @@ dtype = GET_DTYPE (dkp_unit[unitno].flags);
|
||||
M[BOOT_UNIT] = M[BOOT_UNIT] | (unitno << USSC_V_UNIT);
|
||||
if (drv_tab[dtype].newf) M[BOOT_SEEK] = 0176000;
|
||||
saved_PC = BOOT_START;
|
||||
SR = 0100000 + DEV_DKP;
|
||||
return SCPE_OK;
|
||||
}
|
||||
|
||||
@@ -485,6 +485,8 @@ The moving head disk controller implements these registers:
|
||||
DONE 1 device done flag
|
||||
DISABLE 1 interrupt disable flag
|
||||
INT 1 interrupt pending flag
|
||||
DIAG 1 diagnostic mode flag
|
||||
MAP 2 map select
|
||||
STIME 24 seek time, per cylinder
|
||||
RTIME 24 rotational delay
|
||||
|
||||
|
||||
@@ -205,6 +205,7 @@ return rval;
|
||||
t_stat dsk_svc (UNIT *uptr)
|
||||
{
|
||||
int32 i, da, pa;
|
||||
int16 *fbuf = uptr->filebuf;
|
||||
|
||||
dev_busy = dev_busy & ~INT_DSK; /* clear busy */
|
||||
dev_done = dev_done | INT_DSK; /* set done */
|
||||
@@ -218,13 +219,12 @@ da = dsk_da * DSK_NUMWD; /* calc disk addr */
|
||||
if (uptr->FUNC == iopS) { /* read? */
|
||||
for (i = 0; i < DSK_NUMWD; i++) { /* copy sector */
|
||||
pa = MapAddr (0, (dsk_ma + i) & AMASK); /* map address */
|
||||
if (MEM_ADDR_OK (pa)) M[pa] =
|
||||
*(((int16 *) uptr->filebuf) + da + i); }
|
||||
if (MEM_ADDR_OK (pa)) M[pa] = fbuf[da + i]; }
|
||||
dsk_ma = (dsk_ma + DSK_NUMWD) & AMASK; }
|
||||
if (uptr->FUNC == iopP) { /* write? */
|
||||
for (i = 0; i < DSK_NUMWD; i++) { /* copy sector */
|
||||
pa = MapAddr (0, (dsk_ma + i) & AMASK); /* map address */
|
||||
*(((int16 *) uptr->filebuf) + da + i) = M[pa]; }
|
||||
fbuf[da + i] = M[pa]; }
|
||||
if (((uint32) (da + i)) >= uptr->hwmark) /* past end? */
|
||||
uptr->hwmark = da + i + 1; /* upd hwmark */
|
||||
dsk_ma = (dsk_ma + DSK_NUMWD + 3) & AMASK; }
|
||||
|
||||
@@ -25,6 +25,8 @@
|
||||
|
||||
mta magnetic tape
|
||||
|
||||
22-Nov-03 CEO DIB returns # records skipped after space fwd
|
||||
22-Nov-03 CEO Removed cancel of tape events in IORST
|
||||
25-Apr-03 RMS Revised for extended file support
|
||||
28-Mar-03 RMS Added multiformat support
|
||||
28-Feb-03 RMS Revised for magtape library
|
||||
@@ -397,6 +399,7 @@ case CU_SPACEF: /* space forward */
|
||||
}
|
||||
while (mta_wc != 0);
|
||||
mta_upddsta (uptr, uptr->USTAT | STA_RDY);
|
||||
mta_ma = mta_wc; /* Word count = # records */
|
||||
break;
|
||||
|
||||
case CU_SPACER: /* space reverse */
|
||||
@@ -408,6 +411,7 @@ case CU_SPACER: /* space reverse */
|
||||
}
|
||||
while (mta_wc != 0);
|
||||
mta_upddsta (uptr, uptr->USTAT | STA_RDY);
|
||||
mta_ma = mta_wc; /* Word count = # records */
|
||||
break;
|
||||
|
||||
default: /* reserved */
|
||||
@@ -503,8 +507,15 @@ dev_done = dev_done & ~INT_MTA; /* clear done, int */
|
||||
int_req = int_req & ~INT_MTA;
|
||||
mta_cu = mta_wc = mta_ma = mta_sta = 0; /* clear registers */
|
||||
mta_ep = 0;
|
||||
|
||||
/* AOS Installer does an IORST after a tape rewind command but before it can
|
||||
be serviced, yet expects the tape to have been rewound */
|
||||
|
||||
for (u = 0; u < MTA_NUMDR; u++) { /* loop thru units */
|
||||
uptr = mta_dev.units + u;
|
||||
if (sim_is_active (uptr) && /* active and */
|
||||
(uptr->flags & STA_REW)) /* rewinding? */
|
||||
sim_tape_rewind (uptr); /* update tape */
|
||||
sim_tape_reset (uptr); /* clear pos flag */
|
||||
sim_cancel (uptr); /* cancel activity */
|
||||
if (uptr->flags & UNIT_ATT) uptr->USTAT = STA_RDY |
|
||||
@@ -556,34 +567,35 @@ return SCPE_OK;
|
||||
#define BOOT_LEN (sizeof (boot_rom) / sizeof (int))
|
||||
|
||||
static const int32 boot_rom[] = {
|
||||
060222, /* NIOC 0,MTA ; clear disk */
|
||||
020417, /* LDA 0,UNIT ; unit */
|
||||
024417, /* LDA 1,REWIND ; cmd */
|
||||
0060222, /* NIOC 0,MTA ; clear disk */
|
||||
0020417, /* LDA 0,UNIT ; unit */
|
||||
0024417, /* LDA 1,REWIND ; cmd */
|
||||
0107000, /* ADD 0,1 ; cmd + unit */
|
||||
065122, /* DOAS 1,MTA ; start rewind */
|
||||
070422, /* DIA 2,MTA ; get status */
|
||||
0065122, /* DOAS 1,MTA ; start rewind */
|
||||
0070422, /* DIA 2,MTA ; get status */
|
||||
0151213, /* MOVR# 2,2,SNC ; skip if done */
|
||||
000776, /* JMP .-2 */
|
||||
0000776, /* JMP .-2 */
|
||||
0126400, /* SUB 1,1 ; ma, wc = 0 */
|
||||
066022, /* DOB 1,MTA */
|
||||
067022, /* DOC 1,MTA */
|
||||
061122, /* DOAS 0,MTA ; start read */
|
||||
070422, /* DIA 2,MTA ; get status */
|
||||
0066022, /* DOB 1,MTA */
|
||||
0067022, /* DOC 1,MTA */
|
||||
0061122, /* DOAS 0,MTA ; start read */
|
||||
0070422, /* DIA 2,MTA ; get status */
|
||||
0151213, /* MOVR# 2,2,SNC ; skip if done */
|
||||
000776, /* JMP .-2 */
|
||||
000377, /* JMP 377 */
|
||||
000000, /* UNIT: */
|
||||
000010 /* REWIND: 10 */
|
||||
0000776, /* JMP .-2 */
|
||||
0000377, /* JMP 377 */
|
||||
0000000, /* UNIT: */
|
||||
0000010 /* REWIND: 10 */
|
||||
};
|
||||
|
||||
t_stat mta_boot (int32 unitno, DEVICE *dptr)
|
||||
{
|
||||
int32 i;
|
||||
extern int32 saved_PC;
|
||||
extern int32 saved_PC, SR;
|
||||
|
||||
sim_tape_rewind (&mta_unit[unitno]);
|
||||
for (i = 0; i < BOOT_LEN; i++) M[BOOT_START + i] = boot_rom[i];
|
||||
M[BOOT_UNIT] = (unitno & CU_M_UNIT) << CU_V_UNIT;
|
||||
saved_PC = BOOT_START;
|
||||
SR = 0100000 + DEV_MTA;
|
||||
return SCPE_OK;
|
||||
}
|
||||
|
||||
106
NOVA/nova_sys.c
106
NOVA/nova_sys.c
@@ -23,6 +23,7 @@
|
||||
be used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from Robert M Supnik.
|
||||
|
||||
24-Nov-03 CEO Added symbolic support for LEF instruction
|
||||
17-Sep-01 RMS Removed multiconsole support
|
||||
31-May-01 RMS Added multiconsole support
|
||||
14-Mar-01 RMS Revised load/dump interface (again)
|
||||
@@ -43,16 +44,23 @@ extern DEVICE cpu_dev;
|
||||
extern UNIT cpu_unit;
|
||||
#if defined (ECLIPSE)
|
||||
extern DEVICE map_dev;
|
||||
extern DEVICE fpu_dev;
|
||||
extern DEVICE pit_dev;
|
||||
extern int32 Usermap;
|
||||
extern int32 MapStat;
|
||||
#endif
|
||||
extern DEVICE ptr_dev, ptp_dev;
|
||||
extern DEVICE ptr_dev;
|
||||
extern DEVICE ptp_dev;
|
||||
extern DEVICE plt_dev;
|
||||
extern DEVICE tti_dev, tto_dev;
|
||||
extern DEVICE tti1_dev, tto1_dev;
|
||||
extern DEVICE clk_dev, lpt_dev;
|
||||
extern DEVICE dkp_dev, dsk_dev;
|
||||
extern DEVICE tti_dev;
|
||||
extern DEVICE tto_dev;
|
||||
extern DEVICE tti1_dev;
|
||||
extern DEVICE tto1_dev;
|
||||
extern DEVICE clk_dev;
|
||||
extern DEVICE lpt_dev;
|
||||
extern DEVICE dkp_dev;
|
||||
extern DEVICE dsk_dev;
|
||||
extern DEVICE mta_dev;
|
||||
extern UNIT tti_unit, tto_unit;
|
||||
extern UNIT tti1_unit, tto1_unit;
|
||||
extern REG cpu_reg[];
|
||||
extern uint16 M[];
|
||||
extern int32 saved_PC;
|
||||
@@ -81,13 +89,21 @@ DEVICE *sim_devices[] = {
|
||||
&cpu_dev,
|
||||
#if defined (ECLIPSE)
|
||||
&map_dev,
|
||||
&fpu_dev,
|
||||
&pit_dev,
|
||||
#endif
|
||||
&ptr_dev, &ptp_dev,
|
||||
&tti_dev, &tto_dev,
|
||||
&tti1_dev, &tto1_dev,
|
||||
&clk_dev, &plt_dev,
|
||||
&lpt_dev, &dsk_dev,
|
||||
&dkp_dev, &mta_dev,
|
||||
&ptr_dev,
|
||||
&ptp_dev,
|
||||
&tti_dev,
|
||||
&tto_dev,
|
||||
&tti1_dev,
|
||||
&tto1_dev,
|
||||
&clk_dev,
|
||||
&plt_dev,
|
||||
&lpt_dev,
|
||||
&dsk_dev,
|
||||
&dkp_dev,
|
||||
&mta_dev,
|
||||
NULL };
|
||||
|
||||
const char *sim_stop_messages[] = {
|
||||
@@ -256,7 +272,7 @@ static const char *opcode[] = {
|
||||
"BTO", "BTZ", "SBZ", "SZBO",
|
||||
"LOB", "LRB", "COB", "LDB",
|
||||
"STB", "PSH", "POP",
|
||||
"LMP", "SYSC",
|
||||
"LMP", "SYC",
|
||||
"PSHR", "POPB", "BAM", "POPJ",
|
||||
"RTN", "BLM", "DIVX",
|
||||
"MUL", "MULS", "DIV", "DIVS",
|
||||
@@ -366,6 +382,9 @@ static const char *opcode[] = {
|
||||
"DIC", "DICS", "DICC", "DICP",
|
||||
"DOC", "DOCS", "DOCC", "DOCP",
|
||||
"SKPBN", "SKPBZ", "SKPDN", "SKPDZ",
|
||||
#if defined (ECLIPSE)
|
||||
"LEF", "LEF", "LEF", "LEF",
|
||||
#endif
|
||||
NULL };
|
||||
|
||||
static const opc_val[] = {
|
||||
@@ -379,7 +398,7 @@ static const opc_val[] = {
|
||||
0102010+I_2AC, 0102110+I_2AC, 0102210+I_2AC, 0102310+I_2AC,
|
||||
0102410+I_2AC, 0102510+I_2AC, 0102610+I_2AC, 0102710+I_2AC,
|
||||
0103010+I_2AC, 0103110+I_2AC, 0103210+I_2AC,
|
||||
0113410+I_NPN, 0103510+I_RSI,
|
||||
0113410+I_NPN, 0103510+I_2AC,
|
||||
0103710+I_NPN, 0107710+I_NPN, 0113710+I_NPN, 0117710+I_NPN,
|
||||
0127710+I_NPN, 0133710+I_NPN, 0137710+I_NPN,
|
||||
0143710+I_NPN, 0147710+I_NPN, 0153710+I_NPN, 0157710+I_NPN,
|
||||
@@ -489,6 +508,9 @@ static const opc_val[] = {
|
||||
0062400+I_RD, 0062500+I_RD, 0062600+I_RD, 0062700+I_RD,
|
||||
0063000+I_RD, 0063100+I_RD, 0063200+I_RD, 0063300+I_RD,
|
||||
0063400+I_D, 0063500+I_D, 0063600+I_D, 0063700+I_D,
|
||||
#if defined (ECLIPSE)
|
||||
0064000+I_D, 0070000+I_D, 0074000+I_D, 0076000+I_D,
|
||||
#endif
|
||||
-1 };
|
||||
|
||||
static const char *skip[] = {
|
||||
@@ -579,8 +601,8 @@ int32 ind, mode, disp, dev;
|
||||
int32 byac, extind, extdisp, xop;
|
||||
|
||||
cflag = (uptr == NULL) || (uptr == &cpu_unit);
|
||||
c1 = (val[0] >> 8) & 0177;
|
||||
c2 = val[0] & 0177;
|
||||
c1 = ((int32) val[0] >> 8) & 0177;
|
||||
c2 = (int32) val[0] & 0177;
|
||||
if (sw & SWMASK ('A')) { /* ASCII? */
|
||||
fprintf (of, (c2 < 040)? "<%03o>": "%c", c2);
|
||||
return SCPE_OK; }
|
||||
@@ -592,7 +614,7 @@ if (!(sw & SWMASK ('M'))) return SCPE_ARG; /* mnemonic? */
|
||||
|
||||
/* Instruction decode */
|
||||
|
||||
inst = val[0];
|
||||
inst = (int32) val[0];
|
||||
for (i = 0; opc_val[i] >= 0; i++) { /* loop thru ops */
|
||||
j = (opc_val[i] >> I_V_FL) & I_M_FL; /* get class */
|
||||
if ((opc_val[i] & 0177777) == (inst & masks[j])) { /* match? */
|
||||
@@ -605,8 +627,8 @@ for (i = 0; opc_val[i] >= 0; i++) { /* loop thru ops */
|
||||
dev = I_GETDEV (inst); /* IOT fields */
|
||||
byac = I_GETPULSE (inst); /* byte fields */
|
||||
xop = I_GETXOP (inst); /* XOP fields */
|
||||
extind = val[1] & A_IND; /* extended fields */
|
||||
extdisp = val[1] & AMASK;
|
||||
extind = (int32) val[1] & A_IND; /* extended fields */
|
||||
extdisp = (int32) val[1] & AMASK;
|
||||
for (dv = 0; (dev_val[dv] >= 0) && (dev_val[dv] != dev); dv++) ;
|
||||
|
||||
switch (j) { /* switch on class */
|
||||
@@ -617,6 +639,13 @@ for (i = 0; opc_val[i] >= 0; i++) { /* loop thru ops */
|
||||
fprintf (of, "%s %-o", opcode[i], dst);
|
||||
break;
|
||||
case I_V_D: /* dev only */
|
||||
#if defined (ECLIPSE)
|
||||
if (Usermap && (MapStat & 0100)) { /* the evil LEF mode */
|
||||
fprintf (of, "LEF %-o,", dst);
|
||||
fprint_addr (of, addr, ind, mode, disp, FALSE, cflag);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
if (dev_val[dv] >= 0)
|
||||
fprintf (of, "%s %s", opcode[i], device[dv]);
|
||||
else fprintf (of, "%s %-o", opcode[i], dev);
|
||||
@@ -671,7 +700,10 @@ for (i = 0; opc_val[i] >= 0; i++) { /* loop thru ops */
|
||||
return -1;
|
||||
case I_V_XP: /* XOP */
|
||||
fprintf (of, "%s %-o,%-o,%-o", opcode[i], src, dst, xop);
|
||||
break; } /* end case */
|
||||
break; /* end case */
|
||||
default:
|
||||
fprintf (of, "??? [%-o]", inst);
|
||||
break; }
|
||||
return SCPE_OK; } /* end if */
|
||||
} /* end for */
|
||||
return SCPE_ARG;
|
||||
@@ -726,12 +758,12 @@ else if (*cptr == '-') { /* - sign? */
|
||||
cptr++; }
|
||||
if (*cptr != 0) { /* number? */
|
||||
cptr = get_glyph (cptr, gbuf, ','); /* get glyph */
|
||||
d = get_uint (gbuf, 8, AMASK, &r);
|
||||
d = (int32) get_uint (gbuf, 8, AMASK, &r);
|
||||
if (r != SCPE_OK) return NULL;
|
||||
pflag = pflag | A_NUM; }
|
||||
if (*cptr != 0) { /* index? */
|
||||
cptr = get_glyph (cptr, gbuf, 0); /* get glyph */
|
||||
x = get_uint (gbuf, 8, I_M_DST, &r);
|
||||
x = (int32) get_uint (gbuf, 8, I_M_DST, &r);
|
||||
if ((r != SCPE_OK) || (x < 2)) return NULL;
|
||||
pflag = pflag | A_NX; }
|
||||
|
||||
@@ -786,10 +818,10 @@ char gbuf[CBUFSIZE];
|
||||
t_stat r;
|
||||
|
||||
cptr = get_glyph (cptr, gbuf, ','); /* get register */
|
||||
val[0] = get_uint (gbuf, 8, I_M_SRC, &r);
|
||||
val[0] = (int32) get_uint (gbuf, 8, I_M_SRC, &r);
|
||||
if (r != SCPE_OK) return NULL;
|
||||
cptr = get_glyph (cptr, gbuf, term); /* get register */
|
||||
val[1] = get_uint (gbuf, 8, I_M_DST, &r);
|
||||
val[1] = (int32) get_uint (gbuf, 8, I_M_DST, &r);
|
||||
if (r != SCPE_OK) return NULL;
|
||||
return cptr;
|
||||
}
|
||||
@@ -837,13 +869,13 @@ case I_V_NPN: /* no operand */
|
||||
break;
|
||||
case I_V_R: /* IOT reg */
|
||||
cptr = get_glyph (cptr, gbuf, 0); /* get register */
|
||||
d = get_uint (gbuf, 8, I_M_DST, &r);
|
||||
d = (int32) get_uint (gbuf, 8, I_M_DST, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
val[0] = val[0] | (d << I_V_DST); /* put in place */
|
||||
break;
|
||||
case I_V_RD: /* IOT reg,dev */
|
||||
cptr = get_glyph (cptr, gbuf, ','); /* get register */
|
||||
d = get_uint (gbuf, 8, I_M_DST, &r);
|
||||
d = (int32) get_uint (gbuf, 8, I_M_DST, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
val[0] = val[0] | (d << I_V_DST); /* put in place */
|
||||
case I_V_D: /* IOT dev */
|
||||
@@ -852,13 +884,13 @@ case I_V_D: /* IOT dev */
|
||||
(strcmp (device[i], gbuf) != 0); i++);
|
||||
if (device[i] != NULL) val[0] = val[0] | dev_val[i];
|
||||
else {
|
||||
d = get_uint (gbuf, 8, I_M_DEV, &r);
|
||||
d = (int32) get_uint (gbuf, 8, I_M_DEV, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
val[0] = val[0] | (d << I_V_DEV); }
|
||||
break;
|
||||
case I_V_RM: /* reg, addr */
|
||||
cptr = get_glyph (cptr, gbuf, ','); /* get register */
|
||||
d = get_uint (gbuf, 8, I_M_DST, &r);
|
||||
d = (int32) get_uint (gbuf, 8, I_M_DST, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
val[0] = val[0] | (d << I_V_DST); /* put in place */
|
||||
case I_V_M: /* addr */
|
||||
@@ -889,33 +921,33 @@ case I_V_2AC: /* reg, reg */
|
||||
break;
|
||||
case I_V_RSI: /* reg, short imm */
|
||||
cptr = get_glyph (cptr, gbuf, ','); /* get immediate */
|
||||
d = get_uint (gbuf, 8, I_M_SRC + 1, &r);
|
||||
d = (int32) get_uint (gbuf, 8, I_M_SRC + 1, &r);
|
||||
if ((d == 0) || (r != SCPE_OK)) return SCPE_ARG;
|
||||
val[0] = val[0] | ((d - 1) << I_V_SRC); /* put in place */
|
||||
cptr = get_glyph (cptr, gbuf, 0); /* get register */
|
||||
d = get_uint (gbuf, 8, I_M_DST, &r);
|
||||
d = (int32) get_uint (gbuf, 8, I_M_DST, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
val[0] = val[0] | (d << I_V_DST); /* put in place */
|
||||
break;
|
||||
case I_V_RLI: /* reg, long imm */
|
||||
cptr = get_glyph (cptr, gbuf, ','); /* get immediate */
|
||||
val[1] = get_uint (gbuf, 8, DMASK, &r);
|
||||
val[1] = (int32) get_uint (gbuf, 8, DMASK, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
cptr = get_glyph (cptr, gbuf, 0); /* get register */
|
||||
d = get_uint (gbuf, 8, I_M_DST, &r);
|
||||
d = (int32) get_uint (gbuf, 8, I_M_DST, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
val[0] = val[0] | (d << I_V_DST); /* put in place */
|
||||
rtn = -1;
|
||||
break;
|
||||
case I_V_LI: /* long imm */
|
||||
cptr = get_glyph (cptr, gbuf, 0); /* get immediate */
|
||||
val[1] = get_uint (gbuf, 8, DMASK, &r);
|
||||
val[1] = (int32) get_uint (gbuf, 8, DMASK, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
rtn = -1;
|
||||
break;
|
||||
case I_V_RLM: /* reg, long mem */
|
||||
cptr = get_glyph (cptr, gbuf, ','); /* get register */
|
||||
d = get_uint (gbuf, 8, I_M_DST, &r);
|
||||
d = (int32) get_uint (gbuf, 8, I_M_DST, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
val[0] = val[0] | (d << I_V_DST); /* put in place */
|
||||
case I_V_LM: /* long mem */
|
||||
@@ -927,7 +959,7 @@ case I_V_LM: /* long mem */
|
||||
break;
|
||||
case I_V_FRM: /* flt reg, long mem */
|
||||
cptr = get_glyph (cptr, gbuf, ','); /* get register */
|
||||
d = get_uint (gbuf, 8, I_M_DST, &r);
|
||||
d = (int32) get_uint (gbuf, 8, I_M_DST, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
val[0] = val[0] | (d << I_V_DST); /* put in place */
|
||||
cptr = get_addr (cptr, addr, TRUE, cflag, amd);
|
||||
@@ -948,7 +980,7 @@ case I_V_XP: /* XOP */
|
||||
if (cptr == NULL) return SCPE_ARG;
|
||||
val[0] = val[0] | (amd[0] << I_V_SRC) | (amd[1] << I_V_DST);
|
||||
cptr = get_glyph (cptr, gbuf, 0); /* get argument */
|
||||
d = get_uint (gbuf, 8, I_M_XOP, &r);
|
||||
d = (int32) get_uint (gbuf, 8, I_M_XOP, &r);
|
||||
if (r != SCPE_OK) return SCPE_ARG;
|
||||
val[0] = val[0] | (d << I_V_XOP);
|
||||
break; } /* end case */
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* nova_tt.c: NOVA console terminal simulator
|
||||
|
||||
Copyright (c) 1993-2003, Robert M. Supnik
|
||||
Copyright (c) 1993-2004, 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"),
|
||||
@@ -26,6 +26,7 @@
|
||||
tti terminal input
|
||||
tto terminal output
|
||||
|
||||
29-Dec-03 RMS Added console backpressure support
|
||||
25-Apr-03 RMS Revised for extended file support
|
||||
05-Jan-02 RMS Fixed calling sequence for setmod
|
||||
03-Oct-02 RMS Added DIBs
|
||||
@@ -188,14 +189,17 @@ return 0;
|
||||
|
||||
t_stat tto_svc (UNIT *uptr)
|
||||
{
|
||||
int32 c, temp;
|
||||
int32 c;
|
||||
t_stat r;
|
||||
|
||||
c = tto_unit.buf & 0177;
|
||||
if ((tto_unit.flags & UNIT_DASHER) && (c == 031)) c = '\b';
|
||||
if ((r = sim_putchar_s (c)) != SCPE_OK) { /* output; error? */
|
||||
sim_activate (uptr, uptr->wait); /* try again */
|
||||
return ((r == SCPE_STALL)? SCPE_OK: r); } /* !stall? report */
|
||||
dev_busy = dev_busy & ~INT_TTO; /* clear busy */
|
||||
dev_done = dev_done | INT_TTO; /* set done */
|
||||
int_req = (int_req & ~INT_DEV) | (dev_done & ~dev_disable);
|
||||
c = tto_unit.buf & 0177;
|
||||
if ((tto_unit.flags & UNIT_DASHER) && (c == 031)) c = '\b';
|
||||
if ((temp = sim_putchar (c)) != SCPE_OK) return temp;
|
||||
tto_unit.pos = tto_unit.pos + 1;
|
||||
return SCPE_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user