aboutsummaryrefslogtreecommitdiff
path: root/src/Spec/PointEncoding.v
diff options
context:
space:
mode:
Diffstat (limited to 'src/Spec/PointEncoding.v')
-rw-r--r--src/Spec/PointEncoding.v14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/Spec/PointEncoding.v b/src/Spec/PointEncoding.v
index f4634f52f..29e359baa 100644
--- a/src/Spec/PointEncoding.v
+++ b/src/Spec/PointEncoding.v
@@ -20,7 +20,6 @@ Section PointEncoding.
{FqEncoding : canonical encoding of (F q) as (Word.word sz)}
{sign_bit : F q -> bool} {sign_bit_zero : sign_bit 0 = false}
{sign_bit_opp : forall x, x <> 0 -> negb (sign_bit x) = sign_bit (opp x)}.
- Existing Instance prime_q.
Definition point_enc (p : E.point) : Word.word (S sz) := let '(x,y) := proj1_sig p in
Word.WS (sign_bit x) (enc y).
@@ -29,19 +28,12 @@ Section PointEncoding.
{point_dec : Word.word (S sz) -> option E.point
| forall w x, point_dec w = Some x -> (point_enc x = w)
} := @PointEncodingPre.point_dec _ _ _ sign_bit.
-
Definition point_dec := Eval hnf in (proj1_sig point_dec_with_spec).
- Definition point_encoding_valid : forall p : E.point, point_dec (point_enc p) = Some p :=
- @PointEncodingPre.point_encoding_valid _ _ q_5mod8 sqrt_minus1_valid _ _ sign_bit_zero sign_bit_opp.
-
- Definition point_encoding_canonical : forall x_enc x, point_dec x_enc = Some x -> point_enc x = x_enc :=
- PointEncodingPre.point_encoding_canonical.
-
- Instance point_encoding : canonical encoding of E.point as (Word.word (S sz)) := {
+ Global Instance point_encoding : canonical encoding of E.point as (Word.word (S sz)) := {
enc := point_enc;
dec := point_dec;
- encoding_valid := point_encoding_valid;
- encoding_canonical := point_encoding_canonical
+ encoding_valid := @PointEncodingPre.point_encoding_valid _ _ q_5mod8 sqrt_minus1_valid _ _ sign_bit_zero sign_bit_opp;
+ encoding_canonical := PointEncodingPre.point_encoding_canonical
}.
End PointEncoding. \ No newline at end of file