Merge branch 'master' of github.com:simh/simh

Author: markpizz

H316/h316_fhd.c

@@ -1,6 +1,6 @@
 /* h316_fhd.c: H316/516 fixed head simulator
 
-   Copyright (c) 2003-2012, Robert M. Supnik
+   Copyright (c) 2003-2013, 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"),
@@ -25,6 +25,7 @@
 
    fhd          516-4400 fixed head disk
 
+   03-Sep-13    RMS     Added explicit void * cast
    19-Mar-12    RMS     Fixed declaration of chan_req (Mark Pizzolato)
    15-May-06    RMS     Fixed bug in autosize attach (David Gesswein)
    04-Jan-04    RMS     Changed sim_fsize calling sequence
@@ -373,7 +374,7 @@ uint32 tk = CW1_GETTK (fhd_cw1);                        /* track */
 uint32 ca = CW2_GETCA (fhd_cw2);                        /* char addr */
 uint32 wa = ca >> 1;                                    /* word addr */
 uint32 ba = (((sf * FH_NUMTK) + tk) * FH_NUMWD) + wa;   /* buffer offset */
-uint16 *fbuf = uptr->filebuf;                           /* buffer base */
+uint16 *fbuf = (uint16 *) uptr->filebuf;                           /* buffer base */
 uint32 wd;
 
 if (fhd_bad_wa (wa))                                    /* addr bad? */

I1401/i1401_cpu.c

@@ -1,6 +1,6 @@
 /* i1401_cpu.c: IBM 1401 CPU simulator
 
-   Copyright (c) 1993-2011, 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.
 
+   08-Oct-12    RMS     Clear storage and branch preserves B register (Van Snyder)
    19-Mar-11    RMS     Reverted multiple tape indicator implementation
    20-Jan-11    RMS     Fixed branch on EOT indicator per hardware (Van Snyder)
    07-Nov-10    RMS     Fixed divide not to clear word marks in quotient
@@ -178,6 +179,14 @@ typedef struct {
                         PCQ_ENTRY; \
                         IS = AS;
 
+#define BRANCH_CS       if (ADDR_ERR (AS)) { \
+                            reason = STOP_INVBR; \
+                            break; \
+                            } \
+                        PCQ_ENTRY; \
+                        IS = AS;
+
+
 uint8 M[MAXMEMSIZE] = { 0 };                            /* main memory */
 int32 saved_IS = 0;                                     /* saved IS */
 int32 AS = 0;                                           /* AS */
@@ -1563,6 +1572,9 @@ while (reason == 0) {                                   /* loop until halted */
    5,6          invalid B-address
    7            branch
    8+           one operand, branch ignored
+
+   Note that clear storage and branch does not overwrite the B register,
+   unlike all other branches
 */
 
     case OP_CS:                                         /* clear storage */
@@ -1572,7 +1584,7 @@ while (reason == 0) {                                   /* loop until halted */
         if (BS < 0)                                     /* wrap if needed */
             BS = BS + MEMSIZE;
         if (ilnt == 7) {                                /* branch variant? */
-            BRANCH;
+            BRANCH_CS;                                  /* special branch */
             }
         break;
 

I1401/i1401_mt.c

@@ -25,6 +25,7 @@
 
    mt           7-track magtape
 
+   03-Sep-13    RMS     Read TMK does not write GM+WM to memory
    19-Mar-11    RMS     Restored lost edit to insert EOF in memory on read EOF
                         Reverted multiple tape indicator implementation
    20-Jan-11    RMS     Fixed branch on END indicator per hardware (Van Snyder)
@@ -341,6 +342,8 @@ switch (mod) {
                 return STOP_WRAP;
                 }
             }
+        if (st == MTSE_TMK)                             /* if TMK, no GM+WM */
+            break;
         if (M[BS] != (BCD_GRPMRK + WM)) {               /* not GM+WM at end? */
             if (flag & MD_WM)                           /* LCA: clear WM */
                 M[BS] = BCD_GRPMRK;

Interdata/id_fd.c

@@ -1,6 +1,6 @@
 /* id_fd.c: Interdata floppy disk simulator
 
-   Copyright (c) 2001-2012, Robert M Supnik
+   Copyright (c) 2001-2013, 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"),
@@ -25,6 +25,7 @@
 
    fd           M46-630 floppy disk
 
+   03-Sep-13    RMS     Added explicit void * cast
    19-Mar-12    RMS     Fixed macro naming conflict (Mark Pizzolato)
 
    A diskette consists of 77 tracks, each with 26 sectors of 128B.  The
@@ -306,7 +307,7 @@ return 0;
 t_stat fd_svc (UNIT *uptr)
 {
 uint32 i, u, tk, sc, crc, fnc, da;
-uint8 *fbuf = uptr->filebuf;
+uint8 *fbuf = (uint8 *) uptr->filebuf;
 
 u = uptr - fd_dev.units;                                /* get unit number */
 fnc = GET_FNC (uptr->FNC);                              /* get function */

NOVA/eclipse_cpu.c

@@ -3625,7 +3625,7 @@ if ((IR & 0100017) == 0100010) {                        /* This pattern for all
         PC = (PC + 1) & AMASK;
         continue;
     }    
-    if ((IR & 0103777) == 0100650) {                    /* FDD Div double by AC */
+    if ((IR & 0103777) == 0100750) {                    /* FDD Div double by AC */
         if (!(fpu_unit.flags & UNIT_UP))
             continue;
         if (Debug_Flags == 1) {
@@ -3680,7 +3680,7 @@ if ((IR & 0100017) == 0100010) {                        /* This pattern for all
         FPSR |= ((PC - 1) & AMASK);
         continue;
     }    
-    if ((IR & 0103777) == 0101650) {                    /* FDMD Div double by memory */
+    if ((IR & 0103777) == 0101750) {                    /* FDMD Div double by memory */
         if (!(fpu_unit.flags & UNIT_UP))
             continue;
         if (Debug_Flags == 1) {

NOVA/nova_dsk.c

@@ -1,6 +1,6 @@
 /* nova_dsk.c: 4019 fixed head disk simulator
 
-   Copyright (c) 1993-2008, Robert M. Supnik
+   Copyright (c) 1993-2013, 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"),
@@ -25,6 +25,7 @@
 
    dsk          fixed head disk
 
+   03-Sep-13    RMS     Added explicit void * cast
    04-Jul-07    BKR     device name changed to DG's DSK from DEC's DK,
                         DEV_xxx macros now used for consistency,
                         added secret DG DIC function,
@@ -235,7 +236,7 @@ return rval;
 t_stat dsk_svc (UNIT *uptr)
 {
 int32 i, da, pa;
-int16 *fbuf = uptr->filebuf;
+int16 *fbuf = (int16 *) uptr->filebuf;
 
 DEV_CLR_BUSY( INT_DSK ) ;
 DEV_SET_DONE( INT_DSK ) ;

PDP1/pdp1_drm.c

@@ -1,6 +1,6 @@
 /* pdp1_drm.c: PDP-1 drum simulator
 
-   Copyright (c) 1993-2008, Robert M Supnik
+   Copyright (c) 1993-2013, 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 @@
    drp          Type 23 parallel drum
    drm          Type 24 serial drum
 
+   03-Sep-13    RMS     Added explicit void * cast
    21-Dec-06    RMS     Added 16-chan SBS support
    08-Dec-03    RMS     Added parallel drum support
                         Fixed bug in DBL/DCN decoding
@@ -276,7 +277,7 @@ return (stop_inst << IOT_V_REASON) | dat;               /* stop if requested */
 t_stat drm_svc (UNIT *uptr)
 {
 uint32 i, da;
-uint32 *fbuf = uptr->filebuf;
+uint32 *fbuf = (uint32 *) uptr->filebuf;
 
 if ((uptr->flags & UNIT_BUF) == 0) {                    /* not buf? abort */
     drm_err = 1;                                        /* set error */

PDP11/pdp11_defs.h

@@ -26,6 +26,7 @@
    The author gratefully acknowledges the help of Max Burnet, Megan Gentry,
    and John Wilson in resolving questions about the PDP-11
 
+   02-Sep-13    RMS     Added third Massbus adapter and RS drive
    11-Dec-11    RMS     Fixed priority of PIRQ vs IO; added INT_INTERNALn
    22-May-10    RMS     Added check for 64b definitions
    19-Nov-08    RMS     Moved I/O support routines to I/O library
@@ -598,10 +599,11 @@ typedef struct pdp_dib DIB;
 #define INT_V_TU        15
 #define INT_V_RF        16
 #define INT_V_RC        17
-#define INT_V_DMCRX     18
-#define INT_V_DMCTX     19
-#define INT_V_DUPRX     20
-#define INT_V_DUPTX     21
+#define INT_V_RS        18
+#define INT_V_DMCRX     19
+#define INT_V_DMCTX     20
+#define INT_V_DUPRX     21
+#define INT_V_DUPTX     22
 
 #define INT_V_PIR4      0                               /* BR4 */
 #define INT_V_TTI       1
@@ -645,6 +647,7 @@ typedef struct pdp_dib DIB;
 #define INT_TU          (1u << INT_V_TU)
 #define INT_RF          (1u << INT_V_RF)
 #define INT_RC          (1u << INT_V_RC)
+#define INT_RS          (1u << INT_V_RS)
 #define INT_DMCRX       (1u << INT_V_DMCRX)
 #define INT_DMCTX       (1u << INT_V_DMCTX)
 #define INT_DUPRX       (1u << INT_V_DUPRX)
@@ -695,6 +698,7 @@ typedef struct pdp_dib DIB;
 #define IPL_TU          5
 #define IPL_RF          5
 #define IPL_RC          5
+#define IPL_RS          5
 #define IPL_DMCRX       5
 #define IPL_DMCTX       5
 #define IPL_DUPRX       5
@@ -741,9 +745,10 @@ typedef struct pdp_dib DIB;
 
 /* Massbus definitions */
 
-#define MBA_NUM         2                               /* number of MBA's */
+#define MBA_NUM         3                               /* number of MBA's */
 #define MBA_RP          0                               /* MBA for RP */
 #define MBA_TU          1                               /* MBA for TU */
+#define MBA_RS          2                               /* MBA for RS */
 #define MBA_RMASK       037                             /* max 32 reg */
 #define MBE_NXD         1                               /* nx drive */
 #define MBE_NXR         2                               /* nx reg */