Merge saw-core repo #1213
Merged
Merge saw-core repo #1213
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Refactor saw-core `Value` type to make a separate datatype for type values
This works by declaring monomorphic uninterpreted functions at each type instance, using a name suffix based on the type value. Fixes #320.
Support uninterpreted polymorphic functions in sbv/what4 backends.
The new parser also uses `fail` in the `IO` monad to signal a parse error, and avoids partial functions like `read` and `error`.
Modify saw-core external-format parser to use fresh `ExtCns` indices.
the `pdiv`, `pmod` and `pmult` primitives using essentially the same trick we use in the Cryptol symbolic backends.
Updates to track Cryptol PRs GaloisInc/cryptol#923 and GaloisInc/cryptol#940
Also reimplement `IntMod` type in simulator backends to use it.
Also convert primitive implementations to use it.
Quantified variables of type `IntMod n` should work again in the what4/sbv backends.
…nds. When we generate an uninterpreted function in a symbolic backend that takes an argument of type `IntMod n`, we normalize the symbolic integer argument by reducing mod n. This ensures that the resulting expression will respect the underlying equivalence relation for the `IntMod n` type.
Also add `getLabelValues` function from saw-script to saw-core-what4.
Improved support for IntMod type in symbolic backends
Reimplement `getAllExtSet` and `getConstantSet` using `Data.IntSet`.
Do the right thing when encountering 0-width bitvectors in the What4 backend
The _CoqProject file used to contain a lot of extraneous files related to my work on S2N, my work with Talia Ringer, and an attempt at work on BESSPIN. These are obsolete and irrelevant to saw-core-coq and should be located elsewhere. This commit also re-enables the compilation of some saw-core-coq files, notably CryptolPrimitivesForSAWCore which is necessary for extraction from SAW, and CoqVectorsExtra which may not be very useful yet. This also remove all unnecessary Coq and Cryptol files.
Expose Simulator.What4 helper functions for use in compositional crux-mir
|
Note: This PR includes the saw-core repo up to the commit that the saw-core submodule reference previously pointed to (12a8f95, the merge commit for GaloisInc/saw-core#203). It does not include the most-recently-merged PR GaloisInc/saw-core#197, which saw-script is not yet compatible with. The commit from this saw-core PR should be made into part of a new saw-script PR to adapt to the persistent solver features of cryptol. |
|
Awesome! I think the only remaining hurdle is to make the |
|
It looks like @Ptival got the |
brianhuffman
force-pushed
the
merge-saw-core-repo
branch
from
6ce4543 to
41d5a2b
Compare
|
By including the commits from GaloisInc/saw-core#201 and GaloisInc/saw-core#202, the saw-core-coq CI tests are now passing. |
… the saw-script repository, in its entirety and with all history intact. Merge remote-tracking branch 'saw-core/prep-merge' into merge-saw-core-repo
After merging repositories, the saw-core and cryptol-saw-core packages should no longer direct users to create issues on the old saw-core repo.
brianhuffman
force-pushed
the
merge-saw-core-repo
branch
from
e101f2b to
647a603
Compare
robdockins
approved these changes
Apr 26, 2021
atomb
approved these changes
Apr 26, 2021
lisanna-dettwyler
approved these changes
Apr 26, 2021
|
@ldettwy neat, feel free to reach out to me if something in the workflow is confusing or breaks! |
This was referenced Apr 26, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merge pulls the previously-separate saw-core repository into the the saw-script repository, in its entirety and with all history intact.