fix i64.load32_u

OCamlPro · Sep 15, 2023 · a2183bc · a2183bc
1 parent f3a1d57
commit a2183bc
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/src/interpret_functor.ml b/src/interpret_functor.ml
@@ -1387,18 +1387,17 @@ module Make (P : Interpret_functor_intf.P) :
       let/ out_of_bounds = Choice.select out_of_bounds in
       if out_of_bounds then Choice.trap Out_of_bounds_memory_access
       else begin
-        let res = Memory.load_32 mem addr in
-        if sx = S || Sys.word_size = 32 then
-          let res = I64.of_int32 res in
-          st @@ Stack.push_i64 stack res
-        else if Sys.word_size = 64 then
-          let res =
-            I32.(
-              logand res
-                (sub (shl (const_i32 1l) (const_i32 32l)) (const_i32 1l)) )
-          in
-          st @@ Stack.push_i64 stack (I64.of_int32 res)
-        else Log.err "unsupported word size"
+        let res = I64.of_int32 @@ Memory.load_32 mem addr in
+        let res =
+          match sx with
+          | S -> res
+          | U ->
+            let open I64 in
+            let a = shl (const_i64 1L) (const_i64 32L) in
+            let b = sub a (const_i64 1L) in
+            logand res b
+        in
+        st @@ Stack.push_i64 stack res
       end
     | I_store16 (nn, { offset; _ }) ->
       let/* mem = Env.get_memory env mem_0 in