add frame counter at memory location 72

examples/curlywas/tunnel.cwa

@@ -3,14 +3,16 @@ include "../include/microw8-api.cwa"
 export fn upd() {
     let i: i32;
     loop pixels {
-        let inline t = time() * 63 as f32;
-        let lazy x = (i % 320 - 160) as f32;
-        let lazy y = (i / 320 - 120) as f32;
-        let inline d = 40000 as f32 / sqrt(x * x + y * y);
-        let inline u = atan2(x, y) * (512.0 / 3.141);
-        let inline c = ((i32.trunc_sat_f32_s(d + t * 2 as f32) ^ i32.trunc_sat_f32_s(u + t)) & 255) >> 4;
+        let inline t = 16!56;
+        let inline x = (i % 320 - 160) as f32;
+        let inline y = (i #/ 320 - 120) as f32;
+        let inline d = 0xa000 as f32 / sqrt(x * x + y * y);
+        let inline a = atan2(x, y) * 163_f; // (512 / pi)
+        let inline u = i32.trunc_sat_f32_s(a) + t;
+        let inline v = i32.trunc_sat_f32_s(d) + t * 2;
+        let inline c = ((v ^ u) #/ 16) % 16;
         i?FRAMEBUFFER = c;
 
         branch_if (i := i + 1) < 320*240: pixels;
     }
-}
+}

site/content/docs.md

@@ -21,7 +21,7 @@ loaded.
 00000-00040: user memory
 00040-00044: time since module start in ms
 00044-0004c: gamepad state
-0004c-00050: reserved
+0004c-00050: number of frames since module start
 00050-00070: sound data (synced to sound thread)
 00070-00078: reserved
 00078-12c78: frame buffer

src/run-web.html

@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf8"><title>uw8-run</title><style>html,body,canvas{background-color:#202024;margin:0;padding:0}html{height:100%}body{grid-template-rows:1fr;height:100%;display:grid}#screen{image-rendering:pixelated;border:4px solid #303040;place-self:center}#message{color:#c64;z-index:2;background-color:#0006;width:calc(100% - 16px);padding:8px;font:700 12pt sans-serif;position:absolute}@media (width>=648px) and (height>=488px){#screen{width:640px;height:480px}}@media (width>=968px) and (height>=728px){#screen{width:960px;height:720px}}</style></head><body> <canvas id="screen" width="320" height="240" tabindex="1"> </canvas> <div id="message"></div> </body><script type="module">function e(e){return e&&e.__esModule?e.default:e}var t={};t="data:application/wasm;base64,AGFzbQEAAAABFQRgAX8Bf2ACf38Bf2ADf39%2FAGAAAAIPAQNlbnYGbWVtb3J5AgAEAwkIAAABAgEAAAMGEAN%2FAUEAC38BQQALfwFBAAsHGQIIbG9hZF91dzgAAAp1bmNvbXByZXNzAAQIAQcKngUIxwEBB39BAC0AAEEBayIBQQBIBEAgAA8LQYDAByAAaiECIAFBAXEEQEEBQYHABxAEIQIFQYDAB0EAIAAQAwtBAEGAhA9BCBADQYiEDyEDQQghBEGBwAchBQNAIAUgAkggAyMATiAFLQAAIAMtAABMcnEEQCAEIAQgBRACIgZqIQQgAyMASCAFLQAAIAMtAABGcQRAIAMgAxABaiEDCyAFIAZqIQUMAQsgAyMASARAIAQgBCADEAIiB2ohBCADIAdqIQMMAQsLIAQLPAEEfyAAIQEDQCACIAFBAWoiAS0AACIEQf8AcSADdHIhAiADQQdqIQMgBEEHdQ0ACyABQQFqIABrIAJqCxIBAX8gACABIAEQASICEAMgAgskAANAIAJBAEoEQCAAIAJBAWsiAmogASACai0AADoAAAwBCwsLqQEBBn8gACQBQQAkAgNAIANBgAE6AICADyADQQFqIgNBgQNIDQALAkADQEEAEAYiBQRAIAQEf0EBBUGAAhAGCwRAQYECEAVBAWsiAkUNAwtBwQIQBSEGA0AgASABIAJrLQAAOgAAIAFBAWohASAGQQFrIgYNAAsFQQEhBwNAIAdBAXQgBxAGciIHQYACSA0ACyABIAc6AAAgAUEBaiEBCyAFIQQMAAsLIAELNAECfwNAIAAgAmoQBgRAIAEgACACakEgahAGIAJ0ciEBIAJBAWohAgwBCwsgAUEBIAJ0cgtxAQR%2FA0AjAkGAIEgEQCMCQQh0IwEtAAByJAIjAUEBaiQBDAELCyMCQf8BcSICIAAtAICADyIBIwJBCHUiA2xBgAIgAWsgA2wgAWsgAiABSCIEG2okAiAAIAFBByAEQYECbGogAWtBBHVqOgCAgA8gBAsMAEEAQYCEDxAEJAALC%2FMDAQBBAAvsA%2F%2Bfl7wzZsoSLKqmsehkfJ%2BoXizXJ8krjBr6Mx5dWkR96aZnQyWWGaXzQdWZfpcd9XFpdN9brE8ZBQo0n3Wr%2Fs%2BwcdFUW6079DEcDwjYmrxg5ptF4o7IlImwxEhJSWrBbtJepjaeC4PojV7Jghr1VPwDsc83RsuuCyL03791uwlwi0T8mJR%2BslH82ckKlC5TK6wnPyoB908kSeLY%2BEhunDhtWHA7EWwwdQvigYMhTQ6Cyi%2BXelkSq6CnCQnZrAqXrvEsSe7%2BYNt3Hg0MFycXedDIoFANBDyfPayn0VpyJB%2FigcLSUVngClYh6qibj%2FqMUJp3UMooPK9GHgeBn5L4EMDKto29nKMzuGul%2FU%2FcsrTpGvMsNhvP9oiRbGLT%2BtKN9Y08k3umAuKgZuPejhSaRu79ibrTYsFmp%2BjM%2Brr4qsTtbl3vja0Dt7VJRQGqxv7QJUhYkdtsCTqAzeflbQedZ%2FLk8GqBGmx%2F1xH7%2BmtrYLi8V%2FcpWd8a890NTAXJ80KPWJciuREplmTFtGa64gqCDRwwbOzsf8cmf6kXjcByItR9q057ZaXi0FuFXm35mohkeovFYeSXK%2FcVwzOmxlRyMiUTnsaQ299ys%2Bz4RHmnHPKsPhWT42j%2Fn1uicDm5gVxw4bSPORZK9Nzvk9y3%2Bg%3D%3D";var s={};s="data:;base64,AiHfzO34vaTkrd2eAWsXmnk6O0saNxyBOKpKJ4gIZgTFyYLQaErZlwVOzFHSIEwVOdwimalCVY189KvAjT1MA27zTIMgHP7UatKxjcsK5BFbXOHvjhm%2FLesv0gorLh3%2Bp4VSOVvsomIiXDlLL175jQw%2FbY3NPCAhv3e8gH24nzYFr4u3WeQHbVbcFOTxKFGLYMNOsU2QjF2XaPOdZFP32e58qAST0gBwmSKO6tuZq7JVC68uBldt4wWCJEbQqqENSUe5rtcAfyaSRf3gzZ3t3PgnwZHp6%2Fr0cjPo8rqIhvmzkLWI2m4jPwHc8k4s87Gjgpc4YQeipZW9q4PGqym6pnlfUAA8lRaqIo9U%2BnyqAMiI37LAL%2FqtHCi8JG1ByCyw6d9Pf7TLrazkjNNHPa5IJV%2BD8KUJQcCDLquYfrU2baSeirg4QH64Pxevmuo5j9pF97P%2FrfT18mBqcFoba%2Bc1jAeWPRoOSmD9M%2FPIsO1a%2F4bjFd0Uuru95ilanB4yFg4tk9FRqP2zJPk0T4LAzWMXzSX8%2F0VBgOogv%2BniB0XHFmaXv%2BG0PqGrx2sDO2N%2Fi98A3DdQyry%2Fs1%2Bb8mid6w7g5mptwhx561baq1syBSrGSJLqcDAutTh8uXZYvVXbFVzmxfLpAxsR898NHK51FkzqvkxeaNnYbCkC19jhJaslZ1E0vdpidtMzv1uwHCp986mNDT3qK4nWbwOpG52kVtkmac18T9g428D%2BeyJW82GG1hJmGV%2F39FlEB5hxbyFZINNLLAfNwG08itW25ATJ7QxZ%2FAX8zoz%2FT7oLugeHUeMBtvBF%2Bt40Wh2n%2FvjehShTKyMYUvlDZTTzBq34hcaBhCNCHTEHV8bRzoBK3%2Fx0qmeTW2l8vG7KCizhl8VoxALJiY84Isnu1OAS8vKw35FHVUWXDfXLUJw0WooJ%2BdxHnwkxlGBfeNGdWY0zJyRe3CgvsBiGlxC5nABF4pFYBMEOIGR6ev%2F3rrkXL34LdvKr2PkRuMr1gjvb8gGszxhBS40uxdOoWZLRyLA5OZ07W5nHTFbL5l6wKfJrIbrl8ZRamKdD5IXHETRJZq%2BlF3KOS0Jug3R8cjVTtBWYH4QDRXEym7uWNetxnlA5tTOl9kl811ZJeAM2A8TwUY%2FZdnIoPSqf5gUCE%2BcUvdRo55HwOX%2FONuPrPGxNEYIklsAJJlz0ElYqE3NVSphMj3u7re%2F5b%2Fpdf2kWhkJNIdLvvXng6YXb5RM4%2BtqFvQDNV%2FYrEnk4RuFORPr2gwu6%2FllhKTq8RPiV%2FblJi2QsxJnwlFraEsbG3l4E%2FXsovrzL38DcEhBo7wfBSc8JHfs4tMYKHDxzrkUp0Ge01YMKzvvWjrpXrS0Dszq5B5WUA3JOuIBrq6GPuOdFhrJ6Fj7kX3iuWhGxpXrxiyMP%2BE4ax9UTCBGnvV7Nz1wE1gHFVe%2FN%2FoVjMZqV4vhzuVyf%2FEifKcdy1P4dVr6JG6Dw%2FcYvPlvqTtfCo1Khl5In1IrxmO5Hhq8ytKIKG9vTeeCqFXjVMCR9vfkCGyMi%2FbOdvNj6b%2Bq0ijT%2FyxZEp0kb7RSaN%2BihR75CGv7qkh8fy5qZmNYTNxFB5K%2F95iN70AZ8xZwKmOMJ7qbBzNj4j7fyl2zFz2SBLEWrSxhsGXkGjJ7OJmKJhLv8YQNTZij5u4F%2BUGB8GQhVZxmd381jEs4J2fsfbymks0lLC9BhIuCjK%2FTD28z1r7Kw%2Fnk97YXukMfBrNql3Bgh84neyaijJtxmMtuY6rb3CxPYBBQ0xMF%2FI7y6GqQL3xC9SuH5T0q%2FUjPliNfNsZEPgQ7o33%2BM80WMQELh8YeQsBIagyeql1ifqUUZ7hbSygRpIw76Fi7cVCJtaSZzH%2F8CzuoIjbHHWASBtQfLFB2vboh6UuhkyQB4igq0JskQIpQUMQB3wfXs%2BX4La3LtcQfiLkrMDRuqEn0LBhq8pktJvJZvpDtTShpTWpe0F6N43zx0Tk7lxF1awWFSz%2Bw%2B8PR%2BDd70VPEdaOWGxaSXZfnvo5R5wGccKJl0xsCkCZPuh%2BoK5OSHSOQr4eKb561cvGfpj0oO2dpCuIgaDs0r%2B%2BiDwdP2FQkQjyLZKE%2F4OF%2BuzbR9U47GeWrcF0n%2FBUd1VmNDibVX9Fue6C6ssuz8DeiRfXr1gy1w6MeBFXipcCqPm4tDpLbjyncb1A6tXEpAG4kJff0WFLsAtoHJjQLEDzcLBBTWUedmJhr4cOuvOMLpkkKMRE1UDoSkh125vqlARIYGSYpMTjVXIH8Ax2tshe%2Line truncated
+<!doctype html><html><head><meta charset="utf8"><title>uw8-run</title><style>html,body,canvas{background-color:#202024;margin:0;padding:0}html{height:100%}body{grid-template-rows:1fr;height:100%;display:grid}#screen{image-rendering:pixelated;border:4px solid #303040;place-self:center}#message{color:#c64;z-index:2;background-color:#0006;width:calc(100% - 16px);padding:8px;font:700 12pt sans-serif;position:absolute}@media (width>=648px) and (height>=488px){#screen{width:640px;height:480px}}@media (width>=968px) and (height>=728px){#screen{width:960px;height:720px}}</style></head><body> <canvas id="screen" width="320" height="240" tabindex="1"> </canvas> <div id="message"></div> </body><script type="module">function e(e){return e&&e.__esModule?e.default:e}var t={};t="data:application/wasm;base64,AGFzbQEAAAABFQRgAX8Bf2ACf38Bf2ADf39%2FAGAAAAIPAQNlbnYGbWVtb3J5AgAEAwkIAAABAgEAAAMGEAN%2FAUEAC38BQQALfwFBAAsHGQIIbG9hZF91dzgAAAp1bmNvbXByZXNzAAQIAQcKngUIxwEBB39BAC0AAEEBayIBQQBIBEAgAA8LQYDAByAAaiECIAFBAXEEQEEBQYHABxAEIQIFQYDAB0EAIAAQAwtBAEGAhA9BCBADQYiEDyEDQQghBEGBwAchBQNAIAUgAkggAyMATiAFLQAAIAMtAABMcnEEQCAEIAQgBRACIgZqIQQgAyMASCAFLQAAIAMtAABGcQRAIAMgAxABaiEDCyAFIAZqIQUMAQsgAyMASARAIAQgBCADEAIiB2ohBCADIAdqIQMMAQsLIAQLPAEEfyAAIQEDQCACIAFBAWoiAS0AACIEQf8AcSADdHIhAiADQQdqIQMgBEEHdQ0ACyABQQFqIABrIAJqCxIBAX8gACABIAEQASICEAMgAgskAANAIAJBAEoEQCAAIAJBAWsiAmogASACai0AADoAAAwBCwsLqQEBBn8gACQBQQAkAgNAIANBgAE6AICADyADQQFqIgNBgQNIDQALAkADQEEAEAYiBQRAIAQEf0EBBUGAAhAGCwRAQYECEAVBAWsiAkUNAwtBwQIQBSEGA0AgASABIAJrLQAAOgAAIAFBAWohASAGQQFrIgYNAAsFQQEhBwNAIAdBAXQgBxAGciIHQYACSA0ACyABIAc6AAAgAUEBaiEBCyAFIQQMAAsLIAELNAECfwNAIAAgAmoQBgRAIAEgACACakEgahAGIAJ0ciEBIAJBAWohAgwBCwsgAUEBIAJ0cgtxAQR%2FA0AjAkGAIEgEQCMCQQh0IwEtAAByJAIjAUEBaiQBDAELCyMCQf8BcSICIAAtAICADyIBIwJBCHUiA2xBgAIgAWsgA2wgAWsgAiABSCIEG2okAiAAIAFBByAEQYECbGogAWtBBHVqOgCAgA8gBAsMAEEAQYCEDxAEJAALC%2FMDAQBBAAvsA%2F%2Bfl7wzZsoSLKqmsehkfJ%2BoXizXJ8krjBr6Mx5dWkR96aZnQyWWGaXzQdWZfpcd9XFpdN9brE8ZBQo0n3Wr%2Fs%2BwcdFUW6079DEcDwjYmrxg5ptF4o7IlImwxEhJSWrBbtJepjaeC4PojV7Jghr1VPwDsc83RsuuCyL03791uwlwi0T8mJR%2BslH82ckKlC5TK6wnPyoB908kSeLY%2BEhunDhtWHA7EWwwdQvigYMhTQ6Cyi%2BXelkSq6CnCQnZrAqXrvEsSe7%2BYNt3Hg0MFycXedDIoFANBDyfPayn0VpyJB%2FigcLSUVngClYh6qibj%2FqMUJp3UMooPK9GHgeBn5L4EMDKto29nKMzuGul%2FU%2FcsrTpGvMsNhvP9oiRbGLT%2BtKN9Y08k3umAuKgZuPejhSaRu79ibrTYsFmp%2BjM%2Brr4qsTtbl3vja0Dt7VJRQGqxv7QJUhYkdtsCTqAzeflbQedZ%2FLk8GqBGmx%2F1xH7%2BmtrYLi8V%2FcpWd8a890NTAXJ80KPWJciuREplmTFtGa64gqCDRwwbOzsf8cmf6kXjcByItR9q057ZaXi0FuFXm35mohkeovFYeSXK%2FcVwzOmxlRyMiUTnsaQ299ys%2Bz4RHmnHPKsPhWT42j%2Fn1uicDm5gVxw4bSPORZK9Nzvk9y3%2Bg%3D%3D";var s={};s="data:;base64,AiHfzO34vaTkrd2eAWsXmnk6O0saNxyBOKpKJ4gIZgTFyYLQaErZlwVOzFHSIEwVOdwimalCVY189KvAjT1MA27zTIMgHP7UatKxjcsK5BFbXOHvjhm%2FLesv0gorLh3%2Bp4VSOVvsomIiXDlLL175jQw%2FbY3NPCAhv3e8gH24nzYFr4u3WeQHbVbcFOTxKFGLYMNOsU2QjF2XaPOdZFP32e58qAST0gBwmSKO6tuZq7JVC68uBldt4wWCJEbQqqENSUe5rtcAfyaSRf3gzZ3t3PgnwZHp6%2Fr0cjPo8rqIhvmzkLWI2m4jPwHc8k4s87Gjgpc4YQeipZW9q4PGqym6pnlfUAA8lRaqIo9U%2BnyqAMiI37LAL%2FqtHCi8JG1ByCyw6d9Pf7TLrazkjNNHPa5IJV%2BD8KUJQcCDLquYfrU2baSeirg4QH64Pxevmuo5j9pF97P%2FrfT18mBqcFoba%2Bc1jAeWPRoOSmD9M%2FPIsO1a%2F4bjFd0Uuru95ilanB4yFg4tk9FRqP2zJPk0T4LAzWMXzSX8%2F0VBgOogv%2BniB0XHFmaXv%2BG0PqGrx2sDO2N%2Fi98A3DdQyry%2Fs1%2Bb8mid6w7g5mptwhx561baq1syBSrGSJLqcDAutTh8uXZYvVXbFVzmxfLpAxsR898NHK51FkzqvkxeaNnYbCkC19jhJaslZ1E0vdpidtMzv1uwHCp986mNDT3qK4nWbwOpG52kVtkmac18T9g428D%2BeyJW82GG1hJmGV%2F39FlEB5hxbyFZINNLLAfNwG08itW25ATJ7QxZ%2FAX8zoz%2FT7oLugeHUeMBtvBF%2Bt40Wh2n%2FvjehShTKyMYUvlDZTTzBq34hcaBhCNCHTEHV8bRzoBK3%2Fx0qmeTW2l8vG7KCizhl8VoxALJiY84Isnu1OAS8vKw35FHVUWXDfXLUJw0WooJ%2BdxHnwkxlGBfeNGdWY0zJyRe3CgvsBiGlxC5nABF4pFYBMEOIGR6ev%2F3rrkXL34LdvKr2PkRuMr1gjvb8gGszxhBS40uxdOoWZLRyLA5OZ07W5nHTFbL5l6wKfJrIbrl8ZRamKdD5IXHETRJZq%2BlF3KOS0Jug3R8cjVTtBWYH4QDRXEym7uWNetxnlA5tTOl9kl811ZJeAM2A8TwUY%2FZdnIoPSqf5gUCE%2BcUvdRo55HwOX%2FONuPrPGxNEYIklsAJJlz0ElYqE3NVSphMj3u7re%2F5b%2Fpdf2kWhkJNIdLvvXng6YXb5RM4%2BtqFvQDNV%2FYrEnk4RuFORPr2gwu6%2FllhKTq8RPiV%2FblJi2QsxJnwlFraEsbG3l4E%2FXsovrzL38DcEhBo7wfBSc8JHfs4tMYKHDxzrkUp0Ge01YMKzvvWjrpXrS0Dszq5B5WUA3JOuIBrq6GPuOdFhrJ6Fj7kX3iuWhGxpXrxiyMP%2BE4ax9UTCBGnvV7Nz1wE1gHFVe%2FN%2FoVjMZqV4vhzuVyf%2FEifKcdy1P4dVr6JG6Dw%2FcYvPlvqTtfCo1Khl5In1IrxmO5Hhq8ytKIKG9vTeeCqFXjVMCR9vfkCGyMi%2FbOdvNj6b%2Bq0ijT%2FyxZEp0kb7RSaN%2BihR75CGv7qkh8fy5qZmNYTNxFB5K%2F95iN70AZ8xZwKmOMJ7qbBzNj4j7fyl2zFz2SBLEWrSxhsGXkGjJ7OJmKJhLv8YQNTZij5u4F%2BUGB8GQhVZxmd381jEs4J2fsfbymks0lLC9BhIuCjK%2FTD28z1r7Kw%2Fnk97YXukMfBrNql3Bgh84neyaijJtxmMtuY6rb3CxPYBBQ0xMF%2FI7y6GqQL3xC9SuH5T0q%2FUjPliNfNsZEPgQ7o33%2BM80WMQELh8YeQsBIagyeql1ifqUUZ7hbSygRpIw76Fi7cVCJtaSZzH%2F8CzuoIjbHHWASBtQfLFB2vboh6UuhkyQB4igq0JskQIpQUMQB3wfXs%2BX4La3LtcQfiLkrMDRuqEn0LBhq8pktJvJZvpDtTShpTWpe0F6N43zx0Tk7lxF1awWFSz%2Bw%2B8PR%2BDd70VPEdaOWGxaSXZfnvo5R5wGccKJl0xsCkCZPuh%2BoK5OSHSOQr4eKb561cvGfpj0oO2dpCuIgaDs0r%2B%2BiDwdP2FQkQjyLZKE%2F4OF%2BuzbR9U47GeWrcF0n%2FBUd1VmNDibVX9Fue6C6ssuz8DeiRfXr1gy1w6MeBFXipcCqPm4tDpLbjyncb1A6tXEpAG4kJff0WFLsAtoHJjQLEDzcLBBTWUedmJhr4cOuvOMLpkkKMRE1UDoSkh125vqlARIYGSYpMTjVXIH8Ax2tshe%2Line truncated

src/run_native.rs

@@ -27,6 +27,7 @@ struct UW8Instance {
     end_frame: TypedFunc<(), ()>,
     update: Option<TypedFunc<(), ()>>,
     start_time: Instant,
+    frame_counter: u32,
     watchdog: Arc<Mutex<UW8WatchDog>>,
     sound_tx: Option<mpsc::SyncSender<RegisterUpdate>>,
 }
@@ -159,6 +160,7 @@ impl super::Runtime for MicroW8 {
             end_frame,
             update,
             start_time: Instant::now(),
+            frame_counter: 0,
             watchdog,
             sound_tx,
         });
@@ -191,8 +193,11 @@ impl super::Runtime for MicroW8 {
                 let mem = instance.memory.data_mut(&mut instance.store);
                 mem[64..68].copy_from_slice(&time.to_le_bytes());
                 mem[68..72].copy_from_slice(&input.gamepads);
+                mem[72..76].copy_from_slice(&instance.frame_counter.to_le_bytes());
             }
 
+            instance.frame_counter = instance.frame_counter.wrapping_add(1);
+
             instance.store.set_epoch_deadline(self.timeout as u64);
             if let Some(ref update) = instance.update {
                 if let Err(err) = update.call(&mut instance.store, ()) {

web/src/microw8.js

@@ -240,6 +240,7 @@ export default function MicroW8(screen, config = {}) {
             await audioReadyPromise;
     
             let startTime = Date.now();
+            let frameCounter = 0;
     
             const timePerFrame = 1000 / 60;
 
@@ -306,6 +307,7 @@ export default function MicroW8(screen, config = {}) {
                         let time = Date.now() - startTime;
                         u32Mem[16] = time;
                         u32Mem[17] = pad | gamepad;
+                        u32Mem[18] = frameCounter++;
                         if(instance.exports.upd) {
                             instance.exports.upd();
                         }