From 75b14415741721628d4cf238e9f1141e065b7ffc Mon Sep 17 00:00:00 2001 From: David Schmenk Date: Mon, 11 Nov 2024 19:23:13 -0800 Subject: [PATCH] Still looking for 80 column crasht --- src/libsrc/apple/fileio.pla | 2 ++ src/makefile | 2 +- src/mkrel | 2 +- src/vmsrc/apple/cmdjit.pla | 4 ++-- src/vmsrc/apple/plvm802.s | 5 ++++- src/vmsrc/apple/plvmjit02.s | 5 ++++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/libsrc/apple/fileio.pla b/src/libsrc/apple/fileio.pla index 140703b..e9b1eee 100644 --- a/src/libsrc/apple/fileio.pla +++ b/src/libsrc/apple/fileio.pla @@ -515,6 +515,8 @@ when MACHID & MACHID_MODEL fileio:setfileinfo = @a1setfileinfo fileio:geteof = @a1geteof fileio:seteof = @a1seteof + fileio:getmark = @a1getmark + fileio:setmark = @a1setmark fileio:iobufalloc = @a13iobufs fileio:open = @a1open fileio:close = @a1close diff --git a/src/makefile b/src/makefile index 25f289d..1b1914f 100755 --- a/src/makefile +++ b/src/makefile @@ -11,7 +11,7 @@ PLVMJIT03 = rel/apple/SOS.INTERPJIT\#050000 SOSCMD = rel/apple/SOS.CMD\#FE1000 SOSCMDJIT = rel/apple/SOS.CMDJIT\#FE1000 CMD = rel/apple/CMD\#061000 -CMDJIT = rel/apple/CMD128\#061000 +CMDJIT = rel/apple/CMD.128\#061000 PLVMZP_C64 = vmsrc/c64/plvmzp.inc PLVMC64 = rel/c64/PLASMA ED = rel/ED\#FE1000 diff --git a/src/mkrel b/src/mkrel index 0a015f5..e2114bd 100755 --- a/src/mkrel +++ b/src/mkrel @@ -3,7 +3,7 @@ make apple cp rel/apple/CMD#061000 prodos/CMD.BIN -cp rel/apple/CMD128#061000 prodos/CMD128.BIN +cp rel/apple/CMD.128#061000 prodos/CMD.128.BIN cp rel/apple/PLASMA.SYSTEM#FF2000 prodos/PLASMA.SYSTEM.SYS cp rel/apple/PLVM.128#FF2000 prodos/PLVM.128.SYS cp rel/apple/PLVM16#FF2000 prodos/PLVM16.SYS diff --git a/src/vmsrc/apple/cmdjit.pla b/src/vmsrc/apple/cmdjit.pla index 8bfc604..5fc1736 100755 --- a/src/vmsrc/apple/cmdjit.pla +++ b/src/vmsrc/apple/cmdjit.pla @@ -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 @@ -1406,7 +1406,7 @@ def docmds#0 word prefix loadmod(jitmod) // Cannot do this in init code - it will overwrite it! - xheap = $0400 // Reset heap to point at low memory + xheap = $0200 // Reset heap to point at low memory xheaptop = $A000 // Top below JITC prefix = pfxop(heap, GET_PFX) strcpy(getlnbuf, @cmdln) diff --git a/src/vmsrc/apple/plvm802.s b/src/vmsrc/apple/plvm802.s index 4f35016..562e4f9 100644 --- a/src/vmsrc/apple/plvm802.s +++ b/src/vmsrc/apple/plvm802.s @@ -228,6 +228,9 @@ RAMDONE ;CLI UNTIL I KNOW WHAT TO DO WITH THE UNENHANCED IIE LDA #"D" INY STA STRBUF,Y + LDA #"." + INY + STA STRBUF,Y LDA #"1" INY STA STRBUF,Y @@ -403,7 +406,7 @@ CMDENTRY = * ; LDA STRBUF SEC - SBC #$06 + SBC #$07 STA STRBUF JMP $2000 ; JUMP TO LOADED SYSTEM COMMAND ; diff --git a/src/vmsrc/apple/plvmjit02.s b/src/vmsrc/apple/plvmjit02.s index 09555d6..ce6a85d 100755 --- a/src/vmsrc/apple/plvmjit02.s +++ b/src/vmsrc/apple/plvmjit02.s @@ -173,6 +173,9 @@ RAMDONE ;CLI UNTIL I KNOW WHAT TO DO WITH THE UNENHANCED IIE LDA #"D" INY STA STRBUF,Y + LDA #"." + INY + STA STRBUF,Y LDA #"1" INY STA STRBUF,Y @@ -330,7 +333,7 @@ CMDENTRY = * ; LDA STRBUF SEC - SBC #$06 + SBC #$07 STA STRBUF JMP $2000 ; JUMP TO LOADED SYSTEM COMMAND ;