From ac1c46e29b1fed5454e4b7fa38d30e76ec4dc179 Mon Sep 17 00:00:00 2001
From: Tom Everett <tom@khubla.com>
Date: Fri, 18 Oct 2019 16:39:18 -0600
Subject: [PATCH] refactoring source tree

refactored sources into directory per binary in order to prepare for moving more complex, multi-file, programs onto source tree
---
 build/Makefile                    | 68 +++++++++++++++----------------
 build/proto                       |  8 ++--
 src/alt/{ => chrm}/chrm.s         |  0
 src/alt/{ => init}/init.s         |  0
 src/alt/{ => s2}/s2.s             |  0
 src/alt/{ => wktls}/wktls.s       |  0
 src/alt/{ => wktmkdir}/wktmkdir.s |  0
 src/cmd/{ => as}/as.s             |  0
 src/cmd/{ => bi}/bi.s             |  0
 src/cmd/{ => bl}/bl.s             |  0
 src/cmd/{ => cat}/cat.s           |  0
 src/cmd/{ => check}/check.s       |  0
 src/cmd/{ => chmod}/chmod.s       |  0
 src/cmd/{ => chown}/chown.s       |  0
 src/cmd/{ => chrm}/chrm.s         |  0
 src/cmd/{ => cp}/cp.s             |  0
 src/cmd/{ => db}/db.s             |  0
 src/cmd/{ => ds}/ds.s             |  0
 src/cmd/{ => ed}/ed1.s            |  0
 src/cmd/{ => ed}/ed2.s            |  0
 src/cmd/{ => init}/init.s         |  0
 21 files changed, 38 insertions(+), 38 deletions(-)
 rename src/alt/{ => chrm}/chrm.s (100%)
 rename src/alt/{ => init}/init.s (100%)
 rename src/alt/{ => s2}/s2.s (100%)
 rename src/alt/{ => wktls}/wktls.s (100%)
 rename src/alt/{ => wktmkdir}/wktmkdir.s (100%)
 rename src/cmd/{ => as}/as.s (100%)
 rename src/cmd/{ => bi}/bi.s (100%)
 rename src/cmd/{ => bl}/bl.s (100%)
 rename src/cmd/{ => cat}/cat.s (100%)
 rename src/cmd/{ => check}/check.s (100%)
 rename src/cmd/{ => chmod}/chmod.s (100%)
 rename src/cmd/{ => chown}/chown.s (100%)
 rename src/cmd/{ => chrm}/chrm.s (100%)
 rename src/cmd/{ => cp}/cp.s (100%)
 rename src/cmd/{ => db}/db.s (100%)
 rename src/cmd/{ => ds}/ds.s (100%)
 rename src/cmd/{ => ed}/ed1.s (100%)
 rename src/cmd/{ => ed}/ed2.s (100%)
 rename src/cmd/{ => init}/init.s (100%)

diff --git a/build/Makefile b/build/Makefile
index 10ceb31..dc51765 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -57,9 +57,9 @@ a.out:
 # Alternative kernel: no dd, but . and ..
 alt/a.out:
 	$(AS) -f ptr -o alt/a.out $(SYSSRC)/sop.s $(SYSSRC)/s1.s \
-		$(ALTSRC)/s2.s $(SYSSRC)/s[3-8].s
+		$(ALTSRC)/s2/s2.s $(SYSSRC)/s[3-8].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/s2.s $(SYSSRC)/s[3-8].s
 
 # Phil's bootstrap code
 boot.rim: $(SYSSRC)/sop.s $(OTHERSRC)/pbboot.s
@@ -101,32 +101,32 @@ altcmd: dirs $(BINDIR)/as $(BINDIR)/cat $(BINDIR)/check $(BINDIR)/chmod \
 	$(BINDIR)/chown $(BINDIR)/altchrm $(BINDIR)/cp $(BINDIR)/ds \
 	$(BINDIR)/ed $(BINDIR)/altinit $(BINDIR)/altmkdir
 
-$(BINDIR)/as: $(CMDSRC)/as.s
-	$(AS) $(ASARGS) -o $(BINDIR)/as $(CMDSRC)/as.s
+$(BINDIR)/as: $(CMDSRC)/as/as.s
+	$(AS) $(ASARGS) -o $(BINDIR)/as $(CMDSRC)/as/as.s
 
-$(BINDIR)/cat: $(CMDSRC)/cat.s
-	$(AS) $(ASARGS) -o $(BINDIR)/cat $(CMDSRC)/cat.s
+$(BINDIR)/cat: $(CMDSRC)/cat/cat.s
+	$(AS) $(ASARGS) -o $(BINDIR)/cat $(CMDSRC)/cat/cat.s
 
-$(BINDIR)/check: $(CMDSRC)/check.s
-	$(AS) $(ASARGS) -o $(BINDIR)/check $(CMDSRC)/check.s
+$(BINDIR)/check: $(CMDSRC)/check/check.s
+	$(AS) $(ASARGS) -o $(BINDIR)/check $(CMDSRC)/check/check.s
 
-$(BINDIR)/chmod: $(CMDSRC)/chmod.s
-	$(AS) $(ASARGS) -o $(BINDIR)/chmod $(CMDSRC)/chmod.s
+$(BINDIR)/chmod: $(CMDSRC)/chmod/chmod.s
+	$(AS) $(ASARGS) -o $(BINDIR)/chmod $(CMDSRC)/chmod/chmod.s
 
-$(BINDIR)/chown: $(CMDSRC)/chown.s
-	$(AS) $(ASARGS) -o $(BINDIR)/chown $(CMDSRC)/chown.s
+$(BINDIR)/chown: $(CMDSRC)/chown/chown.s
+	$(AS) $(ASARGS) -o $(BINDIR)/chown $(CMDSRC)/chown/chown.s
 
-$(BINDIR)/chrm: $(CMDSRC)/chrm.s
-	$(AS) $(ASARGS) -o $(BINDIR)/chrm $(CMDSRC)/chrm.s
+$(BINDIR)/chrm: $(CMDSRC)/chrm/chrm.s
+	$(AS) $(ASARGS) -o $(BINDIR)/chrm $(CMDSRC)/chrm/chrm.s
 
-$(BINDIR)/altchrm: $(ALTSRC)/chrm.s
-	$(AS) $(ASARGS) -o $(BINDIR)/altchrm $(ALTSRC)/chrm.s
+$(BINDIR)/altchrm: $(ALTSRC)/chrm/chrm.s
+	$(AS) $(ASARGS) -o $(BINDIR)/altchrm $(ALTSRC)/chrm/chrm.s
 
-$(BINDIR)/cp: $(CMDSRC)/cp.s
-	$(AS) $(ASARGS) -o $(BINDIR)/cp $(CMDSRC)/cp.s
+$(BINDIR)/cp: $(CMDSRC)/cp/cp.s
+	$(AS) $(ASARGS) -o $(BINDIR)/cp $(CMDSRC)/cp/cp.s
 
-$(BINDIR)/ds: $(CMDSRC)/ds.s
-	$(AS) $(ASARGS) -o $(BINDIR)/ds $(CMDSRC)/ds.s
+$(BINDIR)/ds: $(CMDSRC)/ds/ds.s
+	$(AS) $(ASARGS) -o $(BINDIR)/ds $(CMDSRC)/ds/ds.s
 
 $(BINDIR)/dskres: $(CMDSRC)/dskres.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
 	$(AS) $(ASARGS) -o $(BINDIR)/dskres $(CMDSRC)/dskres.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
@@ -134,21 +134,21 @@ $(BINDIR)/dskres: $(CMDSRC)/dskres.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
 $(BINDIR)/dsksav: $(CMDSRC)/dsksav.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
 	$(AS) $(ASARGS) -o $(BINDIR)/dsksav $(CMDSRC)/dsksav.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
 
-$(BINDIR)/ed: $(CMDSRC)/ed1.s $(CMDSRC)/ed2.s
-	$(AS) $(ASARGS) -o $(BINDIR)/ed $(CMDSRC)/ed1.s $(CMDSRC)/ed2.s
+$(BINDIR)/ed: $(CMDSRC)/ed/ed1.s $(CMDSRC)/ed/ed2.s
+	$(AS) $(ASARGS) -o $(BINDIR)/ed $(CMDSRC)/ed/ed1.s $(CMDSRC)/ed/ed2.s
 
-$(BINDIR)/init: $(CMDSRC)/init.s
-	$(AS) $(ASARGS) -o $(BINDIR)/init $(CMDSRC)/init.s
+$(BINDIR)/init: $(CMDSRC)/init/init.s
+	$(AS) $(ASARGS) -o $(BINDIR)/init $(CMDSRC)/init/init.s
 
-$(BINDIR)/db: $(CMDSRC)/db.s
-	$(AS) $(ASARGS) -o $(BINDIR)/db $(CMDSRC)/db.s
+$(BINDIR)/db: $(CMDSRC)/db/db.s
+	$(AS) $(ASARGS) -o $(BINDIR)/db $(CMDSRC)/db/db.s
 
 # Alternative init: no dd directory
-$(BINDIR)/altinit: $(ALTSRC)/init.s
-	$(AS) $(ASARGS) -o $(BINDIR)/altinit $(ALTSRC)/init.s
+$(BINDIR)/altinit: $(ALTSRC)/init/init.s
+	$(AS) $(ASARGS) -o $(BINDIR)/altinit $(ALTSRC)/init/init.s
 
-$(BINDIR)/altmkdir: $(ALTSRC)/wktmkdir.s
-	$(AS) $(ASARGS) -o $(BINDIR)/altmkdir $(ALTSRC)/wktmkdir.s
+$(BINDIR)/altmkdir: $(ALTSRC)/wktmkdir/wktmkdir.s
+	$(AS) $(ASARGS) -o $(BINDIR)/altmkdir $(ALTSRC)/wktmkdir/wktmkdir.s
 
 
 # The commands that did not come from the scans
@@ -182,8 +182,8 @@ $(BINDIR)/ls: $(OTHERSRC)/wktls.s
 $(BINDIR)/lsd: $(OTHERSRC)/pblsd.s
 	$(AS) $(ASARGS) -o $(BINDIR)/lsd $(OTHERSRC)/pblsd.s
 
-$(BINDIR)/altls: $(ALTSRC)/wktls.s
-	$(AS) $(ASARGS) -o $(BINDIR)/altls $(ALTSRC)/wktls.s
+$(BINDIR)/altls: $(ALTSRC)/wktls/wktls.s
+	$(AS) $(ASARGS) -o $(BINDIR)/altls $(ALTSRC)/wktls/wktls.s
 
 $(BINDIR)/lsl: $(OTHERSRC)/pblsd.s
 	$(AS) $(ASARGS) -o $(BINDIR)/lsl $(OTHERSRC)/pblsd.s
@@ -198,10 +198,10 @@ $(BINDIR)/od: $(OTHERSRC)/wktod.s
 	$(AS) $(ASARGS) -o $(BINDIR)/od $(OTHERSRC)/wktod.s
 
 # B compiler
-$(BINDIR)/bc: $(CMDSRC)/bl.s $(CMDSRC)/bi.s ../tools/b.c $(OTHERSRC)/b.b
+$(BINDIR)/bc: $(CMDSRC)/bl/bl.s $(CMDSRC)/bi/bi.s ../tools/b.c $(OTHERSRC)/b.b
 	$(CC) $(CCARGS) -o b ../tools/b.c
 	./b $(OTHERSRC)/b.b b.s
-	$(AS) $(ASARGS) -o $(BINDIR)/bc $(CMDSRC)/bl.s b.s $(CMDSRC)/bi.s
+	$(AS) $(ASARGS) -o $(BINDIR)/bc $(CMDSRC)/bl/bl.s b.s $(CMDSRC)/bi/bi.s
 	rm b b.s
 
 tests:
diff --git a/build/proto b/build/proto
index 07e60e1..af8d82c 100644
--- a/build/proto
+++ b/build/proto
@@ -62,11 +62,11 @@ dd 	         drwr- -1 4
       $
     dmr        drwr- 12
       system   l----  3
-      as.s     frwr- 12 ../src/cmd/as.s
+      as.s     frwr- 12 ../src/cmd/as/as.s
       b_readme frwr- 12 fs/b_readme
-      bi.s     frwr- 12 ../src/cmd/bi.s
-      bl.s     frwr- 12 ../src/cmd/bl.s
-      db.s     frwr- 12 ../src/cmd/db.s
+      bi.s     frwr- 12 ../src/cmd/bi/bi.s
+      bl.s     frwr- 12 ../src/cmd/bl/bl.s
+      db.s     frwr- 12 ../src/cmd/db/db.s
       hello.b  frwr- 12 ../src/other/hello.b
       ops.s    frwr- 12 ../src/other/ops.s
       $
diff --git a/src/alt/chrm.s b/src/alt/chrm/chrm.s
similarity index 100%
rename from src/alt/chrm.s
rename to src/alt/chrm/chrm.s
diff --git a/src/alt/init.s b/src/alt/init/init.s
similarity index 100%
rename from src/alt/init.s
rename to src/alt/init/init.s
diff --git a/src/alt/s2.s b/src/alt/s2/s2.s
similarity index 100%
rename from src/alt/s2.s
rename to src/alt/s2/s2.s
diff --git a/src/alt/wktls.s b/src/alt/wktls/wktls.s
similarity index 100%
rename from src/alt/wktls.s
rename to src/alt/wktls/wktls.s
diff --git a/src/alt/wktmkdir.s b/src/alt/wktmkdir/wktmkdir.s
similarity index 100%
rename from src/alt/wktmkdir.s
rename to src/alt/wktmkdir/wktmkdir.s
diff --git a/src/cmd/as.s b/src/cmd/as/as.s
similarity index 100%
rename from src/cmd/as.s
rename to src/cmd/as/as.s
diff --git a/src/cmd/bi.s b/src/cmd/bi/bi.s
similarity index 100%
rename from src/cmd/bi.s
rename to src/cmd/bi/bi.s
diff --git a/src/cmd/bl.s b/src/cmd/bl/bl.s
similarity index 100%
rename from src/cmd/bl.s
rename to src/cmd/bl/bl.s
diff --git a/src/cmd/cat.s b/src/cmd/cat/cat.s
similarity index 100%
rename from src/cmd/cat.s
rename to src/cmd/cat/cat.s
diff --git a/src/cmd/check.s b/src/cmd/check/check.s
similarity index 100%
rename from src/cmd/check.s
rename to src/cmd/check/check.s
diff --git a/src/cmd/chmod.s b/src/cmd/chmod/chmod.s
similarity index 100%
rename from src/cmd/chmod.s
rename to src/cmd/chmod/chmod.s
diff --git a/src/cmd/chown.s b/src/cmd/chown/chown.s
similarity index 100%
rename from src/cmd/chown.s
rename to src/cmd/chown/chown.s
diff --git a/src/cmd/chrm.s b/src/cmd/chrm/chrm.s
similarity index 100%
rename from src/cmd/chrm.s
rename to src/cmd/chrm/chrm.s
diff --git a/src/cmd/cp.s b/src/cmd/cp/cp.s
similarity index 100%
rename from src/cmd/cp.s
rename to src/cmd/cp/cp.s
diff --git a/src/cmd/db.s b/src/cmd/db/db.s
similarity index 100%
rename from src/cmd/db.s
rename to src/cmd/db/db.s
diff --git a/src/cmd/ds.s b/src/cmd/ds/ds.s
similarity index 100%
rename from src/cmd/ds.s
rename to src/cmd/ds/ds.s
diff --git a/src/cmd/ed1.s b/src/cmd/ed/ed1.s
similarity index 100%
rename from src/cmd/ed1.s
rename to src/cmd/ed/ed1.s
diff --git a/src/cmd/ed2.s b/src/cmd/ed/ed2.s
similarity index 100%
rename from src/cmd/ed2.s
rename to src/cmd/ed/ed2.s
diff --git a/src/cmd/init.s b/src/cmd/init/init.s
similarity index 100%
rename from src/cmd/init.s
rename to src/cmd/init/init.s