6502/PLASMA
1
0
Fork 0
mirror of https://github.com/dschmenk/PLASMA.git synced 2026-04-19 09:23:06 +00:00
Code Issues Projects Releases Wiki Activity

Slot init for 80 column requires fixes

Browse Source
This commit is contained in:
David Schmenk
2024-11-11 17:33:25 -08:00
parent d91816019e
commit 6d7465377e
9 changed files with 84 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/makefile
+6 -1
View File
@@ -27,6 +27,7 @@ REN = rel/apple/REN\#FE1000
CAT = rel/apple/CAT\#FE1000
NEWDIR = rel/apple/NEWDIR\#FE1000
TYPE = rel/apple/TYPE\#FE1000
INITSLOT = rel/apple/INITSLOT\#FE1000
SIEVE = rel/SIEVE\#FE1000
PRIMEGAP = rel/PRIMEGAP\#FE1000
ARGS = rel/ARGS\#FE1000
@@ -121,7 +122,7 @@ TXTTYPE = .TXT
#SYSTYPE = \#FF2000
#TXTTYPE = \#040000
apple: $(PLVMZP_APL) $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVMJIT) $(PLVM802) $(PLVM03) $(PLVMJIT03) $(CMD) $(CMDJIT) $(JIT) $(JIT16) $(JITUNE) $(SOSCMD) $(SOSCMDJIT) $(PLASMAPLASM) $(CODEOPT) $(PLFORTH) $(HRFORTH) $(HR2FORTH) $(TX2FORTH) $(SEXPR) $(SMATH) $(DRAWL) $(ZIPCHIP) $(MATCHFILES) $(ARGS) $(MEMMGR) $(MEMTEST) $(FIBER) $(FIBERTEST) $(LONGJMP) $(ED) $(MON) $(COPY) $(DEL) $(REN) $(CAT) $(NEWDIR) $(TYPE) $(SOS) $(ROD) $(SIEVE) $(PRIMEGAP) $(MOUSE) $(UTHERNET2) $(UTHERNET) $(ETHERIP) $(INET) $(DHCP) $(HTTPD) $(TFTPD) $(ROGUE) $(ROGUEMAP) $(ROGUECOMBAT) $(SFM) $(SFMSPRT) $(GRAFIX) $(GFXDEMO) $(LINES) $(HGRTILE) $(HGRFONT) $(HGRSPRITE) $(HGRLIB) $(TILETEST) $(HGRTEST) $(DCGRLIB) $(GRLIB) $(DGRLIB) $(DCGRUTILS) $(GRTEST) $(DGRTEST) $(HGRTEST) $(DCGRTEST) $(DCGRSPRED) $(FILEIO_APL) $(CONIO_APL) $(JOYBUZZ) $(PORTIO) $(SPIPORT) $(SDFAT) $(FATCAT) $(FATGET) $(FATPUT) $(FATWDSK) $(FATRDSK) $(INT32) $(INT32TEST) $(SANE) $(FPSTR) $(FPU) $(SANITY) $(LZ4) $(LZ4CAT) $(RPNCALC) $(SNDSEQ) $(PLAYSEQ) $(CONIOTEST)
apple: $(PLVMZP_APL) $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVMJIT) $(PLVM802) $(PLVM03) $(PLVMJIT03) $(CMD) $(CMDJIT) $(JIT) $(JIT16) $(JITUNE) $(SOSCMD) $(SOSCMDJIT) $(PLASMAPLASM) $(CODEOPT) $(PLFORTH) $(HRFORTH) $(HR2FORTH) $(TX2FORTH) $(SEXPR) $(SMATH) $(DRAWL) $(ZIPCHIP) $(MATCHFILES) $(ARGS) $(MEMMGR) $(MEMTEST) $(FIBER) $(FIBERTEST) $(LONGJMP) $(ED) $(MON) $(COPY) $(DEL) $(REN) $(CAT) $(NEWDIR) $(TYPE) $(INITSLOT) $(SOS) $(ROD) $(SIEVE) $(PRIMEGAP) $(MOUSE) $(UTHERNET2) $(UTHERNET) $(ETHERIP) $(INET) $(DHCP) $(HTTPD) $(TFTPD) $(ROGUE) $(ROGUEMAP) $(ROGUECOMBAT) $(SFM) $(SFMSPRT) $(GRAFIX) $(GFXDEMO) $(LINES) $(HGRTILE) $(HGRFONT) $(HGRSPRITE) $(HGRLIB) $(TILETEST) $(HGRTEST) $(DCGRLIB) $(GRLIB) $(DGRLIB) $(DCGRUTILS) $(GRTEST) $(DGRTEST) $(HGRTEST) $(DCGRTEST) $(DCGRSPRED) $(FILEIO_APL) $(CONIO_APL) $(JOYBUZZ) $(PORTIO) $(SPIPORT) $(SDFAT) $(FATCAT) $(FATGET) $(FATPUT) $(FATWDSK) $(FATRDSK) $(INT32) $(INT32TEST) $(SANE) $(FPSTR) $(FPU) $(SANITY) $(LZ4) $(LZ4CAT) $(RPNCALC) $(SNDSEQ) $(PLAYSEQ) $(CONIOTEST)
-rm vmsrc/plvmzp.inc
@@ -567,6 +568,10 @@ $(TYPE): utilsrc/apple/type.pla $(PLASM)
./$(PLASM) -AMOW utilsrc/apple/type.pla
acme --setpc 4094 -o $(TYPE) utilsrc/apple/type.a
$(INITSLOT): utilsrc/apple/initslot.pla $(PLASM)
./$(PLASM) -AMOW utilsrc/apple/initslot.pla
acme --setpc 4094 -o $(INITSLOT) utilsrc/apple/initslot.a
$(SOS): utilsrc/apple/sos.pla $(PLVM03) $(PLASM)
./$(PLASM) -AMOW utilsrc/apple/sos.pla
acme --setpc 4094 -o $(SOS) utilsrc/apple/sos.a
src/mkrel
+1
View File
@@ -29,6 +29,7 @@ cp rel/apple/REN#FE1000 prodos/sys/REN.REL
cp rel/apple/CAT#FE1000 prodos/sys/CAT.REL
cp rel/apple/NEWDIR#FE1000 prodos/sys/NEWDIR.REL
cp rel/apple/TYPE#FE1000 prodos/sys/TYPE.REL
cp rel/apple/INITSLOT#FE1000 prodos/sys/INITSLOT.REL
cp rel/apple/MATCHFILES#FE1000 prodos/sys/MATCHFILES.REL
cp rel/ARGS#FE1000 prodos/sys/ARGS.REL
cp rel/ED#FE1000 prodos/sys/ED.REL
src/mksys
+41 -40
View File
@@ -1,40 +1,41 @@
cp ../sysfiles/BLANK140.po PLASMA-2.1-SYS.po
./ac.jar -n PLASMA-2.1-SYS.po PLASMA.SYS
#cat ../sysfiles/PRODOS#FF0000 | ./ac.jar -p PLASMA-2.1-SYS.po PRODOS SYS
#cat rel/apple/CMD#061000 | ./ac.jar -p PLASMA-2.1-SYS.po CMD BIN $1000
#cat rel/apple/CMD128#061000 | ./ac.jar -p PLASMA-2.1-SYS.po CMD128 BIN $1000
#cat rel/apple/PLASMA.SYSTEM#FF2000 | ./ac.jar -p PLASMA-2.1-SYS.po PLASMA.SYSTEM SYS
#cat rel/apple/PLVM.128#FF2000 | ./ac.jar -p PLASMA-2.1-SYS.po PLVM.128 SYS
#cat rel/apple/PLVM16#FF2000 | ./ac.jar -p PLASMA-2.1-SYS.po PLVM16 SYS
cat ../doc/Editor.md | ./ac.jar -ptx PLASMA-2.1-SYS.po EDITOR.README TXT
#cat rel/apple/FILEIO#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/FILEIO REL
#cat rel/apple/CONIO#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/CONIO REL
cat rel/LINES#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/LINES REL
cat rel/apple/HGRFONT#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/HGRFONT REL
cat rel/apple/HGRTILE#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/HGRTILE REL
cat rel/apple/HGRSPRITE#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/HGRSPRITE REL
cat rel/apple/HGRLIB#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/HGRLIB REL
cat rel/apple/GRLIB#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/GRLIB REL
cat rel/apple/DGRLIB#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/DGRLIB REL
#cat rel/apple/COPY#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/COPY REL
#cat rel/apple/DEL#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/DEL REL
#cat rel/apple/REN#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/REN REL
#cat rel/apple/CAT#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/CAT REL
#cat rel/apple/NEWDIR#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/NEWDIR REL
#cat rel/apple/TYPE#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/TYPE REL
#cat rel/apple/MATCHFILES#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/MATCHFILES REL
#cat rel/ARGS#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/ARGS REL
cat rel/ED#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/ED REL
cat rel/FIBER#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/FIBER REL
#cat rel/LONGJMP#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/LONGJMP REL
cat rel/MEMMGR#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/MEMMGR REL
cat rel/apple/MOUSE#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/MOUSE REL
cat rel/apple/PORTIO#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/PORTIO REL
cat rel/apple/JOYBUZZ#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/JOYBUZZ REL
cat rel/apple/SNDSEQ#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/SNDSEQ REL
#cat rel/apple/JIT#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/JIT REL
#cat rel/apple/JIT16#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/JIT16 REL
cat rel/apple/JITUNE#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/JITUNE REL
cat rel/apple/ZIPCHIP#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/ZIPCHIP REL
cat rel/LZ4#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/LZ4 REL
#cat rel/INT32#FE1000 | ./ac.jar -p PLASMA-2.1-SYS.po sys/INT32 REL
cp ../sysfiles/BLANK140.po PLASMA-2.2-SYS.po
./ac.jar -n PLASMA-2.2-SYS.po PLASMA.SYS
#cat ../sysfiles/PRODOS#FF0000 | ./ac.jar -p PLASMA-2.2-SYS.po PRODOS SYS
#cat rel/apple/CMD#061000 | ./ac.jar -p PLASMA-2.2-SYS.po CMD BIN $1000
#cat rel/apple/CMD128#061000 | ./ac.jar -p PLASMA-2.2-SYS.po CMD128 BIN $1000
#cat rel/apple/PLASMA.SYSTEM#FF2000 | ./ac.jar -p PLASMA-2.2-SYS.po PLASMA.SYSTEM SYS
#cat rel/apple/PLVM.128#FF2000 | ./ac.jar -p PLASMA-2.2-SYS.po PLVM.128 SYS
#cat rel/apple/PLVM16#FF2000 | ./ac.jar -p PLASMA-2.2-SYS.po PLVM16 SYS
cat ../doc/Editor.md | ./ac.jar -ptx PLASMA-2.2-SYS.po EDITOR.README TXT
#cat rel/apple/FILEIO#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/FILEIO REL
#cat rel/apple/CONIO#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/CONIO REL
cat rel/LINES#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/LINES REL
cat rel/apple/HGRFONT#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/HGRFONT REL
cat rel/apple/HGRTILE#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/HGRTILE REL
cat rel/apple/HGRSPRITE#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/HGRSPRITE REL
cat rel/apple/HGRLIB#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/HGRLIB REL
cat rel/apple/GRLIB#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/GRLIB REL
cat rel/apple/DGRLIB#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/DGRLIB REL
#cat rel/apple/COPY#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/COPY REL
#cat rel/apple/DEL#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/DEL REL
#cat rel/apple/REN#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/REN REL
#cat rel/apple/CAT#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/CAT REL
#cat rel/apple/NEWDIR#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/NEWDIR REL
#cat rel/apple/TYPE#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/TYPE REL
#cat rel/apple/MATCHFILES#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/MATCHFILES REL
#cat rel/ARGS#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/ARGS REL
cat rel/apple/INITSLOT#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/INITSLOT REL
cat rel/ED#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/ED REL
cat rel/FIBER#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/FIBER REL
#cat rel/LONGJMP#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/LONGJMP REL
cat rel/MEMMGR#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/MEMMGR REL
cat rel/apple/MOUSE#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/MOUSE REL
cat rel/apple/PORTIO#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/PORTIO REL
cat rel/apple/JOYBUZZ#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/JOYBUZZ REL
cat rel/apple/SNDSEQ#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/SNDSEQ REL
#cat rel/apple/JIT#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/JIT REL
#cat rel/apple/JIT16#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/JIT16 REL
cat rel/apple/JITUNE#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/JITUNE REL
cat rel/apple/ZIPCHIP#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/ZIPCHIP REL
cat rel/LZ4#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/LZ4 REL
#cat rel/INT32#FE1000 | ./ac.jar -p PLASMA-2.2-SYS.po sys/INT32 REL
src/utilsrc/apple/initslot.pla
+18
View File
@@ -0,0 +1,18 @@
//
// APPLE // slot initializer
//
include "inc/cmdsys.plh"
include "inc/args.plh"
sysflags restxt1|resxtxt1 // Reserve 80 column text pages
var arg
arg = argNext(argFirst)
if ^arg
if arg->1 >= '1' and arg->1 <= '7'
call($C000 + ((arg->1 - '0') << 8), 0, 0, 0, 0)
return modkeep
fin
fin
puts("Usage: INITSLOT [SLOT NUMBER 1-7]\n")
done
src/vmsrc/apple/a1cmd.pla
+4 -4
View File
@@ -1149,11 +1149,11 @@ def execmod(modfile)#1
savesym = lastsym
saveflags = systemflags
if loadmod(@moddci) < modkeep
lastsym = savesym
heap = saveheap
systemflags = saveflags
heap = saveheap
lastsym = savesym
^lastsym = 0
fin
^lastsym = 0
systemflags = saveflags
fin
return -perr
end
src/vmsrc/apple/cmd.pla
+4 -4
View File
@@ -1312,11 +1312,11 @@ def execmod(modfile)#1
savesym = lastsym
saveflags = systemflags
if loadmod(@moddci) < modkeep
lastsym = savesym
heap = saveheap
systemflags = saveflags
heap = saveheap
lastsym = savesym
^lastsym = 0
fin
^lastsym = 0
systemflags = saveflags
fin
return -perr
end
src/vmsrc/apple/cmdjit.pla
+4 -4
View File
@@ -947,7 +947,7 @@ def allocxheap(size)#1
xaddr = xheap
xheap = xheap + size
if systemflags & resxtxt1
if uword_islt(xaddr, $0800) and uword_isgt(xheap, $0400)
if uword_islt(xaddr, $0800) // and uword_isgt(xheap, $0400)
xaddr = $0800
xheap = xaddr + size
fin
@@ -1390,12 +1390,12 @@ def execmod(modfile)#1
savesym = lastsym
saveflags = systemflags
if loadmod(@moddci) < modkeep
lastsym = savesym
systemflags = saveflags
xheap = savexheap
heap = saveheap
lastsym = savesym
^lastsym = 0
fin
^lastsym = 0
systemflags = saveflags
fin
return -perr
end
src/vmsrc/apple/sossys.pla
+3 -3
View File
@@ -1251,14 +1251,14 @@ def execmod(modfile)#1
saveflags = systemflags
savemodid = modid
if loadmod(@moddci) < modkeep
lastsym = savesym
heap = saveheap
while modid > savemodid
modid--
seg_release(modseg[modid])
loop
xpokeb(symtbl.0, lastsym, 0)
systemflags = saveflags
heap = saveheap
lastsym = savesym
xpokeb(symtbl.0, lastsym, 0)
fin
fin
return -perr
src/vmsrc/apple/sossysjit.pla
+3 -3
View File
@@ -1274,14 +1274,14 @@ def execmod(modfile)#1
saveflags = systemflags
savemodid = modid
if loadmod(@moddci) < modkeep
lastsym = savesym
heap = saveheap
while modid > savemodid
modid--
seg_release(modseg[modid])
loop
xpokeb(symtbl.0, lastsym, 0)
systemflags = saveflags
heap = saveheap
lastsym = savesym
xpokeb(symtbl.0, lastsym, 0)
fin
fin
return -perr