From 70bab76b365ca29ed3eb9a375b017bf24e4db59b Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Fri, 21 Aug 2020 17:44:44 +0200
Subject: [PATCH] added plasma example

---
 .../src/prog8/ast/processing/AstChecker.kt    |   2 +-
 examples/compiled/examples.d64                | Bin 174848 -> 174848 bytes
 examples/compiled/plasma.prg                  | Bin 0 -> 1260 bytes
 examples/plasma.p8                            |  28 ++++++++++--------
 examples/test.p8                              |  15 ----------
 5 files changed, 17 insertions(+), 28 deletions(-)
 create mode 100644 examples/compiled/plasma.prg

diff --git a/compiler/src/prog8/ast/processing/AstChecker.kt b/compiler/src/prog8/ast/processing/AstChecker.kt
index 8add048d6..6e394d38d 100644
--- a/compiler/src/prog8/ast/processing/AstChecker.kt
+++ b/compiler/src/prog8/ast/processing/AstChecker.kt
@@ -772,7 +772,7 @@ internal class AstChecker(private val program: Program,
                     errors.err("bitwise operator can only be used on integer operands", expr.right.position)
             }
             "<<", ">>" -> {
-                // for now, bit-shifts can only shift by a constant number
+                // for now, bit-shifts can only shift by a constant number  TODO remove this restriction
                 val constRight = expr.right.constValue(program)
                 if(constRight==null)
                     errors.err("bit-shift can only be done by a constant number (for now)", expr.right.position)
diff --git a/examples/compiled/examples.d64 b/examples/compiled/examples.d64
index 20017586cb7bc8f9768a5e7b81279b5363121791..72bd4da3b877c98e2b6de04f4f20d26a930c6ef9 100644
GIT binary patch
delta 1479
zcmZWpZ){Ul6o2Qo-TLn9>mO`i--eY(JJ2}+mnm5=G71h^Qk>~#{Dw^kF-xYxHxpyF
z5Z^S$>SiU!KiM40TUK<*=Cor%2P!cRla823_~3>gw3`q{i9m#HeV*6NiSgaudv1T{
zoZmU;-TO}G1>Sjq53^Zhb|@YNU@q4vyKREQ{cv)B2ww`peW|L2UrHM9D4Q*k#Tq>5
z1{EtkkT2nWWNs*q0Klhkl{wjTsM|I_6T*F6P(K>Ib_T#c%C1|UWyrixMAiq7_IQ6}
zE+;Yv6q(GCsZe}(DT0x&VVcP<l*?c%9;}0I+;kD@K}OgP;Z$U42HYuDG{KX4y{M(a
z<|XhRVPJv}8IV|m%=&i^G8+j$9vY=Z3BzS3GkmcNs<GxI{5<d-6)M}2m6MSJnUe&i
zCXy&e#z|0O5(yERi}G^`$YdyHDyhUV@Ilzo@t&k@lG2^Y9+tkAe8BdJsSR;ed(7Fs
zXr=|-m4;*&OTW|a)J||s;6uW+?&=kC=hBPTsy!pkWrbW)m`)4*zb3QdTN9#o%$a^O
zsh%g~w||ij35h-LOzes`Mq8VndQ#i9CmL^QY~8nc^X8;Lk!0Pidvvd1(iC-%!F9JG
z=`v}2y5I1Yq8*V8&&npta_Xy)o9l&~;U{d+%HxAsG4EX-hDU89noJNFbO_c%OcgW(
zx?)tUkXSytVu3V+x~d1YOD;nxY2PSSRtOlu!Eu9IkfDYkr>k?Z7&n5G<poDR7~8;&
zfTc?dy)Z?KkW0_?3RCB_gtQ#RQglpdVTq7ZxTUNxr56pgU+7sf0wtP2EX4B_1zXI{
z6Ts|FuePI;5;ApB=em^8*=x3bVT2XRw4cl$&fiK5-Qk5w_Z>d8z#r^h+tiR;-~=^=
zl6Uy$3p_z^;W96<;onIyNSaIq9XH&>k&Dobz2Cro+*Siy6>ZWg>wPQT#9y~=-uUx+
zVgBls%vy-pF`~dsN4epjRH;mV?5s0yTEh_Q|8VFcCFe8TR^1vMiM+D8`$&9*Eg#8g
zG4Hm9A**fWx@`C+?<Y!MtU}E5JpW#@2J!hzoW8;F)1pOZ_y@;#&X%@!(asHJMSW>#
zLez^{A!oh8`K)-}Ha{V*(!L<BCfz0`dSH8IJ>7su5`7P4VM=FN$nlNr|3B**F*?G;
zKUOiXlsa^~+QxE^<H2gU7mq#%6>ADNhOcxNgj0|k|5zfQL?_nPKtrlwQO!gs4%*&^
zTCCF`HwGJE%MKeqejK3>0%Lm)z&^Vp7H!!Z#n0NHvi#|I)859Gesr~iS_$!JOKW3%
zCw&tArKfabtpy<g=7`r0Rpw#E*3uleKAvS8T35}=Xm?mCLq|KTTQ9ae+Z2y&+8t|-
zw*HsRW|_%=jbsM4u><Y!ij;X7BHJ*sj@p&t!rD5RvO3ikP)eN&BVPcuDrBS7MLfv9
zB;iH&6$u}@TH%SY-5EFu2pb`ckrNgPwXSce*C-5G6%+@`s6{E%qE3;E1AD?yJyw&2
V3*_<<m`tGtb%w0Q0S3;(?B5>q6iEO8

delta 605
zcmY+BOK1~O6o&hsnY=U2G^S&%#I~8LloG54q_{F-tAT3EOu$_?(nTR?-3e|=!MYM!
zhjI`%iVzoW)YuuZwu+Bk(Url4i93UeN)Ztsop@4k;n{qLd+!J5{%5utovlXiP@_Vh
zecaWd-o!TwCu`{i<x4%ylk*s^<i9@wQWg5)<Axrjc(6hrnh1o4E}u^G*)(=J{h!{F
z7UlgpyyEN|?7OmQI%czu_!6NBZRrwvIRm^yJ5%c<!K4UuCRNbE6c8jGYWSpWbLh8U
zUIj=ariff9Oi_W#6cYrP;({QPCI~ULL#!}UqQ!_q8-kQGv(e>re|=B!Hiv%tZU@W&
zn?0y|*bcy<Kfb#|np@BT4?B@j*}R9EOo(eZz`1_B^w1|S_}ns5Yy|PqH9=r{1mE3_
zp~FgI?HA((I=$mlm{bE+;lzl|x2Ms)*UH<)5$j0avafGd+rLt!nKNLITgAf3W8QiR
zofK=%8LB;D6^f#-Pot|ZWS=TnW7*NM@qF=rU)k~_JXJ!E%zd$h3$aDL*F6vO5S#ZQ
zkuxnzE*g_7ki0!Xg5yOT^+q3H1&k~*Y(7M-{7k-QF!mthn42{+bUrhW0UiwDH5n5A
wny3md1~K3bK1Nm4t7wuT(La@}jU;QUILI?OEVQ;hOonV>1%5dUl%J#V7lBB)HUIzs

diff --git a/examples/compiled/plasma.prg b/examples/compiled/plasma.prg
new file mode 100644
index 0000000000000000000000000000000000000000..cdfc6eb52ef3187f76b6a8d7e8b55ebc49cd3150
GIT binary patch
literal 1260
zcmbtTe`pg|9DjFdn%ukml%%<=3%)9yrF88a;_AxWx=vl>up_h33Bn0NsjMIfGQqMA
zePv2-Rav2%v@2x~bHzZ1AVzu-p_E185+<UE)goQYTI^1&ohD6g@6y^0w*P$Jdyg-l
z&)w(y{oeQc82g*{S=%sr_nr3|(fj@Avq<Z%M)dI)DE!H80KnDnzUR@~ywW3|WtBhW
z8q27GVo*R$_Ai$W1z?B5$i1x6KVnB$AObK3rm<rPXg8E)^F(cYRt1_2rWG(UBdc6r
zf<r&smD942rpW9+$d42eJM2<RWJmMf@Sa_$<<sWK=R5Y+*VoH{26AE-c4H4Q=;pAS
zK<pwsc2dTReZ*4=Hoz12s-v=+(9LMsAx0xUibc&det67fJS#@rLZ>O?OA5L*;}a+C
z8N)QfHU446oGD9OuSA{yBkElfy~br+rV*#mX~Rz9O>Ux+UNOjJU<OX{rcpg#Nz)sR
zU*k+U;)})~m%M+anvJO(F2oWXE~-Eq0cQ&fDwnn_B)B!zE^aO7PEMj7dfi3S3exSz
z6(qP?r}?jNg$dFfzyc1ShYnIvV!tglRQHoWG)|xi5h28ASjdVZB!Q%j)*cY6A@Q4>
z0*06rJ%FZUhd}BElK7P<B?4{WDNu@5P(cb8iD1@D{3R8?7=oFgZV}6%#IR*{5BjKw
z=3`(EL(EH<J!u&Mzp#2a`px(?y(GnQP=CXfgRwlUJyRL}P|iaNg+p=<Ud%&@!ulN4
z+40{g5v7bYT&FTA%&LqA-(vs!n4`ne^rcsCi5~u|yGjEF$|lU9lLk6%pl=MNTt;cd
zX5IoISEa|I!j*Q3_Vk05>65a83bbxUqjI#yZYEWdWVLBVOWPF2oKQ&t`d{=D3h9gE
z^JjE0!D#WHc$4Zm(R-?||J=af`QcG=VJtR&>2iD`aeZ<sc~eW@x_#%~{RcCTW;5Bj
z`6mnd(`Sp%mtMTg<?_pgLa|shRu=UNh2?xM_wvQk^TlUR^@S(%bJ@)7qnQWy@7=k5
zE3Ms3PEB4<OvEo=8jp=#Afv<Q2M5me_nqoJ(R2LR(Ibbu4s{$nuzz2BTclMC?`&z_
z-n4D&mdy=ywKdfntJa4qg8{#9o!9Mh@Q|~WTdidlmSq@bbvCKTvX(NdwcN%*-r;h4
z*ZKT`U}b21)yC?Y+Pa3#Tefa%+TPr<Gc2}7+S>Q+KX9<)P}kujM~@x<`ZeoENpnaC
I&Eb>&2CzaQxc~qF

literal 0
HcmV?d00001

diff --git a/examples/plasma.p8 b/examples/plasma.p8
index 1c54bfff2..79b54a8c8 100644
--- a/examples/plasma.p8
+++ b/examples/plasma.p8
@@ -1,5 +1,4 @@
 %import c64lib
-%zeropage basicsafe
 
 
 ;/*****************************************************************************\
@@ -22,10 +21,11 @@ main {
 
     sub start() {
         c64.COLOR = 1
-        c64scr.print("creating charset...")
+        c64scr.print("creating charset...\n")
         makechar()
 
         ubyte block = c64.CIA2PRA
+        ; ubyte v = c64.VMCSB
         c64.CIA2PRA = (block & $FC) | (lsb(SCREEN1 >> 14) ^ $03)
 
         repeat {
@@ -34,6 +34,11 @@ main {
             doplasma(SCREEN2)
             c64.VMCSB = PAGE2
         }
+
+        ; restore screen (if you want)
+        ;c64.VMCSB = v
+        ;c64.CIA2PRA = block
+        ;c64scr.print("done!\n")
     }
 
     ; several variables outside of doplasma to make them retain their value
@@ -49,33 +54,32 @@ main {
         ubyte c1b = c1B
         ubyte c2a = c2A
         ubyte c2b = c2B
-        ubyte @zp i
-        ubyte @zp ii
+        ubyte @zp x
+        ubyte @zp y
 
-        for ii in 0 to 24 {
-            ybuf[ii] = sin8u(c1a) + sin8u(c1b)
+        for y in 0 to 24 {
+            ybuf[y] = sin8u(c1a) + sin8u(c1b)
             c1a += 4
             c1b += 9
         }
         c1A += 3
         c1B -= 5
-        for i in 0 to 39 {
-            xbuf[i] = sin8u(c2a) + sin8u(c2b)
+        for x in 0 to 39 {
+            xbuf[x] = sin8u(c2a) + sin8u(c2b)
             c2a += 3
             c2b += 7
         }
         c2A += 2
         c2B -= 3
-        for ii in 0 to 24 {
-            for i in 0 to 39 {
-                @(screen) = xbuf[i] + ybuf[ii]
+        for y in 0 to 24 {
+            for x in 0 to 39 {
+                @(screen) = xbuf[x] + ybuf[y]
                 screen++
             }
         }
     }
 
     sub makechar() {
-
         ubyte[8] bittab = [ $01, $02, $04, $08, $10, $20, $40, $80 ]
         ubyte c
         for c in 0 to 255 {
diff --git a/examples/test.p8 b/examples/test.p8
index fb419f2f1..d33c2febc 100644
--- a/examples/test.p8
+++ b/examples/test.p8
@@ -7,20 +7,5 @@ main {
 
     sub start() {
 
-        uword zz = $ee22
-
-        const uword SCREEN1 = $E000
-        const uword CHARSET = $E800
-        const ubyte PAGE1 = ((SCREEN1 >> 6) & $F0) | ((CHARSET >> 10) & $0E)
-        ubyte cmsb = msb(zz)
-        ubyte clsb = lsb(zz)
-
-        c64scr.print("\ncmsb=")
-        c64scr.print_ubhex(cmsb, false)
-        c64scr.print("\nclsb=")
-        c64scr.print_ubhex(clsb, false)
-        c64scr.print("\nPAGE1=")
-        ubyte p1 = PAGE1            ; TODO fix type error of PAGE1
-        c64scr.print_ubhex(PAGE1, false)
     }
 }