diff options
| author | Thomas Bauereiss | 2018-06-25 19:40:43 +0100 |
|---|---|---|
| committer | Thomas Bauereiss | 2018-06-25 19:46:46 +0100 |
| commit | 90f4906af7b4369d6759e5edbbf8a3aaac4d77e6 (patch) | |
| tree | ef4a563d69f24ee4889396ea93062e553f9f84dd /src | |
| parent | 72c9ec218e77f6a1bbe85e9617b1f1757b0a9c32 (diff) | |
Support bitlist representation in Sail2_string
Diffstat (limited to 'src')
| -rw-r--r-- | src/gen_lib/sail2_operators_bitlists.lem | 4 | ||||
| -rw-r--r-- | src/gen_lib/sail2_operators_mwords.lem | 4 | ||||
| -rw-r--r-- | src/gen_lib/sail2_string.lem | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/gen_lib/sail2_operators_bitlists.lem b/src/gen_lib/sail2_operators_bitlists.lem index 7f1bcba5..3f8b7510 100644 --- a/src/gen_lib/sail2_operators_bitlists.lem +++ b/src/gen_lib/sail2_operators_bitlists.lem @@ -112,8 +112,8 @@ let int_of_vec_fail sign v = maybe_fail "int_of_vec" (int_of_vec_maybe sign v) let int_of_vec_oracle sign v = bools_of_bits_oracle v >>= (fun v -> return (int_of_bools sign v)) let int_of_vec sign v = maybe_failwith (int_of_vec_maybe sign v) -val string_of_vec : list bitU -> string -let string_of_vec = string_of_bv +val string_of_bits : list bitU -> string +let string_of_bits = string_of_bv val and_vec : list bitU -> list bitU -> list bitU val or_vec : list bitU -> list bitU -> list bitU diff --git a/src/gen_lib/sail2_operators_mwords.lem b/src/gen_lib/sail2_operators_mwords.lem index fe319efc..1e4d63ba 100644 --- a/src/gen_lib/sail2_operators_mwords.lem +++ b/src/gen_lib/sail2_operators_mwords.lem @@ -117,8 +117,8 @@ let int_of_vec sign w = let int_of_vec_maybe sign w = Just (int_of_vec sign w) let int_of_vec_fail sign w = return (int_of_vec sign w) -val string_of_vec : forall 'a. Size 'a => mword 'a -> string -let string_of_vec = string_of_bv +val string_of_bits : forall 'a. Size 'a => mword 'a -> string +let string_of_bits = string_of_bv val and_vec : forall 'a. Size 'a => mword 'a -> mword 'a -> mword 'a val or_vec : forall 'a. Size 'a => mword 'a -> mword 'a -> mword 'a diff --git a/src/gen_lib/sail2_string.lem b/src/gen_lib/sail2_string.lem index 3374d800..d0e40ad4 100644 --- a/src/gen_lib/sail2_string.lem +++ b/src/gen_lib/sail2_string.lem @@ -4,7 +4,7 @@ open import List_extra open import String open import String_extra -open import Sail2_operators_mwords +open import Sail2_operators open import Sail2_values val string_sub : string -> ii -> ii -> string @@ -162,6 +162,3 @@ let hex_bits_32_matches_prefix s = else Nothing end - - -let string_of_bits = string_of_vec |