Merge remote-tracking branch 'refs/remotes/remote/master'

Author: psco

AltairZ80/s100_icom.c

@@ -1434,8 +1434,6 @@ static uint8 ICOM_Command(UNIT *uptr, ICOM_REG *pICOM, int32 Data)
             pICOM->status &= ~ICOM_STAT_DRVFAIL;
             pICOM->status &= ~ICOM_STAT_CRC;
             pICOM->status &= ~ICOM_STAT_DDM;
-            pICOM->rDataBuf = 0;
-            pICOM->wDataBuf = 0;
             break;
 
         case ICOM_CMD_LDCONF:

PDP10/kx10_cpu.c

@@ -781,7 +781,7 @@ DEVICE cpu_dev = {
 #if PIDP10
                         /* Update MI register if address matches */
 #define UPDATE_MI(a)    if (!MI_flag && a == AS) { \
-	                     MI = MB; \
+                             MI = MB; \
                         }
 #else
 #define UPDATE_MI(a)
@@ -2331,7 +2331,7 @@ int Mem_write(int flag, int cur_context) {
             if (sim_brk_summ && sim_brk_test(last_addr, SWMASK('W')))
                 watch_stop = 1;
             M[last_addr] = MB;
-	        UPDATE_MI(last_addr);
+            UPDATE_MI(last_addr);
             modify = 0;
             return 0;
         }

PDP11/pdp11_rr.c

@@ -1,6 +1,6 @@
-/* pdp18b_dpy.c: PDP-7 Type 340 interface
+/* pdp18b_dpy.c: PDP-7 Type 34 and Type 340 interface
 
-   Copyright (c) 2019, Lars Brinkhoff
+   Copyright (c) 2019, 2026, Lars Brinkhoff
 
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
@@ -38,6 +38,11 @@
 #define DBG_IOT         001         /* IOT instructions. */
 #define DBG_IRQ         002         /* Interrupts. */
 #define DBG_INS         004         /* 340 instructions. */
+#define DBG_PLT         010         /* Points plotted. */
+
+#define UNIT_V_TYPE34   (UNIT_V_UF + 0)                 /* Type 34 */
+#define UNIT_TYPE34     (1 << UNIT_V_TYPE34)
+#define TYPE34          (dpy_unit[0].flags & UNIT_TYPE34)
 
 /*
  * Number of microseconds between svc calls.  Used to age display and
@@ -63,23 +68,33 @@ DEBTAB dpy_deb[] = {
     { "IOT", DBG_IOT },
     { "IRQ", DBG_IRQ },
     { "INS", DBG_INS },
+    { "PLT", DBG_PLT },
     { NULL, 0 }
     };
 
+MTAB dpy_mod[] = {
+    { UNIT_TYPE34, UNIT_TYPE34, "Type 34", "TYPE34", NULL },
+    { UNIT_TYPE34, 0,           "Type 340", "TYPE340", NULL },
+    { 0 }
+    };
+
 DEVICE dpy_dev = {
-    "DPY", dpy_unit, NULL, NULL,
+    "DPY", dpy_unit, NULL, dpy_mod,
     1, 8, 12, 1, 8, 18,
     NULL, NULL, &dpy_reset,
     NULL, NULL, NULL,
     &dpy_dib, DEV_DISABLE | DEV_DIS | DEV_DEBUG, 0,
     dpy_deb, NULL, NULL
     };
 
+static uint16 dpy_x, dpy_y, dpy_i;
+
 t_stat dpy_svc (UNIT *uptr)
 {
   sim_activate_after(uptr, DPY_CYCLE_US);
   display_age(DPY_CYCLE_US, 0);
-  ty340_cycle();
+  if (!TYPE34)
+    ty340_cycle();
   return SCPE_OK;
 }
 
@@ -95,7 +110,10 @@ t_stat dpy_reset (DEVICE *dptr)
     display_reset();
     ty340_reset(dptr);
   }
-  sim_cancel (&dpy_unit[0]);
+  if (TYPE34)
+    sim_activate_abs (dpy_unit, 0);
+  else
+    sim_cancel (&dpy_unit[0]);
   return SCPE_OK;
 }
 
@@ -132,18 +150,34 @@ int32 dpy05 (int32 dev, int32 pulse, int32 dat)
 {
   sim_debug(DBG_IOT, &dpy_dev, "7005%02o, %06o\n", pulse, dat);
 
-  if (pulse & 001) {
+  if ((pulse & 001) != 0 && !TYPE34) {
     if (ty340_sense(ST340_VEDGE))
       dat |= IOT_SKP;
   }
 
   if (pulse & 002) {
-    dat |= ty340_get_dac();
+    if (TYPE34) {
+      sim_debug(DBG_IOT, &dpy_dev, "Clear X\n");
+      dpy_x = 0;
+    } else {
+      dat |= ty340_get_dac();
+    }
   }
 
   if (pulse & 004) {
-    ty340_clear (ST340_LPHIT);
-    sim_activate_abs (dpy_unit, 0);
+    if (TYPE34) {
+      dpy_x |= dat & 01777;
+      sim_debug(DBG_IOT, &dpy_dev, "Set X to %04o\n", dpy_x);
+    } else {
+      ty340_clear (ST340_LPHIT);
+      sim_activate_abs (dpy_unit, 0);
+    }
+  }
+
+  if ((pulse & 040) != 0 && TYPE34) {
+    sim_debug(DBG_PLT, &dpy_dev, "Plot %04o,%04o intensity %o\n",
+              dpy_x, dpy_y, dpy_i);
+    display_point (dpy_x, dpy_y, (dpy_i * DISPLAY_INT_MAX) / 7, 0);
   }
 
   return dat;
@@ -153,20 +187,36 @@ int32 dpy06 (int32 dev, int32 pulse, int32 dat)
 {
   sim_debug(DBG_IOT, &dpy_dev, "7006%02o, %06o\n", pulse, dat);
 
-  if (pulse & 001) {
+  if ((pulse & 001) != 0 && !TYPE34) {
     if (ty340_sense(ST340_STOPPED))
       dat |= IOT_SKP;
   }
 
   if (pulse & 002) {
-    ty340_set_dac (0);
+    if (TYPE34) {
+       sim_debug(DBG_IOT, &dpy_dev, "Clear Y\n");
+       dpy_y = 0;
+    } else {
+      ty340_set_dac (0);
+    }
   }
 
   if (pulse & 004) {
-    if ((pulse & 010) == 0)
-      ty340_set_dac (dat & 07777);
-    ty340_clear (ST340_STOPPED|ST340_STOP_INT);
-    sim_activate_abs (dpy_unit, 0);
+    if (TYPE34) {
+      dpy_y |= dat & 01777;
+      sim_debug(DBG_IOT, &dpy_dev, "Set Y to %04o\n", dpy_y);
+    } else {
+      if ((pulse & 010) == 0)
+        ty340_set_dac (dat & 07777);
+      ty340_clear (ST340_STOPPED|ST340_STOP_INT);
+      sim_activate_abs (dpy_unit, 0);
+    }
+  }
+
+  if ((pulse & 040) != 0 && TYPE34) {
+    sim_debug(DBG_PLT, &dpy_dev, "Plot %04o,%04o intensity %o\n",
+              dpy_x, dpy_y, dpy_i);
+    display_point (dpy_x, dpy_y, (dpy_i * DISPLAY_INT_MAX) / 7, 0);
   }
 
   return dat;
@@ -176,6 +226,15 @@ int32 dpy07 (int32 dev, int32 pulse, int32 dat)
 {
   sim_debug(DBG_IOT, &dpy_dev, "7007%02o, %06o\n", pulse, dat);
 
+  if (TYPE34) {
+    if (dat & 4)
+      dpy_i = 7 - (dat & 7);
+    else
+      dpy_i = (dat & 3) + 4;
+    sim_debug(DBG_IOT, &dpy_dev, "Set intensity to %06o\n", dpy_i);
+    return dat;
+  }
+
   if (pulse & 001) {
     if (ty340_sense(ST340_LPHIT))
       dat |= IOT_SKP;
@@ -196,6 +255,9 @@ int32 dpy10 (int32 dev, int32 pulse, int32 dat)
 {
   sim_debug(DBG_IOT, &dpy_dev, "7010%02o, %06o\n", pulse, dat);
 
+  if (TYPE34)
+    return dat;
+
   if (pulse & 001) {
     if (ty340_sense(ST340_HEDGE))
       dat |= IOT_SKP;

PDP18B/pdp18b_dpy.c

@@ -44,7 +44,7 @@
 #define DBG_WRITE      0010
 #define DBG_POS        0020
 
-static uint16 GROUP;
+static uint16 BLOCK_GROUP;
 static int16 CURRENT_BLOCK;
 static int16 WANTED_BLOCK;
 
@@ -113,15 +113,15 @@ void tape_op(void)
   switch (C & 7) {
   case RDC: case RDE: case WRC: case WRI: case CHK:
     S = 256 * (B >> 9);
-    GROUP = 0;
-    sim_debug(DBG, &tape_dev, "Single tranfer: S=%04o, BN=%03o\n",
+    BLOCK_GROUP = 0;
+    sim_debug(DBG, &tape_dev, "Single transfer: S=%04o, BN=%03o\n",
               S, WANTED_BLOCK);
     break;
   case RCG: case WCG:
     S = 256 * (B & 7);
-    GROUP = B >> 9;
+    BLOCK_GROUP = B >> 9;
     sim_debug(DBG, &tape_dev, "Group transfer: S=%04o, BN=%03o/%o\n",
-              S, WANTED_BLOCK, GROUP+1);
+              S, WANTED_BLOCK, BLOCK_GROUP+1);
     break;
   case MTB:
     sim_debug(DBG, &tape_dev, "Move towards block %03o\n", WANTED_BLOCK);
@@ -232,12 +232,12 @@ static void tape_done(UNIT *uptr)
     paused = 0;
     break;
   case RCG: case WCG:
-    if (GROUP == 0) {
+    if (BLOCK_GROUP == 0) {
       sim_debug(DBG, &tape_dev, "Done with group\n");
       paused = 0;
     } else {
-      sim_debug(DBG, &tape_dev, "Blocks left in group: %d\n", GROUP);
-      GROUP--;
+      sim_debug(DBG, &tape_dev, "Blocks left in group: %d\n", BLOCK_GROUP);
+      BLOCK_GROUP--;
     }
     WANTED_BLOCK = (WANTED_BLOCK + 1) & TMASK;
     break;

linc/linc_tape.c

@@ -9733,18 +9733,10 @@ for (rptr = lowr; rptr <= highr; rptr++) {
             if ((idx > lows) && (val == last_val))
                 continue;
             if (idx > val_start+1) {
-                if (idx-1 == val_start+1) {
-                    reason = ex_reg (ofile, val, flag, rptr, idx-1);
-                    sim_switches = saved_switches;
-                    if (reason != SCPE_OK)
-                        return reason;
-                    }
-                else {
-                    if (val_start+1 != idx-1)
-                        fprintf (ofile, "%s[%d]-%s[%d]: same as above\n", rptr->name, val_start+1, rptr->name, idx-1);
-                    else
-                        fprintf (ofile, "%s[%d]: same as above\n", rptr->name, val_start+1);
-                    }
+                if (val_start+1 != idx-1)
+                    fprintf (ofile, "%s[%d]-%s[%d]: same as above\n", rptr->name, val_start+1, rptr->name, idx-1);
+                else
+                    fprintf (ofile, "%s[%d]: same as above\n", rptr->name, val_start+1);
                 }
             sim_last_val = last_val = val;
             val_start = idx;

scp.c

@@ -33,9 +33,11 @@
                 First characters 6789----
                 Second character 21012345
                                  111
-                Top 4 bits of second character are 0.
-                It is unlikely that any other format could
-                look like this.
+                The lower order 4 bits of first word are all
+                zero. It is unlikely that any other format could
+                look like this. An ASCII card could match this
+                if it is all blank, but the trailing return would
+                cause it to fail this test.
 
         BCD Format:
                 Each record variable length (80 chars or less).

sim_card.c

@@ -30,12 +30,15 @@
 
         Binary Card format:
                 Each record 160 characters.
-                First character   21012345
-                                  111
-                Second characters 6789----
-                Top 4 bits of second character are 0.
-                It is unlikely that ascii text or BCD format
-                text could produce similar profile.
+                First characters 6789----
+                Second character 21012345
+                                 111
+
+                The lower order 4 bits of first word are all
+                zero. It is unlikely that any other format could
+                look like this. An ASCII card could match this
+                if it is all blank, but the trailing return would
+                cause it to fail this test.
 
         BCD Format:
                 Each record variable length (80 chars or less).