[interpreter] Update {memory,table}.copy to match spec text (#1666)

Change the interpreter implementation of backward copying in the evaluation of memory.copy and table.copy to match the implementation given in the spec. This does not change any behavior.
WebAssembly · Oct 6, 2023 · ef9c157 · ef9c157
1 parent e5435b2
commit ef9c157
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/interpreter/exec/eval.ml b/interpreter/exec/eval.ml
@@ -351,15 +351,16 @@ let rec step (c : config) : config =
             Plain (TableCopy (x, y));
           ]
         else (* d > s *)
+          let n' = I32.sub n 1l in
           vs', List.map (Lib.Fun.flip (@@) e.at) [
-            Plain (Const (I32 (I32.add d 1l) @@ e.at));
-            Plain (Const (I32 (I32.add s 1l) @@ e.at));
-            Plain (Const (I32 (I32.sub n 1l) @@ e.at));
-            Plain (TableCopy (x, y));
-            Plain (Const (I32 d @@ e.at));
-            Plain (Const (I32 s @@ e.at));
+            Plain (Const (I32 (I32.add d n') @@ e.at));
+            Plain (Const (I32 (I32.add s n') @@ e.at));
             Plain (TableGet y);
             Plain (TableSet x);
+            Plain (Const (I32 d @@ e.at));
+            Plain (Const (I32 s @@ e.at));
+            Plain (Const (I32 n' @@ e.at));
+            Plain (TableCopy (x, y));
           ]
 
       | TableInit (x, y), Num (I32 n) :: Num (I32 s) :: Num (I32 d) :: vs' ->
@@ -513,17 +514,18 @@ let rec step (c : config) : config =
             Plain (MemoryCopy);
           ]
         else (* d > s *)
+          let n' = I32.sub n 1l in
           vs', List.map (Lib.Fun.flip (@@) e.at) [
-            Plain (Const (I32 (I32.add d 1l) @@ e.at));
-            Plain (Const (I32 (I32.add s 1l) @@ e.at));
-            Plain (Const (I32 (I32.sub n 1l) @@ e.at));
-            Plain (MemoryCopy);
-            Plain (Const (I32 d @@ e.at));
-            Plain (Const (I32 s @@ e.at));
+            Plain (Const (I32 (I32.add d n') @@ e.at));
+            Plain (Const (I32 (I32.add s n') @@ e.at));
             Plain (Load
               {ty = Types.I32T; align = 0; offset = 0l; pack = Some (Pack8, ZX)});
             Plain (Store
               {ty = Types.I32T; align = 0; offset = 0l; pack = Some Pack8});
+            Plain (Const (I32 d @@ e.at));
+            Plain (Const (I32 s @@ e.at));
+            Plain (Const (I32 n' @@ e.at));
+            Plain (MemoryCopy);
           ]
 
       | MemoryInit x, Num (I32 n) :: Num (I32 s) :: Num (I32 d) :: vs' ->