[CI] fix test wat

L-jasmine · L-jasmine · commit 17221d00a3a2 · 2023-11-18T02:24:27.000+08:00
Signed-off-by: csh &lt;458761603@qq.com&gt;
diff --git a/crates/wasmedge-sys/src/compiler.rs b/crates/wasmedge-sys/src/compiler.rs
@@ -256,24 +256,24 @@ mod tests {
                     (func $fib (param $n i32) (result i32)
                      (if
                       (i32.lt_s
-                       (get_local $n)
+                       (local.get $n)
                        (i32.const 2)
                       )
-                      (return
-                       (i32.const 1)
+                      (then
+                        (return (i32.const 1))
                       )
                      )
                      (return
                       (i32.add
                        (call $fib
                         (i32.sub
-                         (get_local $n)
+                         (local.get $n)
                          (i32.const 2)
                         )
                        )
                        (call $fib
                         (i32.sub
-                         (get_local $n)
+                         (local.get $n)
                          (i32.const 1)
                         )
                        )
diff --git a/examples/wasmedge-sys/async_run_func.rs b/examples/wasmedge-sys/async_run_func.rs
@@ -26,24 +26,24 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             (func $fib (param $n i32) (result i32)
              (if
               (i32.lt_s
-               (get_local $n)
+               (local.get $n)
                (i32.const 2)
               )
-              (return
-               (i32.const 1)
+              (then
+                (return (i32.const 1))
               )
              )
              (return
               (i32.add
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 2)
                 )
                )
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 1)
                 )
                )
diff --git a/examples/wasmedge-sys/async_run_registered_func.rs b/examples/wasmedge-sys/async_run_registered_func.rs
@@ -38,24 +38,24 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             (func $fib (param $n i32) (result i32)
              (if
               (i32.lt_s
-               (get_local $n)
+               (local.get $n)
                (i32.const 2)
               )
-              (return
-               (i32.const 1)
+              (then
+                (return (i32.const 1))
               )
              )
              (return
               (i32.add
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 2)
                 )
                )
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 1)
                 )
                )
diff --git a/examples/wasmedge-sys/data/fibonacci.wat b/examples/wasmedge-sys/data/fibonacci.wat
@@ -3,24 +3,24 @@
  (func $fib (param $n i32) (result i32)
   (if
    (i32.lt_s
-    (get_local $n)
+    (local.get $n)
     (i32.const 2)
    )
-   (return
-    (i32.const 1)
+   (then
+    (return (i32.const 1))
    )
   )
   (return
    (i32.add
     (call $fib
      (i32.sub
-      (get_local $n)
+      (local.get $n)
       (i32.const 2)
      )
     )
     (call $fib
      (i32.sub
-      (get_local $n)
+      (local.get $n)
       (i32.const 1)
      )
     )
diff --git a/examples/wasmedge-sys/executor_register_active_module.rs b/examples/wasmedge-sys/executor_register_active_module.rs
@@ -12,24 +12,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             (func $fib (param $n i32) (result i32)
              (if
               (i32.lt_s
-               (get_local $n)
+               (local.get $n)
                (i32.const 2)
               )
-              (return
-               (i32.const 1)
+              (then
+                (return (i32.const 1))
               )
              )
              (return
               (i32.add
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 2)
                 )
                )
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 1)
                 )
                )
diff --git a/examples/wasmedge-sys/executor_register_named_module.rs b/examples/wasmedge-sys/executor_register_named_module.rs
@@ -12,24 +12,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             (func $fib (param $n i32) (result i32)
              (if
               (i32.lt_s
-               (get_local $n)
+               (local.get $n)
                (i32.const 2)
               )
-              (return
-               (i32.const 1)
+              (then
+                (return (i32.const 1))
               )
              )
              (return
               (i32.add
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 2)
                 )
                )
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 1)
                 )
                )
diff --git a/examples/wasmedge-sys/fibonacci.rs b/examples/wasmedge-sys/fibonacci.rs
@@ -20,24 +20,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 (func $fib (param $n i32) (result i32)
                  (if
                   (i32.lt_s
-                   (get_local $n)
+                   (local.get $n)
                    (i32.const 2)
                   )
-                  (return
-                   (i32.const 1)
+                  (then
+                    (return (i32.const 1))
                   )
                  )
                  (return
                   (i32.add
                    (call $fib
                     (i32.sub
-                     (get_local $n)
+                     (local.get $n)
                      (i32.const 2)
                     )
                    )
                    (call $fib
                     (i32.sub
-                     (get_local $n)
+                     (local.get $n)
                      (i32.const 1)
                     )
                    )
diff --git a/examples/wasmedge-sys/mdbook_example_module_instance.rs b/examples/wasmedge-sys/mdbook_example_module_instance.rs
@@ -30,24 +30,24 @@ fn executor_apis() -> Result<(), Box<dyn std::error::Error>> {
             (func $fib (param $n i32) (result i32)
              (if
               (i32.lt_s
-               (get_local $n)
+               (local.get $n)
                (i32.const 2)
               )
-              (return
-               (i32.const 1)
+              (then
+                (return (i32.const 1))
               )
              )
              (return
               (i32.add
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 2)
                 )
                )
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 1)
                 )
                )
@@ -84,24 +84,24 @@ fn executor_apis() -> Result<(), Box<dyn std::error::Error>> {
             (func $fib (param $n i32) (result i32)
              (if
               (i32.lt_s
-               (get_local $n)
+               (local.get $n)
                (i32.const 2)
               )
-              (return
-               (i32.const 1)
+              (then
+                (return (i32.const 1))
               )
              )
              (return
               (i32.add
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 2)
                 )
                )
                (call $fib
                 (i32.sub
-                 (get_local $n)
+                 (local.get $n)
                  (i32.const 1)
                 )
                )
diff --git a/examples/wasmedge-sys/store_get_named_module.rs b/examples/wasmedge-sys/store_get_named_module.rs
@@ -20,7 +20,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 (func $fib (param $n i32) (result i32)
                  (if
                   (i32.lt_s
-                   (get_local $n)
+                   (local.get $n)
                    (i32.const 2)
                   )
                   (return
@@ -31,13 +31,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                   (i32.add
                    (call $fib
                     (i32.sub
-                     (get_local $n)
+                     (local.get $n)
                      (i32.const 2)
                     )
                    )
                    (call $fib
                     (i32.sub
-                     (get_local $n)
+                     (local.get $n)
                      (i32.const 1)
                     )
                    )
diff --git a/examples/wasmedge-sys/threads.rs b/examples/wasmedge-sys/threads.rs
@@ -37,24 +37,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 (func $fib (param $n i32) (result i32)
                  (if
                   (i32.lt_s
-                   (get_local $n)
+                   (local.get $n)
                    (i32.const 2)
                   )
-                  (return
-                   (i32.const 1)
+                  (then
+                    (return (i32.const 1))
                   )
                  )
                  (return
                   (i32.add
                    (call $fib
                     (i32.sub
-                     (get_local $n)
+                     (local.get $n)
                      (i32.const 2)
                     )
                    )
                    (call $fib
                     (i32.sub
-                     (get_local $n)
+                     (local.get $n)
                      (i32.const 1)
                     )
                    )
diff --git a/src/async/vm.rs b/src/async/vm.rs
diff --git a/src/compiler.rs b/src/compiler.rs
diff --git a/src/executor.rs b/src/executor.rs
diff --git a/src/module.rs b/src/module.rs
diff --git a/src/vm.rs b/src/vm.rs

Original file line number	Diff line number	Diff line change
`@@ -256,24 +256,24 @@ mod tests {`
`256`	`256`	`(func $fib (param $n i32) (result i32)`
`257`	`257`	`(if`
`258`	`258`	`(i32.lt_s`
`259`		`- (get_local $n)`
	`259`	`+ (local.get $n)`
`260`	`260`	`(i32.const 2)`
`261`	`261`	`)`
`262`		`- (return`
`263`		`- (i32.const 1)`
	`262`	`+ (then`
	`263`	`+ (return (i32.const 1))`
`264`	`264`	`)`
`265`	`265`	`)`
`266`	`266`	`(return`
`267`	`267`	`(i32.add`
`268`	`268`	`(call $fib`
`269`	`269`	`(i32.sub`
`270`		`- (get_local $n)`
	`270`	`+ (local.get $n)`
`271`	`271`	`(i32.const 2)`
`272`	`272`	`)`
`273`	`273`	`)`
`274`	`274`	`(call $fib`
`275`	`275`	`(i32.sub`
`276`		`- (get_local $n)`
	`276`	`+ (local.get $n)`
`277`	`277`	`(i32.const 1)`
`278`	`278`	`)`
`279`	`279`	`)`
Original file line number	Diff line number	Diff line change
`@@ -26,24 +26,24 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {`
`26`	`26`	`(func $fib (param $n i32) (result i32)`
`27`	`27`	`(if`
`28`	`28`	`(i32.lt_s`
`29`		`- (get_local $n)`
	`29`	`+ (local.get $n)`
`30`	`30`	`(i32.const 2)`
`31`	`31`	`)`
`32`		`- (return`
`33`		`- (i32.const 1)`
	`32`	`+ (then`
	`33`	`+ (return (i32.const 1))`
`34`	`34`	`)`
`35`	`35`	`)`
`36`	`36`	`(return`
`37`	`37`	`(i32.add`
`38`	`38`	`(call $fib`
`39`	`39`	`(i32.sub`
`40`		`- (get_local $n)`
	`40`	`+ (local.get $n)`
`41`	`41`	`(i32.const 2)`
`42`	`42`	`)`
`43`	`43`	`)`
`44`	`44`	`(call $fib`
`45`	`45`	`(i32.sub`
`46`		`- (get_local $n)`
	`46`	`+ (local.get $n)`
`47`	`47`	`(i32.const 1)`
`48`	`48`	`)`
`49`	`49`	`)`
Original file line number	Diff line number	Diff line change
`@@ -38,24 +38,24 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {`
`38`	`38`	`(func $fib (param $n i32) (result i32)`
`39`	`39`	`(if`
`40`	`40`	`(i32.lt_s`
`41`		`- (get_local $n)`
	`41`	`+ (local.get $n)`
`42`	`42`	`(i32.const 2)`
`43`	`43`	`)`
`44`		`- (return`
`45`		`- (i32.const 1)`
	`44`	`+ (then`
	`45`	`+ (return (i32.const 1))`
`46`	`46`	`)`
`47`	`47`	`)`
`48`	`48`	`(return`
`49`	`49`	`(i32.add`
`50`	`50`	`(call $fib`
`51`	`51`	`(i32.sub`
`52`		`- (get_local $n)`
	`52`	`+ (local.get $n)`
`53`	`53`	`(i32.const 2)`
`54`	`54`	`)`
`55`	`55`	`)`
`56`	`56`	`(call $fib`
`57`	`57`	`(i32.sub`
`58`		`- (get_local $n)`
	`58`	`+ (local.get $n)`
`59`	`59`	`(i32.const 1)`
`60`	`60`	`)`
`61`	`61`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,24 +3,24 @@`
`3`	`3`	`(func $fib (param $n i32) (result i32)`
`4`	`4`	`(if`
`5`	`5`	`(i32.lt_s`
`6`		`- (get_local $n)`
	`6`	`+ (local.get $n)`
`7`	`7`	`(i32.const 2)`
`8`	`8`	`)`
`9`		`- (return`
`10`		`- (i32.const 1)`
	`9`	`+ (then`
	`10`	`+ (return (i32.const 1))`
`11`	`11`	`)`
`12`	`12`	`)`
`13`	`13`	`(return`
`14`	`14`	`(i32.add`
`15`	`15`	`(call $fib`
`16`	`16`	`(i32.sub`
`17`		`- (get_local $n)`
	`17`	`+ (local.get $n)`
`18`	`18`	`(i32.const 2)`
`19`	`19`	`)`
`20`	`20`	`)`
`21`	`21`	`(call $fib`
`22`	`22`	`(i32.sub`
`23`		`- (get_local $n)`
	`23`	`+ (local.get $n)`
`24`	`24`	`(i32.const 1)`
`25`	`25`	`)`
`26`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -12,24 +12,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`12`	`12`	`(func $fib (param $n i32) (result i32)`
`13`	`13`	`(if`
`14`	`14`	`(i32.lt_s`
`15`		`- (get_local $n)`
	`15`	`+ (local.get $n)`
`16`	`16`	`(i32.const 2)`
`17`	`17`	`)`
`18`		`- (return`
`19`		`- (i32.const 1)`
	`18`	`+ (then`
	`19`	`+ (return (i32.const 1))`
`20`	`20`	`)`
`21`	`21`	`)`
`22`	`22`	`(return`
`23`	`23`	`(i32.add`
`24`	`24`	`(call $fib`
`25`	`25`	`(i32.sub`
`26`		`- (get_local $n)`
	`26`	`+ (local.get $n)`
`27`	`27`	`(i32.const 2)`
`28`	`28`	`)`
`29`	`29`	`)`
`30`	`30`	`(call $fib`
`31`	`31`	`(i32.sub`
`32`		`- (get_local $n)`
	`32`	`+ (local.get $n)`
`33`	`33`	`(i32.const 1)`
`34`	`34`	`)`
`35`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,24 +20,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`20`	`20`	`(func $fib (param $n i32) (result i32)`
`21`	`21`	`(if`
`22`	`22`	`(i32.lt_s`
`23`		`- (get_local $n)`
	`23`	`+ (local.get $n)`
`24`	`24`	`(i32.const 2)`
`25`	`25`	`)`
`26`		`- (return`
`27`		`- (i32.const 1)`
	`26`	`+ (then`
	`27`	`+ (return (i32.const 1))`
`28`	`28`	`)`
`29`	`29`	`)`
`30`	`30`	`(return`
`31`	`31`	`(i32.add`
`32`	`32`	`(call $fib`
`33`	`33`	`(i32.sub`
`34`		`- (get_local $n)`
	`34`	`+ (local.get $n)`
`35`	`35`	`(i32.const 2)`
`36`	`36`	`)`
`37`	`37`	`)`
`38`	`38`	`(call $fib`
`39`	`39`	`(i32.sub`
`40`		`- (get_local $n)`
	`40`	`+ (local.get $n)`
`41`	`41`	`(i32.const 1)`
`42`	`42`	`)`
`43`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -30,24 +30,24 @@ fn executor_apis() -> Result<(), Box<dyn std::error::Error>> {`
`30`	`30`	`(func $fib (param $n i32) (result i32)`
`31`	`31`	`(if`
`32`	`32`	`(i32.lt_s`
`33`		`- (get_local $n)`
	`33`	`+ (local.get $n)`
`34`	`34`	`(i32.const 2)`
`35`	`35`	`)`
`36`		`- (return`
`37`		`- (i32.const 1)`
	`36`	`+ (then`
	`37`	`+ (return (i32.const 1))`
`38`	`38`	`)`
`39`	`39`	`)`
`40`	`40`	`(return`
`41`	`41`	`(i32.add`
`42`	`42`	`(call $fib`
`43`	`43`	`(i32.sub`
`44`		`- (get_local $n)`
	`44`	`+ (local.get $n)`
`45`	`45`	`(i32.const 2)`
`46`	`46`	`)`
`47`	`47`	`)`
`48`	`48`	`(call $fib`
`49`	`49`	`(i32.sub`
`50`		`- (get_local $n)`
	`50`	`+ (local.get $n)`
`51`	`51`	`(i32.const 1)`
`52`	`52`	`)`
`53`	`53`	`)`
`@@ -84,24 +84,24 @@ fn executor_apis() -> Result<(), Box<dyn std::error::Error>> {`
`84`	`84`	`(func $fib (param $n i32) (result i32)`
`85`	`85`	`(if`
`86`	`86`	`(i32.lt_s`
`87`		`- (get_local $n)`
	`87`	`+ (local.get $n)`
`88`	`88`	`(i32.const 2)`
`89`	`89`	`)`
`90`		`- (return`
`91`		`- (i32.const 1)`
	`90`	`+ (then`
	`91`	`+ (return (i32.const 1))`
`92`	`92`	`)`
`93`	`93`	`)`
`94`	`94`	`(return`
`95`	`95`	`(i32.add`
`96`	`96`	`(call $fib`
`97`	`97`	`(i32.sub`
`98`		`- (get_local $n)`
	`98`	`+ (local.get $n)`
`99`	`99`	`(i32.const 2)`
`100`	`100`	`)`
`101`	`101`	`)`
`102`	`102`	`(call $fib`
`103`	`103`	`(i32.sub`
`104`		`- (get_local $n)`
	`104`	`+ (local.get $n)`
`105`	`105`	`(i32.const 1)`
`106`	`106`	`)`
`107`	`107`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`20`	`20`	`(func $fib (param $n i32) (result i32)`
`21`	`21`	`(if`
`22`	`22`	`(i32.lt_s`
`23`		`- (get_local $n)`
	`23`	`+ (local.get $n)`
`24`	`24`	`(i32.const 2)`
`25`	`25`	`)`
`26`	`26`	`(return`
`@@ -31,13 +31,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`31`	`31`	`(i32.add`
`32`	`32`	`(call $fib`
`33`	`33`	`(i32.sub`
`34`		`- (get_local $n)`
	`34`	`+ (local.get $n)`
`35`	`35`	`(i32.const 2)`
`36`	`36`	`)`
`37`	`37`	`)`
`38`	`38`	`(call $fib`
`39`	`39`	`(i32.sub`
`40`		`- (get_local $n)`
	`40`	`+ (local.get $n)`
`41`	`41`	`(i32.const 1)`
`42`	`42`	`)`
`43`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -37,24 +37,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`37`	`37`	`(func $fib (param $n i32) (result i32)`
`38`	`38`	`(if`
`39`	`39`	`(i32.lt_s`
`40`		`- (get_local $n)`
	`40`	`+ (local.get $n)`
`41`	`41`	`(i32.const 2)`
`42`	`42`	`)`
`43`		`- (return`
`44`		`- (i32.const 1)`
	`43`	`+ (then`
	`44`	`+ (return (i32.const 1))`
`45`	`45`	`)`
`46`	`46`	`)`
`47`	`47`	`(return`
`48`	`48`	`(i32.add`
`49`	`49`	`(call $fib`
`50`	`50`	`(i32.sub`
`51`		`- (get_local $n)`
	`51`	`+ (local.get $n)`
`52`	`52`	`(i32.const 2)`
`53`	`53`	`)`
`54`	`54`	`)`
`55`	`55`	`(call $fib`
`56`	`56`	`(i32.sub`
`57`		`- (get_local $n)`
	`57`	`+ (local.get $n)`
`58`	`58`	`(i32.const 1)`
`59`	`59`	`)`
`60`	`60`	`)`