Working Apple 3 again

src/vmsrc/apple/plvm03.s

@@ -74,7 +74,7 @@ SEGSTART        =       $2000
         STA     PPH
         STA     IFPH
         !IF     1 {
-        LDA     #<VMCORE        ; COPY VM+CMD INTO SBANK
+        LDA     #<VMCORE        ; COPY VM+SYS INTO SBANK
         STA     SRCL
         LDA     #>VMCORE
         STA     SRCH

src/vmsrc/apple/soscmd.pla

@@ -3,16 +3,6 @@ byte console[]    = ".CONSOLE"
 byte textmode[]   = 16, 0, 15
 byte prefix[64] = ""
 //
-// Utility functions
-//
-asm saveX#0
-        STX     XREG+1
-end
-asm restoreX#0
-XREG    LDX     #$00
-        RTS
-end
-//
 // SOS routines
 // FILE I/O
 //
@@ -225,6 +215,7 @@ def shell#0
     //
     cmdptr   = heapmark
     ^cmdptr  = 0
+    puts("MEM:$"); puth(heapavail); putln
     autorun  = cmdsys:sysopen("AUTORUN")
     if autorun > 0
         ^cmdptr = cmdsys:sysread(autorun, cmdptr + 1, 64)
@@ -263,11 +254,8 @@ def shell#0
                     volumes
                     break
                 is '+'
-                    saveX
                     cmdsys:modexec(striptrail(cmdptr))
-                    restoreX
-                    cmdsys:sysclose(0)
-                    init_cons
+                    cmdsys:syswrite(cmdsys.refcons, @textmode, 3)
                     break
                 otherwise
                     puts("?\n")
@@ -294,7 +282,6 @@ init_cons
 // Print PLASMA version
 //
 puts("PLASMA 2.0 Dev\n")//; putb(version.1); putc('.'); putb(version.0); putln
-puts("MEM:$"); puth(heapavail); putln
 //
 // Save pointer to command line handler
 //

src/vmsrc/apple/sossys.pla

@@ -1202,11 +1202,11 @@ def execmod(modfile)#1
                 modid--
                 seg_release(modseg[modid])
             loop
+            xpokeb(symtbl.0, lastsym, 0)
+            systemflags = saveflags
         else
             modid = 0
         fin
-        xpokeb(symtbl.0, lastsym, 0)
-        systemflags = saveflags
     fin
     return -perr
 end