From e35e6bc458ea03d63ebe23daa8ba2e1c2959431b Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Wed, 2 May 2012 07:06:11 -0700 Subject: [PATCH] Official simh-v3.9-0 Merge --- 0readme_39.txt | 32 ++++++++++++++++++++++---------- NOVA/nova_dkp.c | 5 +++-- PDP11/pdp11_cpu.c | 1 + PDP11/pdp11_io.c | 5 +++-- PDP11/pdp11_sys.c | 3 ++- VAX/vax_syscm.c | 3 ++- sim_rev.h | 8 ++++++-- 7 files changed, 39 insertions(+), 18 deletions(-) diff --git a/0readme_39.txt b/0readme_39.txt index e5b3509e..1dfc5fa6 100644 --- a/0readme_39.txt +++ b/0readme_39.txt @@ -34,25 +34,25 @@ components and build network capable simulators if they are available. 1.1.4 PDP11 and VAX (Mark Pizzolato) - - Added DELQA-Plus device. + - added DELQA-Plus device 1.1.5 IA64 VMS Ethernet Support - - Identified compiler version issues and added IA64 support (Matt Burke) + - identified compiler version issues and added IA64 support (Matt Burke) -1.1.6 Visual Studio Projects (Mark Pizzolato) 2. Bugs Fixed Please see the revision history on http://simh.trailing-edge.com or in the source module sim_rev.h. + 3. Status Report -This is the last release of SimH for which I will be sole editor. After this +This is the last release of SimH for which I will be lead editor. After this release, the source is moving to a public repository: - +https://github.com/markpizz/simh under the general editorship of Dave Hittner and Mark Pizzolato. The status of the individual simulators is as follows: @@ -113,7 +113,7 @@ Stable and working; runs available software. 3.13 IBM 1620 -Hand debug only. No software for it has been found or tested. +Hand debug only. No software for it has been found or tested. 3.14 IBM 7094 @@ -126,7 +126,7 @@ Stable and working, but not really supported. Runs available software. 3.16 IBM 1130 -Stable and working; runs available software. Supported and edited by +Stable and working; runs available software. Supported and edited by Brian Knittel. 3.17 HP 2100/1000 @@ -140,7 +140,7 @@ Stable and working; runs available software. 3.19 GRI-909/99 -Hand debug only. No software for it has been found or tested. +Hand debug only. No software for it has been found or tested. 3.20 SDS-940 @@ -168,10 +168,23 @@ Bill Beech 3.25 Sigma 32b Incomplete; more work is needed on the peripherals for accuracy. +Included in the beta simulators package. 3.26 Alpha -Incomplete; essentially just an EV-5 (21164) chip emulator. +Incomplete; essentially just an EV-5 (21164) chip emulator. Included +in the beta simulators package. + +3.27 SAGE + +Incomplete. Included in the beta simulators package. + +3.28 SC1 + +Internal simulator for SiCortex supercomputer; intended as an example +of implementing an SMP system in the current SimH structure. Included +in the beta simulators package. + 4. Suggestions for Future Work @@ -198,4 +211,3 @@ Incomplete; essentially just an EV-5 (21164) chip emulator. - Data General MV8000 (if a hobbyist license can be obtained for AOS) - Alpha simulator - HP 3000 (16b) simulator with MPE - diff --git a/NOVA/nova_dkp.c b/NOVA/nova_dkp.c index c027022f..f5126f28 100644 --- a/NOVA/nova_dkp.c +++ b/NOVA/nova_dkp.c @@ -25,6 +25,7 @@ dkp moving head disk + 27-Apr-12 RMS Changed ??? string digraphs to ?, per C rules 04-Jul-04 BKR device name changed to DG's DKP from DEC's DP, DEV_SET/CLR/INTR macro use started, fixed 'P' pulse code and secret quirks, @@ -706,7 +707,7 @@ if ( DKP_TRACE(1) ) "write" : ((uptr->FUNC == FCCY_SEEK) ? "seek" - : "" + : "" ) ) ), @@ -871,7 +872,7 @@ do { "read" : ((uptr->FUNC == FCCY_WRITE) ? "write" - : "") + : "") ), (unsigned) (uptr->CYL), (unsigned) (GET_SURF(dkp_ussc, dtype)), diff --git a/PDP11/pdp11_cpu.c b/PDP11/pdp11_cpu.c index cc63549f..7f8eac70 100644 --- a/PDP11/pdp11_cpu.c +++ b/PDP11/pdp11_cpu.c @@ -25,6 +25,7 @@ cpu PDP-11 CPU + 29-Apr-12 RMS Fixed compiler warning (Mark Pizzolato) 19-Mar-12 RMS Fixed declaration of sim_switches (Mark Pizzolato) 29-Dec-08 RMS Fixed failure to clear cpu_bme on RESET (Walter Mueller) 22-Apr-08 RMS Fixed MMR0 treatment in RESET (Walter Mueller) diff --git a/PDP11/pdp11_io.c b/PDP11/pdp11_io.c index 66aca571..9df2b78f 100644 --- a/PDP11/pdp11_io.c +++ b/PDP11/pdp11_io.c @@ -23,6 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Robert M Supnik. + 27-Mar-12 RMS Fixed order of int_internal (Jordi Guillaumes i Pons) 19-Mar-12 RMS Fixed declaration of cpu_opt (Mark Pizzolato) 12-Dec-11 RMS Fixed Qbus interrupts to treat all IO devices as BR4 19-Nov-08 RMS Moved I/O support routines to I/O library @@ -83,8 +84,8 @@ static const int32 pirq_bit[7] = { }; static const int32 int_internal[IPL_HLVL] = { - INT_INTERNAL7, INT_INTERNAL6, INT_INTERNAL5, INT_INTERNAL4, - INT_INTERNAL3, INT_INTERNAL2, INT_INTERNAL1, 0 + 0, INT_INTERNAL1, INT_INTERNAL2, INT_INTERNAL3, + INT_INTERNAL4, INT_INTERNAL5, INT_INTERNAL6, INT_INTERNAL7 }; /* I/O page lookup and linkage routines diff --git a/PDP11/pdp11_sys.c b/PDP11/pdp11_sys.c index c663095a..b0b358cf 100644 --- a/PDP11/pdp11_sys.c +++ b/PDP11/pdp11_sys.c @@ -1,6 +1,6 @@ /* pdp11_sys.c: PDP-11 simulator interface - Copyright (c) 1993-2008, Robert M Supnik + Copyright (c) 1993-2012, 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,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Robert M Supnik. + 29-Apr-12 RMS Fixed compiler warning (Mark Pizzolato) 19-Nov-08 RMS Moved I/O support routines to I/O library 15-May-08 RMS Added KE11-A, DC11 support Renamed DL11 diff --git a/VAX/vax_syscm.c b/VAX/vax_syscm.c index de658624..46225523 100644 --- a/VAX/vax_syscm.c +++ b/VAX/vax_syscm.c @@ -1,6 +1,6 @@ /* vax_syscm.c: PDP-11 compatibility mode symbolic decode and parse - Copyright (c) 1993-2010, Robert M Supnik + Copyright (c) 1993-2012, 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,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Robert M Supnik. + 29-Apr-12 RMS Fixed compiler warning (Mark Pizzolato) 22-May-10 RMS Fixed t_addr printouts for 64b big-endian systems (Mark Pizzolato) 12-Nov-06 RMS Fixed operand order in EIS instructions (W.F.J. Mueller) diff --git a/sim_rev.h b/sim_rev.h index 93b173ca..1104d399 100644 --- a/sim_rev.h +++ b/sim_rev.h @@ -191,6 +191,9 @@ patch date module(s) and fix(es) - fixed backspace over tapemark not to set EOR (Van Snyder) - added no rewind option (Van Snyder) + i1401_sys.c: + - fixed misuse of & instead of && in decode (Peter Schorn) + pdp1_cpu.c: - fixed misuse of & instead of && in Ea_ch (Michael Bloom) @@ -204,7 +207,8 @@ patch date module(s) and fix(es) - fixed priority of PIRQ vs IO; added INT_INTERNALn pdp11_io.c: - - fixed Qbus interrupts to treat all IO devices as BR4 + - fixed Qbus interrupts to treat all IO devices (except clock) as BR4 + - fixed order of int_internal (Jordi Guillaumes i Pons) ppd11_rf.c - fixed bug in updating mem addr extension (Peter Schorn) @@ -319,7 +323,7 @@ patch date module(s) and fix(es) - fixed bug in scan function decode (Peter Schorn) vax_cpu.c: - - revised idle design Mark Pizzolato) + - revised idle design (Mark Pizzolato) - fixed bug in SET CPU IDLE - fixed failure to clear PSL in BPT, XFC