From 722bf2f8882138d55c169b0f7e2afc7a795e33bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D8=B5=D8=B7=D9=81=D9=8A=20=D9=85=D8=AD=D9=85=D9=88?= =?UTF-8?q?=D8=AF=20=D9=83=D9=85=D8=A7=D9=84=20=D8=A7=D9=84=D8=AF=D9=8A?= =?UTF-8?q?=D9=86?= <48567303+moste00@users.noreply.github.com> Date: Tue, 17 Sep 2024 23:54:51 +0300 Subject: [PATCH] more refactorings and consolidation, lots of deleted code, renamed sail_ast_utils to sail_utils --- lib/gen_clike_typedef.ml | 2 +- lib/gen_decoder.ml | 2 +- lib/sail_analysis.ml | 141 ++++++----------------- lib/{sail_ast_utils.ml => sail_utils.ml} | 50 ++++++++ lib/stringify.ml | 2 +- 5 files changed, 86 insertions(+), 111 deletions(-) rename lib/{sail_ast_utils.ml => sail_utils.ml} (54%) diff --git a/lib/gen_clike_typedef.ml b/lib/gen_clike_typedef.ml index 7cc2e07..5eb0dda 100644 --- a/lib/gen_clike_typedef.ml +++ b/lib/gen_clike_typedef.ml @@ -1,6 +1,6 @@ open Sail_ast_processor open Sail_ast_foreach -open Sail_ast_utils +open Sail_utils open Utils open Libsail diff --git a/lib/gen_decoder.ml b/lib/gen_decoder.ml index 5fe9f08..3ca7227 100644 --- a/lib/gen_decoder.ml +++ b/lib/gen_decoder.ml @@ -1,6 +1,6 @@ open Sail_ast_foreach open Sail_ast_processor -open Sail_ast_utils +open Sail_utils open Utils open Constants open Common_types diff --git a/lib/sail_analysis.ml b/lib/sail_analysis.ml index bcf5f44..ee81c3b 100644 --- a/lib/sail_analysis.ml +++ b/lib/sail_analysis.ml @@ -1,5 +1,5 @@ open Common_types -open Sail_ast_utils +open Sail_utils open Sail_ast_foreach open Sail_ast_processor open Constants @@ -95,50 +95,22 @@ let collect_bitvec_abbreviations state _ abbrev _ typ = Hashtbl.add state.type_ctx.bitv_synonyms (id_to_str abbrev) size | _ -> () -let add_bitv2enum_entry tbl enum_id bitv_lit = - let enum_name = id_to_str enum_id in - let const = bitv_literal_to_str bitv_lit in - Hashtbl.add tbl const enum_name - -let add_bitv2bool_entry tbl lit bitv_lit = - let name = - match lit with - | L_true -> "true" - | L_false -> "false" - | _ -> failwith "Expected literal to be a boolean literal" - in - Hashtbl.add tbl (bitv_literal_to_str bitv_lit) name - -let btv2enum_entry_from_mapping_clause bitv2enum_tbl cl = - let (MCL_aux (clause, _)) = cl in - match clause with - | MCL_bidir (l, r) -> ( - let (MPat_aux (left, _)) = l in - let (MPat_aux (right, _)) = r in - match (left, right) with - | MPat_pat lpat, MPat_pat rpat -> ( - let (MP_aux (p1, _)) = lpat in - let (MP_aux (p2, _)) = rpat in - match (p1, p2) with - | MP_id enum_id, MP_lit bitv_const -> - add_bitv2enum_entry bitv2enum_tbl enum_id bitv_const - | MP_lit bitv_const, MP_id enum_id -> - add_bitv2enum_entry bitv2enum_tbl enum_id bitv_const - | MP_lit (L_aux (bool_lit, _)), MP_lit bitv_const -> - add_bitv2bool_entry bitv2enum_tbl bool_lit bitv_const - | _ -> - failwith - "Expected an enum string to map to a bitvec literal in \ - enum<->bitvec mapping" - ) - | _ -> - failwith - "Both sides of a bidiectional enum<->bitvec mapping must be \n\ - \ simple patterns" - ) - | _ -> failwith "Non-bidirectional enum<->bitvec mappings are not supported" +let add_bitv2enum_entry tbl (bitv_str, pat) = + match pat with + | MP_id enum_id -> + let enum_name = id_to_str enum_id in + Hashtbl.add tbl bitv_str enum_name + | MP_lit (L_aux (lit, _)) -> ( + let name = match lit with + | L_true -> "true" + | L_false -> "false" + | _ -> failwith "Expression too complex, unsupported" + in + Hashtbl.add tbl bitv_str name + ) + | _ -> failwith "Unsupported pattern in enum <-> bitvec mapping" -let struct_member_to_key_value_pair (id, MP_aux (pat, _)) = +let struct_member_to_kv_pair (id, MP_aux (pat, _)) = let error_msg = "Unsupported struct member: only bool constants, enum literals, and \ bitvector constants are supported" @@ -156,82 +128,35 @@ let struct_member_to_key_value_pair (id, MP_aux (pat, _)) = | MP_id enum_lit -> (key, Enum_lit (id_to_str enum_lit)) | _ -> failwith error_msg -let add_bitv2struct_entry bitv2struct_tbl struct_members bitv_constant = - let bitv_str = bitv_literal_to_str bitv_constant in - let key_values = List.map struct_member_to_key_value_pair struct_members in - Hashtbl.add bitv2struct_tbl bitv_str key_values - -let btv2struct_entry_from_mapping_clause bitv2struct_tbl cl = - let (MCL_aux (clause, _)) = cl in - match clause with - | MCL_bidir (l, r) -> ( - let (MPat_aux (left, _)) = l in - let (MPat_aux (right, _)) = r in - match (left, right) with - | MPat_pat lpat, MPat_pat rpat -> ( - let (MP_aux (p1, _)) = lpat in - let (MP_aux (p2, _)) = rpat in - match (p1, p2) with - | MP_struct members, MP_lit bitv_const -> - add_bitv2struct_entry bitv2struct_tbl members bitv_const - | MP_lit bitv_const, MP_struct members -> - add_bitv2struct_entry bitv2struct_tbl members bitv_const - | _ -> - failwith - "Expected a struct instance to map to a bitvec literal in \ - struct<->bitvec mapping" - ) - | _ -> - failwith - "Both sides of a bidiectional struct<->bitvec mapping must be\n\ - \ simple patterns" - ) - | _ -> failwith "Non-bidirectional struct<->bitvec mappings are not supported" +let add_bitv2struct_entry bitv2struct_tbl (bitv_str, pat) = + match pat with + | MP_struct struct_members -> + let key_values = List.map struct_member_to_kv_pair struct_members in + Hashtbl.add bitv2struct_tbl bitv_str key_values + | _ -> failwith "Only struct <-> bitvec mappings with struct literals are supported" let mk_bitv2enum mapping_clauses = let bitv2enum_tbl = Hashtbl.create (List.length mapping_clauses) in - List.iter (btv2enum_entry_from_mapping_clause bitv2enum_tbl) mapping_clauses; + let entries = destructure_bitv_mapping mapping_clauses in + List.iter (add_bitv2enum_entry bitv2enum_tbl) entries; bitv2enum_tbl let mk_bitv2struct mapping_clauses = let bitv2struct_tbl = Hashtbl.create (List.length mapping_clauses) in - List.iter - (btv2struct_entry_from_mapping_clause bitv2struct_tbl) - mapping_clauses; + let entries = destructure_bitv_mapping mapping_clauses in + List.iter (add_bitv2struct_entry bitv2struct_tbl) entries; bitv2struct_tbl -let destructure_type_annotation type_annotation = - let (Typ_annot_opt_aux (tannot, _)) = type_annotation in - match tannot with - | Typ_annot_opt_some (_, Typ_aux (Typ_bidir (t1, t2), _)) -> - let (Typ_aux (type1, _)) = t1 in - let (Typ_aux (type2, _)) = t2 in - Some (type1, type2) - | _ -> None - let is_enum_bitv_mapping enums mapping_type_annotation = - let types = destructure_type_annotation mapping_type_annotation in - match types with - | Some (Typ_app (id1, args), Typ_id id2) - when (id_to_str id2 = "bool" || bindings_contains_id enums id2) - && id_to_str id1 = "bits" -> - Some (id_to_str id2, sail_bitv_size_to_int (List.nth args 0)) - | Some (Typ_id id1, Typ_app (id2, args)) - when (id_to_str id1 = "bool" || bindings_contains_id enums id1) - && id_to_str id2 = "bits" -> - Some (id_to_str id1, sail_bitv_size_to_int (List.nth args 0)) - | _ -> None + is_mapping_from_bitv_to_type_id mapping_type_annotation (fun other_type_id -> + id_to_str other_type_id = "bool" + || bindings_contains_id enums other_type_id + ) let is_struct_bitv_mapping env mapping_type_annotation = - let types = destructure_type_annotation mapping_type_annotation in - match types with - | Some (Typ_app (id1, args), Typ_id id2) - when Env.is_record id2 env && id_to_str id1 = "bits" -> - Some (id_to_str id2, sail_bitv_size_to_int (List.nth args 0)) - | Some (Typ_id id1, Typ_app (id2, args)) - when Env.is_record id1 env && id_to_str id2 = "bits" -> - Some (id_to_str id1, sail_bitv_size_to_int (List.nth args 0)) - | _ -> None + is_mapping_from_bitv_to_type_id mapping_type_annotation (fun other_type_id -> + Env.is_record other_type_id env + ) let collect_enum_bitv_mappings state _ id typ_annot clauses = match is_enum_bitv_mapping state.sail_env.enums typ_annot with diff --git a/lib/sail_ast_utils.ml b/lib/sail_utils.ml similarity index 54% rename from lib/sail_ast_utils.ml rename to lib/sail_utils.ml index 768a069..cef4b8e 100644 --- a/lib/sail_ast_utils.ml +++ b/lib/sail_utils.ml @@ -76,3 +76,53 @@ let bitv_literal_size bitv_lit = let bindings_contains_id bindings i = Option.is_some (Bindings.find_opt i bindings) + +let destructure_type_annotation type_annotation = + let (Typ_annot_opt_aux (tannot, _)) = type_annotation in + match tannot with + | Typ_annot_opt_some (_, Typ_aux (Typ_bidir (t1, t2), _)) -> + let (Typ_aux (type1, _)) = t1 in + let (Typ_aux (type2, _)) = t2 in + Some (type1, type2) + | _ -> None + +let is_mapping_from_bitv_to_type_id mapping_type_annotation other_type_predicate + = + let types = destructure_type_annotation mapping_type_annotation in + match types with + | Some (Typ_app (id1, args), Typ_id id2) + when id_to_str id1 = "bits" && other_type_predicate id2 -> + Some (id_to_str id2, sail_bitv_size_to_int (List.nth args 0)) + | Some (Typ_id id1, Typ_app (id2, args)) + when id_to_str id2 = "bits" && other_type_predicate id1 -> + Some (id_to_str id1, sail_bitv_size_to_int (List.nth args 0)) + | _ -> None + +let destructure_bitv_mapping mapping_clauses = + let destructure_clause cl = + let (MCL_aux (clause, _)) = cl in + match clause with + | MCL_bidir (l, r) -> ( + let (MPat_aux (left, _)) = l in + let (MPat_aux (right, _)) = r in + match (left, right) with + | MPat_pat lpat, MPat_pat rpat -> ( + let (MP_aux (p1, _)) = lpat in + let (MP_aux (p2, _)) = rpat in + match (p1, p2) with + | pat, MP_lit bv -> (bitv_literal_to_str bv, pat) + | MP_lit bv, pat -> (bitv_literal_to_str bv, pat) + | _ -> + failwith + "bitvec mappings with bitvec expressions more complex than \ + literals are not supported" + ) + | _ -> + failwith + "Both sides of a bidiectional T <-> bitvec mapping must be \ + simple patterns" + ) + | _ -> failwith "Non-bidirectional T <-> bitvec mappings are not supported" + in + + List.map destructure_clause mapping_clauses diff --git a/lib/stringify.ml b/lib/stringify.ml index 2bb12be..ada2ed1 100644 --- a/lib/stringify.ml +++ b/lib/stringify.ml @@ -4,7 +4,7 @@ open Decoder open Decode_procedure open Constants open Gen_clike_typedef -open Sail_ast_utils +open Sail_utils open Utils let mk_indentation lvl =