diff --git a/README.md b/README.md
index a4e4db4..95f129f 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# 3/13/2018 PLASMA 1.1 Available!
-[Download and read the Release Notes](https://github.com/dschmenk/PLASMA/blob/master/doc/Version%201.1.md)
+# 4/29/2018 PLASMA 1.2 Available!
+[Download and read the Release Notes](https://github.com/dschmenk/PLASMA/blob/master/doc/Version%201.2.md)
# The PLASMA Programming Language
diff --git a/doc/Version 1.1.md b/doc/Version 1.2.md
similarity index 96%
rename from doc/Version 1.1.md
rename to doc/Version 1.2.md
index 2ea7ca2..2716022 100644
--- a/doc/Version 1.1.md
+++ b/doc/Version 1.2.md
@@ -1,16 +1,16 @@
-# PLASMA Version 1.1
+# PLASMA Version 1.2
Welcome to PLASMA: the Grand Unifying Platform for the Apple 1, ][, and ///.
Download the four disk images (three if you don't plan to boot an Apple ///):
-[PLASMA 1.1 System and ProDOS Boot](https://github.com/dschmenk/PLASMA/blob/ver-1/PLASMA-SYS1.PO?raw=true)
+[PLASMA 1.2 System and ProDOS Boot](https://github.com/dschmenk/PLASMA/blob/ver-1/PLASMA-SYS1.PO?raw=true)
-[PLASMA 1.1 Build Tools](https://github.com/dschmenk/PLASMA/blob/ver-1/PLASMA-BLD1.PO?raw=true)
+[PLASMA 1.2 Build Tools](https://github.com/dschmenk/PLASMA/blob/ver-1/PLASMA-BLD1.PO?raw=true)
-[PLASMA 1.1 Demos](https://github.com/dschmenk/PLASMA/blob/ver-1/PLASMA-DEM1.PO?raw=true)
+[PLASMA 1.2 Demos](https://github.com/dschmenk/PLASMA/blob/ver-1/PLASMA-DEM1.PO?raw=true)
-[PLASMA 1.1 Apple /// SOS Boot ](https://github.com/dschmenk/PLASMA/blob/ver-1/PLASMA-SOS1.PO?raw=true)
+[PLASMA 1.2 Apple /// SOS Boot ](https://github.com/dschmenk/PLASMA/blob/ver-1/PLASMA-SOS1.PO?raw=true)
PLASMA can be run from floppies, System in Drive 1, and Build or Demos in Drive 2. Mass storage is the recommended installation that looks like (replacing HARDISK with your volume name of choice):
@@ -98,6 +98,16 @@ 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 1.2
+
+1. Add TFTPD TFTP server
+
+2. Fix Uthernet 1 driver
+
+3. Add mouse module
+
+4. Fix IRQ issues for interrupt driven mouse driver
+
# Changes in PLASMA for 1.1
1. All known bugs are fixed
diff --git a/src/samplesrc/tftpd.pla b/src/samplesrc/tftpd.pla
index ea0746c..f73c113 100644
--- a/src/samplesrc/tftpd.pla
+++ b/src/samplesrc/tftpd.pla
@@ -191,7 +191,7 @@ def readUDP(ipsrc, portsrc, data, len, param)
fin
if param == 512 // Size of initial read
param = fileio:read(ref, buff+datBytes, 512)
- if netscii
+ if type == $04 // TXT type
xlat($0D, $0A, buff+datBytes, param)
fin
block++
@@ -228,7 +228,7 @@ def writeUDP(ipsrc, portsrc, data, len, param)
break
fin
len = len - t_datPkt
- if netscii
+ if type == $04 // TXT type
xlat($0A, $0D, data+datBytes, len)
fin
if fileio:write(ref, data+datBytes, len) <> len
@@ -259,6 +259,8 @@ def writeUDP(ipsrc, portsrc, data, len, param)
return 0
end
def servUDP(ipsrc, portsrc, data, len, param)
+ byte info[24]
+
when *data
is RRQ // Read request
//
@@ -284,12 +286,16 @@ def servUDP(ipsrc, portsrc, data, len, param)
iNet:sendUDP(portTFTP, ipsrc, portsrc, @tftpError, t_errPkt)
return 0
fin
+ info.0 = $0A
+ info:1 = @filename
+ syscall($C4, @info)
+ type = info.4
puts("Reading file: "); puts(@filename); putln
TID = (TID + TID_INC) | $1000
block = 1
buff=>datBlock = swab(block)
len = fileio:read(ref, buff+datBytes, 512)
- if netscii
+ if type == $04 // TXT type
xlat($0D, $0A, buff+datBytes, 512)
fin
portTID = iNet:openUDP(TID, @readUDP, len)
diff --git a/src/tftpbld b/src/tftpbld
index c240e46..4acd1b0 100755
--- a/src/tftpbld
+++ b/src/tftpbld
@@ -1,32 +1,33 @@
#!/bin/bash
# Build tools
-echo "BLD/PLASM"; atftp $1 --put -l rel/PLASM#FE1000 -r $2/BLD/PLASM#FE1000
+echo "BLD/PLASM"; atftp $1 --put -l rel/PLASM#FE1000 -r $2/BLD/PLASM#FE1000
echo "BLD/CODEOPT"; atftp $1 --put -l rel/CODEOPT#FE1000 -r $2/BLD/CODEOPT#FE1000
#Build incs
-echo "BLD/INC/ARGS.PLH"; atftp $1 --option "mode netascii" --put -l inc/args.plh -r $2/BLD/INC/ARGS.PLH#040000
-echo "BLD/INC/CMDSYS.PLH"; atftp $1 --option "mode netascii" --put -l inc/cmdsys.plh -r $2/BLD/INC/CMDSYS.PLH#040000
-echo "BLD/INC/CONIO.PLH"; atftp $1 --option "mode netascii" --put -l inc/conio.plh -r $2/BLD/INC/CONIO.PLH#040000
-echo "BLD/INC/DGR.PLH"; atftp $1 --option "mode netascii" --put -l inc/dgr.plh -r $2/BLD/INC/DGR.PLH#040000
-echo "BLD/INC/FIBER.PLH"; atftp $1 --option "mode netascii" --put -l inc/fiber.plh -r $2/BLD/INC/FIBER.PLH#040000
-echo "BLD/INC/FILEIO.PLH"; atftp $1 --option "mode netascii" --put -l inc/fileio.plh -r $2/BLD/INC/FILEIO.PLH#040000
-echo "BLD/INC/FPSTR.PLH"; atftp $1 --option "mode netascii" --put -l inc/fpstr.plh -r $2/BLD/INC/FPSTR.PLH#040000
-echo "BLD/INC/FPU.PLH"; atftp $1 --option "mode netascii" --put -l inc/fpu.plh -r $2/BLD/INC/FPU.PLH#040000
-echo "BLD/INC/GRAFIX.PLH"; atftp $1 --option "mode netascii" --put -l inc/grafix.plh -r $2/BLD/INC/GRAFIX.PLH#040000
-echo "BLD/INC/INET.PLH"; atftp $1 --option "mode netascii" --put -l inc/inet.plh -r $2/BLD/INC/INET.PLH#040000
-echo "BLD/INC/JOYBUZZ.PLH"; atftp $1 --option "mode netascii" --put -l inc/joybuzz.plh -r $2/BLD/INC/JOYBUZZ.PLH#040000
-echo "BLD/INC/LONGJUMP.PLH"; atftp $1 --option "mode netascii" --put -l inc/longjmp.plh -r $2/BLD/INC/LONGJUMP.PLH#040000
-echo "BLD/INC/LZ4.PLH"; atftp $1 --option "mode netascii" --put -l inc/lz4.plh -r $2/BLD/INC/LZ4.PLH#040000
-echo "BLD/INC/MEMMGR.PLH"; atftp $1 --option "mode netascii" --put -l inc/memmgr.plh -r $2/BLD/INC/MEMMGR.PLH#040000
-echo "BLD/INC/MOUSE.PLH"; atftp $1 --option "mode netascii" --put -l inc/mouse.plh -r $2/BLD/INC/MOUSE.PLH#040000
-echo "BLD/INC/PORTIO.PLH"; atftp $1 --option "mode netascii" --put -l inc/portio.plh -r $2/BLD/INC/PORTIO.PLH#040000
-echo "BLD/INC/SANE.PLH"; atftp $1 --option "mode netascii" --put -l inc/sane.plh -r $2/BLD/INC/SANE.PLH#040000
-echo "BLD/INC/SDFAT.PLH"; atftp $1 --option "mode netascii" --put -l inc/sdfat.plh -r $2/BLD/INC/SDFAT.PLH#040000
-echo "BLD/INC/SNDSEQ.PLH"; atftp $1 --option "mode netascii" --put -l inc/sndseq.plh -r $2/BLD/INC/SNDSEQ.PLH#040000
-echo "BLD/INC/SPIPORT.PLH"; atftp $1 --option "mode netascii" --put -l inc/spiport.plh -r $2/BLD/INC/SPIPORT.PLH#040000
-echo "BLD/INC/TESTLIB.PLH"; atftp $1 --option "mode netascii" --put -l inc/testlib.plh -r $2/BLD/INC/TESTLIB.PLH#040000
+echo "BLD/INC/ARGS.PLH"; atftp $1 --put -l inc/args.plh -r $2/BLD/INC/ARGS.PLH#040000
+echo "BLD/INC/CMDSYS.PLH"; atftp $1 --put -l inc/cmdsys.plh -r $2/BLD/INC/CMDSYS.PLH#040000
+echo "BLD/INC/CONIO.PLH"; atftp $1 --put -l inc/conio.plh -r $2/BLD/INC/CONIO.PLH#040000
+echo "BLD/INC/DGR.PLH"; atftp $1 --put -l inc/dgr.plh -r $2/BLD/INC/DGR.PLH#040000
+echo "BLD/INC/FIBER.PLH"; atftp $1 --put -l inc/fiber.plh -r $2/BLD/INC/FIBER.PLH#040000
+echo "BLD/INC/FILEIO.PLH"; atftp $1 --put -l inc/fileio.plh -r $2/BLD/INC/FILEIO.PLH#040000
+echo "BLD/INC/FPSTR.PLH"; atftp $1 --put -l inc/fpstr.plh -r $2/BLD/INC/FPSTR.PLH#040000
+echo "BLD/INC/FPU.PLH"; atftp $1 --put -l inc/fpu.plh -r $2/BLD/INC/FPU.PLH#040000
+echo "BLD/INC/GRAFIX.PLH"; atftp $1 --put -l inc/grafix.plh -r $2/BLD/INC/GRAFIX.PLH#040000
+echo "BLD/INC/INET.PLH"; atftp $1 --put -l inc/inet.plh -r $2/BLD/INC/INET.PLH#040000
+echo "BLD/INC/JOYBUZZ.PLH"; atftp $1 --put -l inc/joybuzz.plh -r $2/BLD/INC/JOYBUZZ.PLH#040000
+echo "BLD/INC/LONGJUMP.PLH"; atftp $1 --put -l inc/longjmp.plh -r $2/BLD/INC/LONGJUMP.PLH#040000
+echo "BLD/INC/LZ4.PLH"; atftp $1 --put -l inc/lz4.plh -r $2/BLD/INC/LZ4.PLH#040000
+echo "BLD/INC/MEMMGR.PLH"; atftp $1 --put -l inc/memmgr.plh -r $2/BLD/INC/MEMMGR.PLH#040000
+echo "BLD/INC/MOUSE.PLH"; atftp $1 --put -l inc/mouse.plh -r $2/BLD/INC/MOUSE.PLH#040000
+echo "BLD/INC/PORTIO.PLH"; atftp $1 --put -l inc/portio.plh -r $2/BLD/INC/PORTIO.PLH#040000
+echo "BLD/INC/SANE.PLH"; atftp $1 --put -l inc/sane.plh -r $2/BLD/INC/SANE.PLH#040000
+echo "BLD/INC/SDFAT.PLH"; atftp $1 --put -l inc/sdfat.plh -r $2/BLD/INC/SDFAT.PLH#040000
+echo "BLD/INC/SNDSEQ.PLH"; atftp $1 --put -l inc/sndseq.plh -r $2/BLD/INC/SNDSEQ.PLH#040000
+echo "BLD/INC/SPIPORT.PLH"; atftp $1 --put -l inc/spiport.plh -r $2/BLD/INC/SPIPORT.PLH#040000
+echo "BLD/INC/TESTLIB.PLH"; atftp $1 --put -l inc/testlib.plh -r $2/BLD/INC/TESTLIB.PLH#040000
# Sample source
-echo "BLD/MOUSETEST.PLA"; atftp $1 --option "mode netascii" --put -l samplesrc/mousetest.pla -r $2/BLD/MOUSETEST.PLA#040000
-echo "BLD/HTTPD.PLA"; atftp $1 --option "mode netascii" --put -l samplesrc/httpd.pla -r $2/BLD/HTTPD.PLA#040000
+echo "BLD/MOUSETEST.PLA"; atftp $1 --put -l samplesrc/mousetest.pla -r $2/BLD/MOUSETEST.PLA#040000
+echo "BLD/HTTPD.PLA"; atftp $1 --put -l samplesrc/httpd.pla -r $2/BLD/HTTPD.PLA#040000
+echo "BLD/LZ4CAT.PLA"; atftp $1 --put -l samplesrc/lz4cat.pla -r $2/BLD/LZ4CAT.PLA#040000
diff --git a/src/vmsrc/plvm.c b/src/vmsrc/plvm.c
index 64a3764..c636fab 100755
--- a/src/vmsrc/plvm.c
+++ b/src/vmsrc/plvm.c
@@ -526,7 +526,7 @@ void call(uword pc)
*
OPTBL DW CN,CN,CN,CN,CN,CN,CN,CN ; 00 02 04 06 08 0A 0C 0E
DW CN,CN,CN,CN,CN,CN,CN,CN ; 10 12 14 16 18 1A 1C 1E
- DW MINUS1,NEXTOP,NEXTOP,LA,LLA,CB,CW,CS ; 20 22 24 26 28 2A 2C 2E
+ DW MINUS1,BREQ,BRNE,LA,LLA,CB,CW,CS ; 20 22 24 26 28 2A 2C 2E
DW DROP,DROP2,DUP,DIVMOD,ADDI,SUBI,ANDI,ORI ; 30 32 34 36 38 3A 3C 3E
DW ISEQ,ISNE,ISGT,ISLT,ISGE,ISLE,BRFLS,BRTRU ; 40 42 44 46 48 4A 4C 4E
DW BRNCH,SEL,CALL,ICAL,ENTER,LEAVE,RET,CFFB ; 50 52 54 56 58 5A 5C 5E
@@ -535,10 +535,11 @@ OPTBL DW CN,CN,CN,CN,CN,CN,CN,CN ; 00 02 04 06
DW LNOT,ADD,SUB,MUL,DIV,MOD,INCR,DECR ; 80 82 84 86 88 8A 8C 8E
DW NEG,COMP,BAND,IOR,XOR,SHL,SHR,IDXW ; 90 92 94 96 98 9A 9C 9E
DW BRGT,BRLT,INCBRLE,ADDBRLE,DECBRGE,SUBBRGE,BRAND,BROR ; A0 A2 A4 A6 A8 AA AC AE
+ DW ADDLB,ADDLW,ADDAB,ADDAW,IDXLB,IDXLW,IDXAB,IDXAW ; B0 B2 B4 B6 B8 BA BC BE
*/
void interp(code *ip)
{
- int val, ea, frmsz, parmcnt, nybble;
+ int val, ea, frmsz, parmcnt;
code *previp = ip;
while (1)
@@ -558,7 +559,6 @@ void interp(code *ip)
printf("]\n");
gets(cmdline);
}
- nybble = 15;
previp = ip;
switch (*ip++)
{
@@ -566,53 +566,42 @@ void interp(code *ip)
* 0x00-0x1F
*/
case 0x00:
- nybble--;
case 0x02:
- nybble--;
case 0x04:
- nybble--;
case 0x06:
- nybble--;
case 0x08:
- nybble--;
case 0x0A:
- nybble--;
case 0x0C:
- nybble--;
case 0x0E:
- nybble--;
case 0x10:
- nybble--;
case 0x12:
- nybble--;
case 0x14:
- nybble--;
case 0x16:
- nybble--;
case 0x18:
- nybble--;
case 0x1A:
- nybble--;
case 0x1C:
- nybble--;
case 0x1E:
- PUSH(nybble);
+ PUSH(*previp/2);
break;
/*
* 0x20-0x2F
*/
- case 0x20: // NOT : TOS = !TOS
- TOS = !TOS;
+ case 0x20: // MINUS 1 : TOS = -1
+ PUSH(-1);
break;
- case 0x22: // LOR : TOS = TOS || TOS-1
+ case 0x22: // BREQ
val = POP;
- ea = POP;
- PUSH(ea || val);
+ if (val == POP)
+ ip += WORD_PTR(ip) ;
+ else
+ ip += 2;
break;
- case 0x24: // LAND : TOS = TOS && TOS-1
+ case 0x24: // BRNE
val = POP;
- ea = POP;
- PUSH(ea && val);
+ if (val != POP)
+ ip += WORD_PTR(ip) ;
+ else
+ ip += 2;
break;
case 0x26: // LA : TOS = @VAR ; equivalent to CW ADDRESSOF(VAR)
PUSH(WORD_PTR(ip));
@@ -640,7 +629,7 @@ void interp(code *ip)
case 0x30: // DROP : TOS =
POP;
break;
- case 0x32: // DROP2 : TOS ==
+ case 0x32: // DROP2 : TOS =, TOS =
POP;
POP;
break;
@@ -728,7 +717,7 @@ void interp(code *ip)
{
ip += 2;
ip += WORD_PTR(ip);
- parmcnt = 0;
+ break;
}
else
ip += 4;
@@ -745,7 +734,6 @@ void interp(code *ip)
case 0x58: // ENTER : NEW FRAME, FOREACH PARAM LOCALVAR = TOS
frmsz = BYTE_PTR(ip);
ip++;
- PHA(frmsz);
if (show_state)
printf("< $%04X: $%04X > ", fp - frmsz, fp);
fp -= frmsz;
@@ -763,7 +751,7 @@ void interp(code *ip)
printf("\n");
break;
case 0x5A: // LEAVE : DEL FRAME, IP = TOFP
- fp += PLA;
+ fp += BYTE_PTR(ip);
case 0x5C: // RET : IP = TOFP
return;
case 0x5E: // CFFB : TOS = CONSTANTBYTE(IP) | 0xFF00
@@ -801,6 +789,7 @@ void interp(code *ip)
break;
case 0x6C: // DLB : TOS = TOS, LOCALBYTE [IP] = TOS
mem_data[TO_UWORD(fp + BYTE_PTR(ip))] = TOS;
+ TOS = TOS & 0xFF;
ip++;
break;
case 0x6E: // DLW : TOS = TOS, LOCALWORD [IP] = TOS
@@ -847,6 +836,7 @@ void interp(code *ip)
break;
case 0x7C: // DAB : TOS = TOS, BYTE (IP) = TOS
mem_data[UWORD_PTR(ip)] = TOS;
+ TOS = TOS & 0xFF;
ip += 2;
break;
case 0x7E: // DAW : TOS = TOS, WORD (IP) = TOS
@@ -855,11 +845,11 @@ void interp(code *ip)
mem_data[ea + 1] = TOS >> 8;
ip += 2;
break;
- /*
- * 0x080-0x08F
- */
- case 0x80: // ZERO : TOS = 0
- PUSH(0);
+ /*
+ * 0x080-0x08F
+ */
+ case 0x80: // NOT : TOS = !TOS
+ TOS = !TOS;
break;
case 0x82: // ADD : TOS = TOS + TOS-1
val = POP;
@@ -931,92 +921,62 @@ void interp(code *ip)
ea = POP;
PUSH(ea + val * 2);
break;
- /*
+ /*
* 0xA0-0xAF
*/
case 0xA0: // BRGT : TOS-1 > TOS ? IP += (IP)
val = POP;
if (TOS < val)
- {
- POP;
ip += WORD_PTR(ip);
- }
else
- {
- PUSH(val);
ip += 2;
- }
+ PUSH(val);
break;
case 0xA2: // BRLT : TOS-1 < TOS ? IP += (IP)
val = POP;
if (TOS > val)
- {
- POP;
ip += WORD_PTR(ip);
- }
else
- {
- PUSH(val);
ip += 2;
- }
+ PUSH(val);
break;
case 0xA4: // INCBRLE : TOS = TOS + 1
val = POP;
val++;
if (TOS >= val)
- {
- PUSH(val);
ip += WORD_PTR(ip);
- }
else
- {
- POP;
ip += 2;
- }
+ PUSH(val);
break;
case 0xA6: // ADDBRLE : TOS = TOS + TOS-1
val = POP;
ea = POP;
val = ea + val;
if (TOS >= val)
- {
- PUSH(val);
ip += WORD_PTR(ip);
- }
else
- {
- POP;
ip += 2;
- }
+ PUSH(val);
break;
case 0xA8: // DECBRGE : TOS = TOS - 1
val = POP;
val--;
if (TOS <= val)
- {
- PUSH(val);
ip += WORD_PTR(ip);
- }
else
- {
- POP;
ip += 2;
- }
+ PUSH(val);
break;
case 0xAA: // SUBBRGE : TOS = TOS-1 - TOS
val = POP;
ea = POP;
val = ea - val;
if (TOS <= val)
- {
- PUSH(val);
ip += WORD_PTR(ip);
- }
else
- {
- POP;
ip += 2;
- }
+ PUSH(val);
break;
case 0xAC: // BRAND : SHORT CIRCUIT AND
if (TOS) // EVALUATE RIGHT HAND OF AND
@@ -1040,6 +1000,53 @@ void interp(code *ip)
ip += WORD_PTR(ip);
}
break;
+ /*
+ * 0xB0-0xBF
+ */
+ case 0xB0: // ADDLB : TOS = TOS + LOCALBYTE[IP]
+ val = POP + mem_data[TO_UWORD(fp + BYTE_PTR(ip))];
+ PUSH(val);
+ ip++;
+ break;
+ case 0xB2: // ADDLW : TOS = TOS + LOCALWORD[IP]
+ ea = TO_UWORD(fp + BYTE_PTR(ip));
+ val = POP + (mem_data[ea] | (mem_data[ea + 1] << 8));
+ PUSH(val);
+ ip++;
+ break;
+ case 0xB4: // ADDAB : TOS = TOS + BYTE[IP]
+ val = POP + mem_data[UWORD_PTR(ip)];
+ PUSH(val);
+ ip += 2;
+ break;
+ case 0xB6: // ADDAW : TOS = TOS + WORD[IP]
+ ea = UWORD_PTR(ip);
+ val = POP + (mem_data[ea] | (mem_data[ea + 1] << 8));
+ PUSH(val);
+ ip += 2;
+ break;
+ case 0xB8: // IDXLB : TOS = TOS + LOCALBYTE[IP]*2
+ val = POP + mem_data[TO_UWORD(fp + BYTE_PTR(ip))] * 2;
+ PUSH(val);
+ ip++;
+ break;
+ case 0xBA: // IDXLW : TOS = TOS + LOCALWORD[IP]*2
+ ea = TO_UWORD(fp + BYTE_PTR(ip));
+ val = POP + (mem_data[ea] | (mem_data[ea + 1] << 8)) * 2;
+ PUSH(val);
+ ip++;
+ break;
+ case 0xBC: // IDXAB : TOS = TOS + BYTE[IP]*2
+ val = POP + mem_data[UWORD_PTR(ip)] * 2;
+ PUSH(val);
+ ip += 2;
+ break;
+ case 0xBE: // IDXAW : TOS = TOS + WORD[IP]*2
+ ea = UWORD_PTR(ip);
+ val = POP + (mem_data[ea] | (mem_data[ea + 1] << 8)) * 2;
+ PUSH(val);
+ ip += 2;
+ break;
/*
* Odd codes and everything else are errors.
*/