Trial command line option to suppress updating PRIMOS' DATNOW variable.

Error in link to install instructions
The link in README.md to install instructions was either old or never quite right. Point to DRB's overview document now, which points (near) to the version specific ones.
2026-03-29 02:44:55 +00:00 · 2025-09-29 20:38:30 -04:00 · 2022-03-21 15:24:01 -04:00 · 2021-12-13 14:02:01 -05:00 · 2021-09-05 16:40:13 -04:00 · 2021-07-27 14:59:27 -04:00
10 changed files with 309 additions and 154 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+# .editorconfig, Boone, 02/11/21
+# Editor behavior settings
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[makefile]
+indent_style = tab
--- a/.github/workflows/freebsdbuild.yml
+++ b/.github/workflows/freebsdbuild.yml
@@ -0,0 +1,26 @@
+name: freebsdbuild
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - uses: "actions/checkout@v2"
+    - uses: "vmactions/freebsd-vm@v0.1.3"
+      with:
+        usesh: true
+        prepare: pkg install -y curl git
+        run: |
+          make
+    - uses: "marvinpinto/action-automatic-releases@latest"
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        automatic_release_tag: "latest"
+        prerelease: false
+        title: "Bleeding Edge Binary - FreeBSD"
+        files: |
+          LICENSE
+          README.md
+          em.1
+          em
--- a/.github/workflows/linuxbuild.yml
+++ b/.github/workflows/linuxbuild.yml
@@ -0,0 +1,22 @@
+name: linuxbuild
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: "actions/checkout@v2"
+    - name: make
+      run: make
+    - uses: "marvinpinto/action-automatic-releases@latest"
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        automatic_release_tag: "latest"
+        prerelease: false
+        title: "Bleeding Edge Binary - Ubuntu"
+        files: |
+          LICENSE
+          README.md
+          em.1
+          em
--- a/.github/workflows/macbuild.yml
+++ b/.github/workflows/macbuild.yml
@@ -0,0 +1,22 @@
+name: macbuild
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - uses: "actions/checkout@v2"
+    - name: make
+      run: make
+    - uses: "marvinpinto/action-automatic-releases@latest"
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        automatic_release_tag: "latest"
+        prerelease: false
+        title: "Bleeding Edge Binary - MacOS"
+        files: |
+          LICENSE
+          README.md
+          em.1
+          em
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ business unit ceased to exist.  A reformatted copy is available
 A growing collection of Prime and related documentation is available
 at [sysovl.info](https://sysovl.info/reference_prime.html).
 A howto on installing PRIMOS in the emulator is
-[here](https://sysovl.info/reference_prime_drb_installing_primos.html).
+[here](https://sysovl.info/reference_prime_drb_installoview.html).
 Discussion of adapting these instructions to
 22.1.4 has been occurring on the [cctalk mailing
 list](http://classiccmp.org/pipermail/cctalk/2020-March/052126.html).
--- a/devamlc.h
+++ b/devamlc.h
@@ -150,6 +150,8 @@ AMLC status word (from AMLCT5):

 */

+#include <termio.h>
+
 /* this macro closes an AMLC connection - used in several places

   NOTE: don't print disconnect message on dedicated lines */
@@ -559,7 +561,7 @@ int devamlc (int class, int func, int device) {
      if (dc[dx].serial) {        /* any serial connections? */
        if (--dc[dx].dsstime == 0) {
          dc[dx].dsstime = DSSCOUNTDOWN;
-#ifdef __APPLE__
+/* #ifdef __APPLE__ */
          for (lx = 0; lx < 16; lx++) {  /* yes, poll them */
            if (dc[dx].ctype[lx] == CT_SERIAL) {
              int modemstate;
@@ -575,7 +577,7 @@ int devamlc (int class, int func, int device) {
              }
            }
          }
-#endif
+/* #endif */
        }
      }
      //printf("devamlc: dss for device '%o = 0x%x\n", device, dc[dx].dss);
@@ -758,7 +760,6 @@ int devamlc (int class, int func, int device) {

        /* set DTR high (02000) or low if it has changed */

-#ifdef __APPLE__
        if ((getcrs16(A) ^ dc[dx].lconf[lx]) & 02000) {
          int modemstate;
          //printf("devamlc: DTR state changed\n");
@@ -771,7 +772,6 @@ int devamlc (int class, int func, int device) {
          }
          ioctl(fd, TIOCMSET, &modemstate);
        }
-#endif
        break;
      }

--- a/em.c
+++ b/em.c
@@ -274,6 +274,7 @@ static void macheck (unsigned short p300vec, unsigned short chkvec, unsigned int
   T_EAV        trace V-mode effective address calculation
   T_EAI        trace I-mode effective address calculation
   T_FLOW       instruction summary
+   T_FP         floating point
   T_INST       detailed instruction trace
   T_MODE       trace CPU mode changes
   T_EAAP       AP effective address calculation
@@ -311,6 +312,7 @@ static void macheck (unsigned short p300vec, unsigned short chkvec, unsigned int
 #define T_EAS   0x00040000
 #define T_TLB   0x00080000
 #define T_SMLC  0x00100000
+#define T_FP    0x00200000

 #define BITMASK16(b) (0x8000 >> ((b)-1))
 #define BITMASK32(b) ((unsigned int)(0x80000000) >> ((b)-1))
@@ -657,6 +659,7 @@ static unsigned short *physmem = NULL; /* system's physical memory */
 #define LASTFAULT     077

 //static ea_t tnoua_ea=0, tnou_ea=0, tsrc_ea=0;
+static int noclock;                         /* -noclock arg */
 static int domemdump;                       /* -memdump arg */
 static int dolinecleararg;                  /* -dolineclear arg */

@@ -2352,7 +2355,7 @@ special:
 static ea_t apea(unsigned short *bitarg) {
  unsigned short ibr, ea_s, ea_w, bit, br, a;
  unsigned int utempl;
-  ea_t ea, ip;
+  ea_t ea, ip, iwea;

  eap = &gv.brp[RPBR];
  utempl = get32(RP);
@@ -2378,8 +2381,11 @@ static ea_t apea(unsigned short *bitarg) {
      bit = get16(INCVA(ea,2)) >> 12;
    else
      bit = 0;
+    iwea = ea;
    ea = ip;
    TRACE(T_EAAP, " After indirect, AP ea = %o/%o, bit=%d  %s\n", ea>>16, ea & 0xFFFF, bit, searchloadmap(ea,' '));
+    if (ea & 0x80000000)
+      fault(POINTERFAULT, ea>>16, iwea);
  }
  if (bitarg != NULL)
    *bitarg = bit;
@@ -4451,6 +4457,7 @@ int main (int argc, char **argv) {

 #include "dispatch.h"

+  noclock = 0;
  domemdump = 0;
  dolinecleararg = 0;
  bootarg = NULL;
@@ -4469,6 +4476,9 @@ int main (int argc, char **argv) {
      while (i+1 < argc && argv[i+1][0] != '-')
        readloadmap(argv[++i], 1);

+    } else if (strcmp(argv[i],"-noclock") == 0) {
+      noclock = 1;
+
    } else if (strcmp(argv[i],"-memdump") == 0) {
      domemdump = 1;

@@ -4615,6 +4625,8 @@ int main (int argc, char **argv) {
          gv.traceflags |= T_TLB;
        else if (strcmp(argv[i],"smlc") == 0)
          gv.traceflags |= T_SMLC;
+        else if (strcmp(argv[i],"fp") == 0)
+          gv.traceflags |= T_FP;
        else if (isdigit(argv[i][0]) && strlen(argv[i]) <= 3 && sscanf(argv[i],"%d", &templ) == 1)
          gv.traceuser = 0100000 | (templ<<6);   /* form OWNERL for user # */
        else if (strlen(argv[i]) == 6 && sscanf(argv[i],"%o", &templ) == 1)
--- a/emdev.h
+++ b/emdev.h
@@ -1413,7 +1413,9 @@ void initclock(ea_t datnowea) {
  unixtime = time(NULL);
  tms = localtime(&unixtime);
  datnow = tms->tm_year<<25 | (tms->tm_mon+1)<<21 | tms->tm_mday<<16 | ((tms->tm_hour*3600 + tms->tm_min*60 + tms->tm_sec)/4);
-  put32r0(datnow, datnowea);
+  if (! noclock) {
+    put32r0(datnow, datnowea);
+  }
 }


--- a/fp.h
+++ b/fp.h
@@ -40,6 +40,7 @@ http://tima-cmp.imag.fr/~guyot/Cours/Oparithm/english/Op_Ar2.htm

 inline void getdp (unsigned long long p, long long *frac64, int *exp32) {

+  TRACE(T_FP, "  getdp(%016llx)\n", p);
  *frac64 = p & 0xFFFFFFFFFFFF0000LL;  /* unpack fraction */
  *exp32 = (short) (p & 0xFFFFLL);     /* unpack SIGNED exponent */
 }
@@ -59,22 +60,29 @@ int prieee8(unsigned long long dp, double *d) {
  /* unpack Prime DPFP */

  getdp (dp, &frac64, &exp32);
+  TRACE(T_FP, "  prieee8: unpacked frac %016llx exp %08x\n", frac64, exp32);

  /* if negative, change to sign-magnitude */

  sign = 0;
  if (frac64 < 0) {
+    TRACE(T_FP, "  prieee8: changing to sign-magnitude\n");

    /* special case: negative power of 2 */

    if (frac64 == 0x8000000000000000LL) {
+      TRACE(T_FP, "  prieee8: frac is negative power of 2\n");
      exp32 += (1023-128);
      if (exp32 < 0 || exp32 > 0x7fe)
+      {
+        TRACE(T_FP, "  prieee8: exp %x out of range\n", exp32);
        return 0;
+      }
      frac64 |= ((long long)exp32 << 52);
      *d = *(double *)&frac64;
      return 1;
    } else {
+      TRACE(T_FP, "  prieee8: frac is just negative\n");
      sign = 0x8000000000000000LL;
      frac64 = -frac64;
    }
@@ -82,6 +90,7 @@ int prieee8(unsigned long long dp, double *d) {
  /* special case: zero */

  } else if (frac64 == 0) {
+    TRACE(T_FP, "  prieee8: frac is 0\n");
    *d = 0.0;
    return 1;
  }
@@ -89,6 +98,7 @@ int prieee8(unsigned long long dp, double *d) {
  /* normalize positive fraction until bit 2 is 1 */

  while ((frac64 & 0x4000000000000000LL) == 0) {
+    TRACE(T_FP, "  prieee8: normalizing positive fraction\n");
    frac64 = frac64 << 1;
    exp32--;
  }
@@ -98,7 +108,10 @@ int prieee8(unsigned long long dp, double *d) {
  exp32 += (1023-128) - 1;
 #if 1
  if (exp32 < 0 || exp32 > 0x7fe)
+  {
+    TRACE(T_FP, "  prieee8: exponent %x out of range\n", exp32);
    return 0;
+  }
 #else
  if (exp32 < 0) {
    *d = 0.0;
@@ -113,6 +126,7 @@ int prieee8(unsigned long long dp, double *d) {
  /* pack into an IEEE DPFP, losing the leading 1 bit in the process */

  frac64 = sign | ((long long)exp32 << 52) | ((frac64 >> 10) & 0xfffffffffffffLL);
+  TRACE(T_FP, "  prieee8: packed ieee dpfp %016llx\n", frac64);
  *d = *(double *)&frac64;
  return 1;
 }
@@ -134,7 +148,7 @@ retry:
  neg = frac64 < 0;
  exp32 = (frac64 >> 52) & 0x7ff;
  frac64 &= 0xfffffffffffffLL;
-  //printf("dp=%llx, neg=%d, frac64=%llx, exp32=%d, \n", *(long long *)dp, neg, frac64, exp32);
+  TRACE(T_FP, "d=%016llx, neg=%x, frac64=%016llx, exp32=%08x, \n", (long long)d, neg, frac64, exp32);

  /* special case: NaN & +-infinity */

@@ -159,12 +173,21 @@ retry:
     and subnormal */

  if (exp32 != 0)           /* typical IEEE normalized */
+  {
+    TRACE(T_FP, "  ieeepr8: is normalized\n");
    frac64 |= 0x10000000000000LL;
-  else if (frac64 == 0) {   /* IEEE +-0.0 (zero exp+frac) */
+  }
+  else if (frac64 == 0)     /* IEEE +-0.0 (zero exp+frac) */
+  {
+    TRACE(T_FP, "  ieeepr8: zero exp and frac\n");
    *p = 0;                 /* IEEE and Prime zero are the same */
    return okay;
-  } else
+  }
+  else
+  {
+    TRACE(T_FP, "  ieeepr8: subnormal value\n");
      ;                     /* subnormal: no hidden 1 bit */
+  }

  /* adjust exponent, change sign-magnitude to 2's complement,
     and shift fraction into Prime placement (high 48 bits) */
@@ -173,12 +196,14 @@ retry:
  if (neg)
    frac64 = -frac64;
  frac64 <<= 10;
+  TRACE(T_FP, "  ieeepr8: de-biased prime-ised frac %016llx exp %08x\n", frac64, exp32);

  /* normalize Prime DPFP */

  while ((frac64 ^ (frac64 << 1)) >= 0) {
    frac64 = frac64 << 1;
    exp32--;
+    TRACE(T_FP, "  ieeepr8: normalized prime frac %016llx exp %08x\n", frac64, exp32);
  }

 #if 0
@@ -204,8 +229,11 @@ retry:

  if (round)
    if ((frac64 & 0x8000) && ((frac64 & 0x7fffffffffff0000LL) !=  0x7fffffffffff0000LL))
+    {
      /* XXX: should this be a subtract for negative numbers? */
      frac64 += 0x10000;
+      TRACE(T_FP, "  ieeepr8: rounded frac %016llx\n", frac64);
+    }

  *p = swap64((frac64 & 0xffffffffffff0000LL) | (exp32 & 0xffff));
  return okay;
@@ -260,6 +288,7 @@ unsigned long long dfcm (unsigned long long dp, int *oflow) {
  CLEARC;
  *oflow = 0;
  getdp(dp, &frac64, &exp32);
+  TRACE(T_FP, "  dfcm: unpacked frac %016llx exp %08x\n", frac64, exp32);
  if (frac64 != 0) {                          /* can't normalize zero */
    if (frac64 == 0x8000000000000000LL) {     /* overflow case? */
      frac64 = 0x4000000000000000LL;          /* complement power of 2 */
@@ -290,6 +319,7 @@ unsigned long long norm(unsigned long long dp, int *oflow) {

  *oflow = 0;
  getdp(dp, &frac64, &exp32);
+  TRACE(T_FP, "  norm: unpacked frac %016llx exp %08x\n", frac64, exp32);
  while ((frac64 ^ (frac64 << 1)) >= 0) {
    frac64 = frac64 << 1;
    exp32--;
@@ -314,11 +344,16 @@ unsigned long long frn(unsigned long long dp, int *oflow) {

  *oflow = 0;
  getdp(dp, &frac64, &exp32);
+  TRACE(T_FP, "  frn: unpacked frac %016llx exp %08x\n", frac64, exp32);
  if (frac64 == 0)
+  {
+    TRACE(T_FP, "  frn: returning 0\n");
    return 0;
+  }
  else {
    doround1 = ((frac64 & 0x18000000000LL) != 0);
    doround2 = ((frac64 &  0x8000000000LL) != 0) && ((frac64 & 0x7FFFFF0000LL) != 0);
+    TRACE(T_FP, "  frn: doround1 %x doround2 %x\n", doround1, doround2);
    if (doround1 || doround2) {
      frac64 &= 0xFFFFFF0000000000LL;
      if (frac64 != 0x7FFFFF0000000000LL)
@@ -329,8 +364,10 @@ unsigned long long frn(unsigned long long dp, int *oflow) {
      }
      frac64 |= (exp32 & 0xFFFF);
      frac64 = norm(frac64, oflow);
+      TRACE(T_FP, "  frn: rounded frac %016llx\n", frac64);
      return frac64;
    }
+    TRACE(T_FP, "  frn: dp %016llx\n", dp);
    return dp;
  }
 }
@@ -356,26 +393,37 @@ int fcs (unsigned long long fac, int fop) {
  fop = fop & 0xffffff00;
  if (fop == 0)                                      /* fix dirty zero */
    fopexp = 0;
+  TRACE(T_FP, "  fcs: FAC: %016llx %04x; op: %016llx %04x\n", templ, facexp, fop, fopexp);
  if ((templ & 0x80000000) == (fop & 0x80000000)) {  /* compare signs */
    if (facexp == fopexp)                            /* compare exponents */
      if (templ == fop) {                            /* compare fractions */
+        TRACE(T_FP, "  fcs: frac cmp returning eq / skip 1\n");
        SETEQ;
        return 1;
      } else if (templ < fop) {                      /* compare fractions */
+        TRACE(T_FP, "  fcs: frac cmp returning lt / skip 2\n");
        SETLT;                                       /* FAC < operand */
        return 2;
-      } else
+      } else {
+        TRACE(T_FP, "  fcs: frac cmp returning gt / skip 0\n");
        return 0;                                    /* FAC > operand */
+      }
    else if (facexp < fopexp) {                      /* compare exponents */
+      TRACE(T_FP, "  fcs: exp cmp returning lt / skip 2\n");
      SETLT;                                         /* FAC < operand */
      return 2;
-    } else
+    } else {
+      TRACE(T_FP, "  fcs: exp cmp returning gt / skip 0\n");
      return 0;
+    }
  } else if (templ & 0x80000000) {
+    TRACE(T_FP, "  fcs: sign cmp returning lt / skip 2\n");
    SETLT;                                           /* FAC < operand */
    return 2;
-  } else
+  } else {
+    TRACE(T_FP, "  fcs: sign cmp returning gt / skip 0\n");
    return 0;                                        /* FAC > operand */
+  }
 }


@@ -404,27 +452,35 @@ int dfcs (unsigned long long fac, long long fop) {
  fop = fop & 0xffffffffffff0000LL;
  if (fop == 0)                                      /* fix dirty zero */
    fopexp = 0;
-#if 0
-  printf("dfcs: FAC: %016llx %04x; op: %016llx %04x\n", templl, facexp, fop, fopexp);
-#endif
+  TRACE(T_FP, "  dfcs: FAC: %016llx %04x; op: %016llx %04x\n", templl, facexp, fop, fopexp);
  if ((templl & 0x8000000000000000LL) == (fop & 0x8000000000000000LL)) {  /* compare signs */
    if (facexp == fopexp)                            /* compare exponents */
      if (templl == fop) {                           /* compare fractions */
+        TRACE(T_FP, "  dfcs: frac cmp returning eq / skip 1\n");
        SETEQ;
        return 1;
      } else if (templl < fop) {                     /* compare fractions */
+        TRACE(T_FP, "  dfcs: frac cmp returning lt / skip 2\n");
        SETLT;                                       /* FAC < operand */
        return 2;
-      } else
+      } else {
+        TRACE(T_FP, "  dfcs: frac cmp returning gt / skip 0\n");
        return 0;                                    /* FAC > operand */
+      }
    else if (facexp < fopexp) {                      /* compare exponents */
+      TRACE(T_FP, "  dfcs: exp cmp returning lt / skip 2\n");
      SETLT;                                         /* FAC < operand */
      return 2;
-    } else
+    } else {
+      TRACE(T_FP, "  dfcs: exp cmp returning eq / skip 1\n");
      return 0;
+    }
  } else if (templl & 0x8000000000000000LL) {
+    TRACE(T_FP, "  dfcs: sign cmp returning lt / skip 2\n");
    SETLT;                                           /* FAC < operand */
    return 2;
-  } else
+  } else {
+    TRACE(T_FP, "  dfcs: sign cmp returning gt / skip 0\n");
    return 0;                                        /* FAC > operand */
+  }
 }
--- a/util/utextp.c
+++ b/util/utextp.c
@@ -29,7 +29,7 @@ main () {
    else {                    /* not a space character */
      while (space) {         /* dump held-back spaces first */
 	if (space < 3) {      /* write regular spaces */
-	  putchar(' ');
+	  putchar(0240);
 	  space--;
 	  n++;
 	} else {              /* write compressed spaces */
Author	SHA1	Message	Date
Dennis Boone	74aa7fe23e	Trial command line option to suppress updating PRIMOS' DATNOW variable.	2025-09-29 20:38:30 -04:00
Dennis Boone	1819fed512	Error in link to install instructions The link in README.md to install instructions was either old or never quite right. Point to DRB's overview document now, which points (near) to the version specific ones.	2022-03-21 15:24:01 -04:00
Dennis Boone	64c5970e97	Added tracing for floating point operations.	2021-12-13 14:02:01 -05:00
Dennis Boone	c6c0344004	Additional `#ifdef __APPLE__` sections removed Some DTR handling was still inside of such #ifdefs, and thus I was unable to make a modem work on a serial port. I believe this code is portable to OSX, Linux, FreeBSD, and Solaris.	2021-09-05 16:40:13 -04:00
Dennis Boone	0466b4b603	Emit mark parity space(s) in the "less than three" case, not space parity ones. Discovered by Daiyu.	2021-07-27 14:59:27 -04:00
Dennis Boone	256c72ca64	Install git in the vm so the version stamping works.	2021-03-19 01:42:51 -04:00
Dennis Boone	975cc951f8	Really? No "latest" tag or release or whatever, have to use a numeric version?	2021-03-19 01:34:13 -04:00
Dennis Boone	29fbc31df6	Can the packaging be outside the vm thing?	2021-03-19 01:30:30 -04:00
Dennis Boone	f72b67b876	FreeBSD build, attempt 1.	2021-03-19 01:27:25 -04:00
Dennis Boone	df6529c505	Make these manual.	2021-03-19 01:16:12 -04:00
Dennis Boone	8782e6a63e	MacOS builder.	2021-03-19 01:13:11 -04:00
Dennis Boone	88a43363e1	Put repo_token back in Not sure what this really wants, the action doco doesn't explain it _at all_.	2021-03-19 00:58:53 -04:00
Dennis Boone	9fa1c77bad	Flush out the auto-build. No clue if this will work.	2021-03-18 11:58:04 -04:00
Dennis Boone	2d8397d1a4	Create linuxbuild.yml See if we can build release binaries.	2021-03-18 11:45:44 -04:00
Dennis Boone	244f2f49a2	Remove now-inaccurate comment.	2021-02-21 00:35:31 -05:00
Dennis Boone	af2b015383	Fix for problem where PASCAL install test crashes. It appears that the emulator needs to check for faulted pointers after indirection in APs used in e.g. EAFA. PASCAL triggers this issue by using EAFA on an indirect pointer to a DYNT. A two cycle fault check is done other places, and the approach is repeated here.	2021-02-21 00:06:38 -05:00
Dennis Boone	902f535120	Merge remote-tracking branch 'refs/remotes/origin/master'	2021-02-17 18:11:03 -05:00
Dennis Boone	25febc3947	Merge remote-tracking branch 'refs/remotes/origin/master'	2021-02-11 13:01:51 -05:00
Dennis Boone	84afd8da7b	Add an editorconfig file.	2021-02-11 13:01:28 -05:00