diff options
| author | obache <obache@pkgsrc.org> | 2008-11-01 05:15:42 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2008-11-01 05:15:42 +0000 |
| commit | 3451040ae07994e5369a4a7a7adadce5df20f3cc (patch) | |
| tree | 8c9599fc371aea7a46eed5692922c5079af3ff6a /emulators/simh | |
| parent | f1ee377064866e002eb5f64fd2c306ede3b5d893 (diff) | |
| download | pkgsrc-3451040ae07994e5369a4a7a7adadce5df20f3cc.tar.gz | |
Update simh to 3.8.0.
Based on PR 39750 and some clean up.
ChangeLog
V3.8.0 15-Jun-2008
SCP and libraries:
* Fixed bug in local/global register search (found by Mark Pizzolato)
* Fixed bug in restore of RO units (from Mark Pizzolato)
* Added SET/SHO/NO BR with default argument (from Dave Bryan)
* Worked around Telnet negotiation problem with QCTerm (from Dave Bryan)
GRI-909:
* Added GRI-99 support
HP2100 (all changes from Dave Bryan):
* Implemented 12966A Buffered Asynchronous Communications Interface simulator
* Added SET CPU DEBUG and OS/VMA flags, enabled OS/VMA
* Corrected MP W5 (JSB) jumper action, SET/SHOW reversal, mp_mevff clear on interrupt with I/O instruction in trap cell
* Removed DBI support from 1000-M (was temporary for RTE-6/VM)
* Enabled EMA and VIS, added EMA, VIS, and SIGNAL debug flags
* Enabled SIGNAL instructions, SIG debug flag
* Fixed single stepping through interrupts
* Implemented VMA, OS, VIS, SIGNAL, and EMA firmware extensions
* Fixed unsigned divide bug in .DDI
* Fixed unsigned multiply bug in .DMP
* Fixed B register return bug in /CMRT
* DS disk: corrected and verified ioCRS action
* MUX: sync mux poll with console poll for idle compatibility
* PTR: fixed trailing null counter for tape re-read
* CLK: synchronized CLK with TTY if set for 10 msec.
* TTY: changed TTY output wait from 100 to 200 for MSU BASIC
Nova (all changes from Bruce Ray):
* Added CPU support for third-party 64KW memory
* Added CPU history support
* Renamed CLK to RTC, to match DG literature
* Renamed DK to DKP, to match DG literature
* Changed DKP bootstrap to DG official sequence
* Rename DP to DSK, to match DG literature
* Changed DSK bootstrap to DG official sequence
* Renamed MT to MTA, to match DG literature
* Changed MTA bootstrap to DG official sequence
PDP11:
* Fixed DMA memory address limit test (found by John Dundas)
* Fixed MMR0 treatment in RESET (found by Walter Mueller)
* Fixed write behavior of 11/70 MBRK, LOSIZE, HISIZE (found by Walter Mueller)
* Added support to set default state of KDJ11B,E clock control register
* Added support for DC11
* Added support for KE11A
* Added support for KG11A (from John Dundas)
* Added support for RC11 (from John Dundas)
* Added modem control to DL11
* Rename TTIX/TTOX to DLI/DLO, to match DC11 nomenclature
V3.7.3 02-Sep-2007
SCP:
* -Fixed bug in SET THROTTLE command
PDP-10:
* Fixed non-portable usage in SHOW HISTORY routine
PDP-11:
* TA: forward op at BOT skips initial file gap
PDP-8:
* CT: forward op at BOT skips initial file gap
* -CT: fixed handling of BEOT
VAX, VAX780::
* CPU: fixed bug in read access g-format indexed specifiers
V3.7.2 12-Jul-2007
Ethernet library (from Dave Hittner):
* fixed non-ethernet device removal loop (from Naoki Hamada)
* added dynamic loading of wpcap.dll;
* corrected exceed max index bug in ethX lookup
* corrected failure to look up ethernet device names in the registry on Windows XP x64
Honeywell 316/516 (from Theo Engel)
* LPT: fixed loss of last print line (from Theo Engel)
* MT: fixed bug in write without stop (from Theo Engel)
* CLK: fixed bug in clock increment (from Theo Engel)
IBM 1401:
* added recognition of overlapped operation modifiers
* remove restriction on load-mode binary tape operations
* fixed read tape mark operation (found by Van Snyder)
PDP-1:
* -fixed typo in SBS clear (from Norm Lastovica)
PDP-11:
* RH, RP, TU: CS1 DVA is in the device, not the MBA
PDP-8:
* fixed typo (from Norm Lastovica)
VAX:
* revised idle detector
V3.7.1 12-May-2007
SCP and libraries:
* fixed bug in get_sim_opt (reported by Don North)
* fixed bug in RESTORE with changed memory size
* fixed breakpoint actions in DO command file processing (from Dave Bryan)
HP2100 (all fixes from Dave Bryan):
* IPLI EDT delays DMA completion interrupt for TSB
* MUX:
* corrected "mux_sta" size from 16 to 21 elements
* fixed "muxc_reset" to clear lines 16-20
* fixed control card OTx to set current channel number
* fixed to set "muxl_ibuf" in response to a transmit interrupt
* changed "mux_xbuf", "mux_rbuf" declarations from 8 to 16 bits
* fixed to set "mux_rchp" when a line break is received
* fixed incorrect "odd_par" table values
* reversed test in "RCV_PAR" to return "LIL_PAR" on odd parity
* fixed mux reset (ioCRS) to clear port parameters
* fixed to use PUT_DCH instead of PUT_CCH for data channel status
* added DIAG/TERM modifiers to implement diagnostic mode
PDP-11:
* CPU: changed memory size routine to work with RESTORE
* HK: NOP and DCLR (at least) do not check drive type
* HK: MR2 and MR3 only updated on NOP
* TU: TMK sets FCE only on read (found by Naoki Hamada)
* XU: added missing FC_RMAL command
* XU: cleared multicast on write
VAX-11/780:
* modified mbz checks to reflect 780 microcode patches (found by Naoki Hamada)
V3.7.0 03-Feb-2007
SCP and libraries:
* Implemented throttle commands
* Added idle support
* Added -e to control error processing in DO command files (from Dave Bryan)
* Fixed handling of non-printable characters in KSR mode
* Fixed bug in reverse operations for P7B-format tapes
* Fixed bug in reverse operations across erase gaps
GRI-909:
* Fixed handling of non-printable characters in KSR mode
Honeywell 316/516
* Fixed handling of non-printable characters in KSR mode
HP 2100:
* Reorganized CPU modules for easier addition of new instructions
* Added Double Integer instructions, 1000-F CPU, 2114 and 2115 CPUs, 12K and 24K memory sizes, 12607B and 12578A DMA controllers, and 21xx binary loader protection
* Fixed DMS self-test instruction execution on 1000-M
* Fixed indirect interrupt holdoff logic
* Fixed DS REQUEST STATUS to clear status-1 (from Dave Bryan)
* Added Floating Point Processor (from Dave Bryan)
* Fixed LPS diag-mode CLC response
IBM 7094:
* Fixed new bug in halt IO wait loop
* Added IFT, EFT expanded core test instructions
Interdata:
* Removed separate multiplexor clock
* Added idle support
* Synced multiplexor poll to real-time clock
* Fixed handling of non-printable characters in KSR mode
* Synced keyboard poll to real-time clock
* Changed line-time clock to be free-running
PDP-1:
* Added 16-channel sequence break system (API) support
* Added PDP-1D support (including timesharing clock)
* Added Type 630 data communications subsystem (multiplexer)
* Separated TTI, TTO for API support
* Fixed bugs in symbolic character input, block loader
PDP-10:
* Added idle support
* Synced keyboard poll to real-time clock
* Added card reader support
PDP-11:
* Added idle support
* Fixed bug in ASH -32 C value
* Fixed RF11 unit mask (found by John Dundas)
* Synced keyboard, Ethernet, and multiplexer polls to real-time clock
* Added clock coscheduling support
* Added TA11 (casette) support
* Changed DHQ11 to be off by default
* Fixed operand order in EIS instructions (found by W.F.J. Mueller)
PDP-18b:
* Fixed incorrect value of PC on instruction fetch mem mmgt error
* Fixed PDP-15 handling of mem mmgt traps (sets API 3)
* Fixed PDP-15 handling of CAL API 4 (sets only if 0-3 inactive)
* Fixed PDP-15 CAF to clear memory management mode register
* Fixed boundary test in KT15/XVM (reported by Andrew Warkentin)
* Added XVM RDCLK instruction
* Added idle support and infinite loop detection
* Fixed RF15, DSCD does not clear function register
* Added PDP-15 instructions for program selection of console duplex status
* Fxed PDP-15 handling of reader out-of-tape
* Fixed console and multiplexer handling of non-printable characters in KSR mode
* Changed real-time clock to be free running
* Synced keyboard poll to real-time clock
PDP-8:
* Fixed SC value after DVI overflow (found by Don North)
* Added idle support and infinite loop detection
* Added TA8E support
* Changed real-time clock to be free running
* Added ability to disambiguate overlapping IOT definitions in symbolic input and output
* Fxed console handling of non-printable characters in KSR mode
* Synced keyboard poll to real-time clock
VAX, VAX780:
* Added idle support
* Fixed operand order in EIS instructions (found by W.F.J. Mueller)
V3.6.1 22-Jul-2006
SCP:
* Implemented SET/SHOW PCHAR
all DECtapes:
* Fixed conflict in ATTACH switches
HP2100 (from Dave Bryan):
* Added CAPACITY as alternate for REEL
* Fixed EOT test for unlimited reel size
IBM 1620 (from Tim McBride):
* Fixed card reader fgets call
* Fixed card reader boot sequence
IBM 7094:
* Fixed bug in halt IO wait loop
* Fixed bug in reading full 80 column binary cards
* Added binary loader (courtesy of Dave Pitt)
Interdata 32b:
* Fixed transcription errors in disk boot loader (found by Davis Johnson)
PDP-1:
* Fixed bugs in MUS and DIV
PDP-11:
* CIS: added interrupt tests to character instructions
* CIS: added 11/44 stack probe test to MOVCx (only)
* KL11/DL11: first release
* RF11: first release
* TTI, TTO: added UC support to TTI, TTO
18b PDP's:
* CPU: fixed RESET to clear AC, L, and MQ
* DT: fixed checksum calculation bug for Type 550
* FPP: fixed bugs in left shift, multiply
* TTI, TTO: fixed Baudot letters/figures inversion for PDP-4
* TTI, TTO: fixed letters/figures tracking for PDP-4
* TTI, TTO: fixed PDP-4/PDP-7 terminal default to be local echo
* Added FioDEC, Baudot display
* Generalized LOAD to handle HRI, RIM, and BIN files
PDP-8:
* TTIX: fixed bug in DETACH routine
V3.6.0 20-Apr-2006
SCP and libraries
* Revised save/restore format to check simulator options for consistency
Most magnetic tapes
* Added support for limiting tape capacity to a particular size in MB
IBM 7094 - First release
VAX and VAX-11/780 (most bugs found by Tim Stark)
* Added KESU capability to virtual examine
* Fixed bugs in virtual examine
* Rewrote CPU history function for improved usability
* Fixed fault cleanup to clear PSL<tp>
* Fixed ADAWI r-mode to preserve dst<31:16>
* Fixed ACBD/G to test correct operand
* Fixed access checking on modify-class specifiers
* Ffixed branch address calculation in CPU history
* Fixed bug in reported VA on faulting cross-page write
* Fixed POLYD, POLYG to clear R4, R5
* Fixed POLYD, POLYG to set R3 correctly
* Fixed POLYD, POLYG to not exit prematurely if arg = 0
* Fixed POLYD, POLYG to do full 64b multiply
* Fixed POLYF, POLYD, POLYG to remove truncation on add
* Fixed POLYF, POLYD, POLYG to mask multiply result to 31b/63b/63b
* Fixed fp add routine to test for zero via fraction to support "denormal" argument from POLYF, POLYD, POLYG
* Fixed bug in 32b floating multiply routine
* Fixed bug in 64b extended modulus routine
VAX-11/780 only (most bugs found by Tim Stark)
* Added FLOAD command, loads system file from console floppy disk
* Fixed MOVTC, MOVTUC to preserve cc's through page faults
* Fixed MOVTUC to stop on translated == escape
* Fixed CVTPL to set registers before destination reg write
* Fixed CVTPL to set correct cc bit on overflow
* Fixed EDITPC to preserve cc's through page faults
* Fixed EDITPC EO$BLANK_ZERO count, cc test
* Fixed EDITPC EO$INSERT to insert fill instead of blank
* Fixed EDITPC EO$LOAD_PLUS/MINUS to skip character
* Fixed MNEGH to test negated sign, clear C
* Fixed carry propagation in qp_inc, qp_neg, qp_add
* Fixed pack routines to test for zero via fraction
* Fixed ACBH to set cc's on result
* Fixed POLYH to set R3 correctly
* Fixed POLYH to not exit prematurely if arg = 0
* Fixed POLYH to mask multiply result to 127b
* Fixed fp add routine to test for zero via fraction to support "denormal" argument from POLYH
* Fixed EMODH to concatenate 15b of 16b extension
* Fixed bug in reported VA on faulting cross-page write
* Added access check on system PTE reference in TLB miss flows
* Added MBZ checking in LDPCTX and MTPR
* Compatibility mode: fixed omission of SXT
* Compatibility mode: fixed order of operand fetching in XOR
* CR: added CR11/CD11 support
Honeywell 316
* CPU: fixed bugs in LLL, LRL (found by Theo Engel)
* LPT: fixed bug in blanks backscanning (found by Theo Engel)
* TTY: fixed bugs in punch state handling (found by Theo Engel)
IBM 1401 - Fixed bug in divide (reported by Van Snyder)
Interdata
* CPU: fixed bug in DH (found by Mark Hittinger)
* SELCH: fixed bug, GO preserves EXA and SSTA (found by Davis Johnson)
* IDC: fixed WD/WH handling (found by Davis Johnson)
* IDC: fixed bug, nop command should be ignored (found by Davis Johnson)
NOVA - Fixed bug in DIVS (found by Mark Hittinger)
PDP-11
* CPU: fixed order of operand XOR operand fetch for SDSD-type models
* CIS: fixed bug in decode table (found by John Dundas)
* CIS: fixed bug in ASHP
* CIS: fixed bug in write decimal string with mmgt enabled
* CIS: fixed bug in 0-length strings in multiply/divide
* CR: added CR11/CD11 support (from John Dundas)
* TC: fixed READ to set extended data bits in TCST (found by Alan Frisbie)
V3.5.2 20-Jan-2006
All 7-track tapes: added write support for P7B format
All console terminals: KSR/UC output suppresses non-printable characters
PDP10:
* RP.c: fixed DCLR not to clear disk address
PDP11 (also VAX, VAX780 where applicable):
* HK: fixed overlapped seek interaction with NOP, etc
* RH: added enable/disable routine
* RP, RQ, TQ, TS, TU: widened address display to 64b when USE_ADDR64
* RP: fixed DCLR not to clear disk address
* RP, TU: fixed device enable/disable logic to include Massbus adapter
* RP, TU: widened address display to 64b when USE_ADDR64
* TU: changed default adapter to TM03 (for VMS)
PDP8:
* DF, RF, DT: fixed unaligned access bug (found by Doug Carman)
* RL: fixed IOT 61 decoding bug (found by David Gesswein)
VAX:
* CPU: fixed breakpoint detection when USE_ADDR64 option is active
* CPU: fixed CVTfi to trap on integer overflow if PSW<iv> set
* Changed default compile options to USE_ADDR64
VAX780: first release
V3.5.1 15-Oct-2005
IBM 1401:
* Changed character encodings to be consistent with Paul Pierce 709X simulator
* Changed card column binary format to be consistent with Paul Pierce 709X simulator
* Added choice of business or Fortran encoding for card punch, line printer , and inquiry terminal output
* Added mode control for old/new character encodings
IBM 1620: Changed character encodings to be consistent with 7094 and 1401
PDP-11: Fixed bug in autoconfiguration algorithm (missing XU table entry)
VAX:
* Fixed bug in autoconfiguration algorithm (missing XU table entry)
* Fixed bug in floating point structure definitions with 32b compilation option
V3.5.0 09-Sep-2005
SCP and libraries:
* Fixed to trim trailing spaces on file names
* sim_ether: added Windows user-defined adapter names (from Timothe Litt)
* sim_sock: fixed SIGPIPE error on UNIX
* sim_tape: fixed misallocation of TPC map array in 64b configurations
* sim_tmxr: added support for SET <unit> DISCONNECT
IBM 1401:
* Fixed clearing of SSB-SSG on reset (reported by Ralph Reinke)
* Fixed problem with 2, 5 character R, P instructions (reported by Van Snyder)
* Removed error stops from MCE
PDP-11:
* Revised autoconfiguration algorithm and interface
* Added additional 11/60 registers
* pdp11_vh: fixed bug in vector display routine
* pdp11_xu: fixed runt packet processing (found by Tim Chapman)
PDP-15:
* Removed spurious AAS instruction
* Fixed bug in SHOW TTIX CONN/STATS
* Fixed bug in SET TTIXn LOG/NOLOG
PDP8
* Fixed bug in SHOW TTIX CONN/STATS
* Fixed bug in SET TTIXn LOG/NOLOG
HP2100
* Added SET MUXLn DISCONNECT
Interdata:
* fixed bug in SHOW PAS CONN/STATS
* Added SET PASLn DISCONNECT
SDS
* Fixed bug in SHOW MUX CONN/STATS
* Added SET MUXLn DISCONNECT
V3.4.0 03-May-05
SCP and libraries:
* Fixed ASSERT code
* Revised syntax for SET DEBUG (from Dave Bryan)
* Revised interpretation of fprint_sym, fparse_sym returns
* Moved DETACH sanity tests into detach_unit
* Added test for WSAEINPROGRESS (from Tim Riker)
PDP-10:
* Fixed TU bug, ERASE and WREOF should not clear done (reported by Rich Alderson)
* Fixed TU error reporting
PDP-11:
* Fixed TU error reporting
Interdata 16b:
* Fixed bug in show history routine (from Mark Hittinger)
* Revised examine/deposit to do words rather than bytes
Interdata 32b:
* Fixed bug in initial memory allocation
* Fixed bug in show history routine (from Mark Hittinger)
* Revised examine/deposit to do words rather than bytes
HP2100 (all changes and fixes from Dave Bryan)
* CPU: reorganized CPU options
* CPU1: reorganized EIG routines
* Added FFP support
V3.3.2 09-Mar-05
SCP: added ASSERT command (from Dave Bryan)
PDP-11:
* Fixed bugs in RESET for 11/70 (reported by Tim Chapman)
* Fixed bug in SHOW MODEL (from Sergey Okhapkin)
* Made SYSID variable for 11/70 (from Tim Chapman)
* Fixed MBRK write case for 11/70 (from Tim Chapman)
* RQ: added RA60, RA71, RA81 disks
* RY: fixed bug in boot code (reported by Graham Toal)
H316
* Fixed IORETURN macro
* PT: fixed bug in OCP '0001 (found by Philipp Hachtmann)
* MT: fixed error reporting from OCP (found by Philipp Hachtmann)
HP2100 (from Dave Bryan)
* Fixed missing MPCK on JRS target
* Removed EXECUTE instruction (is NOP in actual microcode)
* Fixed missing negative overflow renorm in StoreFP
I1401: fixed bug in LPT write line routine (reported by Van Snyder)
Interdata 32b: fixed branches to mask new PC (from Greg Johnson)
VAX:
* Fixed initial state of cpu_extmem
* RQ: added RA60, RA71, RA81 disks
V3.3.1 08-Jan-05
H316:
* Fxed bug in DIV
* TTY: fixed bug in SKS '104 (reported by Philipp Hachtmann)
* TTY: fixed bug in SKS '504
* Added reader/punch ASCII file support
* Added Teletype reader/punch support
* DP: fixed bug in skip on !seeking
* MT: fixed bug in DMA/DMC support
* LP: fixed bug in DMA/DMC support
HP2100:
* Fixed DMA reset to clear alternate CTL flop (from Dave Bryan)
* Fixed DMA reset to not clear control words (from Dave Bryan)
* Fixed SBS, CBS, TBS to do virtual reads
* Separated A/B from M[0/1], for DMA IO (from Dave Bryan)
* Added SET CPU 21MX-M, 21MX-E (from Dave Brian)
* Disabled TIMER/EXECUTE/DIAG instructions for 21MX-M (from Dave Bryan)
* Added post-processor to maintain T/M consistency (from Dave Bryan)
* DS: first release
* LPS, LPT: added restart when set online, etc (from Dave Bryan)
* LPS: col count for non-printing characters (from Dave Bryan)
IBM 1401: added address argument support (from Van Snyder)
Interdata: added magtape read-only file support
PDP-11:
* Fixed WAIT to work in all modes (from John Dundas)
* TM, TS: added read-only file support
SDS 940: added magtape read-only file support
Diffstat (limited to 'emulators/simh')
| -rw-r--r-- | emulators/simh/Makefile | 18 | ||||
| -rw-r--r-- | emulators/simh/PLIST | 33 | ||||
| -rw-r--r-- | emulators/simh/distinfo | 14 | ||||
| -rw-r--r-- | emulators/simh/patches/patch-aa | 110 | ||||
| -rw-r--r-- | emulators/simh/patches/patch-ab | 26 | ||||
| -rw-r--r-- | emulators/simh/patches/patch-ac | 38 |
6 files changed, 119 insertions, 120 deletions
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile index 34d51e63f46..558016e885c 100644 --- a/emulators/simh/Makefile +++ b/emulators/simh/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2008/01/04 21:45:05 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2008/11/01 05:15:42 obache Exp $ # -DISTNAME= simhv33-0 -PKGNAME= simh-3.3.0 -PKGREVISION= 1 +DISTNAME= simhv38-0 +PKGNAME= simh-3.8.0 CATEGORIES= emulators MASTER_SITES= http://simh.trailing-edge.com/sources/ EXTRACT_SUFX= .zip @@ -23,22 +22,23 @@ WRKSRC= ${WRKDIR} .include "../../mk/bsd.prefs.mk" .if (${MACHINE_ARCH} == "arm") -.if (${CFLAGS:M-O2} == "-O2") -CFLAGS:= ${CFLAGS:S/-O2//} -.endif +BUILDLINK_TRANSFORM+= rm:-O2 .endif INSTALLATION_DIRS= bin share/simh share/doc/simh +MAKE_FILE= makefile + post-extract: ${MKDIR} ${WRKSRC}/BIN - ${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile do-install: (cd ${WRKSRC}/BIN && for BIN in *; do \ ${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \ done) - ${INSTALL_DATA} ${WRKSRC}/VAX/ka655.bin ${DESTDIR}${PREFIX}/share/simh + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/simh + ${INSTALL_DATA} ${WRKSRC}/VAX/ka655x.bin ${DESTDIR}${PREFIX}/share/simh + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/simh (cd ${WRKSRC} && for TXT in *.txt */*.txt; do \ ${INSTALL_DATA} $$TXT ${DESTDIR}${PREFIX}/share/doc/simh; \ done) diff --git a/emulators/simh/PLIST b/emulators/simh/PLIST index 37d68c46102..b4c2bc9f6ba 100644 --- a/emulators/simh/PLIST +++ b/emulators/simh/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2004/12/22 21:07:01 skrll Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/11/01 05:15:42 obache Exp $ bin/simh-altair bin/simh-altairz80 bin/simh-eclipse @@ -7,6 +7,7 @@ bin/simh-h316 bin/simh-hp2100 bin/simh-i1401 bin/simh-i1620 +bin/simh-i7094 bin/simh-ibm1130 bin/simh-id16 bin/simh-id32 @@ -23,40 +24,24 @@ bin/simh-pdp9 bin/simh-s3 bin/simh-sds bin/simh-vax -share/doc/simh/0readme_33.txt +bin/simh-vax780 +share/doc/simh/0readme_38.txt share/doc/simh/0readme_ethernet.txt share/doc/simh/altair.txt -share/doc/simh/altairz80_doc.txt share/doc/simh/eclipse.txt -share/doc/simh/gri_doc.txt -share/doc/simh/h316_doc.txt share/doc/simh/haltguide.txt share/doc/simh/hp2100_diag.txt -share/doc/simh/hp2100_doc.txt -share/doc/simh/i1401_doc.txt -share/doc/simh/i1620_doc.txt +share/doc/simh/i7094_bug_history.txt share/doc/simh/id_diag.txt -share/doc/simh/id_doc.txt -share/doc/simh/lgp_doc.txt -share/doc/simh/nova_doc.txt -share/doc/simh/pdp10_diag.txt -share/doc/simh/pdp10_doc.txt -share/doc/simh/pdp11_doc.txt +share/doc/simh/pdp10_bug_history.txt share/doc/simh/pdp18b_diag.txt -share/doc/simh/pdp18b_doc.txt -share/doc/simh/pdp1_doc.txt -share/doc/simh/pdp8_doc.txt +share/doc/simh/pdp1_diag.txt share/doc/simh/readme1130.txt share/doc/simh/readme_s3.txt share/doc/simh/readme_update.txt share/doc/simh/sds_diag.txt -share/doc/simh/sds_doc.txt -share/doc/simh/simh_doc.txt -share/doc/simh/simh_faq.txt -share/doc/simh/simh_swre.txt share/doc/simh/system3.txt -share/doc/simh/vax780_doc.txt -share/doc/simh/vax_doc.txt -share/simh/ka655.bin +share/doc/simh/vax780_bug_history.txt +share/simh/ka655x.bin @dirrm share/simh @dirrm share/doc/simh diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo index 8a20309c868..d1bf725bc4b 100644 --- a/emulators/simh/distinfo +++ b/emulators/simh/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.12 2005/02/23 18:49:20 agc Exp $ +$NetBSD: distinfo,v 1.13 2008/11/01 05:15:42 obache Exp $ -SHA1 (simhv33-0.zip) = 99a021afe2fd8dfb32bb479e383347e2b883e0f9 -RMD160 (simhv33-0.zip) = 778cc7836b4558b57f1b9ca54427f3d2e8da94a4 -Size (simhv33-0.zip) = 2153444 bytes -SHA1 (patch-aa) = a1c1e10f81b5883c5388084d1b9f31d3560353fe -SHA1 (patch-ab) = aff84028d4184b773b2bd4ebf2ee166357f18924 -SHA1 (patch-ac) = 0f1ddee6f69c0337c8ea02cf24ed6fdecc0ca1f4 +SHA1 (simhv38-0.zip) = e1afbebede7dc4b2e0f7b13fca3ee6aa8d34f9c1 +RMD160 (simhv38-0.zip) = f1986d45f9b17a905957d1dca4eaa70098a7cae6 +Size (simhv38-0.zip) = 2775593 bytes +SHA1 (patch-aa) = 427aa8eca1f1ac17f9279708e666d066b24dde7e +SHA1 (patch-ab) = 85b36e3d92a2bfbd886dbb2e08a0af967edeb0bd +SHA1 (patch-ac) = 78ecdc9abe248eb8c9a1dc3c297a4a7e5eb812d6 diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa index 402c4d444a9..57e5fbc4b4b 100644 --- a/emulators/simh/patches/patch-aa +++ b/emulators/simh/patches/patch-aa @@ -1,71 +1,83 @@ -$NetBSD: patch-aa,v 1.7 2004/12/22 21:07:01 skrll Exp $ +$NetBSD: patch-aa,v 1.8 2008/11/01 05:15:42 obache Exp $ ---- Makefile.orig 2004-10-30 18:32:50.000000000 +0100 -+++ Makefile -@@ -3,28 +3,30 @@ - # Note: -O2 is sometimes broken in GCC when setjump/longjump is being - # used. Try -O2 only with released simulators. +--- makefile.orig 2008-06-06 06:00:46.000000000 +0000 ++++ makefile +@@ -1,32 +1,36 @@ + # + # CC Command # -ifeq ($(WIN32),) +#ifeq ($(WIN32),) - #Unix Environments --ifeq ($(OSTYPE),solaris) --OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE --else --OS_CCDEFS = -D_GNU_SOURCE --endif --CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I . --ifeq ($(USE_NETWORK),) --else --NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a --endif --else -+#ifeq ($(OSTYPE),solaris) -+#OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE -+#else -+#OS_CCDEFS = -D_GNU_SOURCE -+#endif -+#CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I . -+CC = gcc -O2 -g -lm -I . -DDONT_USE_PCAP_FINDALLDEVS -DNEED_PCAP_SENDPACKET -+#ifeq ($(USE_NETWORK),) -+#else -+#NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a -+NETWORK_OPT = -DUSE_NETWORK -lpcap -+#endif -+#else - #Win32 Environments --LDFLAGS = -lm -lwsock32 --CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I. --EXE = .exe --ifeq ($(USE_NETWORK),) + #Unix Environments +- ifneq (,$(findstring solaris,$(OSTYPE))) +- OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE +- else +- ifneq (,$(findstring darwin,$(OSTYPE))) +- OS_CCDEFS = -D_GNU_SOURCE +- else +- OS_CCDEFS = -lrt -lm -D_GNU_SOURCE +- endif +- endif +- CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I . +- ifeq ($(USE_NETWORK),) +- else +- NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a +- endif -else --NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket --endif +- #Win32 Environments +- LDFLAGS = -lm -lwsock32 -lwinmm +- CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I. +- EXE = .exe +- ifeq ($(USE_NETWORK),) +- else +- NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket +- endif -endif -+#LDFLAGS = -lm -lwsock32 -+#CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I. -+#EXE = .exe -+#ifeq ($(USE_NETWORK),) ++# ifneq (,$(findstring solaris,$(OSTYPE))) ++# OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE ++# else ++# ifneq (,$(findstring darwin,$(OSTYPE))) ++# OS_CCDEFS = -D_GNU_SOURCE ++# else ++# OS_CCDEFS = -lrt -lm -D_GNU_SOURCE ++# endif ++# endif ++# CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I . ++CC ?= gcc ++CC := ${CC} -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I . ++# ++# ifeq ($(USE_NETWORK),) ++# else ++# NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a ++ NETWORK_OPT = -DUSE_NETWORK -lpcap ++# endif +#else -+#NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket ++# #Win32 Environments ++# LDFLAGS = -lm -lwsock32 -lwinmm ++# CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I. ++# EXE = .exe ++# ifeq ($(USE_NETWORK),) ++# else ++# NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket ++# endif +#endif -+#endif - # -@@ -252,11 +254,11 @@ ALL = ${BIN}pdp1${EXE} ${BIN}pdp4${EXE} + # Common Libraries +@@ -259,11 +263,11 @@ ALL = pdp1 pdp4 pdp7 pdp8 pdp9 pdp15 pdp all : ${ALL} clean : -ifeq ($(WIN32),) -+#ifeq ($(WIN32),) - ${RM} ${ALL} +- ${RM} ${BIN}* -else - if exist BIN\*.exe del /q BIN\*.exe -endif ++#ifeq ($(WIN32),) ++ rm ${BIN}* +#else +# if exist BIN\*.exe del /q BIN\*.exe +#endif + # # Individual builds - # diff --git a/emulators/simh/patches/patch-ab b/emulators/simh/patches/patch-ab index 11179bfc0b0..42aef027a72 100644 --- a/emulators/simh/patches/patch-ab +++ b/emulators/simh/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.5 2004/12/22 21:07:01 skrll Exp $ +$NetBSD: patch-ab,v 1.6 2008/11/01 05:15:42 obache Exp $ ---- sim_ether.c.orig 2004-03-31 13:38:58.000000000 +0100 +--- sim_ether.c.orig 2007-05-17 12:08:20.000000000 +0200 +++ sim_ether.c -@@ -830,6 +830,15 @@ void eth_callback(u_char* info, const st +@@ -1131,6 +1131,15 @@ void eth_callback(u_char* info, const st + /* set data in passed read packet */ tmp_packet.len = header->len; memcpy(tmp_packet.msg, data, header->len); - + /* + * Pad packet to minimum ethernet len, in case it comes from the local + * host. @@ -15,26 +15,26 @@ $NetBSD: patch-ab,v 1.5 2004/12/22 21:07:01 skrll Exp $ + memset(dev->read_packet->msg + header->len, 0, 60 - header->len); + } + - eth_packet_trace (dev, tmp_packet.msg, tmp_packet.len, "rcvqd"); + if (dev->need_crc) + eth_add_crc32(&tmp_packet); - pthread_mutex_lock (&dev->lock); -@@ -840,6 +849,15 @@ void eth_callback(u_char* info, const st +@@ -1143,6 +1152,15 @@ void eth_callback(u_char* info, const st + /* set data in passed read packet */ dev->read_packet->len = header->len; memcpy(dev->read_packet->msg, data, header->len); - + /* + * Pad packet to minimum ethernet len, in case it comes from the local + * host. + */ + if (header->len <60) { + dev->read_packet->len = 60; -+ memset(dev->read_packet->msg + header->len, 0, 60 - header->len); ++ memset(dev->read_packet->msg + header->len, 0, 60 - header->len); + } -+ - eth_packet_trace (dev, dev->read_packet->msg, dev->read_packet->len, "reading"); ++ + if (dev->need_crc) + eth_add_crc32(dev->read_packet); - /* call optional read callback function */ -@@ -1080,8 +1098,10 @@ int eth_host_devices(int used, int max, +@@ -1431,8 +1449,10 @@ int eth_host_devices(int used, int max, int eth_devices(int max, ETH_LIST* list) { diff --git a/emulators/simh/patches/patch-ac b/emulators/simh/patches/patch-ac index 02ef9cec68d..99030ff7c69 100644 --- a/emulators/simh/patches/patch-ac +++ b/emulators/simh/patches/patch-ac @@ -1,20 +1,22 @@ -$NetBSD: patch-ac,v 1.4 2004/12/22 21:07:01 skrll Exp $ +$NetBSD: patch-ac,v 1.5 2008/11/01 05:15:42 obache Exp $ ---- sim_console.c.orig 2004-11-05 19:39:24.000000000 +0000 +--- sim_console.c.orig 2006-10-01 14:26:58.000000000 +0200 +++ sim_console.c -@@ -347,13 +347,13 @@ for (i = 0; i < sec; i++) { /* loop * - if (tmxr_poll_conn (&sim_con_tmxr) >= 0) { /* poll connect */ - sim_con_ldsc.rcve = 1; /* rcv enabled */ - if (i) { /* if delayed */ -- printf ("Running\n"); /* print transition */ -+ printf ("Running\r\n"); /* print transition */ - fflush (stdout); } - return SCPE_OK; } /* ready to proceed */ - c = sim_os_poll_kbd (); /* check for stop char */ - if ((c == SCPE_STOP) || stop_cpu) return SCPE_STOP; - if ((i % 10) == 0) { /* Status every 10 sec */ -- printf ("Waiting for console Telnet connection\n"); -+ printf ("Waiting for console Telnet connection\r\n"); - fflush (stdout); } - sim_os_sleep (1); /* wait 1 second */ - } +@@ -391,7 +391,7 @@ for (i = 0; i < sec; i++) { + if (tmxr_poll_conn (&sim_con_tmxr) >= 0) { /* poll connect */ + sim_con_ldsc.rcve = 1; /* rcv enabled */ + if (i) { /* if delayed */ +- printf ("Running\n"); /* print transition */ ++ printf ("Running\r\n"); /* print transition */ + fflush (stdout); + } + return SCPE_OK; /* ready to proceed */ +@@ -399,7 +399,7 @@ for (i = 0; i < sec; i++) { + c = sim_os_poll_kbd (); /* check for stop char */ + if ((c == SCPE_STOP) || stop_cpu) return SCPE_STOP; + if ((i % 10) == 0) { /* Status every 10 sec */ +- printf ("Waiting for console Telnet connection\n"); ++ printf ("Waiting for console Telnet connection\r\n"); + fflush (stdout); + } + sim_os_sleep (1); /* wait 1 second */ |