Update Version 2.0.md

plvm putb support

LICENSE.md

@@ -1,157 +1,21 @@
-### GNU LESSER GENERAL PUBLIC LICENSE
+MIT License
 
-Version 3, 29 June 2007
+Copyright (c) 2010-2022 David Schmenk
 
-Copyright (C) 2007 Free Software Foundation, Inc.
-<https://fsf.org/>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-This version of the GNU Lesser General Public License incorporates the
-terms and conditions of version 3 of the GNU General Public License,
-supplemented by the additional permissions listed below.
-
-#### 0. Additional Definitions.
-
-As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the
-GNU General Public License.
-
-"The Library" refers to a covered work governed by this License, other
-than an Application or a Combined Work as defined below.
-
-An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-#### 1. Exception to Section 3 of the GNU GPL.
-
-You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-#### 2. Conveying Modified Versions.
-
-If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
--   a) under this License, provided that you make a good faith effort
-    to ensure that, in the event an Application does not supply the
-    function or data, the facility still operates, and performs
-    whatever part of its purpose remains meaningful, or
--   b) under the GNU GPL, with none of the additional permissions of
-    this License applicable to that copy.
-
-#### 3. Object Code Incorporating Material from Library Header Files.
-
-The object code form of an Application may incorporate material from a
-header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
--   a) Give prominent notice with each copy of the object code that
-    the Library is used in it and that the Library and its use are
-    covered by this License.
--   b) Accompany the object code with a copy of the GNU GPL and this
-    license document.
-
-#### 4. Combined Works.
-
-You may convey a Combined Work under terms of your choice that, taken
-together, effectively do not restrict modification of the portions of
-the Library contained in the Combined Work and reverse engineering for
-debugging such modifications, if you also do each of the following:
-
--   a) Give prominent notice with each copy of the Combined Work that
-    the Library is used in it and that the Library and its use are
-    covered by this License.
--   b) Accompany the Combined Work with a copy of the GNU GPL and this
-    license document.
--   c) For a Combined Work that displays copyright notices during
-    execution, include the copyright notice for the Library among
-    these notices, as well as a reference directing the user to the
-    copies of the GNU GPL and this license document.
--   d) Do one of the following:
-    -   0) Convey the Minimal Corresponding Source under the terms of
-        this License, and the Corresponding Application Code in a form
-        suitable for, and under terms that permit, the user to
-        recombine or relink the Application with a modified version of
-        the Linked Version to produce a modified Combined Work, in the
-        manner specified by section 6 of the GNU GPL for conveying
-        Corresponding Source.
-    -   1) Use a suitable shared library mechanism for linking with
-        the Library. A suitable mechanism is one that (a) uses at run
-        time a copy of the Library already present on the user's
-        computer system, and (b) will operate properly with a modified
-        version of the Library that is interface-compatible with the
-        Linked Version.
--   e) Provide Installation Information, but only if you would
-    otherwise be required to provide such information under section 6
-    of the GNU GPL, and only to the extent that such information is
-    necessary to install and execute a modified version of the
-    Combined Work produced by recombining or relinking the Application
-    with a modified version of the Linked Version. (If you use option
-    4d0, the Installation Information must accompany the Minimal
-    Corresponding Source and Corresponding Application Code. If you
-    use option 4d1, you must provide the Installation Information in
-    the manner specified by section 6 of the GNU GPL for conveying
-    Corresponding Source.)
-
-#### 5. Combined Libraries.
-
-You may place library facilities that are a work based on the Library
-side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
--   a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities, conveyed under the terms of this License.
--   b) Give prominent notice with the combined library that part of it
-    is a work based on the Library, and explaining where to find the
-    accompanying uncombined form of the same work.
-
-#### 6. Revised Versions of the GNU Lesser General Public License.
-
-The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-as you received it specifies that a certain numbered version of the
-GNU Lesser General Public License "or any later version" applies to
-it, you have the option of following the terms and conditions either
-of that published version or of any later version published by the
-Free Software Foundation. If the Library as you received it does not
-specify a version number of the GNU Lesser General Public License, you
-may choose any version of the GNU Lesser General Public License ever
-published by the Free Software Foundation.
-
-If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

doc/Version 2.0.md

@@ -1,20 +1,20 @@
-# PLASMA Version 2.0 Alpha 1
+# PLASMA Version 2.0 Alpha 2
 
 Welcome to PLASMA: the Grand Unifying Platform for the Apple 1, ][, and ///.
 
 Download the five disk images:
 
-[PLASMA 2.0 Alpha1 800K Full System](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2.2mg?raw=true)
+[PLASMA 2.0 Alpha2 800K Full System](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2.2mg?raw=true)
 
-[PLASMA 2.0 Alpha1 System and ProDOS Boot](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2-SYS.PO?raw=true)
+[PLASMA 2.0 Alpha2 System and ProDOS Boot](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2-SYS.PO?raw=true)
 
-[PLASMA 2.0 Alpha1 Build Tools](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2-BLD.PO?raw=true)
+[PLASMA 2.0 Alpha2 Build Tools](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2-BLD.PO?raw=true)
 
-[PLASMA 2.0 Alpha1 Demos](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2-DEM.PO?raw=true)
+[PLASMA 2.0 Alpha2 Demos](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2-DEM.PO?raw=true)
 
-[PLASMA 2.0 Alpha1 TCP/IP network modules](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2-INET.PO?raw=true)
+[PLASMA 2.0 Alpha2 TCP/IP network modules](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2-INET.PO?raw=true)
 
-[PLASMA 2.0 Alpha1 Apple /// SOS Mame Boot and SANE floating point modules](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2-FPSOS.PO?raw=true)
+[PLASMA 2.0 Alpha2 Apple /// SOS Mame Boot and SANE floating point modules](https://github.com/dschmenk/PLASMA/blob/master/images/apple/PLASMA2-FPSOS.PO?raw=true)
 
 [PLASMA 2.0 Alpha1 Apple /// Mame hard disk image](https://github.com/dschmenk/PLASMA/blob/master/images/apple/apple3.hd?raw=true)
 
@@ -118,6 +118,14 @@ There is a [YouTube playlist](https://www.youtube.com/playlist?list=PLlPKgUMQbJ7
 
 - The documentation is sparse and incomplete. Yep, could use your help...
 
+# Changes in PLASMA for 2.0 Alpha 2
+
+1. Self hosted compiler fixes for invalid array size constants
+
+2. Ensure IDs in self hosted compiler are 31 characters significant
+
+3. Fix bug COPY file parsing and move common routine into MATCHFILES
+
 # Changes in PLASMA for 2.0 Alpha 1
 
 1. Improved entry/exit for 128K Apple IIe //c

src/inc/matchfiles.plh

@@ -2,4 +2,5 @@ import matchfiles
     predef matchName(src, exp)#1
     predef matchList(pathptr, exp)#2
     predef isWildName(exp)#1
+    predef fileFromPath(filestr, pathstr)#0
 end

src/libsrc/apple/matchfiles.pla

@@ -15,7 +15,7 @@ def matchNext(src, srcofst, exp, expofst)
                     return TRUE
                 fin
             is '?' // Single char wildcard
-                if ^src >= srcofst 
+                if ^src >= srcofst
                     return matchNext(src, srcofst + 1, exp, expofst + 1)
                 fin
                 return FALSE
@@ -103,7 +103,7 @@ end
 //
 export def isWildName(exp)#1
     byte i
-    
+
     if ^exp
         for i = 1 to ^exp
             if exp->[i] == '*' or exp->[i] == '?'
@@ -113,5 +113,18 @@ export def isWildName(exp)#1
     fin
     return FALSE
 end
+//
+// Utility routine to separate filename from path
+//
+export def fileFromPath(filestr, pathstr)#0
+    byte i
+
+    for i = ^pathstr downto 1
+        if pathstr->[i] == '/'
+            break
+        fin
+    next
+    ^filestr = ^pathstr - i
+    memcpy(filestr + 1, pathstr + 1 + i, ^filestr)
+end
 done
-                

src/makefile

@@ -76,6 +76,7 @@ ROGUE      = rel/ROGUE\#FE1000
 ROGUEMAP   = rel/ROGUEMAP\#FE1000
 ROGUECOMBAT= rel/ROGUECOMBAT\#FE1000
 MON        = rel/apple/MON\#FE1000
+CONIOTST   = rel/apple/CONIOTST\#FE1000
 TILETEST   = rel/apple/TILETEST\#FE1000
 HGRTEST    = rel/apple/HGRTEST\#FE1000
 GRTEST     = rel/apple/GRTEST\#FE1000
@@ -109,11 +110,11 @@ 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) $(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) $(GRLIB) $(DGRLIB) $(GRTEST) $(DGRTEST) $(HGRTEST) $(FILEIO_APL) $(CONIO_APL) $(JOYBUZZ) $(PORTIO) $(SPIPORT) $(SDFAT) $(FATCAT) $(FATGET) $(FATPUT) $(FATWDSK) $(FATRDSK) $(INT32) $(INT32TEST) $(SANE) $(FPSTR) $(FPU) $(SANITY) $(LZ4) $(LZ4CAT) $(RPNCALC) $(SNDSEQ) $(PLAYSEQ)
+apple: $(PLVMZP_APL) $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVMJIT) $(PLVM802) $(PLVM03) $(PLVMJIT03) $(CMD) $(CMDJIT) $(JIT) $(JIT16) $(JITUNE) $(SOSCMD) $(SOSCMDJIT) $(PLASMAPLASM) $(CODEOPT) $(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) $(GRLIB) $(DGRLIB) $(GRTEST) $(DGRTEST) $(HGRTEST) $(FILEIO_APL) $(CONIO_APL) $(JOYBUZZ) $(PORTIO) $(SPIPORT) $(SDFAT) $(FATCAT) $(FATGET) $(FATPUT) $(FATWDSK) $(FATRDSK) $(INT32) $(INT32TEST) $(SANE) $(FPSTR) $(FPU) $(SANITY) $(LZ4) $(LZ4CAT) $(RPNCALC) $(SNDSEQ) $(PLAYSEQ) $(CONIOTST)
 
 	-rm vmsrc/plvmzp.inc
 
-c64: $(PLVMZP_C64) $(PLASM) $(PLVM) $(PLVMC64) 
+c64: $(PLVMZP_C64) $(PLASM) $(PLVM) $(PLVMC64)
 	-rm vmsrc/plvmzp.inc
 
 all: apple c64
@@ -287,6 +288,11 @@ hello:	samplesrc/hello.pla $(PLVM) $(PLASM)
 	./$(PLASM) -AMOW < samplesrc/hello.pla > samplesrc/hello.a
 	acme --setpc 4094 -o $(HELLO) samplesrc/hello.a
 	./$(PLVM) HELLO
+
+$(CONIOTST): samplesrc/coniotst.pla $(PLVM02) $(PLASM)
+	./$(PLASM) -AMOW < samplesrc/coniotst.pla > samplesrc/coniotst.a
+	acme --setpc 4094 -o $(CONIOTST) samplesrc/coniotst.a
+
 $(ROD): samplesrc/rod.pla $(PLVM02) $(PLASM)
 	./$(PLASM) -AMOW < samplesrc/rod.pla > samplesrc/rod.a
 	acme --setpc 4094 -o $(ROD) samplesrc/rod.a
@@ -479,11 +485,11 @@ $(MON): utilsrc/apple/mon.pla $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/mon.pla > utilsrc/apple/mon.a
 	acme --setpc 4094 -o $(MON) utilsrc/apple/mon.a
 
-$(COPY): utilsrc/apple/copy.pla $(PLASM)
+$(COPY): utilsrc/apple/copy.pla $(MATCHFILES) $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/copy.pla > utilsrc/apple/copy.a
 	acme --setpc 4094 -o $(COPY) utilsrc/apple/copy.a
 
-$(DEL): utilsrc/apple/del.pla $(PLASM)
+$(DEL): utilsrc/apple/del.pla $(MATCHFILES) $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/del.pla > utilsrc/apple/del.a
 	acme --setpc 4094 -o $(DEL) utilsrc/apple/del.a
 
@@ -491,7 +497,7 @@ $(REN): utilsrc/apple/ren.pla $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/ren.pla > utilsrc/apple/ren.a
 	acme --setpc 4094 -o $(REN) utilsrc/apple/ren.a
 
-$(CAT): utilsrc/apple/cat.pla $(PLASM)
+$(CAT): utilsrc/apple/cat.pla $(MATCHFILES) $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/cat.pla > utilsrc/apple/cat.a
 	acme --setpc 4094 -o $(CAT) utilsrc/apple/cat.a
 
@@ -522,5 +528,3 @@ $(JIT16): libsrc/apple/jit16.pla libsrc/jit16core.pla $(PLVMJIT) $(PLASM)
 $(JITUNE): utilsrc/apple/jitune.pla $(PLVMJIT) $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/jitune.pla > utilsrc/apple/jitune.a
 	acme --setpc 4094 -o $(JITUNE) utilsrc/apple/jitune.a
-
-

src/mkrel

@@ -125,11 +125,12 @@ cp ../sysfiles/ELEMS.CODE#060000  prodos/fpsos/sys/ELEMS.CODE.BIN
 
 rm -rf prodos/demos
 mkdir prodos/demos
-cp rel/INT32TEST#FE1000     prodos/demos/INT32TEST.REL
-cp rel/apple/ROD#FE1000     prodos/demos/ROD.REL
-cp rel/RPNCALC#FE1000       prodos/demos/RPNCALC.REL
-cp rel/LZ4CAT#FE1000        prodos/demos/LZ4CAT.REL
-cp rel/PRIMEGAP#FE1000      prodos/demos/PRIMEGAP.REL
+cp rel/INT32TEST#FE1000      prodos/demos/INT32TEST.REL
+cp rel/apple/CONIOTST#FE1000 prodos/demos/CONIOTST.REL
+cp rel/apple/ROD#FE1000      prodos/demos/ROD.REL
+cp rel/RPNCALC#FE1000        prodos/demos/RPNCALC.REL
+cp rel/LZ4CAT#FE1000         prodos/demos/LZ4CAT.REL
+cp rel/PRIMEGAP#FE1000       prodos/demos/PRIMEGAP.REL
 
 mkdir prodos/demos/rogue
 cp rel/ROGUE#FE1000        prodos/demos/rogue/ROGUE.REL
@@ -178,6 +179,7 @@ cp rel/CODEOPT#FE1000      prodos/bld/CODEOPT.REL
 mkdir prodos/bld/samples
 cp samplesrc/hello.pla     prodos/bld/samples/HELLO.PLA.TXT
 cp samplesrc/int32test.pla prodos/bld/samples/INT32TEST.PLA.TXT
+cp samplesrc/coniotst.pla  prodos/bld/samples/CONIOTST.PLA.TXT
 cp samplesrc/grtest.pla    prodos/bld/samples/GRTEST.PLA.TXT
 cp samplesrc/dgrtest.pla   prodos/bld/samples/DGRTEST.PLA.TXT
 cp samplesrc/hgrtest.pla   prodos/bld/samples/HGRTEST.PLA.TXT

src/mockingboard/cvtmid.py

@@ -8,7 +8,7 @@ optarg     = 1
 timescale  = 16.0 # Scale time to 16th of a second
 extperchan = 9    # Default to standard MIDI channel  10 for extra percussion
 if len(sys.argv) == 1:
-    print 'Usage:', sys.argv[0], '[-p extra_percussion_channel] [-t timescale] MIDI_file'
+    print('Usage:', sys.argv[0], '[-p extra_percussion_channel] [-t timescale] MIDI_file')
     sys.exit(0)
 # Parse optional arguments
 while optarg < (len(sys.argv) - 1):
@@ -45,15 +45,15 @@ for msg in mid:
             # Percussion
             #
             if vol > 0:
-                print '\t!BYTE\t${0:02X}, ${1:02X}, ${2:02X}\t; Percussion {3:d} Chan {4:d} Dur {5:d}'.format(deltatime, msg.note ^ 0x40, (lrchan << 7) | vol, msg.note, msg.channel + 1, vol)
+                print('\t!BYTE\t${0:02X}, ${1:02X}, ${2:02X}\t; Percussion {3:d} Chan {4:d} Dur {5:d}'.format(deltatime, msg.note ^ 0x40, (lrchan << 7) | vol, msg.note, msg.channel + 1, vol))
                 if extperchan == 9: # Play percussion on both channels if no extended percussion
-                    print '\t!BYTE\t${0:02X}, ${1:02X}, ${2:02X}\t; Percussion {3:d} Chan {4:d} Dur {5:d}'.format(0, msg.note ^ 0x40, vol, msg.note, msg.channel + 1, vol)
+                    print('\t!BYTE\t${0:02X}, ${1:02X}, ${2:02X}\t; Percussion {3:d} Chan {4:d} Dur {5:d}'.format(0, msg.note ^ 0x40, vol, msg.note, msg.channel + 1, vol))
                 eventtime = 0.0
         else:
             #
             # Note
             #
-            print '\t!BYTE\t${0:02X}, ${1:02X}, ${2:02X}\t; Note {3:d} Chan {4:d} Vol {5:d}'.format(deltatime, 0x80 | (octave << 4) | onote, (lrchan << 7) | vol, msg.note, msg.channel + 1, vol)
+            print('\t!BYTE\t${0:02X}, ${1:02X}, ${2:02X}\t; Note {3:d} Chan {4:d} Vol {5:d}'.format(deltatime, 0x80 | (octave << 4) | onote, (lrchan << 7) | vol, msg.note, msg.channel + 1, vol))
             eventtime = 0.0
     elif msg.type == 'set_tempo':
         pass
@@ -65,4 +65,4 @@ for msg in mid:
         pass
     elif msg.type == 'program_change':
         pass
-print '\t!BYTE\t${0:02X}, $00, $00'.format(int(eventtime + 0.5))
+print('\t!BYTE\t${0:02X}, $00, $00'.format(int(eventtime + 0.5)))

src/samplesrc/coniotst.pla

@@ -0,0 +1,31 @@
+// text screen
+include "inc/cmdsys.plh"
+include "inc/conio.plh"
+const SCR_PTR = $0400
+const SCR_SIZE = 1024
+
+byte[SCR_SIZE] ScrSave
+byte I
+word Name
+
+// save text screen
+memcpy(@ScrSave, SCR_PTR, SCR_SIZE)
+conio:home()
+for I=0 to 23
+  conio:gotoxy(I,I)
+  putc('A'+I)
+  putc(' ')
+  puti(I)
+next
+conio:gotoxy(10, 5)
+puts("What is your name")
+Name = gets('?'|$80)  // $BF
+conio:gotoxy(12, 7)
+puts("Nice to meet you, ")
+puts(Name)
+conio:gotoxy(16, 10)
+puts("Press any key ...")
+getc()
+conio:gotoxy(0, 5)
+memcpy(SCR_PTR, @ScrSave, SCR_SIZE)
+done

src/toolsrc/codegen.c

@@ -41,9 +41,9 @@ static t_opseq *pending_seq = 0;
 #define FIXUP_WORD    0x80
 int id_match(char *name, int len, char *id)
 {
+    if (len > ID_LEN) len = ID_LEN;
     if (len == id[0])
     {
-        if (len > 16) len = 16;
         while (len--)
         {
             if (toupper(name[len]) != id[1 + len])
@@ -83,7 +83,7 @@ int idglobal_lookup(char *name, int len)
 }
 int idconst_add(char *name, int len, int value)
 {
-    char c = name[len];
+    char c;
     if (consts > 1024)
     {
         printf("Constant count overflow\n");
@@ -99,11 +99,12 @@ int idconst_add(char *name, int len, int value)
         parse_error("global label already defined\n");
         return (0);
     }
+    if (len > ID_LEN) len = ID_LEN;
+    c = name[len];
     name[len] = '\0';
     emit_idconst(name, value);
     name[len] = c;
     idconst_name[consts][0] = len;
-    if (len > ID_LEN) len = ID_LEN;
     while (len--)
         idconst_name[consts][1 + len] = toupper(name[len]);
     idconst_value[consts] = value;
@@ -112,7 +113,7 @@ int idconst_add(char *name, int len, int value)
 }
 int idlocal_add(char *name, int len, int type, int size)
 {
-    char c = name[len];
+    char c;
     if (localsize > 255)
     {
         printf("Local variable size overflow\n");
@@ -128,11 +129,12 @@ int idlocal_add(char *name, int len, int type, int size)
         parse_error("local label already defined\n");
         return (0);
     }
+    if (len > ID_LEN) len = ID_LEN;
+    c = name[len];
     name[len] = '\0';
     emit_idlocal(name, localsize);
     name[len] = c;
     idlocal_name[locals][0] = len;
-    if (len > ID_LEN) len = ID_LEN;
     while (len--)
         idlocal_name[locals][1 + len] = toupper(name[len]);
     idlocal_type[locals]   = type | LOCAL_TYPE;
@@ -143,7 +145,6 @@ int idlocal_add(char *name, int len, int type, int size)
 }
 int idglobal_add(char *name, int len, int type, int size)
 {
-    char c = name[len];
     if (globals > 1024)
     {
         printf("Global variable count overflow\n");
@@ -159,10 +160,8 @@ int idglobal_add(char *name, int len, int type, int size)
         parse_error("global label already defined\n");
         return (0);
     }
-    name[len] = '\0';
-    name[len] = c;
-    idglobal_name[globals][0] = len;
     if (len > ID_LEN) len = ID_LEN;
+    idglobal_name[globals][0] = len;
     while (len--)
         idglobal_name[globals][1 + len] = toupper(name[len]);
     idglobal_type[globals] = type;
@@ -213,8 +212,8 @@ int idfunc_add(char *name, int len, int type, int tag)
         printf("Global variable count overflow\n");
         return (0);
     }
-    idglobal_name[globals][0] = len;
     if (len > ID_LEN) len = ID_LEN;
+    idglobal_name[globals][0] = len;
     while (len--)
         idglobal_name[globals][1 + len] = toupper(name[len]);
     idglobal_type[globals]  = type;
@@ -879,10 +878,10 @@ void emit_caseblock(int casecnt, int *caseof, int *casetag)
     if (casecnt < 1 || casecnt > 256)
         parse_error("Switch count under/overflow\n");
     emit_pending_seq();
-    printf("\t%s\t$%02lX\t\t\t; CASEBLOCK\n", DB, casecnt & 0xFF);
+    printf("\t%s\t$%02X\t\t\t; CASEBLOCK\n", DB, casecnt & 0xFF);
     for (i = 0; i < casecnt; i++)
     {
-        printf("\t%s\t$%04lX\n", DW, caseof[i] & 0xFFFF);
+        printf("\t%s\t$%04X\n", DW, caseof[i] & 0xFFFF);
         printf("\t%s\t_B%03d-*\n", DW, casetag[i]);
     }
 }

src/toolsrc/codegen.pla

@@ -449,6 +449,7 @@ end
 def idmatch(nameptr, len, idptr, idcnt)
     byte i
 
+    if len > ID_LEN; len = ID_LEN; fin
     while idcnt
         if len == idptr->idname
             i = 1; while i <= len and nameptr->[i - 1] == idptr->idname.[i]; i++; loop
@@ -516,6 +517,7 @@ def size_iddata(type, varsize, initsize)#0
 end
 def new_idglobal(nameptr, len, type, value, cparms, cvals)#0
     if idmatch(nameptr, len, idglobal_tbl, globals); exit_err(ERR_DUP|ERR_ID); fin
+    if len > ID_LEN; len = ID_LEN; fin
     lastglobal=>idval     = value
     lastglobal=>idtype    = type
     lastglobal->funcparms = cparms
@@ -588,6 +590,7 @@ def init_idglobal#0
 end
 def new_idlocal(nameptr, len, type, size)#0
     if idmatch(nameptr, len, @idlocal_tbl, locals); exit_err(ERR_DUP|ERR_ID); fin
+    if len > ID_LEN; len = ID_LEN; fin
     lastlocal=>idval  = framesize
     lastlocal=>idtype = type | LOCAL_TYPE
     nametostr(nameptr, len, lastlocal + idname)

src/toolsrc/ed.pla

@@ -1615,7 +1615,7 @@ def cmdmode#0
     word cmdptr, line
 
     clrscrn
-    puts("PLASMA Editor, Version 2.0 DALPHA1\n")
+    puts("PLASMA Editor, Version 2.0 ALPHA2\n")
     while not exit
         puts(@filename)
         cmdptr = gets($BA)

src/toolsrc/parse.c

@@ -558,7 +558,7 @@ t_opseq *parse_value(t_opseq *codeseq, int rvalue, int *stackdepth)
                 parse_error("Using BYTE value as a pointer");
             else
                 deref++;
-            type = (type & PTR_TYPE) | (scantoken == PTRB_TOKEN) ? BYTE_TYPE : WORD_TYPE; // Type override
+            type = (type & PTR_TYPE) | ((scantoken == PTRB_TOKEN) ? BYTE_TYPE : WORD_TYPE); // Type override
             if (!parse_const(&const_offset))
             {
                 /*

src/toolsrc/parse.pla

@@ -138,10 +138,13 @@ def parse_constval
         is ID_TKN
             size  = 2
             idptr = lookup_id(tknptr, tknlen)
-            type  = idptr=>idtype
+            if not idptr; exit_err(ERR_INVAL|ERR_CONST); fin
+            type = idptr=>idtype
             if type & (FUNC_TYPE|ADDR_TYPE)
                 if mod <> 8; exit_err(ERR_INVAL|ERR_CONST); fin
                 type = CONSTADDR_TYPE
+            elsif type <> CONST_TYPE
+                exit_err(ERR_INVAL|ERR_CONST)
             fin
             value = idptr=>idval
             break
@@ -1064,8 +1067,8 @@ def parse_struc#0
     scan
 end
 def parse_vars(type)
-    byte idlen, size, cfnparms, cfnvals
-    word value, idptr
+    byte idlen, cfnparms, cfnvals
+    word size, value, idptr
 
     when token
         is SYSFLAGS_TKN

src/toolsrc/plasm.pla

@@ -5,6 +5,7 @@ include "inc/longjmp.plh"
 //
 // Tokens
 //
+const ID_LEN            = 32
 const ID_TKN            = $D6 // V
 const CHR_TKN           = $C3 // C
 const INT_TKN           = $C9 // I
@@ -507,7 +508,7 @@ include "toolsrc/parse.pla"
 //
 // Look at command line arguments and compile module
 //
-puts("PLASMA Compiler, Version 2.0 ALPHA1\n")
+puts("PLASMA Compiler, Version 2.0 ALPHA2\n")
 arg = argNext(argFirst)
 if ^arg and ^(arg + 1) == '-'
     opt = arg + 2

src/utilsrc/apple/cat.pla

@@ -12,23 +12,6 @@ char[64] path, wildname
 res[t_fileinfo] fileinfo
 res[t_fileentry] fileentry
 //
-// Convert byte to two hex chars
-//
-def putb(b)#0
-    char h
-    
-    h = ((b >> 4) & $0F) + '0'
-    if h > '9'
-        h = h + 7
-    fin
-    putc(h)
-    h = (b & $0F) + '0'
-    if h > '9'
-        h = h + 7
-    fin
-    putc(h)
-end
-//
 // Copy string with upper case conversion
 //
 def struprcpy(dst, src)#0
@@ -46,23 +29,12 @@ def struprcpy(dst, src)#0
     fin
     ^dst = ^src
 end
-def filefrompath(filestr, pathstr)#0
-    byte i
-    
-    for i = ^pathstr downto 1
-        if pathstr->[i] == '/'
-            break
-        fin
-    next
-    ^filestr = ^pathstr - i
-    memcpy(filestr + 1, pathstr + 1 + i, ^filestr)
-end
 //
 // Print out a directory entry
 //
 def printentry(entryptr)#0
     char type, pad, eofstr[12]
-     
+
     puts(entryptr)
     when entryptr->entry_type
         is $0F // Is it a directory?
@@ -88,12 +60,12 @@ def printentry(entryptr)#0
     for pad = eofstr to 9
         putc(' ')
     next
-    puts(@eofstr)    
+    puts(@eofstr)
     putln
 end
 def printentries(pathstr, entries, num)#0
     byte page
-    
+
     puts(pathstr); putln
     puts("=NAME==========TYPE===AUX====LENGTH=\n")
     page = 20

src/utilsrc/apple/copy.pla

@@ -16,7 +16,7 @@ res[t_fileinfo] srcfileinfo, dstfileinfo
 //
 def pathcpy(dst, src)#0
     byte i, chr
-    
+
     if ^src
         for i = 1 to ^src
             chr = src->[i]
@@ -52,7 +52,7 @@ end
 def pathdiff(path1, path2)#1
     byte i, d
     char[64] abs1, abs2
-    
+
     abspath(@abs1, path1)
     abspath(@abs2, path2)
 
@@ -67,17 +67,6 @@ def pathdiff(path1, path2)#1
     next
     return FALSE
 end
-def filefrompath(filestr, pathstr)#0
-    byte i
-    
-    for i = ^pathstr + 1 downto 1
-        if pathstr->[i] == '/'
-            break
-        fin
-    next
-    ^filestr = ^pathstr - i
-    memcpy(filestr + 1, pathstr + 1 + i, ^filestr)
-end
 //
 // Check destination path
 //
@@ -108,14 +97,14 @@ def copyfiles(srcfile, dstfile)#0
     char[64] srcfilepath
     char[64] dstfilepath
     char[16] wildname
-    
+
     //
     // Check if copying a directory
     //
     strcpy(@srcpath, srcfile)
     wildname = 0
     if fileio:getfileinfo(@srcpath, @srcfileinfo) <> FILE_ERR_OK or (srcfileinfo.storage_type & $0D <> $0D)
-        filefrompath(@wildname, @srcpath)
+        fileFromPath(@wildname, @srcpath)
         srcpath = srcpath - wildname
     fin
     entrylist, entrycnt = matchList(@srcpath, @wildname)
@@ -186,7 +175,7 @@ def copyfiles(srcfile, dstfile)#0
                 puts(" ==> "); puts(@dstfilepath); putln
             fin
             entry = entry + t_fileentry
-            entrycnt--            
+            entrycnt--
         loop
         heaprelease(entrylist)
     fin

src/utilsrc/apple/del.pla

@@ -25,17 +25,6 @@ def struprcpy(dst, src)#0
     fin
     ^dst = ^src
 end
-def filefrompath(filestr, pathstr)#0
-    byte i
-    
-    for i = ^pathstr downto 1
-        if pathstr->[i] == '/'
-            break
-        fin
-    next
-    ^filestr = ^pathstr - i
-    memcpy(filestr + 1, pathstr + 1 + i, ^filestr)
-end
 //
 // Check filename
 //
@@ -81,9 +70,8 @@ def delfiles(delfile)#0
 
     strcpy(@delpath, delfile)
     wildname = 0
-    //if fileio:getfileinfo(@delpath, @fileinfo) <> FILE_ERR_OK or fileinfo.file_type <> $0F
     if delpath[delpath] <> '/'
-        filefrompath(@wildname, @delpath)
+        fileFromPath(@wildname, @delpath)
         delpath = delpath - wildname
     fin
     //
@@ -115,7 +103,7 @@ def delfiles(delfile)#0
                 fileio:destroy(@delfilepath)
             fin
             entry = entry + t_fileentry
-            entrycnt--            
+            entrycnt--
         loop
     elsif not wildname
         puts("Not found: "); puts(@delpath); puts("/"); puts(@wildname); putln
@@ -156,7 +144,7 @@ if not except(exit)
                 strcpy(@path,fileptr)
                 strcat(@path, "/")
                 delfiles(@path)
-            fin    
+            fin
             delfiles(fileptr)
             fileptr = fileptr + ^fileptr + 1
             filecnt--

src/utilsrc/apple/type.pla

@@ -8,23 +8,23 @@ var arg, type, aux
 //
 // Convert byte to two hex chars
 //
-def putb(b)#0
-    char h
-    
-    h = ((b >> 4) & $0F) + '0'
-    if h > '9'
-        h = h + 7
-    fin
-    putc(h)
-    h = (b & $0F) + '0'
-    if h > '9'
-        h = h + 7
-    fin
-    putc(h)
-end
+//def putb(b)#0
+//    char h
+//
+//    h = ((b >> 4) & $0F) + '0'
+//    if h > '9'
+//        h = h + 7
+//    fin
+//    putc(h)
+//    h = (b & $0F) + '0'
+//    if h > '9'
+//        h = h + 7
+//    fin
+//    putc(h)
+//end
 def htoi(hexptr)
     var val, i, n
-    
+
     val = 0
     for i = 1 to ^hexptr
         n = toupper(^(hexptr + i)) - '0'

src/vmsrc/apple/a1cmd.pla

@@ -52,7 +52,7 @@ byte perr, refauto
 // String pool.
 //
 byte autorun[]    = "AUTORUN"
-byte verstr[]     = "\nPLASMA ALPHA1"
+byte verstr[]     = "\nPLASMA ALPHA2"
 byte freestr[]    = "MEM FREE:$"
 byte errorstr[]   = "ERR:$"
 byte prompt[]     = "PLASMA"
@@ -911,7 +911,7 @@ end
 //
 def lookupextern(esd, index)#1
     word sym, addr
-    byte str[16]
+    byte str[33]
     while ^esd
         sym = esd
         esd = sym + dcitos(sym, @str)

src/vmsrc/apple/cmd.pla

@@ -946,7 +946,7 @@ end
 //
 def lookupextern(esd, index)#1
     word sym, addr
-    byte str[16]
+    byte str[33]
     sym = lookupidx(esd, index)
     if sym
         addr = lookuptbl(sym, symtbl)
@@ -1377,7 +1377,7 @@ heap = @lastdef
 //
 // Print PLASMA version
 //
-prstr("PLASMA 2.0 ALPHA1 64K\n")//; prbyte(version.1); cout('.'); prbyte(version.0); crout
+prstr("PLASMA 2.0 ALPHA2 64K\n")//; prbyte(version.1); cout('.'); prbyte(version.0); crout
 //
 // Init symbol table.
 //

src/vmsrc/apple/cmdjit.pla

@@ -988,7 +988,7 @@ end
 //
 def lookupextern(esd, index)#1
     word sym, addr
-    byte str[16]
+    byte str[33]
     sym = lookupidx(esd, index)
     if sym
         addr = lookuptbl(sym, symtbl)
@@ -1454,7 +1454,7 @@ heap = @lastdef
 //
 // Print PLASMA version
 //
-prstr("PLASMA 2.0 ALPHA1 128K\n")//; prbyte(version.1); cout('.'); prbyte(version.0); crout
+prstr("PLASMA 2.0 ALPHA2 128K\n")//; prbyte(version.1); cout('.'); prbyte(version.0); crout
 //
 // Init symbol table.
 //

src/vmsrc/apple/sossys.pla

@@ -1003,7 +1003,7 @@ end
 //
 def lookupextern(esd, index)#1
     word sym, addr
-    byte str[16]
+    byte str[33]
     sym = lookupidx(esd, index)
     if sym
         addr = lookuptbl(sym, symtbl)
@@ -1263,7 +1263,7 @@ cmdlnptr = @cmdln
 // Print PLASMA version
 //
 init_cons
-prstr("PLASMA 2.0 ALPHA1\n")//; putb(version.1); putc('.'); putb(version.0); putln
+prstr("PLASMA 2.0 ALPHA2\n")//; putb(version.1); putc('.'); putb(version.0); putln
 prstr("MEM:$"); prword(availheap); crout
 //
 // Exec command line parser

src/vmsrc/apple/sossysjit.pla

@@ -1014,7 +1014,7 @@ end
 //
 def lookupextern(esd, index)#1
     word sym, addr
-    byte str[16]
+    byte str[33]
     sym = lookupidx(esd, index)
     if sym
         addr = lookuptbl(sym, symtbl)
@@ -1286,7 +1286,7 @@ cmdlnptr = @cmdln
 // Print PLASMA version
 //
 init_cons
-prstr("PLASMA 2.0 ALPHA1 JITC\n")//; putb(version.1); putc('.'); putb(version.0); putln
+prstr("PLASMA 2.0 ALPHA2 JITC\n")//; putb(version.1); putc('.'); putb(version.0); putln
 prstr("MEM:$"); prword(availheap); crout
 //
 // Exec command line parser

src/vmsrc/c64/cmd.pla

@@ -712,7 +712,7 @@ end
 asm cout(c)#0
         LDA     ESTKL,X
         INX
-        JMP     $FFD2        
+        JMP     $FFD2
 end
 asm cin()#1
         DEX
@@ -839,7 +839,7 @@ end
 //
 def lookupextern(esd, index)#1
     word sym, addr
-    byte str[16]
+    byte str[33]
     while ^esd
         sym = esd
         esd = sym + dcitos(sym, @str)

src/vmsrc/plvm.c

@@ -509,6 +509,10 @@ void call(uword pc)
             mem_data[0x1FF] = i;
             PUSH(0x1FF);
             break;
+        case 9: // LIBRARY STDLIB::PUTB
+            i = UPOP;
+            printf("%02X", i);
+            break;
         case 10: // LIBRARY STDLIB::PUTH
             i = UPOP;
             printf("%04X", i);