Merge branch 'master' of https://github.com/DoctorWkt/pdp7-unix

Makefile

@@ -7,5 +7,8 @@ buildit:
 run: buildit
 	cd build && make run
 
+altrun: buildit
+	cd build && make alt && make altrun
+
 clean:
 	cd build && make clean

README.md

@@ -37,20 +37,30 @@ To compile it:
 ## Running pdp7-unix
 
 You will need [simh](http://simh.trailing-edge.com/) 4.0 to run pdp7-unix.  You can get the source code [here](https://github.com/simh/simh).  
-On 64-bit systems, you may need to set the C compiler's optimisation
+On 64-bit systems, you may need to set the C compiler's optimisation level to -O1.
-level to -O1.
+
+### Running from source
 
 To run pdp-unix from the pdp7-unix source tree, do:
 
 `make run`
 
-<pre>
-cd binaries
-pdp7 ../build/unixv0.simh
-</pre>
-
 Press `ctl-e` to break out the simulator into simh
 
+### Precompiled Binaries
+
+You can also run pdp7-unix from precompiled binaries in the [/binaries](/binaries) directory. There are **orig** binaries and **alt** binaries.
+
+The orig binaries use the unixv0 directory semantics as restored from the printouts.  To run pdp7-unix orig:
+
+`cd binaries/orig; pdp7 unixv0.simh`
+
+The alt binaries use the more familiar "." and ".." diretory semanatics as found in later unix.  To run pdp7-unix alt:
+
+`cd binaries/alt; pdp7 unixv0.simh`
+
+### Typical Output
+
 A typical pdp7-unix session on simh looks like:
 
 <pre>

binaries/alt/unixv0.simh

@@ -0,0 +1,13 @@
+set cpu 8k
+set cpu eae
+set cpu history=100
+show cpu
+
+set tti unix
+set rb ena
+att rb image.fs
+show dev
+
+load -S a.rim
+dep pc 0100
+go

binaries/orig/unixv0.simh

@@ -0,0 +1,31 @@
+set cpu 8k
+set cpu eae
+set cpu history=100
+show cpu
+
+# set up SIMH devices:
+
+# UNIX character translations (CR to NL, ESC to ALTMODE):
+set tti unix
+
+# RB09 fixed head disk:
+set rb ena
+att rb image.fs
+
+# uncomment to TELNET in GRAPHICS-2 keyboard/display(!!)
+# (requires github.com/philbudne/simh)
+#set g2in ena
+#att -U g2in 12345
+
+# disable hardware UNIX-7 doesn't know about:
+set lpt disa
+set drm disa
+set dt disa
+
+# show device settings:
+show dev
+
+# load and start the system:
+load -S a.rim
+dep pc 0100
+go

build/Makefile

@@ -21,7 +21,7 @@ TESTDIR=tests
 BINARIES=../binaries/
 
 
-all: cmd others a.rim image.fs copybinaries
+all: cmd others a.rim image.fs
 
 # Make alternative everything: no dd but . and ..
 alt: altcmd altothers alt/a.rim alt/image.fs
@@ -33,7 +33,18 @@ run:
 
 # Alternative run, use the alt/image.fs
 altrun:
-	$(PDP7) alt/unixv0.simh
+	cd alt; $(PDP7) unixv0.simh
+
+dist: all alt
+	mkdir -p $(BINARIES)
+	mkdir -p $(BINARIES)/orig
+	mkdir -p $(BINARIES)/alt
+	cp image.fs $(BINARIES)/orig
+	cp a.rim $(BINARIES)/orig
+	cp unixv0.simh $(BINARIES)/orig
+	cp alt/image.fs $(BINARIES)/alt
+	cp alt/a.rim $(BINARIES)/alt
+	cp alt/unixv0.simh $(BINARIES)/alt
 
 # Warm boot Unix kernel: boots into init and a login prompt
 a.rim:
@@ -63,12 +74,6 @@ alt/image.fs: altcmd altothers
 	$(MKFS) -1 -2 -3 -o alt/image.fs alt/proto
 	$(FSCK) -3 alt/image.fs
 
-
-copybinaries:
-	mkdir -p $(BINARIES)
-	cp image.fs $(BINARIES)
-	cp a.rim $(BINARIES)
-
 clean:
 	rm -f a.rim image.fs a.lst n.out alt/image.fs alt/a.rim alt/a.lst
 	rm -rf $(BINDIR) $(TESTDIR)

build/alt/unixv0.simh

@@ -5,8 +5,9 @@ show cpu
 
 set tti unix
 set rb ena
-att rb alt/image.fs
+att rb image.fs
 show dev
 
-load -S alt/a.rim
+load -S a.rim
 dep pc 0100
+go