From e69f8cd43b8538b91b35737ad31bbbd9e6f81d47 Mon Sep 17 00:00:00 2001 From: Alley Stoughton Date: Mon, 30 Jan 2023 14:45:47 -0500 Subject: [PATCH] Added cancellation variant for ofword that uses mkseq to Word.eca, and added lemmas about the integer values of onew and zerow to BitWord.eca. --- theories/datatypes/BitWord.eca | 11 ++++++++++- theories/datatypes/Word.eca | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/theories/datatypes/BitWord.eca b/theories/datatypes/BitWord.eca index 415c6ad6ba..d325fd6b21 100644 --- a/theories/datatypes/BitWord.eca +++ b/theories/datatypes/BitWord.eca @@ -1,5 +1,6 @@ (* -------------------------------------------------------------------- *) -require import Bool Core Int Xint List. +require import AllCore Bool Int Xint List BitEncoding. +import (*---*) BS2Int. require (*--*) FinType Word Ring. pragma +implicits. @@ -141,6 +142,14 @@ move=> x y; rewrite /unitw !wordP => + i Hi -/(_ i Hi). by rewrite andwE onewE Hi /#. qed. +(* -------------------------------------------------------------------- *) +lemma zerow_int: + bs2int (ofword zerow) = 0. +proof. by rewrite ofwordKmkseq mkseq_nseq bs2int_nseq_false. qed. + +lemma onew_int: + bs2int (ofword onew) = 2 ^ n - 1. +proof. by rewrite ofwordKmkseq mkseq_nseq bs2int_nseq_true 1:ge0_n. qed. (* -------------------------------------------------------------------- *) abstract theory Cost. diff --git a/theories/datatypes/Word.eca b/theories/datatypes/Word.eca index 758424e07e..cc3a6ea653 100644 --- a/theories/datatypes/Word.eca +++ b/theories/datatypes/Word.eca @@ -150,6 +150,12 @@ qed. lemma offunE f i: 0 <= i < n => (offun f).[i] = f i. proof. by move=> lt_in; rewrite offunifE lt_in. qed. +lemma ofwordKmkseq (f : int -> t): + ofword (offun f) = mkseq f n. +proof. +by rewrite ofwordK 1:size_mkseq 1:StdOrder.IntOrder.ler_maxr 1:ge0_n. +qed. + (* -------------------------------------------------------------------- *) op map (f : t -> t) (w : word) : word = mkword (map f (ofword w)).