Rob Dockins
922350ff7a
Put together enough of the framework required to run :sat and :prove
...
queries via What4. We still need to support configuring the solver to use,
multisat queries, and portfolio solving.
2020-04-27 14:19:44 -07:00
Rob Dockins
44a2b8e236
Very basic scaffolding for using what4 as a symbolic backend
2020-04-27 14:19:44 -07:00
Rob Dockins
1e1f7af812
Fix the haskeline package upper bound
2020-04-23 17:37:53 -07:00
robdockins
f29f0158ff
Merge pull request #703 from GaloisInc/issue702
...
issue702
2020-04-23 12:22:25 -07:00
brianhuffman
aa6030ba07
Merge pull request #708 from GaloisInc/fix-iterate
...
Redefine prelude function `iterate` to preserve sharing.
2020-04-22 11:22:17 -07:00
Brian Huffman
4dd77c756b
Update type variable numbering in test suite output.
2020-04-20 11:29:49 -07:00
Brian Huffman
0203244cd6
Redefine prelude function iterate to preserve sharing.
...
Fixes #707 .
2020-04-18 08:12:40 -07:00
brianhuffman
30b41e9c45
Merge pull request #700 from GaloisInc/fix-warnings
...
Fix warnings about redundant imports.
2020-04-18 06:34:52 -07:00
Rob Dockins
ce85155dbe
Add unit test for issue702
2020-04-17 17:48:44 -07:00
Rob Dockins
9434236cbd
Enforce a canonical field ordering in the field type constructor for FinType
...
This solves another manifestation of issue #702 .
2020-04-17 17:48:28 -07:00
Rob Dockins
194d02d06d
Sort the fields of a record type before comparing with the fields in
...
a concrete value in `toExpr`.
Fixes #702
2020-04-17 17:09:58 -07:00
robdockins
d8bf07320f
Merge pull request #638 from rjnw/master
...
Fix for freevars and adding some exports.
2020-04-17 16:25:01 -07:00
Brian Huffman
21a09179ff
Fix warnings about redundant imports.
2020-04-09 13:10:29 -07:00
Rob Dockins
c83f831763
Fix benchmark suite
2020-04-03 14:47:16 -07:00
robdockins
87ad864185
Merge pull request #684 from GaloisInc/eval-refactor
...
Evaluator refactor
2020-04-02 09:42:04 -07:00
Rob Dockins
d08046d063
Test case for issue #662
2020-04-02 09:40:44 -07:00
Rob Dockins
4c6424c8a7
Fix for #662 .
...
This fix interprets integer division as "round down" division
in the symbolic simulator, to match the behavior of the concrete
simulator.
2020-03-30 22:53:10 -07:00
Rob Dockins
943e11478a
Add regression test for word updates
2020-03-30 15:09:53 -07:00
Rob Dockins
cfef882fe5
Minor tweaks in the concrete evaluator
2020-03-30 13:40:59 -07:00
Rob Dockins
bdfd4e6bc0
Add INLINE and SPECIALIZE pragmas to generate better code for the
...
concrete evaluator.
2020-03-30 13:01:06 -07:00
Rob Dockins
34ce8ecc00
Change uses of Z 0 to cause panics. The type constraints for
...
`Z` should make these cases impossible.
2020-03-30 09:54:27 -07:00
Rob Dockins
c94c929354
Comment tweaks
2020-03-30 09:35:00 -07:00
Iavor S. Diatchki
761930257d
Merge pull request #690 from GaloisInc/feature/689
...
Feature/688
2020-03-27 10:25:08 -07:00
Rob Dockins
ffdf11d202
Minor style and bugfixes
2020-03-26 16:03:35 -07:00
Rob Dockins
058847f138
Break the symbolic query description datatypes into a separate
...
module, moving SBV specific code into `Cryptol.Symbolic.SBV`
2020-03-26 09:23:00 -07:00
Iavor Diatchki
fcc7a19998
More information when browsing.
...
This implements the feature request in #689
2020-03-24 16:53:48 -07:00
Iavor Diatchki
ec36d1aa38
Just comments and clean-up. Should contain no semantic changes.
2020-03-23 15:05:31 -07:00
Rob Dockins
0ce797f0c9
Fix a bugged implementation of symbolic bit update for SBV words.
2020-03-23 14:49:17 -07:00
Rob Dockins
d26966101f
Promote the logicShift out of the SBV module into a generic implementation.
...
The concrete evaluator still uses a direct implementation, but this
one, based on a barrel-shifter, can also be used byt the what4 backend.
2020-03-23 14:49:05 -07:00
Rob Dockins
c2459cedb4
Minor consolidation/fixes to primitive definitions
2020-03-19 17:31:43 -07:00
Rob Dockins
20ad7e8e86
Remove the "round-to-zero" versions of integer division and modulus,
...
since we're going to restrict signed division to bitvectors.
2020-03-19 17:30:14 -07:00
Rob Dockins
72cf1ccd18
Implement the non-ring operations on Z_n via translation to integers
...
directly in the `Backend` class definition. Each backend was
essentially doing this anyway.
Also add an `integerAsLit` operation.
2020-03-19 16:44:38 -07:00
Rob Dockins
6029ed2198
More documenation in Backend
2020-03-18 14:31:16 -07:00
Rob Dockins
c3ab80721f
use wordAsChar
2020-03-18 14:30:54 -07:00
Rob Dockins
0cb075ead6
Rename intModXXX operations to znXXX. These names are less confusing.
2020-03-18 13:48:12 -07:00
Rob Dockins
5af4469fe1
Reorganize sequence index and update operations. They now uniformly
...
check for index in bounds conditions, and the interface between
the backend-specific operations is cleaned up.
2020-03-18 13:17:49 -07:00
Rob Dockins
9ed0c1d3a9
Make error handling uniform across the symbolic and concrete backends.
...
Any non-concrete values in error messages are rendered as '?'
2020-03-18 08:28:36 -07:00
Rob Dockins
bc99e7d791
Take bitLit out of the SEval monad. The backends all support
...
a non-monadic version of bit literals, and it's somewhat more convenient.
2020-03-17 15:17:25 -07:00
Rob Dockins
47959c55cc
Rearrange/reorganize the primitive tables for the SBV and Concrete
...
backends to make them line up, and make it more obvious that most
of the primitives are uniformly defined for both backends.
The remaining primitives that have significant structural differences
are the sequence indexing and updating primitives, the shifts/rotates,
and `error`, `random` and `trace`.
While doing this, push the various to/from integer coercions
into the `Backend` class and make the operations uniform.
2020-03-17 15:04:36 -07:00
Rob Dockins
f016a9a9fc
Define carry and scarry instead of making them primitive.
2020-03-17 13:25:39 -07:00
Rob Dockins
e079ab4cf6
Push the Logic, Cmp and SignedCmp class methods into the Backend
...
and use generic implementations.
2020-03-17 11:50:44 -07:00
Rob Dockins
31109c2143
Push error handling into the backend class using methods
...
that interact with the `SEval` monad. Also, finish pushing
the methods of the `Arith` class into the evaluation backend
where they can be generically referenced by both the concrete
and symbolic evaluators.
2020-03-16 17:52:59 -07:00
Rob Dockins
9d74dd1383
In symbolic evaluation mode, use a monad that tracks safety conditions
...
alongside the value being computed. For now, this is just the infrastructure;
soon, we'll push the computation of side effects into the `Backend`
class, where they can interact with this new monad.
2020-03-13 14:15:52 -07:00
Rob Dockins
b108bf0e79
Allow the evaluation monad to depend on the backend
2020-03-13 12:25:41 -07:00
Rob Dockins
71b2f8ce70
Rename the BitWord class into Backend, and split into a separate
...
module. Push primitive type if/then/else operations into the `Backend`
class, and promote `iteValue` and `mergeValue` to operations
on generic values.
2020-03-13 12:04:27 -07:00
Rob Dockins
8718489531
Create a new sentinal datatype Concrete instead of using the unit
...
type to indicate concrete evaluation.
2020-03-11 14:08:30 -07:00
Rob Dockins
be45b4ea29
Move definitions specific to the concrete evaluator in to separate
...
modules. The module structure needs to be a bit more cut up than
I would like to avoid module import cycles.
2020-03-11 10:26:22 -07:00
Rob Dockins
bdb8f49143
Refactor Cryptol.Symbolic.Prims and Cryptol.Symbolic.Value into
...
a single new module `Crypol.Eval.SBV`.
2020-03-09 14:32:07 -07:00
Rob Dockins
0341fd0480
Split out the primitive definitions used by multiple evalautors
...
into a `Generic` module. Refactor the `EvalPrims` class away,
pusing the `iteValue` operation into `BitWord` and demoting
the `evalPrim` operation into an ordinary (non-typeclass)
operation.
2020-03-09 14:09:19 -07:00
Rob Dockins
fbbaed8c83
Rename module Cryptol.Prims.Eval into Cryptol.Eval.Concrete.
...
This fits better into the current module structure, and is a lot
less confusing.
2020-03-09 11:29:08 -07:00
