From 1548330e7a9f09496f2de76e4baa50954f3bc09d Mon Sep 17 00:00:00 2001
From: Pufferfish101007 <50246616+pufferfish101007@users.noreply.github.com>
Date: Wed, 17 Jan 2024 16:20:52 +0000
Subject: [PATCH] implement control_forever & stop button, and fix
 motion_gotoxy (#7)

* implement control_forever

* fix motion_gotoxy

* code cleanup

* add more blocks that request redraw

* remove unneeded logs
---
 playground/components/ProjectPlayer.vue |  5 +-
 playground/lib/project-runner.js        | 94 ++-----------------------
 src/ir.rs                               | 31 ++++++++
 src/targets/wasm.rs                     | 53 +++++++++++---
 4 files changed, 84 insertions(+), 99 deletions(-)

diff --git a/playground/components/ProjectPlayer.vue b/playground/components/ProjectPlayer.vue
index a708bd9..947f9b5 100644
--- a/playground/components/ProjectPlayer.vue
+++ b/playground/components/ProjectPlayer.vue
@@ -9,7 +9,7 @@
   <!--<template v-else>-->
     <br>
     <br>
-    <button @click="greenFlag">green flag</button> <button>stop</button>
+    <button @click="greenFlag">green flag</button> <button @click="stop">stop</button>
     <canvas width="480" height="360" ref="canvas"></canvas>
     <div id="hq-output">Project output:<br></div>
   <!--</template>-->
@@ -55,6 +55,9 @@
       }
     });
   }
+  function stop() {
+    window.stop()
+  }
 </script>
 
 <style scoped>
diff --git a/playground/lib/project-runner.js b/playground/lib/project-runner.js
index df17026..129fbe1 100644
--- a/playground/lib/project-runner.js
+++ b/playground/lib/project-runner.js
@@ -1,5 +1,3 @@
-import { memoryUsage } from "node:process";
-
 function createSkin(renderer, type, layer, ...params) {
   let drawable = renderer.createDrawable(layer.toString());
   let skin = renderer[`create${type}Skin`](...params);
@@ -26,18 +24,6 @@ export default (
     window.renderer = renderer;
     renderer.setLayerGroupOrdering(["background", "video", "pen", "sprite"]);
     //window.open(URL.createObjectURL(new Blob([wasm_bytes], { type: "octet/stream" })));
-    let sprite_info = Array.from({ length: target_names.length }, (_) => ({
-      x: 0,
-      y: 0,
-      pen: {
-        color: 66.66,
-        saturation: 100,
-        brightness: 100,
-        transparency: 0,
-        color4f: [0, 0, 1, 1],
-        size: 1,
-      },
-    }));
     const pen_skin = createSkin(renderer, "Pen", "pen");
     if (typeof require === "undefined") {
       browser = true;
@@ -99,21 +85,9 @@ export default (
           `\x1b[1;32m${targetName} ${verb}:\x1b[0m \x1b[35m${text}\x1b[0m`
         );
       } else {
-        //output_div.appendChild(text_div(`${targetName} ${verb}: ${text}`));
         renderer.updateTextSkin(renderBubble, verb, text, false);
       }
     };
-    /*function updatePenColor(i) {
-      const rgb = hsvToRgb({
-        h: (sprite_info[i].pen.color * 360) / 100,
-        s: sprite_info[i].pen.saturation / 100,
-        v: sprite_info[i].pen.brightness / 100,
-      });
-      sprite_info[i].pen.color4f[0] = rgb.r / 255.0;
-      sprite_info[i].pen.color4f[1] = rgb.g / 255.0;
-      sprite_info[i].pen.color4f[2] = rgb.b / 255.0;
-      sprite_info[i].pen.color4f[3] = 1 - sprite_info[i].pen.transparency / 100;
-    }*/
     let updatePenColor;
     let start_time = 0;
     let sprite_info_offset = 0;
@@ -129,11 +103,9 @@ export default (
       },
       runtime: {
         looks_say: (ty, val, targetIndex) => {
-          console.log("a");
           targetOutput(targetIndex, "say", wasm_val_to_js(ty, val));
         },
         looks_think: (ty, val, targetIndex) => {
-          console.log("b");
           targetOutput(targetIndex, "think", wasm_val_to_js(ty, val));
         },
         operator_equals: (ty1, val1, ty2, val2) => {
@@ -189,9 +161,7 @@ export default (
           renderer.penPoint(
             pen_skin,
             {
-              //diameter: sprite_info[i].pen.size * 2,
-              diameter: radius * 1,
-              //color4f: sprite_info[i].pen.color4f,
+              diameter: radius, // awkward variable naming moment
               color4f: [r, g, b, a],
             },
             x,
@@ -209,15 +179,6 @@ export default (
         pen_setcolor: () => null,
         pen_changecolorparam: () => null,
         pen_setcolorparam: (param, val, i) => {
-          console.log(
-            "pensetcolorparam",
-            Array.from({ length: 14 }, (_, j) =>
-              new DataView(memory.buffer).getFloat32(
-                sprite_info_offset + (i - 1) * spriteInfoLen + j * 4,
-                true
-              )
-            )
-          );
           switch (param) {
             case "color":
               new DataView(memory.buffer).setFloat32(
@@ -225,7 +186,6 @@ export default (
                 val,
                 true
               );
-              //sprite_info[i].pen.color = val;
               break;
             case "saturation":
               new DataView(memory.buffer).setFloat32(
@@ -233,7 +193,6 @@ export default (
                 val,
                 true
               );
-              //sprite_info[i].pen.saturation = val;
               break;
             case "brightness":
               new DataView(memory.buffer).setFloat32(
@@ -241,7 +200,6 @@ export default (
                 val,
                 true
               );
-              //sprite_info[i].pen.brightness = val;
               break;
             case "transparency":
               new DataView(memory.buffer).setFloat32(
@@ -249,32 +207,11 @@ export default (
                 val,
                 true
               );
-              //sprite_info[i].pen.transparency = val;
               break;
             default:
               console.warn(`can\'t update invalid color param ${param}`);
           }
-          console.log(
-            "pensetcolorparam",
-            Array.from({ length: 14 }, (_, j) =>
-              new DataView(memory.buffer).getFloat32(
-                sprite_info_offset + (i - 1) * spriteInfoLen + j * 4,
-                true
-              )
-            ),
-            []
-          );
           updatePenColor(i);
-          console.log(
-            "pensetcolorparam",
-            Array.from({ length: 14 }, (_, j) =>
-              new DataView(memory.buffer).getFloat32(
-                sprite_info_offset + (i - 1) * spriteInfoLen + j * 4,
-                true
-              )
-            ),
-            []
-          );
         },
         pen_changesize: () => null,
         pen_changehue: () => null,
@@ -286,7 +223,6 @@ export default (
         floattostring: Number.prototype.toString,
       },
     };
-    //const buf = new Uint8Array(wasm_bytes);
     try {
       assert(WebAssembly.validate(wasm_bytes));
     } catch {
@@ -324,18 +260,18 @@ export default (
           // @ts-ignore
           strings.set(i, str);
         }
-        console.log([...new Uint8Array(memory.buffer.slice(0, 256))]);
         updatePenColor = (i) => upc(i - 1);
         strings_tbl = strings;
         window.memory = memory;
+        window.stop = () => {
+          for (let i = 0; i < new Uint32Array(memory.buffer)[thn_offset.value / 4]; i++) {
+            new Uint32Array(memory.buffer)[(i + sprite_info_offset + spriteInfoLen * (target_names.length - 1)) / 4] = 0;
+          }
+        };
         // @ts-ignore
         sprite_info_offset = vars_num.value * 12 + thn_offset + 4;
         const dv = new DataView(memory.buffer);
         for (let i = 0; i < target_names.length - 1; i++) {
-          console.log(
-            sprite_info_offset + i * spriteInfoLen + 16,
-            (sprite_info_offset + i * spriteInfoLen + 16) / 4
-          );
           dv.setFloat32(
             sprite_info_offset + i * spriteInfoLen + 16,
             66.66,
@@ -348,38 +284,23 @@ export default (
           dv.setFloat32(sprite_info_offset + i * spriteInfoLen + 44, 1, true);
           dv.setFloat64(sprite_info_offset + i * spriteInfoLen + 48, 1, true);
         }
-        console.log(
-          "hola",
-          Array.from({ length: 64 }, (_, i) =>
-            new DataView(memory.buffer).getFloat32(i * 4, true)
-          )
-        );
-        console.log(`sprite_info_offset + 16: ${sprite_info_offset + 16}`);
-        /*resolve({ strings, green_flag, step_funcs, tick, memory })*/ // @ts-ignore
         green_flag();
-        console.log([...new Uint8Array(memory.buffer.slice(0, 256))]);
         start_time = Date.now();
         console.log("green_flag()");
         $outertickloop: while (true) {
-          console.log([...new Uint8Array(memory.buffer.slice(0, 256))]);
-          // console.log(new Uint32Array(memory.buffer)[thn_offset.value / 4])
           renderer.draw();
-          // console.log('outer')
           const thisTickStartTime = Date.now();
           // @ts-ignore
           $innertickloop: while (
             Date.now() - thisTickStartTime < 23 &&
             new Uint8Array(memory.buffer)[rr_offset.value] === 0
-          ) {
-            //console.log('inner')
+          ){//for (const _ of [1]) {
             // @ts-ignore
-            console.log([...new Uint8Array(memory.buffer.slice(0, 256))]);
             tick();
             // @ts-ignore
             if (new Uint32Array(memory.buffer)[thn_offset.value / 4] === 0) {
               break $outertickloop;
             }
-            //console.log([...new Uint8Array(memory.buffer.slice(0, 1000))]);
           }
           // @ts-ignore
           new Uint8Array(memory.buffer)[rr_offset.value] = 0;
@@ -390,7 +311,6 @@ export default (
           } else {
             await waitAnimationFrame();
           }
-          console.log([...new Uint8Array(memory.buffer.slice(0, 256))]);
         }
       })
       .catch((e) => {
diff --git a/src/ir.rs b/src/ir.rs
index fc76e88..66a654e 100644
--- a/src/ir.rs
+++ b/src/ir.rs
@@ -351,6 +351,9 @@ impl IrBlock {
                     does_yield: true,
                     ..
                 }
+                | motion_gotoxy
+                | pen_penDown
+                | pen_clear
         )
     }
     pub fn is_hat(&self) -> bool {
@@ -883,6 +886,34 @@ impl IrBlockVec for Vec<IrBlock> {
                                 IrOpcode::hq_goto { step: Some((target_id, substack_id)), does_yield: false },
                             ]
                     }
+                    BlockOpcode::control_forever => {
+                        let substack_id = if let BlockArrayOrId::Id(id) = block_info.inputs.get("SUBSTACK").expect("missing SUBSTACK input for control_if").get_1().unwrap().clone().unwrap() { id } else { panic!("malformed SUBSTACK input") };
+                        let mut condition_opcodes = vec![
+                                //IrOpcode::hq_goto_if { step: Some((target_id.clone(), block_info.next.clone().unwrap())), does_yield: true }.into(),
+                                IrOpcode::hq_goto { step: Some((target_id.clone(), substack_id.clone())), does_yield: true }.into(),
+                            ];
+                        let looper_id = Uuid::new_v4().to_string();
+                        if !steps.contains_key(&(target_id.clone(), looper_id.clone())) {
+                            let mut looper_opcodes = vec![];
+                            //looper_opcodes.add_inputs(&block_info.inputs, blocks, Rc::clone(&context), steps, target_id.clone());
+                            looper_opcodes.append(&mut condition_opcodes.clone());
+                            looper_opcodes.fixup_types();
+                            steps.insert((target_id.clone(), looper_id.clone()), Step::new(looper_opcodes, Rc::clone(&context)));
+                        }
+                        if let Some(next) = block_info.next.clone() {
+                            step_from_top_block(next, last_nexts, blocks, Rc::clone(&context), steps, target_id.clone());
+                        }
+                        step_from_top_block(substack_id.clone(), vec![looper_id], blocks, Rc::clone(&context), steps, target_id.clone());
+                        let mut opcodes = vec![];
+                        //opcodes.add_inputs(&block_info.inputs, blocks, Rc::clone(&context), steps, target_id.clone());
+                        opcodes.append(&mut condition_opcodes);
+                        opcodes.fixup_types();
+                        steps.insert((target_id.clone(), block_id.clone()), Step::new(opcodes.clone(), Rc::clone(&context)));
+                        vec![
+                                //IrOpcode::hq_goto_if { step: Some((target_id.clone(), block_info.next.clone().unwrap())), does_yield: true },
+                                IrOpcode::hq_goto { step: Some((target_id, substack_id)), does_yield: false },
+                            ]
+                    }
                     _ => todo!(),
                 }).into_iter().map(IrBlock::from).collect());
             }
diff --git a/src/targets/wasm.rs b/src/targets/wasm.rs
index 009bde3..e76abea 100644
--- a/src/targets/wasm.rs
+++ b/src/targets/wasm.rs
@@ -315,7 +315,7 @@ fn instructions(
             Call(func_indices::PEN_DOWN),
         ],
         motion_gotoxy => vec![
-            LocalSet(step_func_locals::F64), // y
+            LocalSet(step_func_locals::F64),   // y
             LocalSet(step_func_locals::F64_2), // x
             I32Const(0),
             I32Load8S(MemArg {
@@ -354,8 +354,8 @@ fn instructions(
                 align: 0,
                 memory_index: 0,
             }),
-            LocalGet(step_func_locals::F64),
             LocalGet(step_func_locals::F64_2),
+            LocalGet(step_func_locals::F64),
             I32Const(0),
             F32Load(MemArg {
                 offset: (context.target_index - 1) as u64 * u64::try_from(SPRITE_INFO_LEN).unwrap()
@@ -394,6 +394,26 @@ fn instructions(
             }),
             Call(func_indices::PEN_LINETO),
             End,
+            I32Const(0),
+            LocalGet(step_func_locals::F64_2),
+            F64Store(MemArg {
+                offset: (context.target_index - 1) as u64 * u64::try_from(SPRITE_INFO_LEN).unwrap()
+                    + u64::try_from(byte_offset::VARS).unwrap()
+                    + u64::try_from(context.vars.borrow().len()).unwrap() * 12
+                    + u64::try_from(sprite_info_offsets::X_POS).unwrap(),
+                align: 0,
+                memory_index: 0,
+            }),
+            I32Const(0),
+            LocalGet(step_func_locals::F64),
+            F64Store(MemArg {
+                offset: (context.target_index - 1) as u64 * u64::try_from(SPRITE_INFO_LEN).unwrap()
+                    + u64::try_from(byte_offset::VARS).unwrap()
+                    + u64::try_from(context.vars.borrow().len()).unwrap() * 12
+                    + u64::try_from(sprite_info_offsets::Y_POS).unwrap(),
+                align: 0,
+                memory_index: 0,
+            }),
         ],
         pen_penUp => vec![
             I32Const(0),
@@ -1004,11 +1024,29 @@ impl From<IrProject> for WasmProject {
             [],
         );
         types.function(
-            [ValType::F64, ValType::F64, ValType::F64, ValType::F32, ValType::F32, ValType::F32, ValType::F32],
+            [
+                ValType::F64,
+                ValType::F64,
+                ValType::F64,
+                ValType::F32,
+                ValType::F32,
+                ValType::F32,
+                ValType::F32,
+            ],
             [],
         );
         types.function(
-            [ValType::F64, ValType::F64, ValType::F64, ValType::F64, ValType::F64, ValType::F32, ValType::F32, ValType::F32, ValType::F32],
+            [
+                ValType::F64,
+                ValType::F64,
+                ValType::F64,
+                ValType::F64,
+                ValType::F64,
+                ValType::F32,
+                ValType::F32,
+                ValType::F32,
+                ValType::F32,
+            ],
             [],
         );
 
@@ -1389,7 +1427,6 @@ impl From<IrProject> for WasmProject {
         ));
         sprite_update_pen_color_func.instruction(&Instruction::I32Add);
         sprite_update_pen_color_func.instruction(&Instruction::LocalTee(supc_locals::MEM_POS)); // position in memory of sprite info
-        sprite_update_pen_color_func.instruction(&Instruction::Call(func_indices::DBG_LOGI32));
         sprite_update_pen_color_func.instruction(&Instruction::F32Load(MemArg {
             offset: u64::try_from(sprite_info_offsets::PEN_COLOR).unwrap(),
             align: 2,
@@ -1398,7 +1435,6 @@ impl From<IrProject> for WasmProject {
         sprite_update_pen_color_func.instruction(&Instruction::F32Const(2.55));
         sprite_update_pen_color_func.instruction(&Instruction::F32Mul);
         sprite_update_pen_color_func.instruction(&Instruction::I32TruncF32S);
-        sprite_update_pen_color_func.instruction(&Instruction::Call(func_indices::DBG_LOGI32));
         sprite_update_pen_color_func.instruction(&Instruction::LocalSet(supc_locals::HUE)); // hue
         sprite_update_pen_color_func.instruction(&Instruction::LocalGet(supc_locals::MEM_POS));
         sprite_update_pen_color_func.instruction(&Instruction::F32Load(MemArg {
@@ -1409,7 +1445,6 @@ impl From<IrProject> for WasmProject {
         sprite_update_pen_color_func.instruction(&Instruction::F32Const(2.55));
         sprite_update_pen_color_func.instruction(&Instruction::F32Mul);
         sprite_update_pen_color_func.instruction(&Instruction::I32TruncF32S);
-        sprite_update_pen_color_func.instruction(&Instruction::Call(func_indices::DBG_LOGI32));
         sprite_update_pen_color_func.instruction(&Instruction::LocalSet(supc_locals::SAT)); // saturation ∈ [0, 256)
         sprite_update_pen_color_func.instruction(&Instruction::LocalGet(supc_locals::MEM_POS));
         sprite_update_pen_color_func.instruction(&Instruction::F32Load(MemArg {
@@ -1420,7 +1455,6 @@ impl From<IrProject> for WasmProject {
         sprite_update_pen_color_func.instruction(&Instruction::F32Const(2.55));
         sprite_update_pen_color_func.instruction(&Instruction::F32Mul);
         sprite_update_pen_color_func.instruction(&Instruction::I32TruncF32S);
-        sprite_update_pen_color_func.instruction(&Instruction::Call(func_indices::DBG_LOGI32));
         sprite_update_pen_color_func.instruction(&Instruction::LocalSet(supc_locals::VAL)); // value ∈ [0, 256)
         sprite_update_pen_color_func.instruction(&Instruction::LocalGet(supc_locals::MEM_POS));
         sprite_update_pen_color_func.instruction(&Instruction::F32Const(100.0));
@@ -1600,7 +1634,6 @@ impl From<IrProject> for WasmProject {
         sprite_update_pen_color_func.instruction(&Instruction::End);
         sprite_update_pen_color_func.instruction(&Instruction::LocalGet(supc_locals::MEM_POS));
         sprite_update_pen_color_func.instruction(&Instruction::LocalGet(supc_locals::R));
-        sprite_update_pen_color_func.instruction(&Instruction::Call(func_indices::DBG_LOGI32));
         sprite_update_pen_color_func.instruction(&Instruction::F32ConvertI32S);
         sprite_update_pen_color_func.instruction(&Instruction::F32Const(255.0));
         sprite_update_pen_color_func.instruction(&Instruction::F32Div);
@@ -1611,7 +1644,6 @@ impl From<IrProject> for WasmProject {
         }));
         sprite_update_pen_color_func.instruction(&Instruction::LocalGet(supc_locals::MEM_POS));
         sprite_update_pen_color_func.instruction(&Instruction::LocalGet(supc_locals::G));
-        sprite_update_pen_color_func.instruction(&Instruction::Call(func_indices::DBG_LOGI32));
         sprite_update_pen_color_func.instruction(&Instruction::F32ConvertI32S);
         sprite_update_pen_color_func.instruction(&Instruction::F32Const(255.0));
         sprite_update_pen_color_func.instruction(&Instruction::F32Div);
@@ -1622,7 +1654,6 @@ impl From<IrProject> for WasmProject {
         }));
         sprite_update_pen_color_func.instruction(&Instruction::LocalGet(supc_locals::MEM_POS));
         sprite_update_pen_color_func.instruction(&Instruction::LocalGet(supc_locals::B));
-        sprite_update_pen_color_func.instruction(&Instruction::Call(func_indices::DBG_LOGI32));
         sprite_update_pen_color_func.instruction(&Instruction::F32ConvertI32S);
         sprite_update_pen_color_func.instruction(&Instruction::F32Const(255.0));
         sprite_update_pen_color_func.instruction(&Instruction::F32Div);