Update and adapt to GaloisInc/cryptol#1281 "toSignedInteger".

GaloisInc · Sep 15, 2021 · ee6629f · ee6629f
1 parent 6a70cdd
commit ee6629f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/cryptol-saw-core/saw/Cryptol.sawcore b/cryptol-saw-core/saw/Cryptol.sawcore
@@ -1073,6 +1073,12 @@ ecSMod n =
     (error (Stream Bool -> Stream Bool -> Stream Bool) "ecSMod: expected finite word")
     n;
 
+toSignedInteger : (n : Num) -> seq n Bool -> Integer;
+toSignedInteger n =
+  Num#rec (\ (n:Num) -> seq n Bool -> Integer)
+    sbvToInt
+    (error (Stream Bool -> Integer) "toSignedInteger: expected finite word")
+    n;
 
 -- Eq
 ecEq : (a : sort 0) -> PEq a -> a -> a -> Bool;

diff --git a/cryptol-saw-core/src/Verifier/SAW/Cryptol.hs b/cryptol-saw-core/src/Verifier/SAW/Cryptol.hs
@@ -745,6 +745,8 @@ prelPrims =
   , ("%$",           flip scGlobalDef "Cryptol.ecSMod")        -- {n} (fin n, n>=1) => [n] -> [n] -> [n]
   , ("lg2",          flip scGlobalDef "Cryptol.ecLg2")         -- {n} (fin n) => [n] -> [n]
   , (">>$",          flip scGlobalDef "Cryptol.ecSShiftR")     -- {n, ix} (fin n, n >= 1, Integral ix) => [n] -> ix -> [n]
+  , ("toSignedInteger",
+                     flip scGlobalDef "Cryptol.toSignedInteger") -- {n} (fin n, n >= 1) => [n] -> Integer
 
     -- -- Rational primitives
   , ("ratio",        flip scGlobalDef "Cryptol.ecRatio")       -- Integer -> Integer -> Rational

diff --git a/deps/cryptol b/deps/cryptol
+1 −1		docs/ProgrammingCryptol/crashCourse/CrashCourse.tex
+5 −0		lib/Cryptol.cry
+6 −0		src/Cryptol/Backend.hs
+1 −0		src/Cryptol/Backend/Concrete.hs
+1 −0		src/Cryptol/Backend/SBV.hs
+1 −0		src/Cryptol/Backend/What4.hs
+10 −0		src/Cryptol/Eval/Generic.hs
+4 −4		tests/issues/T146.icry.stdout
+6 −6		tests/issues/issue1024.icry.stdout
+1 −1		tests/issues/issue103.icry.stdout
+1 −0		tests/issues/issue226.icry.stdout
+2 −2		tests/issues/issue290v2.icry.stdout
+2 −2		tests/issues/issue723.icry.stdout
+1 −1		tests/modsys/T16.icry.stdout
+1 −1		tests/regression/safety.icry.stdout
+4 −4		tests/regression/tc-errors.icry.stdout