GaloisInc/cryptol
1
1
Fork 0
mirror of https://github.com/GaloisInc/cryptol.git synced 2024-12-26 09:25:56 +03:00
Code Issues Projects Releases Wiki Activity
1,724 Commits 67 Branches 28 Tags 96 MiB
fe4b2d9f70
Commit Graph

81 Commits

Author SHA1 Message Date
Brian Huffman
836771aded Tweak names and order of type variables on Cryptol prelude functions. 
Also update test output for new type variable names.

See #517.
 2018-06-28 14:14:44 -07:00
Brian Huffman
a4a3207f9f Swap type argument order for zext and sext. 
The new argument order works better for partial type application,
so e.g. zext`{32} extends its argument to 32 bits.
 2018-06-28 10:40:37 -07:00
Brian Huffman
9fcb481161 Generalize [x,y...] (infFromThen primitive) to class Arith. 2018-06-21 18:24:12 -07:00
Brian Huffman
4697683ac4 Generalize [x...] (i.e. infFrom primitive) to class Arith. 2018-06-21 17:57:13 -07:00
Brian Huffman
86898c1076 Remove now-redundant primitive toZ; use fromInteger instead. 2018-06-21 17:05:33 -07:00
Brian Huffman
dbd05b5acc Generalize prelude function fromInteger to class Arith. 2018-06-21 16:59:01 -07:00
Iavor Diatchki
0d81f0ba25 Implement defaulting in the presence of overloaded literals. 2018-06-20 15:06:19 -07:00
Brian Huffman
47df3e69b9 Remove obsolete primitives integer and intmod. 
Use the generalized `demote` instead.
 2018-06-18 18:09:03 -07:00
Brian Huffman
7424731e3f Generalize [a,b..c] to work for types in class Literal. 2018-06-15 17:45:57 -07:00
Brian Huffman
cbba44f692 Generalize [a..b] to work for types in class Literal. 2018-06-15 17:17:54 -07:00
Brian Huffman
01667d8486 Merge branch 'master' into literal-class 
# Conflicts:
#	lib/Cryptol.cry
 2018-06-15 11:10:11 -07:00
Brian Huffman
a7b69892f1 Add primitives toZ and fromZ for converting integers to/from Z n. 2018-06-15 10:13:09 -07:00
Brian Huffman
570f0be2ea Remove redundant fin constraint from the type of demote. 
`fin bits` and `bits >= width val` together imply `fin val`.
 2018-06-14 12:33:20 -07:00
Brian Huffman
dda5d34131 Fix constraints on type of primitive intmod. 
The old type did not forbid literals of the invalid type `Z inf`.
 2018-06-14 12:24:32 -07:00
Brian Huffman
5ac32d1ad5 Add a variant of the demote primitive for type Z n. 
intmod : {val, mn} (fin val, n >= val + 1) => Z n
 2018-06-14 06:17:51 -07:00
Brian Huffman
b3d2851923 Merge branch 'master' into literal-class 
# Conflicts:
#	src/Cryptol/TypeCheck/Kind.hs
#	src/Cryptol/TypeCheck/Solve.hs
 2018-06-13 11:41:35 -07:00
Brian Huffman
ab000984d2 Remove redundant prelude functions not, extend, and extendSigned. 
These were recently moved here from Cryptol::Extras. They are duplicates
of existing functions `complement`, `zext`, and `sext`.

See #427.
 2018-05-24 14:41:09 -07:00
Brian Huffman
960143668d Formatting code and comments in Cryptol.cry. 2018-05-24 13:23:26 -07:00
Aaron Tomb
99f3fdbf37 Merge Cryptol/Extras.cry with Cryptol.cry 
Closes #427.
 2018-05-23 15:55:05 -07:00
Brian Huffman
e8a941ecbd Add prelude docstrings for 'head' and 'last'. 2018-04-18 17:01:24 -07:00
Brian Huffman
3be72ae2cb Replace indexing primitives (!!) and (@@) with cryptol implementations. 2018-04-18 16:50:39 -07:00
Brian Huffman
2cdf9bd159 Replace primitives pmult, pmod, pdiv with cryptol implementations. 2018-04-15 06:56:20 -07:00
Brian Huffman
5cd9141fe7 Add functions head and last to Cryptol prelude. Fixes #465. 
Also fix regression test output.
 2018-03-16 15:10:36 -07:00
Brian Huffman
951eebb8e2 Add more documentation of Cryptol prelude primitives. 2017-11-15 11:37:06 -08:00
Brian Huffman
5eb67c0513 Introduce class Literal and generalize primitive demote to use it. 
demote : {val, a} Literal val a => a

instance (fin val) => Literal val Integer
instance (fin val, fin bits, bits >= width val) => Literal val [bits]
 2017-11-08 15:23:08 -08:00
Brian Huffman
3b03545552 Merge branch 'master' into blocks-padding 2017-10-03 13:44:32 -07:00
Rob Dockins
c0699e2d62 Change the fixity levels of (||) and (&&). 
This advances the next step in the plan described in issue #241.
 2017-10-02 14:56:33 -07:00
Brian Huffman
cce32a4868 Merge branch 'master' into integer 
This brings the Logic and Zero type classes into the integer branch.
 2017-09-28 13:18:27 -07:00
Brian Huffman
7e34c25e4d Switch to infix syntax for blocks and padding operators. 
"x /^ y" is x/y rounded up, i.e. the least n such that x <= y*n.
"x %^ y" is the least k such that x+k is a multiple of y.

For comparison,
"x / y" is x/y rounded down, i.e. the greatest n such that x >= y*n.
"x % y" is the least k such that x-k is a multiple of y.

The new syntax is much more suggestive of the relation to "/" and "%".
 2017-09-28 10:26:31 -07:00
Brian Huffman
9bc6d02019 Implement blocks and padding operators for numeric types. 
The design is as described in issue #96:

blocks msgLen blockSize = the least n such that msgLen <= blockSize * n
padding msgLen blockSize = least k such that msgLen + k divides blockSize

or alternatively:

msgLen + padding msgLen blockSize = blocks msgLen blockSize * blockSize
 2017-09-27 13:43:26 -07:00
Brian Huffman
b03f1ae0c2 Add class Zero with zero :: {a} (Zero a) => a. 
Shift operators also have a `Zero` constraint on the element type.
 2017-09-15 16:37:44 -07:00
Brian Huffman
a52510e56b Add 'Logic' class constraints to Cryptol::Extras 2017-09-15 13:38:43 -07:00
Brian Huffman
d1305b2860 Add 'Logic' typeclass with operations complement, &&, ||, ^, zero. 
Left and right shift operations also gain a Logic constraint,
since they shift in zero values.
 2017-09-15 13:33:56 -07:00
Brian Huffman
5d73b5d405 Merge branch 'master' into integer 
This involved plenty of non-trivial merge edits to fix compilation errors.

# Conflicts:
#	src/Cryptol/Eval.hs
#	src/Cryptol/Eval/Value.hs
#	src/Cryptol/Prims/Eval.hs
#	src/Cryptol/Symbolic/Prims.hs
#	src/Cryptol/Symbolic/Value.hs
#	src/Cryptol/TypeCheck/AST.hs
 2017-09-13 14:28:04 -07:00
Robert Dockins
cefc67a149 Implement signed division and remainder as methods of the Arith class. 
Clarify the documentation that division is "round toward 0" division.
 2017-08-16 17:34:22 -07:00
Robert Dockins
987e4a0c3b Implement the type-level support required for the new SignedCmp class. 
This class will represent types that can be meaningfully compared for
signed bitvector equality.  It lifts the comparison operations on
nonempty bitvectors through tuples, records and finite sequences via
lexicographic order.
 2017-08-07 12:37:46 -07:00
Robert Dockins
2b9e5a2421 Add signed and unsigned bitvector extensions 2017-08-04 17:04:29 -07:00
Robert Dockins
9a3b64e088 Fix the definition of the signed borrow function 2017-08-04 17:03:23 -07:00
Robert Dockins
e3dd83066e Rename signed bitvector operations to put the $ at the end 2017-08-04 17:02:10 -07:00
Robert Dockins
a68b835d51 Add operations for signed arithmetic, and carry condition testing. 2017-08-02 16:39:07 -07:00
Iavor Diatchki
e5fa174cbb Add some axioms about width. 
Fixes #387
 2017-07-10 16:59:03 -07:00
Iavor S. Diatchki
0985508bbc Add fin constraints on the message mart of trace. 2017-06-16 09:58:11 -07:00
Brian Huffman
9a267b1f0c Removed definition of binary infix (~) from Cryptol prelude. Fixes #423. 
This change partially reverts changeset c620cbf2, which fixed #296,
which was about supporting `:t (~)` in the REPL.

As of this change, `:t (~)` will no longer work in the REPL.
The regression test for issue #296 is removed.
 2017-05-24 09:39:50 -07:00
Brian Huffman
007c74cd97 Update doc-strings to mention syntactic sugar for complement and sequences. 2017-05-24 09:09:28 -07:00
Trevor Elliott
4dc5eda23a Expand the width table, and fix a bug in CryptoBox (Thanks @tommd) 
The width table in CryptolTC.z3 wasn't large enough to solve constraints
about the width of 64-bit words. This change is a bit of a band-aid, as
larger words will expose the same problem. Longer-term, we should try to
solve these constraints after the SMT-based phase, using some other
approach.

The constraints in CryptoBox were too permissive, and when adjusted to
represent the true intent (that values fit within 64-bits), and the
width table was updated, the example will type-check again.

Thanks to @tommd for tracking both of these down.
 2017-03-27 13:45:50 -07:00
Iavor S. Diatchki
41131fe7ed Redo the export to SMT story in a much simpler way. 2017-02-16 16:46:38 -08:00
Brian Huffman
67e730a07c Merge branch 'master' into integer 2016-09-20 16:04:02 -07:00
Brian Huffman
dafd48cad0 Simplify type of primitive function 'pmult'. Fixes #366. 
Old: (fin a, fin b) => [a] -> [b] -> [max 1 (a + b) - 1]
New: (fin a, fin b) => [1 + a] -> [1 + b] -> [1 + a + b]
 2016-09-20 15:13:40 -07:00
Brian Huffman
e4f958fbfa Add primitives 'toInteger' and 'fromInteger' 
These do not yet work with symbolic arguments. We will
need to first add support for these to SBV.
 2016-08-19 10:17:36 -07:00
Brian Huffman
cb53109f33 Add primitive integer : {val} (fin val) => Integer 2016-08-18 14:26:29 -07:00