Skip to content

Commit

Permalink
restore w.r.t F* and steel main branches
Browse files Browse the repository at this point in the history
  • Loading branch information
nikswamy committed Feb 8, 2024
1 parent f2126d3 commit 7a35612
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 2 deletions.
32 changes: 32 additions & 0 deletions Zeta.fst.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"fstar_exe": "fstar.exe",
"options": [
"--max_fuel", "0",
"--max_ifuel", "2",
"--initial_ifuel", "2",
"--warn_error", "-271",
"--z3cliopt", "timeout=600000",
"--z3cliopt", "smt.arith.nl=false",
"--smtencoding.elim_box", "true",
"--smtencoding.l_arith_repr", "native",
"--smtencoding.nl_arith_repr", "wrapped",
"--smt", "/home/nswamy/workspace/z3/z3/build/z3",
"--z3version", "4.12.3",
"--compat_pre_typed_indexed_effects",
"--cache_dir", "_output/cache",
"--load_cmxs", "steel"
],
"include_dirs": [
"_output",
"utils",
"generic",
"high",
"intermediate",
"steel",
"steel/crypto",
"${KRML_HOME}/krmllib",
"${KRML_HOME}/krmllib/obj",
"../steel/lib/steel"
]
}

2 changes: 1 addition & 1 deletion steel/Zeta.Steel.HashAccumulator.fst
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ let aggregate_raw_hashes
(inv 0);
Loops.for_loop 0sz hash_len_sz inv body;
assert (xor_bytes_pfx s1 s2 hash_len `Seq.equal` xor_bytes s1 s2);
rewrite (inv hash_len)
rewrite (inv (FStar.SizeT.v hash_len_sz))
(A.pts_to b1 _ _ `star` A.pts_to b2 _ _);
return ()

Expand Down
2 changes: 1 addition & 1 deletion steel/Zeta.Steel.ThreadStateModel.fst
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ let rec read_slots (tsm:thread_state_model)
| DValue None -> A.Null
| DValue (Some d) -> A.DValue d
in
Some (Seq.Properties.cons (k, d) tl)
Some (Seq.cons (k, d) tl)
| _ ->
None
)
Expand Down

0 comments on commit 7a35612

Please sign in to comment.