Skip to content
This repository was archived by the owner on Dec 22, 2021. It is now read-only.

Fix to_hex_string for I8 and I16 #320

Merged
merged 1 commit into from
Aug 25, 2020
Merged

Fix to_hex_string for I8 and I16 #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions interpreter/exec/i16.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ include Int.Make (struct
include Int32

let bitwidth = 16
(* TODO incorrect for negative values. *)
let to_hex_string = Printf.sprintf "%lx"
let to_hex_string i =
(* Always print the full 32-bits (8 hex characters), and pad with 0s.
* Then only take the 4 least significant characters. *)
let s = Printf.sprintf "%08lx" i in
String.sub s ((String.length s) - 4) 4

let of_int64 = Int64.to_int32
let to_int64 = Int64.of_int32
Expand Down
7 changes: 5 additions & 2 deletions interpreter/exec/i8.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ include Int.Make (struct
include Int32

let bitwidth = 8
(* TODO incorrect for negative values. *)
let to_hex_string = Printf.sprintf "%lx"
let to_hex_string i =
(* Always print the full 32-bits (8 hex characters), and pad with 0s.
* Then only take the 2 least significant characters. *)
let s = Printf.sprintf "%08lx" i in
String.sub s ((String.length s) - 2) 2

let of_int64 = Int64.to_int32
let to_int64 = Int64.of_int32
Expand Down
20 changes: 11 additions & 9 deletions interpreter/text/arrange.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,18 +587,20 @@ let module_ = module_with_var_opt None
(* Scripts *)

(* Converts a value to string depending on mode. *)
let literal mode lit =
let literal mode lit shape =
let choose_mode bin not_bin = if mode = `Binary then bin else not_bin in
match lit.it with
| Values.I32 i -> choose_mode I32.to_hex_string I32.to_string_s i
| Values.I64 i -> choose_mode I64.to_hex_string I64.to_string_s i
| Values.F32 z -> choose_mode F32.to_hex_string F32.to_string z
| Values.F64 z -> choose_mode F64.to_hex_string F64.to_string z
| Values.V128 v -> choose_mode V128.to_hex_string V128.to_string v
match lit.it, shape with
| Values.I32 i, Some Simd.I8x16 -> choose_mode I8.to_hex_string I8.to_string_s i
| Values.I32 i, Some Simd.I16x8 -> choose_mode I16.to_hex_string I16.to_string_s i
| Values.I32 i, _ -> choose_mode I32.to_hex_string I32.to_string_s i
| Values.I64 i, _ -> choose_mode I64.to_hex_string I64.to_string_s i
| Values.F32 z, _ -> choose_mode F32.to_hex_string F32.to_string z
| Values.F64 z, _ -> choose_mode F64.to_hex_string F64.to_string z
| Values.V128 v, _ -> choose_mode V128.to_hex_string V128.to_string v

(* Converts a literal into a constant instruction. *)
let constant mode lit =
let lit_string = literal mode lit in
let lit_string = literal mode lit None in
Node (constop lit ^ lit_string, [])

let definition mode x_opt def =
Expand Down Expand Up @@ -654,7 +656,7 @@ let result_simd mode res shape pats =
* a SimdResult do not need the i32.const instruction *)
let num_pat mode res =
match res.it with
| LitPat lit -> literal mode lit
| LitPat lit -> literal mode lit (Some shape)
| NanPat {it = Values.F32 n; _}
| NanPat {it = Values.F64 n; _} -> nan n
| _ -> assert false
Expand Down