Merge pull request #1454 from Shaikh-Ubaid/fix_wat_decoding

WASMDecoder: Replace while loop with individual decode intructions

Author: ubaidsk

src/libasr/codegen/wasm_decoder.h

@@ -262,8 +262,17 @@ class WASMDecoder {
             }
 
             data_segments.p[i].insts_start_index = offset;
-            while (read_b8(wasm_bytes, offset) != 0x0B)
-                ;
+
+            // read i32.const
+            if (read_b8(wasm_bytes, offset) != 0x41) {
+                throw CodeGenError("DecodeDataSection: Invalid byte for i32.const");
+            }
+            // read the integer (memory location)
+            read_i32(wasm_bytes, offset);
+            // read expr end
+            if (read_b8(wasm_bytes, offset) != 0x0B) {
+                throw CodeGenError("DecodeDataSection: Invalid byte for expr end");
+            }
 
             uint32_t text_size = read_u32(wasm_bytes, offset);
             data_segments.p[i].text.resize(

tests/print_str.py

@@ -0,0 +1,13 @@
+def printCompOperations():
+   print("x < y")
+   print("x !< y")
+   print("x > y")
+   print("x !> y")
+   print("x == y")
+   print("x != y")
+
+
+def main0():
+   printCompOperations()
+
+main0()

tests/reference/wat-print_str-385e953.json

@@ -0,0 +1,13 @@
+{
+    "basename": "wat-print_str-385e953",
+    "cmd": "lpython --no-color --show-wat {infile}",
+    "infile": "tests/print_str.py",
+    "infile_hash": "56d2a86f8e1cca05ff1749d1c4cdaa79f99b6f92d3ce60870ee900d7",
+    "outfile": null,
+    "outfile_hash": null,
+    "stdout": "wat-print_str-385e953.stdout",
+    "stdout_hash": "a3680583488bc169e7993ffda63e9da9e7aa8987cb4422d31c4ab021",
+    "stderr": null,
+    "stderr_hash": null,
+    "returncode": 0
+}

tests/reference/wat-print_str-385e953.stdout

@@ -0,0 +1,76 @@
+(module
+    (type (;0;) (func (param i32) (result)))
+    (type (;1;) (func (param i64) (result)))
+    (type (;2;) (func (param f32) (result)))
+    (type (;3;) (func (param f64) (result)))
+    (type (;4;) (func (param i32 i32) (result)))
+    (type (;5;) (func (param) (result)))
+    (type (;6;) (func (param i32) (result)))
+    (type (;7;) (func (param) (result)))
+    (type (;8;) (func (param) (result)))
+    (type (;9;) (func (param) (result)))
+    (type (;10;) (func (param) (result)))
+    (import "js" "print_i32" (func (;0;) (type 0)))
+    (import "js" "print_i64" (func (;1;) (type 1)))
+    (import "js" "print_f32" (func (;2;) (type 2)))
+    (import "js" "print_f64" (func (;3;) (type 3)))
+    (import "js" "print_str" (func (;4;) (type 4)))
+    (import "js" "flush_buf" (func (;5;) (type 5)))
+    (import "js" "set_exit_code" (func (;6;) (type 6)))
+    (import "js" "memory" (memory (;0;) 100 100))
+    (func $7 (type 7) (param) (result)
+        (local)
+        call 8
+        return
+    )
+    (func $8 (type 8) (param) (result)
+        (local)
+        call 9
+        return
+    )
+    (func $9 (type 9) (param) (result)
+        (local)
+        i32.const 0
+        i32.const 5
+        call 4
+        call 5
+        i32.const 5
+        i32.const 6
+        call 4
+        call 5
+        i32.const 11
+        i32.const 5
+        call 4
+        call 5
+        i32.const 16
+        i32.const 6
+        call 4
+        call 5
+        i32.const 22
+        i32.const 6
+        call 4
+        call 5
+        i32.const 28
+        i32.const 6
+        call 4
+        call 5
+        return
+    )
+    (func $10 (type 10) (param) (result)
+        (local)
+        call 7
+        i32.const 0
+        call 6
+        return
+    )
+    (export "_lpython_main_program" (func $7))
+    (export "main0" (func $8))
+    (export "printCompOperations" (func $9))
+    (export "_lcompilers_main" (func $10))
+    (data (;0;) (i32.const 0) "x < y")
+    (data (;1;) (i32.const 5) "x !< y")
+    (data (;2;) (i32.const 11) "x > y")
+    (data (;3;) (i32.const 16) "x !> y")
+    (data (;4;) (i32.const 22) "x == y")
+    (data (;5;) (i32.const 28) "x != y")
+)

tests/tests.toml

@@ -286,6 +286,10 @@ c = true
 filename = "ltypes1.py"
 llvm = true
 
+[[test]]
+filename = "print_str.py"
+wat = true
+
 [[test]]
 filename = "../integration_tests/test_builtin.py"
 asr = true