glm94/pdp7-unix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the build so that we boot via Phil's bootstrap code.

Browse Source
This commit is contained in:
Warren Toomey
2016-03-24 17:38:27 +10:00
parent bd13e31f4e
commit 8d69dd6d13
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Makefile
+15 -9
View File
@@ -22,7 +22,7 @@ TESTDIR=tests
BINARIES=../binaries/ BINARIES=../binaries/
all: cmd others a.rim image.fs all: cmd others a.ptr a.rim image.fs
# Make alternative everything: no dd but . and .. # Make alternative everything: no dd but . and ..
alt: altcmd altothers alt/a.rim alt/image.fs alt: altcmd altothers alt/a.rim alt/image.fs
@@ -42,23 +42,28 @@ dist: all alt
mkdir -p $(BINARIES)/alt mkdir -p $(BINARIES)/alt
cp image.fs $(BINARIES)/orig cp image.fs $(BINARIES)/orig
cp a.rim $(BINARIES)/orig cp a.rim $(BINARIES)/orig
cp a.ptr $(BINARIES)/orig
cp unixv0.simh $(BINARIES)/orig cp unixv0.simh $(BINARIES)/orig
cp alt/image.fs $(BINARIES)/alt cp alt/image.fs $(BINARIES)/alt
cp alt/a.rim $(BINARIES)/alt cp alt/a.ptr $(BINARIES)/alt
cp alt/unixv0.simh $(BINARIES)/alt cp alt/unixv0.simh $(BINARIES)/alt
# Warm boot Unix kernel: boots into init and a login prompt # Warm boot Unix kernel: boots into init and a login prompt
a.rim: a.ptr:
$(AS) -f rim -o a.rim $(SYSSRC)/sop.s $(SYSSRC)/s[1-8].s $(AS) -f ptr -o a.ptr $(SYSSRC)/sop.s $(SYSSRC)/s[1-8].s
$(AS) -n -f list -o a.lst $(SYSSRC)/sop.s $(SYSSRC)/s[1-8].s $(AS) -n -f list -o a.lst $(SYSSRC)/sop.s $(SYSSRC)/s[1-8].s
# Alternative kernel: no dd, but . and .. # Alternative kernel: no dd, but . and ..
alt/a.rim: alt/a.ptr:
$(AS) -f rim -o alt/a.rim $(SYSSRC)/sop.s $(SYSSRC)/s1.s \ $(AS) -f ptr -o alt/a.ptr $(SYSSRC)/sop.s $(SYSSRC)/s1.s \
$(ALTSRC)/s2.s $(SYSSRC)/s[3-8].s $(ALTSRC)/s2.s $(SYSSRC)/s[3-8].s
$(AS) -n -f list -o alt/a.lst $(SYSSRC)/sop.s $(SYSSRC)/s1.s \ $(AS) -n -f list -o alt/a.lst $(SYSSRC)/sop.s $(SYSSRC)/s1.s \
$(ALTSRC)/s2.s $(SYSSRC)/s[3-8].s $(ALTSRC)/s2.s $(SYSSRC)/s[3-8].s
# Phil's bootstrap code
a.rim: $(SYSSRC)/sop.s $(OTHERSRC)/pbboot.s
$(AS) -f rim -o a.rim $(SYSSRC)/sop.s $(OTHERSRC)/pbboot.s
# Cold boot Unix kernel: attempts to build a minimal filesystem. # Cold boot Unix kernel: attempts to build a minimal filesystem.
# Don't use this one! # Don't use this one!
coldboot: coldboot:
@@ -67,16 +72,17 @@ coldboot:
# Filesystem image # Filesystem image
image.fs: cmd others image.fs: cmd others
$(MKFS) proto $(MKFS) -k a.ptr proto
$(FSCK) image.fs $(FSCK) image.fs
# Alternate filesystem image: . and .. but no dd # Alternate filesystem image: . and .. but no dd
alt/image.fs: altcmd altothers alt/image.fs: altcmd altothers
$(MKFS) -1 -2 -3 -o alt/image.fs alt/proto $(MKFS) -1 -2 -3 -o alt/image.fs -k alt/a.ptr alt/proto
$(FSCK) -3 alt/image.fs $(FSCK) -3 alt/image.fs
clean: clean:
rm -f a.rim image.fs a.lst n.out alt/image.fs alt/a.rim alt/a.lst rm -f a.rim image.fs a.lst n.out a.ptr
rm -f alt/image.fs alt/a.ptr alt/a.lst
rm -rf $(BINDIR) $(TESTDIR) rm -rf $(BINDIR) $(TESTDIR)
rm -rf $(BINARIES) rm -rf $(BINARIES)
build/unixv0.simh
+2 -2
View File
@@ -25,7 +25,7 @@ set dt disa
# show device settings: # show device settings:
show dev show dev
# load and start the system: # load and run the bootstrap code
load -S a.rim load -S a.rim
dep pc 0100 dep pc 010000
go go