From 365071072b1d415b7ba5ffd8779de45f7e102bae Mon Sep 17 00:00:00 2001
From: Redo <A509DCFC@cock.li>
Date: Sat, 20 Jan 2024 03:12:26 -0600
Subject: [PATCH] fix carry and shifts in hardware, misc

---
 assembler-8608.lua          |   2 +-
 emulator/8608emulator.c     |   6 +++---
 emulator/8608emulator.dll   | Bin 164507 -> 164507 bytes
 emulator/8608emulator.lua   |   6 +++---
 emulator/instructions_gen.c |  12 ++++++------
 instructionList.txt         |   4 ++--
 readme.txt                  |   2 +-
 rom-8608-defs.lua           |  26 +++++++++++++-------------
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/assembler-8608.lua b/assembler-8608.lua
index 010d48d..5824191 100644
--- a/assembler-8608.lua
+++ b/assembler-8608.lua
@@ -706,7 +706,7 @@ if HasTs or (not AsmIncluded) then
 	ts.eval [[
 		function AssembleBuildFile(%fn, %romsize, %offset, %len) { luacall("AssembleBuildFile", strReplace(%fn, "$", "Add-ons/_misc/rom/8608programs/"), %romsize, %offset, %len); }
 	]]
-	AssembleBuildFile(arg[1] or "../8608programs/test.asm", "16 16 8", "0", "256")
+	if not HasTs then AssembleBuildFile(arg[1] or "../8608programs/test.asm", "16 16 8", "0", "256") end
 end
 
 return {
diff --git a/emulator/8608emulator.c b/emulator/8608emulator.c
index c51e5e9..d0ecf2b 100644
--- a/emulator/8608emulator.c
+++ b/emulator/8608emulator.c
@@ -40,9 +40,9 @@
 #define pushretaddr2 writememory(cpu->s++, lobyte((cpu->i-1)%65536));
 #define lni cpu->instr = readmemory(cpu->i++); cpu->cycle = 0;
 #define ldi cpu->instr = readmemory(cpu->i); cpu->cycle = 0;
-#define addf(x,y) { x=(x+y); cpu->cf=x>=256; x&=0xFF; setzf(x); }
-#define subf(x,y) addf(x,-y);
-#define cmpf(x,y) { int t=x-y; cpu->cf=(t<0); setzf(t); }
+#define addf(x,y) { x=(x+y)&0x1FF; cpu->cf=x>=256; x&=0xFF; setzf(x); }
+#define subf(x,y) addf(x,(-y)&0xFF);
+#define cmpf(x,y) { int t=x+((-y)&0xFF); cpu->cf=t>=256; t&=0xFF; setzf(t); }
 #define rol(x,y) x=(x<<y)|(x>>(8-y));
 #define ror(x,y) x=(x>>y)|(x<<(8-y));
 #define sra(x,y) x=(x>>y);
diff --git a/emulator/8608emulator.dll b/emulator/8608emulator.dll
index e04d18ef438b87f419fc86222aaab3bd11476992..38a38150f2b6c1ee13edbb1c4b8e5ccbe554cb48 100644
GIT binary patch
delta 22903
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

delta 22840
zcmb803t$x0xyR>B5=bzXO-OhKSwc{h*Mi^^WW&oSh|5Fk+Z7*oC8z_96)n2UOO1$K
zz%sU?Mnr3G(Jl`OTB-|T)#|Ma1*MhhiilgIbOcKAnfv>8X0tOb+Iwj~|KItY|D1W9
zGmkTyhZl8tcu|M=y@j`5xbfPh_fIUi=p}vWyU(fg`laf&LbZB%NxR$iYTxpO?f#~Z
z@-4rm{lz`r`GL~@HnO#~^@e!e;>t!tX?2T_pN(XGw>;gxvwC*<Kii+$W2mOI^BOZl
zcGNX~k*Q=63XOk}!qMg9iU)Vjv})RtF|7-ZsvrB?s$O1xUvZ#r{_#p%l&o#s)^PcP
zuhgv@Gar1Z$>J|4P1B@>Svf<;MYpmYZL7Hy-c}fK{BphI%Jw(0Z03@J<u{b{)h8dn
zd`Za@%Z*NjUDepd=S^IYR3q68t>eaIZO6xwi;|6M`Fmp)R*f5yTx=UM$26=rj%(7F
z8>NNaYm1NFPHiy_EjvLPaxDMWlG{@F9jz4RTd^(w-b&Vz-QwDQ1=)>0)-Ksw(yyR4
z+swZ>YF(?rlHH|$wPg3_iBx%!>~_~$-*>NSz0oyXIC#j8#@f2YwWY2@-0`uk9O2s1
zjz3E_PVTp$cC6yKH`We#xnr;3^46+(`DOBZ`Mt|@teBNshRrU`ZSwamv;M*phIH(i
zJ-^?xqjxWVxxBn<asOi-&g^Nsd-?i!<?`o8{9ygtgTCx&_m}>)J~@lIt#EfJ-(uy|
z);1<<w`6)P|DgPylLmF{wUExIY1v-l`_JbF%Xgle2iMQ8ouv12no<R|{k~&k?mk7k
z!Lw%BwC}O6uN?PVpWS^5kG+fT?o<377T0hn{m(m!<vVxO8B}ab=`r^3U$*6#7T2~E
ze&34hK~?zOJw12ck2R*U7n1CG&(^xmdr8~TUmv_8q}yvL{?BVU))C3CC0l#!wHV>t
zT1x-(T8?$Z@@vV~9(yfK*M*$!$6CIpKb`z9-LIA|bF2esUmmj^njT7z_&;~(T29&j
z!%pjTga3Q$oT~qaoz{!L$Nq0egMNLi6Yc5O-#37A*S2FGQn}8{wXIW^V_(|r`fCH_
z>&M+Zsi)rXljVc_Rm;~d-l!I?kKDhsLBF=<xv$hrRsE0Y+=v%zb&HY>JzG<Ci;MON
zSQ09(TO2H|YpmQg-E7pAUtiE*{#sY(=!c5T7G0e*aK<`~J9|SrF8O0M?bV`-Da%d$
zZ?m|K$7`ou^uvp%)-CunP`9{ebh<gJfF^F5ZeCNMI`^M<NLJZU<8Q6Jij=2=*2*hM
z8eeIxyh-YoOswhG_-bqAoI~cS0yVTGa}BVu^7CuVzZR%5z2>gfwAM;J+e**>V!d@s
zF51oIvaa#Zt(AuknxhI;Z#BZarcj*_eg2@VtLO)~hP+<aID84q)-@I#c@EiBQm7^E
z2a%#(0`O(mG|nRJWT!`4EANyxmK?v%kk!U1uyX$Uf-GLwxTUpnCZ)`AWzxd9uC(4H
zD_Js*!>1PwUs0sa)BiNfoKU3t6`#p5s#`LAsQHs3HD8S}zb#T-)L^r7J5{Ie-(ZH@
zsiDWO+rZL|69ZjaEB|DfkF`_1_2>q3Yddv~>TTAvSN_g5mK^(zi*Dvnw^ly-_w45N
zFfVJb&g`{zeYUjfW)AG)X*I<Y7mp2e&AjZ((wR4#>)NY+`t<eYp7yF68*rq(I<dF^
z7CD36SyKMhEgs$rP<QgSx+P<4{OnJ$IkH%tt{=VG{Bf}wQ+3Ze4(5@Gi~BxxAiEt8
zRInNH1X(m|ow=)6)u?mLFN;;3I;D9`iR!K@Z<|STua0|KTF>Y|$Zksi=Gh(8R@Ei&
z8)@U#zIBT}Yw&ZFUz;J@(%GC)s`~j#5}NjWfTe~UsasO{)wAY;Qe|{#WD%YXTPthK
zZ%WlY`tE0%?>=5FQq^Ttv{t_KvFt<7ea|9`-fcLwZt=ij89^go`PdxTQJvEF6{%XV
zt>5KWU43O;Yv2E7fg7^j*y*(W78l+3tU0%%8g|M|u{O>rZmsN`ZMNua0ZWdbmgPMM
zW@U`8weocHFCA6S{>KA&G<xIKj`YU`+x(X^K4P-pEK@>VYi09(3X6;OJY!b-R88^Q
z&j{SM-<;%A)m3Y<rC(ra*~zmM#*mLLM(3aXjCsFL`PC)nGd|U~$54#Y1?JQA;-VT#
zJbvH0hsSrH`I%2uP3Z)xd$lODMpiC|bib3eR<8bt<{!5AcyZAVI0L!!t3}($WH@Zf
zj*0BX$Jy-H!L60Q`N+JyO#MzxGrN_myYyYxnLkI>MP}DdYLu!pFX^Oi(Vx85e7zGF
ziR-U5ODfc(`YY3$e^o(0JO9MJnih|@_U-IwJ4cUvVDtAJ{iCBVI{K`m4>)?)2hF9O
z)e6<^#I(KOk@s!g@96K%<GQNrC$#oG@SfAMqknYtMMs}?^ifA2aP%%mZ+7%5v%V`k
zIK}*RS9P(!<?r9N#`FJV{K>yqpTE*=HLc0)-A#?!*j>en%dF--S!P+bCd|pzYH$Z*
zlU+1EH~&zrPE(et`lwMQ)>_AHo<~s`W?79Iyfjd3Ci|#jOir=PI%xa+HBK|;WQ=9j
z7j`k>V9UnF5gP~l+G?3gaqGrmb8C${r^-5P<9K^}^L;1T<+QnHhFR8K)l^wu+Qj(A
z)`a7*a*htxKkXWSt9f5v_2W|GJ-Zxu+HPZ5sqwx|;wR^b<q)gQV>wGDp2~TQf7nYI
zzswQKA^sIPV(hU!R*w8Kd6H6P)_xm@2RPN{_I_$`Z^Jpn#s@am2HKi_#8$(cd<xfM
ze|HryV<)S7IqCxBBm_@UzCvTCz1{(4>=ad8XgS4UW|CUvGnbyD2CwMP*)q(f{hj5c
z$U%3CvHlnhbNeV(lccK9+T!fWiUIa=_DL`Et+F>M?r6%KJU|VmrFjF?s8Zu&yEb^5
zvosZIAiXAS)(%urHh&AHDr19fvz+}+pW*E1c6%|-ZqD&nr{+v&i8mcbspSykf1Fj7
z#?Nv*ujPpEY-j1$b0m=?IZu`GoU_!swgyHxWv5-XCFgL?X(H!%!`YT9W23VkXKMo^
zopNq#tE`;kkX@5>9M(%t8>OLhoMn=^ZM7U?wQYTTl;inB&JzgQ#A+ichZxS*4J!%N
zI!l?oPgbXwS?io)+SZg=HdGBR4UKkMa?Zi9(v(AtUC!FdjNGE{*xr!2okdm3RHv#@
zh2cl=%{^6(pd-x#l%`kOwxly8hxN7+HZh!Qg*DbLhsW8PHhT|KSNAq@wm&=AsSb^I
z?B;fQbap)SHrCtB%I%Kh37zY3v-fbCv>co9w$r3j9j<G$ovf}dwVXY(z;d188nN3p
z#LsIZdu<XpKSwNwq}zz`p|jM4HjhL66LZAaXL}ND#BxaJf;P`bwkO?2EQiD=Ii7BY
zbDc|R_O&v2p}kB<4(3T!))Bj?IhWE{lU+_eYd26+mU0#dhwK`z5?lw$ET<ToY-27u
zXR5(fM#e7srr4Tr)Of{dugY>9p{dS-IdwWxO<{bR?H$3zY2H~}AL6$7Om#M;CR_Yw
zt&|eB1kEi{O4$-NYe!JBY>Am$q~tSeM<PwO_|17zO4t%K)j5>tt4KxoDtps3=U@b!
zgE7$ekW=xPv+ZWtC>8KI_LxIs=60^XWrkypJ!+d1=43f=hGiFnSLfQu9#6x$_=ld%
z;qBSO{1>~ZJ!PvQ9d>Z3;ara_8nJt#)nXf(!VW1jKD9}*&_45w$Do`z2ZxGmteKN*
zWwSoB-C<>8wpOs^V9UW_b19f(sYY|WlD2TTrKFi#M4D^~n6+cFmaK%$c~Y`OIM`#!
z1Li!Dlr3R%i<B&ppjkUkjVdz^*qap7?M?EV+sDZ!IoMZV<D`v^zuWGh)6v6b*?4g~
z*k7F6-KAOlH`|?XaNNvd;}aV<Ic@vRvU8;o2M3%(nY6Lt9P?C(-FC>FcP_id8w4Bg
ztRU#rCCu%#q&QU6O2-yS+G3bnq~tei&qGqS#LRh=3IlVT!C(f@mpiXBj)s{rDH^|b
z&bFD%*5-;UCP?M0xyqmvEvGpAxViRD8ozVuOPd^G<w!~3PRC<zxm2BAl5~ok9*U)*
zyPVq1xfaq6vD%0cwLR8vZO?FD%my(>gXZJI7(DYF>S$B;d8AC6Z{xV5M)vYj;a_0m
zgrkPj_yF!IwUan_hB*%@wZ3v%UF2+FiSe~f0_Nlkvky51*4KN?2_ZF{2c<I0xtAnb
zZC5($>R=qTi`uv5A1+j<m03<X{;kdF9wEAi@r7M9+S&bpn<lu_aK>($k!H@Fta#!I
zshA9!$=NO4B0?8HR!mVrshGmmC;qtIn$OYD5_=y8^fsF98tag)DQe{LJ^X;9X4zEd
z&R3RPZL_8)Y)xnDDgqAnIXJx1Y1~XsRri{e-PIYTskps}m2?hXX>6%Yj4gX+G;`x?
zP;xcBn9XmpC17rmQrZ?y!Vguj;Ai&YBMReWve*c{(0Iv#YPYE_Q-iA$z3pR`_S>3p
zRQ5~$`Kz0!T&4~vm2R%RLj6>!MDzA5)pGs#RE4Gm6G{^`%voV|?s@CFYT6Z`Bs#qt
z$A#QL%e!mZb>x0@D-n^!P@{*Y%@hw>UPW0v=vI?Ci`(c+w_l^K?)&wLnzor5?IcZW
zPbA5G=o(@hc><l-{LM9LjEeR?L(@jARayYuP6Wx*X#JU*HkRB#_YrmE7CP@NmL-p)
z9nRLY5V;S1oR~(QKu;N=X_t@(&?kv2grj{&vWLRa&BS$URa8roOgx8Oq#}gwC1#Ra
z==@RaB6%FG4r*G1ER1d?=8&h*3ALIwmpp{NLBxck<3?-RLgDBe#J$4N31c+ve&J|p
zOq6$5sh}`{*|i6y0=<!Vh}=M1h?V3PdgVA?J;}r9pNQ4uY4n2en)Wn#2z{AYL!Lq>
zoU3UG;pi@6llalg>o@}B;V8*R#5M{R8b43dULzMh@qA5tlRSX#AX4OMbp8ZQ+bJHj
z$3#urP3}j3P3$30pyMylv^04L{VTDLJdG}x#KaJJ96j|yO^bd?AxQEnVUefM$stWU
zOddu*CcY-O&{>l;O<Sk57}|b{rWKR>&?kvf@&r0zs-{(thtQ9RuH+WFcp4*vJdXM<
z(zF_KG^)iZ^pgtIcd@1okP37u5g>0u{Xf*SVdSEZ6K9Yo&>@%5dC7z579vQVLMLBJ
z=OquL9}soq7CP%P`Wkr*RhQFw*F{+w$x>n(6;0>~SI~RO{pjPw732wY$d&Y7@*ui}
zxQ;x9UVRmvmpqK7h?&CC;MH_q@uMFR4dfQOEKKJmZ$d{$uc7x+2%!gw7`ZlG(^e4+
z$rI?5Yw5k@VN}14-b?O7*Aa2@BpSY+&MO{NyMfM2F1mtPN#2C^|1UZ(c>w(_v6?)Z
zB)K?3@1+n%KO@$VTWI`7dM~+XV1}k`AQ$~Tv57o|US3a6CJ&=6M3US>@19AgCXb^%
zZ=zF^`_UxvCb?+%X3l?#0*Q8n*h#M4LT4d%lgH5>2ECfxk8UK=<Vo~`S@df15PFEn
zkZZF!a>S?P33Td@=+xw4w4i}bP3}Y26GzFD4N*<I_Evg01q1E$V-DYXR)%gR3dvLG
z?Az$=<T14O9C|x>0Nqab$kXWUx6|{*gLc1zo=@&aUm&W;ljx;Cp)-?*(JzUbC<Se<
zru~BGN8W^1-^nN-51{Lb0C^G}a~Gq4JcRBb&LB^t*Rm5M$PM%m5hT}QbTVQrc?>;D
z)Cr#lCngF<qeuBqNGj&@S%8>E9!IMd(DTXt=&y({c>*1=kls!nM7I+&$<yepMf7&^
z7+P~Ty`4OO?j+`j2c2~f`zju^>|VBUJ=cFf$u?pk6)Ci#k=`yQwCp~5JGmcSOT@{O
z=yi+f?c@epaX-CXJm^|trFhT_m(bhEL+BgCYVs6%)dO^P@-X_@101dd1&hM`pVGt0
z<7jo99!?%Ww-TGlQ|PTr>A~bNv|t$<PVPgO5wDRqq1DUj;p72yCy^pgqca|)Om3iG
z61&N@=+9U&v4=t&Enh(oC-<YD5c|k2^hJ{%PM$>nOnge7Mn5Jj@u2@C4wGvSaVm(T
z<f3WfYw@GAey*{X>;PK!3)Wvq!B4W5C?-#$lOLvslZVk=gpWLpUcQpUEgXH9=qen&
z{1N(#aP(cmFC4w&QThUT3_V2jBiA0&v>y=zgg?gkKSUuQ6-`tS!=wUj|2RFI+=t#x
zj3AGr?N-slg`;;9V}+ybo}h;dM;{?3k~g6PSJT1C1L%vyH1Z@m=}9{H2Cn}hl7A4_
zQK3D>-HeEkC(xUJNe?GC&_PdgSjhwE0iuE2LZAH=JzV_gsQ;#ilLyhah!}Yaz53U5
zaPlzvcj8`h3yntC(8DRj(2md0!^wT<W5k2xP3YifIi=(Q^d({?c@n+wHykwb5c)o`
znmmo(lAwo^8)$}DLvEpwwRCpjXolE89<@j!>*(!Lfo6!!vH%)cPj45FW{7RV(Z~jR
zyKpo^yeS-wJV$RAj%J9R!qLb^db@BmL+lZbMw&VQX{l(Yg4ib&Xk?Q#3>PIn6^_<F
zPj45Fwh)JfqxCP)+l8Yo#Mi>n`rp#qpM#?<L?O9_)^Db>3*XH6Z=p~s6=?nM=<QO0
zwh$G<(fSwZ?ZVL(qDnYg{}R1jINCzg2uJIa^mgHB3o$@ATEB(PE*xzkhDD`<q<$;C
zT`JHPVuWzC{$+Z*aI}ROD;%xgMsF96wh$AAqxG-Q+l8Yo#5Cb({qK3G5stPHR|rR=
z^{;YmmkP9nxK1k2`q$)q!qFCDrf{_Wbw+`3w1sF8j@JKyQ6L;`A?6B4>)&7$2uE9p
zg~HMLHyH)bas4+)T8R6l0<HfaMu9AVwh#{rN9+H{C=iae5G#eF^=~l>grhCQYT;;o
zicugOZ6VeON9(sU3WTFA+oKEvsi085gHa$AXbZ7fI9mTFMuBj&h1ez>t>4Kg5RSGG
zZwg22cQFctqb<Zv;b{Hai~`|khS(!KN)ma8YqV6L8DgJQppo5_g^LoO3P&S<W)uiV
zGsI!xXyh-90^w+e_*ys`c~|4n365rnLUId@?BV<uO9e@WD3uB{@>fQIa5O_y2uCCD
zF$#pE8KO!!8hM{lARNsQHNw$Ino%Ge%@6~Gqmd671;RgI{AVZ(lL|Dlmr)=UXoeUe
z9F2U)C=iZjh_S-a$Ua7aa5O_q6pltdViX8RGsHCEXk<U5KscHquGq-+-y(^8%qWlw
zG(%h`3!sq<Aso#RGldKL8>2utnjsp5qmfS-1;Wt`F;_SmX<-xyM>E7i;b<iKDZ@Z2
z&<t_ERG^X17zM)74Dq0FG;)AZARNsQD}|$xzcUJiqZwkga5Q2u3WTE>VvTS#@;Re`
zJZg|+hz(MKMh-FxWC1ioY!;424lxRZqZwkGa5Qq5Q6L=65N`@cBmZC&2uCx-PT^?e
z2%|tanmNMx-y;<iBL8F*NClc9_6bKLM=1*zB|a67M!sMa2uCx-Vc}@xOGbfkG(&tX
z9F2UXX<9QJ%@Bp;)>ly~zUF2i6=;Sil?pWS4WmFfdYGsn*S_W45najSXhkcdfZUI+
zCj8_HbeN{J8uB2zjp#?7LZ>OE4ImGr`-ni4f<@AxD{UBg4CSX-+8N~hUQ~OK7(w2I
z))dkpc>vu&j3rNs7V%RT@({X{m`I*RuWJV*H_*exG;*!I(iRezkjK$zMX}PZpx{SW
z6JhcMI;?~S$b;xMB0`=*r*%-;O!6>#KVgu^QHy9G7oB;W(&msG=+RQ8%_Z0PnelKU
zP98*`A|7hy`kx?qi&#xXN-Fr-^V8%B(T+;nBsuy%@fvv=o$A9&9!9Sv_K+KB1Cb_=
zp$mz9<Z<-Ma*lxb(H@l?VSaewN0Xfy|5X%{ot3tx3x}9IftuYo0_06-hwhvLav%Cr
zVj_7Q4fNp1k&AYy;%JEn9Yo9&j*cb_@(}tU(LmmW4(!Ph5>J$5HL;LF0zE+7Pi~=C
zpTI)oVbmm6k~g74da(?75ZzC#5kGo}*dW}mwDH6y@(_A4v6(!9?jn-pY4qvdN;`9#
zRFL$lrt^^d(NRR2+}B5Gw-Xr-T?~C#a(EN^Wb@?P)cOwDpTL{N^Hoh$&UUURBswwr
z$8b%3gbVRlu9bwmDah-KJc`QIMds6F9!(xu<xy2`XEK*2b7=CMEKi*lcMF+Elle2b
zdCSwM+&^UwEnG)=2k{P3$CX6xlQM56cMq8}lRJmZm&sj2=E~%bA@gK%w~#q9xl_pe
znA{~~ZcOeFGA|}qAQ`MOEhf*_a&?k%6Ki4zo}~^hQ)BW>Cevav9cFEd0=P5Ce3;CG
z$pe_&DP$f@=D*|#AUF4wo9fC<ZOK%YOkv5?l}uU5RFzCo$;_0@NXbl;%s|P^lgv2D
zOq0gO$P0nI?8!To73Gl0v=c8?*|!OK^OF}Zc`cEvzf42PlcU`G<dsLBk>u$>UU}ph
zNuCa5dP;6fO<~I1h2-iIx&}rrR~MO?k~@-IzGP-f?nrX=l9{QfOiAUYqGakxrkrG|
zNoJU2W+^wLBr`~X3N{v%StFS(l360TrOD+_W{KpMCYL{%C6Zg3Tt{V+NN#CzrIJY^
zx!=l_N+yZ8-$t|7NSP&)`E|MJ%5_p^isYs%moAwpk{KeoY0G6zW{6~FNM?kRgiHX*
z#E(q)7?o_yZL~3mzCp+{v`p;C^RrCq$g{Id=*VNUOy*dxMrnL5;CJjfDsK%kfg^7W
z7LCaSj=V9*<c+bJMp1d=kVzYPCDCI1pO804Z5}xxFMl#GBl9uxpf7VVG6y5CGje;A
zIT*Q}$^45E?My=yWCBKRWit69w=sFsm#0IyEy*N|+(+d$CX+C7AC=pf%)!WgRPGcq
z2P03AatD!#0hx!9`4?Xob^?_-7nvlG`4*XHi9b#q5tWG+d6AQ+0-0!$2^N__ke6+F
z5tkVRc?p*nbeTbj)1b_|$b5^;v&j64m1KoWX=e+*uEa8yC1fr|=1^qrMEe=b5c17L
z-n-;`3ExS~C+=1!N9FBNo^KL<DmD?HbC`O=(3I#};%#^}4fR2vr!iFCBIPm1UjuuA
zoTHH-m$yiHR0;Ma-%5U%cF4mgviwOf%5oo-&nwKwT%3K>kS7ND#v+q4@(3eO2cdrC
zggiUT41zo>$4`c#GK(P3(K6#8&r34fAkRuN2_(<vmihQSs#8=RRKo)(%6_pQ#s_S}
zK-T*R`JXsY<e@>Z!FZ&M1_IRW<Y1xlauOUuPRJZXa42<uWO-EHq++MShr!-rS=8br
z_=i(wznN`es(uwaPydvckS3}4m_|;cjHXeUV2Yj2O3$Ef1Dp+%Z%Oj1CG!LF4k6!@
z<TX#eCCMwEd`FV^O8JH)@09ZWNZvVR4nba0<QtN_{#nmO`40y}J|xKtq)aBr3yOS9
zl6Od%P>_dH`JN=N;PNfWNRp%Sf-2vT<mEIFq>QFec_|ImqB~&g&@`N~d^3_)Lit`K
zuW>RlVwAi?#TZUOhvu^y)sX=u>5k3^K$Gu${$_s8_H;o9ztT!I9-*H|HXrwbDr#4v
zIiClIF74gL3?x;cB=;M}9`c3JR4cYBUxzlAzq$KXwc~_}g!4nku8*9+v(s569ZCvP
z8$aOZBzmk*^T@rbSE0_+=2iRENxG1GGV13FVpe~m#tWG7iCS53W~0+ePIYbR%v`?I
zsVjj!SlA&L>-|^`J=~{x)B&|cmF70}VZ5@nht<Y|>b~M=pr8DJ)vxL7D&GT&IL{uk
z3u4f_^PYVW%R>%9;-|PhdOP|-e>W+EBs|0q2}BtM`KAYp$wST&6Qd#Txd4*%kSicE
zTJoNHh~*)7K;n#|yr&To2+$St=pj&w;gu)9goGGmd9qPF9`cHKhPpjF#p59#iibg&
zZ|9(RPGu<Ok=`B?qcu;;A%=%kLo5#&3JEiW^Gl6}q&;K`B*d`Jd!|EDkZ2yw787GW
zPv%QQ9<mG)<~oq~tb$k`vJMjGnvnNwg#@@d<jD?5T1d35>+O}rxMbu_2O)m05qY8)
z+gFV|DTjo(PUJ~7B<&$XA#tu9dCzD_kgEu9O}U;w1(eF79GMOY2i=R!hFBgl9}?p-
zlW%$%#K*-ZPgX$^9<mN1*B?AlXW(rGSvGRW4oG~gyP>@h-#9lpC>{^dOYn?$d&(hA
z9#ReQpKE)f_P8GkN;t?SqandMcSBPkDG!+r37_Zo%!XJVG9MB<-|blj@l9|D<Bxx<
zKutN6CF>yagr7f*TOsnSpC>yY!3*4EFC^t52O;4}ZjaspPaDauzZ@j52>GU~A(n>>
zg*1iSp3#udWH*@t(Wbb`bcnn|<XfH%2~TY!vi|uX-?TOaSq4dZ$SPUvBDZH9gr^i&
z(_10(B9dR(4oKjKZn77WbP?8n5EQ<|ZPJfp?>(d(62H{#sfGkDbCaQvl!uIlgfDk{
zra&w=iE7h9@hjY>*%1GgZZaQ|^pIr`d3nn3>nezLwVSMi#64sy#2<EhqB}rI584Zn
zSEYQ@2O;vplqY&A=hZ{XA@cH+_f$jVO)5`@Lgc+FPew;U#`SJA1>(QKO{POq9x@ve
z`!Ba=J|qxvlVy;!hpdvNZghLrm2&?5Gu&t^rlg1LfXLfjeyjIFw3%*l5Ypr!`tfYg
zO>R#)MBW1P?NlGn{V#O08x6&j_K?vK;}*AP3Pdy9WI80~A+yCZ%k7yj9uHXtiOOqa
zev4Lt;vTXN;{TD`vlWu?kR6a<gWIzglJ<~;kl3wmkNi<rAo^oBDhH)Kq#7b`ulY?J
z3h~czlhKfrhfI;BZg+d8%Tjl^$!tjS4$gnR>G>ezCvLJ#7MtrPt7I_`SqBN->Go`e
zq&#E?Bz%|Kvln9B<$3-&2#R|)NbkrYin$jnhon5D8X~XQ`P~=_@y&OW(U2w&nF0wc
z@I3!a2c<#zhGs*Ig>Et*qAhZhWstastb+LOc6-)BEDuRSlK0@rKmVjaX+dpIMDNRD
z9&!Mp-Rt&z3o$(82R_>Ike(2E_s_RH5F#@HuIHbTAej`%n=XKa7rV)okhF)~B%b@-
zo;$_kAxp%w#O--RJT}Qa|EvMU9&npBL$sf|$(!QwkUipwyFH(Z$3wn`_?EgorDZJS
z5a;=)3M4ZW`MvKiCJ#AFJj>ml^C3+hav3D>pxZM8lJt-}AfcZ*9=bdK?gMEn+>8AJ
zlJJmUK@8LF*#rqZ<R-5|EDw2G+WEQLvmX-tMUG_Ge*~0jL$X0d<(#vJb0#5`5X(dQ
zLSif3p5YMRBW^Ml(&Qo2Ac05QJhJ}lK*>CUG(bX+wV5CbA!!eJ5MngBJ*y#>hinkf
z<8IH(;&Bnyze7x`+@=r2<RO-Lo^X4#PIx@T2QgN=J-x)^A%n#8q{|c4MvBRew25MR
z%4O0n7mtU`5YI2&o;$?jA&ugB+U<ErJRTDLrI>!@Hf<D>hrA-5|8{$JipN7f6wj~S
zo<rjCkb(+4YuuhrQIO?9eZ=&P+jOdUJY<Y`o^^YsipN8)70++no*#+FL*`d-{^g5B
ze%vn=lZQMm4Xt&1){4hNlHytC_Piw?4|z{K>)oCM72N;iLr8x0-->C2oBW`XhCJj1
zh)k;Gml`A<4>?CX8{M8s;_;BHAW@m;%{O$jm^|bzX=sz%vqU@|vQj+HyFI@akB7V<
zo)_Gn*Toa{pxt8nt=sgmm^|c&cs9E|MV;|@NCiZu@AEs>M?4-fR6H+o{`00<F}>&}
zAu+w=CRdBcLv9gI((TDk;CskV#k0ljc~sij;(7jgMoe4Xrp;pVkT=EivfJ~ncs%42
z@oaN@z7UUx6nDY%is$*K3rIeW<d4TmV*0(CoGu;@884n!-JXlY<003J=QX$IR`CeQ
zKmRNg)9Y^2gJSZK)#CYs+p|GD9<oh5Z@4`>#p59#isw!7M02w}2gQ^{Iik8^`X6^g
z@*P8Fu=7W#mw5i@CWFM|AtS}}mfJH?JT}Qa|6DGnl-o2zOdfKFc(%JejpFf;hs3kP
z?Ri=}9<oV1f3iK!^UrHya*(dczujWm>24?^9uGMxo?UKFaW_03(iI}#dGp7tpLlYF
z@yEZ@#q^HbG+s;|a*=p;yFJ&7$3t!v&!63%MdI<0pNZ!$IZt-|Pl~Ax$p$?qrgw8D
zA+LzXLw1R0kK6N+cs%4E;`yuFQ`8+#p2+$uLGm#ve~9{u$wP*V=Y6+loOnFsBJrf%
zp6kWqAr0dBAn#%Q3&i9?Oh1WfZ{EZNop?NCt$03kdy?YuknG<%?Q?tH7mu4nwFA=7
zM{d(MV)BsE9(eY<Jv|`u6)k_v`itjdH#u889&)~TGHy@wGBJ733^D!9ZMs7|9?~eD
zPu!lLi^oHr7Eg=Yvq?N2@>*0(pSn%E#pEFw@qFg?{1c)baFg~`ysmgi7l{AwZqJF3
zgom6~#rY3fZqs;7DG#|A68_xnxd9@dVe<$7$B@`TH@O?)JLD!SAWa_fR2BEXz+ty(
zBc`N>{2mhehuiZuB<&&lA@XfEzd=VJ+CSZ-T~CgXhg3qM{-bVFUr@qBhC_m1xIN<_
zDG#{_68_Tdxf&Apka~#xc+K9#X*XV5KPGgMX7v0jhXyrVKc|6>P80~?j}lbf7tL0s
zUZD!KZ#1*4zuwLCchS4+!EekFUG!o6`S`3ZdLLc;#$3@wf4d-s>GPBI-e$b3J~LaA
zMV1B%&8lwtMBF!a)6eA(eAjl<zoPU^cfAjPGr7IHercyLE3~((Z6lgT_RxFix}llY
z$$GUJ?xEM1O+EG9LVW%8?zG$Or4u;m|F)>1DRb=!`mO?BCuI&ksCu@44__SmOfUUZ
zJ*=C1d+85!1n@uE&BcZM&eZ(8kA9}P$*<SxzD}mzTYp>k7v<Jebf6c#!u+PUer`pA
zPxRhx#dk@y{$)W^iM>8^b|1Z;?(1N#?4wurmESStyTu>;ynXWPCT|N(=7)XscXVHA
z+s<|{Gd22jhm1Fu_0{VNe5H2#(bC>D!jIwd&Gv$XJY*20$wS7-Qv50|zf>3^znROE
zIS|W37DK}PelG8M_%u+H2W^4``7xbs%AG^D7a~XaZMsy6S=(Q~(kwkmpUEG(ckHkC
z=y8KF`}!YU-=JClwy4$oo0If0e1-Ozhx_SY>Oo&K-QWa8BIl%9G%!G)VLsYlpQ(o&
zhyvH~cjl9a=)=vf1NAx;vGWy@^LNz3D+ZCzvGZk;$L!oUnEYNle?aoMotFm4AF}iN
zByY0w;vwWuOa8c?$Zmr4%9AHmb9LaCg83sBfh5XuBzJfc=Gj9z>HczikI*wt)xYHL
z|KA$Jjy*C=KhJz&lzy67HC(SV&j^zJLb8pLbv=!2SS{I#(>R`CS*G5+`E-4zxlX9>
z4C(`;$sQn+zYjl$9WOnTe2$&pCwa`yi_apz*Us;jJZ|TOXOll<=kq1!51wgf#R$@;
zZG4yH2|NE<@=bPr$4K&|ogbC_HOcQ}_-D7|@HwE}c0PL)dD_k`$uo9-bCBG!^G_u|
zYUeX*8KYV!Gj*0e%*;rk*eTpFT93=<O^wlSG_M(>-{cg&EQr~cf^O!ZQ}tq@)>wUp
z9_wUYF;1URw5b#4#+=+mXVETtVe{T`dOuarbgX4K1P`C9*B2$di<s4Q`gC?~QJp?q
zkC&U9>*%AQax-10U(zYfPeo-M=mdYS)rV(WbHaK0rTQi1=2PeC59r}?^R)Bz2iVzH
z&e!`?%<=d)_T?g1Zhn0}SKKCZ$OM*)l$-ZY&@a&+@|pW5upb<ZDHHYaoRgnVl=b_}
z)I`>Al$(da`n~1mhzsoN^#$20@be-GQ%%y()#v!k^Cw}7_{?RKvZhxB2kDg;>T@}5
zOD@zOuSm)6w(Y`^Q~0f5xj8z-I+JE&NWYX-e;Cq-bBel6rnJfY(PaJ3il(+vaKml0
zZ)~`p9r2lkQ}nqquIEo-Z5gw9ihieV_{`I$vc;Up%cknX^ty60K2;xIAwSBshtUnQ
RuV-=Qo_)=qOx4#8`d@Y`S^WS2

diff --git a/emulator/8608emulator.lua b/emulator/8608emulator.lua
index e8bd716..8e60bc6 100644
--- a/emulator/8608emulator.lua
+++ b/emulator/8608emulator.lua
@@ -369,7 +369,7 @@ local function RedrawKeyInfo(x, y, uk, run)
 	lg.setColor(0,0,0)
 	lg.rectangle("fill",x,y,768,12)
 	lg.setColor(1,1,1)
-	printHighlight("[ESC] Toggle keyboard", 0, lk.isDown("escape"), x, y)
+	printHighlight("[F4] Toggle keyboard", 0, lk.isDown("f4"), x, y)
 	lg.setColor(1,1,1)
 	if uk then
 		printHighlight("Keystrokes passed to device", 23, false, x, y)
@@ -656,7 +656,7 @@ function love.draw()
 end
 
 function love.keypressed(k)
-	if k=="escape" then
+	if k=="f4" then
 		UseKeyboard = not UseKeyboard
 	else
 		if UseKeyboard then
@@ -674,5 +674,5 @@ function love.keypressed(k)
 	end
 end
 function love.keyreleased(k)
-	if k~="escape" and UseKeyboard then KeyboardOnKey(Keyboard, k, false, CPU, Memory) end
+	if k~="f4" and UseKeyboard then KeyboardOnKey(Keyboard, k, false, CPU, Memory) end
 end
diff --git a/emulator/instructions_gen.c b/emulator/instructions_gen.c
index 974f61e..b87367a 100644
--- a/emulator/instructions_gen.c
+++ b/emulator/instructions_gen.c
@@ -63,19 +63,19 @@ void cpu_instr_46_1(struct CPU* const cpu, struct Memory* const mem) { loadstack
 void cpu_instr_46_2(struct CPU* const cpu, struct Memory* const mem) { tst(cpu->u); lni; }
 void cpu_instr_47_0(struct CPU* const cpu, struct Memory* const mem) { cpu->a=sra(cpu->a,cpu->c); setzf(cpu->a); lni; }
 void cpu_instr_48_0(struct CPU* const cpu, struct Memory* const mem) { loadimmedt cpu->cycle++; }
-void cpu_instr_48_1(struct CPU* const cpu, struct Memory* const mem) { if( cpu->nz           ) { jmprelt } else { lni } }
+void cpu_instr_48_1(struct CPU* const cpu, struct Memory* const mem) { if( cpu->nz               ) { jmprelt } else { lni } }
 void cpu_instr_49_0(struct CPU* const cpu, struct Memory* const mem) { loadimmedt cpu->cycle++; }
 void cpu_instr_49_1(struct CPU* const cpu, struct Memory* const mem) { jmprelt }
 void cpu_instr_50_0(struct CPU* const cpu, struct Memory* const mem) { loadimmedt cpu->cycle++; }
-void cpu_instr_50_1(struct CPU* const cpu, struct Memory* const mem) { if(!cpu->nz           ) { jmprelt } else { lni } }
+void cpu_instr_50_1(struct CPU* const cpu, struct Memory* const mem) { if(!cpu->nz               ) { jmprelt } else { lni } }
 void cpu_instr_51_0(struct CPU* const cpu, struct Memory* const mem) { loadimmedt cpu->cycle++; }
-void cpu_instr_51_1(struct CPU* const cpu, struct Memory* const mem) { if(!cpu->cf           ) { jmprelt } else { lni } }
+void cpu_instr_51_1(struct CPU* const cpu, struct Memory* const mem) { if(!cpu->cf               ) { jmprelt } else { lni } }
 void cpu_instr_52_0(struct CPU* const cpu, struct Memory* const mem) { loadimmedt cpu->cycle++; }
-void cpu_instr_52_1(struct CPU* const cpu, struct Memory* const mem) { if( cpu->cf           ) { jmprelt } else { lni } }
+void cpu_instr_52_1(struct CPU* const cpu, struct Memory* const mem) { if( cpu->cf               ) { jmprelt } else { lni } }
 void cpu_instr_53_0(struct CPU* const cpu, struct Memory* const mem) { loadimmedt cpu->cycle++; }
-void cpu_instr_53_1(struct CPU* const cpu, struct Memory* const mem) { if(cpu->nz && (!cpu->cf)) { jmprelt } else { lni } }
+void cpu_instr_53_1(struct CPU* const cpu, struct Memory* const mem) { if(  cpu->nz &&    cpu->cf ) { jmprelt } else { lni } }
 void cpu_instr_54_0(struct CPU* const cpu, struct Memory* const mem) { loadimmedt cpu->cycle++; }
-void cpu_instr_54_1(struct CPU* const cpu, struct Memory* const mem) { if((!cpu->nz) || cpu->cf) { jmprelt } else { lni } }
+void cpu_instr_54_1(struct CPU* const cpu, struct Memory* const mem) { if((!cpu->nz) || (!cpu->cf)) { jmprelt } else { lni } }
 void cpu_instr_55_0(struct CPU* const cpu, struct Memory* const mem) { cpu->b=lobyte(cpu->p); lni; }
 void cpu_instr_56_0(struct CPU* const cpu, struct Memory* const mem) { cpu->c=hibyte(cpu->p); lni; }
 void cpu_instr_57_0(struct CPU* const cpu, struct Memory* const mem) { cpu->b=lobyte(cpu->q); lni; }
diff --git a/instructionList.txt b/instructionList.txt
index a752f9d..0cddae1 100644
--- a/instructionList.txt
+++ b/instructionList.txt
@@ -131,8 +131,8 @@ jnz imm8     30  2  I+=imm8 if !Zero
 jpz imm8     32  2  I+=imm8 if Zero
 jge imm8     33  2  I+=imm8 if !Carry
 jlt imm8     34  2  I+=imm8 if Carry
-jgt imm8     35  2  I+=imm8 if !Zero & Carry
-jle imm8     36  2  I+=imm8 if Zero | !Carry
+jgt imm8     35  2  I+=imm8 if !Zero & !Carry
+jle imm8     36  2  I+=imm8 if Zero | Carry
 
 Stack (S):
 psh a        40  2  *(S++)=A
diff --git a/readme.txt b/readme.txt
index b3a071c..0ad4517 100644
--- a/readme.txt
+++ b/readme.txt
@@ -9,7 +9,7 @@ How to use the assembler:
 3. In BL console,
     luaexec("your_path/assembler-8608.lua");
 4. To assemble a program, place a 1x1f ghost brick on the top-left corner of the ROM, face forward, and in BL console do
-    AssembleFile("other_path/filename.asm", "RomX RomY RomZ"); where RomX is the width of the ROM, RomY is the depth front to back, and RomZ is the height in bits, i.e. "16 16 8"
+    AssembleBuildFile("other_path/filename.asm", "RomX RomY RomZ"); where RomX is the width of the ROM, RomY is the depth front to back, and RomZ is the height in bits, i.e. "16 16 8"
 You can also run the assembler from the command line to get a memory dump and disassembly in stdout, if you have lua installed:
 	luajit "your_path/assembler-8608.lua" "other_path/filename.asm"
 
diff --git a/rom-8608-defs.lua b/rom-8608-defs.lua
index 4d7daa7..9309b7b 100644
--- a/rom-8608-defs.lua
+++ b/rom-8608-defs.lua
@@ -114,11 +114,11 @@ operations = {
 	aluOpInc = {"aluOpAdd","aluCinOn"},
 	aluOpDec = {"aluOpAdd","aluRInv"},
 	aluOpMov = {"aluAdd","aluSaveNZ"},
-	aluOpShl = {"aluShift"                                               ,"aluSaveNZ"},
-	aluOpShr = {"aluShift","aluShiftRight"                               ,"aluSaveNZ"},
-	aluOpRol = {"aluShift",                "aluShiftRoll"                ,"aluSaveNZ"},
-	aluOpRor = {"aluShift","aluShiftRight","aluShiftRoll"                ,"aluSaveNZ"},
-	aluOpSra = {"aluShift","aluShiftRight",               "aluShiftArith","aluSaveNZ"},
+	aluOpShl = {"aluRun", "aluShift"                                               ,"aluSaveNZ"},
+	aluOpShr = {"aluRun", "aluShift","aluShiftRight"                               ,"aluSaveNZ"},
+	aluOpRol = {"aluRun", "aluShift",                "aluShiftRoll"                ,"aluSaveNZ"},
+	aluOpRor = {"aluRun", "aluShift","aluShiftRight","aluShiftRoll"                ,"aluSaveNZ"},
+	aluOpSra = {"aluRun", "aluShift","aluShiftRight",               "aluShiftArith","aluSaveNZ"},
 	
 	clearRegs = {
 		"aluSaveA","aluSaveB","aluSaveC","aluSaveU","aluSaveT",
@@ -137,8 +137,8 @@ instructions = {
 	{ mnem="brk"        , opcode=0xF3, {"instrSwapIV","adwInc","intFlgVal","intFlgClk"}, desc="Trigger interrupt", ccode={"cpu.ifg=1; int t=cpu.i; cpu.i=cpu.v; cpu.v=t; lni;"} },
 	{ mnem="irt"        , opcode=0xF4, {"instrSwapIV","adwInc","intFlgClk"}, desc="Return from interrupt", ccode={"cpu.ifg=0; int t=cpu.i; cpu.i=cpu.v; cpu.v=t; lni;"} },
 	{ mnem="nop"        , opcode=0xFF, {"instrNext"}, desc="Do nothing", ccode={"lni;"}, },
-	{ mnem="ien"        , opcode=0xF5, {"instrNext"}, desc="Enbale interrupts", ccode={"cpu.ien=1; lni;"}, },
-	{ mnem="idi"        , opcode=0xF6, {"instrNext"}, desc="Disable interrupts", ccode={"cpu.ien=0; lni;"}, },
+	{ mnem="ien"        , opcode=0xF5, {"instrNext"}, desc="Enbale interrupts", ccode={"cpu.ien=1; lni;"}, }, -- todo
+	{ mnem="idi"        , opcode=0xF6, {"instrNext"}, desc="Disable interrupts", ccode={"cpu.ien=0; lni;"}, }, -- todo
 	
 	{ category = "16-bit Inc/Dec", catlet="I" },
 	{ mnem="inc p"      , opcode=0x12, {"adwlP","adwInc","adwSaveP","instrNext"}, desc="P++", ccode={"cpu.p++; lni;"} },
@@ -258,12 +258,12 @@ instructions = {
 	{ mnem="jss q"      , opcode=0xE5, {"pushRetAddr1","instrSub1"}, {"pushRetAddr2","instrSub2"}, {"jmpAbsQ"}, desc="I=Q, *(S++++)=I-1", ccode={"pushretaddr1","pushretaddr2","jmpabsq"} },
 	{ mnem="rts"        , opcode=0xE1, {"pop161","instrSub1"}, {"pop162","instrSub2"}, {"jmpAbsUT","adrInc"}, desc="I=*(----S)+1", ccode={"pop161","pop162","jmpabsutplus1"} },
 	{ mnem="jpr imm8"   , opcode=0x31, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub1"}, {"jmpRelT"}, desc="I+=imm8", ccode={"loadimmedt","jmprelt"} },
-	{ mnem="jnz imm8"   , opcode=0x30, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0NZ"              }, {}, {"instrNext"}, {"jmpRelT"}, desc="I+=imm8 if !Zero"        , ccode={"loadimmedt","if( cpu.nz           ) { jmprelt } else { lni }"} },
-	{ mnem="jpz imm8"   , opcode=0x32, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0Z"               }, {}, {"instrNext"}, {"jmpRelT"}, desc="I+=imm8 if Zero"         , ccode={"loadimmedt","if(!cpu.nz           ) { jmprelt } else { lni }"} },
-	{ mnem="jge imm8"   , opcode=0x33, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0NC"              }, {}, {"instrNext"}, {"jmpRelT"}, desc="I+=imm8 if !Carry"       , ccode={"loadimmedt","if(!cpu.cf           ) { jmprelt } else { lni }"} },
-	{ mnem="jlt imm8"   , opcode=0x34, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0C"               }, {}, {"instrNext"}, {"jmpRelT"}, desc="I+=imm8 if Carry"        , ccode={"loadimmedt","if( cpu.cf           ) { jmprelt } else { lni }"} },
-	{ mnem="jgt imm8"   , opcode=0x35, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0C","instrNext0Z"}, {}, {"jmpRelT"}, {"instrNext"}, desc="I+=imm8 if !Zero & Carry", ccode={"loadimmedt","if(cpu.nz && (!cpu.cf)) { jmprelt } else { lni }"} },
-	{ mnem="jle imm8"   , opcode=0x36, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0C","instrNext0Z"}, {}, {"instrNext"}, {"jmpRelT"}, desc="I+=imm8 if Zero | !Carry", ccode={"loadimmedt","if((!cpu.nz) || cpu.cf) { jmprelt } else { lni }"} },
+	{ mnem="jnz imm8"   , opcode=0x30, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0NZ"               }, {}, {"instrNext"}, {"jmpRelT"}, desc="I+=imm8 if !Zero"       , ccode={"loadimmedt","if( cpu.nz               ) { jmprelt } else { lni }"} },
+	{ mnem="jpz imm8"   , opcode=0x32, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0Z"                }, {}, {"instrNext"}, {"jmpRelT"}, desc="I+=imm8 if Zero"        , ccode={"loadimmedt","if(!cpu.nz               ) { jmprelt } else { lni }"} },
+	{ mnem="jlt imm8"   , opcode=0x33, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0NC"               }, {}, {"instrNext"}, {"jmpRelT"}, desc="I+=imm8 if !Carry"      , ccode={"loadimmedt","if(!cpu.cf               ) { jmprelt } else { lni }"} },
+	{ mnem="jge imm8"   , opcode=0x34, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0C"                }, {}, {"instrNext"}, {"jmpRelT"}, desc="I+=imm8 if Carry"       , ccode={"loadimmedt","if( cpu.cf               ) { jmprelt } else { lni }"} },
+	{ mnem="jgt imm8"   , opcode=0x35, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0NC","instrNext0Z"}, {}, {"jmpRelT"}, {"instrNext"}, desc="I+=imm8 if !Zero & Carry", ccode={"loadimmedt","if(  cpu.nz &&    cpu.cf ) { jmprelt } else { lni }"} },
+	{ mnem="jle imm8"   , opcode=0x36, jmp=true, rel=true, ncycles=2, {"loadImmed","memSaveT","instrSub23Cond","instrNext0NC","instrNext0Z"}, {}, {"instrNext"}, {"jmpRelT"}, desc="I+=imm8 if Zero | !Carry", ccode={"loadimmedt","if((!cpu.nz) || (!cpu.cf)) { jmprelt } else { lni }"} },
 	
 	{ category = "Stack", catlet="S" },
 	{ mnem="psh a"      , opcode=0x40, {"pushReg","alurA","instrSub1"}, {"instrNext"}, desc="*(S++)=A", ccode={"pushbyte(cpu.a);","lni;"} },