Skip to content

Commit cdf2a80

Browse files
committed
bump rupicola
1 parent 9eb8af1 commit cdf2a80

5 files changed

Lines changed: 7 additions & 6 deletions

File tree

src/Bedrock/Field/Translation/Expr.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Section Expr.
110110
fun c x y =>
111111
if literal_eqb x 0
112112
then if literal_eqb y (2^width - 1)
113-
then expr.op bopname.add (expr.literal (-1))
113+
then expr.op bopname.add (expr.op1 op1.opp (expr.literal 1))
114114
(expr.op bopname.eq c (expr.literal 0))
115115
else base_make_error _
116116
else base_make_error _.

src/Bedrock/Field/Translation/Parameters/Defaults.v

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Section Defs.
5454
| expr.literal _ => true
5555
| expr.var x => negb (String.eqb x ERROR)
5656
| expr.load _ a => error_free_expr a
57+
| expr.op1 _ x => error_free_expr x
5758
| expr.op _ x y => (error_free_expr x && error_free_expr y)%bool
5859
| expr.inlinetable _ _ index => error_free_expr index
5960
| expr.ite c a b => (error_free_expr c && error_free_expr a && error_free_expr b)%bool

src/Bedrock/Field/Translation/Proofs/Expr.v

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ Section Expr.
706706
equivalent_base rep.equiv rep.Z ident.literal] in *.
707707
cbv [WeakestPrecondition.dexpr ident.literal] in *.
708708
cbn [WeakestPrecondition.expr WeakestPrecondition.expr_body
709-
Semantics.interp_binop].
709+
Semantics.interp_binop Semantics.interp_op1].
710710
sepsimpl_hyps.
711711
eapply Proper_expr; [ | eassumption ].
712712
repeat intro; subst.
@@ -720,7 +720,8 @@ Section Expr.
720720
Z.ltb_to_lt; try lia.
721721
all:pull_Zmod.
722722
all:autorewrite with zsimplify_fast.
723-
all:try reflexivity.
723+
all:rewrite <-?word.ring_morph_opp, ?word.unsigned_of_Z.
724+
all:cbv [word.wrap]; rewrite ?Zplus_mod_idemp_l, ?Zmod_mod; trivial.
724725
rewrite Z.mod_opp_l_nz
725726
by (rewrite ?Z.mod_1_l; auto with zarith).
726727
Z.rewrite_mod_small.

src/Bedrock/Group/ScalarMult/CSwap.v

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,12 +502,11 @@ Section __.
502502
Memory := m;
503503
Locals := l;
504504
Functions := functions }>
505-
cmd.seq (cmd.set var (expr.op bopname.sub (expr.literal (-1)) (expr.var x_var)))
505+
cmd.seq (cmd.set var (expr.op1 op1.not (expr.var x_var)))
506506
k_impl
507507
<{ pred (nlet_eq [var] v k) }>.
508508
Proof using field_representaton word_ok.
509509
repeat (eexists; split; eauto).
510-
apply word_not_impl.
511510
Qed.
512511
Hint Extern 10 => simple eapply compile_word_not; shelve : compiler.
513512

0 commit comments

Comments
 (0)