diff --git a/images/apple/DRAWL.po b/images/apple/DRAWL.po index 5bfe03e..560e432 100644 Binary files a/images/apple/DRAWL.po and b/images/apple/DRAWL.po differ diff --git a/images/apple/PLFORTH.PO b/images/apple/PLFORTH.PO index a6a1a8f..f8ba885 100644 Binary files a/images/apple/PLFORTH.PO and b/images/apple/PLFORTH.PO differ diff --git a/src/mklisp b/src/mklisp index 4f29ab9..bb0afba 100755 --- a/src/mklisp +++ b/src/mklisp @@ -7,9 +7,9 @@ cat rel/apple/CMD#061000 | java -jar ac.jar -p $PO_IMAGE CMD BIN $10 cat rel/apple/CMD.128#061000 | java -jar ac.jar -p $PO_IMAGE CMD.128 BIN $1000 cat rel/apple/PLASMA.SYSTEM#FF2000 | java -jar ac.jar -p $PO_IMAGE PLASMA.SYSTEM SYS cat rel/apple/PLVM.128#FF2000 | java -jar ac.jar -p $PO_IMAGE PLVM.128 SYS -cat rel/apple/PLVM16#FF2000 | java -jar ac.jar -p $PO_IMAGE PLVM16 SYS +#cat rel/apple/PLVM16#FF2000 | java -jar ac.jar -p $PO_IMAGE PLVM16 SYS cat rel/apple/JIT#FE1000 | java -jar ac.jar -p $PO_IMAGE sys/JIT REL -cat rel/apple/JIT16#FE1000 | java -jar ac.jar -p $PO_IMAGE sys/JIT16 REL +#cat rel/apple/JIT16#FE1000 | java -jar ac.jar -p $PO_IMAGE sys/JIT16 REL cat rel/apple/FILEIO#FE1000 | java -jar ac.jar -p $PO_IMAGE sys/FILEIO REL cat rel/apple/CONIO#FE1000 | java -jar ac.jar -p $PO_IMAGE sys/CONIO REL cat rel/apple/VBLANK#FE1000 | java -jar ac.jar -p $PO_IMAGE sys/VBLANK REL @@ -38,3 +38,4 @@ cat lisp/prog.lisp | java -jar ac.jar -ptx $PO_IMAGE lisp/PROG.L cat lisp/lores.lisp | java -jar ac.jar -ptx $PO_IMAGE lisp/LORES.LISP TXT cat lisp/defun.lisp | java -jar ac.jar -ptx $PO_IMAGE lisp/DEFUN.LISP TXT cat lisp/rod.lisp | java -jar ac.jar -ptx $PO_IMAGE lisp/ROD.LISP TXT +echo "P LISP" | java -jar ac.jar -ptx $PO_IMAGE AUTORUN TXT diff --git a/src/toolsrc/plforth.pla b/src/toolsrc/plforth.pla index ee602e6..a193475 100644 --- a/src/toolsrc/plforth.pla +++ b/src/toolsrc/plforth.pla @@ -513,18 +513,14 @@ asm _cfa_(dentry)#1 LDY #$06 + LDA ESTKL,X STA ESTKH-1,X - LDA (ESTKH-1,X) + TYA CLC + ADC (ESTKH-1,X) ADC ESTKL,X STA ESTKL,X BCC + INC ESTKH,X CLC -+ TYA - ADC ESTKL,X - STA ESTKL,X - BCC + - INC ESTKH,X + RTS end //def hashname(chars, len)#1 @@ -689,6 +685,9 @@ def find(matchchars, matchlen)#1 word dentry byte i + for i = 0 to matchlen-1 + ^(matchchars + i) = toupper(^(matchchars + i)) + next dentry = hashtbl[hashname(matchchars, matchlen)] matchchars-- while dentry @@ -1036,11 +1035,15 @@ def _latest_#1 end def newdict#0 word plist, namechars, namelen + byte i namechars, namelen = nextword(' ') plist = latest latest = heapalloc(namelen + 8) - memcpy(latest + 1, namechars, namelen) + for i = 0 to namelen-1 + ^(latest + i + 1) = toupper(^(namechars + i)) + next + //memcpy(latest + 1, namechars, namelen) ^latest = namelen ^_ffa_(latest) = 0 *_lfa_(latest) = plist