Skip to content

Commit

Permalink
fetch 'bitwuzla' from 'b772cd25'
Browse files Browse the repository at this point in the history
  • Loading branch information
recoules committed Mar 3, 2024
1 parent 6daeee5 commit ccb1587
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 7 deletions.
4 changes: 4 additions & 0 deletions api/dune
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
(foreign_archives
../vendor/bitwuzla/src/api/cpp/bitwuzla-api
../vendor/bitwuzla/bitwuzla-cxx
../vendor/bitwuzla/src/parser/smt2/bitwuzla-smt2
../vendor/bitwuzla/src/lib/bitwuzla-libs
../vendor/cadical/cadical)
(library_flags -linkall)
Expand All @@ -37,6 +38,7 @@
(foreign_archives
../vendor/bitwuzla/src/api/cpp/bitwuzla-api
../vendor/bitwuzla/bitwuzla-cxx
../vendor/bitwuzla/src/parser/smt2/bitwuzla-smt2
../vendor/bitwuzla/src/lib/bitwuzla-libs
../vendor/cadical/cadical)
(library_flags -linkall)
Expand All @@ -57,6 +59,7 @@
(foreign_archives
../vendor/bitwuzla/src/api/cpp/bitwuzla-api
../vendor/bitwuzla/bitwuzla-cxx
../vendor/bitwuzla/src/parser/smt2/bitwuzla-smt2
../vendor/bitwuzla/src/lib/bitwuzla-libs
../vendor/cadical/cadical)
(library_flags -linkall)
Expand All @@ -77,6 +80,7 @@
(foreign_archives
../vendor/bitwuzla/src/api/cpp/bitwuzla-api
../vendor/bitwuzla/bitwuzla-cxx
../vendor/bitwuzla/src/parser/smt2/bitwuzla-smt2
../vendor/bitwuzla/src/lib/bitwuzla-libs
../vendor/cadical/cadical)
(library_flags -linkall)
Expand Down
6 changes: 6 additions & 0 deletions bitwuzla_cxx.ml
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,12 @@ module type S = sig
(** Bit-vector negation (two's complement).
SMT-LIB: [bvneg] *)
| Bv_nego
(** Bit-vector negation overflow test.
Predicate indicating if bit-vector negation produces an overflow.
SMT-LIB: [bvnego] *)
| Bv_nor (** Bit-vector nor.
SMT-LIB: [bvnor] *)
Expand Down
15 changes: 14 additions & 1 deletion bitwuzla_cxx.mli
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,19 @@ module Options : sig
- An unsigned integer value <= 4 \[{b default}: [0]\].
*)
| Time_limit_per : int key
(** Time limit in milliseconds per satisfiability check.**
(** Time limit in milliseconds per satisfiability check.
Values:
- An unsigned integer for the time limit in milliseconds.
\[{b default}: [0]\].
*)
| Memory_limit : int key
(** Memory limit in MB.
Values:
- An unsigned integer for the memory limit in MB.
\[{b default}: [0]\].
*)
| Bv_solver : bv_solver key
| Rewrite_level : int key
(** Rewrite level.
Expand Down Expand Up @@ -791,6 +798,12 @@ module type S = sig
(** Bit-vector negation (two's complement).
SMT-LIB: [bvneg] *)
| Bv_nego
(** Bit-vector negation overflow test.
Predicate indicating if bit-vector negation produces an overflow.
SMT-LIB: [bvnego] *)
| Bv_nor (** Bit-vector nor.
SMT-LIB: [bvnor] *)
Expand Down
1 change: 1 addition & 0 deletions dune
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
(foreign_archives
vendor/bitwuzla/src/api/cpp/bitwuzla-api
vendor/bitwuzla/bitwuzla-cxx
vendor/bitwuzla/src/parser/smt2/bitwuzla-smt2
vendor/bitwuzla/src/lib/bitwuzla-libs
vendor/cadical/cadical)
(c_library_flags :standard -L/opt/homebrew/lib -lgmp)
Expand Down
2 changes: 1 addition & 1 deletion vendor/bitwuzla
Submodule bitwuzla updated 203 files
2 changes: 1 addition & 1 deletion vendor/cadical
Submodule cadical updated 173 files
22 changes: 18 additions & 4 deletions vendor/dune
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
(language cxx)
(names
bitvector
aig_manager
aig_cnf
aig_manager
aig_node
aig_printer
aig_bitblaster
ls
ls_bv
bitvector_domain
Expand Down Expand Up @@ -50,7 +50,21 @@
(extra_deps ../../config.h ../../../../.bitwuzla_tree))))
(subdir
src
(dirs :standard \ parser)
(subdir
parser
(include_subdirs no)
(subdir
smt2
(foreign_library
(archive_name bitwuzla-smt2)
(language cxx)
(names lexer)
(flags
:standard
-std=c++17
-I../..
-DNDEBUG)
(extra_deps ../../../../.bitwuzla_tree))))
(rule
(deps ../COPYING)
(target config.h)
Expand Down Expand Up @@ -126,6 +140,7 @@
rewrites_bv_norm
rewrites_core
rewrites_fp
resource_terminator
cadical
cryptominisat
kissat
Expand All @@ -148,7 +163,6 @@
solver_engine
solver_state
solving_context
timeout_terminator
type
type_data
type_manager
Expand Down

0 comments on commit ccb1587

Please sign in to comment.