++

lacanoid · Jan 10, 2023 · 2e18748 · 2e18748
1 parent a6460ad
commit 2e18748
Show file tree

Hide file tree

Showing 31 changed files with 46 additions and 53 deletions.
diff --git a/boot/README.md b/boot/README.md
@@ -60,7 +60,7 @@ file listing isn't cluttered and `LOAD *` still works as expected.
 By default the boot loader loads and runs file "*" which is the first file on the disk.
 It can be useful tu use something like `kmon` here as a kind of shell.
 
-    $ c1541 my_disk_image.d81 -@ "b-a 8 1 0" -@ "b-a 8 1 1" -write tools/kmon -write tools/kmon.64 -write tools/kmon.128
+    $ c1541 my_disk_image.d81 -@ "b-a 8 1 0" -@ "b-a 8 1 1" -write tools/kmon -write tools/kmon64 -write tools/kmon128
 
 ## Booting the machine
 

diff --git a/c1541/! b/c1541/!
diff --git a/c1541/speedscript b/c1541/speedscript
diff --git a/c1541/speedscript.128 → c1541/speedscript128 b/c1541/speedscript.128 → c1541/speedscript128
diff --git a/c1541/speedscript.64 → c1541/speedscript64 b/c1541/speedscript.64 → c1541/speedscript64
diff --git a/c1571/assembler b/c1571/assembler
diff --git a/c1571/assembler.128 → c1571/assembler128 b/c1571/assembler.128 → c1571/assembler128
diff --git a/c1571/assembler.64 → c1571/assembler64 b/c1571/assembler.64 → c1571/assembler64
diff --git a/cpm++.d81 b/cpm++.d81
diff --git a/vdc64/raster → demos/raster b/vdc64/raster → demos/raster
diff --git a/vdc64/raster.dep → demos/raster.dep b/vdc64/raster.dep → demos/raster.dep
diff --git a/vdc64/raster.s → demos/raster.s b/vdc64/raster.s → demos/raster.s
diff --git a/vdc64/vdc128 → demos/vdc128 b/vdc64/vdc128 → demos/vdc128
diff --git a/vdc64/vdc128.dep → demos/vdc128.dep b/vdc64/vdc128.dep → demos/vdc128.dep
diff --git a/vdc64/vdc128.s → demos/vdc128.s b/vdc64/vdc128.s → demos/vdc128.s
diff --git a/install.sh b/install.sh
@@ -14,8 +14,8 @@ c1541 $DISKIMG -write tools/patch64
 c1541 $DISKIMG -write vdc64/vdc64
 #c1541 $DISKIMG -write tools/patch128
 #c1541 $DISKIMG -write vdc64/vdc128
-c1541 $DISKIMG -write tools/kmon.64 -write tools/kmon.128
-c1541 $DISKIMG -write tools/pip.64 -write tools/pip.128
+c1541 $DISKIMG -write tools/kmon64 -write tools/kmon128
+c1541 $DISKIMG -write tools/pip64 -write tools/pip128
 c1541 $DISKIMG -write tools/sjload !
 #c1541 $DISKIMG -write fifth/5th
 #c1541 $DISKIMG -write fifth/imenu

diff --git a/install_boot.sh b/install_boot.sh
@@ -5,5 +5,5 @@ DISKIMG=$1
 c1541 $DISKIMG -bwrite boot/bootsect.128 1 0 -bwrite boot/autostart64.128 1 1 
 c1541 $DISKIMG -@ "b-a 8 1 0" -@ "b-a 8 1 1" -write tools/kmon
 c1541 $DISKIMG -write c/setup -write c/config
-c1541 $DISKIMG -write tools/kmon.64 -write tools/kmon.128
+c1541 $DISKIMG -write tools/kmon64 -write tools/kmon128
 c1541 $DISKIMG -write s/empty '================'
diff --git a/run64.d81 b/run64.d81
diff --git a/s/issue,s b/s/issue,s
@@ -1,6 +1,14 @@
-You look like a million dollars.  All green and wrinkled.
+To be or not to be.
+		-- Shakespeare
+To do is to be.
+		-- Nietzsche
+To be is to do.
+		-- Sartre
+Do be do be do.
+		-- Sinatra
 
 
-Training is everything.  The peach was once a bitter almond; cauliflower is
-nothing but cabbage with a college education.
+It is easy to find fault, if one has that disposition.  There was once a man
+who, not being able to find any other fault with his coal, complained that
+there were too many prehistoric toads in it.
 		-- Mark Twain, "Pudd'nhead Wilson's Calendar"
diff --git a/tools/Makefile b/tools/Makefile
@@ -3,7 +3,7 @@ CC := cl65
 C1541 := c1541
 X128 := x128
 
-PROGRAMS := kmon.64 kmon.128 pip.64 pip.128 patch64 patch128 mtop sjload
+PROGRAMS := kmon64 kmon128 pip64 pip128 patch64 patch128 mtop sjload
 INCLUDES := ..
 
 ifdef CC65_HOME
@@ -24,30 +24,30 @@ clean:
 zap: clean
 	rm -rf *.dep
 
-kmon.64: kmon.64.o
-	$(CC) $(LDFLAGS) -t c64 -C c64.cfg -u __EXEHDR__ -o kmon.64 kmon.64.o
-kmon.64.o: kmon.s
-	$(AS) $(ASFLAGS) -t c64 -o kmon.64.o kmon.s
-
-kmon.128: kmon.128.o
-	$(CC) $(LDFLAGS) -t c128 -C c128.cfg -o kmon.128 kmon.128.o
-kmon.128.o: kmon.s
-	$(AS) $(ASFLAGS) -t c128 -o kmon.128.o kmon.s
-
-kmon.16: kmon.16.o
-	$(CC) $(LDFLAGS) -t c16 -C c16.cfg -o kmon.16 kmon.16.o
-kmon.16.o: kmon.s
-	$(AS) $(ASFLAGS) -t c16 -o kmon.16.o kmon.s
-
-pip.64: pip.64.o
-	$(CC) $(LDFLAGS) -t c64 -C c64.cfg -u __EXEHDR__ -o pip.64 pip.64.o
-pip.64.o: pip.s
-	$(AS) $(ASFLAGS) -t c64 -o pip.64.o pip.s
-
-pip.128: pip.128.o
-	$(CC) $(LDFLAGS) -t c128 -C c128.cfg -o pip.128 pip.128.o
-pip.128.o: pip.s
-	$(AS) $(ASFLAGS) -t c128 -o pip.128.o pip.s
+kmon64: kmon64.o
+	$(CC) $(LDFLAGS) -t c64 -C c64.cfg -u __EXEHDR__ -o kmon64 kmon64.o
+kmon64.o: kmon.s
+	$(AS) $(ASFLAGS) -t c64 -o kmon64.o kmon.s
+
+kmon128: kmon128.o
+	$(CC) $(LDFLAGS) -t c128 -C c128.cfg -o kmon128 kmon128.o
+kmon128.o: kmon.s
+	$(AS) $(ASFLAGS) -t c128 -o kmon128.o kmon.s
+
+kmon16: kmon16.o
+	$(CC) $(LDFLAGS) -t c16 -C c16.cfg -o kmon16 kmon16.o
+kmon16.o: kmon.s
+	$(AS) $(ASFLAGS) -t c16 -o kmon16.o kmon.s
+
+pip64: pip64.o
+	$(CC) $(LDFLAGS) -t c64 -C c64.cfg -u __EXEHDR__ -o pip64 pip64.o
+pip64.o: pip.s
+	$(AS) $(ASFLAGS) -t c64 -o pip64.o pip.s
+
+pip128: pip128.o
+	$(CC) $(LDFLAGS) -t c128 -C c128.cfg -o pip128 pip128.o
+pip128.o: pip.s
+	$(AS) $(ASFLAGS) -t c128 -o pip128.o pip.s
 
 patch64: LDFLAGS += -t c64 -C c64.cfg -u __EXEHDR__ 
 patch64: patch64.o

diff --git a/tools/kmon b/tools/kmon
diff --git a/tools/kmon.128 → tools/kmon128 b/tools/kmon.128 → tools/kmon128
diff --git a/tools/kmon.64 → tools/kmon64 b/tools/kmon.64 → tools/kmon64
diff --git a/tools/loader.s b/tools/loader.s
@@ -137,13 +137,13 @@ SNDMSG2:
 MSGBAS2  =*
 MSG2_1:   .BYTE $0d,"?",$20+$80
 .ifdef __C128__
-TB_FNLEN: .byte 8
-TB_FN:    .byte "kmon.128",0
-          .res  6
-.else
 TB_FNLEN: .byte 7
-TB_FN:    .byte "kmon.64"
+TB_FN:    .byte "kmon128",0
           .res  7
+.else
+TB_FNLEN: .byte 6
+TB_FN:    .byte "kmon64"
+          .res  8
 .endif
 
 ; -----------------------------------------------------------------------------

diff --git a/tools/pip b/tools/pip
diff --git a/tools/pip.128.dep b/tools/pip.128.dep
diff --git a/tools/pip.dep b/tools/pip.dep
diff --git a/tools/pip.128 → tools/pip128 b/tools/pip.128 → tools/pip128
diff --git a/tools/pip.64 → tools/pip64 b/tools/pip.64 → tools/pip64
diff --git a/tools/sjload b/tools/sjload
diff --git a/vdc64/Makefile b/vdc64/Makefile
@@ -4,8 +4,7 @@ C1541 := c1541
 X128 := x128
 
 TIME := $(shell date +%y%m%d%H%M%S)
-VOLNAME := run64 ${TIME},sy
-PROGRAMS := vdc64 vdc128 raster
+PROGRAMS := vdc64 
 INCLUDES := ..
 
 ifdef CC65_HOME
@@ -34,10 +33,4 @@ zap: clean
 vdc64: LDFLAGS += -t c64 -C c64-asm.cfg -u __EXEHDR__
 vdc64: vdc64.o
 
-vdc128: LDFLAGS += -t c128  
-vdc128: vdc128.o
-
-raster: LDFLAGS += -t c64 -C c64-asm.cfg -u __EXEHDR__
-raster: raster.o
-
 -include *.dep