From c035f56d42809c8ea18f5acdbadb11be09c5e12c Mon Sep 17 00:00:00 2001
From: Steffen Schuemann <s.schuemann@pobox.com>
Date: Mon, 3 Feb 2025 17:23:35 +0100
Subject: [PATCH] Enhanced skip ocode tests, fix ffmpeg error

---
 bin/3-corax+.8o       |   8 ++++++--
 bin/3-corax+.ch8      | Bin 761 -> 777 bytes
 docs/3-corax+.html    |   2 +-
 package.json          |   2 +-
 pictures/splash2x.png | Bin 918 -> 945 bytes
 src/tests/3-corax+.8o |   8 ++++++--
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/bin/3-corax+.8o b/bin/3-corax+.8o
index ec8a92f..454067f 100644
--- a/bin/3-corax+.8o
+++ b/bin/3-corax+.8o
@@ -68,7 +68,8 @@
   v5 := 42
   v6 := 43
   drawop im3 imX
-  i := image-ok
+  i := image-no
+  if v6 != 42 then i := image-ok
   if v6 != 43 then i := image-no
   sprite x2 y 4
 
@@ -79,6 +80,7 @@
   drawop im4 imX
   i := image-no
   if v5 == 42 then i := image-ok
+  if v5 == 43 then i := image-no
   sprite x2 y 4
 
 #################
@@ -86,8 +88,9 @@
 
   y := 11
   drawop im5 imX
-  i := image-no
+  i := image-no  
   if v5 != v6 then i := image-ok
+  if v5 != v5 then i := image-no
   sprite x2 y 4
 
 #################
@@ -107,6 +110,7 @@
   drawop im9 imX
   i := image-no
   if v5 == v6 then i := image-ok
+  if v5 == vb then i := image-no
   sprite x2 y 4
 
 #################
diff --git a/bin/3-corax+.ch8 b/bin/3-corax+.ch8
index 9fc874c917a5a6957c4affe5ac285211abb749b2..07b8ed4bb010d05e6b763ed7ec48c5d73a650f95 100644
GIT binary patch
literal 777
zcmY+?&ui0Q7zgk-HR-fHD5Z!fXxPC+d&w#U(Mv3>z3!5GrY7kR=&=k0jh6(W*WF*_
z-DOBLkcc}B-W_(>VFwR`tsuOAfXFIX5Rv*k`61b*dGmR`@B2RQn>K2eM1EM6#%Cf1
zo$=j0={z1h*;C-RGOUj3W65qgZFYPfv%eQHi}V&t^frs;@wm!P3f%<V%(Tu<3pFj4
zm|JP~7CS3+y6QoC9=}r9x59QIx%&x|poh684T>^o3~!I_jU{%Jxkc71EHOx)J^)=n
zXNgf^kw(%LF2D}3Tf60wV5?v3hkl6e)ZJFF-EZf8pdY2a<30$U_wSVa_`kpCyXb@U
z;loiI`oUQzX?5n#f|pljo#wt1*!}ON)z0$OW`TRfzovfEcY153G@dJRgg@!=Tz|oy
zm<<;;OSF9!ZJ6mDb%y%rDfEPO+&i?$wze=?cxk^S?BgY-HAok?hB-W0=)7A#`f0<>
zNzLxYwPv@o*6e~l%awpuL6ubHl0u~;gJxe6*UP$<m-o|e@EZjGF^RL9*7O@J@*Q1<
z)2ytTFPGo_2~^%--Jj^MA)!o{`X7AyO7`?z4c_N*^TWPL2sJ37+!K@vZWuzSTnI}Q
sRH&-pDz`iVh6RcPZcsrvjy+Fs3PYGGJnj(+3mKHw!uQ?B*R?PI0L|*5+W-In

literal 761
zcmY+?KZw&%7y$6sn)b9Elu|?#G~D3OF1ZLnyd?@Yt4sHsnxucAV>u8sE(r%6T-=WO
zB430%IN=}%-f$3y8ywuvo1TM%pmG)L;!wZuHIdwsy!^iJeeZi8Y1Hfz`(>9K@0jT6
z!|O0RNqYC-4?fHN>YzR>IW4yh2PX;q{E|Ryv>`f8hE+JsBzo9_7^MzJxpZwQSKv68
z@uDNMo>ky;Zm(q)%3daM;}zBJHTqWvH-;tHU%Jg!%MhE4Vwk;y`jt8{%MfWy+9$Lf
zw8&|BEPQ0;XOZubyLGP>Zdh&V3u}<?OW*Wvg^#Uk1wZ)jPb`nTx7xowXk$OL>rh4~
z-Xwf_Zr4%fo1tU<C{#Pns!c-goPU&lIdD5Gg>1T4<ceU_Ni+S1XHxET=0L3NLbTSE
zGt&FUU>$p+IGsJU*@iaj!t~5}$>7ZyWoww7PmS{EW>a@-e&@G?lPfj#wF^yMUuo*7
z_cLXvRn&@9rJxwm71ZSfsot_%Wqwo6^gD|DL)^u<W?X_Oa18}-v#@J{Qv41^7<obQ
zU}QYUjLLX!{H1qLS-yQw!|&6ixxL$EjGLVC)EAtK)HH=qQz2|saG|OqRa4s+XcXYI
hNKGzyN^9R2DaR#l6@Kb7j)hFlYwzDaxO-9i@DCH+luG~r

diff --git a/docs/3-corax+.html b/docs/3-corax+.html
index 44e5d4e..3119db8 100644
--- a/docs/3-corax+.html
+++ b/docs/3-corax+.html
@@ -1,5 +1,5 @@
 <!-- Standalone Generated By Octo (octo-ide.com) -->
-<script>data={"program":"# This is an adaptation and extension of the CHIP-8 test rom from corax89,\n# original can be found here:\n# https://github.com/corax89/chip8-test-rom\n\n# MIT License\n#\n# Copyright (c) 2019 corax89, 2023,2024 Timendus\n#\n# Permission is hereby granted, free of charge, to any person obtaining a copy\n# of this software and associated documentation files (the \"Software\"), to deal\n# in the Software without restriction, including without limitation the rights\n# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n# copies of the Software, and to permit persons to whom the Software is\n# furnished to do so, subject to the following conditions:\n#\n# The above copyright notice and this permission notice shall be included in all\n# copies or substantial portions of the Software.\n#\n# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n# SOFTWARE.\n\n:alias x0 v8\n:alias x1 v9\n:alias x2 vA\n:alias y  vB\n\n:macro drawop A B {\n  i := A\n  sprite x0 y 4\n\n  i := B\n  sprite x1 y 4\n}\n\n: test-2X-0E\n  v0 := 1\n  return\n  # These opcodes will run if the interpreter doesn't have return (00EE) implemented:\n  v0 := 2\n  jump test-2X-0E-hard-return\n\n: main\n  clear\n\n  # Display current version\n  x0 := 50\n  y := 26\n  i := version-0-0\n  sprite x0 y 4\n  x0 := 58\n  i := version-1-0\n  sprite x0 y 4\n\n  # Show output in the first column\n  x0 := 2\n  x1 := 6\n  x2 := 11\n  y := 1\n\n#################\n# Test 3xNN\n\n  v5 := 42\n  v6 := 43\n  drawop im3 imX\n  i := image-ok\n  if v6 != 43 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test 4xNN\n\n  y := 6\n  drawop im4 imX\n  i := image-no\n  if v5 == 42 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 5xy0\n\n  y := 11\n  drawop im5 imX\n  i := image-no\n  if v5 != v6 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 7xNN\n\n  y := 16\n  drawop im7 imX\n  i := image-no\n  v6 += 255\n  if v6 == 42 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 9xy0\n\n  y += 5\n  drawop im9 imX\n  i := image-no\n  if v5 == v6 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 1NNN (displayed as 1X)\n\n  y += 5\n  drawop im1 imX\n  i := image-ok\n  jump test-1X-pass\n  i := image-no\n: test-1X-pass\n  sprite x2 y 4\n\n  # Show output in the second column\n  x0 := 18\n  x1 := 22\n  x2 := 27\n  y := 1\n\n#################\n# Test calling subroutines (2NNN, displayed as 2X)\n\n  drawop im2 imX\n  v0 := 0\n  test-2X-0E    # Attempt to run a subroutine\n: test-2X-0E-hard-return\n  i := image-ok\n  if v0 == 0 then i := image-no  # Subroutine was never called\n  sprite x2 y 4\n\n#################\n# Test returning from subroutines (00EE, displayed as 0E)\n\n  y += 5\n  drawop im0 imE\n  i := image-ok\n  if v0 == 2 then i := image-no  # Return didn't work\n  if v0 != 0 then sprite x2 y 4  # If subroutine wasn't called, return wasn't tested\n\n#################\n# Test 8xy0\n\n  y += 5\n  drawop im8 im0\n  i := image-no\n  v5 := 42\n  v7 := 0\n  v7 := v5\n  if v7 == 42 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy1\n\n  y += 5\n  drawop im8 im1\n  i := image-no\n  v6 := 11\n  v7 := 42\n  v7 |= v6\n  if v7 == 43 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy2\n\n  y += 5\n  drawop im8 im2\n  i := image-no\n  v6 := 120\n  v7 := 31\n  v7 &= v6\n  if v7 == 24 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy3\n\n  y += 5\n  drawop im8 im3\n  i := image-no\n  v6 := 120\n  v7 := 31\n  v7 ^= v6\n  if v7 == 103 then i := image-ok\n  sprite x2 y 4\n\n  # Show output in the third column\n  x0 := 34\n  x1 := 38\n  x2 := 43\n  y  := 1\n\n#################\n# Test 8xy4\n\n  drawop im8 im4\n  i := image-no\n  v6 := 140\n  v7 := 140\n  v7 += v6\n  if v7 == 24 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy5\n\n  y += 5\n  drawop im8 im5\n  i := image-no\n  v6 := 140\n  v7 := 120\n  v7 -= v6\n  if v7 == 236 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy7\n\n  y += 5\n  drawop im8 im7\n  i := image-no\n  v6 := 120\n  v7 := 140\n  v7 =- v6\n  if v7 == 236 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy6\n\n  y += 5\n  drawop im8 im6\n  i := image-no\n  v6 := 15\n  v6 >>= v6\n  if v6 == 7 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xyE\n\n  y += 5\n  drawop im8 imE\n  i := image-no\n  v6 := 224\n  v6 <<= v6\n  if v6 == 192 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test Fx65\n\n  y += 5\n  drawop imF im6\n  i := scratchpad\n  load v1\n  i := image-ok\n  if v0 != 0xAA then i := image-no\n  if v1 != 0x55 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test Fx55\n\n  x0 := 50\n  x1 := 54\n  x2 := 59\n  y  := 1\n  drawop imF im5\n  i := scratchpad\n  v0 := 0\n  v1 := 48\n  save v1\n  i := scratchpad\n  load v0\n  v1 := v0\n  i := scratchpad-plus-1\n  load v0\n  i := image-ok\n  if v0 != 48 then i := image-no\n  if v1 != 0 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test Fx33\n\n  y += 5\n  drawop imF im3\n\n  # N >= 100\n  i := scratchpad\n  v6 := 137\n  bcd v6\n  load v2\n  i := image-no\n  if v0 != 1 then jump fx33-fail\n  if v1 != 3 then jump fx33-fail\n  if v2 != 7 then jump fx33-fail\n  \n  # N < 100\n  i := scratchpad\n  v6 := 65\n  bcd v6\n  load v2\n  i := image-no  \n  if v0 != 0 then jump fx33-fail\n  if v1 != 6 then jump fx33-fail\n  if v2 != 5 then jump fx33-fail\n  \n  # N < 10\n  i := scratchpad\n  v6 := 4\n  bcd v6\n  load v2\n  i := image-no\n  if v0 != 0 then jump fx33-fail\n  if v1 != 0 then jump fx33-fail\n  if v2 != 4 then jump fx33-fail\n\t\n  i := image-ok\n: fx33-fail\n  sprite x2 y 4\n\n#################\n# Test Fx1E\n\n  y += 5\n  drawop imF imE\n  i := image-no\n  v6 := 4\n  i += v6\n  sprite x2 y 4\n\n#################\n# Test to see if registers are 8 bit, as thoroughly as possible.\n\n  y += 5\n  drawop imV imX\n  i := image-ok\n\n  # Addition opcodes should not allow us to overflow\n  v6 := 255\n  v6 += 10\n  if v6 != 9 then i := image-no\n  v6 >>= v6\n  if v6 != 4 then i := image-no\n  v6 := 255\n  v0 := 10\n  v6 += v0\n  if v6 != 9 then i := image-no\n  v6 >>= v6\n  if v6 != 4 then i := image-no\n\n  # Shift opcodes should not retain bits\n  v6 := 255\n  v6 <<= v6\n  v6 >>= v6\n  if v6 != 127 then i := image-no\n  v6 >>= v6\n  v6 <<= v6\n  if v6 != 126 then i := image-no\n\n  # Subtraction should wrap back to positive\n  v6 := 5\n  v6 -= 10\n  if v6 != 251 then i := image-no\n  v6 := 5\n  v6 -= v0\n  if v6 != 251 then i := image-no\n  v6 := 5\n  v0 =- v6\n  if v0 != 251 then i := image-no\n\n  sprite x2 y 4\n\n#################\n# Test is done!\n\n  loop again\n\n: scratchpad\n  0xAA\n: scratchpad-plus-1\n  0x55 0\n\n# Positive and negative images\n: image-no\n  0b00000000\n  0b10100000\n  0b01000000\n  0b10100000\n: image-ok\n  0b00000000\n  0b10100000\n  0b11000000\n  0b10000000\n\n# Individual characters, some taken from Corax89' test.\n: im0\n  0b11100000\n  0b10100000\n  0b10100000\n  0b11100000\n: im1\n  0b11000000\n  0b01000000\n  0b01000000\n  0b11100000\n: im2\n  0b11100000\n  0b00100000\n  0b11000000\n  0b11100000\n: im3\n  0b11100000\n  0b01100000\n  0b00100000\n  0b11100000\n: im4\n  0b10100000\n  0b11100000\n  0b00100000\n  0b00100000\n: im5\n  0b11100000\n  0b11000000\n  0b00100000\n  0b11000000\n: im6\n  0b01100000\n  0b10000000\n  0b11100000\n  0b11100000\n: im7\n  0b11100000\n  0b00100000\n  0b01000000\n  0b01000000\n: im8\n  0b11100000\n  0b11100000\n  0b10100000\n  0b11100000\n: im9\n  0b11100000\n  0b11100000\n  0b00100000\n  0b11000000\n: imA\n  0b01000000\n  0b10100000\n  0b11100000\n  0b10100000\n: imB\n  0b11000000\n  0b11100000\n  0b10100000\n  0b11100000\n: imC\n  0b11100000\n  0b10000000\n  0b10000000\n  0b11100000\n: imD\n  0b11000000\n  0b10100000\n  0b10100000\n  0b11000000\n: imE\n  0b11100000\n  0b11000000\n  0b10000000\n  0b11100000\n: imF\n  0b11100000\n  0b10000000\n  0b11000000\n  0b10000000\n: imV\n  0b00000000\n  0b10100000\n  0b10100000\n  0b01000000\n: imX\n  0b10100000\n  0b01000000\n  0b10100000\n  0b10100000\n\n: version\n: version-0-0\n  0x0a 0xae 0xa2 0x42\n: version-1-0\n  0x38 0x08 0x30 0xb8\n\n","options":{"tickrate":20,"fillColor":"#FFCC00","fillColor2":"#FF6600","blendColor":"#662200","backgroundColor":"#996600","buzzColor":"#FFAA00","quietColor":"#000000","shiftQuirks":false,"loadStoreQuirks":false,"vfOrderQuirks":false,"clipQuirks":true,"jumpQuirks":false,"logicQuirks":true,"vBlankQuirks":true,"screenRotation":0,"maxSize":3216,"touchInputMode":"vip","fontStyle":"octo","displayScale":"6"},"rom":[18,10,96,1,0,238,96,2,18,166,0,224,104,50,107,26,164,241,216,180,104,58,164,245,216,180,104,2,105,6,106,11,107,1,101,42,102,43,164,181,216,180,164,237,217,180,164,165,54,43,164,161,218,180,107,6,164,185,216,180,164,237,217,180,164,161,69,42,164,165,218,180,107,11,164,189,216,180,164,237,217,180,164,161,85,96,164,165,218,180,107,16,164,197,216,180,164,237,217,180,164,161,118,255,70,42,164,165,218,180,123,5,164,205,216,180,164,237,217,180,164,161,149,96,164,165,218,180,123,5,164,173,216,180,164,237,217,180,164,165,18,144,164,161,218,180,104,18,105,22,106,27,107,1,164,177,216,180,164,237,217,180,96,0,34,2,164,165,64,0,164,161,218,180,123,5,164,169,216,180,164,225,217,180,164,165,64,2,164,161,48,0,218,180,123,5,164,201,216,180,164,169,217,180,164,161,101,42,103,0,135,80,71,42,164,165,218,180,123,5,164,201,216,180,164,173,217,180,164,161,102,11,103,42,135,97,71,43,164,165,218,180,123,5,164,201,216,180,164,177,217,180,164,161,102,120,103,31,135,98,71,24,164,165,218,180,123,5,164,201,216,180,164,181,217,180,164,161,102,120,103,31,135,99,71,103,164,165,218,180,104,34,105,38,106,43,107,1,164,201,216,180,164,185,217,180,164,161,102,140,103,140,135,100,71,24,164,165,218,180,123,5,164,201,216,180,164,189,217,180,164,161,102,140,103,120,135,101,71,236,164,165,218,180,123,5,164,201,216,180,164,197,217,180,164,161,102,120,103,140,135,103,71,236,164,165,218,180,123,5,164,201,216,180,164,193,217,180,164,161,102,15,134,102,70,7,164,165,218,180,123,5,164,201,216,180,164,225,217,180,164,161,102,224,134,110,70,192,164,165,218,180,123,5,164,229,216,180,164,193,217,180,164,158,241,101,164,165,48,170,164,161,49,85,164,161,218,180,104,50,105,54,106,59,107,1,164,229,216,180,164,189,217,180,164,158,96,0,97,48,241,85,164,158,240,101,129,0,164,159,240,101,164,165,48,48,164,161,49,0,164,161,218,180,123,5,164,229,216,180,164,181,217,180,164,158,102,137,246,51,242,101,164,161,48,1,20,50,49,3,20,50,50,7,20,50,164,158,102,65,246,51,242,101,164,161,48,0,20,50,49,6,20,50,50,5,20,50,164,158,102,4,246,51,242,101,164,161,48,0,20,50,49,0,20,50,50,4,20,50,164,165,218,180,123,5,164,229,216,180,164,225,217,180,164,161,102,4,246,30,218,180,123,5,164,233,216,180,164,237,217,180,164,165,102,255,118,10,54,9,164,161,134,102,54,4,164,161,102,255,96,10,134,4,54,9,164,161,134,102,54,4,164,161,102,255,134,110,134,102,54,127,164,161,134,102,134,110,54,126,164,161,102,5,118,246,54,251,164,161,102,5,134,5,54,251,164,161,102,5,128,103,48,251,164,161,218,180,20,156,170,85,0,0,160,64,160,0,160,192,128,224,160,160,224,192,64,64,224,224,32,192,224,224,96,32,224,160,224,32,32,224,192,32,192,96,128,224,224,224,32,64,64,224,224,160,224,224,224,32,192,64,160,224,160,192,224,160,224,224,128,128,224,192,160,160,192,224,192,128,224,224,128,192,128,0,160,160,64,160,64,160,160,10,174,162,66,56,8,48,184]}</script>
+<script>data={"program":"# This is an adaptation and extension of the CHIP-8 test rom from corax89,\n# original can be found here:\n# https://github.com/corax89/chip8-test-rom\n\n# MIT License\n#\n# Copyright (c) 2019 corax89, 2023,2024 Timendus\n#\n# Permission is hereby granted, free of charge, to any person obtaining a copy\n# of this software and associated documentation files (the \"Software\"), to deal\n# in the Software without restriction, including without limitation the rights\n# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n# copies of the Software, and to permit persons to whom the Software is\n# furnished to do so, subject to the following conditions:\n#\n# The above copyright notice and this permission notice shall be included in all\n# copies or substantial portions of the Software.\n#\n# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n# SOFTWARE.\n\n:alias x0 v8\n:alias x1 v9\n:alias x2 vA\n:alias y  vB\n\n:macro drawop A B {\n  i := A\n  sprite x0 y 4\n\n  i := B\n  sprite x1 y 4\n}\n\n: test-2X-0E\n  v0 := 1\n  return\n  # These opcodes will run if the interpreter doesn't have return (00EE) implemented:\n  v0 := 2\n  jump test-2X-0E-hard-return\n\n: main\n  clear\n\n  # Display current version\n  x0 := 50\n  y := 26\n  i := version-0-0\n  sprite x0 y 4\n  x0 := 58\n  i := version-1-0\n  sprite x0 y 4\n\n  # Show output in the first column\n  x0 := 2\n  x1 := 6\n  x2 := 11\n  y := 1\n\n#################\n# Test 3xNN\n\n  v5 := 42\n  v6 := 43\n  drawop im3 imX\n  i := image-no\n  if v6 != 42 then i := image-ok\n  if v6 != 43 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test 4xNN\n\n  y := 6\n  drawop im4 imX\n  i := image-no\n  if v5 == 42 then i := image-ok\n  if v5 == 43 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test 5xy0\n\n  y := 11\n  drawop im5 imX\n  i := image-no  \n  if v5 != v6 then i := image-ok\n  if v5 != v5 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test 7xNN\n\n  y := 16\n  drawop im7 imX\n  i := image-no\n  v6 += 255\n  if v6 == 42 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 9xy0\n\n  y += 5\n  drawop im9 imX\n  i := image-no\n  if v5 == v6 then i := image-ok\n  if v5 == vb then i := image-no\n  sprite x2 y 4\n\n#################\n# Test 1NNN (displayed as 1X)\n\n  y += 5\n  drawop im1 imX\n  i := image-ok\n  jump test-1X-pass\n  i := image-no\n: test-1X-pass\n  sprite x2 y 4\n\n  # Show output in the second column\n  x0 := 18\n  x1 := 22\n  x2 := 27\n  y := 1\n\n#################\n# Test calling subroutines (2NNN, displayed as 2X)\n\n  drawop im2 imX\n  v0 := 0\n  test-2X-0E    # Attempt to run a subroutine\n: test-2X-0E-hard-return\n  i := image-ok\n  if v0 == 0 then i := image-no  # Subroutine was never called\n  sprite x2 y 4\n\n#################\n# Test returning from subroutines (00EE, displayed as 0E)\n\n  y += 5\n  drawop im0 imE\n  i := image-ok\n  if v0 == 2 then i := image-no  # Return didn't work\n  if v0 != 0 then sprite x2 y 4  # If subroutine wasn't called, return wasn't tested\n\n#################\n# Test 8xy0\n\n  y += 5\n  drawop im8 im0\n  i := image-no\n  v5 := 42\n  v7 := 0\n  v7 := v5\n  if v7 == 42 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy1\n\n  y += 5\n  drawop im8 im1\n  i := image-no\n  v6 := 11\n  v7 := 42\n  v7 |= v6\n  if v7 == 43 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy2\n\n  y += 5\n  drawop im8 im2\n  i := image-no\n  v6 := 120\n  v7 := 31\n  v7 &= v6\n  if v7 == 24 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy3\n\n  y += 5\n  drawop im8 im3\n  i := image-no\n  v6 := 120\n  v7 := 31\n  v7 ^= v6\n  if v7 == 103 then i := image-ok\n  sprite x2 y 4\n\n  # Show output in the third column\n  x0 := 34\n  x1 := 38\n  x2 := 43\n  y  := 1\n\n#################\n# Test 8xy4\n\n  drawop im8 im4\n  i := image-no\n  v6 := 140\n  v7 := 140\n  v7 += v6\n  if v7 == 24 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy5\n\n  y += 5\n  drawop im8 im5\n  i := image-no\n  v6 := 140\n  v7 := 120\n  v7 -= v6\n  if v7 == 236 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy7\n\n  y += 5\n  drawop im8 im7\n  i := image-no\n  v6 := 120\n  v7 := 140\n  v7 =- v6\n  if v7 == 236 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy6\n\n  y += 5\n  drawop im8 im6\n  i := image-no\n  v6 := 15\n  v6 >>= v6\n  if v6 == 7 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xyE\n\n  y += 5\n  drawop im8 imE\n  i := image-no\n  v6 := 224\n  v6 <<= v6\n  if v6 == 192 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test Fx65\n\n  y += 5\n  drawop imF im6\n  i := scratchpad\n  load v1\n  i := image-ok\n  if v0 != 0xAA then i := image-no\n  if v1 != 0x55 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test Fx55\n\n  x0 := 50\n  x1 := 54\n  x2 := 59\n  y  := 1\n  drawop imF im5\n  i := scratchpad\n  v0 := 0\n  v1 := 48\n  save v1\n  i := scratchpad\n  load v0\n  v1 := v0\n  i := scratchpad-plus-1\n  load v0\n  i := image-ok\n  if v0 != 48 then i := image-no\n  if v1 != 0 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test Fx33\n\n  y += 5\n  drawop imF im3\n\n  # N >= 100\n  i := scratchpad\n  v6 := 137\n  bcd v6\n  load v2\n  i := image-no\n  if v0 != 1 then jump fx33-fail\n  if v1 != 3 then jump fx33-fail\n  if v2 != 7 then jump fx33-fail\n  \n  # N < 100\n  i := scratchpad\n  v6 := 65\n  bcd v6\n  load v2\n  i := image-no  \n  if v0 != 0 then jump fx33-fail\n  if v1 != 6 then jump fx33-fail\n  if v2 != 5 then jump fx33-fail\n  \n  # N < 10\n  i := scratchpad\n  v6 := 4\n  bcd v6\n  load v2\n  i := image-no\n  if v0 != 0 then jump fx33-fail\n  if v1 != 0 then jump fx33-fail\n  if v2 != 4 then jump fx33-fail\n\t\n  i := image-ok\n: fx33-fail\n  sprite x2 y 4\n\n#################\n# Test Fx1E\n\n  y += 5\n  drawop imF imE\n  i := image-no\n  v6 := 4\n  i += v6\n  sprite x2 y 4\n\n#################\n# Test to see if registers are 8 bit, as thoroughly as possible.\n\n  y += 5\n  drawop imV imX\n  i := image-ok\n\n  # Addition opcodes should not allow us to overflow\n  v6 := 255\n  v6 += 10\n  if v6 != 9 then i := image-no\n  v6 >>= v6\n  if v6 != 4 then i := image-no\n  v6 := 255\n  v0 := 10\n  v6 += v0\n  if v6 != 9 then i := image-no\n  v6 >>= v6\n  if v6 != 4 then i := image-no\n\n  # Shift opcodes should not retain bits\n  v6 := 255\n  v6 <<= v6\n  v6 >>= v6\n  if v6 != 127 then i := image-no\n  v6 >>= v6\n  v6 <<= v6\n  if v6 != 126 then i := image-no\n\n  # Subtraction should wrap back to positive\n  v6 := 5\n  v6 -= 10\n  if v6 != 251 then i := image-no\n  v6 := 5\n  v6 -= v0\n  if v6 != 251 then i := image-no\n  v6 := 5\n  v0 =- v6\n  if v0 != 251 then i := image-no\n\n  sprite x2 y 4\n\n#################\n# Test is done!\n\n  loop again\n\n: scratchpad\n  0xAA\n: scratchpad-plus-1\n  0x55 0\n\n# Positive and negative images\n: image-no\n  0b00000000\n  0b10100000\n  0b01000000\n  0b10100000\n: image-ok\n  0b00000000\n  0b10100000\n  0b11000000\n  0b10000000\n\n# Individual characters, some taken from Corax89' test.\n: im0\n  0b11100000\n  0b10100000\n  0b10100000\n  0b11100000\n: im1\n  0b11000000\n  0b01000000\n  0b01000000\n  0b11100000\n: im2\n  0b11100000\n  0b00100000\n  0b11000000\n  0b11100000\n: im3\n  0b11100000\n  0b01100000\n  0b00100000\n  0b11100000\n: im4\n  0b10100000\n  0b11100000\n  0b00100000\n  0b00100000\n: im5\n  0b11100000\n  0b11000000\n  0b00100000\n  0b11000000\n: im6\n  0b01100000\n  0b10000000\n  0b11100000\n  0b11100000\n: im7\n  0b11100000\n  0b00100000\n  0b01000000\n  0b01000000\n: im8\n  0b11100000\n  0b11100000\n  0b10100000\n  0b11100000\n: im9\n  0b11100000\n  0b11100000\n  0b00100000\n  0b11000000\n: imA\n  0b01000000\n  0b10100000\n  0b11100000\n  0b10100000\n: imB\n  0b11000000\n  0b11100000\n  0b10100000\n  0b11100000\n: imC\n  0b11100000\n  0b10000000\n  0b10000000\n  0b11100000\n: imD\n  0b11000000\n  0b10100000\n  0b10100000\n  0b11000000\n: imE\n  0b11100000\n  0b11000000\n  0b10000000\n  0b11100000\n: imF\n  0b11100000\n  0b10000000\n  0b11000000\n  0b10000000\n: imV\n  0b00000000\n  0b10100000\n  0b10100000\n  0b01000000\n: imX\n  0b10100000\n  0b01000000\n  0b10100000\n  0b10100000\n\n: version\n: version-0-0\n  0x0a 0xae 0xa2 0x42\n: version-1-0\n  0x38 0x08 0x30 0xb8\n\n","options":{"tickrate":20,"fillColor":"#FFCC00","fillColor2":"#FF6600","blendColor":"#662200","backgroundColor":"#996600","buzzColor":"#FFAA00","quietColor":"#000000","shiftQuirks":false,"loadStoreQuirks":false,"vfOrderQuirks":false,"clipQuirks":true,"jumpQuirks":false,"logicQuirks":true,"vBlankQuirks":true,"screenRotation":0,"maxSize":3216,"touchInputMode":"vip","fontStyle":"octo","displayScale":"6"},"rom":[18,10,96,1,0,238,96,2,18,182,0,224,104,50,107,26,165,1,216,180,104,58,165,5,216,180,104,2,105,6,106,11,107,1,101,42,102,43,164,197,216,180,164,253,217,180,164,177,54,42,164,181,54,43,164,177,218,180,107,6,164,201,216,180,164,253,217,180,164,177,69,42,164,181,69,43,164,177,218,180,107,11,164,205,216,180,164,253,217,180,164,177,85,96,164,181,85,80,164,177,218,180,107,16,164,213,216,180,164,253,217,180,164,177,118,255,70,42,164,181,218,180,123,5,164,221,216,180,164,253,217,180,164,177,149,96,164,181,149,176,164,177,218,180,123,5,164,189,216,180,164,253,217,180,164,181,18,160,164,177,218,180,104,18,105,22,106,27,107,1,164,193,216,180,164,253,217,180,96,0,34,2,164,181,64,0,164,177,218,180,123,5,164,185,216,180,164,241,217,180,164,181,64,2,164,177,48,0,218,180,123,5,164,217,216,180,164,185,217,180,164,177,101,42,103,0,135,80,71,42,164,181,218,180,123,5,164,217,216,180,164,189,217,180,164,177,102,11,103,42,135,97,71,43,164,181,218,180,123,5,164,217,216,180,164,193,217,180,164,177,102,120,103,31,135,98,71,24,164,181,218,180,123,5,164,217,216,180,164,197,217,180,164,177,102,120,103,31,135,99,71,103,164,181,218,180,104,34,105,38,106,43,107,1,164,217,216,180,164,201,217,180,164,177,102,140,103,140,135,100,71,24,164,181,218,180,123,5,164,217,216,180,164,205,217,180,164,177,102,140,103,120,135,101,71,236,164,181,218,180,123,5,164,217,216,180,164,213,217,180,164,177,102,120,103,140,135,103,71,236,164,181,218,180,123,5,164,217,216,180,164,209,217,180,164,177,102,15,134,102,70,7,164,181,218,180,123,5,164,217,216,180,164,241,217,180,164,177,102,224,134,110,70,192,164,181,218,180,123,5,164,245,216,180,164,209,217,180,164,174,241,101,164,181,48,170,164,177,49,85,164,177,218,180,104,50,105,54,106,59,107,1,164,245,216,180,164,205,217,180,164,174,96,0,97,48,241,85,164,174,240,101,129,0,164,175,240,101,164,181,48,48,164,177,49,0,164,177,218,180,123,5,164,245,216,180,164,197,217,180,164,174,102,137,246,51,242,101,164,177,48,1,20,66,49,3,20,66,50,7,20,66,164,174,102,65,246,51,242,101,164,177,48,0,20,66,49,6,20,66,50,5,20,66,164,174,102,4,246,51,242,101,164,177,48,0,20,66,49,0,20,66,50,4,20,66,164,181,218,180,123,5,164,245,216,180,164,241,217,180,164,177,102,4,246,30,218,180,123,5,164,249,216,180,164,253,217,180,164,181,102,255,118,10,54,9,164,177,134,102,54,4,164,177,102,255,96,10,134,4,54,9,164,177,134,102,54,4,164,177,102,255,134,110,134,102,54,127,164,177,134,102,134,110,54,126,164,177,102,5,118,246,54,251,164,177,102,5,134,5,54,251,164,177,102,5,128,103,48,251,164,177,218,180,20,172,170,85,0,0,160,64,160,0,160,192,128,224,160,160,224,192,64,64,224,224,32,192,224,224,96,32,224,160,224,32,32,224,192,32,192,96,128,224,224,224,32,64,64,224,224,160,224,224,224,32,192,64,160,224,160,192,224,160,224,224,128,128,224,192,160,160,192,224,192,128,224,224,128,192,128,0,160,160,64,160,64,160,160,10,174,162,66,56,8,48,184]}</script>
 <script>"use strict";
 
 function invertKeymap(k) {
diff --git a/package.json b/package.json
index f19dc96..0e41f53 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "Timendus' CHIP-8 Test Suite",
   "scripts": {
     "start": "npm run scale-splash && npm run build-tests",
-    "scale-splash": "ffmpeg -y -i pictures/splash.png -vf scale=96:-1 -sws_flags neighbor pictures/splash2x.png",
+    "scale-splash": "ffmpeg -y -i pictures/splash.png -vf scale=96:-1 -sws_flags neighbor -update true pictures/splash2x.png",
     "build-tests": "for TEST in ./src/tests/*.8o; do export TEST=`basename ${TEST%.*}`; npm run build-test; done",
     "build-test": "echo \"Building ${TEST}.ch8\" && octopus src/tests/${TEST}.8o bin/${TEST}.8o && octo bin/${TEST}.8o bin/${TEST}.ch8 && octo --options octo-config.json bin/${TEST}.8o docs/${TEST}.html && cat bin/${TEST}.8o | pbcopy"
   },
diff --git a/pictures/splash2x.png b/pictures/splash2x.png
index 189d26f1e5cdde53a490d34d3a4bd00bef17a528..af168b51f06cd8ecdf24cd16974eb63ac8ff90ec 100644
GIT binary patch
delta 901
zcmV;01A6?H2eAi`Ie&v`LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N##Ud32Gl+;}
zs7`iK5yx7EB2);qLaPoYmwrK$h9t$sQE)9d__0`ZaB<ev!Br3hKR}!voD^N8#Q&v*
z7BL<i_v78Y$K5+XsF#^;cf|nRaI91!E@iT-QqL<w5HWyJ1b-D~n{%?9gzxyeM}V()
zQJ&?0?$6Pu<!lB7B;pt|Er)o6cxKZvIqwsTtf*+j=fo2hU6A;Z>uQtVI2Sw?c&2Ej
zQ}e_ku~g__wS!sF(ut>uBbshdzL06M#(9ggUaqp%J^2g6Ib&s+>oiA@z#^6)LxPGb
zN+`oYlvaZj8-FR<kNfzCJ-<vYm0Tq-ax9<%9g61%|AXJ%+WD!;W>Po~bicUn#~9GF
z3p8r3`+e-XjT0dF3|tv)f29u0ev)2mYmp<Me;c^CZfoiuaJd5vJ(-H7cv6t2kk13}
zXY@^3VDJ{`U2FE%+Q;bwkfyGZH^9LmFkYbSb)R>KI)8in_e`t5A6|HJp4H;#{r~_0
z)Ja4^RCt{2mQilQFbqR`jNSj51G)j}j{#Q{DLG!ckY9mfQPgW-^zjJv12vwB9L`pM
z`n*xG*?<;A;qgVWqMv~|6S?to@pg#}C=rfZd;Z(Ei)BEGR6zL5tjJ;2Tbyu#3@FiB
zK>U=ofPa__MHx_{Re;9ID14IXWt>kz69t{?w+3WcmbFjwRfjLR+7-xOv}><e>`%=y
zpm3JjTw8#56QVcf3TM=awdlMXp1u{3+RS(HA+TEqliF)Q3ZR{X`)&sGX@JH`^tK<G
zcQc?*1EdaCm)rxW<!?ZVKaLw&@PK9?JW*YMnSY3<C%rhX0k!^~)!wRgwQKHe?NV$r
zAVzAe+Nzy|>W*(tcE&Tk42Y;6NrA)W3{Q5(GrbImsJ;_TnAw1m%vT1)C+Q?iG8<5m
z`TBsO=TXl?ueYyf1KI`Xj8)G7gr|HRnjy};kwY?T?W+F}5Vq??=eu~fx&D2K$)N6N
zKz_-NGA4X-C!ks{qY#Y&MZK0~S(g;P!1zmXtkkCS=b2f{u4Dreg7Osx8M8nw37*9}
z2r{5VkttrdAEood@Zb#SjprsnYHuwHcBlbTGYApYF*gM?*5?luf4a<v%{wsoaD4%?
bI|KR!tw>4X(;|$000000NkvXXu0mjfaFnqD

delta 874
zcmV-w1C{)-2bKqrIe&g>LqkwWLqi~Na&Km7Y-Iodc$|HaJxD@P7>1vFEs`h<a)^ky
zgEiGs5shVm1O{RTS`FQwG{Jkj+^e)W2CYIvKTB3aOLMIatw9j<1JT^jRMZl3<EWrS
z_ATe(J>UCrzW0D!&grJxHVvkgcjA$-l1wct9k2Ka(!(G=ReyKwnOH1J%lf)U66f8h
znAN)P&+0bTT^%F^nAUA457HVixs|sC?*l=7Lp4A;2S%J^Y8j+Qp=&jM6P&5CEM^9s
zM0^(HAfRNLSZiW^!!bdg078ao86YQXYzQt2Hgg5N{!X!B*SfW|D0E<e2=gouLqVfJ
zmK=FT$zq}45`QN`xP`yJ>W@)CBS#h;g*i4cQLBE$AN<bNO^=V&CUu3O{l)V>hM;2?
zDkabRKK8uI3HYAj%4+yG%P{o`zEVRA9YJ6lF0LDzwg;Cx(D!7kj#`y`fSgXl`x$hn
zp!XI!S8BP{?>T*dL=mDlaBv9283?Sl*xTQn+rK^a{C|D`UU+hzhL$D+0005LNkl<Z
zc%1E)U2elL41;@&-T#^cwgK%+07n!lDPDibr@*!->Pu?$b_?_ibvzR}T&;fhb)sUi
z0S!dq@kOzs*T9^K-1xp311JMZgyYtp|95v-29!tzgwL#s9Hw@0!T}jjqFF$Emsvne
zhN288(SH=6<BIwd!?ld_C1|3c>-t9nvMkHmr}e7Cmt5@%<S*LUD;E1xy$mSqr54u)
z;N67ijlRMeHDWC~?}oc?1*8`50i=%CL4zkXpm@@qjr(o}^lE^PE75L0H1B3WuLekM
ztPZ&cP|M$d5`P>wvfu%&KC^(Bj<|bLi{lzl>woWAZC71at4@aO%u*~fAVzAe+Nhm`
z>Wn8R4d|@^U56&jY(PooX9mP4=_E`t8&Hz@`2j`GNB!LO*nK=3&@Mn%jCuti+~w=8
z2q=#!JUKh+8v??1o#=cO@3yXg-^FB5XEdN>Mi~=6xf4*WmQjetfTCK<vaF{RzQAhN
zb7QSLf1c?zb|o8-5R_kGkTC<)lHgvvgCGM+6q(|I`%yYCh6iUrC!U)CskOBz*r5hU
z%^*Zn+k7aX<NErc;!l_Puz3dtA6_3o_Q`<$0If(#;VH1lvj6}907*qoM6N<$g3)xB
AlK=n!

diff --git a/src/tests/3-corax+.8o b/src/tests/3-corax+.8o
index fc9fe85..b3d1a01 100644
--- a/src/tests/3-corax+.8o
+++ b/src/tests/3-corax+.8o
@@ -68,7 +68,8 @@
   v5 := 42
   v6 := 43
   drawop im3 imX
-  i := image-ok
+  i := image-no
+  if v6 != 42 then i := image-ok
   if v6 != 43 then i := image-no
   sprite x2 y 4
 
@@ -79,6 +80,7 @@
   drawop im4 imX
   i := image-no
   if v5 == 42 then i := image-ok
+  if v5 == 43 then i := image-no
   sprite x2 y 4
 
 #################
@@ -86,8 +88,9 @@
 
   y := 11
   drawop im5 imX
-  i := image-no
+  i := image-no  
   if v5 != v6 then i := image-ok
+  if v5 != v5 then i := image-no
   sprite x2 y 4
 
 #################
@@ -107,6 +110,7 @@
   drawop im9 imX
   i := image-no
   if v5 == v6 then i := image-ok
+  if v5 == vb then i := image-no
   sprite x2 y 4
 
 #################