diff options
| author | Liana Hadarean <lianahady@gmail.com> | 2012-02-25 18:23:10 +0000 |
|---|---|---|
| committer | Liana Hadarean <lianahady@gmail.com> | 2012-02-25 18:23:10 +0000 |
| commit | 7aa55e0d38e73a02b11ad0c5a60196b610674050 (patch) | |
| tree | c59def0ed00dcde29a5a6498cf74ac87dc3a2a6f /src/theory/bv/kinds | |
| parent | d8da6a3644d1cdbe62d44a8eb80068da4d1d2855 (diff) | |
Refactored CnfStream to work with the bv theory Bitblaster:
* separated SatSolverInput interface class into two classes:
- TheoryProxy for the sat solver to communicate with the theories
- SatSolverInterface abstract class to communicate with the sat solver
* instead of using #ifdef typedef for SatClauses and SatLiterals, now there are CVC4 SatLiteral/SatClause types and mappings between them and the internal sat solver clause/literal representation
* added abstract classes for DPLLSatSolver and BVSatSolver different interfaces
Replaced TheoryBV with bitblasting implementation:
* all operators bitblasted
* only operator elimination rewrite rules so far
Diffstat (limited to 'src/theory/bv/kinds')
| -rw-r--r-- | src/theory/bv/kinds | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/theory/bv/kinds b/src/theory/bv/kinds index d502c5ecb..36d25de2a 100644 --- a/src/theory/bv/kinds +++ b/src/theory/bv/kinds @@ -57,6 +57,12 @@ operator BITVECTOR_SLE 2 "bit-vector signed less than or equal" operator BITVECTOR_SGT 2 "bit-vector signed greater than" operator BITVECTOR_SGE 2 "signed greater than or equal" +constant BITVECTOR_BITOF_OP \ + ::CVC4::BitVectorBitOf \ + ::CVC4::BitVectorBitOfHashStrategy \ + "util/bitvector.h" \ + "operator for the bit-vector boolean bit extract" + constant BITVECTOR_EXTRACT_OP \ ::CVC4::BitVectorExtract \ ::CVC4::BitVectorExtractHashStrategy \ @@ -93,6 +99,7 @@ constant BITVECTOR_ROTATE_RIGHT_OP \ "util/bitvector.h" \ "operator for the bit-vector rotate right" +parameterized BITVECTOR_BITOF BITVECTOR_BITOF_OP 1 "bit-vector boolean bit extract" parameterized BITVECTOR_EXTRACT BITVECTOR_EXTRACT_OP 1 "bit-vector extract" parameterized BITVECTOR_REPEAT BITVECTOR_REPEAT_OP 1 "bit-vector repeat" parameterized BITVECTOR_ZERO_EXTEND BITVECTOR_ZERO_EXTEND_OP 1 "bit-vector zero-extend" @@ -138,6 +145,7 @@ typerule BITVECTOR_SGT ::CVC4::theory::bv::BitVectorPredicateTypeRule typerule BITVECTOR_SGE ::CVC4::theory::bv::BitVectorPredicateTypeRule typerule BITVECTOR_EXTRACT ::CVC4::theory::bv::BitVectorExtractTypeRule +typerule BITVECTOR_BITOF ::CVC4::theory::bv::BitVectorBitOfTypeRule typerule BITVECTOR_CONCAT ::CVC4::theory::bv::BitVectorConcatRule typerule BITVECTOR_REPEAT ::CVC4::theory::bv::BitVectorRepeatTypeRule typerule BITVECTOR_ZERO_EXTEND ::CVC4::theory::bv::BitVectorExtendTypeRule |