From 93fd47047bd59595035c62fae6a1f5a689e5a75d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 23 Jan 2024 14:05:50 +0100
Subject: [PATCH 001/158] Bitwuzla: Added SWIG file to autogenerate JNI
 bindings and switched to the C++ API.

---
 .idea/JavaSMT.iml                             |    9 +
 build/build-publish-solvers.xml               |  166 +-
 lib/native/source/libbitwuzla/bitwuzla.i      |  454 +
 lib/native/source/libbitwuzla/bitwuzla_wrap.c | 8324 -----------------
 lib/native/source/libbitwuzla/compile.sh      |   73 -
 solvers_ivy_conf/ivy_bitwuzla.xml             |   24 +-
 .../bitwuzla/BitwuzlaArrayFormulaManager.java |   28 +-
 .../BitwuzlaBitvectorFormulaManager.java      |  146 +-
 .../BitwuzlaBooleanFormulaManager.java        |   64 +-
 .../solvers/bitwuzla/BitwuzlaDeclaration.java |   30 +-
 .../BitwuzlaFloatingPointManager.java         |  217 +-
 .../solvers/bitwuzla/BitwuzlaFormula.java     |   26 +-
 .../bitwuzla/BitwuzlaFormulaCreator.java      |  499 +-
 .../bitwuzla/BitwuzlaFormulaManager.java      |   57 +-
 .../solvers/bitwuzla/BitwuzlaJNI.java         |  758 --
 .../solvers/bitwuzla/BitwuzlaKind.java        |  314 -
 .../solvers/bitwuzla/BitwuzlaModel.java       |  126 +-
 .../bitwuzla/BitwuzlaNativeApiTest.java       | 1041 +--
 .../solvers/bitwuzla/BitwuzlaOption.java      |  168 -
 .../solvers/bitwuzla/BitwuzlaOptionInfo.java  |   86 -
 .../BitwuzlaQuantifiedFormulaManager.java     |   44 +-
 .../solvers/bitwuzla/BitwuzlaResult.java      |   73 -
 .../bitwuzla/BitwuzlaSolverContext.java       |  146 +-
 .../bitwuzla/BitwuzlaTheoremProver.java       |  122 +-
 .../solvers/bitwuzla/BitwuzlaUFManager.java   |    6 +-
 .../solvers/bitwuzla/NumericValue.java        |    2 +
 26 files changed, 1685 insertions(+), 11318 deletions(-)
 create mode 100644 lib/native/source/libbitwuzla/bitwuzla.i
 delete mode 100644 lib/native/source/libbitwuzla/bitwuzla_wrap.c
 delete mode 100755 lib/native/source/libbitwuzla/compile.sh
 delete mode 100644 src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaJNI.java
 delete mode 100644 src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaKind.java
 delete mode 100644 src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaOption.java
 delete mode 100644 src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaOptionInfo.java
 delete mode 100644 src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaResult.java

diff --git a/.idea/JavaSMT.iml b/.idea/JavaSMT.iml
index c9ee959dbd..6923bc643d 100644
--- a/.idea/JavaSMT.iml
+++ b/.idea/JavaSMT.iml
@@ -322,6 +322,15 @@ SPDX-License-Identifier: Apache-2.0
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/java/runtime-bitwuzla/bitwuzla.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
diff --git a/build/build-publish-solvers.xml b/build/build-publish-solvers.xml
index 473feca100..0557ecb491 100644
--- a/build/build-publish-solvers.xml
+++ b/build/build-publish-solvers.xml
@@ -173,7 +173,7 @@ SPDX-License-Identifier: Apache-2.0
         </javac>
         <jar destfile="opensmt-${opensmt.version}.jar" basedir="${path.source}/bin"/>
         <delete dir="${path.source}/bin"/>
-        <delete dir="lib/native/source/opensmt/src"/>
+        <delete dir="${path.source}/src"/>
     </target>
 
     <target name="publish-opensmt" depends="package-opensmt, load-ivy"
@@ -846,15 +846,11 @@ SPDX-License-Identifier: Apache-2.0
             a checkout of the official git repositoy from 'https://github.com/bitwuzla/bitwuzla'.
             Note that shell substitutions do not work and a full absolute path has to be specified.
         </fail>
-        <echo>
-            The path is ${bitwuzla.path}</echo>
-
         <fail unless="bitwuzla.customRev">
             Please specify a custom revision with the flag -Dbitwuzla.customRev=XXX.
             The custom revision has to be unique amongst the already known version
             numbers from the ivy repository. The script will append the git revision.
         </fail>
-
         <fail unless="gmp.path">
             Please specify the path to GMP with the flag -Dgmp.path=/path/to/gmp.
             The path has to point to the root GMP folder with version equal to or larger than 6.1.
@@ -870,59 +866,157 @@ SPDX-License-Identifier: Apache-2.0
         <property name="bitwuzla.version" value="${bitwuzla.customRev}-g${bitwuzla.revision}"/>
         <echo message="Building Bitwuzla in version '${bitwuzla.version}'"/>
 
-        <!-- add JNI wrapper before compiling Bitwuzla -->
-        <copy file="lib/native/source/libbitwuzla/bitwuzla_wrap.c"
-              tofile="${bitwuzla.path}/src/bitwuzla_wrap.c"/>
+        <!-- path to our local directory in lib/native -->
+        <property name="source.path" value="${user.dir}/lib/native/source/libbitwuzla"/>
 
+        <!-- build bitwuzla -->
         <exec executable="./configure.py" dir="${bitwuzla.path}" failonerror="true">
             <arg value="--shared"/>
-            <arg value="--wipe"/>
+            <arg value="--prefix"/>
+            <arg value="${bitwuzla.path}/install"/>
         </exec>
         <exec executable="meson" dir="${bitwuzla.path}/build/" failonerror="true">
             <arg value="compile"/>
         </exec>
+        <exec executable="meson" dir="${bitwuzla.path}/build/" failonerror="true">
+            <arg value="install"/>
+        </exec>
 
-        <!-- unneeded symbols are removed by Meson automatically -->
+        <!-- copy bitwuzla include files to the source tree -->
+        <copy todir="${source.path}">
+            <fileset dir="${bitwuzla.path}/install">
+                <include name="include/**"/>
+            </fileset>
+        </copy>
 
-        <exec executable="lib/native/source/libbitwuzla/compile.sh" failonerror="true">
-            <arg value="${bitwuzla.path}" />
+        <!-- create ouput directory for the swig proxies -->
+        <mkdir dir="${source.path}/src/org/sosy_lab/java_smt/solvers/bitwuzla/api"/>
+
+        <!-- run swig to generate java files and the c wrapper -->
+        <exec executable="swig" dir="${source.path}" failonerror="true">
+            <arg value="-java"/>
+            <arg value="-c++"/>
+            <arg value="-package"/>
+            <arg value="org.sosy_lab.java_smt.solvers.bitwuzla.api"/>
+            <arg value="-outdir"/>
+            <arg value="src/org/sosy_lab/java_smt/solvers/bitwuzla/api"/>
+            <arg value="-o"/>
+            <arg value="bitwuzla_wrap.cpp"/>
+            <arg value="bitwuzla.i"/>
         </exec>
-        
-        <!-- fix RPATH and library dependencies -->
-        <exec executable="patchelf" dir="lib/native/source/libbitwuzla/" failonerror="true">
-            <arg value="--set-rpath"/><arg value="$ORIGIN"/>
-            <arg value="--replace-needed"/><arg value="libbitwuzla.so.0"/><arg value="libbitwuzla.so"/>
+
+        <!-- compile java proxies and create jar file -->
+        <mkdir dir="${source.path}/build"/>
+        <javac srcdir="${source.path}/src/" destdir="${source.path}/build"
+               includeantruntime="false" failonerror="true">
+            <include name="org/sosy_lab/java_smt/solvers/bitwuzla/api/*.java"/>
+        </javac>
+        <jar destfile="bitwuzla-${bitwuzla.version}.jar" basedir="${source.path}/build"/>
+        <delete dir="${source.path}/build"/>
+
+        <!-- generate and package javadoc documentation -->
+        <delete dir="${source.path}/doc"/>
+        <mkdir dir="${source.path}/doc"/>
+        <javadoc sourcepath="${source.path}/src" destdir="${source.path}/doc"/>
+        <jar destfile="bitwuzla-${bitwuzla.version}-javadoc.jar" basedir="${source.path}/doc"/>
+        <delete dir="${source.path}/doc"/>
+
+        <!-- package swig generated source code, then remove the files -->
+        <jar destfile="bitwuzla-${bitwuzla.version}-sources.jar" basedir="${source.path}/src"/>
+        <delete dir="${source.path}/src"/>
+
+        <!-- compile the swig wrapper -->
+        <exec executable="g++" dir="${source.path}" failonerror="true">
+            <arg value="-fPIC"/>
+            <arg value="-c"/>
+            <arg value="bitwuzla_wrap.cpp"/>
+            <arg value="-I${source.path}/include"/>
+            <arg value="-I${java.home}/include"/>
+            <arg value="-I${java.home}/include/linux"/>
+        </exec>
+        <delete file="${source.path}/bitwuzla_wrap.cpp"/>
+
+        <!-- delete includes from the source tree (we're done compiling) -->
+        <delete dir="${source.path}/include"/>
+
+        <!-- link the wrapper to create libbitwuzlaJNI.so -->
+        <exec executable="g++" dir="${source.path}" failonerror="true">
+            <arg value="-shared"/>
+            <arg value="-o"/>
             <arg value="libbitwuzlaJNI.so"/>
+            <arg value="bitwuzla_wrap.o"/>
+            <arg value="-L${bitwuzla.path}/install/lib/x86_64-linux-gnu"/>
+            <arg value="-lbitwuzla"/>
+            <arg value="-Wl,-z,defs"/>
+        </exec>
+        <delete file="${source.path}/bitwuzla_wrap.o"/>
+
+        <!-- copy library files into directory to be published for Ivy -->
+        <move file="${source.path}/libbitwuzlaJNI.so"
+              tofile="libbitwuzlaJNI-${bitwuzla.version}.so"
+              failonerror="true"/>
+        <copy file="${bitwuzla.path}/build/src/libbitwuzla.so.0"
+              tofile="libbitwuzla-${bitwuzla.version}.so"
+              failonerror="true"/>
+        <copy file="${bitwuzla.path}/build/src/lib/libbitwuzlals.so"
+              tofile="libbitwuzlals-${bitwuzla.version}.so"
+              failonerror="true"/>
+        <copy file="${bitwuzla.path}/build/src/lib/libbitwuzlabv.so"
+              tofile="libbitwuzlabv-${bitwuzla.version}.so"
+              failonerror="true"/>
+        <copy file="${bitwuzla.path}/build/src/lib/libbitwuzlabb.so"
+              tofile="libbitwuzlabb-${bitwuzla.version}.so"
+              failonerror="true"/>
+        <copy file="${gmp.path}/.libs/libgmp.so.10.5.0"
+              tofile="libgmp-${bitwuzla.version}.so"
+              failonerror="true"/>
+
+        <!-- patch libraries -->
+        <exec executable="patchelf" failonerror="true">
+            <arg value="--set-rpath"/>
+            <arg value="$ORIGIN"/>
+            <arg value="libgmp-${bitwuzla.version}.so"/>
         </exec>
-        <exec executable="patchelf" dir="${bitwuzla.path}/build/src/" failonerror="true">
+        <exec executable="patchelf" failonerror="true">
             <arg value="--set-rpath"/><arg value="$ORIGIN"/>
-            <arg value="libbitwuzla.so.0"/>
+            <arg value="libbitwuzlabb-${bitwuzla.version}.so"/>
         </exec>
-        <exec executable="patchelf" dir="${bitwuzla.path}/build/src/lib/" failonerror="true">
+        <exec executable="patchelf" failonerror="true">
             <arg value="--set-rpath"/><arg value="$ORIGIN"/>
-            <arg value="libbitwuzlals.so"/>
+            <arg value="--replace-needed"/>
+            <arg value="libgmp.so.10"/>
+            <arg value="libgmp.so"/>
+            <arg value="libbitwuzlabv-${bitwuzla.version}.so"/>
         </exec>
-        <exec executable="patchelf" dir="${bitwuzla.path}/build/src/lib/" failonerror="true">
+        <exec executable="patchelf" failonerror="true">
             <arg value="--set-rpath"/><arg value="$ORIGIN"/>
-            <arg value="libbitwuzlabv.so"/>
+            <arg value="--replace-needed"/>
+            <arg value="libgmp.so.10"/>
+            <arg value="libgmp.so"/>
+            <arg value="libbitwuzlals-${bitwuzla.version}.so"/>
         </exec>
-        <exec executable="patchelf" dir="${bitwuzla.path}/build/src/lib/" failonerror="true">
+        <exec executable="patchelf" failonerror="true">
             <arg value="--set-rpath"/><arg value="$ORIGIN"/>
-            <arg value="libbitwuzlabb.so"/>
+            <arg value="--replace-needed"/>
+            <arg value="libgmp.so.10"/>
+            <arg value="libgmp.so"/>
+            <arg value="libbitwuzla-${bitwuzla.version}.so"/>
         </exec>
-        <exec executable="patchelf" dir="${gmp.path}/.libs/" failonerror="true">
+        <exec executable="patchelf" failonerror="true">
             <arg value="--set-rpath"/><arg value="$ORIGIN"/>
-            <arg value="libgmp.so.10.5.0"/>
+            <arg value="--replace-needed"/>
+            <arg value="libbitwuzla.so.0"/>
+            <arg value="libbitwuzla.so"/>
+            <arg value="libbitwuzlaJNI-${bitwuzla.version}.so"/>
+        </exec>
+        <!-- We need to run this twice? -->
+        <exec executable="patchelf" failonerror="true">
+            <arg value="--set-rpath"/><arg value="$ORIGIN"/>
+            <arg value="--replace-needed"/>
+            <arg value="libbitwuzla.so.0"/>
+            <arg value="libbitwuzla.so"/>
+            <arg value="libbitwuzlaJNI-${bitwuzla.version}.so"/>
         </exec>
-
-        <!-- copy library files into directory to be published for IVY -->
-        <copy file="lib/native/source/libbitwuzla/libbitwuzlaJNI.so" tofile="libbitwuzlaJNI-${bitwuzla.version}.so"/>
-        <copy file="${bitwuzla.path}/build/src/lib/libbitwuzlals.so" tofile="libbitwuzlals-${bitwuzla.version}.so"/>
-        <copy file="${bitwuzla.path}/build/src/lib/libbitwuzlabv.so" tofile="libbitwuzlabv-${bitwuzla.version}.so"/>
-        <copy file="${bitwuzla.path}/build/src/lib/libbitwuzlabb.so" tofile="libbitwuzlabb-${bitwuzla.version}.so"/>
-        <copy file="${gmp.path}/.libs/libgmp.so.10.5.0" tofile="libgmp-${bitwuzla.version}.so"/>
-        <copy file="${bitwuzla.path}/build/src/libbitwuzla.so.0"
-              tofile="libbitwuzla-${bitwuzla.version}.so"/>
     </target>
 
     <target name="publish-bitwuzla" depends="package-bitwuzla, load-ivy"
diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
new file mode 100644
index 0000000000..f026ec7a9b
--- /dev/null
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -0,0 +1,454 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+%module BitwuzlaNative
+%{
+#include "include/bitwuzla/cpp/bitwuzla.h"
+#include "include/bitwuzla/cpp/parser.h"
+
+#include <sstream>
+%}
+
+%include <stdint.i>
+%include <std_string.i>
+
+%include <stdint.i>
+%include <std_string.i>
+
+%include <std_vector.i>
+%template(Vector_Int)
+  std::vector<int>;
+%template(Vector_String)
+  std::vector<std::string>;
+%template(Vector_Term)
+  std::vector<bitwuzla::Term>;
+%template(Vector_Sort)
+  std::vector<bitwuzla::Sort>;
+
+%include <std_unordered_map.i>
+%template(Map_TermTerm)
+  std::unordered_map<bitwuzla::Term, bitwuzla::Term>;
+
+%include <std_shared_ptr.i>
+%shared_ptr(bitwuzla::Bitwuzla);
+
+namespace std {
+%ignore to_string(bitwuzla::Kind kind);
+%ignore to_string(bitwuzla::RoundingMode rm);
+%ignore to_string(bitwuzla::Result result);
+}
+
+%include "include/bitwuzla/enums.h"
+%include "include/bitwuzla/option.h"
+
+namespace bitwuzla {
+
+/** Output streams */
+%ignore set_bv_format;
+%ignore operator<< (std::ostream &ostream, const set_bv_format &f);
+%ignore operator<< (std::ostream &out, Result result);
+%ignore operator<< (std::ostream &out, Kind kind);
+%ignore operator<< (std::ostream &out, RoundingMode rm);
+
+/** Exception */
+%ignore Exception::Exception (const std::stringstream &stream);
+
+/** Options */
+%ignore Options::operator= (const Options &options);
+%ignore Options::set (Option option, const char *mode);
+%ignore Options::set (Option option, uint64_t value);
+%extend Options {
+  void set(Option option, int value) {
+    $self->set(option, value);
+  }
+}
+
+/** OptionInfo */
+%ignore OptionInfo;
+
+/** Term */
+%rename(get) Term::operator[];
+%rename(toString) Term::str;
+
+%ignore Term::id() const;
+%extend Term {
+  int id() {
+    return (int) $self->id();
+  }
+}
+
+%ignore Term::indices () const;
+%extend Term {
+  std::vector<int> indices() {
+    std::vector<int> result;
+    for(auto v : $self->indices()) {
+      result.emplace_back(v);
+    }
+    return result;
+  }
+}
+
+%ignore Term::symbol () const;
+%exception Term::symbol {
+  try { $action }
+  catch(std::bad_optional_access& e) {
+    return $null;
+  }
+}
+%extend Term {
+  std::string symbol() {
+    return $self->symbol().value();
+  }
+}
+
+%ignore Term::value() const;
+
+%ignore operator==(const Term &a, const Term &b);
+%ignore operator!=(const Term &a, const Term &b);
+%ignore operator<< (std::ostream &out, const Sort &sort);
+%extend Term {
+  int hashCode() {
+    std::hash<bitwuzla::Term> f;
+    return (int) f(*$self);
+  }
+
+  bool isEqual(Term other) {
+    return operator==(*$self, other);
+  }
+}
+
+%typemap(javacode) Term %{
+  public boolean equals(Object object) {
+    if(object instanceof $javaclassname) {
+      Term that = ($javaclassname) object;
+      return this.isEqual(that);
+    }
+    return false;
+  }
+%}
+
+// Add static methods for term creation
+%ignore mk_true();
+%extend Bitwuzla {
+  static Term mk_true() {
+    return bitwuzla::mk_true();
+  }
+}
+%ignore mk_false();
+%extend Bitwuzla {
+  static Term mk_false() {
+    return bitwuzla::mk_false();
+  }
+}
+%ignore mk_bv_zero(const Sort &);
+%extend Bitwuzla {
+  static Term mk_bv_zero(const Sort &sort) {
+    return bitwuzla::mk_bv_zero(sort);
+  }
+}
+%ignore mk_bv_one(const Sort &);
+%extend Bitwuzla {
+  static Term mk_bv_one(const Sort &sort) {
+    return bitwuzla::mk_bv_one(sort);
+  }
+}
+%ignore mk_bv_ones(const Sort &);
+%extend Bitwuzla {
+  static Term mk_bv_ones(const Sort &sort) {
+    return bitwuzla::mk_bv_ones(sort);
+  }
+}
+%ignore mk_bv_min_signed(const Sort &);
+%extend Bitwuzla {
+  static Term mk_bv_min_signed(const Sort &sort) {
+    return bitwuzla::mk_bv_min_signed(sort);
+  }
+}
+%ignore mk_bv_max_signed(const Sort &);
+%extend Bitwuzla {
+    static Term mk_bv_max_signed(const Sort &sort) {
+    return bitwuzla::mk_bv_max_signed(sort);
+  }
+}
+%ignore mk_bv_value(const Sort &, const std::string &, uint8_t = 2);
+%extend Bitwuzla {
+    static Term mk_bv_value(const Sort &sort, const std::string &value, int base = 2) {
+      return bitwuzla::mk_bv_value(sort, value, (int8_t) base);
+  }
+}
+%ignore mk_bv_value_uint64(const Sort &, uint64_t);
+%extend Bitwuzla {
+  static Term mk_bv_value_unsigned(const Sort &sort, int value) {
+    return bitwuzla::mk_bv_value_uint64(sort, value);
+  }
+}
+%ignore mk_bv_value_int64(const Sort &, int64_t);
+%extend Bitwuzla {
+  static Term mk_bv_value_signed(const Sort &sort, int value) {
+    return bitwuzla::mk_bv_value_int64(sort, value);
+  }
+}
+%ignore mk_fp_pos_zero(const Sort &);
+%extend Bitwuzla {
+  static Term mk_fp_pos_zero(const Sort &sort) {
+    return bitwuzla::mk_fp_pos_zero(sort);
+  }
+}
+%ignore mk_fp_neg_zero(const Sort &);
+%extend Bitwuzla {
+  static Term mk_fp_neg_zero(const Sort &sort) {
+    return bitwuzla::mk_fp_neg_zero(sort);
+  }
+}
+%ignore mk_fp_pos_inf(const Sort &);
+%extend Bitwuzla {
+  static Term mk_fp_pos_inf(const Sort &sort) {
+    return bitwuzla::mk_fp_pos_inf(sort);
+  }
+}
+%ignore mk_fp_neg_inf(const Sort &);
+%extend Bitwuzla {
+  static Term mk_fp_neg_inf(const Sort &sort) {
+    return bitwuzla::mk_fp_neg_inf(sort);
+  }
+}
+%ignore mk_fp_nan(const Sort &);
+%extend Bitwuzla {
+  static Term mk_fp_nan(const Sort &sort) {
+    return bitwuzla::mk_fp_nan(sort);
+  }
+}
+%ignore mk_fp_value(const Term &, const Term &, const Term &);
+%extend Bitwuzla {
+  static Term mk_fp_value(
+      const Term &bv_sign, const Term &bv_exponent, const Term &bv_significand) {
+    return bitwuzla::mk_fp_value(bv_sign, bv_exponent, bv_significand);
+  }
+}
+%ignore mk_fp_value(const Sort &, const Term &, const std::string &);
+%extend Bitwuzla {
+  static Term mk_fp_value(const Sort &sort, const Term &rm, const std::string &real) {
+    return bitwuzla::mk_fp_value(sort, rm, real);
+  }
+}
+%ignore mk_fp_value(const Sort &,
+                    const Term &,
+                    const std::string &,
+                    const std::string &);
+%extend Bitwuzla {
+  static Term mk_fp_value(
+      const Sort &sort, const Term &rm, const std::string &num, const std::string &den) {
+    return bitwuzla::mk_fp_value(sort, rm, num, den);
+  }
+}
+%ignore mk_rm_value(RoundingMode);
+%extend Bitwuzla {
+  static Term mk_rm_value(RoundingMode rm) {
+    return bitwuzla::mk_rm_value(rm);
+  }
+}
+%ignore mk_const_array(const Sort &, const Term &);
+%extend Bitwuzla {
+  static Term mk_const_array(const Sort &sort, const Term &term) {
+    return bitwuzla::mk_const_array(sort, term);
+  }
+}
+%ignore mk_term(Kind, const std::vector<Term> &, const std::vector<uint64_t> &indices = {});
+%extend Bitwuzla {
+  static Term mk_term(Kind kind, const Term &t1) {
+    return bitwuzla::mk_term(kind, {t1}, {});
+  }
+  static Term mk_term(Kind kind, const Term &t1, int i1) {
+    return bitwuzla::mk_term(kind, {t1}, {(uint64_t) i1});
+  }
+  static Term mk_term(Kind kind, const Term &t1, int i1, int i2) {
+    return bitwuzla::mk_term(kind, {t1}, {(uint64_t) i1, (uint64_t) i2});
+  }
+  static Term mk_term(Kind kind, const Term &t1, const Term &t2) {
+    return bitwuzla::mk_term(kind, {t1, t2}, {});
+  }
+  static Term mk_term(Kind kind, const Term &t1, const Term &t2, int i1) {
+    return bitwuzla::mk_term(kind, {t1, t2}, {(uint64_t) i1});
+  }
+  static Term mk_term(Kind kind, const Term &t1, const Term &t2, int i1, int i2) {
+    return bitwuzla::mk_term(kind, {t1, t2}, {(uint64_t) i1, (uint64_t) i2});
+  }
+  static Term mk_term(Kind kind, const Term &t1, const Term &t2, const Term &t3) {
+    return bitwuzla::mk_term(kind, {t1, t2, t3}, {});
+  }
+  static Term mk_term(Kind kind, const std::vector<Term> &args) {
+    return bitwuzla::mk_term(kind, args, {});
+  }
+  static Term mk_term(Kind kind, const std::vector<Term> &args, const std::vector<int> &indices) {
+    std::vector<uint64_t> unsigned_indices;
+    for (auto i : indices) {
+      unsigned_indices.emplace_back((uint64_t) i);
+    }
+    return bitwuzla::mk_term(kind, args, unsigned_indices);
+  }
+}
+%ignore mk_const(const Sort &, std::optional<const std::string> = std::nullopt);
+%extend Bitwuzla {
+  static Term mk_const(const Sort &sort) {
+    return bitwuzla::mk_const(sort, std::nullopt);
+  }
+  static Term mk_const(const Sort &sort, std::string symbol) {
+    return bitwuzla::mk_const(sort, symbol);
+  }
+}
+%ignore mk_var(const Sort &, std::optional<const std::string> = std::nullopt);
+%extend Bitwuzla {
+  static Term mk_var(const Sort &sort) {
+    return bitwuzla::mk_var(sort, std::nullopt);
+  }
+  static Term mk_var(const Sort &sort, std::string symbol) {
+    return bitwuzla::mk_var(sort, symbol);
+  }
+}
+
+// Substitution: This will change the term itself!
+%ignore substitute_terms (std::vector<Term> &, const std::unordered_map<Term,Term> &);
+%ignore substitute_term (const Term &, const std::unordered_map<Term, Term> &);
+%extend Term {
+  void substitute(const std::unordered_map<Term, Term> &map) {
+    bitwuzla::substitute_term(*$self, map);
+  }
+}
+
+/** Sort */
+%rename(toString) Sort::str;
+
+%ignore Sort::uninterpreted_symbol() const;
+%ignore Sort::is_uninterpreted() const;
+
+%ignore Sort::id() const;
+%extend Sort {
+  int id() {
+    return (int) $self->id();
+  }
+}
+
+%ignore Sort::bv_size() const;
+%extend Sort {
+  int bv_size() {
+    return (int) $self->bv_size();
+  }
+}
+
+%ignore Sort::fp_exp_size() const;
+%ignore Sort::fp_sig_size() const;
+%extend Sort {
+  int fp_exp_size() {
+    return (int) $self->fp_exp_size();
+  }
+  int fp_sig_size() {
+    return (int) $self->fp_sig_size();
+  }
+}
+
+%ignore Sort::fun_arity() const;
+%extend Sort {
+  int fun_arity() {
+    return (int) $self->fun_arity();
+  }
+}
+
+%ignore operator==(const Sort &a, const Sort &b);
+%ignore operator!=(const Sort &a, const Sort &b);
+%ignore operator<< (std::ostream &out, const Sort &sort);
+%extend Sort {
+  int hashCode() {
+    std::hash<bitwuzla::Sort> f;
+    return (int) f(*$self);
+  }
+  bool isEqual(Sort other) {
+    return operator==(*$self, other);
+  }
+}
+
+%typemap(javacode) Sort %{
+  public boolean equals(Object object) {
+    if(object instanceof $javaclassname) {
+      Sort that = ($javaclassname) object;
+      return this.isEqual(that);
+    }
+    return false;
+  }
+%}
+
+// Add static methods for sort creation
+%ignore mk_array_sort(const Sort &, const Sort &);
+%extend Bitwuzla {
+   static Sort mk_array_sort(const Sort &index, const Sort &element) {
+     return bitwuzla::mk_array_sort(index, element);
+  }
+}
+%ignore mk_bool_sort();
+%extend Bitwuzla {
+   static Sort mk_bool_sort() {
+     return bitwuzla::mk_bool_sort();
+  }
+ }
+%ignore mk_bv_sort(uint64_t);
+%extend Bitwuzla {
+  static Sort mk_bv_sort(int size) {
+    return bitwuzla::mk_bv_sort(size);
+  }
+}
+%ignore mk_fp_sort(uint64_t, uint64_t);
+%extend Bitwuzla {
+  static Sort mk_fp_sort(int exp_size, int sig_size) {
+    return bitwuzla::mk_fp_sort(exp_size, sig_size);
+  }
+}
+%ignore mk_fun_sort(const std::vector<Sort> &, const Sort &);
+%extend Bitwuzla {
+  static Sort mk_fun_sort(const std::vector<Sort> &domain, const Sort &codomain) {
+    return bitwuzla::mk_fun_sort(domain, codomain);
+  }
+}
+
+%ignore mk_uninterpreted_sort(std::optional<const std::string> = std::nullopt);
+%ignore mk_rm_sort();
+
+/** Terminator */
+// TODO: Can we use this directly?
+%ignore Terminator;
+
+/** Bitwuzla */
+%ignore Bitwuzla::is_unsat_assumption (const Term &term);
+%ignore Bitwuzla::print_formula (std::ostream &out, const std::string &format="smt2") const;
+%extend Bitwuzla {
+  std::string print_formula () {
+    std::ostringstream out;
+    $self->print_formula(out);
+    return out.str();
+  }
+}
+%ignore Bitwuzla::statistics () const;
+%ignore Bitwuzla::simplify ();
+}
+
+%include "include/bitwuzla/cpp/bitwuzla.h"
+
+namespace bitwuzla::parser {
+%ignore Parser::Parser(
+  Options &options,
+  const std::string &infile_name,
+  const std::string &language,
+  std::ostream *out = &std::cout);
+
+%ignore Parser::Parser(
+  Options &options,
+  const std::string &infile_name,
+  FILE *infile,
+  const std::string &language = "smt2",
+  std::ostream *out = &std::cout);
+}
+
+%include "include/bitwuzla/cpp/parser.h"
diff --git a/lib/native/source/libbitwuzla/bitwuzla_wrap.c b/lib/native/source/libbitwuzla/bitwuzla_wrap.c
deleted file mode 100644
index ef65f837af..0000000000
--- a/lib/native/source/libbitwuzla/bitwuzla_wrap.c
+++ /dev/null
@@ -1,8324 +0,0 @@
-// This file is part of JavaSMT,
-// an API wrapper for a collection of SMT solvers:
-// https://github.com/sosy-lab/java-smt
-//
-// SPDX-FileCopyrightText: 2023 Dirk Beyer <https://www.sosy-lab.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG
- * interface file instead.
- * ----------------------------------------------------------------------------- */
-
-
-#ifndef SWIGJAVA
-#define SWIGJAVA
-#endif
-
-
-/* -----------------------------------------------------------------------------
- *  This section contains generic SWIG labels for method/variable
- *  declarations/attributes, and other compiler dependent labels.
- * ----------------------------------------------------------------------------- */
-
-/* template workaround for compilers that cannot correctly implement the C++ standard */
-#ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# else
-#  define SWIGTEMPLATEDISAMBIGUATOR
-# endif
-#endif
-
-/* inline attribute */
-#ifndef SWIGINLINE
-# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
-#   define SWIGINLINE inline
-# else
-#   define SWIGINLINE
-# endif
-#endif
-
-/* attribute recognised by some compilers to avoid 'unused' warnings */
-#ifndef SWIGUNUSED
-# if defined(__GNUC__)
-#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__))
-#   else
-#     define SWIGUNUSED
-#   endif
-# elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__))
-# else
-#   define SWIGUNUSED
-# endif
-#endif
-
-#ifndef SWIG_MSC_UNSUPPRESS_4505
-# if defined(_MSC_VER)
-#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif
-#endif
-
-#ifndef SWIGUNUSEDPARM
-# ifdef __cplusplus
-#   define SWIGUNUSEDPARM(p)
-# else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
-# endif
-#endif
-
-/* internal SWIG method */
-#ifndef SWIGINTERN
-# define SWIGINTERN static SWIGUNUSED
-#endif
-
-/* internal inline SWIG method */
-#ifndef SWIGINTERNINLINE
-# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
-#endif
-
-/* exporting methods */
-#if defined(__GNUC__)
-#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#    ifndef GCC_HASCLASSVISIBILITY
-#      define GCC_HASCLASSVISIBILITY
-#    endif
-#  endif
-#endif
-
-#ifndef SWIGEXPORT
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   if defined(STATIC_LINKED)
-#     define SWIGEXPORT
-#   else
-#     define SWIGEXPORT __declspec(dllexport)
-#   endif
-# else
-#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
-#     define SWIGEXPORT __attribute__ ((visibility("default")))
-#   else
-#     define SWIGEXPORT
-#   endif
-# endif
-#endif
-
-/* calling conventions for Windows */
-#ifndef SWIGSTDCALL
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   define SWIGSTDCALL __stdcall
-# else
-#   define SWIGSTDCALL
-# endif
-#endif
-
-/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
-# define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
-
-/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
-#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
-# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
-#endif
-
-/* Intel's compiler complains if a variable which was never initialised is
- * cast to void, which is a common idiom which we use to indicate that we
- * are aware a variable isn't used.  So we just silence that warning.
- * See: https://github.com/swig/swig/issues/192 for more discussion.
- */
-#ifdef __INTEL_COMPILER
-# pragma warning disable 592
-#endif
-
-
-/* Fix for jlong on some versions of gcc on Windows */
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-  typedef long long __int64;
-#endif
-
-/* Fix for jlong on 64-bit x86 Solaris */
-#if defined(__x86_64)
-# ifdef _LP64
-#   undef _LP64
-# endif
-#endif
-
-#include <jni.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-#include <unistd.h>
-
-
-/* Support for throwing Java exceptions */
-typedef enum {
-  SWIG_JavaOutOfMemoryError = 1,
-  SWIG_JavaIOException,
-  SWIG_JavaRuntimeException,
-  SWIG_JavaIndexOutOfBoundsException,
-  SWIG_JavaArithmeticException,
-  SWIG_JavaIllegalArgumentException,
-  SWIG_JavaNullPointerException,
-  SWIG_JavaDirectorPureVirtual,
-  SWIG_JavaUnknownError,
-  SWIG_JavaIllegalStateException,
-} SWIG_JavaExceptionCodes;
-
-typedef struct {
-  SWIG_JavaExceptionCodes code;
-  const char *java_exception;
-} SWIG_JavaExceptions_t;
-
-struct callback_info {
-    JNIEnv *jenv;
-    jmethodID callback_method;
-    jobject obj;
-};
-
-static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) {
-  jclass excep;
-  static const SWIG_JavaExceptions_t java_exceptions[] = {
-    { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" },
-    { SWIG_JavaIOException, "java/io/IOException" },
-    { SWIG_JavaRuntimeException, "java/lang/RuntimeException" },
-    { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" },
-    { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" },
-    { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" },
-    { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
-    { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
-    { SWIG_JavaUnknownError,  "java/lang/UnknownError" },
-    { SWIG_JavaIllegalStateException, "java/lang/IllegalStateException" },
-    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" }
-  };
-  const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
-
-  while (except_ptr->code != code && except_ptr->code)
-    except_ptr++;
-
-  (*jenv)->ExceptionClear(jenv);
-  excep = (*jenv)->FindClass(jenv, except_ptr->java_exception);
-  if (excep)
-    (*jenv)->ThrowNew(jenv, excep, msg);
-}
-
-
-/* Contract support */
-
-#define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, msg); return nullreturn; } else
-
-
-#if defined(SWIG_NOINCLUDE) || defined(SWIG_NOARRAYS)
-
-/*
-static int SWIG_JavaArrayInSchar (JNIEnv *jenv, jbyte **jarr, signed char **carr, jbyteArray input);
-static void SWIG_JavaArrayArgoutSchar (JNIEnv *jenv, jbyte *jarr, signed char *carr, jbyteArray input);
-static jbyteArray SWIG_JavaArrayOutSchar (JNIEnv *jenv, signed char *result, jsize sz);
-
-
-static int SWIG_JavaArrayInUchar (JNIEnv *jenv, jshort **jarr, unsigned char **carr, jshortArray input);
-static void SWIG_JavaArrayArgoutUchar (JNIEnv *jenv, jshort *jarr, unsigned char *carr, jshortArray input);
-static jshortArray SWIG_JavaArrayOutUchar (JNIEnv *jenv, unsigned char *result, jsize sz);
-
-
-static int SWIG_JavaArrayInShort (JNIEnv *jenv, jshort **jarr, short **carr, jshortArray input);
-static void SWIG_JavaArrayArgoutShort (JNIEnv *jenv, jshort *jarr, short *carr, jshortArray input);
-static jshortArray SWIG_JavaArrayOutShort (JNIEnv *jenv, short *result, jsize sz);
-
-
-static int SWIG_JavaArrayInUshort (JNIEnv *jenv, jint **jarr, unsigned short **carr, jintArray input);
-static void SWIG_JavaArrayArgoutUshort (JNIEnv *jenv, jint *jarr, unsigned short *carr, jintArray input);
-static jintArray SWIG_JavaArrayOutUshort (JNIEnv *jenv, unsigned short *result, jsize sz);
-
-
-static int SWIG_JavaArrayInUint (JNIEnv *jenv, jlong **jarr, unsigned int **carr, jlongArray input);
-static void SWIG_JavaArrayArgoutUint (JNIEnv *jenv, jlong *jarr, unsigned int *carr, jlongArray input);
-static jlongArray SWIG_JavaArrayOutUint (JNIEnv *jenv, unsigned int *result, jsize sz);
-
-
-static int SWIG_JavaArrayInLong (JNIEnv *jenv, jint **jarr, long **carr, jintArray input);
-static void SWIG_JavaArrayArgoutLong (JNIEnv *jenv, jint *jarr, long *carr, jintArray input);
-static jintArray SWIG_JavaArrayOutLong (JNIEnv *jenv, long *result, jsize sz);
-
-
-static int SWIG_JavaArrayInLonglong (JNIEnv *jenv, jlong **jarr, jlong **carr, jlongArray input);
-static void SWIG_JavaArrayArgoutLonglong (JNIEnv *jenv, jlong *jarr, jlong *carr, jlongArray input);
-static jlongArray SWIG_JavaArrayOutLonglong (JNIEnv *jenv, jlong *result, jsize sz);
-
-
-static int SWIG_JavaArrayInFloat (JNIEnv *jenv, jfloat **jarr, float **carr, jfloatArray input);
-static void SWIG_JavaArrayArgoutFloat (JNIEnv *jenv, jfloat *jarr, float *carr, jfloatArray input);
-static jfloatArray SWIG_JavaArrayOutFloat (JNIEnv *jenv, float *result, jsize sz);
-
-
-static int SWIG_JavaArrayInDouble (JNIEnv *jenv, jdouble **jarr, double **carr, jdoubleArray input);
-static void SWIG_JavaArrayArgoutDouble (JNIEnv *jenv, jdouble *jarr, double *carr, jdoubleArray input);
-*/
-
-static int SWIG_JavaArrayInInt (JNIEnv *jenv, jint **jarr, int **carr, jintArray input);
-static void SWIG_JavaArrayArgoutInt (JNIEnv *jenv, jint *jarr, int *carr, jintArray input);
-static jintArray SWIG_JavaArrayOutInt (JNIEnv *jenv, int *result, jsize sz);
-
-static int SWIG_JavaArrayInUlong (JNIEnv *jenv, jlong **jarr, unsigned long **carr, jlongArray input);
-static void SWIG_JavaArrayArgoutUlong (JNIEnv *jenv, jlong *jarr, unsigned long *carr, jlongArray input);
-static jlongArray SWIG_JavaArrayOutUlong (JNIEnv *jenv, unsigned long *result, jsize sz);
-
-#else
-
-/* signed char[] support *//*
-static int SWIG_JavaArrayInSchar (JNIEnv *jenv, jbyte **jarr, signed char **carr, jbyteArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetByteArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (signed char*) malloc(sz * sizeof(signed char)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (signed char)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutSchar (JNIEnv *jenv, jbyte *jarr, signed char *carr, jbyteArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jbyte)carr[i];
-  (*jenv)->ReleaseByteArrayElements(jenv, input, jarr, 0);
-}
-
-static jbyteArray SWIG_JavaArrayOutSchar (JNIEnv *jenv, signed char *result, jsize sz) {
-  jbyte *arr;
-  int i;
-  jbyteArray jresult = (*jenv)->NewByteArray(jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = (*jenv)->GetByteArrayElements(jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jbyte)result[i];
-  (*jenv)->ReleaseByteArrayElements(jenv, jresult, arr, 0);
-  return jresult;
-}
-*/
-
-/* unsigned char[] support *//*
-static int SWIG_JavaArrayInUchar (JNIEnv *jenv, jshort **jarr, unsigned char **carr, jshortArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetShortArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (unsigned char*) malloc(sz * sizeof(unsigned char)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (unsigned char)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutUchar (JNIEnv *jenv, jshort *jarr, unsigned char *carr, jshortArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jshort)carr[i];
-  (*jenv)->ReleaseShortArrayElements(jenv, input, jarr, 0);
-}
-
-static jshortArray SWIG_JavaArrayOutUchar (JNIEnv *jenv, unsigned char *result, jsize sz) {
-  jshort *arr;
-  int i;
-  jshortArray jresult = (*jenv)->NewShortArray(jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = (*jenv)->GetShortArrayElements(jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jshort)result[i];
-  (*jenv)->ReleaseShortArrayElements(jenv, jresult, arr, 0);
-  return jresult;
-}
-*/
-
-/* short[] support *//*
-static int SWIG_JavaArrayInShort (JNIEnv *jenv, jshort **jarr, short **carr, jshortArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetShortArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (short*) malloc(sz * sizeof(short)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (short)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutShort (JNIEnv *jenv, jshort *jarr, short *carr, jshortArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jshort)carr[i];
-  (*jenv)->ReleaseShortArrayElements(jenv, input, jarr, 0);
-}
-
-static jshortArray SWIG_JavaArrayOutShort (JNIEnv *jenv, short *result, jsize sz) {
-  jshort *arr;
-  int i;
-  jshortArray jresult = (*jenv)->NewShortArray(jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = (*jenv)->GetShortArrayElements(jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jshort)result[i];
-  (*jenv)->ReleaseShortArrayElements(jenv, jresult, arr, 0);
-  return jresult;
-}
-*/
-
-/* unsigned short[] support */ /*
-static int SWIG_JavaArrayInUshort (JNIEnv *jenv, jint **jarr, unsigned short **carr, jintArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetIntArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (unsigned short*) malloc(sz * sizeof(unsigned short)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (unsigned short)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutUshort (JNIEnv *jenv, jint *jarr, unsigned short *carr, jintArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jint)carr[i];
-  (*jenv)->ReleaseIntArrayElements(jenv, input, jarr, 0);
-}
-
-static jintArray SWIG_JavaArrayOutUshort (JNIEnv *jenv, unsigned short *result, jsize sz) {
-  jint *arr;
-  int i;
-  jintArray jresult = (*jenv)->NewIntArray(jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = (*jenv)->GetIntArrayElements(jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jint)result[i];
-  (*jenv)->ReleaseIntArrayElements(jenv, jresult, arr, 0);
-  return jresult;
-}
-*/
-
-/* int[] support */
-static int SWIG_JavaArrayInInt (JNIEnv *jenv, jint **jarr, int **carr, jintArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetIntArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (int*) malloc(sz * sizeof(int)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (int)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutInt (JNIEnv *jenv, jint *jarr, int *carr, jintArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jint)carr[i];
-  (*jenv)->ReleaseIntArrayElements(jenv, input, jarr, 0);
-}
-
-static jintArray SWIG_JavaArrayOutInt (JNIEnv *jenv, int *result, jsize sz) {
-  jint *arr;
-  int i;
-  jintArray jresult = (*jenv)->NewIntArray(jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = (*jenv)->GetIntArrayElements(jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jint)result[i];
-  (*jenv)->ReleaseIntArrayElements(jenv, jresult, arr, 0);
-  return jresult;
-}
-
-
-/* unsigned int[] support */ /*
-static int SWIG_JavaArrayInUint (JNIEnv *jenv, jlong **jarr, unsigned int **carr, jlongArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetLongArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (unsigned int*) malloc(sz * sizeof(unsigned int)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (unsigned int)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutUint (JNIEnv *jenv, jlong *jarr, unsigned int *carr, jlongArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jlong)carr[i];
-  (*jenv)->ReleaseLongArrayElements(jenv, input, jarr, 0);
-}
-
-static jlongArray SWIG_JavaArrayOutUint (JNIEnv *jenv, unsigned int *result, jsize sz) {
-  jlong *arr;
-  int i;
-  jlongArray jresult = (*jenv)->NewLongArray(jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = (*jenv)->GetLongArrayElements(jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jlong)result[i];
-  (*jenv)->ReleaseLongArrayElements(jenv, jresult, arr, 0);
-  return jresult;
-}
-*/
-
-/* long[] support */ /*
-static int SWIG_JavaArrayInLong (JNIEnv *jenv, jint **jarr, long **carr, jintArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetIntArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (long*) malloc(sz * sizeof(long)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (long)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutLong (JNIEnv *jenv, jint *jarr, long *carr, jintArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jint)carr[i];
-  (*jenv)->ReleaseIntArrayElements(jenv, input, jarr, 0);
-}
-
-static jintArray SWIG_JavaArrayOutLong (JNIEnv *jenv, long *result, jsize sz) {
-  jint *arr;
-  int i;
-  jintArray jresult = (*jenv)->NewIntArray(jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = (*jenv)->GetIntArrayElements(jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jint)result[i];
-  (*jenv)->ReleaseIntArrayElements(jenv, jresult, arr, 0);
-  return jresult;
-}
-*/
-
-/* unsigned long[] support */
-static int SWIG_JavaArrayInUlong (JNIEnv *jenv, jlong **jarr, unsigned long **carr, jlongArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetLongArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (unsigned long*) malloc(sz * sizeof(unsigned long)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (unsigned long)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutUlong (JNIEnv *jenv, jlong *jarr, unsigned long *carr, jlongArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jlong)carr[i];
-  (*jenv)->ReleaseLongArrayElements(jenv, input, jarr, 0);
-}
-
-static jlongArray SWIG_JavaArrayOutUlong (JNIEnv *jenv, unsigned long *result, jsize sz) {
-  jlong *arr;
-  int i;
-  jlongArray jresult = (*jenv)->NewLongArray(jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = (*jenv)->GetLongArrayElements(jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jlong)result[i];
-  (*jenv)->ReleaseLongArrayElements(jenv, jresult, arr, 0);
-  return jresult;
-}
-
-
-/* jlong[] support */ /*
-static int SWIG_JavaArrayInLonglong (JNIEnv *jenv, jlong **jarr, jlong **carr, jlongArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetLongArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (jlong*) malloc(sz * sizeof(jlong)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (jlong)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutLonglong (JNIEnv *jenv, jlong *jarr, jlong *carr, jlongArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jlong)carr[i];
-  (*jenv)->ReleaseLongArrayElements(jenv, input, jarr, 0);
-}
-
-static jlongArray SWIG_JavaArrayOutLonglong (JNIEnv *jenv, jlong *result, jsize sz) {
-  jlong *arr;
-  int i;
-  jlongArray jresult = (*jenv)->NewLongArray(jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = (*jenv)->GetLongArrayElements(jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jlong)result[i];
-  (*jenv)->ReleaseLongArrayElements(jenv, jresult, arr, 0);
-  return jresult;
-}
-*/
-
-/* float[] support */ /*
-static int SWIG_JavaArrayInFloat (JNIEnv *jenv, jfloat **jarr, float **carr, jfloatArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetFloatArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (float*) malloc(sz * sizeof(float)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (float)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutFloat (JNIEnv *jenv, jfloat *jarr, float *carr, jfloatArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jfloat)carr[i];
-  (*jenv)->ReleaseFloatArrayElements(jenv, input, jarr, 0);
-}
-
-static jfloatArray SWIG_JavaArrayOutFloat (JNIEnv *jenv, float *result, jsize sz) {
-  jfloat *arr;
-  int i;
-  jfloatArray jresult = (*jenv)->NewFloatArray(jenv, sz);
-  if (!jresult)
-    return NULL;
-  arr = (*jenv)->GetFloatArrayElements(jenv, jresult, 0);
-  if (!arr)
-    return NULL;
-  for (i=0; i<sz; i++)
-    arr[i] = (jfloat)result[i];
-  (*jenv)->ReleaseFloatArrayElements(jenv, jresult, arr, 0);
-  return jresult;
-}
-*/
-
-/* double[] support */ /*
-static int SWIG_JavaArrayInDouble (JNIEnv *jenv, jdouble **jarr, double **carr, jdoubleArray input) {
-  int i;
-  jsize sz;
-  if (!input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array");
-    return 0;
-  }
-  sz = (*jenv)->GetArrayLength(jenv, input);
-  *jarr = (*jenv)->GetDoubleArrayElements(jenv, input, 0);
-  if (!*jarr)
-    return 0; 
-  *carr = (double*) malloc(sz * sizeof(double)); 
-  if (!*carr) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed");
-    return 0;
-  }
-  for (i=0; i<sz; i++)
-    (*carr)[i] = (double)(*jarr)[i];
-  return 1;
-}
-
-static void SWIG_JavaArrayArgoutDouble (JNIEnv *jenv, jdouble *jarr, double *carr, jdoubleArray input) {
-  int i;
-  jsize sz = (*jenv)->GetArrayLength(jenv, input);
-  for (i=0; i<sz; i++)
-    jarr[i] = (jdouble)carr[i];
-  (*jenv)->ReleaseDoubleArrayElements(jenv, input, jarr, 0);
-}
-*/
-
-#endif
-
-
-#include "bitwuzla.h"
-#include "parser.h"
-
-
-#include <stdint.h>		// Use the C99 official header
-
-
-#define SWIGWORDSIZE64
-#ifndef LONG_MAX
-#include <limits.h>
-#endif
-#if (__WORDSIZE == 32) || (LONG_MAX == INT_MAX)
-# error "SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32"
-#endif
-
-
-static BitwuzlaTerm *new_BitwuzlaTermArray(int nelements) { 
-  return (BitwuzlaTerm *) calloc(nelements,sizeof(BitwuzlaTerm)); 
-}
-
-static void delete_BitwuzlaTermArray(BitwuzlaTerm *ary) { 
-  free(ary); 
-}
-
-static BitwuzlaTerm BitwuzlaTermArray_getitem(BitwuzlaTerm *ary, int index) {
-    return ary[index];
-}
-static void BitwuzlaTermArray_setitem(BitwuzlaTerm *ary, int index, BitwuzlaTerm value) {
-    ary[index] = value;
-}
-
-
-static BitwuzlaSort *new_BitwuzlaSortArray(int nelements) { 
-  return (BitwuzlaSort *) calloc(nelements,sizeof(BitwuzlaSort)); 
-}
-
-static void delete_BitwuzlaSortArray(BitwuzlaSort *ary) { 
-  free(ary); 
-}
-
-static BitwuzlaSort BitwuzlaSortArray_getitem(BitwuzlaSort *ary, int index) {
-    return ary[index];
-}
-static void BitwuzlaSortArray_setitem(BitwuzlaSort *ary, int index, BitwuzlaSort value) {
-    ary[index] = value;
-}
-
-
-static uint64_t *new_uint64_tArray(int nelements) { 
-  return (uint64_t *) calloc(nelements,sizeof(uint64_t)); 
-}
-
-static void delete_uint64_tArray(uint64_t *ary) { 
-  free(ary); 
-}
-
-static uint64_t uint64_tArray_getitem(uint64_t *ary, int index) {
-    return ary[index];
-}
-static void uint64_tArray_setitem(uint64_t *ary, int index, uint64_t value) {
-    ary[index] = value;
-}
-
-typedef union {
-  unsigned int __wch;
-  char __wchb[4];
-} __mbstate_t___value;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1BitwuzlaTermArray(JNIEnv *jenv, jclass jcls, jint jarg1) {
-  jlong jresult = 0 ;
-  int arg1 ;
-  BitwuzlaTerm *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (int)jarg1; 
-  result = (BitwuzlaTerm *)new_BitwuzlaTermArray(arg1);
-  *(BitwuzlaTerm **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1BitwuzlaTermArray(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  BitwuzlaTerm *arg1 = (BitwuzlaTerm *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaTerm **)&jarg1; 
-  delete_BitwuzlaTermArray(arg1);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaTermArray_1getitem(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm *arg1 = (BitwuzlaTerm *) 0 ;
-  int arg2 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaTerm **)&jarg1; 
-  arg2 = (int)jarg2; 
-  result = (BitwuzlaTerm)BitwuzlaTermArray_getitem(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaTermArray_1setitem(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2, jlong jarg3) {
-  BitwuzlaTerm *arg1 = (BitwuzlaTerm *) 0 ;
-  int arg2 ;
-  BitwuzlaTerm arg3 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaTerm **)&jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (BitwuzlaTerm)jarg3; 
-  BitwuzlaTermArray_setitem(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1BitwuzlaSortArray(JNIEnv *jenv, jclass jcls, jint jarg1) {
-  jlong jresult = 0 ;
-  int arg1 ;
-  BitwuzlaSort *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (int)jarg1; 
-  result = (BitwuzlaSort *)new_BitwuzlaSortArray(arg1);
-  *(BitwuzlaSort **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1BitwuzlaSortArray(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  BitwuzlaSort *arg1 = (BitwuzlaSort *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaSort **)&jarg1; 
-  delete_BitwuzlaSortArray(arg1);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaSortArray_1getitem(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaSort *arg1 = (BitwuzlaSort *) 0 ;
-  int arg2 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaSort **)&jarg1; 
-  arg2 = (int)jarg2; 
-  result = (BitwuzlaSort)BitwuzlaSortArray_getitem(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaSortArray_1setitem(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2, jlong jarg3) {
-  BitwuzlaSort *arg1 = (BitwuzlaSort *) 0 ;
-  int arg2 ;
-  BitwuzlaSort arg3 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaSort **)&jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (BitwuzlaSort)jarg3; 
-  BitwuzlaSortArray_setitem(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1uint64_1tArray(JNIEnv *jenv, jclass jcls, jint jarg1) {
-  jlong jresult = 0 ;
-  int arg1 ;
-  uint64_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (int)jarg1; 
-  result = (uint64_t *)new_uint64_tArray(arg1);
-  *(uint64_t **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1uint64_1tArray(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  uint64_t *arg1 = (uint64_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(uint64_t **)&jarg1; 
-  delete_uint64_tArray(arg1);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_uint64_1tArray_1getitem(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jlong jresult = 0 ;
-  uint64_t *arg1 = (uint64_t *) 0 ;
-  int arg2 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(uint64_t **)&jarg1; 
-  arg2 = (int)jarg2; 
-  result = (uint64_t)uint64_tArray_getitem(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_uint64_1tArray_1setitem(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2, jlong jarg3) {
-  uint64_t *arg1 = (uint64_t *) 0 ;
-  int arg2 ;
-  uint64_t arg3 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(uint64_t **)&jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (uint64_t)jarg3; 
-  uint64_tArray_setitem(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_true_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_false_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1bool_1true_1false_1are_1defined_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1STDIO_1H_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1FEATURES_1H_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1DEFAULT_1SOURCE_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1USE_1ISOC2X_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1POSIX_1IMPLICITLY_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1POSIX_1SOURCE_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1POSIX_1C_1SOURCE_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  long result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (long)(200809L);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1POSIX_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1POSIX2_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1POSIX199309_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1POSIX199506_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1XOPEN2K_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1ISOC95_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1ISOC99_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1XOPEN2K8_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1ATFILE_1SOURCE_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1WORDSIZE_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(32);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1WORDSIZE32_1SIZE_1ULONG_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1WORDSIZE32_1PTRDIFF_1LONG_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1WORDSIZE_1TIME64_1COMPAT32_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1TIMESIZE_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(32);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1MISC_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1ATFILE_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1USE_1FORTIFY_1LEVEL_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1USE_1DEPRECATED_1GETS_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1USE_1DEPRECATED_1SCANF_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1STDC_1PREDEF_1H_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1STDC_1IEC_1559_1_1_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1STDC_1IEC_160559_1BFP_1_1_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  long result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (long)(201404L);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1STDC_1IEC_1559_1COMPLEX_1_1_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1STDC_1IEC_160559_1COMPLEX_1_1_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  long result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (long)(201404L);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1STDC_1ISO_110646_1_1_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  long result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (long)(201706L);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GNU_1LIBRARY_1_1_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(6);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1_1_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1MINOR_1_1_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(35);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1SYS_1CDEFS_1H_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1glibc_1c99_1flexarr_1available_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1LDOUBLE_1REDIRECTS_1TO_1FLOAT128_1ABI_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1HAVE_1GENERIC_1SELECTION_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1USE_1LIB_1EXT2_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1USE_1IEC_160559_1BFP_1EXT_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1USE_1IEC_160559_1BFP_1EXT_1C2X_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1USE_1IEC_160559_1EXT_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1USE_1IEC_160559_1FUNCS_1EXT_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1USE_1IEC_160559_1FUNCS_1EXT_1C2X_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1GLIBC_1USE_1IEC_160559_1TYPES_1EXT_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1BITS_1TYPES_1H_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1BITS_1TYPESIZES_1H_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1RLIM_1T_1MATCHES_1RLIM64_1T_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1STATFS_1MATCHES_1STATFS64_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1KERNEL_1OLD_1TIMEVAL_1MATCHES_1TIMEVAL64_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1FD_1SETSIZE_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1024);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1BITS_1TIME64_1H_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1fsid_1t_1_1_1val_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jintArray jarg2) {
-  __fsid_t *arg1 = (__fsid_t *) 0 ;
-  int *arg2 ;
-  jint *jarr2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(__fsid_t **)&jarg1; 
-  if (jarg2 && (*jenv)->GetArrayLength(jenv, jarg2) != 2) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size");
-    return ;
-  }
-  if (!SWIG_JavaArrayInInt(jenv, &jarr2, (int **)&arg2, jarg2)) return ; 
-  {
-    size_t ii;
-    int *b = (int *) arg1->__val;
-    for (ii = 0; ii < (size_t)2; ii++) b[ii] = *((int *) arg2 + ii);
-  }
-  SWIG_JavaArrayArgoutInt(jenv, jarr2, (int *)arg2, jarg2); 
-  free(arg2); 
-}
-
-
-SWIGEXPORT jintArray JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1fsid_1t_1_1_1val_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jintArray jresult = 0 ;
-  __fsid_t *arg1 = (__fsid_t *) 0 ;
-  int *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(__fsid_t **)&jarg1; 
-  result = (int *)(int *) ((arg1)->__val);
-  jresult = SWIG_JavaArrayOutInt(jenv, (int *)result, 2); 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1_1_1fsid_1t(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  __fsid_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (__fsid_t *)calloc(1, sizeof(__fsid_t));
-  *(__fsid_t **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1_1_1fsid_1t(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  __fsid_t *arg1 = (__fsid_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(__fsid_t **)&jarg1; 
-  free((char *) arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1_1_1_1fpos_1t_1defined_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1_1_1mbstate_1t_1defined_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1mbstate_1t_1_1_1count_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
-  __mbstate_t *arg1 = (__mbstate_t *) 0 ;
-  int arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(__mbstate_t **)&jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->__count = arg2;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1mbstate_1t_1_1_1count_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  __mbstate_t *arg1 = (__mbstate_t *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(__mbstate_t **)&jarg1; 
-  result = (int) ((arg1)->__count);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1mbstate_1t_1_1_1value_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  __mbstate_t *arg1 = (__mbstate_t *) 0 ;
-  __mbstate_t___value *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(__mbstate_t **)&jarg1; 
-  result = (__mbstate_t___value *)& ((arg1)->__value);
-  *(__mbstate_t___value **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1_1_1mbstate_1t(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  __mbstate_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (__mbstate_t *)calloc(1, sizeof(__mbstate_t));
-  *(__mbstate_t **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1_1_1mbstate_1t(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  __mbstate_t *arg1 = (__mbstate_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(__mbstate_t **)&jarg1; 
-  free((char *) arg1);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1mbstate_1t_1_1_1value_1_1_1wch_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  __mbstate_t___value *arg1 = (__mbstate_t___value *) 0 ;
-  unsigned int arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(__mbstate_t___value **)&jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->__wch = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1mbstate_1t_1_1_1value_1_1_1wch_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  __mbstate_t___value *arg1 = (__mbstate_t___value *) 0 ;
-  unsigned int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(__mbstate_t___value **)&jarg1; 
-  result = (unsigned int) ((arg1)->__wch);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1mbstate_1t_1_1_1value_1_1_1wchb_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  __mbstate_t___value *arg1 = (__mbstate_t___value *) 0 ;
-  char *arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(__mbstate_t___value **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    if(arg2) {
-      strncpy((char*)arg1->__wchb, (const char *)arg2, 4-1);
-      arg1->__wchb[4-1] = 0;
-    } else {
-      arg1->__wchb[0] = 0;
-    }
-  }
-  
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1mbstate_1t_1_1_1value_1_1_1wchb_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  __mbstate_t___value *arg1 = (__mbstate_t___value *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(__mbstate_t___value **)&jarg1; 
-  result = (char *)(char *) ((arg1)->__wchb);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1_1_1mbstate_1t_1_1_1value(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  __mbstate_t___value *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (__mbstate_t___value *)calloc(1, sizeof(__mbstate_t___value));
-  *(__mbstate_t___value **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1_1_1mbstate_1t_1_1_1value(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  __mbstate_t___value *arg1 = (__mbstate_t___value *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(__mbstate_t___value **)&jarg1; 
-  free((char *) arg1);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1fpos_1t_1_1_1pos_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
-  struct _G_fpos_t *arg1 = (struct _G_fpos_t *) 0 ;
-  __off_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _G_fpos_t **)&jarg1; 
-  arg2 = (__off_t)jarg2; 
-  if (arg1) (arg1)->__pos = arg2;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1fpos_1t_1_1_1pos_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  struct _G_fpos_t *arg1 = (struct _G_fpos_t *) 0 ;
-  __off_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _G_fpos_t **)&jarg1; 
-  result = (__off_t) ((arg1)->__pos);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1fpos_1t_1_1_1state_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  struct _G_fpos_t *arg1 = (struct _G_fpos_t *) 0 ;
-  __mbstate_t *arg2 = (__mbstate_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  (void)jarg2_;
-  arg1 = *(struct _G_fpos_t **)&jarg1; 
-  arg2 = *(__mbstate_t **)&jarg2; 
-  if (arg1) (arg1)->__state = *arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1fpos_1t_1_1_1state_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _G_fpos_t *arg1 = (struct _G_fpos_t *) 0 ;
-  __mbstate_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _G_fpos_t **)&jarg1; 
-  result = (__mbstate_t *)& ((arg1)->__state);
-  *(__mbstate_t **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1_1_1fpos_1t(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  struct _G_fpos_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (struct _G_fpos_t *)calloc(1, sizeof(struct _G_fpos_t));
-  *(struct _G_fpos_t **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1_1_1fpos_1t(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  struct _G_fpos_t *arg1 = (struct _G_fpos_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(struct _G_fpos_t **)&jarg1; 
-  free((char *) arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1_1_1_1fpos64_1t_1defined_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1fpos64_1t_1_1_1pos_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct _G_fpos64_t *arg1 = (struct _G_fpos64_t *) 0 ;
-  __off64_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _G_fpos64_t **)&jarg1; 
-  arg2 = (__off64_t)jarg2; 
-  if (arg1) (arg1)->__pos = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1fpos64_1t_1_1_1pos_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _G_fpos64_t *arg1 = (struct _G_fpos64_t *) 0 ;
-  __off64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _G_fpos64_t **)&jarg1; 
-  result = (__off64_t) ((arg1)->__pos);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1fpos64_1t_1_1_1state_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  struct _G_fpos64_t *arg1 = (struct _G_fpos64_t *) 0 ;
-  __mbstate_t *arg2 = (__mbstate_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  (void)jarg2_;
-  arg1 = *(struct _G_fpos64_t **)&jarg1; 
-  arg2 = *(__mbstate_t **)&jarg2; 
-  if (arg1) (arg1)->__state = *arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1fpos64_1t_1_1_1state_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _G_fpos64_t *arg1 = (struct _G_fpos64_t *) 0 ;
-  __mbstate_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _G_fpos64_t **)&jarg1; 
-  result = (__mbstate_t *)& ((arg1)->__state);
-  *(__mbstate_t **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1_1_1fpos64_1t(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  struct _G_fpos64_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (struct _G_fpos64_t *)calloc(1, sizeof(struct _G_fpos64_t));
-  *(struct _G_fpos64_t **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1_1_1fpos64_1t(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  struct _G_fpos64_t *arg1 = (struct _G_fpos64_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(struct _G_fpos64_t **)&jarg1; 
-  free((char *) arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1_1_1FILE_1defined_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1FILE_1defined_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1struct_1FILE_1defined_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1flags_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  int arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->_flags = arg2;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1flags_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (int) ((arg1)->_flags);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1read_1ptr_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_read_ptr);
-    if (arg2) {
-      arg1->_IO_read_ptr = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_read_ptr, (const char *)arg2);
-    } else {
-      arg1->_IO_read_ptr = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1read_1ptr_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_read_ptr);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1read_1end_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_read_end);
-    if (arg2) {
-      arg1->_IO_read_end = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_read_end, (const char *)arg2);
-    } else {
-      arg1->_IO_read_end = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1read_1end_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_read_end);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1read_1base_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_read_base);
-    if (arg2) {
-      arg1->_IO_read_base = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_read_base, (const char *)arg2);
-    } else {
-      arg1->_IO_read_base = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1read_1base_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_read_base);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1write_1base_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_write_base);
-    if (arg2) {
-      arg1->_IO_write_base = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_write_base, (const char *)arg2);
-    } else {
-      arg1->_IO_write_base = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1write_1base_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_write_base);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1write_1ptr_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_write_ptr);
-    if (arg2) {
-      arg1->_IO_write_ptr = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_write_ptr, (const char *)arg2);
-    } else {
-      arg1->_IO_write_ptr = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1write_1ptr_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_write_ptr);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1write_1end_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_write_end);
-    if (arg2) {
-      arg1->_IO_write_end = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_write_end, (const char *)arg2);
-    } else {
-      arg1->_IO_write_end = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1write_1end_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_write_end);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1buf_1base_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_buf_base);
-    if (arg2) {
-      arg1->_IO_buf_base = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_buf_base, (const char *)arg2);
-    } else {
-      arg1->_IO_buf_base = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1buf_1base_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_buf_base);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1buf_1end_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_buf_end);
-    if (arg2) {
-      arg1->_IO_buf_end = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_buf_end, (const char *)arg2);
-    } else {
-      arg1->_IO_buf_end = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1buf_1end_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_buf_end);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1save_1base_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_save_base);
-    if (arg2) {
-      arg1->_IO_save_base = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_save_base, (const char *)arg2);
-    } else {
-      arg1->_IO_save_base = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1save_1base_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_save_base);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1backup_1base_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_backup_base);
-    if (arg2) {
-      arg1->_IO_backup_base = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_backup_base, (const char *)arg2);
-    } else {
-      arg1->_IO_backup_base = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1backup_1base_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_backup_base);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1save_1end_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    free(arg1->_IO_save_end);
-    if (arg2) {
-      arg1->_IO_save_end = (char *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->_IO_save_end, (const char *)arg2);
-    } else {
-      arg1->_IO_save_end = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1IO_1save_1end_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *) ((arg1)->_IO_save_end);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1markers_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  struct _IO_marker *arg2 = (struct _IO_marker *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = *(struct _IO_marker **)&jarg2; 
-  if (arg1) (arg1)->_markers = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1markers_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  struct _IO_marker *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (struct _IO_marker *) ((arg1)->_markers);
-  *(struct _IO_marker **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1chain_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  struct _IO_FILE *arg2 = (struct _IO_FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  (void)jarg2_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = *(struct _IO_FILE **)&jarg2; 
-  if (arg1) (arg1)->_chain = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1chain_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  struct _IO_FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (struct _IO_FILE *) ((arg1)->_chain);
-  *(struct _IO_FILE **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1fileno_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  int arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->_fileno = arg2;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1fileno_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (int) ((arg1)->_fileno);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1flags2_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  int arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->_flags2 = arg2;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1flags2_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (int) ((arg1)->_flags2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1old_1offset_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  __off_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = (__off_t)jarg2; 
-  if (arg1) (arg1)->_old_offset = arg2;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1old_1offset_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  __off_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (__off_t) ((arg1)->_old_offset);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1cur_1column_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  unsigned short arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = (unsigned short)jarg2; 
-  if (arg1) (arg1)->_cur_column = arg2;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1cur_1column_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  unsigned short result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (unsigned short) ((arg1)->_cur_column);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1vtable_1offset_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jbyte jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  signed char arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = (signed char)jarg2; 
-  if (arg1) (arg1)->_vtable_offset = arg2;
-}
-
-
-SWIGEXPORT jbyte JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1vtable_1offset_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jbyte jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  signed char result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (signed char) ((arg1)->_vtable_offset);
-  jresult = (jbyte)result; 
-  return jresult;
-}
-
-/* Disables due to bugs
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1shortbuf_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    if(arg2) {
-      strncpy((char*)arg1->_shortbuf, (const char *)arg2, 1-1);
-      arg1->_shortbuf[1-1] = 0;
-    } else {
-      arg1->_shortbuf[0] = 0;
-    }
-  }
-  
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-*/
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1shortbuf_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *)(char *) ((arg1)->_shortbuf);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1lock_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  _IO_lock_t *arg2 = (_IO_lock_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = *(_IO_lock_t **)&jarg2; 
-  if (arg1) (arg1)->_lock = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1lock_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  _IO_lock_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (_IO_lock_t *) ((arg1)->_lock);
-  *(_IO_lock_t **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1offset_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  __off64_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = (__off64_t)jarg2; 
-  if (arg1) (arg1)->_offset = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1offset_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  __off64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (__off64_t) ((arg1)->_offset);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1codecvt_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  struct _IO_codecvt *arg2 = (struct _IO_codecvt *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = *(struct _IO_codecvt **)&jarg2; 
-  if (arg1) (arg1)->_codecvt = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1codecvt_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  struct _IO_codecvt *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (struct _IO_codecvt *) ((arg1)->_codecvt);
-  *(struct _IO_codecvt **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1wide_1data_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  struct _IO_wide_data *arg2 = (struct _IO_wide_data *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = *(struct _IO_wide_data **)&jarg2; 
-  if (arg1) (arg1)->_wide_data = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1wide_1data_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  struct _IO_wide_data *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (struct _IO_wide_data *) ((arg1)->_wide_data);
-  *(struct _IO_wide_data **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1freeres_1list_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  struct _IO_FILE *arg2 = (struct _IO_FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  (void)jarg2_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = *(struct _IO_FILE **)&jarg2; 
-  if (arg1) (arg1)->_freeres_list = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1freeres_1list_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  struct _IO_FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (struct _IO_FILE *) ((arg1)->_freeres_list);
-  *(struct _IO_FILE **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1freeres_1buf_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = *(void **)&jarg2; 
-  if (arg1) (arg1)->_freeres_buf = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1freeres_1buf_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  void *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (void *) ((arg1)->_freeres_buf);
-  *(void **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1_1pad5_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  size_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = (size_t)jarg2; 
-  if (arg1) (arg1)->__pad5 = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1_1pad5_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  size_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (size_t) ((arg1)->__pad5);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1mode_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  int arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->_mode = arg2;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1mode_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (int) ((arg1)->_mode);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1unused2_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    if(arg2) {
-      strncpy((char*)arg1->_unused2, (const char *)arg2, 15*sizeof(int)-4*sizeof(void *)-sizeof(size_t)-1);
-      arg1->_unused2[15*sizeof(int)-4*sizeof(void *)-sizeof(size_t)-1] = 0;
-    } else {
-      arg1->_unused2[0] = 0;
-    }
-  }
-  
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1FILE_1_1unused2_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  result = (char *)(char *) ((arg1)->_unused2);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1_1IO_1FILE(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  struct _IO_FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (struct _IO_FILE *)calloc(1, sizeof(struct _IO_FILE));
-  *(struct _IO_FILE **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1_1IO_1FILE(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  struct _IO_FILE *arg1 = (struct _IO_FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(struct _IO_FILE **)&jarg1; 
-  free((char *) arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1EOF_1SEEN_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0x0010);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1ERR_1SEEN_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0x0020);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IO_1USER_1LOCK_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0x8000);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IOFBF_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IOLBF_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1IONBF_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BUFSIZ_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(8192);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_EOF_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)((-1));
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_SEEK_1SET_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(0);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_SEEK_1CUR_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_SEEK_1END_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_P_1tmpdir_1get(JNIEnv *jenv, jclass jcls) {
-  jstring jresult = 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (char *)("/tmp");
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1BITS_1STDIO_1LIM_1H_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_L_1tmpnam_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(20);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_TMP_1MAX_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(238328);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_FILENAME_1MAX_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(4096);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_L_1ctermid_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(9);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_FOPEN_1MAX_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)(16);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_stdin_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  FILE *arg1 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  stdin = arg1;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_stdin_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (FILE *)stdin;
-  *(FILE **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_stdout_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  FILE *arg1 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  stdout = arg1;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_stdout_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (FILE *)stdout;
-  *(FILE **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_stderr_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  FILE *arg1 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  stderr = arg1;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_stderr_1get(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (FILE *)stderr;
-  *(FILE **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_remove(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  jint jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  result = (int)remove((char const *)arg1);
-  jresult = (jint)result; 
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_rename(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2) {
-  jint jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)rename((char const *)arg1,(char const *)arg2);
-  jresult = (jint)result; 
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_renameat(JNIEnv *jenv, jclass jcls, jint jarg1, jstring jarg2, jint jarg3, jstring jarg4) {
-  jint jresult = 0 ;
-  int arg1 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  char *arg4 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (int)jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  arg3 = (int)jarg3; 
-  arg4 = 0;
-  if (jarg4) {
-    arg4 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg4, 0);
-    if (!arg4) return 0;
-  }
-  result = (int)renameat(arg1,(char const *)arg2,arg3,(char const *)arg4);
-  jresult = (jint)result; 
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  if (arg4) (*jenv)->ReleaseStringUTFChars(jenv, jarg4, (const char *)arg4);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fclose(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)fclose(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_tmpfile(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (FILE *)tmpfile();
-  *(FILE **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_tmpnam(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  jstring jresult = 0 ;
-  char *arg1 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  result = (char *)tmpnam(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_tmpnam_1r(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  jstring jresult = 0 ;
-  char *arg1 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  result = (char *)tmpnam_r(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_tempnam(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2) {
-  jstring jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (char *)tempnam((char const *)arg1,(char const *)arg2);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fflush(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)fflush(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fflush_1unlocked(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)fflush_unlocked(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fopen(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2) {
-  jlong jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (FILE *)fopen((char const *)arg1,(char const *)arg2);
-  *(FILE **)&jresult = result; 
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_freopen(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2, jlong jarg3, jobject jarg3_) {
-  jlong jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  FILE *arg3 = (FILE *) 0 ;
-  FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg3_;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  arg3 = *(FILE **)&jarg3; 
-  result = (FILE *)freopen((char const *)arg1,(char const *)arg2,arg3);
-  *(FILE **)&jresult = result; 
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fdopen(JNIEnv *jenv, jclass jcls, jint jarg1, jstring jarg2) {
-  jlong jresult = 0 ;
-  int arg1 ;
-  char *arg2 = (char *) 0 ;
-  FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (int)jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (FILE *)fdopen(arg1,(char const *)arg2);
-  *(FILE **)&jresult = result; 
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fmemopen(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3) {
-  jlong jresult = 0 ;
-  void *arg1 = (void *) 0 ;
-  size_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(void **)&jarg1; 
-  arg2 = (size_t)jarg2; 
-  arg3 = 0;
-  if (jarg3) {
-    arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);
-    if (!arg3) return 0;
-  }
-  result = (FILE *)fmemopen(arg1,arg2,(char const *)arg3);
-  *(FILE **)&jresult = result; 
-  if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_open_1memstream(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  jlong jresult = 0 ;
-  char **arg1 = (char **) 0 ;
-  size_t *arg2 = (size_t *) 0 ;
-  FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(char ***)&jarg1; 
-  arg2 = *(size_t **)&jarg2; 
-  result = (FILE *)open_memstream(arg1,arg2);
-  *(FILE **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_setbuf(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  FILE *arg1 = (FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  setbuf(arg1,arg2);
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_setvbuf(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jint jarg3, jlong jarg4) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  size_t arg4 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  arg3 = (int)jarg3; 
-  arg4 = (size_t)jarg4; 
-  result = (int)setvbuf(arg1,arg2,arg3,arg4);
-  jresult = (jint)result; 
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_setbuffer(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jlong jarg3) {
-  FILE *arg1 = (FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  arg3 = (size_t)jarg3; 
-  setbuffer(arg1,arg2,arg3);
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_setlinebuf(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  FILE *arg1 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  setlinebuf(arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fprintf(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)fprintf(arg1,(char const *)arg2,arg3);
-  jresult = (jint)result; 
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_printf(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  jint jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  void *arg2 = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  result = (int)printf((char const *)arg1,arg2);
-  jresult = (jint)result; 
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_sprintf(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2) {
-  jint jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (int)sprintf(arg1,(char const *)arg2,arg3);
-  jresult = (jint)result; 
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fgetc(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)fgetc(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_getc(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)getc(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_getchar(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)getchar();
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_getc_1unlocked(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)getc_unlocked(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_getchar_1unlocked(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (int)getchar_unlocked();
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fgetc_1unlocked(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)fgetc_unlocked(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fputc(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
-  int arg1 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg2_;
-  arg1 = (int)jarg1; 
-  arg2 = *(FILE **)&jarg2; 
-  result = (int)fputc(arg1,arg2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_putc(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
-  int arg1 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg2_;
-  arg1 = (int)jarg1; 
-  arg2 = *(FILE **)&jarg2; 
-  result = (int)putc(arg1,arg2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_putchar(JNIEnv *jenv, jclass jcls, jint jarg1) {
-  jint jresult = 0 ;
-  int arg1 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (int)jarg1; 
-  result = (int)putchar(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fputc_1unlocked(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
-  int arg1 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg2_;
-  arg1 = (int)jarg1; 
-  arg2 = *(FILE **)&jarg2; 
-  result = (int)fputc_unlocked(arg1,arg2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_putc_1unlocked(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
-  int arg1 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg2_;
-  arg1 = (int)jarg1; 
-  arg2 = *(FILE **)&jarg2; 
-  result = (int)putc_unlocked(arg1,arg2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_putchar_1unlocked(JNIEnv *jenv, jclass jcls, jint jarg1) {
-  jint jresult = 0 ;
-  int arg1 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (int)jarg1; 
-  result = (int)putchar_unlocked(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_getw(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)getw(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_putw(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
-  int arg1 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg2_;
-  arg1 = (int)jarg1; 
-  arg2 = *(FILE **)&jarg2; 
-  result = (int)putw(arg1,arg2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fgets(JNIEnv *jenv, jclass jcls, jstring jarg1, jint jarg2, jlong jarg3, jobject jarg3_) {
-  jstring jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  int arg2 ;
-  FILE *arg3 = (FILE *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg3_;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  arg2 = (int)jarg2; 
-  arg3 = *(FILE **)&jarg3; 
-  result = (char *)fgets(arg1,arg2,arg3);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  return jresult;
-}
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1getdelim(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jint jarg3, jlong jarg4, jobject jarg4_) {
-  jint jresult = 0 ;
-  char **arg1 = (char **) 0 ;
-  size_t *arg2 = (size_t *) 0 ;
-  int arg3 ;
-  FILE *arg4 = (FILE *) 0 ;
-  __ssize_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg4_;
-  arg1 = *(char ***)&jarg1; 
-  arg2 = *(size_t **)&jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = *(FILE **)&jarg4; 
-  result = (__ssize_t)__getdelim(arg1,arg2,arg3,arg4);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_getdelim(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jint jarg3, jlong jarg4, jobject jarg4_) {
-  jint jresult = 0 ;
-  char **arg1 = (char **) 0 ;
-  size_t *arg2 = (size_t *) 0 ;
-  int arg3 ;
-  FILE *arg4 = (FILE *) 0 ;
-  __ssize_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg4_;
-  arg1 = *(char ***)&jarg1; 
-  arg2 = *(size_t **)&jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = *(FILE **)&jarg4; 
-  result = (__ssize_t)getdelim(arg1,arg2,arg3,arg4);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_getline(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jobject jarg3_) {
-  jint jresult = 0 ;
-  char **arg1 = (char **) 0 ;
-  size_t *arg2 = (size_t *) 0 ;
-  FILE *arg3 = (FILE *) 0 ;
-  __ssize_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg3_;
-  arg1 = *(char ***)&jarg1; 
-  arg2 = *(size_t **)&jarg2; 
-  arg3 = *(FILE **)&jarg3; 
-  result = (__ssize_t)getline(arg1,arg2,arg3);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fputs(JNIEnv *jenv, jclass jcls, jstring jarg1, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg2_;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  arg2 = *(FILE **)&jarg2; 
-  result = (int)fputs((char const *)arg1,arg2);
-  jresult = (jint)result; 
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_puts(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  jint jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  result = (int)puts((char const *)arg1);
-  jresult = (jint)result; 
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ungetc(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
-  int arg1 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg2_;
-  arg1 = (int)jarg1; 
-  arg2 = *(FILE **)&jarg2; 
-  result = (int)ungetc(arg1,arg2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fread(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jlong jarg4, jobject jarg4_) {
-  jlong jresult = 0 ;
-  void *arg1 = (void *) 0 ;
-  size_t arg2 ;
-  size_t arg3 ;
-  FILE *arg4 = (FILE *) 0 ;
-  size_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg4_;
-  arg1 = *(void **)&jarg1; 
-  arg2 = (size_t)jarg2; 
-  arg3 = (size_t)jarg3; 
-  arg4 = *(FILE **)&jarg4; 
-  result = (size_t)fread(arg1,arg2,arg3,arg4);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fwrite(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jlong jarg4, jobject jarg4_) {
-  jlong jresult = 0 ;
-  void *arg1 = (void *) 0 ;
-  size_t arg2 ;
-  size_t arg3 ;
-  FILE *arg4 = (FILE *) 0 ;
-  size_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg4_;
-  arg1 = *(void **)&jarg1; 
-  arg2 = (size_t)jarg2; 
-  arg3 = (size_t)jarg3; 
-  arg4 = *(FILE **)&jarg4; 
-  result = (size_t)fwrite((void const *)arg1,arg2,arg3,arg4);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fread_1unlocked(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jlong jarg4, jobject jarg4_) {
-  jlong jresult = 0 ;
-  void *arg1 = (void *) 0 ;
-  size_t arg2 ;
-  size_t arg3 ;
-  FILE *arg4 = (FILE *) 0 ;
-  size_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg4_;
-  arg1 = *(void **)&jarg1; 
-  arg2 = (size_t)jarg2; 
-  arg3 = (size_t)jarg3; 
-  arg4 = *(FILE **)&jarg4; 
-  result = (size_t)fread_unlocked(arg1,arg2,arg3,arg4);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fwrite_1unlocked(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jlong jarg4, jobject jarg4_) {
-  jlong jresult = 0 ;
-  void *arg1 = (void *) 0 ;
-  size_t arg2 ;
-  size_t arg3 ;
-  FILE *arg4 = (FILE *) 0 ;
-  size_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg4_;
-  arg1 = *(void **)&jarg1; 
-  arg2 = (size_t)jarg2; 
-  arg3 = (size_t)jarg3; 
-  arg4 = *(FILE **)&jarg4; 
-  result = (size_t)fwrite_unlocked((void const *)arg1,arg2,arg3,arg4);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fseek(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  long arg2 ;
-  int arg3 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  arg2 = (long)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)fseek(arg1,arg2,arg3);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ftell(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  long result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (long)ftell(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_rewind(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  FILE *arg1 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  rewind(arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fseeko(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  __off_t arg2 ;
-  int arg3 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  arg2 = (__off_t)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)fseeko(arg1,arg2,arg3);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ftello(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  __off_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (__off_t)ftello(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fgetpos(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  fpos_t *arg2 = (fpos_t *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  (void)jarg2_;
-  arg1 = *(FILE **)&jarg1; 
-  arg2 = *(fpos_t **)&jarg2; 
-  result = (int)fgetpos(arg1,arg2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fsetpos(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  fpos_t *arg2 = (fpos_t *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  (void)jarg2_;
-  arg1 = *(FILE **)&jarg1; 
-  arg2 = *(fpos_t **)&jarg2; 
-  result = (int)fsetpos(arg1,(struct _G_fpos_t const *)arg2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_clearerr(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  FILE *arg1 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  clearerr(arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_feof(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)feof(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ferror(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)ferror(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_clearerr_1unlocked(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  FILE *arg1 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  clearerr_unlocked(arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_feof_1unlocked(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)feof_unlocked(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ferror_1unlocked(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)ferror_unlocked(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_perror(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return ;
-  }
-  perror((char const *)arg1);
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fileno(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)fileno(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_fileno_1unlocked(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)fileno_unlocked(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_pclose(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)pclose(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_popen(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2) {
-  jlong jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  FILE *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (FILE *)popen((char const *)arg1,(char const *)arg2);
-  *(FILE **)&jresult = result; 
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ctermid(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  jstring jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  result = (char *)ctermid(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_flockfile(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  FILE *arg1 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  flockfile(arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ftrylockfile(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)ftrylockfile(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_funlockfile(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  FILE *arg1 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  funlockfile(arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1uflow(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  result = (int)__uflow(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI__1_1overflow(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
-  jint jresult = 0 ;
-  FILE *arg1 = (FILE *) 0 ;
-  int arg2 ;
-  int result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(FILE **)&jarg1; 
-  arg2 = (int)jarg2; 
-  result = (int)__overflow(arg1,arg2);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BITWUZLA_1SAT_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  enum BitwuzlaResult result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (enum BitwuzlaResult)BITWUZLA_SAT;
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BITWUZLA_1UNSAT_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  enum BitwuzlaResult result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (enum BitwuzlaResult)BITWUZLA_UNSAT;
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BITWUZLA_1UNKNOWN_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  enum BitwuzlaResult result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (enum BitwuzlaResult)BITWUZLA_UNKNOWN;
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BITWUZLA_1RM_1RNE_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  enum BitwuzlaRoundingMode result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (enum BitwuzlaRoundingMode)BITWUZLA_RM_RNE;
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BITWUZLA_1RM_1RNA_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  enum BitwuzlaRoundingMode result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (enum BitwuzlaRoundingMode)BITWUZLA_RM_RNA;
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BITWUZLA_1RM_1RTN_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  enum BitwuzlaRoundingMode result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (enum BitwuzlaRoundingMode)BITWUZLA_RM_RTN;
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BITWUZLA_1RM_1RTP_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  enum BitwuzlaRoundingMode result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (enum BitwuzlaRoundingMode)BITWUZLA_RM_RTP;
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BITWUZLA_1RM_1RTZ_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  enum BitwuzlaRoundingMode result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (enum BitwuzlaRoundingMode)BITWUZLA_RM_RTZ;
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BITWUZLA_1RM_1MAX_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  enum BitwuzlaRoundingMode result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (enum BitwuzlaRoundingMode)BITWUZLA_RM_MAX;
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BITWUZLA_1KIND_1CONSTANT_1get(JNIEnv *jenv, jclass jcls) {
-  jint jresult = 0 ;
-  enum BitwuzlaKind result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (enum BitwuzlaKind)BITWUZLA_KIND_CONSTANT;
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1copyright(JNIEnv *jenv, jclass jcls) {
-  jstring jresult = 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (char *)bitwuzla_copyright();
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1version(JNIEnv *jenv, jclass jcls) {
-  jstring jresult = 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (char *)bitwuzla_version();
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1git_1id(JNIEnv *jenv, jclass jcls) {
-  jstring jresult = 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (char *)bitwuzla_git_id();
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1opt_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  BitwuzlaOption arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  arg2 = (BitwuzlaOption)jarg2; 
-  if (arg1) (arg1)->opt = arg2;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1opt_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jint jresult = 0 ;
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  BitwuzlaOption result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  result = (BitwuzlaOption) ((arg1)->opt);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1shrt_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    if (arg2) {
-      arg1->shrt = (char const *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->shrt, (const char *)arg2);
-    } else {
-      arg1->shrt = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1shrt_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  result = (char *) ((arg1)->shrt);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1lng_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    if (arg2) {
-      arg1->lng = (char const *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->lng, (const char *)arg2);
-    } else {
-      arg1->lng = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1lng_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  result = (char *) ((arg1)->lng);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1description_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    if (arg2) {
-      arg1->description = (char const *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->description, (const char *)arg2);
-    } else {
-      arg1->description = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1description_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  result = (char *) ((arg1)->description);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1is_1numeric_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jboolean jarg2) {
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  _Bool arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  {
-    arg2 = (jarg2 ? true : false);
-  }
-  if (arg1) (arg1)->is_numeric = arg2;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1is_1numeric_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jboolean jresult = 0 ;
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  result =  ((arg1)->is_numeric);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1numeric_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  struct NumericValue *arg2 = (struct NumericValue *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  (void)jarg2_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  arg2 = *(struct NumericValue **)&jarg2; 
-  if (arg1) (arg1)->numeric = *arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1numeric_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  struct NumericValue *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  result = (struct NumericValue *)& ((arg1)->numeric);
-  *(struct NumericValue **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1mode_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  struct ModeValue *arg2 = (struct ModeValue *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  (void)jarg2_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  arg2 = *(struct ModeValue **)&jarg2; 
-  if (arg1) (arg1)->mode = *arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_BitwuzlaOptionInfo_1mode_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  struct ModeValue *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  result = (struct ModeValue *)& ((arg1)->mode);
-  *(struct ModeValue **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1BitwuzlaOptionInfo(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  struct BitwuzlaOptionInfo *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (struct BitwuzlaOptionInfo *)calloc(1, sizeof(struct BitwuzlaOptionInfo));
-  *(struct BitwuzlaOptionInfo **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1BitwuzlaOptionInfo(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  struct BitwuzlaOptionInfo *arg1 = (struct BitwuzlaOptionInfo *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(struct BitwuzlaOptionInfo **)&jarg1; 
-  free((char *) arg1);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_NumericValue_1cur_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct NumericValue *arg1 = (struct NumericValue *) 0 ;
-  uint64_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct NumericValue **)&jarg1; 
-  arg2 = (uint64_t)jarg2; 
-  if (arg1) (arg1)->cur = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_NumericValue_1cur_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct NumericValue *arg1 = (struct NumericValue *) 0 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct NumericValue **)&jarg1; 
-  result = (uint64_t) ((arg1)->cur);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_NumericValue_1dflt_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct NumericValue *arg1 = (struct NumericValue *) 0 ;
-  uint64_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct NumericValue **)&jarg1; 
-  arg2 = (uint64_t)jarg2; 
-  if (arg1) (arg1)->dflt = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_NumericValue_1dflt_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct NumericValue *arg1 = (struct NumericValue *) 0 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct NumericValue **)&jarg1; 
-  result = (uint64_t) ((arg1)->dflt);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_NumericValue_1min_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct NumericValue *arg1 = (struct NumericValue *) 0 ;
-  uint64_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct NumericValue **)&jarg1; 
-  arg2 = (uint64_t)jarg2; 
-  if (arg1) (arg1)->min = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_NumericValue_1min_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct NumericValue *arg1 = (struct NumericValue *) 0 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct NumericValue **)&jarg1; 
-  result = (uint64_t) ((arg1)->min);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_NumericValue_1max_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct NumericValue *arg1 = (struct NumericValue *) 0 ;
-  uint64_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct NumericValue **)&jarg1; 
-  arg2 = (uint64_t)jarg2; 
-  if (arg1) (arg1)->max = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_NumericValue_1max_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct NumericValue *arg1 = (struct NumericValue *) 0 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct NumericValue **)&jarg1; 
-  result = (uint64_t) ((arg1)->max);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1NumericValue(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  struct NumericValue *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (struct NumericValue *)calloc(1, sizeof(struct NumericValue));
-  *(struct NumericValue **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1NumericValue(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  struct NumericValue *arg1 = (struct NumericValue *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(struct NumericValue **)&jarg1; 
-  free((char *) arg1);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ModeValue_1cur_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct ModeValue *arg1 = (struct ModeValue *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct ModeValue **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    if (arg2) {
-      arg1->cur = (char const *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->cur, (const char *)arg2);
-    } else {
-      arg1->cur = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ModeValue_1cur_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct ModeValue *arg1 = (struct ModeValue *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct ModeValue **)&jarg1; 
-  result = (char *) ((arg1)->cur);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ModeValue_1dflt_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  struct ModeValue *arg1 = (struct ModeValue *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct ModeValue **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    if (arg2) {
-      arg1->dflt = (char const *) malloc(strlen((const char *)arg2)+1);
-      strcpy((char *)arg1->dflt, (const char *)arg2);
-    } else {
-      arg1->dflt = 0;
-    }
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ModeValue_1dflt_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  struct ModeValue *arg1 = (struct ModeValue *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct ModeValue **)&jarg1; 
-  result = (char *) ((arg1)->dflt);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ModeValue_1num_1modes_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct ModeValue *arg1 = (struct ModeValue *) 0 ;
-  size_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct ModeValue **)&jarg1; 
-  arg2 = (size_t)jarg2; 
-  if (arg1) (arg1)->num_modes = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ModeValue_1num_1modes_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct ModeValue *arg1 = (struct ModeValue *) 0 ;
-  size_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct ModeValue **)&jarg1; 
-  result = (size_t) ((arg1)->num_modes);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ModeValue_1modes_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  struct ModeValue *arg1 = (struct ModeValue *) 0 ;
-  char **arg2 = (char **) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct ModeValue **)&jarg1; 
-  arg2 = *(char ***)&jarg2; 
-  if (arg1) (arg1)->modes = (char const **)arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_ModeValue_1modes_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  struct ModeValue *arg1 = (struct ModeValue *) 0 ;
-  char **result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(struct ModeValue **)&jarg1; 
-  result = (char **) ((arg1)->modes);
-  *(char ***)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_new_1ModeValue(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  struct ModeValue *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (struct ModeValue *)calloc(1, sizeof(struct ModeValue));
-  *(struct ModeValue **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_delete_1ModeValue(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  struct ModeValue *arg1 = (struct ModeValue *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(struct ModeValue **)&jarg1; 
-  free((char *) arg1);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1options_1new(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  BitwuzlaOptions *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (BitwuzlaOptions *)bitwuzla_options_new();
-  *(BitwuzlaOptions **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1options_1delete(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  bitwuzla_options_delete(arg1);
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1option_1is_1valid(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {
-  jboolean jresult = 0 ;
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  char *arg2 = (char *) 0 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = bitwuzla_option_is_valid(arg1,(char const *)arg2);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1option_1is_1numeric(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jboolean jresult = 0 ;
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  BitwuzlaOption arg2 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  arg2 = (BitwuzlaOption)jarg2; 
-  result = bitwuzla_option_is_numeric(arg1,arg2);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1option_1is_1mode(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jboolean jresult = 0 ;
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  BitwuzlaOption arg2 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  arg2 = (BitwuzlaOption)jarg2; 
-  result = bitwuzla_option_is_mode(arg1,arg2);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1set_1option(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2, jlong jarg3) {
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  BitwuzlaOption arg2 ;
-  uint64_t arg3 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  arg2 = (BitwuzlaOption)jarg2; 
-  arg3 = (uint64_t)jarg3; 
-  bitwuzla_set_option(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1set_1option_1mode(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2, jstring jarg3) {
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  BitwuzlaOption arg2 ;
-  char *arg3 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  arg2 = (BitwuzlaOption)jarg2; 
-  arg3 = 0;
-  if (jarg3) {
-    arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);
-    if (!arg3) return ;
-  }
-  bitwuzla_set_option_mode(arg1,arg2,(char const *)arg3);
-  if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1get_1option(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  BitwuzlaOption arg2 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  arg2 = (BitwuzlaOption)jarg2; 
-  result = (uint64_t)bitwuzla_get_option(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1get_1option_1mode(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jstring jresult = 0 ;
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  BitwuzlaOption arg2 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  arg2 = (BitwuzlaOption)jarg2; 
-  result = (char *)bitwuzla_get_option_mode(arg1,arg2);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1get_1option_1info(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2, jlong jarg3, jobject jarg3_) {
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  BitwuzlaOption arg2 ;
-  BitwuzlaOptionInfo *arg3 = (BitwuzlaOptionInfo *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg3_;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  arg2 = (BitwuzlaOption)jarg2; 
-  arg3 = *(BitwuzlaOptionInfo **)&jarg3; 
-  bitwuzla_get_option_info(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1result_1to_1string(JNIEnv *jenv, jclass jcls, jint jarg1) {
-  jstring jresult = 0 ;
-  BitwuzlaResult arg1 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaResult)jarg1; 
-  result = (char *)bitwuzla_result_to_string(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1rm_1to_1string(JNIEnv *jenv, jclass jcls, jint jarg1) {
-  jstring jresult = 0 ;
-  BitwuzlaRoundingMode arg1 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaRoundingMode)jarg1; 
-  result = (char *)bitwuzla_rm_to_string(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1kind_1to_1string(JNIEnv *jenv, jclass jcls, jint jarg1) {
-  jstring jresult = 0 ;
-  BitwuzlaKind arg1 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaKind)jarg1; 
-  result = (char *)bitwuzla_kind_to_string(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1hash(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  size_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (size_t)bitwuzla_sort_hash(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1bv_1get_1size(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (uint64_t)bitwuzla_sort_bv_get_size(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1fp_1get_1exp_1size(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (uint64_t)bitwuzla_sort_fp_get_exp_size(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1fp_1get_1sig_1size(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (uint64_t)bitwuzla_sort_fp_get_sig_size(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1array_1get_1index(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaSort)bitwuzla_sort_array_get_index(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1array_1get_1element(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaSort)bitwuzla_sort_array_get_element(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1fun_1get_1domain_1sorts(JNIEnv *jenv, jclass jcls, jlong jarg1, jlongArray jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  size_t *arg2 = (size_t *) 0 ;
-  size_t temp2 ;
-  BitwuzlaSort *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  {
-    if (!jarg2) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-      return 0;
-    }
-    if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-      return 0;
-    }
-    temp2 = (size_t)0;
-    arg2 = &temp2; 
-  }
-  result = (BitwuzlaSort *)bitwuzla_sort_fun_get_domain_sorts(arg1,arg2);
-  *(BitwuzlaSort **)&jresult = result; 
-  {
-    jlong jvalue = (jlong)temp2;
-    (*jenv)->SetLongArrayRegion(jenv, jarg2, 0, 1, &jvalue);
-  }
-  
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1fun_1get_1codomain(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaSort)bitwuzla_sort_fun_get_codomain(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1fun_1get_1arity(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (uint64_t)bitwuzla_sort_fun_get_arity(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1get_1uninterpreted_1symbol(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jstring jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (char *)bitwuzla_sort_get_uninterpreted_symbol(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1is_1equal(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  jboolean jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaSort arg2 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = (BitwuzlaSort)jarg2; 
-  result = bitwuzla_sort_is_equal(arg1,arg2);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1is_1array(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = bitwuzla_sort_is_array(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1is_1bool(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = bitwuzla_sort_is_bool(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1is_1bv(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = bitwuzla_sort_is_bv(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1is_1fp(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = bitwuzla_sort_is_fp(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1is_1fun(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = bitwuzla_sort_is_fun(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1is_1rm(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = bitwuzla_sort_is_rm(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1is_1uninterpreted(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = bitwuzla_sort_is_uninterpreted(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1to_1string(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jstring jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (char *)bitwuzla_sort_to_string(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1sort_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jobject jarg2_) {
-  BitwuzlaSort arg1 ;
-  FILE *arg2 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg2_;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = *(FILE **)&jarg2; 
-  bitwuzla_sort_print(arg1,arg2);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1hash(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  size_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (size_t)bitwuzla_term_hash(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1get_1kind(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jint jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  BitwuzlaKind result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (BitwuzlaKind)bitwuzla_term_get_kind(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-// BitwuzlaTerm* terms = bitwuzla_term_get_children(value, size_t* sizePtr);
-// We don't really need arg2 in Java(SMT), as the return array has a size in Java. But we need it here to create the array with that correct size!
-SWIGEXPORT jlongArray JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1get_1children(JNIEnv *jenv, jclass jcls, jlong jarg1, jlongArray jarg2) {
-  BitwuzlaTerm arg1 ;
-  size_t *arg2 = (size_t *) 0 ;
-  size_t temp2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  {
-    if (!jarg2) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-      return 0;
-    }
-    if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-      return 0;
-    }
-    temp2 = (size_t)0;
-    arg2 = &temp2; 
-  }
-  long unsigned int * result = bitwuzla_term_get_children(arg1,arg2);
-
-  {
-    jlong jvalue = (jlong)temp2;
-    (*jenv)->SetLongArrayRegion(jenv, jarg2, 0, 1, &jvalue);
-  }
-
-  jlongArray ret = (jobjectArray)(*jenv)->NewLongArray(jenv, *arg2);
-  if (ret == 0) {
-    return NULL;
-  }
-  long long int tmp[*arg2];
-  for (int i = 0; i < *arg2; i++) {
-    tmp[i] = (long long int) result[i];
-  }
-  (*jenv)->SetLongArrayRegion(jenv, ret, 0, *arg2, tmp);
-  
-  return ret;
-}
-
-
-SWIGEXPORT jlongArray JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1get_1indices(JNIEnv *jenv, jclass jcls, jlong jarg1, jlongArray jarg2) {
-  BitwuzlaTerm arg1 ;
-  size_t *arg2 = (size_t *) 0 ;
-  size_t temp2 ;
-  uint64_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  {
-    if (!jarg2) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-      return 0;
-    }
-    if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-      return 0;
-    }
-    temp2 = (size_t)0;
-    arg2 = &temp2; 
-  }
-  result = (uint64_t *)bitwuzla_term_get_indices(arg1,arg2);
-
-  {
-    jlong jvalue = (jlong)temp2;
-    (*jenv)->SetLongArrayRegion(jenv, jarg2, 0, 1, &jvalue);
-  }
-
-  jlongArray ret = (jobjectArray)(*jenv)->NewLongArray(jenv, *arg2);
-  if (ret == 0) {
-    printf("Error when creating returning jlongArray.");
-    return 0;
-  }
-
-  long long int tmp[*arg2];
-  for (int i = 0; i < *arg2; i++) {
-    tmp[i] = (long long int) *result;
-    result++;
-  }
-  (*jenv)->SetLongArrayRegion(jenv, ret, 0, *arg2, tmp);
-  
-  return ret;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1indexed(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_indexed(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1get_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (BitwuzlaSort)bitwuzla_term_get_sort(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1array_1get_1index_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (BitwuzlaSort)bitwuzla_term_array_get_index_sort(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1array_1get_1element_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (BitwuzlaSort)bitwuzla_term_array_get_element_sort(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1fun_1get_1domain_1sorts(JNIEnv *jenv, jclass jcls, jlong jarg1, jlongArray jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  size_t *arg2 = (size_t *) 0 ;
-  size_t temp2 ;
-  BitwuzlaSort *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  {
-    if (!jarg2) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-      return 0;
-    }
-    if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-      return 0;
-    }
-    temp2 = (size_t)0;
-    arg2 = &temp2; 
-  }
-  result = (BitwuzlaSort *)bitwuzla_term_fun_get_domain_sorts(arg1,arg2);
-  *(BitwuzlaSort **)&jresult = result; 
-  {
-    jlong jvalue = (jlong)temp2;
-    (*jenv)->SetLongArrayRegion(jenv, jarg2, 0, 1, &jvalue);
-  }
-  
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1fun_1get_1codomain_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (BitwuzlaSort)bitwuzla_term_fun_get_codomain_sort(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1bv_1get_1size(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (uint64_t)bitwuzla_term_bv_get_size(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1fp_1get_1exp_1size(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (uint64_t)bitwuzla_term_fp_get_exp_size(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1fp_1get_1sig_1size(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (uint64_t)bitwuzla_term_fp_get_sig_size(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1fun_1get_1arity(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  uint64_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (uint64_t)bitwuzla_term_fun_get_arity(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1get_1symbol(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jstring jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (char *)bitwuzla_term_get_symbol(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1equal_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  BitwuzlaTerm arg2 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  result = bitwuzla_term_is_equal_sort(arg1,arg2);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1array(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_array(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1const(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_const(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1fun(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_fun(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1var(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_var(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1value(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_value(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1bv_1value(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_bv_value(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1fp_1value(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_fp_value(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1rm_1value(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_rm_value(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1bool(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_bool(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1bv(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_bv(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1fp(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_fp(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1rm(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_rm(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1uninterpreted(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_uninterpreted(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1true(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_true(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1false(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_false(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1bv_1value_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_bv_value_zero(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1bv_1value_1one(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_bv_value_one(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1bv_1value_1ones(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_bv_value_ones(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1bv_1value_1min_1signed(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_bv_value_min_signed(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1bv_1value_1max_1signed(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_bv_value_max_signed(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1fp_1value_1pos_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_fp_value_pos_zero(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1fp_1value_1neg_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_fp_value_neg_zero(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1fp_1value_1pos_1inf(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_fp_value_pos_inf(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1fp_1value_1neg_1inf(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_fp_value_neg_inf(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1fp_1value_1nan(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_fp_value_nan(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1rm_1value_1rna(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_rm_value_rna(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1rm_1value_1rne(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_rm_value_rne(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1rm_1value_1rtn(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_rm_value_rtn(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1rm_1value_1rtp(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_rm_value_rtp(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1is_1rm_1value_1rtz(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_is_rm_value_rtz(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1value_1get_1bool(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = bitwuzla_term_value_get_bool(arg1);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1value_1get_1str(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jstring jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (char *)bitwuzla_term_value_get_str(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1value_1get_1str_1fmt(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jstring jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  uint8_t arg2 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  result = (char *)bitwuzla_term_value_get_str_fmt(arg1,arg2);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1value_1get_1fp_1ieee(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jlong jarg4, jint jarg5) {
-  BitwuzlaTerm arg1 ;
-  char **arg2 = (char **) 0 ;
-  char **arg3 = (char **) 0 ;
-  char **arg4 = (char **) 0 ;
-  uint8_t arg5 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  arg2 = *(char ***)&jarg2; 
-  arg3 = *(char ***)&jarg3; 
-  arg4 = *(char ***)&jarg4; 
-  arg5 = (uint8_t)jarg5; 
-  bitwuzla_term_value_get_fp_ieee(arg1,(char const **)arg2,(char const **)arg3,(char const **)arg4,arg5);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1value_1get_1rm(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jint jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  BitwuzlaRoundingMode result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (BitwuzlaRoundingMode)bitwuzla_term_value_get_rm(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1to_1string(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jstring jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  result = (char *)bitwuzla_term_to_string(arg1);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1to_1string_1fmt(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jstring jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  uint8_t arg2 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  result = (char *)bitwuzla_term_to_string_fmt(arg1,arg2);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jobject jarg2_) {
-  BitwuzlaTerm arg1 ;
-  FILE *arg2 = (FILE *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg2_;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  arg2 = *(FILE **)&jarg2; 
-  bitwuzla_term_print(arg1,arg2);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1term_1print_1fmt(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jobject jarg2_, jint jarg3) {
-  BitwuzlaTerm arg1 ;
-  FILE *arg2 = (FILE *) 0 ;
-  uint8_t arg3 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg2_;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  arg2 = *(FILE **)&jarg2; 
-  arg3 = (uint8_t)jarg3; 
-  bitwuzla_term_print_fmt(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1new(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  Bitwuzla *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  result = (Bitwuzla *)bitwuzla_new((struct BitwuzlaOptions const *)arg1);
-  *(Bitwuzla **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1delete(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  bitwuzla_delete(arg1);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1set_1termination_1callback(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3) {
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  int32_t (*arg2)(void *) = (int32_t (*)(void *)) 0 ;
-  void *arg3 = (void *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  arg2 = *(int32_t (**)(void *))&jarg2; 
-  arg3 = *(void **)&jarg3; 
-  bitwuzla_set_termination_callback(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1get_1termination_1callback_1state(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  void *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  result = (void *)bitwuzla_get_termination_callback_state(arg1);
-  *(void **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1set_1abort_1callback(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  void (*arg1)(char const *) = (void (*)(char const *)) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(void (**)(char const *))&jarg1; 
-  bitwuzla_set_abort_callback(arg1);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1push(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  uint64_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  arg2 = (uint64_t)jarg2; 
-  bitwuzla_push(arg1,arg2);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1pop(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  uint64_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  arg2 = (uint64_t)jarg2; 
-  bitwuzla_pop(arg1,arg2);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1assert(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  BitwuzlaTerm arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  bitwuzla_assert(arg1,arg2);
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1get_1assertions(JNIEnv *jenv, jclass jcls, jlong jarg1, jlongArray jarg2) {
-  jlong jresult = 0 ;
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  size_t *arg2 = (size_t *) 0 ;
-  size_t temp2 ;
-  BitwuzlaTerm *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  {
-    if (!jarg2) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-      return 0;
-    }
-    if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-      return 0;
-    }
-    temp2 = (size_t)0;
-    arg2 = &temp2; 
-  }
-  result = (BitwuzlaTerm *)bitwuzla_get_assertions(arg1,arg2);
-  *(BitwuzlaTerm **)&jresult = result; 
-  {
-    jlong jvalue = (jlong)temp2;
-    (*jenv)->SetLongArrayRegion(jenv, jarg2, 0, 1, &jvalue);
-  }
-  
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1is_1unsat_1assumption(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  jboolean jresult = 0 ;
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  BitwuzlaTerm arg2 ;
-  _Bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  result = bitwuzla_is_unsat_assumption(arg1,arg2);
-  {
-    jresult = (result ? JNI_TRUE : JNI_FALSE);
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1get_1unsat_1assumptions(JNIEnv *jenv, jclass jcls, jlong jarg1, jlongArray jarg2) {
-  jlong jresult = 0 ;
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  size_t *arg2 = (size_t *) 0 ;
-  size_t temp2 ;
-  BitwuzlaTerm *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  {
-    if (!jarg2) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-      return 0;
-    }
-    if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-      return 0;
-    }
-    temp2 = (size_t)0;
-    arg2 = &temp2; 
-  }
-  result = (BitwuzlaTerm *)bitwuzla_get_unsat_assumptions(arg1,arg2);
-  *(BitwuzlaTerm **)&jresult = result; 
-  {
-    jlong jvalue = (jlong)temp2;
-    (*jenv)->SetLongArrayRegion(jenv, jarg2, 0, 1, &jvalue);
-  }
-  
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1get_1unsat_1core(JNIEnv *jenv, jclass jcls, jlong jarg1, jlongArray jarg2) {
-  jlong jresult = 0 ;
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  size_t *arg2 = (size_t *) 0 ;
-  size_t temp2 ;
-  BitwuzlaTerm *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  {
-    if (!jarg2) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-      return 0;
-    }
-    if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-      return 0;
-    }
-    temp2 = (size_t)0;
-    arg2 = &temp2; 
-  }
-  result = (BitwuzlaTerm *)bitwuzla_get_unsat_core(arg1,arg2);
-  *(BitwuzlaTerm **)&jresult = result; 
-  {
-    jlong jvalue = (jlong)temp2;
-    (*jenv)->SetLongArrayRegion(jenv, jarg2, 0, 1, &jvalue);
-  }
-  
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1simplify(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  bitwuzla_simplify(arg1);
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1check_1sat(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jint jresult = 0 ;
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  BitwuzlaResult result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  result = (BitwuzlaResult)bitwuzla_check_sat(arg1);
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1check_1sat_1assuming(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlongArray jarg3) {
-  jint jresult = 0 ;
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  uint32_t arg2 ;
-  BitwuzlaTerm *arg3 ;
-  jlong *jarr3 ;
-  BitwuzlaResult result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (!SWIG_JavaArrayInUlong(jenv, &jarr3, (unsigned long **)&arg3, jarg3)) return 0; 
-  result = (BitwuzlaResult)bitwuzla_check_sat_assuming(arg1,arg2,arg3);
-  jresult = (jint)result; 
-  SWIG_JavaArrayArgoutUlong(jenv, jarr3, (unsigned long *)arg3, jarg3); 
-  free(arg3); 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1get_1value(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  jlong jresult = 0 ;
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  BitwuzlaTerm arg2 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  result = (BitwuzlaTerm)bitwuzla_get_value(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1print_1formula(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2, jlong jarg3, jobject jarg3_, jint jarg4) {
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  char *arg2 = (char *) 0 ;
-  FILE *arg3 = (FILE *) 0 ;
-  uint8_t arg4 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg3_;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return ;
-  }
-  arg3 = *(FILE **)&jarg3; 
-  arg4 = (uint8_t)jarg4; 
-  bitwuzla_print_formula(arg1,(char const *)arg2,arg3,arg4);
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1get_1statistics(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jlongArray jarg4) {
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  char ***arg2 = (char ***) 0 ;
-  char ***arg3 = (char ***) 0 ;
-  size_t *arg4 = (size_t *) 0 ;
-  size_t temp4 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&jarg1; 
-  arg2 = *(char ****)&jarg2; 
-  arg3 = *(char ****)&jarg3; 
-  {
-    if (!jarg4) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
-      return ;
-    }
-    if ((*jenv)->GetArrayLength(jenv, jarg4) == 0) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
-      return ;
-    }
-    temp4 = (size_t)0;
-    arg4 = &temp4; 
-  }
-  bitwuzla_get_statistics(arg1,(char const ***)arg2,(char const ***)arg3,arg4);
-  {
-    jlong jvalue = (jlong)temp4;
-    (*jenv)->SetLongArrayRegion(jenv, jarg4, 0, 1, &jvalue);
-  }
-  
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1array_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaSort arg2 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = (BitwuzlaSort)jarg2; 
-  result = (BitwuzlaSort)bitwuzla_mk_array_sort(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1bool_1sort(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (BitwuzlaSort)bitwuzla_mk_bool_sort();
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1bv_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  uint64_t arg1 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (uint64_t)jarg1; 
-  result = (BitwuzlaSort)bitwuzla_mk_bv_sort(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1fp_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  jlong jresult = 0 ;
-  uint64_t arg1 ;
-  uint64_t arg2 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (uint64_t)jarg1; 
-  arg2 = (uint64_t)jarg2; 
-  result = (BitwuzlaSort)bitwuzla_mk_fp_sort(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1fun_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jlongArray jarg2, jlong jarg3) {
-  jlong jresult = 0 ;
-  uint64_t arg1 ;
-  BitwuzlaSort *arg2 ;
-  BitwuzlaSort arg3 ;
-  jlong *jarr2 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (uint64_t)jarg1; 
-  if (!SWIG_JavaArrayInUlong(jenv, &jarr2, (unsigned long **)&arg2, jarg2)) return 0; 
-  arg3 = (BitwuzlaSort)jarg3; 
-  result = (BitwuzlaSort)bitwuzla_mk_fun_sort(arg1,arg2,arg3);
-  jresult = (jlong)result; 
-  SWIG_JavaArrayArgoutUlong(jenv, jarr2, (unsigned long *)arg2, jarg2); 
-  free(arg2); 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1rm_1sort(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (BitwuzlaSort)bitwuzla_mk_rm_sort();
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1uninterpreted_1sort(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  jlong jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  BitwuzlaSort result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) return 0;
-  }
-  result = (BitwuzlaSort)bitwuzla_mk_uninterpreted_sort((char const *)arg1);
-  jresult = (jlong)result; 
-  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1true(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (BitwuzlaTerm)bitwuzla_mk_true();
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1false(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  result = (BitwuzlaTerm)bitwuzla_mk_false();
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1bv_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_bv_zero(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1bv_1one(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_bv_one(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1bv_1ones(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_bv_ones(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1bv_1min_1signed(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_bv_min_signed(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1bv_1max_1signed(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_bv_max_signed(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1fp_1pos_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_fp_pos_zero(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1fp_1neg_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_fp_neg_zero(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1fp_1pos_1inf(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_fp_pos_inf(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1fp_1neg_1inf(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_fp_neg_inf(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1fp_1nan(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_fp_nan(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1bv_1value(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2, jint jarg3) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  char *arg2 = (char *) 0 ;
-  uint8_t arg3 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  arg3 = (uint8_t)jarg3; 
-  result = (BitwuzlaTerm)bitwuzla_mk_bv_value(arg1,(char const *)arg2,arg3);
-  jresult = (jlong)result; 
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1bv_1value_1uint64(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  uint64_t arg2 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = (uint64_t)jarg2; 
-  result = (BitwuzlaTerm)bitwuzla_mk_bv_value_uint64(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1bv_1value_1int64(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  int64_t arg2 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = (int64_t)jarg2; 
-  result = (BitwuzlaTerm)bitwuzla_mk_bv_value_int64(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1fp_1value(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  BitwuzlaTerm arg2 ;
-  BitwuzlaTerm arg3 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  arg3 = (BitwuzlaTerm)jarg3; 
-  result = (BitwuzlaTerm)bitwuzla_mk_fp_value(arg1,arg2,arg3);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1fp_1from_1real(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm arg2 ;
-  char *arg3 = (char *) 0 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  arg3 = 0;
-  if (jarg3) {
-    arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);
-    if (!arg3) return 0;
-  }
-  result = (BitwuzlaTerm)bitwuzla_mk_fp_from_real(arg1,arg2,(char const *)arg3);
-  jresult = (jlong)result; 
-  if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1fp_1from_1rational(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3, jstring jarg4) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  arg3 = 0;
-  if (jarg3) {
-    arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);
-    if (!arg3) return 0;
-  }
-  arg4 = 0;
-  if (jarg4) {
-    arg4 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg4, 0);
-    if (!arg4) return 0;
-  }
-  result = (BitwuzlaTerm)bitwuzla_mk_fp_from_rational(arg1,arg2,(char const *)arg3,(char const *)arg4);
-  jresult = (jlong)result; 
-  if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);
-  if (arg4) (*jenv)->ReleaseStringUTFChars(jenv, jarg4, (const char *)arg4);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1rm_1value(JNIEnv *jenv, jclass jcls, jint jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaRoundingMode arg1 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaRoundingMode)jarg1; 
-  result = (BitwuzlaTerm)bitwuzla_mk_rm_value(arg1);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1term1(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaKind arg1 ;
-  BitwuzlaTerm arg2 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaKind)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  result = (BitwuzlaTerm)bitwuzla_mk_term1(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1term2(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jlong jarg3) {
-  jlong jresult = 0 ;
-  BitwuzlaKind arg1 ;
-  BitwuzlaTerm arg2 ;
-  BitwuzlaTerm arg3 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaKind)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  arg3 = (BitwuzlaTerm)jarg3; 
-  result = (BitwuzlaTerm)bitwuzla_mk_term2(arg1,arg2,arg3);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1term3(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jlong jarg3, jlong jarg4) {
-  jlong jresult = 0 ;
-  BitwuzlaKind arg1 ;
-  BitwuzlaTerm arg2 ;
-  BitwuzlaTerm arg3 ;
-  BitwuzlaTerm arg4 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaKind)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  arg3 = (BitwuzlaTerm)jarg3; 
-  arg4 = (BitwuzlaTerm)jarg4; 
-  result = (BitwuzlaTerm)bitwuzla_mk_term3(arg1,arg2,arg3,arg4);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1term(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jlongArray jarg3) {
-  jlong jresult = 0 ;
-  BitwuzlaKind arg1 ;
-  uint32_t arg2 ;
-  BitwuzlaTerm *arg3 ;
-  jlong *jarr3 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaKind)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (!SWIG_JavaArrayInUlong(jenv, &jarr3, (unsigned long **)&arg3, jarg3)) return 0; 
-  result = (BitwuzlaTerm)bitwuzla_mk_term(arg1,arg2,arg3);
-  jresult = (jlong)result; 
-  SWIG_JavaArrayArgoutUlong(jenv, jarr3, (unsigned long *)arg3, jarg3); 
-  free(arg3); 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1term1_1indexed1(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jlong jarg3) {
-  jlong jresult = 0 ;
-  BitwuzlaKind arg1 ;
-  BitwuzlaTerm arg2 ;
-  uint64_t arg3 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaKind)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  arg3 = (uint64_t)jarg3; 
-  result = (BitwuzlaTerm)bitwuzla_mk_term1_indexed1(arg1,arg2,arg3);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1term1_1indexed2(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jlong jarg3, jlong jarg4) {
-  jlong jresult = 0 ;
-  BitwuzlaKind arg1 ;
-  BitwuzlaTerm arg2 ;
-  uint64_t arg3 ;
-  uint64_t arg4 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaKind)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  arg3 = (uint64_t)jarg3; 
-  arg4 = (uint64_t)jarg4; 
-  result = (BitwuzlaTerm)bitwuzla_mk_term1_indexed2(arg1,arg2,arg3,arg4);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1term2_1indexed1(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jlong jarg3, jlong jarg4) {
-  jlong jresult = 0 ;
-  BitwuzlaKind arg1 ;
-  BitwuzlaTerm arg2 ;
-  BitwuzlaTerm arg3 ;
-  uint64_t arg4 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaKind)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  arg3 = (BitwuzlaTerm)jarg3; 
-  arg4 = (uint64_t)jarg4; 
-  result = (BitwuzlaTerm)bitwuzla_mk_term2_indexed1(arg1,arg2,arg3,arg4);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1term2_1indexed2(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jlong jarg3, jlong jarg4, jlong jarg5) {
-  jlong jresult = 0 ;
-  BitwuzlaKind arg1 ;
-  BitwuzlaTerm arg2 ;
-  BitwuzlaTerm arg3 ;
-  uint64_t arg4 ;
-  uint64_t arg5 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaKind)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  arg3 = (BitwuzlaTerm)jarg3; 
-  arg4 = (uint64_t)jarg4; 
-  arg5 = (uint64_t)jarg5; 
-  result = (BitwuzlaTerm)bitwuzla_mk_term2_indexed2(arg1,arg2,arg3,arg4,arg5);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1term_1indexed(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jlongArray jarg3, jlong jarg4, jlongArray jarg5) {
-  jlong jresult = 0 ;
-  BitwuzlaKind arg1 ;
-  uint32_t arg2 ;
-  BitwuzlaTerm *arg3 ;
-  uint32_t arg4 ;
-  uint64_t *arg5 ;
-  jlong *jarr3 ;
-  jlong *jarr5 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaKind)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (!SWIG_JavaArrayInUlong(jenv, &jarr3, (unsigned long **)&arg3, jarg3)) return 0; 
-  arg4 = (uint32_t)jarg4; 
-  if (!SWIG_JavaArrayInUlong(jenv, &jarr5, (unsigned long **)&arg5, jarg5)) return 0; 
-  result = (BitwuzlaTerm)bitwuzla_mk_term_indexed(arg1,arg2,arg3,arg4,(unsigned long const (*))arg5);
-  jresult = (jlong)result; 
-  SWIG_JavaArrayArgoutUlong(jenv, jarr3, (unsigned long *)arg3, jarg3); 
-  SWIG_JavaArrayArgoutUlong(jenv, jarr5, (unsigned long *)arg5, jarg5); 
-  free(arg3); 
-  free(arg5); 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1const(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  char *arg2 = (char *) 0 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (BitwuzlaTerm)bitwuzla_mk_const(arg1,(char const *)arg2);
-  jresult = (jlong)result; 
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1const_1array(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  BitwuzlaTerm arg2 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = (BitwuzlaTerm)jarg2; 
-  result = (BitwuzlaTerm)bitwuzla_mk_const_array(arg1,arg2);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1mk_1var(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {
-  jlong jresult = 0 ;
-  BitwuzlaSort arg1 ;
-  char *arg2 = (char *) 0 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaSort)jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  result = (BitwuzlaTerm)bitwuzla_mk_var(arg1,(char const *)arg2);
-  jresult = (jlong)result; 
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1substitute_1term(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlongArray jarg3, jlongArray jarg4) {
-  jlong jresult = 0 ;
-  BitwuzlaTerm arg1 ;
-  size_t arg2 ;
-  BitwuzlaTerm *arg3 ;
-  BitwuzlaTerm *arg4 ;
-  jlong *jarr3 ;
-  jlong *jarr4 ;
-  BitwuzlaTerm result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (BitwuzlaTerm)jarg1; 
-  arg2 = (size_t)jarg2; 
-  if (!SWIG_JavaArrayInUlong(jenv, &jarr3, (unsigned long **)&arg3, jarg3)) return 0; 
-  if (!SWIG_JavaArrayInUlong(jenv, &jarr4, (unsigned long **)&arg4, jarg4)) return 0; 
-  result = (BitwuzlaTerm)bitwuzla_substitute_term(arg1,arg2,arg3,arg4);
-  jresult = (jlong)result; 
-  SWIG_JavaArrayArgoutUlong(jenv, jarr3, (unsigned long *)arg3, jarg3); 
-  SWIG_JavaArrayArgoutUlong(jenv, jarr4, (unsigned long *)arg4, jarg4); 
-  free(arg3); 
-  free(arg4); 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1substitute_1terms(JNIEnv *jenv, jclass jcls, jlong jarg1, jlongArray jarg2, jlong jarg3, jlongArray jarg4, jlongArray jarg5) {
-  size_t arg1 ;
-  BitwuzlaTerm *arg2 ;
-  size_t arg3 ;
-  BitwuzlaTerm *arg4 ;
-  BitwuzlaTerm *arg5 ;
-  jlong *jarr2 ;
-  jlong *jarr4 ;
-  jlong *jarr5 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = (size_t)jarg1; 
-  if (!SWIG_JavaArrayInUlong(jenv, &jarr2, (unsigned long **)&arg2, jarg2)) return ; 
-  arg3 = (size_t)jarg3; 
-  if (!SWIG_JavaArrayInUlong(jenv, &jarr4, (unsigned long **)&arg4, jarg4)) return ; 
-  if (!SWIG_JavaArrayInUlong(jenv, &jarr5, (unsigned long **)&arg5, jarg5)) return ; 
-  bitwuzla_substitute_terms(arg1,arg2,arg3,arg4,arg5);
-  SWIG_JavaArrayArgoutUlong(jenv, jarr2, (unsigned long *)arg2, jarg2); 
-  SWIG_JavaArrayArgoutUlong(jenv, jarr4, (unsigned long *)arg4, jarg4); 
-  SWIG_JavaArrayArgoutUlong(jenv, jarr5, (unsigned long *)arg5, jarg5); 
-  free(arg2); 
-  free(arg4); 
-  free(arg5); 
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1parser_1new(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2, jlong jarg3, jobject jarg3_, jstring jarg4, jint jarg5, jstring jarg6) {
-  jlong jresult = 0 ;
-  BitwuzlaOptions *arg1 = (BitwuzlaOptions *) 0 ;
-  char *arg2 = (char *) 0 ;
-  FILE *arg3 = (FILE *) 0 ;
-  char *arg4 = (char *) 0 ;
-  uint8_t arg5 ;
-  char *arg6 = (char *) 0 ;
-  BitwuzlaParser *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg3_;
-  arg1 = *(BitwuzlaOptions **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
-    if (!arg2) return 0;
-  }
-  arg3 = *(FILE **)&jarg3; 
-  arg4 = 0;
-  if (jarg4) {
-    arg4 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg4, 0);
-    if (!arg4) return 0;
-  }
-  arg5 = (uint8_t)jarg5; 
-  arg6 = 0;
-  if (jarg6) {
-    arg6 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg6, 0);
-    if (!arg6) return 0;
-  }
-  result = (BitwuzlaParser *)bitwuzla_parser_new(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,(char const *)arg6);
-  *(BitwuzlaParser **)&jresult = result; 
-  if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);
-  if (arg4) (*jenv)->ReleaseStringUTFChars(jenv, jarg4, (const char *)arg4);
-  if (arg6) (*jenv)->ReleaseStringUTFChars(jenv, jarg6, (const char *)arg6);
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1parser_1delete(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  BitwuzlaParser *arg1 = (BitwuzlaParser *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaParser **)&jarg1; 
-  bitwuzla_parser_delete(arg1);
-}
-
-
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1parser_1parse(JNIEnv *jenv, jclass jcls, jlong jarg1, jboolean jarg2) {
-  jstring jresult = 0 ;
-  BitwuzlaParser *arg1 = (BitwuzlaParser *) 0 ;
-  _Bool arg2 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaParser **)&jarg1; 
-  {
-    arg2 = (jarg2 ? true : false);
-  }
-  result = (char *)bitwuzla_parser_parse(arg1,arg2);
-  if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_bitwuzla_1parser_1get_1bitwuzla(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jlong jresult = 0 ;
-  BitwuzlaParser *arg1 = (BitwuzlaParser *) 0 ;
-  Bitwuzla *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(BitwuzlaParser **)&jarg1; 
-  result = (Bitwuzla *)bitwuzla_parser_get_bitwuzla(arg1);
-  *(Bitwuzla **)&jresult = result; 
-  return jresult;
-}
-
-//Used for checking JavaSMT TerminationCallback boolean to determine if Bitwuzla should temrinate
-static int32_t java_termination_callback(void *user_data) {
-    struct callback_info *helper = (struct callback_info *) user_data;
-    JNIEnv *jenv = helper->jenv;
-
-    if (helper->obj == NULL) {
-        SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Illegal termination callback object");
-        return 1;
-    }
-
-    jboolean result = (*jenv)->CallBooleanMethod(jenv, helper->obj, helper->callback_method);
-
-    if ((*jenv)->ExceptionCheck(jenv)) {
-        return 1;    //This is for safety reasons here as one could use shutdownIfNecessary() as callback method in theory (not advised)
-    }
-
-    return (int32_t)(result != JNI_FALSE);
-}
-
-//Takes String and appends it to valid path for temporary files
-//Make sure that filename is compliant with the used temp file method
-//Returns NULL in case of NULL filename (so make sure you dont enter NULL!)
-char *addTemppathToFilename(char *filename) {
-
-  if (!filename) {
-    return NULL;
-  }
-
-  char *dir = getenv("TMPDIR");
-  if (dir == NULL || strlen(dir) == 0) {
-    dir = "/tmp/";
-  }
-
-  int dirLength = (int)strlen(dir);
-  int filenameLength = (int)strlen(filename);
-  int completeNameLength = dirLength + filenameLength + 2;  //+2 because we may need 1 additional for '/'
-  char *tempfileName = (char *)malloc(completeNameLength);
-  if (!tempfileName) {
-    return NULL;
-  }
-  strcpy(tempfileName, dir);
-  if (dir[dirLength - 1] != '/') {
-    strcat(tempfileName, "/");
-  }
-  strcat(tempfileName, filename);
-
-  return tempfileName;
-}
-
-/** Open a temporary file for reading and writing and return the file-pointer.
- * The file will be cleaned up when closed.
- * On error, we report an Exception to JNIEnv and return NULL. */
-FILE* openTempFile(JNIEnv *jenv) {
-  char *tempfileName = addTemppathToFilename("bitwuzla_temp_XXXXXX");
-  if (tempfileName == NULL) {
-    perror("ERROR CREATING TEMPORARY FILE FOR BITWUZLA");
-    SWIG_JavaThrowException(jenv, SWIG_JavaIOException, "FileName may not be NULL");
-    return NULL;
-  }
-  int fileDesrc = mkstemp(tempfileName);
-  if (fileDesrc == -1) {
-    free(tempfileName);
-    perror("ERROR CREATING TEMPORARY FILE FOR BITWUZLA");
-    SWIG_JavaThrowException(jenv, SWIG_JavaIOException, "FileDescriptor may not be NULL");
-    return NULL;
-  }
-  FILE *file = fdopen(fileDesrc, "w+");
-  unlink(tempfileName);
-  free(tempfileName);
-  if (file == NULL) {
-    perror("ERROR: COULDNT DUMP NODE BECAUSE IT COULDNT CREATE A DUMP FILE");
-    SWIG_JavaThrowException(jenv, SWIG_JavaIOException, "File may not be NULL");
-    return NULL;
-  }
-  return file;
-}
-
-SWIGEXPORT jlongArray JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_parse(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-
-  if (jarg1) {
-    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
-    if (!arg1) {
-      printf("Failure transforming a Java String to a C String.");
-      return 0;
-    }
-  }
-
-  BitwuzlaOptions* options = bitwuzla_options_new();
-  bitwuzla_set_option(options, BITWUZLA_OPT_PRODUCE_UNSAT_CORES, 1);
-  bitwuzla_set_option(options, BITWUZLA_OPT_REWRITE_LEVEL, 0);
-  bitwuzla_set_option(options, BITWUZLA_OPT_PRODUCE_MODELS, 2);
-
-  // Bitwuzla forces us to do this as it does not accept any other flag besides r and r+
-  const char * filename = "notATmpFile.smt2";
-  FILE* file = fopen(filename, "w+");
-
-  if (file == 0) {
-    printf("Failure creating a file for parsing.");
-    bitwuzla_options_delete(options);
-    fclose(file);
-    remove(filename);
-    return 0;
-  }
-
-  fputs(arg1, file);
-  fclose(file);
-  file = fopen(filename, "r");
-
-  if (file == 0) {
-    printf("Failure creating a file for parsing.");
-    bitwuzla_options_delete(options);
-    fclose(file);
-    remove(filename);
-    return 0;
-  }
-  /*
-  FILE *file = openTempFile(jenv);
-  if (!file) {
-    return 0;
-  }
-
-  assert(file != 0);
-
-  fputs(arg1, file);
-
-  // Bitwuzla wants the file pointer and the name
-  int MAXSIZE = 0xFFFF;
-  char proclnk[0xFFFF];
-  char filename[0xFFFF];
-  int fno;
-  ssize_t r;
-  fno = fileno(file);
-  sprintf(proclnk, "/proc/self/fd/%d", fno);
-  r = readlink(proclnk, filename, MAXSIZE);
-  if (r < 0) {
-    printf("Failed to find filename when parsing: failed to readlink\n");
-    return 0;
-  }
-  filename[r] = '\0';
-  */
-
-
-  BitwuzlaParser* parser = bitwuzla_parser_new(
-      options, filename, file, "smt2", 10, "<stdout>");
-
-  // Now parse the input file. true == parse only, no SAT check.
-  const char* err_msg = bitwuzla_parser_parse(parser, true);
-
-  // We expect no error to occur.
-  if (err_msg != 0) {
-    printf("Failure in parsing: parser did not parse with bitwuzla_parser_parse() with error: %s.", err_msg);
-    bitwuzla_parser_delete(parser);
-    bitwuzla_options_delete(options);
-    fclose(file);
-    remove(filename);
-    return 0;
-  }
-
-  // Now we retrieve the set of asserted formulas and print them.
-  size_t size;
-  BitwuzlaTerm* assertions =
-      bitwuzla_get_assertions(bitwuzla_parser_get_bitwuzla(parser), &size);
-
-  if (size < 1 || assertions == 0) {
-    printf("Failure in parsing: no term returned.");
-    bitwuzla_parser_delete(parser);
-    bitwuzla_options_delete(options);
-    fclose(file);
-    remove(filename);
-    return 0;
-
-  }
-
-  // cleanup
-  bitwuzla_parser_delete(parser);
-  bitwuzla_options_delete(options);
-
-  fclose(file);
-  remove(filename);
-
-  // Make jlongarray
-  jlongArray ret = (jobjectArray)(*jenv)->NewLongArray(jenv, size);
-  if (ret == 0) {
-    return NULL;
-  }
-  // tmp array with correct type
-  long long int tmp[size];
-  for (int i = 0; i < size; i++) {
-    tmp[i] = (long long int) assertions[i];
-  }
-  // copy to jlongarray
-  (*jenv)->SetLongArrayRegion(jenv, ret, 0, size, tmp);
-  
-  return ret;
-}
-
-/** Read all content from the given file pointer and store it in a Java String.
- * We assume the file pointer to be open and do not close it.
- * On error, we report an exception to JNIEnv and return NULL. */
-jstring copyFileContentToString(JNIEnv *jenv, FILE *file) {
-
-  // flush any buffered data.
-  if (fflush(file) != 0) {
-    perror("ERROR: COULDNT FLUSH DUMP FILE");
-    SWIG_JavaThrowException(jenv, SWIG_JavaIOException, "File could not be flushed");
-    return NULL;
-  }
-
-  // get file size
-  if (fseek(file, 0, SEEK_SET) != 0) {
-    perror("ERROR SEEKING FILE BEGINNING");
-    SWIG_JavaThrowException(jenv, SWIG_JavaIOException, "Could not determine the beginning of the used file");
-    return NULL;
-  }
-  if (fseek(file, 0, SEEK_END) != 0) {
-    perror("ERROR SEEKING FILE LENGTH");
-    SWIG_JavaThrowException(jenv, SWIG_JavaIOException, "Could not determine the end of the used file");
-    return NULL;
-  }
-  long fileLength = ftell(file);
-  if (fseek(file, 0, SEEK_SET) != 0) {
-    perror("ERROR SEEKING FILE BEGINNING");
-    SWIG_JavaThrowException(jenv, SWIG_JavaIOException, "Could not determine the beginning of the used file");
-    return NULL;
-  }
-  if (fileLength <= 0) {
-    perror("ERROR READING FILE LENGTH");
-    SWIG_JavaThrowException(jenv, SWIG_JavaIOException, "File length may not be NULL");
-    return NULL;
-  }
-
-  // get file content
-  char *buffer = (char *)malloc((fileLength + 1) * sizeof(char));
-  if (!buffer) {
-    perror("ERROR READING FILE INTO BUFFER");
-    SWIG_JavaThrowException(jenv, SWIG_JavaIOException, "Buffer may not be NULL");
-    return NULL;
-  }
-  size_t readLength = fread(buffer, 1, fileLength, file);
-  if ((unsigned long)fileLength != readLength) {
-    free(buffer);
-    perror("ERROR READING FILE INTO BUFFER");
-    SWIG_JavaThrowException(jenv, SWIG_JavaIOException, "Could not read the whole length of the file into the buffer");
-    return 0;
-  }
-  buffer[fileLength] = '\0';
-  jstring jresult = (*jenv)->NewStringUTF(jenv, (const char *)buffer);
-  free(buffer);
-
-  return jresult;
-}
-
-// dump_formula_smt2(long termToPrint, int baseRepresentation)
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_dump_1formula_1smt2(JNIEnv *jenv, jclass jcls, jlong jterm, jint jbase) {
-  BitwuzlaTerm term = (BitwuzlaTerm) jterm;
-  uint8_t base = (uint8_t)jbase;
-  
-  (void)jenv;
-  (void)jcls;
-
-  FILE *file = openTempFile(jenv);
-  if (!file) {
-    return NULL;
-  }
-
-  bitwuzla_term_print_fmt(term, file, base);
-
-  // read
-  jstring jresult = copyFileContentToString(jenv, file);
-
-  // cleanup
-  fclose(file);
-
-  return jresult;
-}
-
-// dump_assertions_smt2(long bitwuzlaEnv, int baseRepresentation)
-SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_dump_1assertions_1smt2(JNIEnv *jenv, jclass jcls, jlong env, jint base) {
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-  uint8_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Bitwuzla **)&env; 
-  
-  arg2 = (uint8_t)base; 
-
-
-  FILE *file = openTempFile(jenv);
-  if (!file) {
-    return NULL;
-  }
-
-  bitwuzla_print_formula(arg1, "smt2" , file, arg2);
-
-  // read
-  jstring jresult = copyFileContentToString(jenv, file);
-
-  // cleanup
-  fclose(file);
-
-  return jresult;
-}
-
-SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_set_1termination(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
-  Bitwuzla *arg1 = (Bitwuzla *) 0 ;
-
-  (void)jenv;
-  (void)jcls;
-
-  arg1 = *(Bitwuzla **)&jarg1; 
-
-  jclass cls = (*jenv)->FindClass(jenv, "org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaJNI$TerminationCallback");
-  if (cls == NULL) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Class for Bitwuzlas set_termination() may not be NULL");
-    return 0;
-  }
-
-  jmethodID methodID = (*jenv)->GetMethodID(jenv, cls, "shouldTerminate", "()Z");
-  if (methodID == NULL) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "MethodID in Bitwuzlas set_termination() may not be NULL");
-    return 0;
-  }
-
-  if (jarg2 == NULL) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "TerminationCallback of Bitwuzlas set_termination() may not be NULL");
-    return 0;
-  }
-
-  struct callback_info *helper = malloc(sizeof(struct callback_info));
-  helper->jenv = jenv;
-  helper->callback_method = methodID;
-  helper->obj = (*jenv)->NewGlobalRef(jenv, jarg2);
-
-  bitwuzla_set_termination_callback(arg1, &java_termination_callback, helper);
-
-  //Returns address to helper to be freed after termination has been called. See method boolector_free_termination
-  return (jlong)helper;
-}
-
-
-// Call this with the return value of the method boolector_set_termination to free ressources
-SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_BitwuzlaJNI_free_1termination(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  (void)jcls;
-
-  struct callback_info *helper = (struct callback_info *)(long)jarg1;
-  if (helper == NULL) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "TerminationCallback of Bitwuzlas free_termination() may not be NULL");
-    return;
-  }
-
-  (*jenv)->DeleteGlobalRef(jenv, helper->obj);
-  helper->obj = NULL;
-  free(helper);
-}
-
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/lib/native/source/libbitwuzla/compile.sh b/lib/native/source/libbitwuzla/compile.sh
deleted file mode 100755
index a2deb63490..0000000000
--- a/lib/native/source/libbitwuzla/compile.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env bash
-
-# This file is part of JavaSMT,
-# an API wrapper for a collection of SMT solvers:
-# https://github.com/sosy-lab/java-smt
-#
-# SPDX-FileCopyrightText: 2020 Dirk Beyer <https://www.sosy-lab.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# #########################################
-#
-# INFO:
-# This script is automatically called from ant when publishing MathSAT5 or OptiMathSAT.
-# There is no need to call this scripts manually, except for developing and debugging.
-#
-# #########################################
-
-# This script builds the bitwuzla JNI shared library
-
-# For building libbitwuzlaJNI.so, there are several dependencies located all in the bitwuzla folder:
-# - Bitwuzla can be found here: https://github.com/bitwuzla/bitwuzla/tree/main
-# (Bitwuzla itself needs the GMP library >= 6.1)
-
-# To build Bitwuzla bindings, first you need to compile bitwuzla as shared libary
-# then use this script: ./compile.sh $BITWUZLA_DIR
-
-
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
-  [[ ${SOURCE} != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-cd ${DIR}
-
-JNI_HEADERS="$(../get_jni_headers.sh)"
-
-BWZL_SRC_DIR="$1"/src
-BWZL_LIB_DIR="$1"/lib
-BWZL_BUILD_SRC_DIR="$1"/build/src
-BWZL_BUILD_LIB_DIR="$1"/build/src/lib
-BWZL_INCLUDE_DIR="$1"/include
-BWZL_INCLUDE_C_DIR="$1"/include/bitwuzla/c
-
-SRC_FILE="bitwuzla_wrap.c"
-OUT_FILE="libbitwuzlaJNI.so"
-
-echo "$1"
-echo "$BWZL_SRC_DIR"
-
-# check requirements
-if [ ! -f "$BWZL_BUILD_SRC_DIR/libbitwuzla.so.0" ]; then
-    echo "You need to specify the directory with the compiled Bitwuzla shared libaries on the command line!"
-    exit 1
-fi
-
-echo "Compiling the C wrapper code and creating the \"$OUT_FILE\" library..."
-
-# This will compile the JNI wrapper part, given the JNI and the Bitwuzla header/dependency files
-gcc $JNI_HEADERS -I$BWZL_SRC_DIR -I$BWZL_LIB_DIR -I$BWZL_BUILD_SRC_DIR -I$BWZL_BUILD_LIB_DIR -I$BWZL_INCLUDE_DIR -I$BWZL_INCLUDE_C_DIR $SRC_FILE -fPIC -Wall -pedantic -c
-
-# Link
-gcc -shared bitwuzla_wrap.o -L$BWZL_BUILD_SRC_DIR -lbitwuzla -Wl,-rpath,$BWZL_BUILD_SRC_DIR -o libbitwuzlaJNI.so
-
-# TODO: improve compiliation process (strict mode), strip lib, check if we can compile static libs and include them
-
-echo "Compilation Done"
-echo "All Done"
-echo "Please check the following dependencies that will be required at runtime by libbitwuzlaJNI.so:"
-LANG=C objdump -p ${OUT_FILE} | grep -A50 "required from"
diff --git a/solvers_ivy_conf/ivy_bitwuzla.xml b/solvers_ivy_conf/ivy_bitwuzla.xml
index 8dbf1d3bb3..136d127ba5 100644
--- a/solvers_ivy_conf/ivy_bitwuzla.xml
+++ b/solvers_ivy_conf/ivy_bitwuzla.xml
@@ -11,9 +11,8 @@ SPDX-License-Identifier: Apache-2.0
 -->
 
 <ivy-module version="2.0"
-    xmlns:e="http://ant.apache.org/ivy/extra"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
     <info organisation="org.sosy_lab" module="javasmt-solver-bitwuzla">
       <license name="MIT License" url="https://github.com/bitwuzla/bitwuzla/blob/main/COPYING"/>
         <description>
@@ -23,16 +22,31 @@ SPDX-License-Identifier: Apache-2.0
     </info>
 
     <configurations>
+        <!-- TODO: Add windows support -->
         <conf name="solver-bitwuzla" />
+        <conf name="solver-bitwuzla" extends="solver-bitwuzla-linux"/>
+        <conf name="solver-bitwuzla-linux" extends="solver-bitwuzla-common"/>
+        <conf name="solver-bitwuzla-common" visibility="private"/>
+        <!--
+        <conf name="sources"/>
+        <conf name="javadoc"/>
+        -->
     </configurations>
 
     <publications defaultconf="solver-bitwuzla">
-        <artifact name="libbitwuzla"    conf="solver-bitwuzla" type="shared-object" ext="so"/>
+        <!-- Linux native libraries -->
         <artifact name="libbitwuzlaJNI" conf="solver-bitwuzla" type="shared-object" ext="so"/>
+        <artifact name="libbitwuzla" conf="solver-bitwuzla" type="shared-object" ext="so"/>
+        <artifact name="libgmp" conf="solver-bitwuzla" type="shared-object" ext="so"/>
         <artifact name="libbitwuzlabb"  conf="solver-bitwuzla" type="shared-object" ext="so"/>
         <artifact name="libbitwuzlabv"  conf="solver-bitwuzla" type="shared-object" ext="so"/>
         <artifact name="libbitwuzlals"  conf="solver-bitwuzla" type="shared-object" ext="so"/>
-        <artifact name="libgmp"         conf="solver-bitwuzla" type="shared-object" ext="so"/>
+        <!-- Java code, docs and source -->
+        <artifact name="bitwuzla" conf="solver-bitwuzla-common" ext="jar"/>
+        <!--
+        <artifact name="bitwuzla" conf="sources" e:classifier="sources" type="source" ext="jar"/>
+        <artifact name="bitwuzla" conf="javadoc" e:classifier="javadoc" type="javadoc" ext="jar"/>^
+        -->
     </publications>
 
     <dependencies></dependencies>
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
index 4e853ba93f..24f6c41094 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
@@ -8,45 +8,45 @@
 
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_EQUAL;
-
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.api.FormulaType;
 import org.sosy_lab.java_smt.api.FormulaType.ArrayFormulaType;
 import org.sosy_lab.java_smt.basicimpl.AbstractArrayFormulaManager;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
 
 public class BitwuzlaArrayFormulaManager
-    extends AbstractArrayFormulaManager<Long, Long, Long, BitwuzlaDeclaration> {
+    extends AbstractArrayFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
 
   protected BitwuzlaArrayFormulaManager(BitwuzlaFormulaCreator pCreator) {
     super(pCreator);
   }
 
   @Override
-  protected Long select(Long pArray, Long pIndex) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_ARRAY_SELECT.swigValue(), pArray, pIndex);
+  protected Term select(Term pArray, Term pIndex) {
+    return Bitwuzla.mk_term(Kind.ARRAY_SELECT, pArray, pIndex);
   }
 
   @Override
-  protected Long store(Long pArray, Long pIndex, Long pValue) {
-    return BitwuzlaJNI.bitwuzla_mk_term3(
-        BitwuzlaKind.BITWUZLA_KIND_ARRAY_STORE.swigValue(), pArray, pIndex, pValue);
+  protected Term store(Term pArray, Term pIndex, Term pValue) {
+    return Bitwuzla.mk_term(Kind.ARRAY_STORE, pArray, pIndex, pValue);
   }
 
   @Override
   @SuppressWarnings("MethodTypeParameterName")
-  protected <TI extends Formula, TE extends Formula> Long internalMakeArray(
+  protected <TI extends Formula, TE extends Formula> Term internalMakeArray(
       String pName, FormulaType<TI> pIndexType, FormulaType<TE> pElementType) {
     final ArrayFormulaType<TI, TE> arrayFormulaType =
         FormulaType.getArrayType(pIndexType, pElementType);
-    final long bitwuzlaArrayType = toSolverType(arrayFormulaType);
-    long newVar = getFormulaCreator().makeVariable(bitwuzlaArrayType, pName);
+    final Sort bitwuzlaArrayType = toSolverType(arrayFormulaType);
+    Term newVar = getFormulaCreator().makeVariable(bitwuzlaArrayType, pName);
     return newVar;
   }
 
   @Override
-  protected Long equivalence(Long pArray1, Long pArray2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_EQUAL.swigValue(), pArray1, pArray2);
+  protected Term equivalence(Term pArray1, Term pArray2) {
+    return Bitwuzla.mk_term(Kind.EQUAL, pArray1, pArray2);
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
index a1a0b971fe..8567f3fa9d 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
@@ -12,194 +12,172 @@
 import org.sosy_lab.java_smt.basicimpl.AbstractBitvectorFormulaManager;
 import org.sosy_lab.java_smt.basicimpl.AbstractBooleanFormulaManager;
 import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
 
 public class BitwuzlaBitvectorFormulaManager
-    extends AbstractBitvectorFormulaManager<Long, Long, Long, BitwuzlaDeclaration> {
+    extends AbstractBitvectorFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
 
   protected BitwuzlaBitvectorFormulaManager(
-      FormulaCreator<Long, Long, Long, BitwuzlaDeclaration> pCreator,
-      AbstractBooleanFormulaManager<Long, Long, Long, BitwuzlaDeclaration> pBmgr) {
+      FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator,
+      AbstractBooleanFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> pBmgr) {
     super(pCreator, pBmgr);
   }
 
   @Override
-  protected Long makeBitvectorImpl(int length, Long pParam1) {
+  protected Term makeBitvectorImpl(int length, Term pParam1) {
     throw new UnsupportedOperationException("Bitwuzla does not support INT theory");
   }
 
   @Override
-  protected Long makeBitvectorImpl(int length, BigInteger pI) {
+  protected Term makeBitvectorImpl(int length, BigInteger pI) {
     pI = transformValueToRange(length, pI);
-    long sort = BitwuzlaJNI.bitwuzla_mk_bv_sort(length);
-    return BitwuzlaJNI.bitwuzla_mk_bv_value(sort, pI.toString(), 10);
+    Sort sort = Bitwuzla.mk_bv_sort(length);
+    return Bitwuzla.mk_bv_value(sort, pI.toString(), 10);
   }
 
   @Override
-  protected Long toIntegerFormulaImpl(Long pI, boolean signed) {
+  protected Term toIntegerFormulaImpl(Term pI, boolean signed) {
     throw new UnsupportedOperationException("BV to INT conversion is not supported.");
   }
 
   @Override
-  protected Long negate(Long pParam1) {
-    return BitwuzlaJNI.bitwuzla_mk_term1(BitwuzlaKind.BITWUZLA_KIND_BV_NOT.swigValue(), pParam1);
+  protected Term negate(Term pParam1) {
+    return Bitwuzla.mk_term(Kind.BV_NOT, pParam1);
   }
 
   @Override
-  protected Long add(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_BV_ADD.swigValue(), pParam1, pParam2);
+  protected Term add(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.BV_ADD, pParam1, pParam2);
   }
 
   @Override
-  protected Long subtract(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_BV_SUB.swigValue(), pParam1, pParam2);
+  protected Term subtract(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.BV_SUB, pParam1, pParam2);
   }
 
   @Override
-  protected Long divide(Long pParam1, Long pParam2, boolean signed) {
+  protected Term divide(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_SDIV.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_SDIV, pParam1, pParam2);
     } else {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_UDIV.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_UDIV, pParam1, pParam2);
     }
   }
 
   @Override
-  protected Long modulo(Long pParam1, Long pParam2, boolean signed) {
+  protected Term modulo(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_SREM.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_SREM, pParam1, pParam2);
     } else {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_UREM.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_UREM, pParam1, pParam2);
     }
   }
 
   @Override
-  protected Long multiply(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_BV_MUL.swigValue(), pParam1, pParam2);
+  protected Term multiply(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.BV_MUL, pParam1, pParam2);
   }
 
   @Override
-  protected Long equal(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), pParam1, pParam2);
+  protected Term equal(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.EQUAL, pParam1, pParam2);
   }
 
   @Override
-  protected Long greaterThan(Long pParam1, Long pParam2, boolean signed) {
+  protected Term greaterThan(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_SGT.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_SGT, pParam1, pParam2);
     } else {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_UGT.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_UGT, pParam1, pParam2);
     }
   }
 
   @Override
-  protected Long greaterOrEquals(Long pParam1, Long pParam2, boolean signed) {
+  protected Term greaterOrEquals(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_SGE.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_SGE, pParam1, pParam2);
     } else {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_UGE.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_UGE, pParam1, pParam2);
     }
   }
 
   @Override
-  protected Long lessThan(Long pParam1, Long pParam2, boolean signed) {
+  protected Term lessThan(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_SLT.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_SLT, pParam1, pParam2);
     } else {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_ULT.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_ULT, pParam1, pParam2);
     }
   }
 
   @Override
-  protected Long lessOrEquals(Long pParam1, Long pParam2, boolean signed) {
+  protected Term lessOrEquals(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_SLE.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_SLE, pParam1, pParam2);
     } else {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_ULE.swigValue(), pParam1, pParam2);
+      return Bitwuzla.mk_term(Kind.BV_ULE, pParam1, pParam2);
     }
   }
 
   @Override
-  protected Long not(Long pParam1) {
-    return BitwuzlaJNI.bitwuzla_mk_term1(BitwuzlaKind.BITWUZLA_KIND_BV_NOT.swigValue(), pParam1);
+  protected Term not(Term pParam1) {
+    return Bitwuzla.mk_term(Kind.BV_NOT, pParam1);
   }
 
   @Override
-  protected Long and(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_BV_AND.swigValue(), pParam1, pParam2);
+  protected Term and(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.BV_AND, pParam1, pParam2);
   }
 
   @Override
-  protected Long or(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_BV_OR.swigValue(), pParam1, pParam2);
+  protected Term or(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.BV_OR, pParam1, pParam2);
   }
 
   @Override
-  protected Long xor(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_BV_XOR.swigValue(), pParam1, pParam2);
+  protected Term xor(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.BV_XOR, pParam1, pParam2);
   }
 
   @Override
-  protected Long makeVariableImpl(int pLength, String pVar) {
-    long sort = BitwuzlaJNI.bitwuzla_mk_bv_sort(pLength);
+  protected Term makeVariableImpl(int pLength, String pVar) {
+    Sort sort = Bitwuzla.mk_bv_sort(pLength);
     return getFormulaCreator().makeVariable(sort, pVar);
   }
 
   @Override
-  protected Long shiftRight(Long pNumber, Long toShift, boolean signed) {
+  protected Term shiftRight(Term pNumber, Term toShift, boolean signed) {
     if (signed) {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_ASHR.swigValue(), pNumber, toShift);
+      return Bitwuzla.mk_term(Kind.BV_ASHR, pNumber, toShift);
     } else {
-      return BitwuzlaJNI.bitwuzla_mk_term2(
-          BitwuzlaKind.BITWUZLA_KIND_BV_SHR.swigValue(), pNumber, toShift);
+      return Bitwuzla.mk_term(Kind.BV_SHR, pNumber, toShift);
     }
   }
 
   @Override
-  protected Long shiftLeft(Long pNumber, Long toShift) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_BV_SHL.swigValue(), pNumber, toShift);
+  protected Term shiftLeft(Term pNumber, Term toShift) {
+    return Bitwuzla.mk_term(Kind.BV_SHL, pNumber, toShift);
   }
 
   @Override
-  protected Long concat(Long number, Long pAppend) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_BV_CONCAT.swigValue(), number, pAppend);
+  protected Term concat(Term number, Term pAppend) {
+    return Bitwuzla.mk_term(Kind.BV_CONCAT, number, pAppend);
   }
 
   @Override
-  protected Long extract(Long pNumber, int pMsb, int pLsb) {
-    return BitwuzlaJNI.bitwuzla_mk_term1_indexed2(
-        BitwuzlaKind.BITWUZLA_KIND_BV_EXTRACT.swigValue(), pNumber, pMsb, pLsb);
+  protected Term extract(Term pNumber, int pMsb, int pLsb) {
+    return Bitwuzla.mk_term(Kind.BV_EXTRACT, pNumber, pMsb, pLsb);
   }
 
   @Override
-  protected Long extend(Long pNumber, int pExtensionBits, boolean pSigned) {
+  protected Term extend(Term pNumber, int pExtensionBits, boolean pSigned) {
     if (pSigned) {
-      return BitwuzlaJNI.bitwuzla_mk_term1_indexed1(
-          BitwuzlaKind.BITWUZLA_KIND_BV_SIGN_EXTEND.swigValue(), pNumber, pExtensionBits);
+      return Bitwuzla.mk_term(Kind.BV_SIGN_EXTEND, pNumber, pExtensionBits);
     } else {
-      return BitwuzlaJNI.bitwuzla_mk_term1_indexed1(
-          BitwuzlaKind.BITWUZLA_KIND_BV_ZERO_EXTEND.swigValue(), pNumber, pExtensionBits);
+      return Bitwuzla.mk_term(Kind.BV_ZERO_EXTEND, pNumber, pExtensionBits);
     }
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
index cdaa9c96bd..be34898423 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
@@ -10,50 +10,52 @@
 
 import org.sosy_lab.java_smt.basicimpl.AbstractBooleanFormulaManager;
 import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
 
 public class BitwuzlaBooleanFormulaManager
-    extends AbstractBooleanFormulaManager<Long, Long, Long, BitwuzlaDeclaration> {
+    extends AbstractBooleanFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
   // private final long bitwuzla;
-  private final long pTrue;
-  private final long pFalse;
+  private final Term pTrue;
+  private final Term pFalse;
 
   protected BitwuzlaBooleanFormulaManager(
-      FormulaCreator<Long, Long, Long, BitwuzlaDeclaration> pCreator) {
+      FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator) {
     super(pCreator);
     // bitwuzla = getFormulaCreator().getEnv();
-    pTrue = BitwuzlaJNI.bitwuzla_mk_true();
-    pFalse = BitwuzlaJNI.bitwuzla_mk_false();
+    pTrue = Bitwuzla.mk_true();
+    pFalse = Bitwuzla.mk_false();
   }
 
   @Override
-  protected Long makeVariableImpl(String pVar) {
-    long boolType = getFormulaCreator().getBoolType();
+  protected Term makeVariableImpl(String pVar) {
+    Sort boolType = getFormulaCreator().getBoolType();
     return getFormulaCreator().makeVariable(boolType, pVar);
   }
 
   @Override
-  protected Long makeBooleanImpl(boolean value) {
+  protected Term makeBooleanImpl(boolean value) {
     return value ? pTrue : pFalse;
   }
 
   @Override
-  protected Long not(Long pParam1) {
+  protected Term not(Term pParam1) {
     if (isTrue(pParam1)) {
       return pFalse;
     } else if (isFalse(pParam1)) {
       return pTrue;
     }
 
-    if (BitwuzlaJNI.bitwuzla_term_get_kind(pParam1) == BitwuzlaKind.BITWUZLA_KIND_NOT.swigValue()) {
-      long[] size = new long[1];
-      long[] pChildren = BitwuzlaJNI.bitwuzla_term_get_children(pParam1, size);
-      return pChildren[0];
+    if (pParam1.kind() == Kind.NOT) {
+      return pParam1.get(0);
     }
-    return BitwuzlaJNI.bitwuzla_mk_term1(BitwuzlaKind.BITWUZLA_KIND_NOT.swigValue(), pParam1);
+    return Bitwuzla.mk_term(Kind.NOT, pParam1);
   }
 
   @Override
-  protected Long and(Long pParam1, Long pParam2) {
+  protected Term and(Term pParam1, Term pParam2) {
     if (isTrue(pParam1)) {
       return pParam2;
     } else if (isTrue(pParam2)) {
@@ -65,12 +67,11 @@ protected Long and(Long pParam1, Long pParam2) {
     } else if (pParam1.equals(pParam2)) {
       return pParam1;
     }
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_AND.swigValue(), pParam1, pParam2);
+    return Bitwuzla.mk_term(Kind.AND, pParam1, pParam2);
   }
 
   @Override
-  protected Long or(Long pParam1, Long pParam2) {
+  protected Term or(Term pParam1, Term pParam2) {
     if (isTrue(pParam1)) {
       return pTrue;
     } else if (isTrue(pParam2)) {
@@ -82,33 +83,31 @@ protected Long or(Long pParam1, Long pParam2) {
     } else if (pParam1.equals(pParam2)) {
       return pParam1;
     }
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_OR.swigValue(), pParam1, pParam2);
+    return Bitwuzla.mk_term(Kind.OR, pParam1, pParam2);
   }
 
   @Override
-  protected Long xor(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(
-        BitwuzlaKind.BITWUZLA_KIND_XOR.swigValue(), pParam1, pParam2);
+  protected Term xor(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.XOR, pParam1, pParam2);
   }
 
   @Override
-  protected Long equivalence(Long bits1, Long bits2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_IFF.swigValue(), bits1, bits2);
+  protected Term equivalence(Term bits1, Term bits2) {
+    return Bitwuzla.mk_term(Kind.IFF, bits1, bits2);
   }
 
   @Override
-  protected boolean isTrue(Long bits) {
-    return BitwuzlaJNI.bitwuzla_term_is_true(bits);
+  protected boolean isTrue(Term bits) {
+    return bits.is_true();
   }
 
   @Override
-  protected boolean isFalse(Long bits) {
-    return BitwuzlaJNI.bitwuzla_term_is_false(bits);
+  protected boolean isFalse(Term bits) {
+    return bits.is_false();
   }
 
   @Override
-  protected Long ifThenElse(Long pCond, Long pF1, Long pF2) {
+  protected Term ifThenElse(Term pCond, Term pF1, Term pF2) {
     if (isTrue(pCond)) {
       return pF1;
     } else if (isFalse(pCond)) {
@@ -120,7 +119,6 @@ protected Long ifThenElse(Long pCond, Long pF1, Long pF2) {
     } else if (isFalse(pF1) && isTrue(pF2)) {
       return not(pCond);
     }
-    return BitwuzlaJNI.bitwuzla_mk_term3(
-        BitwuzlaKind.BITWUZLA_KIND_ITE.swigValue(), pCond, pF1, pF2);
+    return Bitwuzla.mk_term(Kind.ITE, pCond, pF1, pF2);
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaDeclaration.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaDeclaration.java
index c93da123ac..d771d6fa2d 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaDeclaration.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaDeclaration.java
@@ -9,32 +9,39 @@
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
 import java.util.Objects;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
 
 // Declarations sometimes need the info of a Term, but mostly those of Kinds.
 // We can not discern between the two however, hence this wrapper
 public class BitwuzlaDeclaration {
-  private final Long decl;
+  private final Object decl;
 
   // If isKind, decl == KIND; else decl == term
   private final boolean isKind;
 
-  BitwuzlaDeclaration(long pDecl, boolean pIsKind) {
-    decl = pDecl;
-    isKind = pIsKind;
+  BitwuzlaDeclaration(Term pTerm) {
+    decl = pTerm;
+    isKind = false;
+  }
+
+  BitwuzlaDeclaration(Kind pKind) {
+    decl = pKind;
+    isKind = true;
   }
 
   public boolean isKind() {
     return isKind;
   }
 
-  public long getTerm() {
+  public Term getTerm() {
     assert !isKind;
-    return decl;
+    return (Term) decl;
   }
 
-  public int getKind() {
+  public Kind getKind() {
     assert isKind;
-    return decl.intValue();
+    return (Kind) decl;
   }
 
   @Override
@@ -44,16 +51,13 @@ public boolean equals(Object any) {
     }
     if (any instanceof BitwuzlaDeclaration) {
       BitwuzlaDeclaration otherDecl = (BitwuzlaDeclaration) any;
-      if (this.isKind == otherDecl.isKind && Objects.equals(this.decl, otherDecl.decl)) {
-        return true;
-      }
+      return isKind == otherDecl.isKind && Objects.equals(decl, otherDecl.decl);
     }
     return false;
   }
 
   @Override
   public int hashCode() {
-    // Might be errorprone as term and kind might have the same hashcode but not be equal
-    return decl != null ? decl.hashCode() : 0;
+    return Objects.hash(decl, isKind);
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index 8c08aa240b..e73baa5320 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -8,48 +8,24 @@
 
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_EQUAL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_ABS;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_ADD;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_DIV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_EQUAL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_GEQ;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_GT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_INF;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_NAN;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_NEG;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_NORMAL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_SUBNORMAL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_ZERO;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_LEQ;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_LT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_MAX;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_MIN;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_MUL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_NEG;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_RTI;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_SQRT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_SUB;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_FP_FROM_BV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_FP_FROM_FP;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_FP_FROM_SBV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_FP_FROM_UBV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_SBV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_UBV;
-
 import org.sosy_lab.java_smt.api.FloatingPointRoundingMode;
 import org.sosy_lab.java_smt.api.FormulaType;
 import org.sosy_lab.java_smt.api.FormulaType.FloatingPointType;
 import org.sosy_lab.java_smt.basicimpl.AbstractFloatingPointFormulaManager;
 import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.RoundingMode;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
 
 public class BitwuzlaFloatingPointManager
-    extends AbstractFloatingPointFormulaManager<Long, Long, Long, BitwuzlaDeclaration> {
+    extends AbstractFloatingPointFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
   // private final long bitwuzla;
-  private final long roundingMode;
+  private final Term roundingMode;
 
   protected BitwuzlaFloatingPointManager(
-      FormulaCreator<Long, Long, Long, BitwuzlaDeclaration> pCreator,
+      FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator,
       FloatingPointRoundingMode pFloatingPointRoundingMode) {
     super(pCreator);
     // bitwuzla = pCreator.getEnv();
@@ -57,28 +33,28 @@ protected BitwuzlaFloatingPointManager(
   }
 
   @Override
-  protected Long getDefaultRoundingMode() {
+  protected Term getDefaultRoundingMode() {
     return roundingMode;
   }
 
   @Override
-  protected Long getRoundingModeImpl(FloatingPointRoundingMode pFloatingPointRoundingMode) {
-    long out;
+  protected Term getRoundingModeImpl(FloatingPointRoundingMode pFloatingPointRoundingMode) {
+    Term out;
     switch (pFloatingPointRoundingMode) {
       case NEAREST_TIES_TO_EVEN:
-        out = BitwuzlaJNI.bitwuzla_mk_rm_value(BitwuzlaJNI.BITWUZLA_RM_RNE_get());
+        out = Bitwuzla.mk_rm_value(RoundingMode.RNE);
         break;
       case NEAREST_TIES_AWAY:
-        out = BitwuzlaJNI.bitwuzla_mk_rm_value(BitwuzlaJNI.BITWUZLA_RM_RNA_get());
+        out = Bitwuzla.mk_rm_value(RoundingMode.RNA);
         break;
       case TOWARD_POSITIVE:
-        out = BitwuzlaJNI.bitwuzla_mk_rm_value(BitwuzlaJNI.BITWUZLA_RM_RTP_get());
+        out = Bitwuzla.mk_rm_value(RoundingMode.RTP);
         break;
       case TOWARD_NEGATIVE:
-        out = BitwuzlaJNI.bitwuzla_mk_rm_value(BitwuzlaJNI.BITWUZLA_RM_RTN_get());
+        out = Bitwuzla.mk_rm_value(RoundingMode.RTN);
         break;
       case TOWARD_ZERO:
-        out = BitwuzlaJNI.bitwuzla_mk_rm_value(BitwuzlaJNI.BITWUZLA_RM_RTZ_get());
+        out = Bitwuzla.mk_rm_value(RoundingMode.RTZ);
         break;
       default:
         throw new AssertionError("Unexpected value");
@@ -87,47 +63,47 @@ protected Long getRoundingModeImpl(FloatingPointRoundingMode pFloatingPointRound
   }
 
   @Override
-  protected Long makeNumberImpl(double n, FloatingPointType type, Long pFloatingPointRoundingMode) {
+  protected Term makeNumberImpl(double n, FloatingPointType type, Term pFloatingPointRoundingMode) {
     return makeNumberImpl(String.format("%f", n), type, pFloatingPointRoundingMode);
   }
 
-  private long mkFpaSort(FloatingPointType pType) {
+  private Sort mkFpaSort(FloatingPointType pType) {
     return getFormulaCreator().getFloatingPointType(pType);
   }
 
   @Override
-  protected Long makeNumberAndRound(
-      String pN, FloatingPointType pType, Long pFloatingPointRoundingMode) {
-    return BitwuzlaJNI.bitwuzla_mk_fp_from_real(mkFpaSort(pType), pFloatingPointRoundingMode, pN);
+  protected Term makeNumberAndRound(
+      String pN, FloatingPointType pType, Term pFloatingPointRoundingMode) {
+    return Bitwuzla.mk_fp_value(mkFpaSort(pType), pFloatingPointRoundingMode, pN);
   }
 
   @Override
-  protected Long makeVariableImpl(String pVar, FloatingPointType pType) {
+  protected Term makeVariableImpl(String pVar, FloatingPointType pType) {
     return getFormulaCreator().makeVariable(mkFpaSort(pType), pVar);
   }
 
   @Override
-  protected Long makePlusInfinityImpl(FloatingPointType pType) {
-    return BitwuzlaJNI.bitwuzla_mk_fp_pos_inf(mkFpaSort(pType));
+  protected Term makePlusInfinityImpl(FloatingPointType pType) {
+    return Bitwuzla.mk_fp_pos_inf(mkFpaSort(pType));
   }
 
   @Override
-  protected Long makeMinusInfinityImpl(FloatingPointType pType) {
-    return BitwuzlaJNI.bitwuzla_mk_fp_neg_inf(mkFpaSort(pType));
+  protected Term makeMinusInfinityImpl(FloatingPointType pType) {
+    return Bitwuzla.mk_fp_neg_inf(mkFpaSort(pType));
   }
 
   @Override
-  protected Long makeNaNImpl(FloatingPointType pType) {
-    return BitwuzlaJNI.bitwuzla_mk_fp_nan(mkFpaSort(pType));
+  protected Term makeNaNImpl(FloatingPointType pType) {
+    return Bitwuzla.mk_fp_nan(mkFpaSort(pType));
   }
 
   @Override
-  protected Long castToImpl(
-      Long pNumber, boolean pSigned, FormulaType<?> pTargetType, Long pRoundingMode) {
+  protected Term castToImpl(
+      Term pNumber, boolean pSigned, FormulaType<?> pTargetType, Term pRoundingMode) {
     if (pTargetType.isFloatingPointType()) {
       FormulaType.FloatingPointType targetType = (FormulaType.FloatingPointType) pTargetType;
-      return BitwuzlaJNI.bitwuzla_mk_term2_indexed2(
-          BITWUZLA_KIND_FP_TO_FP_FROM_FP.swigValue(),
+      return Bitwuzla.mk_term(
+          Kind.FP_TO_FP_FROM_FP,
           pRoundingMode,
           pNumber,
           targetType.getExponentSize(),
@@ -135,11 +111,9 @@ protected Long castToImpl(
     } else if (pTargetType.isBitvectorType()) {
       FormulaType.BitvectorType targetType = (FormulaType.BitvectorType) pTargetType;
       if (pSigned) {
-        return BitwuzlaJNI.bitwuzla_mk_term2_indexed1(
-            BITWUZLA_KIND_FP_TO_SBV.swigValue(), pRoundingMode, pNumber, targetType.getSize());
+        return Bitwuzla.mk_term(Kind.FP_TO_SBV, pRoundingMode, pNumber, targetType.getSize());
       } else {
-        return BitwuzlaJNI.bitwuzla_mk_term2_indexed1(
-            BITWUZLA_KIND_FP_TO_UBV.swigValue(), pRoundingMode, pNumber, targetType.getSize());
+        return Bitwuzla.mk_term(Kind.FP_TO_UBV, pRoundingMode, pNumber, targetType.getSize());
       }
     } else {
       throw new UnsupportedOperationException("Attempted cast to an unsupported type.");
@@ -147,22 +121,22 @@ protected Long castToImpl(
   }
 
   @Override
-  protected Long castFromImpl(
-      Long pNumber, boolean pSigned, FloatingPointType pTargetType, Long pRoundingMode) {
+  protected Term castFromImpl(
+      Term pNumber, boolean pSigned, FloatingPointType pTargetType, Term pRoundingMode) {
     FormulaType<?> formulaType = getFormulaCreator().getFormulaType(pNumber);
     if (formulaType.isFloatingPointType()) {
       return castToImpl(pNumber, pSigned, pTargetType, pRoundingMode);
     } else if (formulaType.isBitvectorType()) {
       if (pSigned) {
-        return BitwuzlaJNI.bitwuzla_mk_term2_indexed2(
-            BITWUZLA_KIND_FP_TO_FP_FROM_SBV.swigValue(),
+        return Bitwuzla.mk_term(
+            Kind.FP_TO_FP_FROM_SBV,
             roundingMode,
             pNumber,
             pTargetType.getExponentSize(),
             pTargetType.getMantissaSize() + 1);
       } else {
-        return BitwuzlaJNI.bitwuzla_mk_term2_indexed2(
-            BITWUZLA_KIND_FP_TO_FP_FROM_UBV.swigValue(),
+        return Bitwuzla.mk_term(
+            Kind.FP_TO_FP_FROM_UBV,
             roundingMode,
             pNumber,
             pTargetType.getExponentSize(),
@@ -175,137 +149,130 @@ protected Long castFromImpl(
   }
 
   @Override
-  protected Long fromIeeeBitvectorImpl(Long pNumber, FloatingPointType pTargetType) {
-    return BitwuzlaJNI.bitwuzla_mk_term1_indexed2(
-        BITWUZLA_KIND_FP_TO_FP_FROM_BV.swigValue(),
+  protected Term fromIeeeBitvectorImpl(Term pNumber, FloatingPointType pTargetType) {
+    return Bitwuzla.mk_term(
+        Kind.FP_TO_FP_FROM_BV,
         pNumber,
         pTargetType.getExponentSize(),
         pTargetType.getMantissaSize() + 1);
   }
 
   @Override
-  protected Long toIeeeBitvectorImpl(Long pNumber) {
-    long rm = BitwuzlaJNI.bitwuzla_mk_rm_value(BitwuzlaJNI.BITWUZLA_RM_RTZ_get());
-    long inputBits =
-        BitwuzlaJNI.bitwuzla_term_fp_get_exp_size(pNumber)
-            + BitwuzlaJNI.bitwuzla_term_fp_get_sig_size(pNumber);
+  protected Term toIeeeBitvectorImpl(Term pNumber) {
+    Term rm = Bitwuzla.mk_rm_value(RoundingMode.RTZ);
+    int inputBits = pNumber.sort().fp_exp_size() + pNumber.sort().fp_sig_size();
     // This is most likely wrong/inprecise!
-    return BitwuzlaJNI.bitwuzla_mk_term2_indexed1(
-        BITWUZLA_KIND_FP_TO_SBV.swigValue(), rm, pNumber, inputBits);
+    return Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, pNumber, inputBits);
   }
 
   @Override
-  protected Long negate(Long pParam1) {
-    return BitwuzlaJNI.bitwuzla_mk_term1(BITWUZLA_KIND_FP_NEG.swigValue(), pParam1);
+  protected Term negate(Term pParam1) {
+    return Bitwuzla.mk_term(Kind.FP_NEG, pParam1);
   }
 
   @Override
-  protected Long abs(Long pParam1) {
-    return BitwuzlaJNI.bitwuzla_mk_term1(BITWUZLA_KIND_FP_ABS.swigValue(), pParam1);
+  protected Term abs(Term pParam1) {
+    return Bitwuzla.mk_term(Kind.FP_ABS, pParam1);
   }
 
   @Override
-  protected Long max(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_FP_MAX.swigValue(), pParam1, pParam2);
+  protected Term max(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.FP_MAX, pParam1, pParam2);
   }
 
   @Override
-  protected Long min(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_FP_MIN.swigValue(), pParam1, pParam2);
+  protected Term min(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.FP_MIN, pParam1, pParam2);
   }
 
   @Override
-  protected Long sqrt(Long pNumber, Long pRoundingMode) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_FP_SQRT.swigValue(), pRoundingMode, pNumber);
+  protected Term sqrt(Term pNumber, Term pRoundingMode) {
+    return Bitwuzla.mk_term(Kind.FP_SQRT, pRoundingMode, pNumber);
   }
 
   @Override
-  protected Long add(Long pParam1, Long pParam2, Long pRoundingMode) {
-    return BitwuzlaJNI.bitwuzla_mk_term3(
-        BITWUZLA_KIND_FP_ADD.swigValue(), pRoundingMode, pParam1, pParam2);
+  protected Term add(Term pParam1, Term pParam2, Term pRoundingMode) {
+    return Bitwuzla.mk_term(Kind.FP_ADD, pRoundingMode, pParam1, pParam2);
   }
 
   @Override
-  protected Long subtract(Long pParam1, Long pParam2, Long pFloatingPointRoundingMode) {
-    return BitwuzlaJNI.bitwuzla_mk_term3(
-        BITWUZLA_KIND_FP_SUB.swigValue(), pFloatingPointRoundingMode, pParam1, pParam2);
+  protected Term subtract(Term pParam1, Term pParam2, Term pFloatingPointRoundingMode) {
+    return Bitwuzla.mk_term(Kind.FP_SUB, pFloatingPointRoundingMode, pParam1, pParam2);
   }
 
   @Override
-  protected Long divide(Long pParam1, Long pParam2, Long pFloatingPointRoundingMode) {
-    return BitwuzlaJNI.bitwuzla_mk_term3(
-        BITWUZLA_KIND_FP_DIV.swigValue(), pFloatingPointRoundingMode, pParam1, pParam2);
+  protected Term divide(Term pParam1, Term pParam2, Term pFloatingPointRoundingMode) {
+    return Bitwuzla.mk_term(Kind.FP_DIV, pFloatingPointRoundingMode, pParam1, pParam2);
   }
 
   @Override
-  protected Long multiply(Long pParam1, Long pParam2, Long pFloatingPointRoundingMode) {
-    return BitwuzlaJNI.bitwuzla_mk_term3(
-        BITWUZLA_KIND_FP_MUL.swigValue(), pFloatingPointRoundingMode, pParam1, pParam2);
+  protected Term multiply(Term pParam1, Term pParam2, Term pFloatingPointRoundingMode) {
+    return Bitwuzla.mk_term(Kind.FP_MUL, pFloatingPointRoundingMode, pParam1, pParam2);
   }
 
   @Override
-  protected Long assignment(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_EQUAL.swigValue(), pParam1, pParam2);
+  protected Term assignment(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.EQUAL, pParam1, pParam2);
   }
 
   @Override
-  protected Long equalWithFPSemantics(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_FP_EQUAL.swigValue(), pParam1, pParam2);
+  protected Term equalWithFPSemantics(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.FP_EQUAL, pParam1, pParam2);
   }
 
   @Override
-  protected Long greaterThan(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_FP_GT.swigValue(), pParam1, pParam2);
+  protected Term greaterThan(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.FP_GT, pParam1, pParam2);
   }
 
   @Override
-  protected Long greaterOrEquals(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_FP_GEQ.swigValue(), pParam1, pParam2);
+  protected Term greaterOrEquals(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.FP_GEQ, pParam1, pParam2);
   }
 
   @Override
-  protected Long lessThan(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_FP_LT.swigValue(), pParam1, pParam2);
+  protected Term lessThan(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.FP_LT, pParam1, pParam2);
   }
 
   @Override
-  protected Long lessOrEquals(Long pParam1, Long pParam2) {
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_FP_LEQ.swigValue(), pParam1, pParam2);
+  protected Term lessOrEquals(Term pParam1, Term pParam2) {
+    return Bitwuzla.mk_term(Kind.FP_LEQ, pParam1, pParam2);
   }
 
   @Override
-  protected Long isNaN(Long pParam) {
-    return BitwuzlaJNI.bitwuzla_mk_term1(BITWUZLA_KIND_FP_IS_NAN.swigValue(), pParam);
+  protected Term isNaN(Term pParam) {
+    return Bitwuzla.mk_term(Kind.FP_IS_NAN, pParam);
   }
 
   @Override
-  protected Long isInfinity(Long pParam) {
-    return BitwuzlaJNI.bitwuzla_mk_term1(BITWUZLA_KIND_FP_IS_INF.swigValue(), pParam);
+  protected Term isInfinity(Term pParam) {
+    return Bitwuzla.mk_term(Kind.FP_IS_INF, pParam);
   }
 
   @Override
-  protected Long isZero(Long pParam) {
-    return BitwuzlaJNI.bitwuzla_mk_term1(BITWUZLA_KIND_FP_IS_ZERO.swigValue(), pParam);
+  protected Term isZero(Term pParam) {
+    return Bitwuzla.mk_term(Kind.FP_IS_ZERO, pParam);
   }
 
   @Override
-  protected Long isSubnormal(Long pParam) {
-    return BitwuzlaJNI.bitwuzla_mk_term1(BITWUZLA_KIND_FP_IS_SUBNORMAL.swigValue(), pParam);
+  protected Term isSubnormal(Term pParam) {
+    return Bitwuzla.mk_term(Kind.FP_IS_SUBNORMAL, pParam);
   }
 
   @Override
-  protected Long isNormal(Long pParam) {
-    return BitwuzlaJNI.bitwuzla_mk_term1(BITWUZLA_KIND_FP_IS_NORMAL.swigValue(), pParam);
+  protected Term isNormal(Term pParam) {
+    return Bitwuzla.mk_term(Kind.FP_IS_NORMAL, pParam);
   }
 
   @Override
-  protected Long isNegative(Long pParam) {
-    return BitwuzlaJNI.bitwuzla_mk_term1(BITWUZLA_KIND_FP_IS_NEG.swigValue(), pParam);
+  protected Term isNegative(Term pParam) {
+    return Bitwuzla.mk_term(Kind.FP_IS_NEG, pParam);
   }
 
   @Override
-  protected Long round(Long pFormula, FloatingPointRoundingMode pRoundingMode) {
-    long rm = getRoundingModeImpl(pRoundingMode);
-    return BitwuzlaJNI.bitwuzla_mk_term2(BITWUZLA_KIND_FP_RTI.swigValue(), rm, pFormula);
+  protected Term round(Term pFormula, FloatingPointRoundingMode pRoundingMode) {
+    Term rm = getRoundingModeImpl(pRoundingMode);
+    return Bitwuzla.mk_term(Kind.FP_RTI, rm, pFormula);
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
index d47f7a05d6..46dabbfc45 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
@@ -17,16 +17,18 @@
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.api.FormulaType;
 import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
 
 @Immutable
 abstract class BitwuzlaFormula implements Formula {
-  private final long bitwuzlaTerm;
+  @SuppressWarnings("Immutable")
+  private final Term bitwuzlaTerm;
 
-  BitwuzlaFormula(long term) {
+  BitwuzlaFormula(Term term) {
     bitwuzlaTerm = term;
   }
 
-  final long getTerm() {
+  final Term getTerm() {
     return bitwuzlaTerm;
   }
 
@@ -39,7 +41,7 @@ final long getTerm() {
    */
   @Override
   public String toString() {
-    return BitwuzlaJNI.bitwuzla_term_to_string(this.bitwuzlaTerm);
+    return bitwuzlaTerm.toString();
   }
 
   /**
@@ -58,14 +60,14 @@ public boolean equals(Object other) {
     if (!(other instanceof BitwuzlaFormula)) {
       return false;
     }
-    return bitwuzlaTerm == ((BitwuzlaFormula) other).getTerm();
+    Term otherTerm = ((BitwuzlaFormula) other).getTerm();
+    return bitwuzlaTerm.equals(otherTerm);
   }
 
   /** returns a valid hashCode satisfying the constraints given by {@link #equals}. */
   @Override
   public int hashCode() {
-    // In this case, the long returned by the JNI is not a pointer, but the value itself.
-    return (int) BitwuzlaJNI.bitwuzla_term_hash(bitwuzlaTerm);
+    return bitwuzlaTerm.hashCode();
   }
 
   @Immutable
@@ -76,7 +78,7 @@ static final class BitwuzlaArrayFormula<TI extends Formula, TE extends Formula>
     private final FormulaType<TI> indexType;
     private final FormulaType<TE> elementType;
 
-    BitwuzlaArrayFormula(long pTerm, FormulaType<TI> pIndexType, FormulaType<TE> pElementType) {
+    BitwuzlaArrayFormula(Term pTerm, FormulaType<TI> pIndexType, FormulaType<TE> pElementType) {
       super(pTerm);
       indexType = pIndexType;
       elementType = pElementType;
@@ -93,7 +95,7 @@ public FormulaType<TE> getElementType() {
 
   @Immutable
   static final class BitwuzlaBitvectorFormula extends BitwuzlaFormula implements BitvectorFormula {
-    BitwuzlaBitvectorFormula(long pTerm) {
+    BitwuzlaBitvectorFormula(Term pTerm) {
       super(pTerm);
     }
   }
@@ -101,7 +103,7 @@ static final class BitwuzlaBitvectorFormula extends BitwuzlaFormula implements B
   @Immutable
   static final class BitwuzlaFloatingPointFormula extends BitwuzlaFormula
       implements FloatingPointFormula {
-    BitwuzlaFloatingPointFormula(long pTerm) {
+    BitwuzlaFloatingPointFormula(Term pTerm) {
       super(pTerm);
     }
   }
@@ -109,14 +111,14 @@ static final class BitwuzlaFloatingPointFormula extends BitwuzlaFormula
   @Immutable
   static final class BitwuzlaFloatingPointRoundingModeFormula extends BitwuzlaFormula
       implements FloatingPointRoundingModeFormula {
-    BitwuzlaFloatingPointRoundingModeFormula(long pTerm) {
+    BitwuzlaFloatingPointRoundingModeFormula(Term pTerm) {
       super(pTerm);
     }
   }
 
   @Immutable
   static final class BitwuzlaBooleanFormula extends BitwuzlaFormula implements BooleanFormula {
-    BitwuzlaBooleanFormula(long pTerm) {
+    BitwuzlaBooleanFormula(Term pTerm) {
       super(pTerm);
     }
   }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index 15a0b4846d..1267cc15b2 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -9,75 +9,6 @@
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_AND;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_APPLY;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_ARRAY_SELECT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_ARRAY_STORE;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_ADD;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_AND;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_ASHR;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_CONCAT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_EXTRACT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_MUL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_NEG;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_NOT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_OR;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_SDIV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_SGE;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_SGT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_SHL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_SIGN_EXTEND;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_SLE;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_SLT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_SREM;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_SUB;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_UDIV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_UGE;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_UGT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_ULE;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_ULT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_UREM;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_XOR;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_BV_ZERO_EXTEND;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_CONSTANT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_DISTINCT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_EQUAL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_EXISTS;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FORALL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_ABS;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_ADD;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_DIV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_EQUAL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_GEQ;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_GT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_INF;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_NAN;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_NEG;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_NORMAL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_SUBNORMAL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_IS_ZERO;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_LEQ;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_LT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_MAX;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_MIN;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_MUL;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_NEG;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_RTI;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_SQRT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_SUB;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_FP_FROM_BV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_FP_FROM_FP;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_FP_FROM_SBV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_FP_FROM_UBV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_SBV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_FP_TO_UBV;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_IFF;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_IMPLIES;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_ITE;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_NOT;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_OR;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_VALUE;
-import static org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaKind.BITWUZLA_KIND_XOR;
 
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableList;
@@ -89,7 +20,6 @@
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.stream.LongStream;
 import org.sosy_lab.java_smt.api.ArrayFormula;
 import org.sosy_lab.java_smt.api.BitvectorFormula;
 import org.sosy_lab.java_smt.api.BooleanFormula;
@@ -108,23 +38,30 @@
 import org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaFormula.BitwuzlaBooleanFormula;
 import org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaFormula.BitwuzlaFloatingPointFormula;
 import org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaFormula.BitwuzlaFloatingPointRoundingModeFormula;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Map_TermTerm;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
-public class BitwuzlaFormulaCreator extends FormulaCreator<Long, Long, Long, BitwuzlaDeclaration> {
-  private final Table<String, Long, Long> formulaCache = HashBasedTable.create();
+public class BitwuzlaFormulaCreator extends FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> {
+  private final Table<String, Sort, Term> formulaCache = HashBasedTable.create();
 
   // private final Table<String, Long, Long> boundFormulaCache = HashBasedTable.create();
 
-  protected BitwuzlaFormulaCreator(Long pBitwuzlaEnv) {
-    super(pBitwuzlaEnv, BitwuzlaJNI.bitwuzla_mk_bool_sort(), null, null, null, null);
+  protected BitwuzlaFormulaCreator() {
+    super(null, Bitwuzla.mk_bool_sort(), null, null, null, null);
   }
 
   @Override
-  public Long getBitvectorType(int bitwidth) {
-    return BitwuzlaJNI.bitwuzla_mk_bv_sort(bitwidth);
+  public Sort getBitvectorType(int bitwidth) {
+    return Bitwuzla.mk_bv_sort(bitwidth);
   }
 
   @Override
-  public BitvectorFormula encapsulateBitvector(Long pTerm) {
+  public BitvectorFormula encapsulateBitvector(Term pTerm) {
     assert getFormulaType(pTerm).isBitvectorType()
         : "Unexpected formula type for BV formula: " + getFormulaType(pTerm);
     return new BitwuzlaBitvectorFormula(pTerm);
@@ -133,10 +70,8 @@ assert getFormulaType(pTerm).isBitvectorType()
   // Assuming that JavaSMT FloatingPointType follows IEEE 754, if it is in the decimal
   // system instead use bitwuzla_mk_fp_value_from_real somehow or convert myself
   @Override
-  public Long getFloatingPointType(FloatingPointType type) {
-    long fpSort =
-        BitwuzlaJNI.bitwuzla_mk_fp_sort(type.getExponentSize(), type.getMantissaSize() + 1);
-    return fpSort;
+  public Sort getFloatingPointType(FloatingPointType type) {
+    return Bitwuzla.mk_fp_sort(type.getExponentSize(), type.getMantissaSize() + 1);
   }
 
   @Override
@@ -154,213 +89,206 @@ protected <TI extends Formula, TE extends Formula> FormulaType<TI> getArrayFormu
   }
 
   @Override
-  public Long getArrayType(Long indexType, Long elementType) {
-    return BitwuzlaJNI.bitwuzla_mk_array_sort(indexType, elementType);
+  public Sort getArrayType(Sort indexType, Sort elementType) {
+    return Bitwuzla.mk_array_sort(indexType, elementType);
   }
 
   @Override
-  protected FloatingPointFormula encapsulateFloatingPoint(Long pTerm) {
+  protected FloatingPointFormula encapsulateFloatingPoint(Term pTerm) {
     assert getFormulaType(pTerm).isFloatingPointType()
-        : String.format(
-            "%s is no FP, but %s (%s)",
-            pTerm, BitwuzlaJNI.bitwuzla_term_get_sort(pTerm), getFormulaType(pTerm));
+        : String.format("%s is no FP, but %s (%s)", pTerm, pTerm.sort(), getFormulaType(pTerm));
     return new BitwuzlaFloatingPointFormula(pTerm);
   }
 
   @Override
   @SuppressWarnings("MethodTypeParameterName")
   protected <TI extends Formula, TE extends Formula> ArrayFormula<TI, TE> encapsulateArray(
-      Long pTerm, FormulaType<TI> pIndexType, FormulaType<TE> pElementType) {
+      Term pTerm, FormulaType<TI> pIndexType, FormulaType<TE> pElementType) {
     assert getFormulaType(pTerm).isArrayType()
         : "Unexpected formula type for array formula: " + getFormulaType(pTerm);
     return new BitwuzlaArrayFormula<>(pTerm, pIndexType, pElementType);
   }
 
   @Override
-  public Long makeVariable(Long pSort, String varName) {
-    Long maybeFormula = formulaCache.get(varName, pSort);
+  public Term makeVariable(Sort pSort, String varName) {
+    Term maybeFormula = formulaCache.get(varName, pSort);
     if (maybeFormula != null) {
       return maybeFormula;
     }
 
-    long newVar = BitwuzlaJNI.bitwuzla_mk_const(pSort, varName);
+    Term newVar = Bitwuzla.mk_const(pSort, varName);
     formulaCache.put(varName, pSort, newVar);
     return newVar;
   }
 
-  public long makeBoundVariable(long var) {
-    String name = BitwuzlaJNI.bitwuzla_term_get_symbol(var);
-    Long sort = BitwuzlaJNI.bitwuzla_term_get_sort(var);
+  public Term makeBoundVariable(Term var) {
+    String name = var.symbol();
+    Sort sort = var.sort();
     // TODO: do we need a bound cache?
-    // Long maybeVar = boundFormulaCache.get(name, sort);
+    // Term maybeVar = boundFormulaCache.get(name, sort);
     // if (maybeVar != null) {
     // return maybeVar;
     // }
 
-    long newVar = BitwuzlaJNI.bitwuzla_mk_var(sort, name);
+    Term newVar = Bitwuzla.mk_var(sort, name);
     // boundFormulaCache.put(name, sort, newVar);
     return newVar;
   }
 
-  public FormulaType<?> bitwuzlaSortToType(Long pSort) {
+  public FormulaType<?> bitwuzlaSortToType(Sort pSort) {
     // UFs play by different rules. For them, we need to extract the domain
-    if (BitwuzlaJNI.bitwuzla_sort_is_fp(pSort)) {
-      long exponent = BitwuzlaJNI.bitwuzla_sort_fp_get_exp_size(pSort);
-      long mantissa = BitwuzlaJNI.bitwuzla_sort_fp_get_sig_size(pSort) - 1;
-      return FormulaType.getFloatingPointType((int) exponent, (int) mantissa);
-    } else if (BitwuzlaJNI.bitwuzla_sort_is_bv(pSort)) {
-      return FormulaType.getBitvectorTypeWithSize(
-          (int) BitwuzlaJNI.bitwuzla_sort_bv_get_size(pSort));
-    } else if (BitwuzlaJNI.bitwuzla_sort_is_array(pSort)) {
-      FormulaType<?> domainSort =
-          bitwuzlaSortToType(BitwuzlaJNI.bitwuzla_sort_array_get_element(pSort));
-      FormulaType<?> rangeSort =
-          bitwuzlaSortToType(BitwuzlaJNI.bitwuzla_sort_array_get_index(pSort));
+    if (pSort.is_fp()) {
+      int exponent = pSort.fp_exp_size();
+      int mantissa = pSort.fp_sig_size() - 1;
+      return FormulaType.getFloatingPointType(exponent, mantissa);
+    } else if (pSort.is_bv()) {
+      return FormulaType.getBitvectorTypeWithSize(pSort.bv_size());
+    } else if (pSort.is_array()) {
+      FormulaType<?> domainSort = bitwuzlaSortToType(pSort.array_index());
+      FormulaType<?> rangeSort = bitwuzlaSortToType(pSort.array_element());
       return FormulaType.getArrayType(domainSort, rangeSort);
-    } else if (BitwuzlaJNI.bitwuzla_sort_is_bool(pSort)) {
+    } else if (pSort.is_bool()) {
       return FormulaType.BooleanType;
-    } else if (BitwuzlaJNI.bitwuzla_sort_is_rm(pSort)) {
+    } else if (pSort.is_rm()) {
       return FormulaType.FloatingPointRoundingModeType;
     }
 
     throw new UnsupportedOperationException(
-        "Could not find the JavaSMT type for sort"
-            + BitwuzlaJNI.bitwuzla_sort_to_string(pSort)
-            + ".");
+        "Could not find the JavaSMT type for sort" + pSort + ".");
   }
 
-  private FunctionDeclarationKind getDeclarationKind(Long term) {
-    BitwuzlaKind kind = BitwuzlaKind.swigToEnum(BitwuzlaJNI.bitwuzla_term_get_kind(term));
+  private FunctionDeclarationKind getDeclarationKind(Term term) {
+    Kind kind = term.kind();
 
-    if (kind.equals(BITWUZLA_KIND_AND)) {
+    if (kind.equals(Kind.AND)) {
       return FunctionDeclarationKind.AND;
-    } else if (kind.equals(BITWUZLA_KIND_DISTINCT)) {
+    } else if (kind.equals(Kind.DISTINCT)) {
       return FunctionDeclarationKind.DISTINCT;
-    } else if (kind.equals(BITWUZLA_KIND_EQUAL)) {
+    } else if (kind.equals(Kind.EQUAL)) {
       return FunctionDeclarationKind.EQ;
-    } else if (kind.equals(BITWUZLA_KIND_IFF)) {
+    } else if (kind.equals(Kind.IFF)) {
       return FunctionDeclarationKind.IFF;
-    } else if (kind.equals(BITWUZLA_KIND_IMPLIES)) {
+    } else if (kind.equals(Kind.IMPLIES)) {
       return FunctionDeclarationKind.IMPLIES;
-    } else if (kind.equals(BITWUZLA_KIND_NOT)) {
+    } else if (kind.equals(Kind.NOT)) {
       return FunctionDeclarationKind.NOT;
-    } else if (kind.equals(BITWUZLA_KIND_OR)) {
+    } else if (kind.equals(Kind.OR)) {
       return FunctionDeclarationKind.OR;
-    } else if (kind.equals(BITWUZLA_KIND_XOR)) {
+    } else if (kind.equals(Kind.XOR)) {
       return FunctionDeclarationKind.XOR;
-    } else if (kind.equals(BITWUZLA_KIND_ITE)) {
+    } else if (kind.equals(Kind.ITE)) {
       return FunctionDeclarationKind.ITE;
-    } else if (kind.equals(BITWUZLA_KIND_APPLY)) {
+    } else if (kind.equals(Kind.APPLY)) {
       return FunctionDeclarationKind.UF;
-    } else if (kind.equals(BITWUZLA_KIND_ARRAY_SELECT)) {
+    } else if (kind.equals(Kind.ARRAY_SELECT)) {
       return FunctionDeclarationKind.SELECT;
-    } else if (kind.equals(BITWUZLA_KIND_ARRAY_STORE)) {
+    } else if (kind.equals(Kind.ARRAY_STORE)) {
       return FunctionDeclarationKind.STORE;
-    } else if (kind.equals(BITWUZLA_KIND_BV_ADD)) {
+    } else if (kind.equals(Kind.BV_ADD)) {
       return FunctionDeclarationKind.BV_ADD;
-    } else if (kind.equals(BITWUZLA_KIND_BV_AND)) {
+    } else if (kind.equals(Kind.BV_AND)) {
       return FunctionDeclarationKind.BV_AND;
-    } else if (kind.equals(BITWUZLA_KIND_BV_ASHR)) {
+    } else if (kind.equals(Kind.BV_ASHR)) {
       return FunctionDeclarationKind.BV_ASHR;
-    } else if (kind.equals(BITWUZLA_KIND_BV_CONCAT)) {
+    } else if (kind.equals(Kind.BV_CONCAT)) {
       return FunctionDeclarationKind.BV_CONCAT;
-    } else if (kind.equals(BITWUZLA_KIND_BV_MUL)) {
+    } else if (kind.equals(Kind.BV_MUL)) {
       return FunctionDeclarationKind.BV_MUL;
-    } else if (kind.equals(BITWUZLA_KIND_BV_NEG)) {
+    } else if (kind.equals(Kind.BV_NEG)) {
       return FunctionDeclarationKind.BV_NEG;
-    } else if (kind.equals(BITWUZLA_KIND_BV_NOT)) {
+    } else if (kind.equals(Kind.BV_NOT)) {
       return FunctionDeclarationKind.BV_NOT;
-    } else if (kind.equals(BITWUZLA_KIND_BV_OR)) {
+    } else if (kind.equals(Kind.BV_OR)) {
       return FunctionDeclarationKind.BV_OR;
-    } else if (kind.equals(BITWUZLA_KIND_BV_SDIV)) {
+    } else if (kind.equals(Kind.BV_SDIV)) {
       return FunctionDeclarationKind.BV_SDIV;
-    } else if (kind.equals(BITWUZLA_KIND_BV_SGE)) {
+    } else if (kind.equals(Kind.BV_SGE)) {
       return FunctionDeclarationKind.BV_SGE;
-    } else if (kind.equals(BITWUZLA_KIND_BV_SGT)) {
+    } else if (kind.equals(Kind.BV_SGT)) {
       return FunctionDeclarationKind.BV_SGT;
-    } else if (kind.equals(BITWUZLA_KIND_BV_SHL)) {
+    } else if (kind.equals(Kind.BV_SHL)) {
       return FunctionDeclarationKind.BV_SHL;
-    } else if (kind.equals(BITWUZLA_KIND_BV_SLE)) {
+    } else if (kind.equals(Kind.BV_SLE)) {
       return FunctionDeclarationKind.BV_SLE;
-    } else if (kind.equals(BITWUZLA_KIND_BV_SLT)) {
+    } else if (kind.equals(Kind.BV_SLT)) {
       return FunctionDeclarationKind.BV_SLT;
-    } else if (kind.equals(BITWUZLA_KIND_BV_SREM)) {
+    } else if (kind.equals(Kind.BV_SREM)) {
       return FunctionDeclarationKind.BV_SREM;
-    } else if (kind.equals(BITWUZLA_KIND_BV_SUB)) {
+    } else if (kind.equals(Kind.BV_SUB)) {
       return FunctionDeclarationKind.BV_SUB;
-    } else if (kind.equals(BITWUZLA_KIND_BV_UDIV)) {
+    } else if (kind.equals(Kind.BV_UDIV)) {
       return FunctionDeclarationKind.BV_UDIV;
-    } else if (kind.equals(BITWUZLA_KIND_BV_UGE)) {
+    } else if (kind.equals(Kind.BV_UGE)) {
       return FunctionDeclarationKind.BV_UGE;
-    } else if (kind.equals(BITWUZLA_KIND_BV_UGT)) {
+    } else if (kind.equals(Kind.BV_UGT)) {
       return FunctionDeclarationKind.BV_UGT;
-    } else if (kind.equals(BITWUZLA_KIND_BV_ULE)) {
+    } else if (kind.equals(Kind.BV_ULE)) {
       return FunctionDeclarationKind.BV_ULE;
-    } else if (kind.equals(BITWUZLA_KIND_BV_ULT)) {
+    } else if (kind.equals(Kind.BV_ULT)) {
       return FunctionDeclarationKind.BV_ULT;
-    } else if (kind.equals(BITWUZLA_KIND_BV_UREM)) {
+    } else if (kind.equals(Kind.BV_UREM)) {
       return FunctionDeclarationKind.BV_UREM;
-    } else if (kind.equals(BITWUZLA_KIND_BV_EXTRACT)) {
+    } else if (kind.equals(Kind.BV_EXTRACT)) {
       return FunctionDeclarationKind.BV_EXTRACT;
-    } else if (kind.equals(BITWUZLA_KIND_BV_SIGN_EXTEND)) {
+    } else if (kind.equals(Kind.BV_SIGN_EXTEND)) {
       return FunctionDeclarationKind.BV_SIGN_EXTENSION;
-    } else if (kind.equals(BITWUZLA_KIND_BV_ZERO_EXTEND)) {
+    } else if (kind.equals(Kind.BV_ZERO_EXTEND)) {
       return FunctionDeclarationKind.BV_ZERO_EXTENSION;
-    } else if (kind.equals(BITWUZLA_KIND_FP_ABS)) {
+    } else if (kind.equals(Kind.FP_ABS)) {
       return FunctionDeclarationKind.FP_ABS;
-    } else if (kind.equals(BITWUZLA_KIND_FP_ADD)) {
+    } else if (kind.equals(Kind.FP_ADD)) {
       return FunctionDeclarationKind.FP_ADD;
-    } else if (kind.equals(BITWUZLA_KIND_FP_DIV)) {
+    } else if (kind.equals(Kind.FP_DIV)) {
       return FunctionDeclarationKind.FP_DIV;
-    } else if (kind.equals(BITWUZLA_KIND_FP_EQUAL)) {
+    } else if (kind.equals(Kind.FP_EQUAL)) {
       return FunctionDeclarationKind.FP_EQ;
-    } else if (kind.equals(BITWUZLA_KIND_FP_GEQ)) {
+    } else if (kind.equals(Kind.FP_GEQ)) {
       return FunctionDeclarationKind.FP_GE;
-    } else if (kind.equals(BITWUZLA_KIND_FP_GT)) {
+    } else if (kind.equals(Kind.FP_GT)) {
       return FunctionDeclarationKind.FP_GT;
-    } else if (kind.equals(BITWUZLA_KIND_FP_IS_INF)) {
+    } else if (kind.equals(Kind.FP_IS_INF)) {
       return FunctionDeclarationKind.FP_IS_INF;
-    } else if (kind.equals(BITWUZLA_KIND_FP_IS_NAN)) {
+    } else if (kind.equals(Kind.FP_IS_NAN)) {
       return FunctionDeclarationKind.FP_IS_NAN;
-    } else if (kind.equals(BITWUZLA_KIND_FP_IS_NEG)) {
+    } else if (kind.equals(Kind.FP_IS_NEG)) {
       return FunctionDeclarationKind.FP_IS_NEGATIVE;
-    } else if (kind.equals(BITWUZLA_KIND_FP_IS_NORMAL)) {
+    } else if (kind.equals(Kind.FP_IS_NORMAL)) {
       return FunctionDeclarationKind.FP_IS_NORMAL;
-    } else if (kind.equals(BITWUZLA_KIND_FP_IS_SUBNORMAL)) {
+    } else if (kind.equals(Kind.FP_IS_SUBNORMAL)) {
       return FunctionDeclarationKind.FP_IS_SUBNORMAL;
-    } else if (kind.equals(BITWUZLA_KIND_FP_IS_ZERO)) {
+    } else if (kind.equals(Kind.FP_IS_ZERO)) {
       return FunctionDeclarationKind.FP_IS_ZERO;
-    } else if (kind.equals(BITWUZLA_KIND_FP_LEQ)) {
+    } else if (kind.equals(Kind.FP_LEQ)) {
       return FunctionDeclarationKind.FP_LE;
-    } else if (kind.equals(BITWUZLA_KIND_FP_LT)) {
+    } else if (kind.equals(Kind.FP_LT)) {
       return FunctionDeclarationKind.FP_LT;
-    } else if (kind.equals(BITWUZLA_KIND_FP_MAX)) {
+    } else if (kind.equals(Kind.FP_MAX)) {
       return FunctionDeclarationKind.FP_MAX;
-    } else if (kind.equals(BITWUZLA_KIND_FP_MIN)) {
+    } else if (kind.equals(Kind.FP_MIN)) {
       return FunctionDeclarationKind.FP_MIN;
-    } else if (kind.equals(BITWUZLA_KIND_FP_MUL)) {
+    } else if (kind.equals(Kind.FP_MUL)) {
       return FunctionDeclarationKind.FP_MUL;
-    } else if (kind.equals(BITWUZLA_KIND_FP_NEG)) {
+    } else if (kind.equals(Kind.FP_NEG)) {
       return FunctionDeclarationKind.FP_NEG;
-    } else if (kind.equals(BITWUZLA_KIND_FP_RTI)) {
+    } else if (kind.equals(Kind.FP_RTI)) {
       return FunctionDeclarationKind.FP_ROUND_TO_INTEGRAL;
-    } else if (kind.equals(BITWUZLA_KIND_FP_SQRT)) {
+    } else if (kind.equals(Kind.FP_SQRT)) {
       return FunctionDeclarationKind.FP_SQRT;
-    } else if (kind.equals(BITWUZLA_KIND_FP_SUB)) {
+    } else if (kind.equals(Kind.FP_SUB)) {
       return FunctionDeclarationKind.FP_SUB;
-    } else if (kind.equals(BITWUZLA_KIND_FP_TO_FP_FROM_BV)) {
+    } else if (kind.equals(Kind.FP_TO_FP_FROM_BV)) {
       return FunctionDeclarationKind.BV_UCASTTO_FP;
-    } else if (kind.equals(BITWUZLA_KIND_FP_TO_FP_FROM_FP)) {
+    } else if (kind.equals(Kind.FP_TO_FP_FROM_FP)) {
       return FunctionDeclarationKind.FP_CASTTO_FP;
-    } else if (kind.equals(BITWUZLA_KIND_FP_TO_FP_FROM_SBV)) {
+    } else if (kind.equals(Kind.FP_TO_FP_FROM_SBV)) {
       return FunctionDeclarationKind.BV_SCASTTO_FP;
-    } else if (kind.equals(BITWUZLA_KIND_FP_TO_FP_FROM_UBV)) {
+    } else if (kind.equals(Kind.FP_TO_FP_FROM_UBV)) {
       return FunctionDeclarationKind.BV_UCASTTO_FP;
-    } else if (kind.equals(BITWUZLA_KIND_FP_TO_SBV)) {
+    } else if (kind.equals(Kind.FP_TO_SBV)) {
       return FunctionDeclarationKind.FP_CASTTO_SBV;
-    } else if (kind.equals(BITWUZLA_KIND_FP_TO_UBV)) {
+    } else if (kind.equals(Kind.FP_TO_UBV)) {
       return FunctionDeclarationKind.FP_CASTTO_UBV;
-    } else if (kind.equals(BITWUZLA_KIND_BV_XOR)) {
+    } else if (kind.equals(Kind.BV_XOR)) {
       return FunctionDeclarationKind.BV_XOR;
     }
     throw new UnsupportedOperationException("Can not discern formula kind " + kind);
@@ -368,7 +296,7 @@ private FunctionDeclarationKind getDeclarationKind(Long term) {
 
   @SuppressWarnings("unchecked")
   @Override
-  public <T extends Formula> T encapsulate(FormulaType<T> pType, Long pTerm) {
+  public <T extends Formula> T encapsulate(FormulaType<T> pType, Term pTerm) {
     assert pType.equals(getFormulaType(pTerm))
         : String.format(
             "Trying to encapsulate formula of type %s as %s", getFormulaType(pTerm), pType);
@@ -390,46 +318,38 @@ public <T extends Formula> T encapsulate(FormulaType<T> pType, Long pTerm) {
   @SuppressWarnings("unchecked")
   @Override
   public <T extends Formula> FormulaType<T> getFormulaType(T pFormula) {
-    long sort = BitwuzlaJNI.bitwuzla_term_get_sort(extractInfo(pFormula));
+    Sort sort = extractInfo(pFormula).sort();
     if (pFormula instanceof BitvectorFormula) {
-      checkArgument(
-          BitwuzlaJNI.bitwuzla_sort_is_bv(sort),
-          "BitvectorFormula with type missmatch: %s",
-          pFormula);
-      return (FormulaType<T>)
-          FormulaType.getBitvectorTypeWithSize(
-              Math.toIntExact(BitwuzlaJNI.bitwuzla_sort_bv_get_size(sort)));
+      checkArgument(sort.is_bv(), "BitvectorFormula with type missmatch: %s", pFormula);
+      return (FormulaType<T>) FormulaType.getBitvectorTypeWithSize(sort.bv_size());
     } else if (pFormula instanceof ArrayFormula<?, ?>) {
       FormulaType<T> arrayIndexType = getArrayFormulaIndexType((ArrayFormula<T, T>) pFormula);
       FormulaType<T> arrayElementType = getArrayFormulaElementType((ArrayFormula<T, T>) pFormula);
       return (FormulaType<T>) FormulaType.getArrayType(arrayIndexType, arrayElementType);
     } else if (pFormula instanceof FloatingPointFormula) {
-      if (!BitwuzlaJNI.bitwuzla_sort_is_fp(sort)) {
+      if (!sort.is_fp()) {
         throw new IllegalArgumentException(
-            "FloatingPointFormula with actual type "
-                + BitwuzlaJNI.bitwuzla_sort_to_string(sort)
-                + ": "
-                + pFormula);
+            "FloatingPointFormula with actual type " + sort + ": " + pFormula);
       }
-      int exp = (int) BitwuzlaJNI.bitwuzla_sort_fp_get_exp_size(sort);
-      int man = (int) BitwuzlaJNI.bitwuzla_sort_fp_get_sig_size(sort) - 1;
+      int exp = sort.fp_exp_size();
+      int man = sort.fp_sig_size() - 1;
       return (FormulaType<T>) FormulaType.getFloatingPointType(exp, man);
-    } else if (BitwuzlaJNI.bitwuzla_sort_is_rm(sort)) {
+    } else if (sort.is_rm()) {
       return (FormulaType<T>) FormulaType.FloatingPointRoundingModeType;
     }
     return super.getFormulaType(pFormula);
   }
 
   @Override
-  public FormulaType<?> getFormulaType(Long formula) {
-    long pType = BitwuzlaJNI.bitwuzla_term_get_sort(formula);
+  public FormulaType<?> getFormulaType(Term formula) {
+    Sort pType = formula.sort();
     return bitwuzlaSortToType(pType);
   }
 
-  private BigDecimal parseIEEEbinaryFP(long pTerm) {
+  private BigDecimal parseIEEEbinaryFP(Term pTerm) {
     // The Bitwuzla string for FPs is always in binary, regardless of the second argument.
 
-    String fp = BitwuzlaJNI.bitwuzla_term_value_get_str(pTerm);
+    String fp = pTerm.toString();
 
     if (fp.length() == 32) {
       float result = Float.intBitsToFloat(Integer.parseUnsignedInt(fp, 2));
@@ -449,66 +369,70 @@ private BigDecimal parseIEEEbinaryFP(long pTerm) {
   }
 
   @Override
-  public <R> R visit(FormulaVisitor<R> visitor, Formula formula, Long f)
+  public <R> R visit(FormulaVisitor<R> visitor, Formula formula, Term f)
       throws UnsupportedOperationException {
-    BitwuzlaKind kind = BitwuzlaKind.swigToEnum(BitwuzlaJNI.bitwuzla_term_get_kind(f));
-    if (termIsConstant(f)) {
+    Kind kind = f.kind();
+    if (f.is_value()) {
       return visitor.visitConstant(formula, convertValue(f));
-
-    } else if (BitwuzlaJNI.bitwuzla_term_is_fp_value(f)) {
+    } else if (f.sort().is_fp()) {
       return visitor.visitConstant(formula, parseIEEEbinaryFP(f));
 
-    } else if (BitwuzlaJNI.bitwuzla_term_is_const(f)) {
-      String name = BitwuzlaJNI.bitwuzla_term_get_symbol(f);
+    } else if (f.is_const()) {
+      String name = f.symbol();
       return visitor.visitFreeVariable(formula, name);
 
-    } else if (BitwuzlaJNI.bitwuzla_term_is_var(f)) {
-      String name = BitwuzlaJNI.bitwuzla_term_get_symbol(f);
-      long sort = BitwuzlaJNI.bitwuzla_term_get_sort(f);
-      long originalVar = formulaCache.get(name, sort);
+    } else if (f.is_variable()) {
+      String name = f.symbol();
+      Sort sort = f.sort();
+      Term originalVar = formulaCache.get(name, sort);
       return visitor.visitBoundVariable(encapsulate(getFormulaType(originalVar), originalVar), 0);
 
-    } else if (kind.equals(BITWUZLA_KIND_EXISTS) || kind.equals(BITWUZLA_KIND_FORALL)) {
-      long[] children = BitwuzlaJNI.bitwuzla_term_get_children(f, new long[1]);
+    } else if (kind.equals(Kind.EXISTS) || kind.equals(Kind.FORALL)) {
+      Vector_Term children = f.children();
       // QUANTIFIER: replace bound variable with free variable for visitation
-      int size = children.length;
-      assert children.length == 2;
-      long bodyUnSub = children[size - 1];
+      int size = children.size();
+      assert size == 2;
+      Term body = children.get(size - 1);
       List<Formula> freeEncVars = new ArrayList<>();
       // The first length - 2 elements are bound vars, and the last element is the body
-      long[] boundVars = new long[size - 1];
-      long[] freeVars = new long[size - 1];
+      Term[] boundVars = new Term[size - 1];
+      Term[] freeVars = new Term[size - 1];
       for (int i = 0; i < size - 1; i++) {
-        long boundVar = children[i];
+        Term boundVar = children.get(i);
         boundVars[i] = boundVar;
-        String name = BitwuzlaJNI.bitwuzla_term_get_symbol(boundVar);
+        String name = boundVar.symbol();
         assert name != null;
-        long sort = BitwuzlaJNI.bitwuzla_term_get_sort(boundVar);
-        long freeVar = formulaCache.get(name, sort);
+        Sort sort = boundVar.sort();
+        Term freeVar = formulaCache.get(name, sort); // FIXME: Shouldn this be a fresh variable?
         freeVars[i] = freeVar;
         freeEncVars.add(encapsulate(getFormulaType(freeVar), freeVar));
       }
 
-      long bodySubbed = BitwuzlaJNI.bitwuzla_substitute_term(bodyUnSub, 1, boundVars, freeVars);
+      Map_TermTerm map = new Map_TermTerm();
+      for (int i = 0; i < boundVars.length; i++) {
+        map.put(boundVars[i], freeVars[i]);
+      }
+      // FIXME: This will change the original term
+      body.substitute(map);
 
-      Quantifier quant = kind.equals(BITWUZLA_KIND_EXISTS) ? Quantifier.EXISTS : Quantifier.FORALL;
+      Quantifier quant = kind.equals(Kind.EXISTS) ? Quantifier.EXISTS : Quantifier.FORALL;
       return visitor.visitQuantifier(
-          (BooleanFormula) formula, quant, freeEncVars, encapsulateBoolean(bodySubbed));
+          (BooleanFormula) formula, quant, freeEncVars, encapsulateBoolean(body));
 
     } else {
-      long[] args = BitwuzlaJNI.bitwuzla_term_get_children(f, new long[1]);
+      Vector_Term args = f.children();
       ImmutableList.Builder<Formula> arguments = ImmutableList.builder();
       ImmutableList.Builder<FormulaType<?>> argumentTypes = ImmutableList.builder();
 
-      String name = BitwuzlaJNI.bitwuzla_term_get_symbol(f);
+      String name = f.symbol();
 
       BitwuzlaDeclaration decl = null;
-      for (int i = 0; i < args.length; i++) {
-        long argument = args[i];
-        if (kind == BITWUZLA_KIND_APPLY && i == 0) {
+      for (int i = 0; i < args.size(); i++) {
+        Term argument = args.get(i);
+        if (kind == Kind.APPLY && i == 0) {
           // UFs carry the decl in the first child and the decl has the name
-          decl = new BitwuzlaDeclaration(argument, false);
-          name = BitwuzlaJNI.bitwuzla_term_get_symbol(argument);
+          decl = new BitwuzlaDeclaration(argument);
+          name = argument.symbol();
           continue;
         }
         FormulaType<?> type = getFormulaType(argument);
@@ -517,15 +441,15 @@ public <R> R visit(FormulaVisitor<R> visitor, Formula formula, Long f)
       }
 
       if (name == null) {
-        name = BitwuzlaJNI.bitwuzla_kind_to_string(BitwuzlaJNI.bitwuzla_term_get_kind(f));
+        name = f.kind().toString();
       }
       if (decl == null) {
-        decl = new BitwuzlaDeclaration(BitwuzlaJNI.bitwuzla_term_get_kind(f), true);
+        decl = new BitwuzlaDeclaration(f.kind());
       }
-      if (BitwuzlaJNI.bitwuzla_term_is_indexed(f)) {
+      if (f.num_indices() > 0) {
         // We need to retain the original formula as the declaration for indexed formulas,
         // otherwise we loose the index info, but we also need to know if its a kind or term
-        decl = new BitwuzlaDeclaration(f, false);
+        decl = new BitwuzlaDeclaration(f);
       }
 
       return visitor.visitFunction(
@@ -536,97 +460,79 @@ public <R> R visit(FormulaVisitor<R> visitor, Formula formula, Long f)
     }
   }
 
-  private boolean termIsConstant(long term) {
-    return BITWUZLA_KIND_VALUE.swigValue() == BitwuzlaJNI.bitwuzla_term_get_kind(term);
-  }
-
   @Override
-  public Long callFunctionImpl(BitwuzlaDeclaration declaration, List<Long> args) {
+  public Term callFunctionImpl(BitwuzlaDeclaration declaration, List<Term> args) {
     // For UFs the declaration needs to be a const wrapping of the function sort
     // For all other functions it needs to be the kind
     // BUT, we can never use a bitwuzla_term_is... function on a KIND
-    if (!declaration.isKind() && BitwuzlaJNI.bitwuzla_term_is_indexed(declaration.getTerm())) {
+    if (!declaration.isKind() && declaration.getTerm().num_indices() > 0) {
       // The term might be indexed, then we need index creation
-      long term = declaration.getTerm();
-      int properKind = BitwuzlaJNI.bitwuzla_term_get_kind(term);
-      if (BitwuzlaKind.swigToEnum(properKind) == BITWUZLA_KIND_BV_ZERO_EXTEND) {
-        System.out.println();
+      Term term = declaration.getTerm();
+      Kind properKind = term.kind();
+      if (properKind == Kind.BV_ZERO_EXTEND) {
+        // FIXME: Not implemented
+        throw new UnsupportedOperationException();
       }
-      long[] indices = BitwuzlaJNI.bitwuzla_term_get_indices(term, new long[1]);
-      return BitwuzlaJNI.bitwuzla_mk_term_indexed(
-          properKind,
-          args.size(),
-          args.stream().mapToLong(Long::longValue).toArray(),
-          indices.length,
-          indices);
+      return Bitwuzla.mk_term(properKind, new Vector_Term(args), term.indices());
     }
 
-    if (!declaration.isKind() && BitwuzlaJNI.bitwuzla_term_is_fun(declaration.getTerm())) {
-      long[] functionAndArgs =
-          LongStream.concat(
-                  LongStream.of(declaration.getTerm()), args.stream().mapToLong(Long::longValue))
-              .toArray();
-      return BitwuzlaJNI.bitwuzla_mk_term(
-          BITWUZLA_KIND_APPLY.swigValue(), functionAndArgs.length, functionAndArgs);
+    if (!declaration.isKind() && declaration.getTerm().sort().is_fun()) {
+      Vector_Term functionAndArgs = new Vector_Term();
+      functionAndArgs.add(declaration.getTerm());
+      functionAndArgs.addAll(args);
+      return Bitwuzla.mk_term(Kind.APPLY, functionAndArgs);
     }
 
     assert declaration.isKind();
-    long declKind = declaration.getKind();
 
-    return BitwuzlaJNI.bitwuzla_mk_term(
-        (int) declKind, args.size(), args.stream().mapToLong(Long::longValue).toArray());
+    return Bitwuzla.mk_term(declaration.getKind(), new Vector_Term(args));
   }
 
   @Override
-  public BitwuzlaDeclaration declareUFImpl(String name, Long pReturnType, List<Long> pArgTypes) {
+  public BitwuzlaDeclaration declareUFImpl(String name, Sort pReturnType, List<Sort> pArgTypes) {
     if (pArgTypes.isEmpty()) {
       // Bitwuzla does not support UFs with no args, so we make a variable
       // TODO: implement
       throw new UnsupportedOperationException("Bitwuzla does not support 0 arity UFs.");
     }
-    long functionSort =
-        BitwuzlaJNI.bitwuzla_mk_fun_sort(
-            pArgTypes.size(), pArgTypes.stream().mapToLong(Long::longValue).toArray(), pReturnType);
+    Sort functionSort = Bitwuzla.mk_fun_sort(new Vector_Sort(pArgTypes), pReturnType);
 
-    Long maybeFormula = formulaCache.get(name, functionSort);
+    Term maybeFormula = formulaCache.get(name, functionSort);
     if (maybeFormula != null) {
-      return new BitwuzlaDeclaration(maybeFormula, false);
+      return new BitwuzlaDeclaration(maybeFormula);
     }
 
-    long uf = BitwuzlaJNI.bitwuzla_mk_const(functionSort, name);
+    Term uf = Bitwuzla.mk_const(functionSort, name);
     formulaCache.put(name, functionSort, uf);
-    return new BitwuzlaDeclaration(uf, false);
+    return new BitwuzlaDeclaration(uf);
   }
 
   @Override
-  protected BitwuzlaDeclaration getBooleanVarDeclarationImpl(Long pLong) {
-    long kind = BitwuzlaJNI.bitwuzla_term_get_kind(pLong);
+  protected BitwuzlaDeclaration getBooleanVarDeclarationImpl(Term pTerm) {
+    Kind kind = pTerm.kind();
 
     // CONSTANTS are "variables" and Kind.VARIABLES are bound variables in for example quantifiers
-    assert kind == BITWUZLA_KIND_APPLY.swigValue() || kind == BITWUZLA_KIND_CONSTANT.swigValue()
-        : BitwuzlaJNI.bitwuzla_term_to_string(kind);
-    if (kind == BITWUZLA_KIND_APPLY.swigValue()) {
-      long[] size = new long[1];
-      long[] pChildren = BitwuzlaJNI.bitwuzla_term_get_children(pLong, size);
+    assert kind == Kind.APPLY || kind == Kind.CONSTANT : kind.toString();
+    if (kind == Kind.APPLY) {
       // Returns pointer to Uninterpreted Function used in Apply
-      return new BitwuzlaDeclaration(pChildren[0], false);
+      return new BitwuzlaDeclaration(pTerm.get(0));
     } else {
-      return new BitwuzlaDeclaration(pLong, true);
+      return new BitwuzlaDeclaration(pTerm);
     }
   }
 
   @Override
-  public Long extractInfo(Formula pT) {
+  public Term extractInfo(Formula pT) {
     return BitwuzlaFormulaManager.getBitwuzlaTerm(pT);
   }
 
   @Override
-  public BooleanFormula encapsulateBoolean(Long pTerm) {
+  public BooleanFormula encapsulateBoolean(Term pTerm) {
     assert getFormulaType(pTerm).isBooleanType();
     return new BitwuzlaBooleanFormula(pTerm);
   }
 
-  protected Table<String, Long, Long> getCache() {
+  protected Table<String, Sort, Term> getCache() {
     return formulaCache;
   }
 
@@ -637,27 +543,26 @@ protected boolean formulaCacheContains(String variable) {
   }
 
   // Optional that contains the variable to the entered String if there is one.
-  protected Optional<Long> getFormulaFromCache(String variable) {
-    Iterator<Entry<Long, Long>> entrySetIter = formulaCache.row(variable).entrySet().iterator();
+  protected Optional<Term> getFormulaFromCache(String variable) {
+    Iterator<Entry<Sort, Term>> entrySetIter = formulaCache.row(variable).entrySet().iterator();
     if (entrySetIter.hasNext()) {
-      // If there is a non empty row for an entry, there is only one entry
+      // If there is a non-empty row for an entry, there is only one entry
       return Optional.of(entrySetIter.next().getValue());
     }
     return Optional.empty();
   }
 
   @Override
-  public Object convertValue(Long term) {
-    String value;
-    long sort = BitwuzlaJNI.bitwuzla_term_get_sort(term);
-    if (BitwuzlaJNI.bitwuzla_term_is_const(term)) {
+  public Object convertValue(Term term) {
+    Sort sort = term.sort();
+    if (term.is_const()) {
       return null;
     }
-    if (BitwuzlaJNI.bitwuzla_sort_is_fun(sort)) {
+    if (sort.is_fun()) {
       // TODO: this is wrong
       throw new AssertionError("Error: Unknown sort and term");
     } else {
-      value = BitwuzlaJNI.bitwuzla_term_to_string(term);
+      String value = term.toString();
       if (value.startsWith("#b")) {
         // Bitvectors in Bitwuzla start with a #b
         return new BigInteger(value.substring(2), 2);
@@ -673,14 +578,12 @@ public Object convertValue(Long term) {
             .replace("#b", "")
             .replace("#b", "")
             .strip();
-      } else if (BitwuzlaJNI.bitwuzla_sort_is_rm(sort)) {
+      } else if (sort.is_rm()) {
         return value;
       }
     }
 
     throw new AssertionError(
-        "Error: Could not convert term to value; Unknown sort and term. "
-            + "Value: "
-            + BitwuzlaJNI.bitwuzla_term_to_string(term));
+        "Error: Could not convert term to value; Unknown sort and term. " + "Value: " + term);
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index da61462db4..fa187f811c 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -8,16 +8,25 @@
 
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
+
 import com.google.common.base.Preconditions;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import org.sosy_lab.common.Appender;
-import org.sosy_lab.common.Appenders;
 import org.sosy_lab.java_smt.api.BooleanFormula;
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormulaManager;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Options;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Parser;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
 final class BitwuzlaFormulaManager
-    extends AbstractFormulaManager<Long, Long, Long, BitwuzlaDeclaration> {
+    extends AbstractFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
+
+  private final Options bitwuzlaOption;
 
   BitwuzlaFormulaManager(
       BitwuzlaFormulaCreator pFormulaCreator,
@@ -26,7 +35,8 @@ final class BitwuzlaFormulaManager
       BitwuzlaBitvectorFormulaManager pBitvectorManager,
       BitwuzlaQuantifiedFormulaManager pQuantifierManager,
       BitwuzlaFloatingPointManager pFloatingPointManager,
-      BitwuzlaArrayFormulaManager pArrayManager) {
+      BitwuzlaArrayFormulaManager pArrayManager,
+      Options pBitwuzlaOptions) {
     super(
         pFormulaCreator,
         pFunctionManager,
@@ -40,6 +50,8 @@ final class BitwuzlaFormulaManager
         null,
         null,
         null);
+
+    bitwuzlaOption = pBitwuzlaOptions;
   }
 
   @Override
@@ -50,24 +62,31 @@ public BooleanFormula parse(String s) throws IllegalArgumentException {
     if (s.contains("(exit)")) {
       s = s.replace("(exit)", "");
     }
-    long[] terms = BitwuzlaJNI.parse(s);
-    Preconditions.checkArgument(terms != null, "Could not parse input string \"%s\"", s);
-    assert terms != null;
-    // AND all the terms
-    Long retForm;
-    if (terms.length > 1) {
-      retForm =
-          BitwuzlaJNI.bitwuzla_mk_term(
-              BitwuzlaKind.BITWUZLA_KIND_AND.swigValue(), terms.length, terms);
-    } else {
-      retForm = terms[0];
+
+    // create a temporary file and dump the formulas to it in SMTLIB2 format
+    Path file;
+    try {
+      file = Files.createTempFile("bitwuzla-", ".smt2");
+      Files.writeString(file, s);
+    } catch (IOException e) {
+      throw new RuntimeException("Could not created temporary file for parsing", e);
     }
-    assert BitwuzlaJNI.bitwuzla_term_is_bool(retForm);
-    return super.getFormulaCreator().encapsulateBoolean(retForm);
+
+    // run the parser on the temporary file
+    Parser parser = new Parser(bitwuzlaOption, file.toString());
+    String error = parser.parse(true);
+
+    Preconditions.checkArgument(error.isEmpty(), error);
+    Vector_Term assertions = parser.bitwuzla().get_assertions();
+
+    Preconditions.checkArgument(assertions.size() == 1, "Could not parse input string \"%s\"", s);
+    return getFormulaCreator().encapsulateBoolean(assertions.get(0));
   }
 
   @Override
-  public Appender dumpFormula(Long pTerm) {
+  public Appender dumpFormula(Term pTerm) {
+    // TODO: We need to reimplement this
+    /*
     // There are 2 ways of SMT2 printing in Bitwuzla, bitwuzla_term_print() and
     // bitwuzla_term_print_fmt(), which print a single formula, and bitwuzla_print_formula(),
     // which prints the complete assertion stack of the bitwuzla instance given to the function.
@@ -91,9 +110,11 @@ public void appendTo(Appendable out) throws IOException {
         out.append(dump);
       }
     };
+    */
+    throw new UnsupportedOperationException();
   }
 
-  static long getBitwuzlaTerm(Formula pT) {
+  static Term getBitwuzlaTerm(Formula pT) {
     return ((BitwuzlaFormula) pT).getTerm();
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaJNI.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaJNI.java
deleted file mode 100644
index 3939559601..0000000000
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaJNI.java
+++ /dev/null
@@ -1,758 +0,0 @@
-// This file is part of JavaSMT,
-// an API wrapper for a collection of SMT solvers:
-// https://github.com/sosy-lab/java-smt
-//
-// SPDX-FileCopyrightText: 2023 Dirk Beyer <https://www.sosy-lab.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package org.sosy_lab.java_smt.solvers.bitwuzla;
-
-@SuppressWarnings({"unused", "checkstyle:methodname", "checkstyle:parametername"})
-public class BitwuzlaJNI {
-  private BitwuzlaJNI() {}
-
-  public static final native long new_BitwuzlaTermArray(int jarg1);
-
-  public static final native void delete_BitwuzlaTermArray(long jarg1);
-
-  public static final native long BitwuzlaTermArray_getitem(long jarg1, int jarg2);
-
-  public static final native void BitwuzlaTermArray_setitem(long jarg1, int jarg2, long jarg3);
-
-  public static final native long new_BitwuzlaSortArray(int jarg1);
-
-  public static final native void delete_BitwuzlaSortArray(long jarg1);
-
-  public static final native long BitwuzlaSortArray_getitem(long jarg1, int jarg2);
-
-  public static final native void BitwuzlaSortArray_setitem(long jarg1, int jarg2, long jarg3);
-
-  public static final native long new_uint64_tArray(int jarg1);
-
-  public static final native void delete_uint64_tArray(long jarg1);
-
-  public static final native long uint64_tArray_getitem(long jarg1, int jarg2);
-
-  public static final native void uint64_tArray_setitem(long jarg1, int jarg2, long jarg3);
-
-  public static final native int true_get();
-
-  public static final native int false_get();
-
-  public static final native int __bool_true_false_are_defined_get();
-
-  public static final native int _STDIO_H_get();
-
-  public static final native int _FEATURES_H_get();
-
-  public static final native int _DEFAULT_SOURCE_get();
-
-  public static final native int __GLIBC_USE_ISOC2X_get();
-
-  public static final native int __USE_POSIX_IMPLICITLY_get();
-
-  public static final native int _POSIX_SOURCE_get();
-
-  public static final native int _POSIX_C_SOURCE_get();
-
-  public static final native int __USE_POSIX_get();
-
-  public static final native int __USE_POSIX2_get();
-
-  public static final native int __USE_POSIX199309_get();
-
-  public static final native int __USE_POSIX199506_get();
-
-  public static final native int __USE_XOPEN2K_get();
-
-  public static final native int __USE_ISOC95_get();
-
-  public static final native int __USE_ISOC99_get();
-
-  public static final native int __USE_XOPEN2K8_get();
-
-  public static final native int _ATFILE_SOURCE_get();
-
-  public static final native int __WORDSIZE_get();
-
-  public static final native int __WORDSIZE32_SIZE_ULONG_get();
-
-  public static final native int __WORDSIZE32_PTRDIFF_LONG_get();
-
-  public static final native int __WORDSIZE_TIME64_COMPAT32_get();
-
-  public static final native int __TIMESIZE_get();
-
-  public static final native int __USE_MISC_get();
-
-  public static final native int __USE_ATFILE_get();
-
-  public static final native int __USE_FORTIFY_LEVEL_get();
-
-  public static final native int __GLIBC_USE_DEPRECATED_GETS_get();
-
-  public static final native int __GLIBC_USE_DEPRECATED_SCANF_get();
-
-  public static final native int _STDC_PREDEF_H_get();
-
-  public static final native int __STDC_IEC_559___get();
-
-  public static final native int __STDC_IEC_60559_BFP___get();
-
-  public static final native int __STDC_IEC_559_COMPLEX___get();
-
-  public static final native int __STDC_IEC_60559_COMPLEX___get();
-
-  public static final native int __STDC_ISO_10646___get();
-
-  public static final native int __GNU_LIBRARY___get();
-
-  public static final native int __GLIBC___get();
-
-  public static final native int __GLIBC_MINOR___get();
-
-  public static final native int _SYS_CDEFS_H_get();
-
-  public static final native int __glibc_c99_flexarr_available_get();
-
-  public static final native int __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI_get();
-
-  public static final native int __HAVE_GENERIC_SELECTION_get();
-
-  public static final native int __GLIBC_USE_LIB_EXT2_get();
-
-  public static final native int __GLIBC_USE_IEC_60559_BFP_EXT_get();
-
-  public static final native int __GLIBC_USE_IEC_60559_BFP_EXT_C2X_get();
-
-  public static final native int __GLIBC_USE_IEC_60559_EXT_get();
-
-  public static final native int __GLIBC_USE_IEC_60559_FUNCS_EXT_get();
-
-  public static final native int __GLIBC_USE_IEC_60559_FUNCS_EXT_C2X_get();
-
-  public static final native int __GLIBC_USE_IEC_60559_TYPES_EXT_get();
-
-  public static final native int _BITS_TYPES_H_get();
-
-  public static final native int _BITS_TYPESIZES_H_get();
-
-  public static final native int __RLIM_T_MATCHES_RLIM64_T_get();
-
-  public static final native int __STATFS_MATCHES_STATFS64_get();
-
-  public static final native int __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64_get();
-
-  public static final native int __FD_SETSIZE_get();
-
-  public static final native int _BITS_TIME64_H_get();
-
-  public static final native long new___fpos64_t();
-
-  public static final native void delete___fpos64_t(long jarg1);
-
-  public static final native int ____FILE_defined_get();
-
-  public static final native int __FILE_defined_get();
-
-  public static final native int __struct_FILE_defined_get();
-
-  public static final native long new__IO_FILE();
-
-  public static final native void delete__IO_FILE(long jarg1);
-
-  public static final native int _IO_EOF_SEEN_get();
-
-  public static final native int _IO_ERR_SEEN_get();
-
-  public static final native int _IO_USER_LOCK_get();
-
-  public static final native int _IOFBF_get();
-
-  public static final native int _IOLBF_get();
-
-  public static final native int _IONBF_get();
-
-  public static final native int BUFSIZ_get();
-
-  public static final native int EOF_get();
-
-  public static final native int SEEK_SET_get();
-
-  public static final native int SEEK_CUR_get();
-
-  public static final native int SEEK_END_get();
-
-  public static final native String P_tmpdir_get();
-
-  public static final native int _BITS_STDIO_LIM_H_get();
-
-  public static final native int L_tmpnam_get();
-
-  public static final native int TMP_MAX_get();
-
-  public static final native int FILENAME_MAX_get();
-
-  public static final native int L_ctermid_get();
-
-  public static final native int FOPEN_MAX_get();
-
-  public static final native long stdin_get();
-
-  public static final native long stdout_get();
-
-  public static final native long stderr_get();
-
-  public static final native int remove(String jarg1);
-
-  public static final native int rename(String jarg1, String jarg2);
-
-  public static final native int renameat(int jarg1, String jarg2, int jarg3, String jarg4);
-
-  public static final native long tmpfile();
-
-  public static final native String tmpnam(String jarg1);
-
-  public static final native String tmpnam_r(String jarg1);
-
-  public static final native String tempnam(String jarg1, String jarg2);
-
-  public static final native long fopen(String jarg1, String jarg2);
-
-  public static final native long fdopen(int jarg1, String jarg2);
-
-  public static final native long fmemopen(long jarg1, long jarg2, String jarg3);
-
-  public static final native long open_memstream(long jarg1, long jarg2);
-
-  public static final native int printf(String jarg1);
-
-  public static final native int sprintf(String jarg1, String jarg2);
-
-  public static final native int vprintf(String jarg1, long jarg2);
-
-  public static final native int vsprintf(String jarg1, String jarg2, long jarg3);
-
-  public static final native int snprintf(String jarg1, long jarg2, String jarg3);
-
-  public static final native int vsnprintf(String jarg1, long jarg2, String jarg3, long jarg4);
-
-  public static final native int vdprintf(int jarg1, String jarg2, long jarg3);
-
-  public static final native int dprintf(int jarg1, String jarg2);
-
-  public static final native int scanf(String jarg1);
-
-  public static final native int sscanf(String jarg1, String jarg2);
-
-  public static final native int __HAVE_FLOAT128_get();
-
-  public static final native int __HAVE_DISTINCT_FLOAT128_get();
-
-  public static final native int __HAVE_FLOAT64X_get();
-
-  public static final native int __HAVE_FLOAT64X_LONG_DOUBLE_get();
-
-  public static final native int __HAVE_FLOAT16_get();
-
-  public static final native int __HAVE_FLOAT32_get();
-
-  public static final native int __HAVE_FLOAT64_get();
-
-  public static final native int __HAVE_FLOAT32X_get();
-
-  public static final native int __HAVE_FLOAT128X_get();
-
-  public static final native int __HAVE_DISTINCT_FLOAT16_get();
-
-  public static final native int __HAVE_DISTINCT_FLOAT32_get();
-
-  public static final native int __HAVE_DISTINCT_FLOAT64_get();
-
-  public static final native int __HAVE_DISTINCT_FLOAT32X_get();
-
-  public static final native int __HAVE_DISTINCT_FLOAT64X_get();
-
-  public static final native int __HAVE_DISTINCT_FLOAT128X_get();
-
-  public static final native int __HAVE_FLOATN_NOT_TYPEDEF_get();
-
-  public static final native int __isoc99_scanf(String jarg1);
-
-  public static final native int __isoc99_sscanf(String jarg1, String jarg2);
-
-  public static final native int vscanf(String jarg1, long jarg2);
-
-  public static final native int vsscanf(String jarg1, String jarg2, long jarg3);
-
-  public static final native int __isoc99_vscanf(String jarg1, long jarg2);
-
-  public static final native int __isoc99_vsscanf(String jarg1, String jarg2, long jarg3);
-
-  public static final native int getchar();
-
-  public static final native int getchar_unlocked();
-
-  public static final native int putchar(int jarg1);
-
-  public static final native int putchar_unlocked(int jarg1);
-
-  public static final native int puts(String jarg1);
-
-  public static final native void perror(String jarg1);
-
-  public static final native long popen(String jarg1, String jarg2);
-
-  public static final native String ctermid(String jarg1);
-
-  public static final native int BITWUZLA_SAT_get();
-
-  public static final native int BITWUZLA_UNSAT_get();
-
-  public static final native int BITWUZLA_UNKNOWN_get();
-
-  public static final native int BITWUZLA_RM_RNE_get();
-
-  public static final native int BITWUZLA_RM_RNA_get();
-
-  public static final native int BITWUZLA_RM_RTN_get();
-
-  public static final native int BITWUZLA_RM_RTP_get();
-
-  public static final native int BITWUZLA_RM_RTZ_get();
-
-  public static final native int BITWUZLA_RM_MAX_get();
-
-  public static final native int BITWUZLA_KIND_CONSTANT_get();
-
-  public static final native String bitwuzla_copyright();
-
-  public static final native String bitwuzla_version();
-
-  public static final native String bitwuzla_git_id();
-
-  public static final native void BitwuzlaOptionInfo_opt_set(
-      long jarg1, BitwuzlaOptionInfo jarg1_, int jarg2);
-
-  public static final native int BitwuzlaOptionInfo_opt_get(long jarg1, BitwuzlaOptionInfo jarg1_);
-
-  public static final native void BitwuzlaOptionInfo_shrt_set(
-      long jarg1, BitwuzlaOptionInfo jarg1_, String jarg2);
-
-  public static final native String BitwuzlaOptionInfo_shrt_get(
-      long jarg1, BitwuzlaOptionInfo jarg1_);
-
-  public static final native void BitwuzlaOptionInfo_lng_set(
-      long jarg1, BitwuzlaOptionInfo jarg1_, String jarg2);
-
-  public static final native String BitwuzlaOptionInfo_lng_get(
-      long jarg1, BitwuzlaOptionInfo jarg1_);
-
-  public static final native void BitwuzlaOptionInfo_description_set(
-      long jarg1, BitwuzlaOptionInfo jarg1_, String jarg2);
-
-  public static final native String BitwuzlaOptionInfo_description_get(
-      long jarg1, BitwuzlaOptionInfo jarg1_);
-
-  public static final native void BitwuzlaOptionInfo_is_numeric_set(
-      long jarg1, BitwuzlaOptionInfo jarg1_, boolean jarg2);
-
-  public static final native boolean BitwuzlaOptionInfo_is_numeric_get(
-      long jarg1, BitwuzlaOptionInfo jarg1_);
-
-  public static final native void BitwuzlaOptionInfo_numeric_set(
-      long jarg1, BitwuzlaOptionInfo jarg1_, long jarg2, NumericValue jarg2_);
-
-  public static final native long BitwuzlaOptionInfo_numeric_get(
-      long jarg1, BitwuzlaOptionInfo jarg1_);
-
-  public static final native long BitwuzlaOptionInfo_mode_get(
-      long jarg1, BitwuzlaOptionInfo jarg1_);
-
-  public static final native long new_BitwuzlaOptionInfo();
-
-  public static final native void delete_BitwuzlaOptionInfo(long jarg1);
-
-  public static final native void NumericValue_cur_set(long jarg1, NumericValue jarg1_, long jarg2);
-
-  public static final native long NumericValue_cur_get(long jarg1, NumericValue jarg1_);
-
-  public static final native void NumericValue_dflt_set(
-      long jarg1, NumericValue jarg1_, long jarg2);
-
-  public static final native long NumericValue_dflt_get(long jarg1, NumericValue jarg1_);
-
-  public static final native void NumericValue_min_set(long jarg1, NumericValue jarg1_, long jarg2);
-
-  public static final native long NumericValue_min_get(long jarg1, NumericValue jarg1_);
-
-  public static final native void NumericValue_max_set(long jarg1, NumericValue jarg1_, long jarg2);
-
-  public static final native long NumericValue_max_get(long jarg1, NumericValue jarg1_);
-
-  public static final native long new_NumericValue();
-
-  public static final native void delete_NumericValue(long jarg1);
-
-  public static final native long new_ModeValue();
-
-  public static final native void delete_ModeValue(long jarg1);
-
-  public static final native long bitwuzla_options_new();
-
-  public static final native void bitwuzla_options_delete(long jarg1);
-
-  public static final native boolean bitwuzla_option_is_valid(long jarg1, String jarg2);
-
-  public static final native boolean bitwuzla_option_is_numeric(long jarg1, int jarg2);
-
-  public static final native boolean bitwuzla_option_is_mode(long jarg1, int jarg2);
-
-  public static final native void bitwuzla_set_option(long jarg1, int jarg2, long jarg3);
-
-  public static final native void bitwuzla_set_option_mode(long jarg1, int jarg2, String jarg3);
-
-  public static final native long bitwuzla_get_option(long jarg1, int jarg2);
-
-  public static final native String bitwuzla_get_option_mode(long jarg1, int jarg2);
-
-  public static final native void bitwuzla_get_option_info(
-      long jarg1, int jarg2, long jarg3, BitwuzlaOptionInfo jarg3_);
-
-  public static final native String bitwuzla_result_to_string(int jarg1);
-
-  public static final native String bitwuzla_rm_to_string(int jarg1);
-
-  public static final native String bitwuzla_kind_to_string(int jarg1);
-
-  public static final native long bitwuzla_sort_hash(long jarg1);
-
-  public static final native long bitwuzla_sort_bv_get_size(long jarg1);
-
-  public static final native long bitwuzla_sort_fp_get_exp_size(long jarg1);
-
-  public static final native long bitwuzla_sort_fp_get_sig_size(long jarg1);
-
-  public static final native long bitwuzla_sort_array_get_index(long jarg1);
-
-  public static final native long bitwuzla_sort_array_get_element(long jarg1);
-
-  public static final native long bitwuzla_sort_fun_get_domain_sorts(long jarg1, long[] jarg2);
-
-  public static final native long bitwuzla_sort_fun_get_codomain(long jarg1);
-
-  public static final native long bitwuzla_sort_fun_get_arity(long jarg1);
-
-  public static final native String bitwuzla_sort_get_uninterpreted_symbol(long jarg1);
-
-  public static final native boolean bitwuzla_sort_is_equal(long jarg1, long jarg2);
-
-  public static final native boolean bitwuzla_sort_is_array(long jarg1);
-
-  public static final native boolean bitwuzla_sort_is_bool(long jarg1);
-
-  public static final native boolean bitwuzla_sort_is_bv(long jarg1);
-
-  public static final native boolean bitwuzla_sort_is_fp(long jarg1);
-
-  public static final native boolean bitwuzla_sort_is_fun(long jarg1);
-
-  public static final native boolean bitwuzla_sort_is_rm(long jarg1);
-
-  public static final native boolean bitwuzla_sort_is_uninterpreted(long jarg1);
-
-  public static final native String bitwuzla_sort_to_string(long jarg1);
-
-  public static final native long bitwuzla_term_hash(long jarg1);
-
-  public static final native int bitwuzla_term_get_kind(long jarg1);
-
-  public static final native long[] bitwuzla_term_get_children(long jarg1, long[] jarg2);
-
-  public static final native long[] bitwuzla_term_get_indices(long jarg1, long[] jarg2);
-
-  public static final native boolean bitwuzla_term_is_indexed(long jarg1);
-
-  public static final native long bitwuzla_term_get_sort(long jarg1);
-
-  public static final native long bitwuzla_term_array_get_index_sort(long jarg1);
-
-  public static final native long bitwuzla_term_array_get_element_sort(long jarg1);
-
-  public static final native long bitwuzla_term_fun_get_domain_sorts(long jarg1, long[] jarg2);
-
-  public static final native long bitwuzla_term_fun_get_codomain_sort(long jarg1);
-
-  public static final native long bitwuzla_term_bv_get_size(long jarg1);
-
-  public static final native long bitwuzla_term_fp_get_exp_size(long jarg1);
-
-  public static final native long bitwuzla_term_fp_get_sig_size(long jarg1);
-
-  public static final native long bitwuzla_term_fun_get_arity(long jarg1);
-
-  public static final native String bitwuzla_term_get_symbol(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_equal_sort(long jarg1, long jarg2);
-
-  public static final native boolean bitwuzla_term_is_array(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_const(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_fun(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_var(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_value(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_bv_value(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_fp_value(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_rm_value(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_bool(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_bv(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_fp(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_rm(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_uninterpreted(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_true(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_false(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_bv_value_zero(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_bv_value_one(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_bv_value_ones(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_bv_value_min_signed(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_bv_value_max_signed(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_fp_value_pos_zero(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_fp_value_neg_zero(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_fp_value_pos_inf(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_fp_value_neg_inf(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_fp_value_nan(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_rm_value_rna(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_rm_value_rne(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_rm_value_rtn(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_rm_value_rtp(long jarg1);
-
-  public static final native boolean bitwuzla_term_is_rm_value_rtz(long jarg1);
-
-  public static final native boolean bitwuzla_term_value_get_bool(long jarg1);
-
-  public static final native String bitwuzla_term_value_get_str(long jarg1);
-
-  public static final native String bitwuzla_term_value_get_str_fmt(long jarg1, int jarg2);
-
-  public static final native void bitwuzla_term_value_get_fp_ieee(
-      long jarg1, long jarg2, long jarg3, long jarg4, int jarg5);
-
-  public static final native int bitwuzla_term_value_get_rm(long jarg1);
-
-  public static final native String bitwuzla_term_to_string(long jarg1);
-
-  public static final native String bitwuzla_term_to_string_fmt(long jarg1, int jarg2);
-
-  public static final native long bitwuzla_new(long options);
-
-  public static final native void bitwuzla_delete(long env);
-
-  public static final native void bitwuzla_set_termination_callback(
-      long jarg1, long jarg2, long jarg3);
-
-  public static final native long bitwuzla_get_termination_callback_state(long jarg1);
-
-  public static final native void bitwuzla_set_abort_callback(long jarg1);
-
-  public static final native void bitwuzla_push(long env, long numOfLevels);
-
-  public static final native void bitwuzla_pop(long env, long numOfLevel);
-
-  public static final native void bitwuzla_assert(long env, long jarg2);
-
-  public static final native long bitwuzla_get_assertions(long jarg1, long[] jarg2);
-
-  public static final native boolean bitwuzla_is_unsat_assumption(long jarg1, long jarg2);
-
-  public static final native long bitwuzla_get_unsat_assumptions(long jarg1, long[] jarg2);
-
-  public static final native long bitwuzla_get_unsat_core(long env, long[] jarg2);
-
-  public static final native void bitwuzla_simplify(long jarg1);
-
-  public static final native int bitwuzla_check_sat(long env);
-
-  public static final native int bitwuzla_check_sat_assuming(long jarg1, long jarg2, long[] jarg3);
-
-  public static final native long bitwuzla_get_value(long env, long term);
-
-  public static final native void bitwuzla_get_statistics(
-      long jarg1, long jarg2, long jarg3, long[] jarg4);
-
-  public static final native long bitwuzla_mk_array_sort(long index, long element);
-
-  public static final native long bitwuzla_mk_bool_sort();
-
-  public static final native long bitwuzla_mk_bv_sort(long width);
-
-  public static final native long bitwuzla_mk_fp_sort(long exponent, long significant);
-
-  public static final native long bitwuzla_mk_fun_sort(long arity, long[] domain, long codomain);
-
-  public static final native long bitwuzla_mk_rm_sort();
-
-  public static final native long bitwuzla_mk_uninterpreted_sort(String symbol);
-
-  public static final native long bitwuzla_mk_true();
-
-  public static final native long bitwuzla_mk_false();
-
-  public static final native long bitwuzla_mk_bv_zero(long jarg1);
-
-  public static final native long bitwuzla_mk_bv_one(long jarg1);
-
-  public static final native long bitwuzla_mk_bv_ones(long jarg1);
-
-  public static final native long bitwuzla_mk_bv_min_signed(long jarg1);
-
-  public static final native long bitwuzla_mk_bv_max_signed(long jarg1);
-
-  public static final native long bitwuzla_mk_fp_pos_zero(long jarg1);
-
-  public static final native long bitwuzla_mk_fp_neg_zero(long jarg1);
-
-  public static final native long bitwuzla_mk_fp_pos_inf(long jarg1);
-
-  public static final native long bitwuzla_mk_fp_neg_inf(long jarg1);
-
-  public static final native long bitwuzla_mk_fp_nan(long jarg1);
-
-  public static final native long bitwuzla_mk_bv_value(long jarg1, String jarg2, int jarg3);
-
-  public static final native long bitwuzla_mk_bv_value_uint64(long jarg1, long jarg2);
-
-  public static final native long bitwuzla_mk_bv_value_int64(long jarg1, int jarg2);
-
-  public static final native long bitwuzla_mk_fp_value(long jarg1, long jarg2, long jarg3);
-
-  public static final native long bitwuzla_mk_fp_from_real(long jarg1, long jarg2, String jarg3);
-
-  public static final native long bitwuzla_mk_fp_from_rational(
-      long jarg1, long jarg2, String jarg3, String jarg4);
-
-  public static final native long bitwuzla_mk_rm_value(int jarg1);
-
-  public static final native long bitwuzla_mk_term1(int jarg1, long jarg2);
-
-  public static final native long bitwuzla_mk_term2(int jarg1, long jarg2, long jarg3);
-
-  public static final native long bitwuzla_mk_term3(int jarg1, long jarg2, long jarg3, long jarg4);
-
-  public static final native long bitwuzla_mk_term(int jarg1, long jarg2, long[] jarg3);
-
-  public static final native long bitwuzla_mk_term1_indexed1(int jarg1, long jarg2, long jarg3);
-
-  public static final native long bitwuzla_mk_term1_indexed2(
-      int jarg1, long jarg2, long jarg3, long jarg4);
-
-  public static final native long bitwuzla_mk_term2_indexed1(
-      int jarg1, long jarg2, long jarg3, long jarg4);
-
-  public static final native long bitwuzla_mk_term2_indexed2(
-      int jarg1, long jarg2, long jarg3, long jarg4, long jarg5);
-
-  public static final native long bitwuzla_mk_term_indexed(
-      int jarg1, long jarg2, long[] jarg3, long jarg4, long[] jarg5);
-
-  public static final native long bitwuzla_mk_const(long jarg1, String jarg2);
-
-  public static final native long bitwuzla_mk_const_array(long jarg1, long jarg2);
-
-  public static final native long bitwuzla_mk_var(long jarg1, String jarg2);
-
-  public static final native long bitwuzla_substitute_term(
-      long jarg1, long jarg2, long[] jarg3, long[] jarg4);
-
-  public static final native void bitwuzla_substitute_terms(
-      long sizeOfTermsToSubstituteIn,
-      long[] termsToSubstituteIn,
-      long sizeOfSubstitutionMap,
-      long[] mapKeys,
-      long[] mapValues);
-
-  public static final native void bitwuzla_parser_delete(long jarg1);
-
-  public static final native String bitwuzla_parser_parse(long jarg1, boolean jarg2);
-
-  public static final native long bitwuzla_parser_get_bitwuzla(long jarg1);
-
-  // This returns the assertions of the input String as formulas individually
-  public static final native long[] parse(String jarg);
-
-  /**
-   * Dumps the SMT2 String representation of a entered Bitwuzla term.
-   *
-   * @param term Bitwuzla term.
-   * @param baseOfValueInterpretation base of the values to be printed. I.e. 2, 10 or 16.
-   * @return String of the term.
-   */
-  public static final native String dump_formula_smt2(long term, int baseOfValueInterpretation);
-
-  /**
-   * Prints the assertion stack of the entered Bitwuzla environment.
-   *
-   * @param env a Bitwuzla environment where the assertion stack should be printed.
-   * @param baseOfValueInterpretation base of the values to be printed. I.e. 2, 10 or 16.
-   * @return String of the terms on the assertion stack.
-   */
-  public static final native String dump_assertions_smt2(long env, int baseOfValueInterpretation);
-
-  /**
-   * Sets termination callback to chosen implementation of a method.
-   *
-   * @param env instance
-   * @param terminationCallback TerminationCallback method
-   * @return address to helper struct. Call method boolector_free_termination with it to free its
-   *     ressources after termination!
-   */
-  protected static native long set_termination(long env, TerminationCallback terminationCallback);
-
-  /**
-   * Frees resources of the termination callback function. Call ONLY after termination has occured
-   * with the return value of set_termination of its instance!
-   *
-   * @param helper address to helper struct used in termination callback.
-   */
-  protected static native void free_termination(long helper);
-
-  /** This is used to get the methodID for the JNI call to the termination callback method. */
-  interface TerminationCallback {
-    boolean shouldTerminate() throws InterruptedException;
-  }
-}
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaKind.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaKind.java
deleted file mode 100644
index 430c46069d..0000000000
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaKind.java
+++ /dev/null
@@ -1,314 +0,0 @@
-// This file is part of JavaSMT,
-// an API wrapper for a collection of SMT solvers:
-// https://github.com/sosy-lab/java-smt
-//
-// SPDX-FileCopyrightText: 2023 Dirk Beyer <https://www.sosy-lab.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package org.sosy_lab.java_smt.solvers.bitwuzla;
-
-public final class BitwuzlaKind {
-  // FIXME: We should use SWIG to auto-generate the enum for us. This class will break whenever
-  //  bitwuzla changes their definitions.
-
-  private static int swigNext = 0;
-  private final int swigValue;
-  private final String swigName;
-  public static final BitwuzlaKind BITWUZLA_KIND_CONSTANT =
-      BitwuzlaKind.of("BITWUZLA_KIND_CONSTANT", BitwuzlaJNI.BITWUZLA_KIND_CONSTANT_get());
-  public static final BitwuzlaKind BITWUZLA_KIND_CONST_ARRAY =
-      BitwuzlaKind.of("BITWUZLA_KIND_CONST_ARRAY");
-  public static final BitwuzlaKind BITWUZLA_KIND_VALUE = BitwuzlaKind.of("BITWUZLA_KIND_VALUE");
-  public static final BitwuzlaKind BITWUZLA_KIND_VARIABLE =
-      BitwuzlaKind.of("BITWUZLA_KIND_VARIABLE");
-  public static final BitwuzlaKind BITWUZLA_KIND_AND = BitwuzlaKind.of("BITWUZLA_KIND_AND");
-  public static final BitwuzlaKind BITWUZLA_KIND_DISTINCT =
-      BitwuzlaKind.of("BITWUZLA_KIND_DISTINCT");
-  public static final BitwuzlaKind BITWUZLA_KIND_EQUAL = BitwuzlaKind.of("BITWUZLA_KIND_EQUAL");
-  public static final BitwuzlaKind BITWUZLA_KIND_IFF = BitwuzlaKind.of("BITWUZLA_KIND_IFF");
-  public static final BitwuzlaKind BITWUZLA_KIND_IMPLIES = BitwuzlaKind.of("BITWUZLA_KIND_IMPLIES");
-  public static final BitwuzlaKind BITWUZLA_KIND_NOT = BitwuzlaKind.of("BITWUZLA_KIND_NOT");
-  public static final BitwuzlaKind BITWUZLA_KIND_OR = BitwuzlaKind.of("BITWUZLA_KIND_OR");
-  public static final BitwuzlaKind BITWUZLA_KIND_XOR = BitwuzlaKind.of("BITWUZLA_KIND_XOR");
-  public static final BitwuzlaKind BITWUZLA_KIND_ITE = BitwuzlaKind.of("BITWUZLA_KIND_ITE");
-  public static final BitwuzlaKind BITWUZLA_KIND_EXISTS = BitwuzlaKind.of("BITWUZLA_KIND_EXISTS");
-  public static final BitwuzlaKind BITWUZLA_KIND_FORALL = BitwuzlaKind.of("BITWUZLA_KIND_FORALL");
-  public static final BitwuzlaKind BITWUZLA_KIND_APPLY = BitwuzlaKind.of("BITWUZLA_KIND_APPLY");
-  public static final BitwuzlaKind BITWUZLA_KIND_LAMBDA = BitwuzlaKind.of("BITWUZLA_KIND_LAMBDA");
-  public static final BitwuzlaKind BITWUZLA_KIND_ARRAY_SELECT =
-      BitwuzlaKind.of("BITWUZLA_KIND_ARRAY_SELECT");
-  public static final BitwuzlaKind BITWUZLA_KIND_ARRAY_STORE =
-      BitwuzlaKind.of("BITWUZLA_KIND_ARRAY_STORE");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_ADD = BitwuzlaKind.of("BITWUZLA_KIND_BV_ADD");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_AND = BitwuzlaKind.of("BITWUZLA_KIND_BV_AND");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_ASHR = BitwuzlaKind.of("BITWUZLA_KIND_BV_ASHR");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_COMP = BitwuzlaKind.of("BITWUZLA_KIND_BV_COMP");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_CONCAT =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_CONCAT");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_DEC = BitwuzlaKind.of("BITWUZLA_KIND_BV_DEC");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_INC = BitwuzlaKind.of("BITWUZLA_KIND_BV_INC");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_MUL = BitwuzlaKind.of("BITWUZLA_KIND_BV_MUL");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_NAND = BitwuzlaKind.of("BITWUZLA_KIND_BV_NAND");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_NEG = BitwuzlaKind.of("BITWUZLA_KIND_BV_NEG");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_NEG_OVERFLOW =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_NEG_OVERFLOW");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_NOR = BitwuzlaKind.of("BITWUZLA_KIND_BV_NOR");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_NOT = BitwuzlaKind.of("BITWUZLA_KIND_BV_NOT");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_OR = BitwuzlaKind.of("BITWUZLA_KIND_BV_OR");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_REDAND =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_REDAND");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_REDOR =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_REDOR");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_REDXOR =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_REDXOR");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_ROL = BitwuzlaKind.of("BITWUZLA_KIND_BV_ROL");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_ROR = BitwuzlaKind.of("BITWUZLA_KIND_BV_ROR");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SADD_OVERFLOW =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_SADD_OVERFLOW");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SDIV_OVERFLOW =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_SDIV_OVERFLOW");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SDIV = BitwuzlaKind.of("BITWUZLA_KIND_BV_SDIV");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SGE = BitwuzlaKind.of("BITWUZLA_KIND_BV_SGE");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SGT = BitwuzlaKind.of("BITWUZLA_KIND_BV_SGT");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SHL = BitwuzlaKind.of("BITWUZLA_KIND_BV_SHL");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SHR = BitwuzlaKind.of("BITWUZLA_KIND_BV_SHR");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SLE = BitwuzlaKind.of("BITWUZLA_KIND_BV_SLE");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SLT = BitwuzlaKind.of("BITWUZLA_KIND_BV_SLT");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SMOD = BitwuzlaKind.of("BITWUZLA_KIND_BV_SMOD");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SMUL_OVERFLOW =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_SMUL_OVERFLOW");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SREM = BitwuzlaKind.of("BITWUZLA_KIND_BV_SREM");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SSUB_OVERFLOW =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_SSUB_OVERFLOW");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SUB = BitwuzlaKind.of("BITWUZLA_KIND_BV_SUB");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_UADD_OVERFLOW =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_UADD_OVERFLOW");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_UDIV = BitwuzlaKind.of("BITWUZLA_KIND_BV_UDIV");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_UGE = BitwuzlaKind.of("BITWUZLA_KIND_BV_UGE");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_UGT = BitwuzlaKind.of("BITWUZLA_KIND_BV_UGT");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_ULE = BitwuzlaKind.of("BITWUZLA_KIND_BV_ULE");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_ULT = BitwuzlaKind.of("BITWUZLA_KIND_BV_ULT");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_UMUL_OVERFLOW =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_UMUL_OVERFLOW");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_UREM = BitwuzlaKind.of("BITWUZLA_KIND_BV_UREM");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_USUB_OVERFLOW =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_USUB_OVERFLOW");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_XNOR = BitwuzlaKind.of("BITWUZLA_KIND_BV_XNOR");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_XOR = BitwuzlaKind.of("BITWUZLA_KIND_BV_XOR");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_EXTRACT =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_EXTRACT");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_REPEAT =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_REPEAT");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_ROLI = BitwuzlaKind.of("BITWUZLA_KIND_BV_ROLI");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_RORI = BitwuzlaKind.of("BITWUZLA_KIND_BV_RORI");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_SIGN_EXTEND =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_SIGN_EXTEND");
-  public static final BitwuzlaKind BITWUZLA_KIND_BV_ZERO_EXTEND =
-      BitwuzlaKind.of("BITWUZLA_KIND_BV_ZERO_EXTEND");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_ABS = BitwuzlaKind.of("BITWUZLA_KIND_FP_ABS");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_ADD = BitwuzlaKind.of("BITWUZLA_KIND_FP_ADD");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_DIV = BitwuzlaKind.of("BITWUZLA_KIND_FP_DIV");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_EQUAL =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_EQUAL");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_FMA = BitwuzlaKind.of("BITWUZLA_KIND_FP_FMA");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_FP = BitwuzlaKind.of("BITWUZLA_KIND_FP_FP");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_GEQ = BitwuzlaKind.of("BITWUZLA_KIND_FP_GEQ");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_GT = BitwuzlaKind.of("BITWUZLA_KIND_FP_GT");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_IS_INF =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_IS_INF");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_IS_NAN =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_IS_NAN");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_IS_NEG =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_IS_NEG");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_IS_NORMAL =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_IS_NORMAL");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_IS_POS =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_IS_POS");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_IS_SUBNORMAL =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_IS_SUBNORMAL");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_IS_ZERO =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_IS_ZERO");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_LEQ = BitwuzlaKind.of("BITWUZLA_KIND_FP_LEQ");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_LT = BitwuzlaKind.of("BITWUZLA_KIND_FP_LT");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_MAX = BitwuzlaKind.of("BITWUZLA_KIND_FP_MAX");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_MIN = BitwuzlaKind.of("BITWUZLA_KIND_FP_MIN");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_MUL = BitwuzlaKind.of("BITWUZLA_KIND_FP_MUL");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_NEG = BitwuzlaKind.of("BITWUZLA_KIND_FP_NEG");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_REM = BitwuzlaKind.of("BITWUZLA_KIND_FP_REM");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_RTI = BitwuzlaKind.of("BITWUZLA_KIND_FP_RTI");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_SQRT = BitwuzlaKind.of("BITWUZLA_KIND_FP_SQRT");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_SUB = BitwuzlaKind.of("BITWUZLA_KIND_FP_SUB");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_TO_FP_FROM_BV =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_TO_FP_FROM_BV");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_TO_FP_FROM_FP =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_TO_FP_FROM_FP");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_TO_FP_FROM_SBV =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_TO_FP_FROM_SBV");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_TO_FP_FROM_UBV =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_TO_FP_FROM_UBV");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_TO_SBV =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_TO_SBV");
-  public static final BitwuzlaKind BITWUZLA_KIND_FP_TO_UBV =
-      BitwuzlaKind.of("BITWUZLA_KIND_FP_TO_UBV");
-  public static final BitwuzlaKind BITWUZLA_KIND_NUM_KINDS =
-      BitwuzlaKind.of("BITWUZLA_KIND_NUM_KINDS");
-
-  public int swigValue() {
-    return swigValue;
-  }
-
-  @Override
-  public String toString() {
-    return swigName;
-  }
-
-  public static BitwuzlaKind swigToEnum(int swigValue) {
-    if (swigValue < swigValues.length
-        && swigValue >= 0
-        && swigValues[swigValue].swigValue == swigValue) {
-      return swigValues[swigValue];
-    }
-    for (int i = 0; i < swigValues.length; i++) {
-      if (swigValues[i].swigValue == swigValue) {
-        return swigValues[i];
-      }
-    }
-    throw new IllegalArgumentException(
-        "No enum " + BitwuzlaKind.class + " with value " + swigValue);
-  }
-
-  private BitwuzlaKind(String swigName) {
-    this.swigName = swigName;
-    this.swigValue = BitwuzlaKind.swigNext;
-  }
-
-  private static BitwuzlaKind of(String swigName) {
-    BitwuzlaKind kind = new BitwuzlaKind(swigName);
-    BitwuzlaKind.swigNext++;
-    return kind;
-  }
-
-  private BitwuzlaKind(String swigName, int swigValue) {
-    this.swigName = swigName;
-    this.swigValue = swigValue;
-  }
-
-  private static BitwuzlaKind of(String swigName, int swigValue) {
-    BitwuzlaKind kind = new BitwuzlaKind(swigName, swigValue);
-    BitwuzlaKind.swigNext = swigValue + 1;
-    return kind;
-  }
-
-  private static BitwuzlaKind[] swigValues = {
-    BITWUZLA_KIND_CONSTANT,
-    BITWUZLA_KIND_CONST_ARRAY,
-    BITWUZLA_KIND_VALUE,
-    BITWUZLA_KIND_VARIABLE,
-    BITWUZLA_KIND_AND,
-    BITWUZLA_KIND_DISTINCT,
-    BITWUZLA_KIND_EQUAL,
-    BITWUZLA_KIND_IFF,
-    BITWUZLA_KIND_IMPLIES,
-    BITWUZLA_KIND_NOT,
-    BITWUZLA_KIND_OR,
-    BITWUZLA_KIND_XOR,
-    BITWUZLA_KIND_ITE,
-    BITWUZLA_KIND_EXISTS,
-    BITWUZLA_KIND_FORALL,
-    BITWUZLA_KIND_APPLY,
-    BITWUZLA_KIND_LAMBDA,
-    BITWUZLA_KIND_ARRAY_SELECT,
-    BITWUZLA_KIND_ARRAY_STORE,
-    BITWUZLA_KIND_BV_ADD,
-    BITWUZLA_KIND_BV_AND,
-    BITWUZLA_KIND_BV_ASHR,
-    BITWUZLA_KIND_BV_COMP,
-    BITWUZLA_KIND_BV_CONCAT,
-    BITWUZLA_KIND_BV_DEC,
-    BITWUZLA_KIND_BV_INC,
-    BITWUZLA_KIND_BV_MUL,
-    BITWUZLA_KIND_BV_NAND,
-    BITWUZLA_KIND_BV_NEG,
-    BITWUZLA_KIND_BV_NEG_OVERFLOW,
-    BITWUZLA_KIND_BV_NOR,
-    BITWUZLA_KIND_BV_NOT,
-    BITWUZLA_KIND_BV_OR,
-    BITWUZLA_KIND_BV_REDAND,
-    BITWUZLA_KIND_BV_REDOR,
-    BITWUZLA_KIND_BV_REDXOR,
-    BITWUZLA_KIND_BV_ROL,
-    BITWUZLA_KIND_BV_ROR,
-    BITWUZLA_KIND_BV_SADD_OVERFLOW,
-    BITWUZLA_KIND_BV_SDIV_OVERFLOW,
-    BITWUZLA_KIND_BV_SDIV,
-    BITWUZLA_KIND_BV_SGE,
-    BITWUZLA_KIND_BV_SGT,
-    BITWUZLA_KIND_BV_SHL,
-    BITWUZLA_KIND_BV_SHR,
-    BITWUZLA_KIND_BV_SLE,
-    BITWUZLA_KIND_BV_SLT,
-    BITWUZLA_KIND_BV_SMOD,
-    BITWUZLA_KIND_BV_SMUL_OVERFLOW,
-    BITWUZLA_KIND_BV_SREM,
-    BITWUZLA_KIND_BV_SSUB_OVERFLOW,
-    BITWUZLA_KIND_BV_SUB,
-    BITWUZLA_KIND_BV_UADD_OVERFLOW,
-    BITWUZLA_KIND_BV_UDIV,
-    BITWUZLA_KIND_BV_UGE,
-    BITWUZLA_KIND_BV_UGT,
-    BITWUZLA_KIND_BV_ULE,
-    BITWUZLA_KIND_BV_ULT,
-    BITWUZLA_KIND_BV_UMUL_OVERFLOW,
-    BITWUZLA_KIND_BV_UREM,
-    BITWUZLA_KIND_BV_USUB_OVERFLOW,
-    BITWUZLA_KIND_BV_XNOR,
-    BITWUZLA_KIND_BV_XOR,
-    BITWUZLA_KIND_BV_EXTRACT,
-    BITWUZLA_KIND_BV_REPEAT,
-    BITWUZLA_KIND_BV_ROLI,
-    BITWUZLA_KIND_BV_RORI,
-    BITWUZLA_KIND_BV_SIGN_EXTEND,
-    BITWUZLA_KIND_BV_ZERO_EXTEND,
-    BITWUZLA_KIND_FP_ABS,
-    BITWUZLA_KIND_FP_ADD,
-    BITWUZLA_KIND_FP_DIV,
-    BITWUZLA_KIND_FP_EQUAL,
-    BITWUZLA_KIND_FP_FMA,
-    BITWUZLA_KIND_FP_FP,
-    BITWUZLA_KIND_FP_GEQ,
-    BITWUZLA_KIND_FP_GT,
-    BITWUZLA_KIND_FP_IS_INF,
-    BITWUZLA_KIND_FP_IS_NAN,
-    BITWUZLA_KIND_FP_IS_NEG,
-    BITWUZLA_KIND_FP_IS_NORMAL,
-    BITWUZLA_KIND_FP_IS_POS,
-    BITWUZLA_KIND_FP_IS_SUBNORMAL,
-    BITWUZLA_KIND_FP_IS_ZERO,
-    BITWUZLA_KIND_FP_LEQ,
-    BITWUZLA_KIND_FP_LT,
-    BITWUZLA_KIND_FP_MAX,
-    BITWUZLA_KIND_FP_MIN,
-    BITWUZLA_KIND_FP_MUL,
-    BITWUZLA_KIND_FP_NEG,
-    BITWUZLA_KIND_FP_REM,
-    BITWUZLA_KIND_FP_RTI,
-    BITWUZLA_KIND_FP_SQRT,
-    BITWUZLA_KIND_FP_SUB,
-    BITWUZLA_KIND_FP_TO_FP_FROM_BV,
-    BITWUZLA_KIND_FP_TO_FP_FROM_FP,
-    BITWUZLA_KIND_FP_TO_FP_FROM_SBV,
-    BITWUZLA_KIND_FP_TO_FP_FROM_UBV,
-    BITWUZLA_KIND_FP_TO_SBV,
-    BITWUZLA_KIND_FP_TO_UBV,
-    BITWUZLA_KIND_NUM_KINDS,
-  };
-}
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
index d9ea7d77d0..01ceb05494 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
@@ -20,22 +20,27 @@
 import java.util.Set;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.sosy_lab.java_smt.basicimpl.AbstractModel;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
-class BitwuzlaModel extends AbstractModel<Long, Long, Long> {
+class BitwuzlaModel extends AbstractModel<Term, Sort, Void> {
 
   // The prover env, not the creator env!
-  private final long bitwuzlaEnv;
+  private final Bitwuzla bitwuzlaEnv;
 
   private final BitwuzlaTheoremProver prover;
 
   private final BitwuzlaFormulaCreator bitwuzlaCreator;
-  private final ImmutableList<Long> assertedTerms;
+  private final ImmutableList<Term> assertedTerms;
 
   protected BitwuzlaModel(
-      long bitwuzlaEnv,
+      Bitwuzla bitwuzlaEnv,
       BitwuzlaTheoremProver prover,
       BitwuzlaFormulaCreator bitwuzlaCreator,
-      Collection<Long> assertedTerms) {
+      Collection<Term> assertedTerms) {
     super(prover, bitwuzlaCreator);
     this.bitwuzlaEnv = bitwuzlaEnv;
     this.prover = prover;
@@ -49,42 +54,38 @@ public ImmutableList<ValueAssignment> asList() {
     Preconditions.checkState(!isClosed());
     Preconditions.checkState(!prover.isClosed(), "Cannot use model after prover is closed");
     ImmutableSet.Builder<ValueAssignment> variablesBuilder = ImmutableSet.builder();
-    Deque<Long> queue = new ArrayDeque<>(assertedTerms);
+    Deque<Term> queue = new ArrayDeque<>(assertedTerms);
     while (!queue.isEmpty()) {
-      long term = queue.removeFirst();
-      long[] children = BitwuzlaJNI.bitwuzla_term_get_children(term, new long[1]);
+      Term term = queue.removeFirst();
+      Sort sort = term.sort();
+      Vector_Term children = term.children();
       // The term might be a value (variable or const, w only variable having a symbol)
       // an array, an UF, or an FP or a function.
       // Functions are just split into their children and those are traversed
-      if (BitwuzlaJNI.bitwuzla_term_is_rm(term)) {
+      if (sort.is_rm()) {
         // Do nothing
-      } else if (BitwuzlaJNI.bitwuzla_term_get_kind(term)
-          == BitwuzlaKind.BITWUZLA_KIND_APPLY.swigValue()) {
+      } else if (term.kind() == Kind.APPLY) {
         variablesBuilder.add(getUFAssignment(term));
-        for (int i = 1; i < children.length; i++) {
-          queue.addLast(children[i]);
+        for (int i = 1; i < children.size(); i++) {
+          queue.addLast(children.get(i));
         }
 
-      } else if (BitwuzlaJNI.bitwuzla_term_is_bv(term)
-          && BitwuzlaJNI.bitwuzla_term_is_const(term)) {
+      } else if (sort.is_bv() && term.is_const()) {
         variablesBuilder.add(getSimpleAssignment(term));
 
-      } else if (BitwuzlaJNI.bitwuzla_term_is_bool(term)
-          && BitwuzlaJNI.bitwuzla_term_is_const(term)) {
+      } else if (sort.is_bool() && term.is_const()) {
         variablesBuilder.add(getSimpleAssignment(term));
 
-      } else if (BitwuzlaJNI.bitwuzla_term_is_fp(term)
-          && BitwuzlaJNI.bitwuzla_term_is_const(term)) {
+      } else if (sort.is_fp() && term.is_const()) {
         // We can't eval FP properly at the moment, we just return whatever the solver gives us
         // (BV representation of the FP)
         variablesBuilder.add(getSimpleAssignment(term));
 
-      } else if (BitwuzlaJNI.bitwuzla_term_is_array(term)
-          && BitwuzlaJNI.bitwuzla_term_is_const(term)) {
+      } else if (sort.is_array() && term.is_const()) {
         variablesBuilder.addAll(getArrayAssignment(term));
 
       } else {
-        for (long child : children) {
+        for (Term child : children) {
           queue.addLast(child);
         }
       }
@@ -93,10 +94,10 @@ public ImmutableList<ValueAssignment> asList() {
     return variablesBuilder.build().asList();
   }
 
-  private ValueAssignment getSimpleAssignment(long pTerm) {
+  private ValueAssignment getSimpleAssignment(Term pTerm) {
     List<Object> argumentInterpretation = new ArrayList<>();
-    long valueTerm = BitwuzlaJNI.bitwuzla_get_value(bitwuzlaEnv, pTerm);
-    String name = BitwuzlaJNI.bitwuzla_term_get_symbol(pTerm);
+    Term valueTerm = bitwuzlaEnv.get_value(pTerm);
+    String name = pTerm.symbol();
     assert name != null;
     return new ValueAssignment(
         bitwuzlaCreator.encapsulateWithTypeOf(pTerm),
@@ -107,13 +108,13 @@ private ValueAssignment getSimpleAssignment(long pTerm) {
         argumentInterpretation);
   }
 
-  private Collection<ValueAssignment> getArrayAssignment(long pTerm) {
+  private Collection<ValueAssignment> getArrayAssignment(Term pTerm) {
     return getArrayAssignments(pTerm, ImmutableList.of());
   }
 
   // TODO: check this in detail. I think this might be incomplete.
   // We should add more Model tests in general. As most are parsing and int based!
-  private Collection<ValueAssignment> getArrayAssignments(long pTerm, List<Object> upperIndices) {
+  private Collection<ValueAssignment> getArrayAssignments(Term pTerm, List<Object> upperIndices) {
     // Array children for store are structured in the following way:
     // {starting array, index, value} in "we add value at index to array"
     // Selections are structured: {starting array, index}
@@ -125,54 +126,53 @@ private Collection<ValueAssignment> getArrayAssignments(long pTerm, List<Object>
     // formula})
 
     // TODO: Array equals value
-    long array = pTerm;
+    Term array = pTerm;
     Collection<ValueAssignment> assignments = new ArrayList<>();
-    Set<Long> indices = new HashSet<>();
-    while (BitwuzlaJNI.bitwuzla_term_is_array(array)) {
+    Set<Term> indices = new HashSet<>();
+    while (array.sort().is_array()) {
       // Here we either have STORE; SELECT or an empty Array
-      long[] children = BitwuzlaJNI.bitwuzla_term_get_children(array, new long[1]);
+      Vector_Term children = array.children();
       List<Object> innerIndices = new ArrayList<>(upperIndices);
       String name = getArrayName(array);
       assert name != null;
-      if (children.length == 0) {
+      if (children.size() == 0) {
         // Empty array
         return assignments;
-      } else if (children.length == 2) {
+      } else if (children.size() == 2) {
         // SELECT expression
-        long index = children[1];
-
+        Term index = children.get(1);
         if (!indices.add(index)) {
           continue;
         }
 
-        long indexValue = BitwuzlaJNI.bitwuzla_get_value(bitwuzlaEnv, index);
+        Term indexValue = bitwuzlaEnv.get_value(index);
         innerIndices.add(evaluateImpl(indexValue));
 
         // The value of an SELECT is equal to the content
-        long valueTerm = BitwuzlaJNI.bitwuzla_get_value(bitwuzlaEnv, array);
+        Term valueTerm = bitwuzlaEnv.get_value(array);
 
         assignments.add(
             new ValueAssignment(
                 bitwuzlaCreator.encapsulateWithTypeOf(array),
                 bitwuzlaCreator.encapsulateWithTypeOf(valueTerm),
-                creator.encapsulateBoolean(buildEqForTwoTerms(pTerm, valueTerm)),
+                creator.encapsulateBoolean(buildEqForTwoTerms(array, valueTerm)),
                 name,
                 evaluateImpl(valueTerm),
                 innerIndices));
-        array = children[0];
+        array = children.get(0);
 
       } else {
         // STORE expression
-        assert children.length == 3;
-        long index = children[1];
-        long content = children[2];
+        assert children.size() == 3;
+        Term index = children.get(1);
+        Term content = children.get(2);
 
         if (!indices.add(index)) {
           continue;
         }
 
-        long indexValue = BitwuzlaJNI.bitwuzla_get_value(bitwuzlaEnv, index);
-        long contentValue = BitwuzlaJNI.bitwuzla_get_value(bitwuzlaEnv, content);
+        Term indexValue = bitwuzlaEnv.get_value(index);
+        Term contentValue = bitwuzlaEnv.get_value(content);
         innerIndices.add(evaluateImpl(indexValue));
         assignments.add(
             new ValueAssignment(
@@ -183,41 +183,41 @@ private Collection<ValueAssignment> getArrayAssignments(long pTerm, List<Object>
                 evaluateImpl(contentValue),
                 innerIndices));
 
-        array = children[0];
+        array = children.get(0);
         assignments.addAll(getArrayAssignments(array, innerIndices));
       }
     }
     return assignments;
   }
 
-  private String getArrayName(long array) {
-    String name = BitwuzlaJNI.bitwuzla_term_get_symbol(array);
+  private String getArrayName(Term array) {
+    String name = array.symbol();
     if (name != null) {
       return name;
     }
-    return getArrayName(BitwuzlaJNI.bitwuzla_term_get_children(array, new long[1])[0]);
+    return getArrayName(array.get(0));
   }
 
-  private long buildEqForTwoTerms(long left, long right) {
-    assert BitwuzlaJNI.bitwuzla_term_is_equal_sort(left, right);
-    BitwuzlaKind kind = BitwuzlaKind.BITWUZLA_KIND_EQUAL;
-    if (BitwuzlaJNI.bitwuzla_term_is_fp(left)) {
-      kind = BitwuzlaKind.BITWUZLA_KIND_FP_EQUAL;
+  private Term buildEqForTwoTerms(Term left, Term right) {
+    assert left.sort().equals(right.sort());
+    Kind kind = Kind.EQUAL;
+    if (left.sort().is_fp()) {
+      kind = Kind.FP_EQUAL;
     }
-    return BitwuzlaJNI.bitwuzla_mk_term2(kind.swigValue(), left, right);
+    return Bitwuzla.mk_term(kind, left, right);
   }
 
-  private ValueAssignment getUFAssignment(long pTerm) {
-    long valueTerm = BitwuzlaJNI.bitwuzla_get_value(bitwuzlaEnv, pTerm);
+  private ValueAssignment getUFAssignment(Term pTerm) {
+    Term valueTerm = bitwuzlaEnv.get_value(pTerm);
     // The first child is the decl, the others are args
-    long[] children = BitwuzlaJNI.bitwuzla_term_get_children(pTerm, new long[1]);
-    String name = BitwuzlaJNI.bitwuzla_term_get_symbol(children[0]);
+    Vector_Term children = pTerm.children();
+    String name = children.get(0).symbol();
     assert name != null;
 
     List<Object> argumentInterpretation = new ArrayList<>();
-    for (int i = 1; i < children.length; i++) {
-      long child = children[i];
-      long childValue = BitwuzlaJNI.bitwuzla_get_value(bitwuzlaEnv, child);
+    for (int i = 1; i < children.size(); i++) {
+      Term child = children.get(i);
+      Term childValue = bitwuzlaEnv.get_value(child);
       argumentInterpretation.add(creator.convertValue(childValue));
     }
 
@@ -231,8 +231,8 @@ private ValueAssignment getUFAssignment(long pTerm) {
   }
 
   @Override
-  protected @Nullable Long evalImpl(Long formula) {
+  protected @Nullable Term evalImpl(Term formula) {
     Preconditions.checkState(!prover.isClosed(), "Cannot use model after prover is closed");
-    return BitwuzlaJNI.bitwuzla_get_value(bitwuzlaEnv, formula);
+    return bitwuzlaEnv.get_value(formula);
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index 82e0f11d3e..f2468752a3 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -9,8 +9,12 @@
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.common.truth.Truth;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import org.junit.After;
 import org.junit.AssumptionViolatedException;
 import org.junit.Before;
@@ -18,9 +22,22 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.sosy_lab.common.NativeLibraries;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Map_TermTerm;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Option;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Options;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Parser;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Result;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.RoundingMode;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Int;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
 public class BitwuzlaNativeApiTest {
-  private long bitwuzla;
+  private Bitwuzla bitwuzla;
 
   @BeforeClass
   public static void load() {
@@ -33,748 +50,457 @@ public static void load() {
 
   @Before
   public void createEnvironment() {
-    long options = BitwuzlaJNI.bitwuzla_options_new();
-    BitwuzlaJNI.bitwuzla_set_option(
-        options, BitwuzlaOption.BITWUZLA_OPT_REWRITE_LEVEL.swigValue(), 0);
-    BitwuzlaJNI.bitwuzla_set_option(
-        options, BitwuzlaOption.BITWUZLA_OPT_PRODUCE_MODELS.swigValue(), 1);
-    // Cadical is always the default solver, but this shows how to set the option
-    BitwuzlaJNI.bitwuzla_set_option_mode(
-        options, BitwuzlaOption.BITWUZLA_OPT_SAT_SOLVER.swigValue(), "cadical");
-    bitwuzla = BitwuzlaJNI.bitwuzla_new(options);
+    Options options = createOptions();
+    bitwuzla = new Bitwuzla(options);
+  }
+
+  private Options createOptions() {
+    Options options = new Options();
+    options.set(Option.REWRITE_LEVEL, 0);
+    options.set(Option.PRODUCE_MODELS, 1);
+    return options;
   }
 
   @After
   public void freeEnvironment() {
-    BitwuzlaJNI.bitwuzla_delete(bitwuzla);
+    if (bitwuzla != null) {
+      bitwuzla.delete();
+    }
   }
 
   //  @Test
   //  public void functionWithNoArguments() {
-  //    NativeLibraries.loadLibrary("bitwuzlaJNI");
-  //    long bool_sort = bitwuzlaJNI.bitwuzla_mk_bool_sort();
-  //    long a = bitwuzlaJNI.bitwuzla_mk_var(bool_sort, "a");
-  //
-  //    long noArgumentUF =
-  //        bitwuzlaJNI.bitwuzla_mk_term1(
-  //            BitwuzlaKind.BITWUZLA_KIND_LAMBDA.swigValue(), a);
+  //      Sort bool_sort = Bitwuzla.mk_bool_sort();
+  //      Term a = Bitwuzla.mk_var(bool_sort, "a");
+  //      Term noArgumentUF = Bitwuzla.mk_term(Kind.LAMBDA, a);
   //  }
 
   @Test
-  public void unsignedFunctions() {
-    long sortbv4 = BitwuzlaJNI.bitwuzla_mk_bv_sort(4);
-    long sortbv8 = BitwuzlaJNI.bitwuzla_mk_bv_sort(8);
+  public void signedFunctions() {
+    Sort sortbv4 = Bitwuzla.mk_bv_sort(4);
+    Sort sortbv8 = Bitwuzla.mk_bv_sort(8);
     // Create function sort.
-    long[] domain = {sortbv8, sortbv4};
-    long sortfun = BitwuzlaJNI.bitwuzla_mk_fun_sort(2, domain, sortbv8);
+    Sort[] domain = {sortbv8, sortbv4};
+    Sort sortfun = Bitwuzla.mk_fun_sort(new Vector_Sort(domain), sortbv8);
 
-    long x = BitwuzlaJNI.bitwuzla_mk_const(sortbv8, "x");
-    long f = BitwuzlaJNI.bitwuzla_mk_const(sortfun, "f");
+    Term x = Bitwuzla.mk_const(sortbv8, "x");
+    Term f = Bitwuzla.mk_const(sortfun, "f");
 
-    long term =
-        BitwuzlaJNI.bitwuzla_mk_term3(
-            BitwuzlaKind.BITWUZLA_KIND_APPLY.swigValue(),
-            f,
-            x,
-            BitwuzlaJNI.bitwuzla_mk_term1_indexed2(
-                BitwuzlaKind.BITWUZLA_KIND_BV_EXTRACT.swigValue(), x, 6, 3));
+    Term term = Bitwuzla.mk_term(Kind.APPLY, f, x, Bitwuzla.mk_term(Kind.BV_EXTRACT, x, 6, 3));
 
-    long resultSort = BitwuzlaJNI.bitwuzla_term_get_sort(term);
+    Sort resultSort = term.sort();
 
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_equal(sortbv8, resultSort)).isTrue();
-  }
-
-  @SuppressWarnings("CheckReturnValue")
-  @Test
-  public void quickstartExample() {
-    // Create bit-vector sorts of size 4 and 8.
-    long sortbv4 = BitwuzlaJNI.bitwuzla_mk_bv_sort(4);
-    long sortbv8 = BitwuzlaJNI.bitwuzla_mk_bv_sort(8);
-    // Create function sort.
-    long[] domain = {sortbv8, sortbv4};
-    long sortfun = BitwuzlaJNI.bitwuzla_mk_fun_sort(2, domain, sortbv8);
-    // Create array sort.
-    long sortarr = BitwuzlaJNI.bitwuzla_mk_array_sort(sortbv8, sortbv8);
-
-    // Create two bit-vector constants of that sort.
-    long x = BitwuzlaJNI.bitwuzla_mk_const(sortbv8, "x");
-    long y = BitwuzlaJNI.bitwuzla_mk_const(sortbv8, "y");
-    long f = BitwuzlaJNI.bitwuzla_mk_const(sortfun, "f");
-    long a = BitwuzlaJNI.bitwuzla_mk_const(sortarr, "a");
-    // Create bit-vector values one and two of the same sort.
-    long one = BitwuzlaJNI.bitwuzla_mk_bv_one(sortbv8);
-    long two = BitwuzlaJNI.bitwuzla_mk_bv_value_uint64(sortbv8, 2);
-
-    // (bvsdiv x (_ bv2 8))
-    long sdiv =
-        BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_BV_SDIV.swigValue(), x, two);
-    // (bvashr y (_ bv1 8))
-    long ashr =
-        BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_BV_ASHR.swigValue(), y, one);
-    // ((_ extract 3 0) (bvsdiv x (_ bv2 8)))
-    long sdive =
-        BitwuzlaJNI.bitwuzla_mk_term1_indexed2(
-            BitwuzlaKind.BITWUZLA_KIND_BV_EXTRACT.swigValue(), sdiv, 3, 0);
-    // ((_ extract 3 0) (bvashr x (_ bv1 8)))
-    long ashre =
-        BitwuzlaJNI.bitwuzla_mk_term1_indexed2(
-            BitwuzlaKind.BITWUZLA_KIND_BV_EXTRACT.swigValue(), ashr, 3, 0);
-
-    // (assert
-    //     (distinct
-    //         ((_ extract 3 0) (bvsdiv x (_ bv2 8)))
-    //         ((_ extract 3 0) (bvashr y (_ bv1 8)))))
-    BitwuzlaJNI.bitwuzla_assert(
-        bitwuzla,
-        BitwuzlaJNI.bitwuzla_mk_term2(
-            BitwuzlaKind.BITWUZLA_KIND_DISTINCT.swigValue(), sdive, ashre));
-
-    // (assert (= (f x ((_ extract 6 3) x)) y))
-    BitwuzlaJNI.bitwuzla_assert(
-        bitwuzla,
-        BitwuzlaJNI.bitwuzla_mk_term2(
-            BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(),
-            BitwuzlaJNI.bitwuzla_mk_term3(
-                BitwuzlaKind.BITWUZLA_KIND_APPLY.swigValue(),
-                f,
-                x,
-                BitwuzlaJNI.bitwuzla_mk_term1_indexed2(
-                    BitwuzlaKind.BITWUZLA_KIND_BV_EXTRACT.swigValue(), x, 6, 3)),
-            y));
-
-    // (assert (= (select a x) y))
-    BitwuzlaJNI.bitwuzla_assert(
-        bitwuzla,
-        BitwuzlaJNI.bitwuzla_mk_term2(
-            BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(),
-            BitwuzlaJNI.bitwuzla_mk_term2(
-                BitwuzlaKind.BITWUZLA_KIND_ARRAY_SELECT.swigValue(), a, x),
-            y));
-
-    // (check-sat)
-    long result = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(result).isEqualTo(BitwuzlaResult.BITWUZLA_SAT.swigValue());
-
-    // Print model in SMT-LIBv2 format.
-    // We call the API to check that the calls work, but don't assert them
-    long[] decls = {x, y, f, a};
-
-    // System.out.println("(");
-    for (int i = 0; i < 4; ++i) {
-      long sort = BitwuzlaJNI.bitwuzla_term_get_sort(decls[i]);
-      // System.out.print("  (define-fun " + BitwuzlaJNI.bitwuzla_term_get_symbol(decls[i]) + " (");
-      BitwuzlaJNI.bitwuzla_term_get_symbol(decls[i]);
-      if (BitwuzlaJNI.bitwuzla_sort_is_fun(sort)) {
-        long value = BitwuzlaJNI.bitwuzla_get_value(bitwuzla, decls[i]);
-        long[] size = new long[1];
-        long[] children = BitwuzlaJNI.bitwuzla_term_get_children(value, size);
-        assertThat(size[0]).isEqualTo(2);
-        // int j = 0;
-        while (BitwuzlaJNI.bitwuzla_term_get_kind(children[1])
-            == BitwuzlaKind.BITWUZLA_KIND_LAMBDA.swigValue()) {
-          assertThat(BitwuzlaJNI.bitwuzla_term_is_var(children[0])).isTrue();
-          BitwuzlaJNI.bitwuzla_term_to_string(children[0]);
-          BitwuzlaJNI.bitwuzla_sort_to_string(BitwuzlaJNI.bitwuzla_term_get_sort(children[0]));
-          /*System.out.print(
-          (j > 0 ? " " : "")
-              + BitwuzlaJNI.bitwuzla_term_to_string(children[0])
-              + " "
-              + BitwuzlaJNI.bitwuzla_sort_to_string(
-                  BitwuzlaJNI.bitwuzla_term_get_sort(children[0]))
-              + " ");*/
-          value = children[1];
-          children = BitwuzlaJNI.bitwuzla_term_get_children(value, size);
-          // j += 1;
-        }
-        assertThat(BitwuzlaJNI.bitwuzla_term_is_var(children[0])).isTrue();
-        BitwuzlaJNI.bitwuzla_term_to_string(children[0]);
-        BitwuzlaJNI.bitwuzla_sort_to_string(BitwuzlaJNI.bitwuzla_term_get_sort(children[0]));
-        /*
-        System.out.print(
-            (j > 0 ? " " : "")
-                + BitwuzlaJNI.bitwuzla_term_to_string(children[0])
-                + " "
-                + BitwuzlaJNI.bitwuzla_sort_to_string(
-                    BitwuzlaJNI.bitwuzla_term_get_sort(children[0]))
-                + ") ");*/
-        BitwuzlaJNI.bitwuzla_sort_to_string(BitwuzlaJNI.bitwuzla_sort_fun_get_codomain(sort));
-        /*
-        System.out.print(
-            BitwuzlaJNI.bitwuzla_sort_to_string(BitwuzlaJNI.bitwuzla_sort_fun_get_codomain(sort))
-                + " ");*/
-        BitwuzlaJNI.bitwuzla_term_to_string(children[1]);
-        /*
-        System.out.println(BitwuzlaJNI.bitwuzla_term_to_string(children[1]));*/
-      } else {
-        BitwuzlaJNI.bitwuzla_sort_to_string(sort);
-        BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, decls[i]));
-        /*
-        System.out.println(
-            ") "
-                + BitwuzlaJNI.bitwuzla_sort_to_string(sort)
-                + " "
-                + BitwuzlaJNI.bitwuzla_term_to_string(
-                    BitwuzlaJNI.bitwuzla_get_value(bitwuzla, decls[i])));*/
-      }
-    }
-    // System.out.println(")");
-
-    // Print value for x, y, f and a.
-    // Note: The returned string of bitwuzlaJNI.bitwuzla_term_value_get_str is only valid
-    //       until the next call to bitwuzlaJNI.bitwuzla_term_value_get_str
-    // Both x and y are bit-vector terms and their value is a bit-vector
-    // value that can be printed via bitwuzlaJNI.bitwuzla_term_value_get_str().
-    BitwuzlaJNI.bitwuzla_term_value_get_str(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, x));
-    BitwuzlaJNI.bitwuzla_term_value_get_str(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, y));
-    /*
-    System.out.println(
-        "value of x: "
-            + BitwuzlaJNI.bitwuzla_term_value_get_str(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, x)));
-    System.out.println(
-        "value of y: "
-            + BitwuzlaJNI.bitwuzla_term_value_get_str(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, y)));
-            */
-
-    // f and a, on the other hand, are a function and array term, respectively.
-    // The value of these terms is not a value term: for f, it is a lambda term,
-    // and the value of a is represented as a store term. Thus we cannot use
-    // bitwuzlaJNI.bitwuzla_term_value_get_str(), but we can print the value of the terms
-    // via bitwuzlaJNI.bitwuzla_term_to_string().
-    // System.out.println("to_string representation of value of f:");
-
-    BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, f));
-    /*
-    System.out.println(
-        BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, f)));*/
-    // System.out.println("to_string representation of value of a:");
-
-    BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, a));
-    /*
-    System.out.println(
-        BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, a)));*/
-
-    // Note that the assignment string of bit-vector terms is given as the
-    // pure assignment string, either in binary, hexadecimal or decimal format,
-    // whereas bitwuzlaJNI.bitwuzla_term_to_string() prints the value in SMT-LIB2 format
-    // (in binary number format).
-    BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, x));
-    /*
-    System.out.println(
-        "to_string representation of value of x: "
-            + BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, x)));*/
-    BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, y));
-    /*
-    System.out.println(
-        "to_string representation of value of y: "
-            + BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, y)));*/
-
-    // Query value of bit-vector term that does not occur in the input formula
-    long v =
-        BitwuzlaJNI.bitwuzla_get_value(
-            bitwuzla,
-            BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_BV_MUL.swigValue(), x, x));
-    /*
-    System.out.println(
-        "value of v = x * x: "
-            + BitwuzlaJNI.bitwuzla_term_value_get_str(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, v)));
-            */
-    BitwuzlaJNI.bitwuzla_term_value_get_str(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, v));
+    assertThat(sortbv8).isEqualTo(resultSort);
   }
 
   @Test
   public void boolType() {
-    long pBoolType = BitwuzlaJNI.bitwuzla_mk_bool_sort();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_bool(pBoolType)).isTrue();
+    Sort pBoolType = Bitwuzla.mk_bool_sort();
+    assertThat(pBoolType.is_bool()).isTrue();
   }
 
-  // Bitwuzla fails this critically!
+  // FIXME: Bitwuzla fails this critically!
   @Ignore
   @Test
   public void repeatedTermCreationInMultipleSolversTest() {
-    long tru1 = BitwuzlaJNI.bitwuzla_mk_true();
-    long tru12 = BitwuzlaJNI.bitwuzla_mk_true();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_true(tru1)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_true(tru12)).isTrue();
+    Term tru1 = Bitwuzla.mk_true();
+    Term tru12 = Bitwuzla.mk_true();
+    assertThat(tru1.is_true()).isTrue();
+    assertThat(tru12.is_true()).isTrue();
 
     new Thread(
             () -> {
-              assertThat(BitwuzlaJNI.bitwuzla_term_is_true(tru1)).isTrue();
-              assertThat(BitwuzlaJNI.bitwuzla_term_is_true(tru12)).isTrue();
+              assertThat(tru1.is_true()).isTrue();
+              assertThat(tru12.is_true()).isTrue();
             })
         .start();
   }
 
   @Test
   public void isFalse() {
-    long pBoolType = BitwuzlaJNI.bitwuzla_mk_bool_sort();
-    long var1 = BitwuzlaJNI.bitwuzla_mk_const(pBoolType, "var1");
-    long var2 = BitwuzlaJNI.bitwuzla_mk_const(pBoolType, "var2");
-
-    Truth.assertThat(BitwuzlaJNI.bitwuzla_term_is_false(var1)).isFalse();
-    Truth.assertThat(BitwuzlaJNI.bitwuzla_term_is_true(var1)).isFalse();
-    Truth.assertThat(BitwuzlaJNI.bitwuzla_term_is_false(var2)).isFalse();
-    Truth.assertThat(BitwuzlaJNI.bitwuzla_term_is_true(var2)).isFalse();
+    Sort pBoolType = Bitwuzla.mk_bool_sort();
+    Term var1 = Bitwuzla.mk_const(pBoolType, "var1");
+    Term var2 = Bitwuzla.mk_const(pBoolType, "var2");
+
+    Truth.assertThat(var1.is_false()).isFalse();
+    Truth.assertThat(var1.is_true()).isFalse();
+    Truth.assertThat(var2.is_false()).isFalse();
+    Truth.assertThat(var2.is_true()).isFalse();
   }
 
   @Test
   public void testBvModel() {
-    long bvSort = BitwuzlaJNI.bitwuzla_mk_bv_sort(32);
-    long a = BitwuzlaJNI.bitwuzla_mk_const(bvSort, "a");
-    long one = BitwuzlaJNI.bitwuzla_mk_bv_one(bvSort);
-    long two = BitwuzlaJNI.bitwuzla_mk_bv_value_uint64(bvSort, 2);
+    Sort bvSort = Bitwuzla.mk_bv_sort(32);
+    Term a = Bitwuzla.mk_const(bvSort, "a");
+    Term one = Bitwuzla.mk_bv_one(bvSort);
+    Term two = Bitwuzla.mk_bv_value_signed(bvSort, 2);
 
     // 1 + 2 = a
-    long add =
-        BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_BV_ADD.swigValue(), one, two);
-    long eq = BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), add, a);
+    Term add = Bitwuzla.mk_term(Kind.BV_ADD, one, two);
+    Term eq = Bitwuzla.mk_term(Kind.EQUAL, add, a);
 
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, eq);
-    long res = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(res).isEqualTo(BitwuzlaResult.BITWUZLA_SAT.swigValue());
+    bitwuzla.assert_formula(eq);
+    Result res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
 
     // Get model value as String
-    String aString = BitwuzlaJNI.bitwuzla_term_to_string(a);
+    String aString = a.toString();
     assertThat(aString).isEqualTo("a");
-    String aValue =
-        BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, a));
+    String aValue = bitwuzla.get_value(a).toString();
     // #b00000000000000000000000000000011 == 3
     assertThat(aValue).isEqualTo("#b00000000000000000000000000000011");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(one))
-        .isEqualTo("#b00000000000000000000000000000001");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(two))
-        .isEqualTo("#b00000000000000000000000000000010");
+    assertThat(one.toString()).isEqualTo("#b00000000000000000000000000000001");
+    assertThat(two.toString()).isEqualTo("#b00000000000000000000000000000010");
   }
 
   @Test
   public void testBvArrayModelStore() {
-    long bvSort4 = BitwuzlaJNI.bitwuzla_mk_bv_sort(4);
-    long bvSort8 = BitwuzlaJNI.bitwuzla_mk_bv_sort(8);
-    long sortArr = BitwuzlaJNI.bitwuzla_mk_array_sort(bvSort4, bvSort8);
+    Sort bvSort4 = Bitwuzla.mk_bv_sort(4);
+    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
+    Sort sortArr = Bitwuzla.mk_array_sort(bvSort4, bvSort8);
 
-    long var = BitwuzlaJNI.bitwuzla_mk_const(bvSort8, "var");
-    long eleven = BitwuzlaJNI.bitwuzla_mk_bv_value_uint64(bvSort8, 11);
-    long zero = BitwuzlaJNI.bitwuzla_mk_bv_zero(bvSort4);
-    long one = BitwuzlaJNI.bitwuzla_mk_bv_one(bvSort4);
+    Term var = Bitwuzla.mk_const(bvSort8, "var");
+    Term eleven = Bitwuzla.mk_bv_value_signed(bvSort8, 11);
+    Term zero = Bitwuzla.mk_bv_zero(bvSort4);
+    Term one = Bitwuzla.mk_bv_one(bvSort4);
 
-    long arr = BitwuzlaJNI.bitwuzla_mk_const(sortArr, "arr");
+    Term arr = Bitwuzla.mk_const(sortArr, "arr");
 
     // Array arr = {11, var} AND arr[0] == arr[1] -> var == 11
-    long arrW11At0 =
-        BitwuzlaJNI.bitwuzla_mk_term3(
-            BitwuzlaKind.BITWUZLA_KIND_ARRAY_STORE.swigValue(), arr, zero, eleven);
-    long arrWVarAt1 =
-        BitwuzlaJNI.bitwuzla_mk_term3(
-            BitwuzlaKind.BITWUZLA_KIND_ARRAY_STORE.swigValue(), arrW11At0, one, var);
-    long eq =
-        BitwuzlaJNI.bitwuzla_mk_term2(
-            BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(),
-            BitwuzlaJNI.bitwuzla_mk_term2(
-                BitwuzlaKind.BITWUZLA_KIND_ARRAY_SELECT.swigValue(), arrWVarAt1, one),
-            BitwuzlaJNI.bitwuzla_mk_term2(
-                BitwuzlaKind.BITWUZLA_KIND_ARRAY_SELECT.swigValue(), arrWVarAt1, zero));
-
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, eq);
-    long res = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(res).isEqualTo(BitwuzlaResult.BITWUZLA_SAT.swigValue());
+    Term arrW11At0 = Bitwuzla.mk_term(Kind.ARRAY_STORE, arr, zero, eleven);
+    Term arrWVarAt1 = Bitwuzla.mk_term(Kind.ARRAY_STORE, arrW11At0, one, var);
+    Term eq =
+        Bitwuzla.mk_term(
+            Kind.EQUAL,
+            Bitwuzla.mk_term(Kind.ARRAY_SELECT, arrWVarAt1, one),
+            Bitwuzla.mk_term(Kind.ARRAY_SELECT, arrWVarAt1, zero));
+
+    bitwuzla.assert_formula(eq);
+    Result res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
 
     // Get model value as String
-    String varString = BitwuzlaJNI.bitwuzla_term_to_string(var);
+    String varString = var.toString();
     assertThat(varString).isEqualTo("var");
-    String varValue =
-        BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, var));
+    String varValue = bitwuzla.get_value(var).toString();
 
     assertThat(varValue).isEqualTo("#b00001011");
-    assertThat(
-            BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, eleven)))
-        .isEqualTo(varValue);
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(one)).isEqualTo("#b0001");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(zero)).isEqualTo("#b0000");
+    assertThat(bitwuzla.get_value(eleven).toString()).isEqualTo(varValue);
+    assertThat(one.toString()).isEqualTo("#b0001");
+    assertThat(zero.toString()).isEqualTo("#b0000");
 
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_array(arrWVarAt1)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_array(arr)).isTrue();
+    assertThat(arrWVarAt1.sort().is_array()).isTrue();
+    assertThat(arr.sort().is_array()).isTrue();
 
     // Getting the model of the array prints the SMTLIB2 representation
-    long valueArrWVarAt1 = BitwuzlaJNI.bitwuzla_get_value(bitwuzla, arrWVarAt1);
+    Term valueArrWVarAt1 = bitwuzla.get_value(arrWVarAt1);
     // The value of an STORE expression is not really helpful, see string below
-    String arrWVarAt1ValueString = BitwuzlaJNI.bitwuzla_term_to_string(valueArrWVarAt1);
+    String arrWVarAt1ValueString = valueArrWVarAt1.toString();
     assertThat(arrWVarAt1ValueString)
         .isEqualTo(
             "(store (store ((as const (Array (_ BitVec 4) (_ BitVec 8))) #b00000000) #b0000"
                 + " #b00001011) #b0001 #b00001011)");
 
     // We can access the children of the arrays
-    long[] sizeArr = new long[1];
     // Array children are structured in the following way:
     // {starting array, index, value} in "we add value at index to array"
     // Just declared (empty) arrays return an empty array
-    long[] children = BitwuzlaJNI.bitwuzla_term_get_children(arrWVarAt1, sizeArr);
-    assertThat(children).hasLength(3);
-    assertThat(sizeArr[0]).isEqualTo(3);
-    assertThat(children[0]).isEqualTo(arrW11At0);
-    assertThat(children[1]).isEqualTo(one);
-    assertThat(children[2]).isEqualTo(var);
-    long[] children2 = BitwuzlaJNI.bitwuzla_term_get_children(arrW11At0, sizeArr);
-    assertThat(children).hasLength(3);
-    assertThat(sizeArr[0]).isEqualTo(3);
-    assertThat(children2[0]).isEqualTo(arr);
-    assertThat(children2[1]).isEqualTo(zero);
-    assertThat(children2[2]).isEqualTo(eleven);
-    long[] children3 = BitwuzlaJNI.bitwuzla_term_get_children(arr, sizeArr);
+    Vector_Term children = arrWVarAt1.children();
+    assertThat(children.size()).isEqualTo(3);
+    assertThat(children.get(0)).isEqualTo(arrW11At0);
+    assertThat(children.get(1)).isEqualTo(one);
+    assertThat(children.get(2)).isEqualTo(var);
+    Vector_Term children2 = arrW11At0.children();
+    assertThat(children.size()).isEqualTo(3);
+    assertThat(children2.get(0)).isEqualTo(arr);
+    assertThat(children2.get(1)).isEqualTo(zero);
+    assertThat(children2.get(2)).isEqualTo(eleven);
+    Vector_Term children3 = arr.children();
     assertThat(children3).isEmpty();
-    assertThat(sizeArr[0]).isEqualTo(0);
   }
 
+  @Ignore // FIXME
   @Test
   public void testBvArrayModelSelect() {
-    long bvSort4 = BitwuzlaJNI.bitwuzla_mk_bv_sort(4);
-    long bvSort8 = BitwuzlaJNI.bitwuzla_mk_bv_sort(8);
-    long sortArr = BitwuzlaJNI.bitwuzla_mk_array_sort(bvSort4, bvSort8);
+    Sort bvSort4 = Bitwuzla.mk_bv_sort(4);
+    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
+    Sort sortArr = Bitwuzla.mk_array_sort(bvSort4, bvSort8);
 
-    long eleven = BitwuzlaJNI.bitwuzla_mk_bv_value_uint64(bvSort8, 11);
-    long zero = BitwuzlaJNI.bitwuzla_mk_bv_zero(bvSort4);
-    long one = BitwuzlaJNI.bitwuzla_mk_bv_one(bvSort4);
+    Term eleven = Bitwuzla.mk_bv_value_signed(bvSort8, 11);
+    Term zero = Bitwuzla.mk_bv_zero(bvSort4);
+    Term one = Bitwuzla.mk_bv_one(bvSort4);
 
-    long arr = BitwuzlaJNI.bitwuzla_mk_const(sortArr, "arr");
+    Term arr = Bitwuzla.mk_const(sortArr, "arr");
 
     // Array arr[0] == (store arr[1] 11))[1]
-    long selectArrAtZero =
-        BitwuzlaJNI.bitwuzla_mk_term2(
-            BitwuzlaKind.BITWUZLA_KIND_ARRAY_SELECT.swigValue(), arr, zero);
-    long arrWElevenAt1 =
-        BitwuzlaJNI.bitwuzla_mk_term3(
-            BitwuzlaKind.BITWUZLA_KIND_ARRAY_STORE.swigValue(), arr, one, eleven);
-    long selectArrWElevenAtOne =
-        BitwuzlaJNI.bitwuzla_mk_term2(
-            BitwuzlaKind.BITWUZLA_KIND_ARRAY_SELECT.swigValue(), arrWElevenAt1, one);
-    long eq =
-        BitwuzlaJNI.bitwuzla_mk_term2(
-            BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), selectArrAtZero, selectArrWElevenAtOne);
-
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, eq);
-    long res = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(res).isEqualTo(BitwuzlaResult.BITWUZLA_SAT.swigValue());
-
-    String arrAtZeroString = BitwuzlaJNI.bitwuzla_term_get_symbol(selectArrAtZero);
+    Term selectArrAtZero = Bitwuzla.mk_term(Kind.ARRAY_SELECT, arr, zero);
+    Term arrWElevenAt1 = Bitwuzla.mk_term(Kind.ARRAY_STORE, arr, one, eleven);
+    Term selectArrWElevenAtOne = Bitwuzla.mk_term(Kind.ARRAY_SELECT, arrWElevenAt1, one);
+    Term eq = Bitwuzla.mk_term(Kind.EQUAL, selectArrAtZero, selectArrWElevenAtOne);
+
+    bitwuzla.assert_formula(eq);
+    Result res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
+
+    String arrAtZeroString = selectArrAtZero.symbol();
     assertThat(arrAtZeroString).isNull();
     // Get model value arr[0] as String
-    String arrAtZeroValueString =
-        BitwuzlaJNI.bitwuzla_term_value_get_str(
-            BitwuzlaJNI.bitwuzla_get_value(bitwuzla, selectArrAtZero));
+    String arrAtZeroValueString = bitwuzla.get_value(selectArrAtZero).toString();
     // 00001011 == 11
     assertThat(arrAtZeroValueString).isEqualTo("00001011");
 
     // Arrays w 2 children are structured in the following way:
     // {starting array, index} in "we select index from array"
     // Just declared (empty) arrays return an empty children array
-    long[] children = BitwuzlaJNI.bitwuzla_term_get_children(selectArrAtZero, new long[1]);
-    assertThat(children).hasLength(2);
-    assertThat(children[0]).isEqualTo(arr);
-    String arrSymbol = BitwuzlaJNI.bitwuzla_term_get_symbol(children[0]);
+    Vector_Term children = selectArrAtZero.children();
+    assertThat(children.size()).isEqualTo(2);
+    assertThat(children.get(0)).isEqualTo(arr);
+    String arrSymbol = children.get(0).symbol();
     assertThat(arrSymbol).isEqualTo("arr");
-    assertThat(children[1]).isEqualTo(zero);
+    assertThat(children.get(1)).isEqualTo(zero);
   }
 
   @Test
   public void testUfModel() {
-    long boolSort = BitwuzlaJNI.bitwuzla_mk_bool_sort();
-    long res = BitwuzlaJNI.bitwuzla_mk_const(boolSort, "res");
-    long bvSort8 = BitwuzlaJNI.bitwuzla_mk_bv_sort(8);
-    long arg1 = BitwuzlaJNI.bitwuzla_mk_const(bvSort8, "arg1");
-    long arg2 = BitwuzlaJNI.bitwuzla_mk_bv_value_uint64(bvSort8, 11);
-    long[] domain = {bvSort8, bvSort8};
-    long sortFun = BitwuzlaJNI.bitwuzla_mk_fun_sort(2, domain, boolSort);
-
-    long foo = BitwuzlaJNI.bitwuzla_mk_const(sortFun, "foo");
-    long appliedFoo =
-        BitwuzlaJNI.bitwuzla_mk_term3(
-            BitwuzlaKind.BITWUZLA_KIND_APPLY.swigValue(), foo, arg1, arg2);
-
-    long eq =
-        BitwuzlaJNI.bitwuzla_mk_term2(
-            BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), appliedFoo, res);
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, eq);
-    long result = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(result).isEqualTo(BitwuzlaResult.BITWUZLA_SAT.swigValue());
+    Sort boolSort = Bitwuzla.mk_bool_sort();
+    Term res = Bitwuzla.mk_const(boolSort, "res");
+    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
+    Term arg1 = Bitwuzla.mk_const(bvSort8, "arg1");
+    Term arg2 = Bitwuzla.mk_bv_value_signed(bvSort8, 11);
+    Sort[] domain = {bvSort8, bvSort8};
+    Sort sortFun = Bitwuzla.mk_fun_sort(new Vector_Sort(domain), boolSort);
+
+    Term foo = Bitwuzla.mk_const(sortFun, "foo");
+    Term appliedFoo = Bitwuzla.mk_term(Kind.APPLY, foo, arg1, arg2);
+
+    Term eq = Bitwuzla.mk_term(Kind.EQUAL, appliedFoo, res);
+    bitwuzla.assert_formula(eq);
+    Result result = bitwuzla.check_sat();
+    assertThat(result).isEqualTo(Result.SAT);
 
     // Get model value as String
-    String resString = BitwuzlaJNI.bitwuzla_term_to_string(res);
+    String resString = res.toString();
     assertThat(resString).isEqualTo("res");
-    String resValue =
-        BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, res));
+    String resValue = bitwuzla.get_value(res).toString();
 
     // Bitwuzla seems to default to false and zero
     assertThat(resValue).isEqualTo("false");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, arg1)))
-        .isEqualTo("#b00000000");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(arg2)).isEqualTo("#b00001011");
+    assertThat(bitwuzla.get_value(arg1).toString()).isEqualTo("#b00000000");
+    assertThat(arg2.toString()).isEqualTo("#b00001011");
 
     // Children of the UF are ordered the following:
     // {function, arguments...}
     // Declaration is empty array
-    long[] sizeArr = new long[1];
-    long[] childrenAppliedFoo = BitwuzlaJNI.bitwuzla_term_get_children(appliedFoo, sizeArr);
-    assertThat(childrenAppliedFoo).hasLength(3);
-    assertThat(sizeArr[0]).isEqualTo(3);
-    assertThat(childrenAppliedFoo[0]).isEqualTo(foo);
-    assertThat(childrenAppliedFoo[1]).isEqualTo(arg1);
-    assertThat(childrenAppliedFoo[2]).isEqualTo(arg2);
-    long[] childrenFoo = BitwuzlaJNI.bitwuzla_term_get_children(foo, sizeArr);
+    Vector_Term childrenAppliedFoo = appliedFoo.children();
+    assertThat(childrenAppliedFoo.size()).isEqualTo(3);
+    assertThat(childrenAppliedFoo.get(0)).isEqualTo(foo);
+    assertThat(childrenAppliedFoo.get(1)).isEqualTo(arg1);
+    assertThat(childrenAppliedFoo.get(2)).isEqualTo(arg2);
+    Vector_Term childrenFoo = foo.children();
     assertThat(childrenFoo).isEmpty();
-    assertThat(sizeArr[0]).isEqualTo(0);
   }
 
   @Test
   public void testBoolModel() {
-    long boolSort = BitwuzlaJNI.bitwuzla_mk_bool_sort();
-    long x = BitwuzlaJNI.bitwuzla_mk_const(boolSort, "x");
-    long t = BitwuzlaJNI.bitwuzla_mk_true();
-    long f = BitwuzlaJNI.bitwuzla_mk_false();
+    Sort boolSort = Bitwuzla.mk_bool_sort();
+    Term x = Bitwuzla.mk_const(boolSort, "x");
+    Term t = Bitwuzla.mk_true();
+    Term f = Bitwuzla.mk_false();
 
     // (x AND true) OR false
-    long and = BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_AND.swigValue(), x, t);
-    long or = BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_OR.swigValue(), and, f);
+    Term and = Bitwuzla.mk_term(Kind.AND, x, t);
+    Term or = Bitwuzla.mk_term(Kind.OR, and, f);
 
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, or);
-    long res = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(res).isEqualTo(BitwuzlaResult.BITWUZLA_SAT.swigValue());
+    bitwuzla.assert_formula(or);
+    Result res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
 
     // Get model value as String
-    String xString = BitwuzlaJNI.bitwuzla_term_to_string(x);
+    String xString = x.toString();
     assertThat(xString).isEqualTo("x");
-    String xValue =
-        BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, x));
+    String xValue = bitwuzla.get_value(x).toString();
 
     assertThat(xValue).isEqualTo("true");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(t)).isEqualTo("true");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(f)).isEqualTo("false");
+    assertThat(t.toString()).isEqualTo("true");
+    assertThat(f.toString()).isEqualTo("false");
 
     // Children of AND and OR
-    long[] sizeArr = new long[1];
-    long[] childrenOr = BitwuzlaJNI.bitwuzla_term_get_children(or, sizeArr);
-    assertThat(childrenOr).hasLength(2);
-    assertThat(sizeArr[0]).isEqualTo(2);
-    assertThat(childrenOr[0]).isEqualTo(and);
-    assertThat(childrenOr[1]).isEqualTo(f);
-
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_kind(or))
-        .isEqualTo(BitwuzlaKind.BITWUZLA_KIND_OR.swigValue());
-
-    long[] childrenAnd = BitwuzlaJNI.bitwuzla_term_get_children(and, sizeArr);
-    assertThat(childrenOr).hasLength(2);
-    assertThat(sizeArr[0]).isEqualTo(2);
-    assertThat(childrenAnd[0]).isEqualTo(x);
-    assertThat(childrenAnd[1]).isEqualTo(t);
-
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_kind(and))
-        .isEqualTo(BitwuzlaKind.BITWUZLA_KIND_AND.swigValue());
+    Vector_Term childrenOr = or.children();
+    assertThat(childrenOr.size()).isEqualTo(2);
+    assertThat(childrenOr.get(0)).isEqualTo(and);
+    assertThat(childrenOr.get(1)).isEqualTo(f);
+
+    assertThat(or.kind()).isEqualTo(Kind.OR);
+
+    Vector_Term childrenAnd = and.children();
+    assertThat(childrenOr.size()).isEqualTo(2);
+    assertThat(childrenAnd.get(0)).isEqualTo(x);
+    assertThat(childrenAnd.get(1)).isEqualTo(t);
+
+    assertThat(and.kind()).isEqualTo(Kind.AND);
   }
 
   @Test
   public void testFpModel() {
-    long fpSort = BitwuzlaJNI.bitwuzla_mk_fp_sort(5, 11);
-    long rm = BitwuzlaJNI.bitwuzla_mk_rm_value(BitwuzlaJNI.BITWUZLA_RM_RNE_get());
-    long a = BitwuzlaJNI.bitwuzla_mk_const(fpSort, "a");
-    long one = BitwuzlaJNI.bitwuzla_mk_fp_from_real(fpSort, rm, "1");
+    Sort fpSort = Bitwuzla.mk_fp_sort(5, 11);
+    Term rm = Bitwuzla.mk_rm_value(RoundingMode.RNE);
+    Term a = Bitwuzla.mk_const(fpSort, "a");
+    Term one = Bitwuzla.mk_fp_value(fpSort, rm, "1");
     // Rational with 0 (or only 0s) as the second argument crashes Bitwuzla!
-    long two = BitwuzlaJNI.bitwuzla_mk_fp_from_rational(fpSort, rm, "2", "1");
+    Term two = Bitwuzla.mk_fp_value(fpSort, rm, "2", "1");
 
     // 1 + 2 = a
-    long add =
-        BitwuzlaJNI.bitwuzla_mk_term3(BitwuzlaKind.BITWUZLA_KIND_FP_ADD.swigValue(), rm, two, one);
-    long eq = BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), add, a);
+    Term add = Bitwuzla.mk_term(Kind.FP_ADD, rm, two, one);
+    Term eq = Bitwuzla.mk_term(Kind.EQUAL, add, a);
 
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, eq);
-    long res = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(res).isEqualTo(BitwuzlaResult.BITWUZLA_SAT.swigValue());
+    bitwuzla.assert_formula(eq);
+    Result res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
 
     // Get model value as String
-    String aString = BitwuzlaJNI.bitwuzla_term_to_string(a);
+    String aString = a.toString();
     assertThat(aString).isEqualTo("a");
-    String aValue =
-        BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, a));
+    String aValue = bitwuzla.get_value(a).toString();
 
     assertThat(aValue).isEqualTo("(fp #b0 #b10000 #b1000000000)");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(one)).isEqualTo("(fp #b0 #b01111 #b0000000000)");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(two)).isEqualTo("(fp #b0 #b10000 #b0000000000)");
+    assertThat(one.toString()).isEqualTo("(fp #b0 #b01111 #b0000000000)");
+    assertThat(two.toString()).isEqualTo("(fp #b0 #b10000 #b0000000000)");
   }
 
   @Test
   public void testFpToBv() {
     // A constant (BITWUZLA_KIND_CONSTANT) is both, a variable and a constant value
     // However a value is also a BITWUZLA_KIND_VALUE, while a variable is not
-    long fpSort = BitwuzlaJNI.bitwuzla_mk_fp_sort(5, 11);
-    long rm = BitwuzlaJNI.bitwuzla_mk_rm_value(BitwuzlaJNI.BITWUZLA_RM_RTZ_get());
-    long a = BitwuzlaJNI.bitwuzla_mk_const(fpSort, "a");
-    long one = BitwuzlaJNI.bitwuzla_mk_fp_from_real(fpSort, rm, "-1");
-    long two = BitwuzlaJNI.bitwuzla_mk_fp_from_real(fpSort, rm, "2");
-
-    long bvOne =
-        BitwuzlaJNI.bitwuzla_mk_term2_indexed1(
-            BitwuzlaKind.BITWUZLA_KIND_FP_TO_SBV.swigValue(), rm, one, 11 + 5);
-    long bvTwo =
-        BitwuzlaJNI.bitwuzla_mk_term2_indexed1(
-            BitwuzlaKind.BITWUZLA_KIND_FP_TO_SBV.swigValue(), rm, two, 11 + 5);
-    long add =
-        BitwuzlaJNI.bitwuzla_mk_term3(BitwuzlaKind.BITWUZLA_KIND_FP_ADD.swigValue(), rm, two, one);
-    long eq = BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), add, a);
-
-    long bvA =
-        BitwuzlaJNI.bitwuzla_mk_term2_indexed1(
-            BitwuzlaKind.BITWUZLA_KIND_FP_TO_SBV.swigValue(), rm, a, 11 + 5);
-    long bvAdd =
-        BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_BV_ADD.swigValue(), bvOne, bvTwo);
-    long eqBv =
-        BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), bvAdd, bvA);
-
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, eq);
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, eqBv);
-    long res = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(res).isEqualTo(BitwuzlaResult.BITWUZLA_SAT.swigValue());
-
-    String bvAString =
-        BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, bvA));
+    Sort fpSort = Bitwuzla.mk_fp_sort(5, 11);
+    Term rm = Bitwuzla.mk_rm_value(RoundingMode.RTZ);
+    Term a = Bitwuzla.mk_const(fpSort, "a");
+    Term one = Bitwuzla.mk_fp_value(fpSort, rm, "-1");
+    Term two = Bitwuzla.mk_fp_value(fpSort, rm, "2");
+
+    Term bvOne = Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, one, 11 + 5);
+    Term bvTwo = Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, two, 11 + 5);
+    Term add = Bitwuzla.mk_term(Kind.FP_ADD, rm, two, one);
+    Term eq = Bitwuzla.mk_term(Kind.EQUAL, add, a);
+
+    Term bvA = Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, a, 11 + 5);
+    Term bvAdd = Bitwuzla.mk_term(Kind.BV_ADD, bvOne, bvTwo);
+    Term eqBv = Bitwuzla.mk_term(Kind.EQUAL, bvAdd, bvA);
+
+    bitwuzla.assert_formula(eq);
+    bitwuzla.assert_formula(eqBv);
+    Result res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
+
+    String bvAString = bitwuzla.get_value(bvA).toString();
 
     assertThat(bvAString).isEqualTo("#b0000000000000001");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, bvOne)))
-        .isEqualTo("#b1111111111111111");
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(BitwuzlaJNI.bitwuzla_get_value(bitwuzla, bvTwo)))
-        .isEqualTo("#b0000000000000010");
+    assertThat(bitwuzla.get_value(bvOne).toString()).isEqualTo("#b1111111111111111");
+    assertThat(bitwuzla.get_value(bvTwo).toString()).isEqualTo("#b0000000000000010");
     // Now test -0.9 to 0 and 0.9 to 0
-    long nearlyMin1 = BitwuzlaJNI.bitwuzla_mk_fp_from_real(fpSort, rm, "-0.9");
-    long nearly1 = BitwuzlaJNI.bitwuzla_mk_fp_from_real(fpSort, rm, "0.9");
-    long bvnearlyMin1 =
-        BitwuzlaJNI.bitwuzla_mk_term2_indexed1(
-            BitwuzlaKind.BITWUZLA_KIND_FP_TO_SBV.swigValue(), rm, nearlyMin1, 11 + 5);
-    long bvnearly1 =
-        BitwuzlaJNI.bitwuzla_mk_term2_indexed1(
-            BitwuzlaKind.BITWUZLA_KIND_FP_TO_SBV.swigValue(), rm, nearly1, 11 + 5);
-    long b = BitwuzlaJNI.bitwuzla_mk_const(BitwuzlaJNI.bitwuzla_mk_bv_sort(11 + 5), "b");
-    long bvAdd2 =
-        BitwuzlaJNI.bitwuzla_mk_term2(
-            BitwuzlaKind.BITWUZLA_KIND_BV_ADD.swigValue(), bvnearlyMin1, bvnearly1);
-    long eqBv2 =
-        BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), bvAdd2, b);
-
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, eqBv2);
-    res = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(res).isEqualTo(BitwuzlaResult.BITWUZLA_SAT.swigValue());
-
-    assertThat(
-            BitwuzlaJNI.bitwuzla_term_to_string(
-                BitwuzlaJNI.bitwuzla_get_value(bitwuzla, bvnearlyMin1)))
-        .isEqualTo("#b0000000000000000");
-    assertThat(
-            BitwuzlaJNI.bitwuzla_term_to_string(
-                BitwuzlaJNI.bitwuzla_get_value(bitwuzla, bvnearly1)))
-        .isEqualTo("#b0000000000000000");
+    Term nearlyMin1 = Bitwuzla.mk_fp_value(fpSort, rm, "-0.9");
+    Term nearly1 = Bitwuzla.mk_fp_value(fpSort, rm, "0.9");
+    Term bvnearlyMin1 = Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, nearlyMin1, 11 + 5);
+    Term bvnearly1 = Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, nearly1, 11 + 5);
+    Term b = Bitwuzla.mk_const(Bitwuzla.mk_bv_sort(11 + 5), "b");
+    Term bvAdd2 = Bitwuzla.mk_term(Kind.BV_ADD, bvnearlyMin1, bvnearly1);
+    Term eqBv2 = Bitwuzla.mk_term(Kind.EQUAL, bvAdd2, b);
+
+    bitwuzla.assert_formula(eqBv2);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
+
+    assertThat(bitwuzla.get_value(bvnearlyMin1).toString()).isEqualTo("#b0000000000000000");
+    assertThat(bitwuzla.get_value(bvnearly1).toString()).isEqualTo("#b0000000000000000");
   }
 
   @Test
   public void testTypes() {
     // A constant (BITWUZLA_KIND_CONSTANT) is both, a variable and a constant value
     // However a value is also a BITWUZLA_KIND_VALUE, while a variable is not
-    long fpSort = BitwuzlaJNI.bitwuzla_mk_fp_sort(5, 11);
-    long rm = BitwuzlaJNI.bitwuzla_mk_rm_value(BitwuzlaJNI.BITWUZLA_RM_RNE_get());
-    long a = BitwuzlaJNI.bitwuzla_mk_const(fpSort, "a");
-    long one = BitwuzlaJNI.bitwuzla_mk_fp_from_real(fpSort, rm, "1");
-    long two = BitwuzlaJNI.bitwuzla_mk_fp_from_real(fpSort, rm, "2");
-
-    long boolSort = BitwuzlaJNI.bitwuzla_mk_bool_sort();
-    //    long res = bitwuzlaJNI.bitwuzla_mk_const(boolSort, "res");
-    long bvSort8 = BitwuzlaJNI.bitwuzla_mk_bv_sort(8);
-    long arg1 = BitwuzlaJNI.bitwuzla_mk_const(bvSort8, "arg1");
-    long arg2 = BitwuzlaJNI.bitwuzla_mk_bv_value_uint64(bvSort8, 11);
-    long[] domain = {bvSort8, bvSort8};
-    long sortFun = BitwuzlaJNI.bitwuzla_mk_fun_sort(2, domain, boolSort);
+    Sort fpSort = Bitwuzla.mk_fp_sort(5, 11);
+    Term rm = Bitwuzla.mk_rm_value(RoundingMode.RNE);
+    Term a = Bitwuzla.mk_const(fpSort, "a");
+    Term one = Bitwuzla.mk_fp_value(fpSort, rm, "1");
+    Term two = Bitwuzla.mk_fp_value(fpSort, rm, "2");
+
+    Sort boolSort = Bitwuzla.mk_bool_sort();
+    //    Result res = Bitwuzla.mk_const(boolSort, "res");
+    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
+    Term arg1 = Bitwuzla.mk_const(bvSort8, "arg1");
+    Term arg2 = Bitwuzla.mk_bv_value_signed(bvSort8, 11);
+    Sort[] domain = {bvSort8, bvSort8};
+    Sort sortFun = Bitwuzla.mk_fun_sort(new Vector_Sort(domain), boolSort);
 
     // (applied) UFs have 1 + arity children, the UF decl (in this case foo), then the arguments
     // in order. Applied UFs are also no "fun", but can only be discerned by KIND
     // The decl has no children, but you can get domain and codomain with API calls
-    long foo = BitwuzlaJNI.bitwuzla_mk_const(sortFun, "foo");
-    long appliedFoo =
-        BitwuzlaJNI.bitwuzla_mk_term3(
-            BitwuzlaKind.BITWUZLA_KIND_APPLY.swigValue(), foo, arg1, arg2);
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_fun(appliedFoo)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_bool(appliedFoo)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_bool(BitwuzlaJNI.bitwuzla_term_get_sort(appliedFoo)))
-        .isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_symbol(appliedFoo)).isNull();
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_symbol(foo)).isEqualTo("foo");
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_const(foo)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_fun(foo)).isTrue();
-    long[] appliedFooChildren = BitwuzlaJNI.bitwuzla_term_get_children(appliedFoo, new long[1]);
-    assertThat(appliedFooChildren[0]).isEqualTo(foo);
-    assertThat(appliedFooChildren[1]).isEqualTo(arg1);
-    assertThat(appliedFooChildren[2]).isEqualTo(arg2);
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_children(appliedFooChildren[0], new long[1]))
-        .isEmpty();
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_kind(appliedFoo))
-        .isEqualTo(BitwuzlaKind.BITWUZLA_KIND_APPLY.swigValue());
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_kind(foo))
-        .isEqualTo(BitwuzlaKind.BITWUZLA_KIND_CONSTANT.swigValue());
-
-    long add =
-        BitwuzlaJNI.bitwuzla_mk_term3(BitwuzlaKind.BITWUZLA_KIND_FP_ADD.swigValue(), rm, two, one);
-    long eq = BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), add, a);
-    long neg = BitwuzlaJNI.bitwuzla_mk_term1(BitwuzlaKind.BITWUZLA_KIND_NOT.swigValue(), eq);
+    Term foo = Bitwuzla.mk_const(sortFun, "foo");
+    Term appliedFoo = Bitwuzla.mk_term(Kind.APPLY, foo, arg1, arg2);
+    assertThat(appliedFoo.sort().is_fun()).isFalse();
+    assertThat(appliedFoo.sort().is_bool()).isTrue();
+    assertThat(appliedFoo.symbol()).isNull();
+    assertThat(foo.symbol()).isEqualTo("foo");
+    assertThat(foo.is_const()).isTrue();
+    assertThat(foo.sort().is_fun()).isTrue();
+    assertThat(appliedFoo.get(0)).isEqualTo(foo);
+    assertThat(appliedFoo.get(1)).isEqualTo(arg1);
+    assertThat(appliedFoo.get(2)).isEqualTo(arg2);
+    assertThat(appliedFoo.get(0).children()).isEmpty();
+    assertThat(appliedFoo.kind()).isEqualTo(Kind.APPLY);
+    assertThat(foo.kind()).isEqualTo(Kind.CONSTANT);
+
+    Term add = Bitwuzla.mk_term(Kind.FP_ADD, rm, two, one);
+    Term eq = Bitwuzla.mk_term(Kind.EQUAL, add, a);
+    Term neg = Bitwuzla.mk_term(Kind.NOT, eq);
 
     // The type of add is fp (a bv add would be bv)
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_fp(add)).isTrue();
+    assertThat(add.sort().is_fp()).isTrue();
     // eq is bool
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_bool(eq)).isTrue();
+    assertThat(eq.sort().is_bool()).isTrue();
     // neg is also bool
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_bool(neg)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_fun(neg)).isFalse();
+    assertThat(neg.sort().is_bool()).isTrue();
+    assertThat(neg.sort().is_fun()).isFalse();
 
     // Non-UF functions consist of a KIND and arguments.
     // You can get the KIND w bitwuzla_term_get_kind() and the arguments in the correct order w
     // bitwuzla_term_get_children()
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_fun(appliedFoo)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_fun(add)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_fun(eq)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_fun(neg)).isFalse();
-
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_rm(rm)).isTrue();
-
-    long aSort = BitwuzlaJNI.bitwuzla_term_get_sort(a);
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_bv_value(a)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_fp(aSort)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_const(aSort)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_fp(a)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_var(a)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_value(a)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_kind(a))
-        .isEqualTo(BitwuzlaKind.BITWUZLA_KIND_CONSTANT.swigValue());
-
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_fun(aSort)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_fp(aSort)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_rm(aSort)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_bool(aSort)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_bv(aSort)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_array(aSort)).isFalse();
-
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(a)).isEqualTo("a");
-
-    long oneSort = BitwuzlaJNI.bitwuzla_term_get_sort(one);
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_kind(one))
-        .isEqualTo(BitwuzlaKind.BITWUZLA_KIND_VALUE.swigValue());
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_kind(one))
-        .isNotEqualTo(BitwuzlaKind.BITWUZLA_KIND_VARIABLE.swigValue());
-    assertThat(BitwuzlaJNI.bitwuzla_term_get_kind(one))
-        .isNotEqualTo(BitwuzlaKind.BITWUZLA_KIND_CONSTANT.swigValue());
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_bv_value(one)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_fp(oneSort)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_const(oneSort)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_fp(one)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_var(one)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_fun(oneSort)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_fp(oneSort)).isTrue();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_rm(oneSort)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_bool(oneSort)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_bv(oneSort)).isFalse();
-    assertThat(BitwuzlaJNI.bitwuzla_sort_is_array(oneSort)).isFalse();
-
-    assertThat(BitwuzlaJNI.bitwuzla_term_to_string(one)).isEqualTo("(fp #b0 #b01111 #b0000000000)");
+    assertThat(appliedFoo.sort().is_fun()).isFalse();
+    assertThat(add.sort().is_fun()).isFalse();
+    assertThat(eq.sort().is_fun()).isFalse();
+    assertThat(neg.sort().is_fun()).isFalse();
+
+    assertThat(rm.sort().is_rm()).isTrue();
+
+    Sort aSort = a.sort();
+    assertThat(aSort.is_bv()).isFalse();
+    assertThat(aSort.is_fp()).isTrue();
+    assertThat(aSort.is_fun()).isFalse();
+    assertThat(aSort.is_rm()).isFalse();
+    assertThat(aSort.is_bool()).isFalse();
+    assertThat(aSort.is_array()).isFalse();
+
+    assertThat(a.is_const()).isTrue();
+    assertThat(a.is_variable()).isFalse();
+    assertThat(a.is_value()).isFalse();
+    assertThat(a.kind()).isEqualTo(Kind.CONSTANT);
+
+    assertThat(a.toString()).isEqualTo("a");
+
+    Sort oneSort = one.sort();
+    assertThat(one.kind()).isEqualTo(Kind.VALUE);
+    assertThat(one.kind()).isNotEqualTo(Kind.VARIABLE);
+    assertThat(one.kind()).isNotEqualTo(Kind.CONSTANT);
+    assertThat(oneSort.is_bv()).isFalse();
+    assertThat(oneSort.is_fp()).isTrue();
+    assertThat(one.is_const()).isFalse();
+    assertThat(oneSort.is_fp()).isTrue();
+    assertThat(one.is_variable()).isFalse();
+    assertThat(oneSort.is_fun()).isFalse();
+    assertThat(oneSort.is_rm()).isFalse();
+    assertThat(oneSort.is_bool()).isFalse();
+    assertThat(oneSort.is_array()).isFalse();
+
+    assertThat(one.toString()).isEqualTo("(fp #b0 #b01111 #b0000000000)");
   }
 
   /*
@@ -782,26 +508,21 @@ public void testTypes() {
    */
   @Test
   public void testExtend() {
-    long bvSort8 = BitwuzlaJNI.bitwuzla_mk_bv_sort(8);
-    long bvSort10 = BitwuzlaJNI.bitwuzla_mk_bv_sort(10);
-    long x = BitwuzlaJNI.bitwuzla_mk_const(bvSort8, "x");
-    long y = BitwuzlaJNI.bitwuzla_mk_const(bvSort10, "y");
-    long xExt =
-        BitwuzlaJNI.bitwuzla_mk_term1_indexed1(
-            BitwuzlaKind.BITWUZLA_KIND_BV_SIGN_EXTEND.swigValue(), x, 2);
-    long xExtEqY =
-        BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), xExt, y);
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, xExtEqY);
-    long res = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(res).isEqualTo(BitwuzlaResult.BITWUZLA_SAT.swigValue());
-
-    long[] children = BitwuzlaJNI.bitwuzla_term_get_children(xExt, new long[1]);
-    assertThat(children).hasLength(1);
-    assertThat(BitwuzlaJNI.bitwuzla_term_is_indexed(xExt)).isTrue();
-    long[] len = new long[1];
-    long[] indices = BitwuzlaJNI.bitwuzla_term_get_indices(xExt, len);
-    assertThat(indices).hasLength(1);
-    assertThat(indices[0]).isEqualTo(2);
+    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
+    Sort bvSort10 = Bitwuzla.mk_bv_sort(10);
+    Term x = Bitwuzla.mk_const(bvSort8, "x");
+    Term y = Bitwuzla.mk_const(bvSort10, "y");
+    Term xExt = Bitwuzla.mk_term(Kind.BV_SIGN_EXTEND, x, 2);
+    Term xExtEqY = Bitwuzla.mk_term(Kind.EQUAL, xExt, y);
+    bitwuzla.assert_formula(xExtEqY);
+    Result res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
+
+    assertThat(xExt.num_children()).isEqualTo(1);
+    assertThat(xExt.num_indices()).isGreaterThan(0);
+    Vector_Int indices = xExt.indices();
+    assertThat(indices.size()).isEqualTo(1);
+    assertThat(indices.get(0)).isEqualTo(2);
   }
 
   // Todo:
@@ -809,36 +530,32 @@ public void testExtend() {
   @Test
   public void testExists() {
     // EXISTS x, y . x = z AND y = z implies x = y
-    long bvSort8 = BitwuzlaJNI.bitwuzla_mk_bv_sort(8);
-    long x = BitwuzlaJNI.bitwuzla_mk_const(bvSort8, "x");
-    long y = BitwuzlaJNI.bitwuzla_mk_const(bvSort8, "y");
-    long z = BitwuzlaJNI.bitwuzla_mk_const(bvSort8, "z");
-
-    long xEqZ = BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), x, z);
-    long yEqZ = BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), y, z);
-    long xEqY = BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_EQUAL.swigValue(), x, y);
-    long formula =
-        BitwuzlaJNI.bitwuzla_mk_term2(
-            BitwuzlaKind.BITWUZLA_KIND_IMPLIES.swigValue(),
-            BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_AND.swigValue(), xEqZ, yEqZ),
-            xEqY);
+    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
+    Term x = Bitwuzla.mk_const(bvSort8, "x");
+    Term y = Bitwuzla.mk_const(bvSort8, "y");
+    Term z = Bitwuzla.mk_const(bvSort8, "z");
+
+    Term xEqZ = Bitwuzla.mk_term(Kind.EQUAL, x, z);
+    Term yEqZ = Bitwuzla.mk_term(Kind.EQUAL, y, z);
+    Term xEqY = Bitwuzla.mk_term(Kind.EQUAL, x, y);
+    Term formula = Bitwuzla.mk_term(Kind.IMPLIES, Bitwuzla.mk_term(Kind.AND, xEqZ, yEqZ), xEqY);
 
     // Substitute the free vars with bound vars
-    long xB = BitwuzlaJNI.bitwuzla_mk_var(bvSort8, "x");
-    long yB = BitwuzlaJNI.bitwuzla_mk_var(bvSort8, "y");
+    Term xB = Bitwuzla.mk_var(bvSort8, "x");
+    Term yB = Bitwuzla.mk_var(bvSort8, "y");
     // Substitution does not return a new term, but modifies the existing!
-    BitwuzlaJNI.bitwuzla_substitute_terms(
-        1, new long[] {formula}, 2, new long[] {x, y}, new long[] {xB, yB});
+    Map_TermTerm mapping = new Map_TermTerm();
+    mapping.put(x, xB);
+    mapping.put(y, yB);
+    formula.substitute(mapping);
     // Build quantifier
-    long[] argsAndBody = {xB, yB, formula};
-    long ex =
-        BitwuzlaJNI.bitwuzla_mk_term(
-            BitwuzlaKind.BITWUZLA_KIND_FORALL.swigValue(), argsAndBody.length, argsAndBody);
+    Term[] argsAndBody = {xB, yB, formula};
+    Term ex = Bitwuzla.mk_term(Kind.FORALL, new Vector_Term(argsAndBody));
 
     // Check SAT
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, ex);
-    long res = BitwuzlaJNI.bitwuzla_check_sat(bitwuzla);
-    assertThat(res).isEqualTo(BitwuzlaResult.BITWUZLA_UNSAT.swigValue());
+    bitwuzla.assert_formula(ex);
+    Result res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.UNSAT);
 
     // Model
   }
@@ -854,14 +571,27 @@ public void testExists() {
           + "(define-fun .def_14 () Bool (or e .def_13))\n"
           + "(assert .def_14)";
 
+  private Vector_Term parse(String smt2dump) throws IOException {
+    // create a temporary file and dump the formulas to it in SMTLIB2 format
+    Path file = Files.createTempFile("bitwuzla-", ".smt2");
+    Files.writeString(file, smt2dump);
+
+    // run the parser on the temporary file
+    Parser parser = new Parser(createOptions(), file.toString());
+    String error = parser.parse(true);
+
+    assertWithMessage(error).that(error).isEmpty();
+    return parser.bitwuzla().get_assertions();
+  }
+
   // Bitwuzla currently REWRITES terms when parsing
   @Ignore
   @Test
-  public void parserTest2() {
-    long[] terms = BitwuzlaJNI.parse(SMT2DUMP);
-    BitwuzlaJNI.bitwuzla_push(bitwuzla, 1);
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, terms[0]);
-    String newDump = BitwuzlaJNI.dump_assertions_smt2(bitwuzla, 10);
+  public void parserTest2() throws IOException {
+    Vector_Term assertions = parse(SMT2DUMP);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(assertions.get(0));
+    String newDump = bitwuzla.print_formula();
     if (newDump.contains("(check-sat)")) {
       newDump = newDump.replace("(check-sat)", "");
     }
@@ -872,39 +602,46 @@ public void parserTest2() {
   }
 
   @Test
-  public void parserTest() {
-    long boolSort = BitwuzlaJNI.bitwuzla_mk_bool_sort();
-    long x = BitwuzlaJNI.bitwuzla_mk_const(boolSort, "x");
-    long y = BitwuzlaJNI.bitwuzla_mk_const(boolSort, "y");
-    long xOrY = BitwuzlaJNI.bitwuzla_mk_term2(BitwuzlaKind.BITWUZLA_KIND_XOR.swigValue(), x, y);
-    BitwuzlaJNI.bitwuzla_push(bitwuzla, 1);
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, xOrY);
-
-    String dump = BitwuzlaJNI.dump_assertions_smt2(bitwuzla, 10);
+  public void parserTest() throws IOException {
+    Sort boolSort = Bitwuzla.mk_bool_sort();
+    Term x = Bitwuzla.mk_const(boolSort, "x");
+    Term y = Bitwuzla.mk_const(boolSort, "y");
+    Term xOrY = Bitwuzla.mk_term(Kind.XOR, x, y);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(xOrY);
+
+    String dump = bitwuzla.print_formula();
     System.out.println(dump);
     // check-sat and exit messes with the parse, in that suddenly sat is checked and the formulas
     // are rewritten and then returned in a different form, independent of options
 
-    BitwuzlaJNI.bitwuzla_pop(bitwuzla, 1);
+    bitwuzla.pop(1);
+
+    // parse the dumped formulas
+    Vector_Term assertions = parse(dump);
 
-    long[] terms = BitwuzlaJNI.parse(dump);
+    // add the parsed assertion to our stack
+    bitwuzla.push(1);
+    assertThat(assertions.size()).isEqualTo(1);
+    bitwuzla.assert_formula(assertions.get(0));
 
-    BitwuzlaJNI.bitwuzla_push(bitwuzla, 1);
-    BitwuzlaJNI.bitwuzla_assert(bitwuzla, terms[0]);
-    String newDump = BitwuzlaJNI.dump_assertions_smt2(bitwuzla, 10);
+    // the output of print_formula should stay the same
+    String newDump = bitwuzla.print_formula();
     assertThat(newDump).isEqualTo(dump);
   }
 
+  /*
   @Ignore
   @Test
-  public void parserFailTest() {
+  public void parserFailTest() throws IOException {
     // valid
     String input = "(declare-const a Bool)\n(declare-const b Bool)\n(assert (or a b))";
-    long[] terms = BitwuzlaJNI.parse(input);
-    assertThat(terms).isNotNull();
+    Vector_Term assertions = parse(input);
+    assertThat(assertions).isNotEmpty();
     // invalid/fails
     String badInput = "(declare-const a Bool)\n(assert (or a b))";
-    terms = BitwuzlaJNI.parse(badInput);
-    assertThat(terms).isNotNull();
+    assertions = parse(badInput);
+    // FIXME: Throw an exception in swig if the parse failed
   }
+  */
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaOption.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaOption.java
deleted file mode 100644
index 1487d27377..0000000000
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaOption.java
+++ /dev/null
@@ -1,168 +0,0 @@
-// This file is part of JavaSMT,
-// an API wrapper for a collection of SMT solvers:
-// https://github.com/sosy-lab/java-smt
-//
-// SPDX-FileCopyrightText: 2023 Dirk Beyer <https://www.sosy-lab.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package org.sosy_lab.java_smt.solvers.bitwuzla;
-
-public final class BitwuzlaOption {
-
-  private static int swigNext = 0;
-  private final int swigValue;
-  private final String swigName;
-  public static final BitwuzlaOption BITWUZLA_OPT_LOGLEVEL =
-      new BitwuzlaOption("BITWUZLA_OPT_LOGLEVEL");
-  public static final BitwuzlaOption BITWUZLA_OPT_PRODUCE_MODELS =
-      new BitwuzlaOption("BITWUZLA_OPT_PRODUCE_MODELS");
-  public static final BitwuzlaOption BITWUZLA_OPT_PRODUCE_UNSAT_ASSUMPTIONS =
-      new BitwuzlaOption("BITWUZLA_OPT_PRODUCE_UNSAT_ASSUMPTIONS");
-  public static final BitwuzlaOption BITWUZLA_OPT_PRODUCE_UNSAT_CORES =
-      new BitwuzlaOption("BITWUZLA_OPT_PRODUCE_UNSAT_CORES");
-  public static final BitwuzlaOption BITWUZLA_OPT_SEED = new BitwuzlaOption("BITWUZLA_OPT_SEED");
-  public static final BitwuzlaOption BITWUZLA_OPT_VERBOSITY =
-      new BitwuzlaOption("BITWUZLA_OPT_VERBOSITY");
-  public static final BitwuzlaOption BITWUZLA_OPT_TIME_LIMIT_PER =
-      new BitwuzlaOption("BITWUZLA_OPT_TIME_LIMIT_PER");
-  public static final BitwuzlaOption BITWUZLA_OPT_BV_SOLVER =
-      new BitwuzlaOption("BITWUZLA_OPT_BV_SOLVER");
-  public static final BitwuzlaOption BITWUZLA_OPT_REWRITE_LEVEL =
-      new BitwuzlaOption("BITWUZLA_OPT_REWRITE_LEVEL");
-  public static final BitwuzlaOption BITWUZLA_OPT_SAT_SOLVER =
-      new BitwuzlaOption("BITWUZLA_OPT_SAT_SOLVER");
-  public static final BitwuzlaOption BITWUZLA_OPT_PROP_CONST_BITS =
-      new BitwuzlaOption("BITWUZLA_OPT_PROP_CONST_BITS");
-  public static final BitwuzlaOption BITWUZLA_OPT_PROP_INFER_INEQ_BOUNDS =
-      new BitwuzlaOption("BITWUZLA_OPT_PROP_INFER_INEQ_BOUNDS");
-  public static final BitwuzlaOption BITWUZLA_OPT_PROP_NPROPS =
-      new BitwuzlaOption("BITWUZLA_OPT_PROP_NPROPS");
-  public static final BitwuzlaOption BITWUZLA_OPT_PROP_NUPDATES =
-      new BitwuzlaOption("BITWUZLA_OPT_PROP_NUPDATES");
-  public static final BitwuzlaOption BITWUZLA_OPT_PROP_OPT_LT_CONCAT_SEXT =
-      new BitwuzlaOption("BITWUZLA_OPT_PROP_OPT_LT_CONCAT_SEXT");
-  public static final BitwuzlaOption BITWUZLA_OPT_PROP_PATH_SEL =
-      new BitwuzlaOption("BITWUZLA_OPT_PROP_PATH_SEL");
-  public static final BitwuzlaOption BITWUZLA_OPT_PROP_PROB_RANDOM_INPUT =
-      new BitwuzlaOption("BITWUZLA_OPT_PROP_PROB_RANDOM_INPUT");
-  public static final BitwuzlaOption BITWUZLA_OPT_PROP_PROB_USE_INV_VALUE =
-      new BitwuzlaOption("BITWUZLA_OPT_PROP_PROB_USE_INV_VALUE");
-  public static final BitwuzlaOption BITWUZLA_OPT_PROP_SEXT =
-      new BitwuzlaOption("BITWUZLA_OPT_PROP_SEXT");
-  public static final BitwuzlaOption BITWUZLA_OPT_PROP_NORMALIZE =
-      new BitwuzlaOption("BITWUZLA_OPT_PROP_NORMALIZE");
-  public static final BitwuzlaOption BITWUZLA_OPT_PREPROCESS =
-      new BitwuzlaOption("BITWUZLA_OPT_PREPROCESS");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_CONTRADICTING_ANDS =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_CONTRADICTING_ANDS");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_ELIM_BV_EXTRACTS =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_ELIM_BV_EXTRACTS");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_EMBEDDED_CONSTR =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_EMBEDDED_CONSTR");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_FLATTEN_AND =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_FLATTEN_AND");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_NORMALIZE =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_NORMALIZE");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_NORMALIZE_SHARE_AWARE =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_NORMALIZE_SHARE_AWARE");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_SKELETON_PREPROC =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_SKELETON_PREPROC");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_VARIABLE_SUBST =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_VARIABLE_SUBST");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_VARIABLE_SUBST_NORM_EQ =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_VARIABLE_SUBST_NORM_EQ");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_VARIABLE_SUBST_NORM_DISEQ =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_VARIABLE_SUBST_NORM_DISEQ");
-  public static final BitwuzlaOption BITWUZLA_OPT_PP_VARIABLE_SUBST_NORM_BV_INEQ =
-      new BitwuzlaOption("BITWUZLA_OPT_PP_VARIABLE_SUBST_NORM_BV_INEQ");
-  public static final BitwuzlaOption BITWUZLA_OPT_DBG_RW_NODE_THRESH =
-      new BitwuzlaOption("BITWUZLA_OPT_DBG_RW_NODE_THRESH");
-  public static final BitwuzlaOption BITWUZLA_OPT_DBG_PP_NODE_THRESH =
-      new BitwuzlaOption("BITWUZLA_OPT_DBG_PP_NODE_THRESH");
-  public static final BitwuzlaOption BITWUZLA_OPT_DBG_CHECK_MODEL =
-      new BitwuzlaOption("BITWUZLA_OPT_DBG_CHECK_MODEL");
-  public static final BitwuzlaOption BITWUZLA_OPT_DBG_CHECK_UNSAT_CORE =
-      new BitwuzlaOption("BITWUZLA_OPT_DBG_CHECK_UNSAT_CORE");
-  public static final BitwuzlaOption BITWUZLA_OPT_NUM_OPTS =
-      new BitwuzlaOption("BITWUZLA_OPT_NUM_OPTS");
-
-  public int swigValue() {
-    return swigValue;
-  }
-
-  @Override
-  public String toString() {
-    return swigName;
-  }
-
-  public static BitwuzlaOption swigToEnum(int swigValue) {
-    if (swigValue < swigValues.length
-        && swigValue >= 0
-        && swigValues[swigValue].swigValue == swigValue) {
-      return swigValues[swigValue];
-    }
-    for (int i = 0; i < swigValues.length; i++) {
-      if (swigValues[i].swigValue == swigValue) {
-        return swigValues[i];
-      }
-    }
-    throw new IllegalArgumentException(
-        "No enum " + BitwuzlaOption.class + " with value " + swigValue);
-  }
-
-  // Suppress because of SWIG magic
-  @SuppressWarnings("StaticAssignmentInConstructor")
-  private BitwuzlaOption(String swigName) {
-    this.swigName = swigName;
-    this.swigValue = swigNext++;
-  }
-
-  private static BitwuzlaOption[] swigValues = {
-    BITWUZLA_OPT_LOGLEVEL,
-    BITWUZLA_OPT_PRODUCE_MODELS,
-    BITWUZLA_OPT_PRODUCE_UNSAT_ASSUMPTIONS,
-    BITWUZLA_OPT_PRODUCE_UNSAT_CORES,
-    BITWUZLA_OPT_SEED,
-    BITWUZLA_OPT_VERBOSITY,
-    BITWUZLA_OPT_TIME_LIMIT_PER,
-    BITWUZLA_OPT_BV_SOLVER,
-    BITWUZLA_OPT_REWRITE_LEVEL,
-    BITWUZLA_OPT_SAT_SOLVER,
-    BITWUZLA_OPT_PROP_CONST_BITS,
-    BITWUZLA_OPT_PROP_INFER_INEQ_BOUNDS,
-    BITWUZLA_OPT_PROP_NPROPS,
-    BITWUZLA_OPT_PROP_NUPDATES,
-    BITWUZLA_OPT_PROP_OPT_LT_CONCAT_SEXT,
-    BITWUZLA_OPT_PROP_PATH_SEL,
-    BITWUZLA_OPT_PROP_PROB_RANDOM_INPUT,
-    BITWUZLA_OPT_PROP_PROB_USE_INV_VALUE,
-    BITWUZLA_OPT_PROP_SEXT,
-    BITWUZLA_OPT_PROP_NORMALIZE,
-    BITWUZLA_OPT_PREPROCESS,
-    BITWUZLA_OPT_PP_CONTRADICTING_ANDS,
-    BITWUZLA_OPT_PP_ELIM_BV_EXTRACTS,
-    BITWUZLA_OPT_PP_EMBEDDED_CONSTR,
-    BITWUZLA_OPT_PP_FLATTEN_AND,
-    BITWUZLA_OPT_PP_NORMALIZE,
-    BITWUZLA_OPT_PP_NORMALIZE_SHARE_AWARE,
-    BITWUZLA_OPT_PP_SKELETON_PREPROC,
-    BITWUZLA_OPT_PP_VARIABLE_SUBST,
-    BITWUZLA_OPT_PP_VARIABLE_SUBST_NORM_EQ,
-    BITWUZLA_OPT_PP_VARIABLE_SUBST_NORM_DISEQ,
-    BITWUZLA_OPT_PP_VARIABLE_SUBST_NORM_BV_INEQ,
-    BITWUZLA_OPT_DBG_RW_NODE_THRESH,
-    BITWUZLA_OPT_DBG_PP_NODE_THRESH,
-    BITWUZLA_OPT_DBG_CHECK_MODEL,
-    BITWUZLA_OPT_DBG_CHECK_UNSAT_CORE,
-    BITWUZLA_OPT_NUM_OPTS,
-  };
-}
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaOptionInfo.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaOptionInfo.java
deleted file mode 100644
index 2bdc1e463b..0000000000
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaOptionInfo.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// This file is part of JavaSMT,
-// an API wrapper for a collection of SMT solvers:
-// https://github.com/sosy-lab/java-smt
-//
-// SPDX-FileCopyrightText: 2023 Dirk Beyer <https://www.sosy-lab.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package org.sosy_lab.java_smt.solvers.bitwuzla;
-
-public class BitwuzlaOptionInfo {
-  private transient long swigCPtr;
-  protected transient boolean swigCMemOwn;
-
-  protected BitwuzlaOptionInfo(long cPtr, boolean cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  protected static long getCPtr(BitwuzlaOptionInfo obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-
-  public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        BitwuzlaJNI.delete_BitwuzlaOptionInfo(swigCPtr);
-      }
-      swigCPtr = 0;
-    }
-  }
-
-  public void setOpt(BitwuzlaOption value) {
-    BitwuzlaJNI.BitwuzlaOptionInfo_opt_set(swigCPtr, this, value.swigValue());
-  }
-
-  public BitwuzlaOption getOpt() {
-    return BitwuzlaOption.swigToEnum(BitwuzlaJNI.BitwuzlaOptionInfo_opt_get(swigCPtr, this));
-  }
-
-  public void setShrt(String value) {
-    BitwuzlaJNI.BitwuzlaOptionInfo_shrt_set(swigCPtr, this, value);
-  }
-
-  public String getShrt() {
-    return BitwuzlaJNI.BitwuzlaOptionInfo_shrt_get(swigCPtr, this);
-  }
-
-  public void setLng(String value) {
-    BitwuzlaJNI.BitwuzlaOptionInfo_lng_set(swigCPtr, this, value);
-  }
-
-  public String getLng() {
-    return BitwuzlaJNI.BitwuzlaOptionInfo_lng_get(swigCPtr, this);
-  }
-
-  public void setDescription(String value) {
-    BitwuzlaJNI.BitwuzlaOptionInfo_description_set(swigCPtr, this, value);
-  }
-
-  public String getDescription() {
-    return BitwuzlaJNI.BitwuzlaOptionInfo_description_get(swigCPtr, this);
-  }
-
-  public void setNumeric(NumericValue value) {
-    BitwuzlaJNI.BitwuzlaOptionInfo_numeric_set(swigCPtr, this, NumericValue.getCPtr(value), value);
-  }
-
-  public NumericValue getNumeric() {
-    long cPtr = BitwuzlaJNI.BitwuzlaOptionInfo_numeric_get(swigCPtr, this);
-    return (cPtr == 0) ? null : new NumericValue(cPtr, false);
-  }
-
-  public BitwuzlaOptionInfo() {
-    this(BitwuzlaJNI.new_BitwuzlaOptionInfo(), true);
-  }
-}
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
index c19529c4f4..750eb5f4b2 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
@@ -14,51 +14,59 @@
 import org.sosy_lab.java_smt.api.SolverException;
 import org.sosy_lab.java_smt.basicimpl.AbstractQuantifiedFormulaManager;
 import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Map_TermTerm;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
 public class BitwuzlaQuantifiedFormulaManager
-    extends AbstractQuantifiedFormulaManager<Long, Long, Long, BitwuzlaDeclaration> {
+    extends AbstractQuantifiedFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
 
   protected BitwuzlaQuantifiedFormulaManager(
-      FormulaCreator<Long, Long, Long, BitwuzlaDeclaration> pCreator) {
+      FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator) {
     super(pCreator);
   }
 
   @Override
-  protected Long eliminateQuantifiers(Long pExtractInfo)
+  protected Term eliminateQuantifiers(Term pExtractInfo)
       throws SolverException, InterruptedException {
     throw new UnsupportedOperationException("Bitwuzla does not support eliminating Quantifiers.");
   }
 
   @Override
-  public Long mkQuantifier(Quantifier q, List<Long> vars, Long body) {
+  public Term mkQuantifier(Quantifier q, List<Term> vars, Term body) {
     checkArgument(
         !vars.isEmpty(), "The list of bound variables for a quantifier may not be empty.");
-    long[] origVars = new long[vars.size()];
-    long[] substVars = new long[vars.size()];
+    Term[] origVars = new Term[vars.size()];
+    Term[] substVars = new Term[vars.size()];
 
     for (int i = 0; i < vars.size(); i++) {
-      long var = vars.get(i);
+      Term var = vars.get(i);
       origVars[i] = var;
       // Create/Use bound vars
-      long boundCopy = ((BitwuzlaFormulaCreator) formulaCreator).makeBoundVariable(var);
+      Term boundCopy = ((BitwuzlaFormulaCreator) formulaCreator).makeBoundVariable(var);
       substVars[i] = boundCopy;
     }
-    long substBody = BitwuzlaJNI.bitwuzla_substitute_term(body, vars.size(), origVars, substVars);
 
-    long[] argsAndBody = new long[2];
-    argsAndBody[1] = substBody;
-    long currentFormula = substBody;
+    Map_TermTerm map = new Map_TermTerm();
+    for (int i = 0; i < origVars.length; i++) {
+      map.put(origVars[i], substVars[i]);
+    }
+    // FIXME: This will ovewrite the old body
+    body.substitute(map);
+
+    Term[] argsAndBody = new Term[2];
+    argsAndBody[1] = body;
+    Term currentFormula = body;
     for (int i = 0; i < vars.size(); i++) {
       argsAndBody[0] = substVars[i];
       if (q.equals(Quantifier.FORALL)) {
-        currentFormula =
-            BitwuzlaJNI.bitwuzla_mk_term(
-                BitwuzlaKind.BITWUZLA_KIND_FORALL.swigValue(), argsAndBody.length, argsAndBody);
+        currentFormula = Bitwuzla.mk_term(Kind.FORALL, new Vector_Term(argsAndBody));
 
       } else {
-        currentFormula =
-            BitwuzlaJNI.bitwuzla_mk_term(
-                BitwuzlaKind.BITWUZLA_KIND_EXISTS.swigValue(), argsAndBody.length, argsAndBody);
+        currentFormula = Bitwuzla.mk_term(Kind.EXISTS, new Vector_Term(argsAndBody));
       }
       argsAndBody[1] = currentFormula;
     }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaResult.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaResult.java
deleted file mode 100644
index 4b79528fbd..0000000000
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaResult.java
+++ /dev/null
@@ -1,73 +0,0 @@
-// This file is part of JavaSMT,
-// an API wrapper for a collection of SMT solvers:
-// https://github.com/sosy-lab/java-smt
-//
-// SPDX-FileCopyrightText: 2023 Dirk Beyer <https://www.sosy-lab.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.sosy_lab.java_smt.solvers.bitwuzla;
-
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-public final class BitwuzlaResult {
-
-  private static int swigNext = 0;
-  private final int swigValue;
-  private final String swigName;
-  public static final BitwuzlaResult BITWUZLA_SAT =
-      BitwuzlaResult.of("BITWUZLA_SAT", BitwuzlaJNI.BITWUZLA_SAT_get());
-  public static final BitwuzlaResult BITWUZLA_UNSAT =
-      BitwuzlaResult.of("BITWUZLA_UNSAT", BitwuzlaJNI.BITWUZLA_UNSAT_get());
-  public static final BitwuzlaResult BITWUZLA_UNKNOWN =
-      BitwuzlaResult.of("BITWUZLA_UNKNOWN", BitwuzlaJNI.BITWUZLA_UNKNOWN_get());
-
-  private static BitwuzlaResult[] swigValues = {BITWUZLA_SAT, BITWUZLA_UNSAT, BITWUZLA_UNKNOWN};
-
-  public int swigValue() {
-    return swigValue;
-  }
-
-  @Override
-  public String toString() {
-    return swigName;
-  }
-
-  public static BitwuzlaResult swigToEnum(int swigValue) {
-    if (swigValue < swigValues.length
-        && swigValue >= 0
-        && swigValues[swigValue].swigValue == swigValue) {
-      return swigValues[swigValue];
-    }
-    for (int i = 0; i < swigValues.length; i++) {
-      if (swigValues[i].swigValue == swigValue) {
-        return swigValues[i];
-      }
-    }
-    throw new IllegalArgumentException(
-        "No enum " + BitwuzlaResult.class + " with value " + swigValue);
-  }
-
-  @SuppressWarnings("unused")
-  private BitwuzlaResult(String swigName) {
-    this.swigName = swigName;
-    this.swigValue = swigNext++;
-  }
-
-  private BitwuzlaResult(String swigName, int swigValue) {
-    this.swigName = swigName;
-    this.swigValue = swigValue;
-  }
-
-  private static BitwuzlaResult of(String swigName, int swigValue) {
-    BitwuzlaResult res = new BitwuzlaResult(swigName, swigValue);
-    BitwuzlaResult.swigNext = res.swigValue + 1;
-    return res;
-  }
-}
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
index ea35f25c29..38cfa0b93e 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
@@ -22,8 +22,6 @@
 import org.sosy_lab.common.ShutdownNotifier;
 import org.sosy_lab.common.configuration.Configuration;
 import org.sosy_lab.common.configuration.InvalidConfigurationException;
-import org.sosy_lab.common.configuration.Option;
-import org.sosy_lab.common.configuration.Options;
 import org.sosy_lab.common.io.PathCounterTemplate;
 import org.sosy_lab.java_smt.SolverContextFactory.Solvers;
 import org.sosy_lab.java_smt.api.FloatingPointRoundingMode;
@@ -31,10 +29,13 @@
 import org.sosy_lab.java_smt.api.OptimizationProverEnvironment;
 import org.sosy_lab.java_smt.api.ProverEnvironment;
 import org.sosy_lab.java_smt.basicimpl.AbstractSolverContext;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.BitwuzlaNative;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Option;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Options;
 
 public final class BitwuzlaSolverContext extends AbstractSolverContext {
 
-  @Options(prefix = "solver.bitwuzla")
+  @org.sosy_lab.common.configuration.Options(prefix = "solver.bitwuzla")
   public static class BitwuzlaSettings {
 
     enum SatSolver {
@@ -44,10 +45,12 @@ enum SatSolver {
       KISSAT
     }
 
-    @Option(secure = true, description = "The SAT solver used by Bitwuzla.")
+    @org.sosy_lab.common.configuration.Option(
+        secure = true,
+        description = "The SAT solver used by " + "Bitwuzla.")
     private SatSolver satSolver = SatSolver.CADICAL;
 
-    @Option(
+    @org.sosy_lab.common.configuration.Option(
         secure = true,
         description =
             "Further options for Bitwuzla in addition to the default options. "
@@ -73,9 +76,7 @@ protected String getFurtherOptions() {
   private final BitwuzlaFormulaCreator creator;
   private final ShutdownNotifier shutdownNotifier;
 
-  private final BitwuzlaSettings settings;
-
-  private final long randomSeed;
+  private final Options solverOptions;
 
   private boolean closed = false;
 
@@ -83,14 +84,12 @@ protected String getFurtherOptions() {
       BitwuzlaFormulaManager pManager,
       BitwuzlaFormulaCreator pCreator,
       ShutdownNotifier pShutdownNotifier,
-      long pRandomSeed,
-      BitwuzlaSettings pSettings) {
+      Options pOptions) {
     super(pManager);
     manager = pManager;
     creator = pCreator;
     shutdownNotifier = pShutdownNotifier;
-    randomSeed = pRandomSeed;
-    settings = pSettings;
+    solverOptions = pOptions;
   }
 
   @SuppressWarnings("unused")
@@ -104,10 +103,9 @@ public static BitwuzlaSolverContext create(
       throws InvalidConfigurationException {
     pLoader.accept("bitwuzlaJNI");
 
-    BitwuzlaSettings settings = new BitwuzlaSettings(config);
-    final long bitwuzla = createEnvironmentBasedOnOptions(settings, randomSeed);
+    Options solverOptions = buildBitwuzlaOptions(new BitwuzlaSettings(config), randomSeed);
 
-    BitwuzlaFormulaCreator creator = new BitwuzlaFormulaCreator(bitwuzla);
+    BitwuzlaFormulaCreator creator = new BitwuzlaFormulaCreator();
     BitwuzlaUFManager functionTheory = new BitwuzlaUFManager(creator);
     BitwuzlaBooleanFormulaManager booleanTheory = new BitwuzlaBooleanFormulaManager(creator);
     BitwuzlaBitvectorFormulaManager bitvectorTheory =
@@ -125,31 +123,66 @@ public static BitwuzlaSolverContext create(
             bitvectorTheory,
             quantifierTheory,
             floatingPointTheory,
-            arrayTheory);
+            arrayTheory,
+            solverOptions);
 
-    return new BitwuzlaSolverContext(manager, creator, pShutdownNotifier, randomSeed, settings);
+    return new BitwuzlaSolverContext(manager, creator, pShutdownNotifier, solverOptions);
   }
 
-  private static long createEnvironmentBasedOnOptions(BitwuzlaSettings settings, long randomSeed)
+  /**
+   * Set more options for Bitwuzla.
+   *
+   * @param pOptions        current Bitwuzla options
+   * @param pFurtherOptions String to be parsed with options to be set.
+   * @throws InvalidConfigurationException signals that the format of the option string is wrong or
+   *                                       an invalid option is used.
+   */
+  private static Options setFurtherOptions(Options pOptions, String pFurtherOptions)
       throws InvalidConfigurationException {
-    long options = BitwuzlaJNI.bitwuzla_options_new();
+    MapSplitter optionSplitter =
+        Splitter.on(',')
+            .trimResults()
+            .omitEmptyStrings()
+            .withKeyValueSeparator(Splitter.on('=').limit(2).trimResults());
+    ImmutableMap<String, String> furtherOptionsMap;
 
+    try {
+      furtherOptionsMap = ImmutableMap.copyOf(optionSplitter.split(pFurtherOptions));
+    } catch (IllegalArgumentException e) {
+      throw new InvalidConfigurationException(
+          "Invalid Bitwuzla option in \"" + pFurtherOptions + "\": " + e.getMessage(), e);
+    }
+    for (Map.Entry<String, String> option : furtherOptionsMap.entrySet()) {
+      try {
+        Class<?> optionClass = Option.class;
+        Field optionField = optionClass.getField(option.getKey());
+        // Get the value of the public fields
+        Option value = (Option) optionField.get(null);
+        if (pOptions.is_numeric(value)) {
+          pOptions.set(value, Integer.parseInt(option.getValue()));
+        } else {
+          pOptions.set(value, option.getValue());
+        }
+      } catch (java.lang.NoSuchFieldException e) {
+        throw new InvalidConfigurationException(e.getMessage(), e);
+      } catch (IllegalAccessException pE) {
+        throw new RuntimeException("Problem with access to BitwuzlaOption Field", pE);
+      }
+    }
+    return pOptions;
+  }
+
+  private static Options buildBitwuzlaOptions(BitwuzlaSettings settings, long randomSeed)
+      throws InvalidConfigurationException {
     Preconditions.checkNotNull(settings.getSatSolver());
-    BitwuzlaJNI.bitwuzla_set_option_mode(
-        options,
-        BitwuzlaOption.BITWUZLA_OPT_SAT_SOLVER.swigValue(),
-        settings.getSatSolver().name().toLowerCase(Locale.getDefault()));
-    BitwuzlaJNI.bitwuzla_set_option(
-        options, BitwuzlaOption.BITWUZLA_OPT_PRODUCE_MODELS.swigValue(), 2);
-    BitwuzlaJNI.bitwuzla_set_option(
-        options, BitwuzlaOption.BITWUZLA_OPT_SEED.swigValue(), randomSeed);
-    // Stop Bitwuzla from rewriting formulas in outputs
-    BitwuzlaJNI.bitwuzla_set_option(
-        options, BitwuzlaOption.BITWUZLA_OPT_REWRITE_LEVEL.swigValue(), 0);
 
-    setFurtherOptions(options, settings.getFurtherOptions());
+    Options options = new Options();
+    options.set(Option.SAT_SOLVER, settings.getSatSolver().name().toLowerCase(Locale.getDefault()));
+    options.set(Option.PRODUCE_MODELS, 2); // "2" means "create model for all terms"
+    options.set(Option.SEED, (int) randomSeed);
+    options.set(Option.REWRITE_LEVEL, 0); // Stop Bitwuzla from rewriting formulas in outputs
 
-    return BitwuzlaJNI.bitwuzla_new(options);
+    return setFurtherOptions(options, settings.getFurtherOptions());
   }
 
   /**
@@ -160,7 +193,7 @@ private static long createEnvironmentBasedOnOptions(BitwuzlaSettings settings, l
    */
   @Override
   public String getVersion() {
-    return "Bitwuzla " + BitwuzlaJNI.bitwuzla_version();
+    return "Bitwuzla " + BitwuzlaNative.version();
   }
 
   /**
@@ -187,7 +220,6 @@ public Solvers getSolverName() {
   public void close() {
     if (!closed) {
       closed = true;
-      BitwuzlaJNI.bitwuzla_delete(creator.getEnv());
     }
   }
 
@@ -195,8 +227,7 @@ public void close() {
   protected ProverEnvironment newProverEnvironment0(Set<ProverOptions> options) {
     Preconditions.checkState(!closed, "solver context is already closed");
 
-    return new BitwuzlaTheoremProver(
-        manager, creator, shutdownNotifier, options, settings, randomSeed);
+    return new BitwuzlaTheoremProver(manager, creator, shutdownNotifier, options, solverOptions);
   }
 
   @Override
@@ -229,47 +260,4 @@ protected OptimizationProverEnvironment newOptimizationProverEnvironment0(
   protected boolean supportsAssumptionSolving() {
     return true;
   }
-
-  /**
-   * Set more options for Bitwuzla.
-   *
-   * @param pOptions options pointer
-   * @param pFurtherOptions String to be parsed with options to be set.
-   * @throws InvalidConfigurationException signals that the format of the option string is wrong or
-   *     an invalid option is used.
-   */
-  private static void setFurtherOptions(long pOptions, String pFurtherOptions)
-      throws InvalidConfigurationException {
-    MapSplitter optionSplitter =
-        Splitter.on(',')
-            .trimResults()
-            .omitEmptyStrings()
-            .withKeyValueSeparator(Splitter.on('=').limit(2).trimResults());
-    ImmutableMap<String, String> furtherOptionsMap;
-
-    try {
-      furtherOptionsMap = ImmutableMap.copyOf(optionSplitter.split(pFurtherOptions));
-    } catch (IllegalArgumentException e) {
-      throw new InvalidConfigurationException(
-          "Invalid Bitwuzla option in \"" + pFurtherOptions + "\": " + e.getMessage(), e);
-    }
-    for (Map.Entry<String, String> option : furtherOptionsMap.entrySet()) {
-      try {
-        Class<?> optionClass = BitwuzlaOption.class;
-        Field optionField = optionClass.getField(option.getKey());
-        // Get the value of the public fields
-        BitwuzlaOption value = (BitwuzlaOption) optionField.get(null);
-        if (BitwuzlaJNI.bitwuzla_option_is_numeric(pOptions, value.swigValue())) {
-          long optionValue = Long.parseLong(option.getValue());
-          BitwuzlaJNI.bitwuzla_set_option(pOptions, value.swigValue(), optionValue);
-        } else {
-          BitwuzlaJNI.bitwuzla_set_option_mode(pOptions, value.swigValue(), option.getValue());
-        }
-      } catch (java.lang.NoSuchFieldException e) {
-        throw new InvalidConfigurationException(e.getMessage(), e);
-      } catch (IllegalAccessException pE) {
-        throw new RuntimeException("Problem with access to BitwuzlaOption Field", pE);
-      }
-    }
-  }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index 59f3ccead9..c95bf7cbcf 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -13,7 +13,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 import java.util.Optional;
 import java.util.Set;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -26,12 +25,16 @@
 import org.sosy_lab.java_smt.basicimpl.AbstractProverWithAllSat;
 import org.sosy_lab.java_smt.basicimpl.CachingModel;
 import org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaFormula.BitwuzlaBooleanFormula;
-import org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaJNI.TerminationCallback;
-import org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaSolverContext.BitwuzlaSettings;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Option;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Options;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Result;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
 class BitwuzlaTheoremProver extends AbstractProverWithAllSat<Void> implements ProverEnvironment {
 
-  private final long env;
+  private final Bitwuzla env;
 
   @SuppressWarnings("unused")
   private final BitwuzlaFormulaManager manager;
@@ -39,62 +42,45 @@ class BitwuzlaTheoremProver extends AbstractProverWithAllSat<Void> implements Pr
   private final BitwuzlaFormulaCreator creator;
   protected boolean wasLastSatCheckSat = false; // and stack is not changed
 
-  private final TerminationCallback terminationCallback;
-  private final long terminationCallbackHelper;
+  // FIXME: Add termination callback
+  // private final TerminationCallback terminationCallback;
+  // private final long terminationCallbackHelper;
 
   protected BitwuzlaTheoremProver(
       BitwuzlaFormulaManager pManager,
       BitwuzlaFormulaCreator pCreator,
       ShutdownNotifier pShutdownNotifier,
       Set<ProverOptions> pOptions,
-      BitwuzlaSettings pSettings,
-      long pRandomSeed) {
+      Options pSolverOptions) {
     super(pOptions, pManager.getBooleanFormulaManager(), pShutdownNotifier);
     manager = pManager;
     creator = pCreator;
     // Bitwuzla guarantees that Terms and Sorts are shared
-    env = createEnvironment(pOptions, pSettings, pRandomSeed);
-    terminationCallback = shutdownNotifier::shouldShutdown;
-    terminationCallbackHelper = addTerminationCallback();
+    env = createEnvironment(pOptions, pSolverOptions);
+    // terminationCallback = shutdownNotifier::shouldShutdown;
+    // terminationCallbackHelper = addTerminationCallback();
   }
 
-  private long createEnvironment(
-      Set<ProverOptions> pFurtherOptions, BitwuzlaSettings pSettings, long pRandomSeed) {
-    // TODO: set further options
-    long options = BitwuzlaJNI.bitwuzla_options_new();
-
-    if (pFurtherOptions.contains(ProverOptions.GENERATE_MODELS)
-        || pFurtherOptions.contains(ProverOptions.GENERATE_ALL_SAT)) {
-      BitwuzlaJNI.bitwuzla_set_option(
-          options, BitwuzlaOption.BITWUZLA_OPT_PRODUCE_MODELS.swigValue(), 2);
+  private Bitwuzla createEnvironment(Set<ProverOptions> pFurtherOptions, Options pSolverOptions) {
+    if (!pFurtherOptions.contains(ProverOptions.GENERATE_MODELS)
+        && !pFurtherOptions.contains(ProverOptions.GENERATE_ALL_SAT)) {
+      // Model generation is always on in pSolverOptions. Disable it when the ProverOption was
+      // not selected.
+      pSolverOptions.set(Option.PRODUCE_MODELS, 0);
     }
 
     if (pFurtherOptions.contains(ProverOptions.GENERATE_UNSAT_CORE)) {
-      BitwuzlaJNI.bitwuzla_set_option(
-          options, BitwuzlaOption.BITWUZLA_OPT_PRODUCE_UNSAT_CORES.swigValue(), 2);
+      pSolverOptions.set(Option.PRODUCE_UNSAT_CORES, 2);
     }
 
     if (pFurtherOptions.contains(ProverOptions.GENERATE_UNSAT_CORE_OVER_ASSUMPTIONS)) {
-      BitwuzlaJNI.bitwuzla_set_option(
-          options, BitwuzlaOption.BITWUZLA_OPT_PRODUCE_UNSAT_ASSUMPTIONS.swigValue(), 2);
+      pSolverOptions.set(Option.PRODUCE_UNSAT_ASSUMPTIONS, 2);
     }
+
     // TODO: termination callback
     // bitwuzlaJNI.bitwuzla_set_termination_callback();
 
-    Preconditions.checkNotNull(pSettings.getSatSolver());
-    BitwuzlaJNI.bitwuzla_set_option_mode(
-        options,
-        BitwuzlaOption.BITWUZLA_OPT_SAT_SOLVER.swigValue(),
-        pSettings.getSatSolver().name().toLowerCase(Locale.getDefault()));
-    BitwuzlaJNI.bitwuzla_set_option(
-        options, BitwuzlaOption.BITWUZLA_OPT_SEED.swigValue(), pRandomSeed);
-    // Stop Bitwuzla from rewriting formulas in outputs
-    BitwuzlaJNI.bitwuzla_set_option(
-        options, BitwuzlaOption.BITWUZLA_OPT_REWRITE_LEVEL.swigValue(), 0);
-
-    // setFurtherOptions(pOptions, settings.getFurtherOptions());
-
-    return BitwuzlaJNI.bitwuzla_new(options);
+    return new Bitwuzla(pSolverOptions);
   }
 
   /**
@@ -103,13 +89,13 @@ private long createEnvironment(
    */
   @Override
   public void popImpl() {
-    BitwuzlaJNI.bitwuzla_pop(env, 1);
+    env.pop(1);
   }
 
   @Override
   public @Nullable Void addConstraintImpl(BooleanFormula constraint) throws InterruptedException {
     wasLastSatCheckSat = false;
-    BitwuzlaJNI.bitwuzla_assert(env, ((BitwuzlaBooleanFormula) constraint).getTerm());
+    env.assert_formula(((BitwuzlaBooleanFormula) constraint).getTerm());
     return null;
   }
 
@@ -122,19 +108,18 @@ public void popImpl() {
    */
   @Override
   public void pushImpl() throws InterruptedException {
-    BitwuzlaJNI.bitwuzla_push(env, 1);
+    env.push(1);
   }
 
-  private boolean readSATResult(int resultValue) throws SolverException, InterruptedException {
-    if (resultValue == BitwuzlaResult.BITWUZLA_SAT.swigValue()) {
+  private boolean readSATResult(Result resultValue) throws SolverException, InterruptedException {
+    if (resultValue == Result.SAT) {
       wasLastSatCheckSat = true;
       return false;
-    } else if (resultValue == BitwuzlaResult.BITWUZLA_UNSAT.swigValue()) {
+    } else if (resultValue == Result.UNSAT) {
       return true;
-    } else if (resultValue == BitwuzlaResult.BITWUZLA_UNKNOWN.swigValue()
-        && terminationCallback.shouldTerminate()) {
-      throw new InterruptedException("Bitwuzla interrupted.");
-    } else {
+    } /*else if (resultValue == Result.UNKNOWN && terminationCallback.shouldTerminate()) {
+        throw new InterruptedException("Bitwuzla interrupted.");
+      }*/ else {
       throw new SolverException("Bitwuzla returned UNKNOWN.");
     }
   }
@@ -144,7 +129,7 @@ private boolean readSATResult(int resultValue) throws SolverException, Interrupt
   public boolean isUnsat() throws SolverException, InterruptedException {
     Preconditions.checkState(!closed);
     wasLastSatCheckSat = false;
-    final int result = BitwuzlaJNI.bitwuzla_check_sat(env);
+    final Result result = env.check_sat();
     return readSATResult(result);
   }
 
@@ -157,9 +142,12 @@ public boolean isUnsat() throws SolverException, InterruptedException {
   @Override
   public boolean isUnsatWithAssumptions(Collection<BooleanFormula> assumptions)
       throws SolverException, InterruptedException {
-    long[] ass =
-        assumptions.stream().mapToLong(a -> ((BitwuzlaBooleanFormula) a).getTerm()).toArray();
-    final int result = BitwuzlaJNI.bitwuzla_check_sat_assuming(env, assumptions.size(), ass);
+    Vector_Term ass = new Vector_Term();
+    for (BooleanFormula formula : assumptions) {
+      BitwuzlaBooleanFormula bitwuzlaFormula = (BitwuzlaBooleanFormula) formula;
+      ass.add(bitwuzlaFormula.getTerm());
+    }
+    final Result result = env.check_sat(ass);
     return readSATResult(result);
   }
 
@@ -177,21 +165,15 @@ public Model getModel() throws SolverException {
     Preconditions.checkState(!closed);
     Preconditions.checkState(wasLastSatCheckSat, NO_MODEL_HELP);
     checkGenerateModels();
-    Model result = new CachingModel(getEvaluatorWithoutChecks());
-    return result;
+    return new CachingModel(getEvaluatorWithoutChecks());
   }
 
   private List<BooleanFormula> getUnsatCore0() {
-    long[] size = new long[1];
-    return encapsulate(BitwuzlaJNI.bitwuzla_get_unsat_core(env, size), size[0]);
-  }
-
-  private List<BooleanFormula> encapsulate(long pTermsArray, long size) {
-    List<BooleanFormula> result = new ArrayList<>((int) size);
-    for (int i = 0; i < size; i++) {
-      result.add(creator.encapsulateBoolean(BitwuzlaJNI.BitwuzlaTermArray_getitem(pTermsArray, i)));
+    List<BooleanFormula> wrapped = new ArrayList<>();
+    for (Term term : env.get_unsat_assumptions()) {
+      wrapped.add(creator.encapsulateBoolean(term));
     }
-    return result;
+    return wrapped;
   }
 
   /**
@@ -233,9 +215,8 @@ public Optional<List<BooleanFormula>> unsatCoreOverAssumptions(
   @Override
   public void close() {
     if (!closed) {
-      BitwuzlaJNI.free_termination(terminationCallbackHelper);
-      BitwuzlaJNI.bitwuzla_delete(env);
       closed = true;
+      env.delete();
     }
     super.close();
   }
@@ -249,9 +230,10 @@ protected BitwuzlaModel getEvaluatorWithoutChecks() {
   public boolean isClosed() {
     return closed;
   }
-
-  private long addTerminationCallback() {
-    Preconditions.checkState(!closed, "solver context is already closed");
-    return BitwuzlaJNI.set_termination(env, terminationCallback);
-  }
+  /*
+   private long addTerminationCallback() {
+     Preconditions.checkState(!closed, "solver context is already closed");
+     return BitwuzlaJNI.set_termination(env, terminationCallback);
+   }
+  */
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaUFManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaUFManager.java
index af1a685c51..ff14991b67 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaUFManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaUFManager.java
@@ -10,9 +10,11 @@
 
 import org.sosy_lab.java_smt.basicimpl.AbstractUFManager;
 import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
 
-public class BitwuzlaUFManager extends AbstractUFManager<Long, BitwuzlaDeclaration, Long, Long> {
-  protected BitwuzlaUFManager(FormulaCreator<Long, Long, Long, BitwuzlaDeclaration> pCreator) {
+public class BitwuzlaUFManager extends AbstractUFManager<Term, BitwuzlaDeclaration, Sort, Void> {
+  protected BitwuzlaUFManager(FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator) {
     super(pCreator);
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/NumericValue.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/NumericValue.java
index 045aad1e5d..8b631533ce 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/NumericValue.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/NumericValue.java
@@ -16,6 +16,7 @@
 
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
+/*
 public class NumericValue {
   private transient long swigCPtr;
   protected transient boolean swigCMemOwn;
@@ -75,3 +76,4 @@ public NumericValue() {
     this(BitwuzlaJNI.new_NumericValue(), true);
   }
 }
+*/

From 68c9b64cbd6f15be3088db3b51f5095e9a3f84f3 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 23 Jan 2024 21:27:47 +0100
Subject: [PATCH 002/158] Re-enabled dumpFormula in BitwuzlaFormulaManager.

---
 .../bitwuzla/BitwuzlaFormulaManager.java      | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index fa187f811c..a022e4e6c3 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -14,9 +14,11 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import org.sosy_lab.common.Appender;
+import org.sosy_lab.common.Appenders;
 import org.sosy_lab.java_smt.api.BooleanFormula;
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormulaManager;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Options;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Parser;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
@@ -85,8 +87,6 @@ public BooleanFormula parse(String s) throws IllegalArgumentException {
 
   @Override
   public Appender dumpFormula(Term pTerm) {
-    // TODO: We need to reimplement this
-    /*
     // There are 2 ways of SMT2 printing in Bitwuzla, bitwuzla_term_print() and
     // bitwuzla_term_print_fmt(), which print a single formula, and bitwuzla_print_formula(),
     // which prints the complete assertion stack of the bitwuzla instance given to the function.
@@ -95,23 +95,14 @@ public Appender dumpFormula(Term pTerm) {
     return new Appenders.AbstractAppender() {
       @Override
       public void appendTo(Appendable out) throws IOException {
-        long printCtx = getFormulaCreator().getEnv();
-        BitwuzlaJNI.bitwuzla_push(printCtx, 1);
-        BitwuzlaJNI.bitwuzla_assert(printCtx, pTerm);
-        String dump = BitwuzlaJNI.dump_assertions_smt2(printCtx, 10);
-        BitwuzlaJNI.bitwuzla_pop(printCtx, 1);
-        // Bitwuzla prints (check-sat)\n(exit)\n in the end. We remove that.
-        if (dump.contains("(check-sat)\n")) {
-          dump = dump.replace("(check-sat)", "");
-        }
-        if (dump.contains("(exit)")) {
-          dump = dump.replace("(exit)", "");
-        }
+        Bitwuzla bitwuzla = new Bitwuzla(); // TODO: It would be better to keep this instance around
+        bitwuzla.assert_formula(pTerm);
+        String dump = bitwuzla.print_formula();
+        dump = dump.replace("(check-sat)", "");
+        dump = dump.replace("(exit)", "");
         out.append(dump);
       }
     };
-    */
-    throw new UnsupportedOperationException();
   }
 
   static Term getBitwuzlaTerm(Formula pT) {

From 24a072a6dde58d09a2332d0a5161fe989c1d48f8 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 23 Jan 2024 22:00:24 +0100
Subject: [PATCH 003/158] Downgrade to local C++ build of Bitwuzla.

---
 lib/ivy.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ivy.xml b/lib/ivy.xml
index a1606bf2b3..e32675199e 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -167,7 +167,8 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
-        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.3.1-g6eae1f85" conf="runtime-bitwuzla->solver-bitwuzla"/>
+        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.3.0-g2b5a4a86"
+                    conf="runtime-bitwuzla->solver-bitwuzla"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->
         <dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.0-1-gc58fe5b4" conf="runtime-yices2->runtime; contrib->sources" />

From 573b6d2d7a56a8d38eb755190b90826b1fc7fe65 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 23 Jan 2024 22:01:22 +0100
Subject: [PATCH 004/158] Fixed includes in bitwuzla.i

---
 lib/native/source/libbitwuzla/bitwuzla.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index f026ec7a9b..6c5d332ee7 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -8,8 +8,8 @@
 
 %module BitwuzlaNative
 %{
-#include "include/bitwuzla/cpp/bitwuzla.h"
-#include "include/bitwuzla/cpp/parser.h"
+#include <bitwuzla/cpp/bitwuzla.h>
+#include <bitwuzla/cpp/parser.h>
 
 #include <sstream>
 %}

From 3671f1056a201b6e37bec49b6fb39151c602523b Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 23 Jan 2024 22:10:05 +0100
Subject: [PATCH 005/158] Added bitwuzla_wrap.cpp to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1bf8b0cf09..80e752954b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
 /lib/java/runtime/*.jar
 /lib/java/test/*.jar
 lib/native/source/libz3j/org_sosy_lab_solver_z3_Z3NativeApi.c
+lib/native/source/libbitwuzla/bitwuzla_wrap.cpp
 lib/native/source/*/*.so
 lib/native/source/*/*.o
 lib/native/source/**/*.java

From 5f485ba8200bc0c82015d5619961ca3cc4e7669d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 23 Jan 2024 22:16:25 +0100
Subject: [PATCH 006/158] Fixed a bug in BitwuzlaTheoremProver.getUnsatCore()

---
 .../java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index c95bf7cbcf..e81687260f 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -170,7 +170,7 @@ public Model getModel() throws SolverException {
 
   private List<BooleanFormula> getUnsatCore0() {
     List<BooleanFormula> wrapped = new ArrayList<>();
-    for (Term term : env.get_unsat_assumptions()) {
+    for (Term term : env.get_unsat_core()) {
       wrapped.add(creator.encapsulateBoolean(term));
     }
     return wrapped;

From 44d499666134eda43f7c7dc2b43107888925864b Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 23 Jan 2024 22:40:38 +0100
Subject: [PATCH 007/158] Improved error messages in
 BitwuzlaFormulaManager.parse()

---
 .../solvers/bitwuzla/BitwuzlaFormulaManager.java      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index a022e4e6c3..c1bf2e9d56 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -8,7 +8,6 @@
 
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
-
 import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -78,10 +77,16 @@ public BooleanFormula parse(String s) throws IllegalArgumentException {
     Parser parser = new Parser(bitwuzlaOption, file.toString());
     String error = parser.parse(true);
 
-    Preconditions.checkArgument(error.isEmpty(), error);
+    Preconditions.checkArgument(
+        error.isEmpty(), "Could not parse input string \"%s\": Error \"%s\"", s, error);
     Vector_Term assertions = parser.bitwuzla().get_assertions();
 
-    Preconditions.checkArgument(assertions.size() == 1, "Could not parse input string \"%s\"", s);
+    Preconditions.checkArgument(
+        !assertions.isEmpty(), "Could not parse input string \"%s\": No assertion was found", s);
+    Preconditions.checkArgument(
+        assertions.size() == 1,
+        "Could not parse input string \"%s\": Only one assertion is allowed",
+        s);
     return getFormulaCreator().encapsulateBoolean(assertions.get(0));
   }
 

From 0a2431da5d828424eb85968991bb2fe674d643d3 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 23 Jan 2024 22:46:56 +0100
Subject: [PATCH 008/158] Fixed formating.

---
 .../java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
index 38cfa0b93e..76d889c528 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
@@ -132,10 +132,10 @@ public static BitwuzlaSolverContext create(
   /**
    * Set more options for Bitwuzla.
    *
-   * @param pOptions        current Bitwuzla options
+   * @param pOptions current Bitwuzla options
    * @param pFurtherOptions String to be parsed with options to be set.
    * @throws InvalidConfigurationException signals that the format of the option string is wrong or
-   *                                       an invalid option is used.
+   *     an invalid option is used.
    */
   private static Options setFurtherOptions(Options pOptions, String pFurtherOptions)
       throws InvalidConfigurationException {

From 72772bb3d324d1fd80eaffbf59a03b5e876949de Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 23 Jan 2024 23:56:47 +0100
Subject: [PATCH 009/158] Fixed term substitution.

---
 lib/native/source/libbitwuzla/bitwuzla.i                      | 4 ++--
 .../java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java     | 3 +--
 .../solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java    | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index 6c5d332ee7..04b4173758 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -315,8 +315,8 @@ namespace bitwuzla {
 %ignore substitute_terms (std::vector<Term> &, const std::unordered_map<Term,Term> &);
 %ignore substitute_term (const Term &, const std::unordered_map<Term, Term> &);
 %extend Term {
-  void substitute(const std::unordered_map<Term, Term> &map) {
-    bitwuzla::substitute_term(*$self, map);
+  Term substitute(const std::unordered_map<Term, Term> &map) {
+    return bitwuzla::substitute_term(*$self, map);
   }
 }
 
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index f66d50f52a..9033cfae90 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -418,8 +418,7 @@ public <R> R visit(FormulaVisitor<R> visitor, Formula formula, Term f)
       for (int i = 0; i < boundVars.length; i++) {
         map.put(boundVars[i], freeVars[i]);
       }
-      // FIXME: This will change the original term
-      body.substitute(map);
+      body = body.substitute(map);
 
       Quantifier quant = kind.equals(Kind.EXISTS) ? Quantifier.EXISTS : Quantifier.FORALL;
       return visitor.visitQuantifier(
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
index 750eb5f4b2..7f21a1d234 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
@@ -54,8 +54,7 @@ public Term mkQuantifier(Quantifier q, List<Term> vars, Term body) {
     for (int i = 0; i < origVars.length; i++) {
       map.put(origVars[i], substVars[i]);
     }
-    // FIXME: This will ovewrite the old body
-    body.substitute(map);
+    body = body.substitute(map);
 
     Term[] argsAndBody = new Term[2];
     argsAndBody[1] = body;

From 992cbe4fc6691bbec120d9df1694d1c99075893b Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 24 Jan 2024 00:13:08 +0100
Subject: [PATCH 010/158] Removed special case for BV_ZERO_EXTEND in
 BitwuzlaFormulaCreator.callFunctionImpl as it seems unneeded.

---
 .../java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index 9033cfae90..8933cd6865 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -474,10 +474,6 @@ public Term callFunctionImpl(BitwuzlaDeclaration declaration, List<Term> args) {
       // The term might be indexed, then we need index creation
       Term term = declaration.getTerm();
       Kind properKind = term.kind();
-      if (properKind == Kind.BV_ZERO_EXTEND) {
-        // FIXME: Not implemented
-        throw new UnsupportedOperationException();
-      }
       return Bitwuzla.mk_term(properKind, new Vector_Term(args), term.indices());
     }
 

From bebae05969d7b631ce70322bb3f7322e6ac0fe7d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 24 Jan 2024 01:13:21 +0100
Subject: [PATCH 011/158] Added termination hook.

---
 lib/native/source/libbitwuzla/bitwuzla.i      |  9 +++--
 .../bitwuzla/BitwuzlaTheoremProver.java       | 35 ++++++++-----------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index 04b4173758..55ec76fb79 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -6,7 +6,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-%module BitwuzlaNative
+%module(directors="1") BitwuzlaNative
 %{
 #include <bitwuzla/cpp/bitwuzla.h>
 #include <bitwuzla/cpp/parser.h>
@@ -417,8 +417,11 @@ namespace bitwuzla {
 %ignore mk_rm_sort();
 
 /** Terminator */
-// TODO: Can we use this directly?
-%ignore Terminator;
+%insert("runtime") %{
+#define SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON
+%}
+
+%feature("director") Terminator;
 
 /** Bitwuzla */
 %ignore Bitwuzla::is_unsat_assumption (const Term &term);
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index e81687260f..a23fc997c9 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -30,6 +30,7 @@
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Options;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Result;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Terminator;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
 class BitwuzlaTheoremProver extends AbstractProverWithAllSat<Void> implements ProverEnvironment {
@@ -42,10 +43,6 @@ class BitwuzlaTheoremProver extends AbstractProverWithAllSat<Void> implements Pr
   private final BitwuzlaFormulaCreator creator;
   protected boolean wasLastSatCheckSat = false; // and stack is not changed
 
-  // FIXME: Add termination callback
-  // private final TerminationCallback terminationCallback;
-  // private final long terminationCallbackHelper;
-
   protected BitwuzlaTheoremProver(
       BitwuzlaFormulaManager pManager,
       BitwuzlaFormulaCreator pCreator,
@@ -55,10 +52,19 @@ protected BitwuzlaTheoremProver(
     super(pOptions, pManager.getBooleanFormulaManager(), pShutdownNotifier);
     manager = pManager;
     creator = pCreator;
+
     // Bitwuzla guarantees that Terms and Sorts are shared
     env = createEnvironment(pOptions, pSolverOptions);
-    // terminationCallback = shutdownNotifier::shouldShutdown;
-    // terminationCallbackHelper = addTerminationCallback();
+
+    // Install shutdown hook
+    env.configure_terminator(
+        new Terminator() {
+          @Override
+          public boolean terminate() {
+            return shutdownNotifier
+                .shouldShutdown(); // shutdownNotifer is defined in the superclass
+          }
+        });
   }
 
   private Bitwuzla createEnvironment(Set<ProverOptions> pFurtherOptions, Options pSolverOptions) {
@@ -68,18 +74,13 @@ private Bitwuzla createEnvironment(Set<ProverOptions> pFurtherOptions, Options p
       // not selected.
       pSolverOptions.set(Option.PRODUCE_MODELS, 0);
     }
-
     if (pFurtherOptions.contains(ProverOptions.GENERATE_UNSAT_CORE)) {
       pSolverOptions.set(Option.PRODUCE_UNSAT_CORES, 2);
     }
-
     if (pFurtherOptions.contains(ProverOptions.GENERATE_UNSAT_CORE_OVER_ASSUMPTIONS)) {
       pSolverOptions.set(Option.PRODUCE_UNSAT_ASSUMPTIONS, 2);
     }
 
-    // TODO: termination callback
-    // bitwuzlaJNI.bitwuzla_set_termination_callback();
-
     return new Bitwuzla(pSolverOptions);
   }
 
@@ -117,9 +118,9 @@ private boolean readSATResult(Result resultValue) throws SolverException, Interr
       return false;
     } else if (resultValue == Result.UNSAT) {
       return true;
-    } /*else if (resultValue == Result.UNKNOWN && terminationCallback.shouldTerminate()) {
-        throw new InterruptedException("Bitwuzla interrupted.");
-      }*/ else {
+    } else if (resultValue == Result.UNKNOWN && shutdownNotifier.shouldShutdown()) {
+      throw new InterruptedException();
+    } else {
       throw new SolverException("Bitwuzla returned UNKNOWN.");
     }
   }
@@ -230,10 +231,4 @@ protected BitwuzlaModel getEvaluatorWithoutChecks() {
   public boolean isClosed() {
     return closed;
   }
-  /*
-   private long addTerminationCallback() {
-     Preconditions.checkState(!closed, "solver context is already closed");
-     return BitwuzlaJNI.set_termination(env, terminationCallback);
-   }
-  */
 }

From bd3c00970767cd422c6308c196cc4b18881e323f Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 24 Jan 2024 01:47:20 +0100
Subject: [PATCH 012/158] Removed duplicate %include from bitwuzla.i

---
 lib/native/source/libbitwuzla/bitwuzla.i | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index 55ec76fb79..eb5027a7a2 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -17,9 +17,6 @@
 %include <stdint.i>
 %include <std_string.i>
 
-%include <stdint.i>
-%include <std_string.i>
-
 %include <std_vector.i>
 %template(Vector_Int)
   std::vector<int>;

From 33a328aad631f21bcc9a34ccac630d288bbe3b88 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 24 Jan 2024 01:57:18 +0100
Subject: [PATCH 013/158] Added default exception handler to the swig script.

---
 lib/native/source/libbitwuzla/bitwuzla.i | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index eb5027a7a2..3251898b54 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -34,6 +34,16 @@
 %include <std_shared_ptr.i>
 %shared_ptr(bitwuzla::Bitwuzla);
 
+%exception {
+  try {
+    $action
+  } catch(bitwuzla::Exception& e) {
+    jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+    jenv->ThrowNew(exceptionType, e.what());
+    return $null;
+  }
+}
+
 namespace std {
 %ignore to_string(bitwuzla::Kind kind);
 %ignore to_string(bitwuzla::RoundingMode rm);
@@ -44,7 +54,6 @@ namespace std {
 %include "include/bitwuzla/option.h"
 
 namespace bitwuzla {
-
 /** Output streams */
 %ignore set_bv_format;
 %ignore operator<< (std::ostream &ostream, const set_bv_format &f);
@@ -92,8 +101,9 @@ namespace bitwuzla {
 
 %ignore Term::symbol () const;
 %exception Term::symbol {
-  try { $action }
-  catch(std::bad_optional_access& e) {
+  try {
+    $action
+  } catch(std::bad_optional_access& e) {
     return $null;
   }
 }

From b5d65f4d6a768d829315d6cf145c03a5e18fc693 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 24 Jan 2024 02:16:37 +0100
Subject: [PATCH 014/158] Make sure that rationals are supported in test
 rationalToFpMinusOne from FloatingPointFormulaManagerTest.

---
 .../sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
index aad36ef3e2..204582e23c 100644
--- a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
@@ -614,6 +614,7 @@ public void rationalToFpOne() throws SolverException, InterruptedException {
 
   @Test
   public void rationalToFpMinusOne() throws SolverException, InterruptedException {
+    requireRationals();
     requireBitvectors();
 
     NumeralFormula ratOne = rmgr.makeNumber(-1);

From 9fbbacd951cba43416b51e97c89e47e284f5d4fe Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 24 Jan 2024 03:04:18 +0100
Subject: [PATCH 015/158] Fixed solver option description.

---
 .../java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
index 76d889c528..e5d2fe337c 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
@@ -47,16 +47,17 @@ enum SatSolver {
 
     @org.sosy_lab.common.configuration.Option(
         secure = true,
-        description = "The SAT solver used by " + "Bitwuzla.")
+        description = "The SAT solver used by Bitwuzla.")
     private SatSolver satSolver = SatSolver.CADICAL;
 
     @org.sosy_lab.common.configuration.Option(
         secure = true,
         description =
             "Further options for Bitwuzla in addition to the default options. "
-                + "Format:  \"Optionname=value\" with ’,’ to seperate options. "
-                + "Optionname and value can be found in BtorOption or Bitwuzla C Api."
-                + "Example: \"BTOR_OPT_MODEL_GEN=2,BTOR_OPT_INCREMENTAL=1\".")
+                + "Format:  \"option_name=value\" with ’,’ to separate options. "
+                + "Option names and values can be found in the Bitwuzla documentation online:"
+                + "https://bitwuzla.github.io/docs/cpp/enums/option.html#_CPPv4N8bitwuzla6OptionE"
+                + "Example: \"PRODUCE_MODELS=2,SAT_SOLVER=kissat\".")
     private String furtherOptions = "";
 
     protected SatSolver getSatSolver() {

From a3146e4cd2fd87dbd28ce7b581f8fa1ccf2b560b Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 24 Jan 2024 03:20:42 +0100
Subject: [PATCH 016/158] Fixed handling of ProverOptions.Generate_MODELS

---
 .../solvers/bitwuzla/BitwuzlaSolverContext.java    |  1 -
 .../solvers/bitwuzla/BitwuzlaTheoremProver.java    | 14 ++++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
index e5d2fe337c..d1a3cca073 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
@@ -179,7 +179,6 @@ private static Options buildBitwuzlaOptions(BitwuzlaSettings settings, long rand
 
     Options options = new Options();
     options.set(Option.SAT_SOLVER, settings.getSatSolver().name().toLowerCase(Locale.getDefault()));
-    options.set(Option.PRODUCE_MODELS, 2); // "2" means "create model for all terms"
     options.set(Option.SEED, (int) randomSeed);
     options.set(Option.REWRITE_LEVEL, 0); // Stop Bitwuzla from rewriting formulas in outputs
 
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index a23fc997c9..f4f85f2c13 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -67,17 +67,15 @@ public boolean terminate() {
         });
   }
 
-  private Bitwuzla createEnvironment(Set<ProverOptions> pFurtherOptions, Options pSolverOptions) {
-    if (!pFurtherOptions.contains(ProverOptions.GENERATE_MODELS)
-        && !pFurtherOptions.contains(ProverOptions.GENERATE_ALL_SAT)) {
-      // Model generation is always on in pSolverOptions. Disable it when the ProverOption was
-      // not selected.
-      pSolverOptions.set(Option.PRODUCE_MODELS, 0);
+  private Bitwuzla createEnvironment(Set<ProverOptions> pProverOptions, Options pSolverOptions) {
+    if (pProverOptions.contains(ProverOptions.GENERATE_MODELS)
+        || pProverOptions.contains(ProverOptions.GENERATE_ALL_SAT)) {
+      pSolverOptions.set(Option.PRODUCE_MODELS, 2);
     }
-    if (pFurtherOptions.contains(ProverOptions.GENERATE_UNSAT_CORE)) {
+    if (pProverOptions.contains(ProverOptions.GENERATE_UNSAT_CORE)) {
       pSolverOptions.set(Option.PRODUCE_UNSAT_CORES, 2);
     }
-    if (pFurtherOptions.contains(ProverOptions.GENERATE_UNSAT_CORE_OVER_ASSUMPTIONS)) {
+    if (pProverOptions.contains(ProverOptions.GENERATE_UNSAT_CORE_OVER_ASSUMPTIONS)) {
       pSolverOptions.set(Option.PRODUCE_UNSAT_ASSUMPTIONS, 2);
     }
 

From 67043df71aa0ac6f4f25cdcff0b0306e34519faa Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 25 Jan 2024 04:53:40 +0100
Subject: [PATCH 017/158] Fixed the last merge.

---
 .../solvers/bitwuzla/BitwuzlaFloatingPointManager.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index 852506fac1..6b7ae5b65e 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -63,7 +63,7 @@ protected Term getRoundingModeImpl(FloatingPointRoundingMode pFloatingPointRound
   }
 
   @Override
-  protected Term makeNumberImpl(double n, FloatingPointType type, Long pFloatingPointRoundingMode) {
+  protected Term makeNumberImpl(double n, FloatingPointType type, Term pFloatingPointRoundingMode) {
     if (Double.compare(n, -0.0) == 0) {
       return Bitwuzla.mk_fp_neg_zero(mkFpaSort(type));
     } else {
@@ -83,8 +83,7 @@ protected Term makeNumberAndRound(
     if (Double.compare(Double.parseDouble(pN), -0.0) == 0) {
       return Bitwuzla.mk_fp_neg_zero(mkFpaSort(pType));
     } else {
-      return Bitwuzla.mk_fp_from_real(
-          mkFpaSort(pType), pFloatingPointRoundingMode, decimals);
+      return Bitwuzla.mk_fp_value(mkFpaSort(pType), pFloatingPointRoundingMode, decimals);
     }
   }
 

From 7945be01bb25d690ad2cef358d44d9ead1199956 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 25 Jan 2024 04:58:26 +0100
Subject: [PATCH 018/158] Bitwuzla: Added support for floating point values in
 the model.

---
 build/build-publish-solvers.xml               |  9 ++++
 lib/native/source/libbitwuzla/bitwuzla.i      | 44 ++++++++++++++++++
 .../bitwuzla/BitwuzlaFormulaCreator.java      | 45 ++++++-------------
 3 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/build/build-publish-solvers.xml b/build/build-publish-solvers.xml
index 0557ecb491..4c333edade 100644
--- a/build/build-publish-solvers.xml
+++ b/build/build-publish-solvers.xml
@@ -931,6 +931,7 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="-c"/>
             <arg value="bitwuzla_wrap.cpp"/>
             <arg value="-I${source.path}/include"/>
+            <arg value="-I${gmp.path}"/>
             <arg value="-I${java.home}/include"/>
             <arg value="-I${java.home}/include/linux"/>
         </exec>
@@ -946,7 +947,9 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="libbitwuzlaJNI.so"/>
             <arg value="bitwuzla_wrap.o"/>
             <arg value="-L${bitwuzla.path}/install/lib/x86_64-linux-gnu"/>
+            <arg value="-L${gmp.path}/.libs"/>
             <arg value="-lbitwuzla"/>
+            <arg value="-lgmp"/>
             <arg value="-Wl,-z,defs"/>
         </exec>
         <delete file="${source.path}/bitwuzla_wrap.o"/>
@@ -1007,6 +1010,9 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="--replace-needed"/>
             <arg value="libbitwuzla.so.0"/>
             <arg value="libbitwuzla.so"/>
+            <arg value="--replace-needed"/>
+            <arg value="libgmp.so.10"/>
+            <arg value="libgmp.so"/>
             <arg value="libbitwuzlaJNI-${bitwuzla.version}.so"/>
         </exec>
         <!-- We need to run this twice? -->
@@ -1015,6 +1021,9 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="--replace-needed"/>
             <arg value="libbitwuzla.so.0"/>
             <arg value="libbitwuzla.so"/>
+            <arg value="--replace-needed"/>
+            <arg value="libgmp.so.10"/>
+            <arg value="libgmp.so"/>
             <arg value="libbitwuzlaJNI-${bitwuzla.version}.so"/>
         </exec>
     </target>
diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index 3251898b54..f06b88ece4 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -11,6 +11,8 @@
 #include <bitwuzla/cpp/bitwuzla.h>
 #include <bitwuzla/cpp/parser.h>
 
+#include <gmp.h>
+
 #include <sstream>
 %}
 
@@ -114,6 +116,48 @@ namespace bitwuzla {
 }
 
 %ignore Term::value() const;
+%extend Term {
+  bool to_bool() {
+    assert($self->is_value() && $self->sort().is_bool());
+    return $self->value<bool>();
+  }
+
+  bitwuzla::RoundingMode to_rm() {
+    assert($self->is_value() && $self->sort().is_rm());
+    return $self->value<bitwuzla::RoundingMode>();
+  }
+
+  std::string to_bv() {
+    assert($self->is_value() && $self->sort().is_bv());
+    return $self->value<std::string>();
+  }
+
+  double to_fp() {
+    assert($self->is_value() && $self->sort().is_fp());
+        const auto [sign, exponent, mantissa] =
+          $self->value<std::tuple<std::string, std::string, std::string>>();
+
+        mpz_t expMpz;
+        mpz_init_set_str(expMpz, exponent.c_str(), 2);
+        int32_t expVal = mpz_get_si(expMpz);
+        int32_t bias = -1 + (1 << -1 + exponent.length());
+        mpz_clear(expMpz);
+
+        std::string significant = (expVal == 0 ? "" : "1") + mantissa;
+        std::string formated =
+          significant + "@" + std::to_string(expVal - bias - (-1 + significant.length()));
+
+        mpf_t fpMpz;
+        int error = mpf_init_set_str(fpMpz, formated.c_str(), -2);
+        if (error != 0) {
+          throw bitwuzla::Exception("sign: " + sign + ", exponent: " + exponent + ", mantissa: " + mantissa);
+        }
+        double fpVal = mpf_get_d(fpMpz);
+        mpf_clear(fpMpz);
+
+        return (sign == "1") ? -fpVal : fpVal;
+  }
+}
 
 %ignore operator==(const Term &a, const Term &b);
 %ignore operator!=(const Term &a, const Term &b);
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index 8933cd6865..8092979d77 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -10,11 +10,11 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Table;
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -374,9 +374,6 @@ public <R> R visit(FormulaVisitor<R> visitor, Formula formula, Term f)
     Kind kind = f.kind();
     if (f.is_value()) {
       return visitor.visitConstant(formula, convertValue(f));
-    } else if (f.sort().is_fp()) {
-      return visitor.visitConstant(formula, parseIEEEbinaryFP(f));
-
     } else if (f.is_const()) {
       String name = f.symbol();
       return visitor.visitFreeVariable(formula, name);
@@ -555,36 +552,20 @@ protected Optional<Term> getFormulaFromCache(String variable) {
 
   @Override
   public Object convertValue(Term term) {
+    Preconditions.checkArgument(term.is_value(), "Term \"%s\" is not a value.", term);
     Sort sort = term.sort();
-    if (term.is_const()) {
-      return null;
+    if (sort.is_bool()) {
+      return term.to_bool();
     }
-    if (sort.is_fun()) {
-      // TODO: this is wrong
-      throw new AssertionError("Error: Unknown sort and term");
-    } else {
-      String value = term.toString();
-      if (value.startsWith("#b")) {
-        // Bitvectors in Bitwuzla start with a #b
-        return new BigInteger(value.substring(2), 2);
-      } else if (value.equals("true")) {
-        return true;
-      } else if (value.equals("false")) {
-        return false;
-      } else if (value.startsWith("(fp")) {
-        return value
-            .replace("(fp", "")
-            .replace(")", "")
-            .replace("#b", "")
-            .replace("#b", "")
-            .replace("#b", "")
-            .strip();
-      } else if (sort.is_rm()) {
-        return value;
-      }
+    if (sort.is_rm()) {
+      return term.to_rm();
     }
-
-    throw new AssertionError(
-        "Error: Could not convert term to value; Unknown sort and term. " + "Value: " + term);
+    if (sort.is_bv()) {
+      return term.to_bv();
+    }
+    if (sort.is_fp()) {
+      return term.to_fp();
+    }
+    throw new AssertionError("Unknown value type.");
   }
 }

From aac0ffbc21c154c033ea853565d174aa183db0af Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 25 Jan 2024 04:59:13 +0100
Subject: [PATCH 019/158] Bitwuzla: Re-enabled floating point tests.

---
 src/org/sosy_lab/java_smt/test/SolverBasedTest0.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java b/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
index cba97168a0..55db681570 100644
--- a/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
+++ b/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
@@ -250,14 +250,6 @@ protected final void requireQuantifiers() {
   }
 
   protected final void requireFloats() {
-    // TODO: Bitwuza
-    //  Remove once we have a proper solution to the results
-    assume()
-        .withMessage(
-            "FP is not available in Bitwuzla until we can get a proper decimal "
-                + "representation of the results.")
-        .that(solverToUse())
-        .isNotEqualTo(Solvers.BITWUZLA);
     assume()
         .withMessage("Solver %s does not support the theory of floats", solverToUse())
         .that(fpmgr)

From 126109cbd33a2044bb8bb4eae8f3ce0be61213e5 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Mon, 29 Jan 2024 20:13:04 +0100
Subject: [PATCH 020/158] Bitwuzla: Rewrote Term.to_fp() to return a string as
 value. This allows us to handle arbitrary size fp values. Improved native
 method mk_fp_value to handle scientific notation in input strings.

---
 lib/native/source/libbitwuzla/bitwuzla.i      | 119 ++++++++++++++----
 .../BitwuzlaFloatingPointManager.java         |  24 ++--
 .../bitwuzla/BitwuzlaFormulaCreator.java      |  25 +---
 3 files changed, 111 insertions(+), 57 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index f06b88ece4..fdcfc96c93 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -14,6 +14,8 @@
 #include <gmp.h>
 
 #include <sstream>
+#include <cassert>
+#include <limits>
 %}
 
 %include <stdint.i>
@@ -132,30 +134,52 @@ namespace bitwuzla {
     return $self->value<std::string>();
   }
 
-  double to_fp() {
+  std::string to_fp () {
     assert($self->is_value() && $self->sort().is_fp());
-        const auto [sign, exponent, mantissa] =
-          $self->value<std::tuple<std::string, std::string, std::string>>();
 
-        mpz_t expMpz;
-        mpz_init_set_str(expMpz, exponent.c_str(), 2);
-        int32_t expVal = mpz_get_si(expMpz);
-        int32_t bias = -1 + (1 << -1 + exponent.length());
-        mpz_clear(expMpz);
+    // Get Bitwuzla representation of the term value
+    auto [sign, exponent, mantissa] =
+      $self->value<std::tuple<std::string, std::string, std::string>> ();
 
-        std::string significant = (expVal == 0 ? "" : "1") + mantissa;
-        std::string formated =
-          significant + "@" + std::to_string(expVal - bias - (-1 + significant.length()));
+    bool isSignZero = sign == "0";
+    bool isExponentZero = exponent.find_first_not_of("0") == std::string::npos;
+    bool isExponentOnes = exponent.find_first_not_of("1") == std::string::npos;
+    bool isMantissaZero = exponent.find_first_not_of("0") == std::string::npos;
 
-        mpf_t fpMpz;
-        int error = mpf_init_set_str(fpMpz, formated.c_str(), -2);
-        if (error != 0) {
-          throw bitwuzla::Exception("sign: " + sign + ", exponent: " + exponent + ", mantissa: " + mantissa);
-        }
-        double fpVal = mpf_get_d(fpMpz);
-        mpf_clear(fpMpz);
+    // Handle special values
+    if (isExponentZero && isMantissaZero) {
+      return isSignZero ? "0.0" : "-0.0";
+    }
+    if (isExponentOnes && isMantissaZero) {
+      return isSignZero ? "Infinity" : "-Infinity";
+    }
+    if (isExponentOnes && !isMantissaZero) {
+      return "NaN";
+    }
+
+    // Calculate value of the exponent
+    mpz_t expMpz;
+    mpz_init_set_str(expMpz, exponent.c_str(), 2);
+    int32_t expVal = mpz_get_si(expMpz);
+    int32_t bias = -1 + (1 << -1 + exponent.length());
+    mpz_clear(expMpz);
+
+    // Rewrite Bitwuzla representation in a format GMP can understand
+    std::string significant = (expVal == 0 ? "" : "1") + mantissa;
+    std::string formated =
+      significant + "@" + std::to_string(expVal - bias - ((int32_t) significant.length() - 1));
 
-        return (sign == "1") ? -fpVal : fpVal;
+    // Convert result to base10 floating point representation
+    mpf_t floatMpf;
+    mpf_init_set_str(floatMpf, formated.c_str(), -2);
+
+    mp_exp_t exp10;
+    char* sig10 = mpf_get_str(nullptr, &exp10, 10, 0, floatMpf);
+    std::string result =  "0." + std::string(sig10) + "e" + std::to_string(exp10);
+    delete[] sig10;
+    mpf_clear(floatMpf);
+
+    return (sign == "-") ? ("-" + result) : result;
   }
 }
 
@@ -283,8 +307,61 @@ namespace bitwuzla {
 }
 %ignore mk_fp_value(const Sort &, const Term &, const std::string &);
 %extend Bitwuzla {
-  static Term mk_fp_value(const Sort &sort, const Term &rm, const std::string &real) {
-    return bitwuzla::mk_fp_value(sort, rm, real);
+  static Term mk_fp_value(const Sort &sort, const Term &rm, const std::string &repr) {
+    // Handle special values
+    if (repr == "0.0") {
+      return mk_fp_pos_zero(sort);
+    }
+    if (repr == "-0.0") {
+      return mk_fp_neg_zero(sort);
+    }
+    if (repr == "Infinity") {
+      return mk_fp_pos_inf(sort);
+    }
+    if (repr == "-Infinity") {
+      return mk_fp_neg_inf(sort);
+    }
+    if (repr == "NaN") {
+      return mk_fp_nan(sort);
+    }
+
+    // Parse float value with GMP
+    mpf_t floatVal;
+    std::string prev_loc = std::setlocale(LC_ALL, nullptr);
+    std::setlocale(LC_ALL, "en_US.UTF-8");
+    int error = mpf_init_set_str(floatVal, repr.c_str(), 10);
+    std::setlocale(LC_ALL, prev_loc.c_str());
+    if (error != 0) {
+      throw bitwuzla::Exception(
+        "String \"" + repr + "\" can't be parsed as a floating point number.");
+    }
+
+    // Convert to decimal format for Bitwuzla
+    mp_exp_t exponent;
+    char* mantissa = mpf_get_str(nullptr, &exponent, 10, 0, floatVal);
+    std::string input = std::string(mantissa);
+    std::ostringstream output;
+    if (input[0] == '-') {
+      output << "-";
+      input.erase(0, 1);
+    }
+    if (exponent <= 0) {
+      output << "0.";
+      output << std::string(-exponent, '0');
+      output << input;
+    } else {
+      output << input.substr(0, exponent);
+      if (exponent > input.length()) {
+        output << std::string(exponent - input.length(), '0');
+      }
+      if (exponent < input.length()) {
+        output << '.' << input.substr(exponent);
+      }
+    }
+    delete[] mantissa;
+
+    // Create the term
+    return bitwuzla::mk_fp_value(sort, rm, output.str());
   }
 }
 %ignore mk_fp_value(const Sort &,
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index 6b7ae5b65e..4d1c755da7 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -8,6 +8,9 @@
 
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
+import java.math.BigDecimal;
+import org.sosy_lab.common.rationals.Rational;
+import org.sosy_lab.java_smt.api.FloatingPointFormula;
 import org.sosy_lab.java_smt.api.FloatingPointRoundingMode;
 import org.sosy_lab.java_smt.api.FormulaType;
 import org.sosy_lab.java_smt.api.FormulaType.FloatingPointType;
@@ -62,13 +65,16 @@ protected Term getRoundingModeImpl(FloatingPointRoundingMode pFloatingPointRound
     return out;
   }
 
+  @Override
+  public FloatingPointFormula makeNumber(Rational n, FormulaType.FloatingPointType type) {
+    BigDecimal num = new BigDecimal(n.getNum());
+    BigDecimal den = new BigDecimal(n.getDen());
+    return makeNumber(num.divide(den), type);
+  }
+
   @Override
   protected Term makeNumberImpl(double n, FloatingPointType type, Term pFloatingPointRoundingMode) {
-    if (Double.compare(n, -0.0) == 0) {
-      return Bitwuzla.mk_fp_neg_zero(mkFpaSort(type));
-    } else {
-      return makeNumberImpl(String.format("%f", n), type, pFloatingPointRoundingMode);
-    }
+    return makeNumberImpl(String.valueOf(n), type, pFloatingPointRoundingMode);
   }
 
   private Sort mkFpaSort(FloatingPointType pType) {
@@ -78,13 +84,7 @@ private Sort mkFpaSort(FloatingPointType pType) {
   @Override
   protected Term makeNumberAndRound(
       String pN, FloatingPointType pType, Term pFloatingPointRoundingMode) {
-    // Convert scientific notation (f.ex "1.234E2") to a plain decimal string (f.ex "123.4")
-    String decimals = String.format("%.0f", Double.parseDouble(pN));
-    if (Double.compare(Double.parseDouble(pN), -0.0) == 0) {
-      return Bitwuzla.mk_fp_neg_zero(mkFpaSort(pType));
-    } else {
-      return Bitwuzla.mk_fp_value(mkFpaSort(pType), pFloatingPointRoundingMode, decimals);
-    }
+    return Bitwuzla.mk_fp_value(mkFpaSort(pType), pFloatingPointRoundingMode, pN);
   }
 
   @Override
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index 8092979d77..dbc6302822 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -14,7 +14,6 @@
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Table;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -346,28 +345,6 @@ public FormulaType<?> getFormulaType(Term formula) {
     return bitwuzlaSortToType(pType);
   }
 
-  private BigDecimal parseIEEEbinaryFP(Term pTerm) {
-    // The Bitwuzla string for FPs is always in binary, regardless of the second argument.
-
-    String fp = pTerm.toString();
-
-    if (fp.length() == 32) {
-      float result = Float.intBitsToFloat(Integer.parseUnsignedInt(fp, 2));
-      return new BigDecimal(result);
-    } else if (fp.length() == 64) {
-      double result = Double.longBitsToDouble(Long.parseUnsignedLong(fp, 2));
-      return new BigDecimal(result);
-    } else {
-      throw new UnsupportedOperationException(
-          "Visitor can only visit constant FPs of 32 or 64 " + "bits.");
-    }
-
-    //    String fpSMTLIB = bitwuzlaJNI.bitwuzla_term_to_string(pTerm);
-    //    String[] mySplit = fpSMTLIB.split(" #b");
-    //    mySplit[3] = mySplit[3].replace(")", "");
-    //    double result = calculateDecimal(mySplit[3], mySplit[2], mySplit[1]);
-  }
-
   @Override
   public <R> R visit(FormulaVisitor<R> visitor, Formula formula, Term f)
       throws UnsupportedOperationException {
@@ -564,7 +541,7 @@ public Object convertValue(Term term) {
       return term.to_bv();
     }
     if (sort.is_fp()) {
-      return term.to_fp();
+      return Double.parseDouble(term.to_fp());
     }
     throw new AssertionError("Unknown value type.");
   }

From e848771b40e9f8031ed2a506d03e7522d9848e1c Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Mon, 29 Jan 2024 20:59:02 +0100
Subject: [PATCH 021/158] Bitwuzla: Fixed handling of negative zero in the JNI
 bindings.

---
 lib/native/source/libbitwuzla/bitwuzla.i | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index fdcfc96c93..b24f6a5dfd 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -13,9 +13,11 @@
 
 #include <gmp.h>
 
+#include <string>
 #include <sstream>
+
 #include <cassert>
-#include <limits>
+
 %}
 
 %include <stdint.i>
@@ -309,12 +311,6 @@ namespace bitwuzla {
 %extend Bitwuzla {
   static Term mk_fp_value(const Sort &sort, const Term &rm, const std::string &repr) {
     // Handle special values
-    if (repr == "0.0") {
-      return mk_fp_pos_zero(sort);
-    }
-    if (repr == "-0.0") {
-      return mk_fp_neg_zero(sort);
-    }
     if (repr == "Infinity") {
       return mk_fp_pos_inf(sort);
     }
@@ -340,6 +336,17 @@ namespace bitwuzla {
     mp_exp_t exponent;
     char* mantissa = mpf_get_str(nullptr, &exponent, 10, 0, floatVal);
     std::string input = std::string(mantissa);
+
+    bool isZeroes = input.find_first_not_of("0") == std::string::npos;
+    if (isZeroes) {
+      // GMP drops the sign for -0.0, so we have handle this as a special case
+      if (repr[0] == '-') {
+        return mk_fp_neg_zero(sort);
+      } else {
+        return mk_fp_pos_zero(sort);
+      }
+    }
+
     std::ostringstream output;
     if (input[0] == '-') {
       output << "-";

From e7c09f66dfa3889b5bff3d47ef66b2bca6196ade Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Mon, 29 Jan 2024 21:11:25 +0100
Subject: [PATCH 022/158] Bitwuzla: Fixed bug in Term.to_fp() that affected the
 handling of 'Infinity'.

---
 lib/native/source/libbitwuzla/bitwuzla.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index b24f6a5dfd..e6175db6a8 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -146,7 +146,7 @@ namespace bitwuzla {
     bool isSignZero = sign == "0";
     bool isExponentZero = exponent.find_first_not_of("0") == std::string::npos;
     bool isExponentOnes = exponent.find_first_not_of("1") == std::string::npos;
-    bool isMantissaZero = exponent.find_first_not_of("0") == std::string::npos;
+    bool isMantissaZero = mantissa.find_first_not_of("0") == std::string::npos;
 
     // Handle special values
     if (isExponentZero && isMantissaZero) {

From 0eac7931f9ef781a3e46479de1c03a23ff3f0c06 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Mon, 29 Jan 2024 22:59:39 +0100
Subject: [PATCH 023/158] Bitwuzla: Clear mpf in mk_fp_value.

---
 lib/native/source/libbitwuzla/bitwuzla.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index e6175db6a8..7f3705b9e4 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -336,7 +336,7 @@ namespace bitwuzla {
     mp_exp_t exponent;
     char* mantissa = mpf_get_str(nullptr, &exponent, 10, 0, floatVal);
     std::string input = std::string(mantissa);
-
+    mpf_clear(floatVal);
     bool isZeroes = input.find_first_not_of("0") == std::string::npos;
     if (isZeroes) {
       // GMP drops the sign for -0.0, so we have handle this as a special case

From de2258ee51e47dcf89bf5549b9c91c1a2381a05d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 30 Jan 2024 01:52:24 +0100
Subject: [PATCH 024/158] Bitwuzla does not seem to support casting float to
 bitvector. Disabled the affected tests and added a FIXME note to
 BitwuzlaFloatingPointManager.

---
 .../BitwuzlaFloatingPointManager.java         | 13 +++++++----
 .../test/FloatingPointFormulaManagerTest.java | 22 ++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index 4d1c755da7..26ef86f338 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -169,10 +169,15 @@ protected Term fromIeeeBitvectorImpl(Term pNumber, FloatingPointType pTargetType
 
   @Override
   protected Term toIeeeBitvectorImpl(Term pNumber) {
-    Term rm = Bitwuzla.mk_rm_value(RoundingMode.RTZ);
-    int inputBits = pNumber.sort().fp_exp_size() + pNumber.sort().fp_sig_size();
-    // This is most likely wrong/inprecise!
-    return Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, pNumber, inputBits);
+    // FIXME: Bitwuzla seems to be lacking an inverse to FP_TO_FP_FROM_BV?
+    //  The supported options are:
+    //    * FP_TO_FP_FROM_SBV: Converts from in to float
+    //    * FP_TO_SBV: Converts from float to int by rounding to the next integer
+    //    * FP_TO_FP_FROM_BV: Recast a bitvector as float
+    //    * FP_TO_BV: Missing?
+    //  Using FP_TO_SBV instead will only work if the floating point number is really an integer
+    throw new UnsupportedOperationException(
+        "Bitwuzla does not support casting from float to bitvector");
   }
 
   @Override
diff --git a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
index 204582e23c..d5a67bc3d9 100644
--- a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
@@ -682,9 +682,9 @@ public void fpTraversalWithRoundingMode() {
   @Test
   public void fpIeeeConversionTypes() {
     assume()
-        .withMessage("FP-to-BV conversion not available for CVC4 and CVC5")
+        .withMessage("FP-to-BV conversion not available for %s", solverToUse())
         .that(solverToUse())
-        .isNoneOf(Solvers.CVC4, Solvers.CVC5);
+        .isNoneOf(Solvers.CVC4, Solvers.CVC5, Solvers.BITWUZLA);
 
     FloatingPointFormula var = fpmgr.makeVariable("var", singlePrecType);
     assertThat(mgr.getFormulaType(fpmgr.toIeeeBitvector(var)))
@@ -694,9 +694,9 @@ public void fpIeeeConversionTypes() {
   @Test
   public void fpIeeeConversion() throws SolverException, InterruptedException {
     assume()
-        .withMessage("FP-to-BV conversion not available for CVC4 and CVC5")
+        .withMessage("FP-to-BV conversion not available for %s", solverToUse())
         .that(solverToUse())
-        .isNoneOf(Solvers.CVC4, Solvers.CVC5);
+        .isNoneOf(Solvers.CVC4, Solvers.CVC5, Solvers.BITWUZLA);
 
     FloatingPointFormula var = fpmgr.makeVariable("var", singlePrecType);
     assertThatFormula(
@@ -708,9 +708,9 @@ public void fpIeeeConversion() throws SolverException, InterruptedException {
   @Test
   public void ieeeFpConversion() throws SolverException, InterruptedException {
     assume()
-        .withMessage("FP-to-BV conversion not available for CVC4 and CVC5")
+        .withMessage("FP-to-BV conversion not available for %s", solverToUse())
         .that(solverToUse())
-        .isNoneOf(Solvers.CVC4, Solvers.CVC5);
+        .isNoneOf(Solvers.CVC4, Solvers.CVC5, Solvers.BITWUZLA);
 
     BitvectorFormula var = bvmgr.makeBitvector(32, 123456789);
     assertThatFormula(
@@ -720,6 +720,11 @@ public void ieeeFpConversion() throws SolverException, InterruptedException {
 
   @Test
   public void checkIeeeFpConversion32() throws SolverException, InterruptedException {
+    assume()
+        .withMessage("FP-to-BV conversion not available for Bitwuzla")
+        .that(solverToUse())
+        .isNotEqualTo(Solvers.BITWUZLA);
+
     for (float f : getListOfFloats()) {
       checkFP(
           singlePrecType,
@@ -730,6 +735,11 @@ public void checkIeeeFpConversion32() throws SolverException, InterruptedExcepti
 
   @Test
   public void checkIeeeFpConversion64() throws SolverException, InterruptedException {
+    assume()
+        .withMessage("FP-to-BV conversion not available for Bitwuzla")
+        .that(solverToUse())
+        .isNotEqualTo(Solvers.BITWUZLA);
+
     for (double d : getListOfDoubles()) {
       checkFP(
           doublePrecType,

From 9d3508bca719d4e7c1ab2434c5b8998e7ade80b9 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 30 Jan 2024 02:13:20 +0100
Subject: [PATCH 025/158] Clean up bitwuzla_wrap.h in the build script.

---
 build/build-publish-solvers.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/build-publish-solvers.xml b/build/build-publish-solvers.xml
index 4c333edade..0ecfb07831 100644
--- a/build/build-publish-solvers.xml
+++ b/build/build-publish-solvers.xml
@@ -936,6 +936,7 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="-I${java.home}/include/linux"/>
         </exec>
         <delete file="${source.path}/bitwuzla_wrap.cpp"/>
+        <delete file="${source.path}/bitwuzla_wrap.h"/>
 
         <!-- delete includes from the source tree (we're done compiling) -->
         <delete dir="${source.path}/include"/>

From 93cc3c0cdbaab520345ccfef4437a00d615efd11 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 30 Jan 2024 02:53:08 +0100
Subject: [PATCH 026/158] Added patch to disable finalizers in the swig
 generated code. This provides a temporary fix to the phantom reference issue.

---
 build/build-publish-solvers.xml               |   8 +
 .../libbitwuzla/phantomReferences.patch       | 153 ++++++++++++++++++
 2 files changed, 161 insertions(+)
 create mode 100644 lib/native/source/libbitwuzla/phantomReferences.patch

diff --git a/build/build-publish-solvers.xml b/build/build-publish-solvers.xml
index 0ecfb07831..93f21a8375 100644
--- a/build/build-publish-solvers.xml
+++ b/build/build-publish-solvers.xml
@@ -905,6 +905,14 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="bitwuzla.i"/>
         </exec>
 
+        <!-- apply patch for the phantom reference issue -->
+        <!-- FIXME: This will lead to memory leaks. We should look for a proper fix. -->
+        <exec executable="patch" failonerror="true">
+            <arg value="-p0"/>
+            <arg value="-i"/>
+            <arg value="lib/native/source/libbitwuzla/phantomReferences.patch"/>
+        </exec>
+
         <!-- compile java proxies and create jar file -->
         <mkdir dir="${source.path}/build"/>
         <javac srcdir="${source.path}/src/" destdir="${source.path}/build"
diff --git a/lib/native/source/libbitwuzla/phantomReferences.patch b/lib/native/source/libbitwuzla/phantomReferences.patch
new file mode 100644
index 0000000000..1718839a60
--- /dev/null
+++ b/lib/native/source/libbitwuzla/phantomReferences.patch
@@ -0,0 +1,153 @@
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java	2024-01-30 02:17:29.958540211 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java	2024-01-30 02:13:50.700388020 +0100
+@@ -27,7 +27,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Exception.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Exception.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Exception.java	2024-01-30 02:17:08.706597398 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Exception.java	2024-01-30 02:13:50.576389963 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-01-30 02:16:53.494652530 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-01-30 02:13:50.564390151 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+@@ -171,7 +171,7 @@
+   
+     @SuppressWarnings("deprecation")
+     protected void finalize() {
+-      delete();
++      //delete();
+     }
+   
+     public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java	2024-01-30 02:17:14.802578662 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java	2024-01-30 02:13:50.596389650 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java	2024-01-30 02:17:40.450520255 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java	2024-01-30 02:13:50.704387957 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java	2024-01-30 02:17:20.062564011 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java	2024-01-30 02:13:50.636389023 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java	2024-01-30 02:16:42.862698311 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java	2024-01-30 02:13:50.640388960 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-01-30 02:17:34.346531214 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-01-30 02:13:50.624389211 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java	2024-01-30 02:16:58.418633361 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java	2024-01-30 02:13:50.460391781 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java	2024-01-30 02:17:24.998551530 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java	2024-01-30 02:13:50.532390653 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java	2024-01-30 02:16:35.794732123 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java	2024-01-30 02:13:50.484391405 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-01-30 02:17:03.534614791 +0100
++++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-01-30 02:13:50.508391029 +0100
+@@ -35,7 +35,7 @@
+ 
+   @SuppressWarnings("deprecation")
+   protected void finalize() {
+-    delete();
++    //delete();
+   }
+ 
+   public synchronized void delete() {

From 624a4f0387e76617ad3cf09581d7fd869e819bd9 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 30 Jan 2024 02:57:03 +0100
Subject: [PATCH 027/158] Fix value type for bitvectors.

---
 lib/native/source/libbitwuzla/bitwuzla.i                       | 2 +-
 .../java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index 7f3705b9e4..bd028ba3c0 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -133,7 +133,7 @@ namespace bitwuzla {
 
   std::string to_bv() {
     assert($self->is_value() && $self->sort().is_bv());
-    return $self->value<std::string>();
+    return $self->value<std::string>(10);
   }
 
   std::string to_fp () {
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index dbc6302822..48cbb5c05f 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -14,6 +14,7 @@
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Table;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -538,7 +539,7 @@ public Object convertValue(Term term) {
       return term.to_rm();
     }
     if (sort.is_bv()) {
-      return term.to_bv();
+      return new BigInteger(term.to_bv());
     }
     if (sort.is_fp()) {
       return Double.parseDouble(term.to_fp());

From 334ba394b026431102052f8b8d1f500901086663 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 30 Jan 2024 03:00:33 +0100
Subject: [PATCH 028/158] Disabled one more test for Bitwuzla as it requires
 casting form float to bitvector, which is not supported by the solver.

---
 src/org/sosy_lab/java_smt/test/SolverVisitorTest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java b/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
index 636d929af7..368c4c2992 100644
--- a/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
@@ -360,8 +360,10 @@ public void floatMoreVisit() {
     checkKind(fpmgr.max(x, y), FunctionDeclarationKind.FP_MAX);
     checkKind(fpmgr.min(x, y), FunctionDeclarationKind.FP_MIN);
     checkKind(fpmgr.sqrt(x), FunctionDeclarationKind.FP_SQRT);
-    if (Solvers.CVC4 != solverToUse()
-        && Solvers.CVC5 != solverToUse()) { // CVC4/CVC5 do not support this operation
+    if (!List.of(Solvers.CVC4, Solvers.CVC5, Solvers.BITWUZLA)
+        .contains(solverToUse())) { // CVC4/CVC5 do not
+      // support this operation
+      // .. and neither does Bitwuzla
       checkKind(fpmgr.toIeeeBitvector(x), FunctionDeclarationKind.FP_AS_IEEEBV);
     }
     checkKind(

From eb326fcdc7206ef792bcc0cb338debc700340dda Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 30 Jan 2024 03:26:28 +0100
Subject: [PATCH 029/158] Added bitwuzla_wrap.h to gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 80e752954b..1ac22eb376 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
 /lib/java/test/*.jar
 lib/native/source/libz3j/org_sosy_lab_solver_z3_Z3NativeApi.c
 lib/native/source/libbitwuzla/bitwuzla_wrap.cpp
+lib/native/source/libbitwuzla/bitwuzla_wrap.h
 lib/native/source/*/*.so
 lib/native/source/*/*.o
 lib/native/source/**/*.java

From 3303561c3899550e8795f6a8927ff2005b7280e8 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 30 Jan 2024 04:01:33 +0100
Subject: [PATCH 030/158] Added sources and javadoc to the distribution.

---
 build/build-publish-solvers.xml   | 2 +-
 lib/ivy.xml                       | 2 +-
 solvers_ivy_conf/ivy_bitwuzla.xml | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/build/build-publish-solvers.xml b/build/build-publish-solvers.xml
index 93f21a8375..c259808faf 100644
--- a/build/build-publish-solvers.xml
+++ b/build/build-publish-solvers.xml
@@ -1048,7 +1048,7 @@ SPDX-License-Identifier: Apache-2.0
         <ivy:publish
                 pubrevision="${bitwuzla.version}"
                 resolver="Sosy-Lab-Publish"
-                artifactspattern="[artifact]-[revision].[ext]"
+                artifactspattern="[artifact]-[revision](-[classifier]).[ext]"
                 status="release"
         />
         <echo>
diff --git a/lib/ivy.xml b/lib/ivy.xml
index e32675199e..78ee88c63f 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -168,7 +168,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
         <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.3.0-g2b5a4a86"
-                    conf="runtime-bitwuzla->solver-bitwuzla"/>
+                    conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->
         <dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.0-1-gc58fe5b4" conf="runtime-yices2->runtime; contrib->sources" />
diff --git a/solvers_ivy_conf/ivy_bitwuzla.xml b/solvers_ivy_conf/ivy_bitwuzla.xml
index 136d127ba5..bbed21ab19 100644
--- a/solvers_ivy_conf/ivy_bitwuzla.xml
+++ b/solvers_ivy_conf/ivy_bitwuzla.xml
@@ -11,6 +11,7 @@ SPDX-License-Identifier: Apache-2.0
 -->
 
 <ivy-module version="2.0"
+            xmlns:e="http://ant.apache.org/ivy/extra"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
     <info organisation="org.sosy_lab" module="javasmt-solver-bitwuzla">
@@ -27,26 +28,22 @@ SPDX-License-Identifier: Apache-2.0
         <conf name="solver-bitwuzla" extends="solver-bitwuzla-linux"/>
         <conf name="solver-bitwuzla-linux" extends="solver-bitwuzla-common"/>
         <conf name="solver-bitwuzla-common" visibility="private"/>
-        <!--
         <conf name="sources"/>
         <conf name="javadoc"/>
-        -->
     </configurations>
 
     <publications defaultconf="solver-bitwuzla">
         <!-- Linux native libraries -->
         <artifact name="libbitwuzlaJNI" conf="solver-bitwuzla" type="shared-object" ext="so"/>
         <artifact name="libbitwuzla" conf="solver-bitwuzla" type="shared-object" ext="so"/>
-        <artifact name="libgmp" conf="solver-bitwuzla" type="shared-object" ext="so"/>
         <artifact name="libbitwuzlabb"  conf="solver-bitwuzla" type="shared-object" ext="so"/>
         <artifact name="libbitwuzlabv"  conf="solver-bitwuzla" type="shared-object" ext="so"/>
         <artifact name="libbitwuzlals"  conf="solver-bitwuzla" type="shared-object" ext="so"/>
+        <artifact name="libgmp" conf="solver-bitwuzla" type="shared-object" ext="so"/>
         <!-- Java code, docs and source -->
         <artifact name="bitwuzla" conf="solver-bitwuzla-common" ext="jar"/>
-        <!--
         <artifact name="bitwuzla" conf="sources" e:classifier="sources" type="source" ext="jar"/>
-        <artifact name="bitwuzla" conf="javadoc" e:classifier="javadoc" type="javadoc" ext="jar"/>^
-        -->
+        <artifact name="bitwuzla" conf="javadoc" e:classifier="javadoc" type="javadoc" ext="jar"/>
     </publications>
 
     <dependencies></dependencies>

From 0b3ce9b21c0d1311fdcd2d9b35703796241b9686 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 2 Feb 2024 11:39:37 +0100
Subject: [PATCH 031/158] Added checks in BitwuzlaTheoremProver.

---
 .../java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index f4f85f2c13..e1dde569f0 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -141,6 +141,8 @@ public boolean isUnsat() throws SolverException, InterruptedException {
   @Override
   public boolean isUnsatWithAssumptions(Collection<BooleanFormula> assumptions)
       throws SolverException, InterruptedException {
+    Preconditions.checkState(!closed);
+    wasLastSatCheckSat = false;
     Vector_Term ass = new Vector_Term();
     for (BooleanFormula formula : assumptions) {
       BitwuzlaBooleanFormula bitwuzlaFormula = (BitwuzlaBooleanFormula) formula;
@@ -200,7 +202,7 @@ public Optional<List<BooleanFormula>> unsatCoreOverAssumptions(
       Collection<BooleanFormula> assumptions) throws SolverException, InterruptedException {
     Preconditions.checkNotNull(assumptions);
     Preconditions.checkState(!closed);
-    checkGenerateUnsatCores();
+    checkGenerateUnsatCores(); // FIXME: JavaDoc say ProverOptions.GENERATE_UNSAT_CORE is not needed
     Preconditions.checkState(!wasLastSatCheckSat);
     boolean sat = !isUnsatWithAssumptions(assumptions);
     return sat ? Optional.empty() : Optional.of(getUnsatCore0());

From 813128d88df05a677b76d75679de4930507c57ed Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 2 Feb 2024 11:40:14 +0100
Subject: [PATCH 032/158] Update Bitwuzla to 0.3.2

---
 lib/ivy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ivy.xml b/lib/ivy.xml
index 78ee88c63f..357f7b3c16 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -167,7 +167,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
-        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.3.0-g2b5a4a86"
+        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.3.2-g9a9a8fed"
                     conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->

From edf2ad5b5bfee794f655b80ead58dbe0512be227 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 2 Feb 2024 11:42:02 +0100
Subject: [PATCH 033/158] Implemented toIeeeBitvector for
 BitwuzlaFloatingPointManager by using a workaround suggested in
 https://github.com/bitwuzla/bitwuzla/discussions/103.

---
 .../BitwuzlaFloatingPointManager.java         | 26 +++++++++++--------
 .../bitwuzla/BitwuzlaFormulaCreator.java      | 12 ++++++++-
 .../bitwuzla/BitwuzlaTheoremProver.java       |  4 +--
 .../test/FloatingPointFormulaManagerTest.java | 16 +++---------
 .../java_smt/test/SolverVisitorTest.java      |  8 +++---
 5 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index 26ef86f338..bcc58b7765 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -24,14 +24,14 @@
 
 public class BitwuzlaFloatingPointManager
     extends AbstractFloatingPointFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
-  // private final long bitwuzla;
+  private final BitwuzlaFormulaCreator bitwuzlaCreator;
   private final Term roundingMode;
 
   protected BitwuzlaFloatingPointManager(
       FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator,
       FloatingPointRoundingMode pFloatingPointRoundingMode) {
     super(pCreator);
-    // bitwuzla = pCreator.getEnv();
+    bitwuzlaCreator = (BitwuzlaFormulaCreator) pCreator;
     roundingMode = getRoundingModeImpl(pFloatingPointRoundingMode);
   }
 
@@ -169,15 +169,19 @@ protected Term fromIeeeBitvectorImpl(Term pNumber, FloatingPointType pTargetType
 
   @Override
   protected Term toIeeeBitvectorImpl(Term pNumber) {
-    // FIXME: Bitwuzla seems to be lacking an inverse to FP_TO_FP_FROM_BV?
-    //  The supported options are:
-    //    * FP_TO_FP_FROM_SBV: Converts from in to float
-    //    * FP_TO_SBV: Converts from float to int by rounding to the next integer
-    //    * FP_TO_FP_FROM_BV: Recast a bitvector as float
-    //    * FP_TO_BV: Missing?
-    //  Using FP_TO_SBV instead will only work if the floating point number is really an integer
-    throw new UnsupportedOperationException(
-        "Bitwuzla does not support casting from float to bitvector");
+    int sizeExp = pNumber.sort().fp_exp_size();
+    int sizeSig = pNumber.sort().fp_sig_size();
+
+    Sort bvSort = Bitwuzla.mk_bv_sort(sizeExp + sizeSig);
+
+    Term bvVar = Bitwuzla.mk_const(bvSort);
+    Term equal = Bitwuzla.mk_term(
+        Kind.EQUAL,
+        Bitwuzla.mk_term(Kind.FP_TO_FP_FROM_BV, bvVar, sizeExp, sizeSig),
+        pNumber);
+
+    bitwuzlaCreator.addVariableCast(equal);
+    return bvVar;
   }
 
   @Override
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index 48cbb5c05f..ab8e7cd53e 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -16,10 +16,12 @@
 import com.google.common.collect.Table;
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.Set;
 import org.sosy_lab.java_smt.api.ArrayFormula;
 import org.sosy_lab.java_smt.api.BitvectorFormula;
 import org.sosy_lab.java_smt.api.BooleanFormula;
@@ -49,7 +51,7 @@
 public class BitwuzlaFormulaCreator extends FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> {
   private final Table<String, Sort, Term> formulaCache = HashBasedTable.create();
 
-  // private final Table<String, Long, Long> boundFormulaCache = HashBasedTable.create();
+  private final Set<Term> variableCasts = new HashSet<>();
 
   protected BitwuzlaFormulaCreator() {
     super(null, Bitwuzla.mk_bool_sort(), null, null, null, null);
@@ -546,4 +548,12 @@ public Object convertValue(Term term) {
     }
     throw new AssertionError("Unknown value type.");
   }
+
+  public void addVariableCast(Term equal) {
+    variableCasts.add(equal);
+  }
+
+  public Iterable<Term> getVariableCasts() {
+    return variableCasts;
+  }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index e1dde569f0..bf419f15c3 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -128,7 +128,7 @@ private boolean readSATResult(Result resultValue) throws SolverException, Interr
   public boolean isUnsat() throws SolverException, InterruptedException {
     Preconditions.checkState(!closed);
     wasLastSatCheckSat = false;
-    final Result result = env.check_sat();
+    final Result result = env.check_sat(new Vector_Term(creator.getVariableCasts()));
     return readSATResult(result);
   }
 
@@ -143,7 +143,7 @@ public boolean isUnsatWithAssumptions(Collection<BooleanFormula> assumptions)
       throws SolverException, InterruptedException {
     Preconditions.checkState(!closed);
     wasLastSatCheckSat = false;
-    Vector_Term ass = new Vector_Term();
+    Vector_Term ass = new Vector_Term(creator.getVariableCasts());
     for (BooleanFormula formula : assumptions) {
       BitwuzlaBooleanFormula bitwuzlaFormula = (BitwuzlaBooleanFormula) formula;
       ass.add(bitwuzlaFormula.getTerm());
diff --git a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
index d5a67bc3d9..e53404ebd7 100644
--- a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
@@ -696,7 +696,7 @@ public void fpIeeeConversion() throws SolverException, InterruptedException {
     assume()
         .withMessage("FP-to-BV conversion not available for %s", solverToUse())
         .that(solverToUse())
-        .isNoneOf(Solvers.CVC4, Solvers.CVC5, Solvers.BITWUZLA);
+        .isNoneOf(Solvers.CVC4, Solvers.CVC5);
 
     FloatingPointFormula var = fpmgr.makeVariable("var", singlePrecType);
     assertThatFormula(
@@ -710,7 +710,7 @@ public void ieeeFpConversion() throws SolverException, InterruptedException {
     assume()
         .withMessage("FP-to-BV conversion not available for %s", solverToUse())
         .that(solverToUse())
-        .isNoneOf(Solvers.CVC4, Solvers.CVC5, Solvers.BITWUZLA);
+        .isNoneOf(Solvers.CVC4, Solvers.CVC5);
 
     BitvectorFormula var = bvmgr.makeBitvector(32, 123456789);
     assertThatFormula(
@@ -720,11 +720,7 @@ public void ieeeFpConversion() throws SolverException, InterruptedException {
 
   @Test
   public void checkIeeeFpConversion32() throws SolverException, InterruptedException {
-    assume()
-        .withMessage("FP-to-BV conversion not available for Bitwuzla")
-        .that(solverToUse())
-        .isNotEqualTo(Solvers.BITWUZLA);
-
+    // FIXME: This is *very* slow on Bitwuzla
     for (float f : getListOfFloats()) {
       checkFP(
           singlePrecType,
@@ -735,11 +731,7 @@ public void checkIeeeFpConversion32() throws SolverException, InterruptedExcepti
 
   @Test
   public void checkIeeeFpConversion64() throws SolverException, InterruptedException {
-    assume()
-        .withMessage("FP-to-BV conversion not available for Bitwuzla")
-        .that(solverToUse())
-        .isNotEqualTo(Solvers.BITWUZLA);
-
+    // FIXME: This is *very* slow on Bitwuzla
     for (double d : getListOfDoubles()) {
       checkFP(
           doublePrecType,
diff --git a/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java b/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
index 368c4c2992..ed4cd4932b 100644
--- a/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
@@ -361,9 +361,11 @@ public void floatMoreVisit() {
     checkKind(fpmgr.min(x, y), FunctionDeclarationKind.FP_MIN);
     checkKind(fpmgr.sqrt(x), FunctionDeclarationKind.FP_SQRT);
     if (!List.of(Solvers.CVC4, Solvers.CVC5, Solvers.BITWUZLA)
-        .contains(solverToUse())) { // CVC4/CVC5 do not
-      // support this operation
-      // .. and neither does Bitwuzla
+        .contains(solverToUse())) { // CVC4/CVC5 and bitwuzla do not support this operation
+      // On Bitwuzla we now use a workaround that replaces "fp_to_bv(fpTerm)" with "newVar" and then
+      // adds the assertion "fpTerm = bv_to_fp(newVar)" as a side condition.
+      // Unfortunately this does not solve the problem in this test and there is no way of fixing
+      // it.
       checkKind(fpmgr.toIeeeBitvector(x), FunctionDeclarationKind.FP_AS_IEEEBV);
     }
     checkKind(

From 2df60102fd73a380c24081372878929dc603248d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 2 Feb 2024 12:24:16 +0100
Subject: [PATCH 034/158] Reduce the number of test runs in
 FloatingPointFormulaManagerTest.checkIEEEFpConversion for Bitwuzla. The
 solver seems to have performance issues in this task.

---
 .../test/FloatingPointFormulaManagerTest.java  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
index e53404ebd7..c9fd1ecdde 100644
--- a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
@@ -720,7 +720,6 @@ public void ieeeFpConversion() throws SolverException, InterruptedException {
 
   @Test
   public void checkIeeeFpConversion32() throws SolverException, InterruptedException {
-    // FIXME: This is *very* slow on Bitwuzla
     for (float f : getListOfFloats()) {
       checkFP(
           singlePrecType,
@@ -731,7 +730,6 @@ public void checkIeeeFpConversion32() throws SolverException, InterruptedExcepti
 
   @Test
   public void checkIeeeFpConversion64() throws SolverException, InterruptedException {
-    // FIXME: This is *very* slow on Bitwuzla
     for (double d : getListOfDoubles()) {
       checkFP(
           doublePrecType,
@@ -752,14 +750,16 @@ private List<Float> getListOfFloats() {
             0.0f // , -0.0f // MathSat5 fails for NEGATIVE_ZERO
             );
 
-    for (int i = 1; i < 20; i++) {
-      for (int j = 1; j < 20; j++) {
+    final int stepSize = solverToUse() == Solvers.BITWUZLA ? 10 : 1;
+    for (int i = 1; i < 20; i += stepSize) {
+      for (int j = 1; j < 20; j += stepSize) {
         flts.add((float) (i * Math.pow(10, j)));
       }
     }
 
+    final int numRandom = solverToUse() == Solvers.BITWUZLA ? 5 : NUM_RANDOM_TESTS;
     Random rand = new Random(0);
-    for (int i = 0; i < NUM_RANDOM_TESTS; i++) {
+    for (int i = 0; i < numRandom; i++) {
       float flt = Float.intBitsToFloat(rand.nextInt());
       if (!Float.isNaN(flt)) {
         flts.add(flt);
@@ -781,14 +781,16 @@ private List<Double> getListOfDoubles() {
             0.0 // , -0.0 // MathSat5 fails for NEGATIVE_ZERO
             );
 
-    for (int i = 1; i < 20; i++) {
-      for (int j = 1; j < 20; j++) {
+    final int stepSize = solverToUse() == Solvers.BITWUZLA ? 10 : 1;
+    for (int i = 1; i < 20; i += stepSize) {
+      for (int j = 1; j < 20; j += stepSize) {
         dbls.add(i * Math.pow(10, j));
       }
     }
 
+    final int numRandom = solverToUse() == Solvers.BITWUZLA ? 5 : NUM_RANDOM_TESTS;
     Random rand = new Random(0);
-    for (int i = 0; i < NUM_RANDOM_TESTS; i++) {
+    for (int i = 0; i < numRandom; i++) {
       double d = Double.longBitsToDouble(rand.nextLong());
       if (!Double.isNaN(d)) {
         dbls.add(d);

From 74b0e3f5292b6e27b9fedcd2080a670e4a5ae2f6 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 2 Feb 2024 12:29:43 +0100
Subject: [PATCH 035/158] Added -0.0 to the list of test values in
 FloatingPointFormulaManagerTest.

---
 .../test/FloatingPointFormulaManagerTest.java      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
index c9fd1ecdde..0a8ef88eb6 100644
--- a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
@@ -747,8 +747,11 @@ private List<Float> getListOfFloats() {
             Float.MAX_VALUE,
             Float.POSITIVE_INFINITY,
             Float.NEGATIVE_INFINITY,
-            0.0f // , -0.0f // MathSat5 fails for NEGATIVE_ZERO
-            );
+            0.0f);
+
+    if (solverToUse() != Solvers.MATHSAT5) {
+      flts.add(-0.0f); // MathSat5 fails for NEGATIVE_ZERO
+    }
 
     final int stepSize = solverToUse() == Solvers.BITWUZLA ? 10 : 1;
     for (int i = 1; i < 20; i += stepSize) {
@@ -778,8 +781,11 @@ private List<Double> getListOfDoubles() {
             Double.MAX_VALUE,
             Double.POSITIVE_INFINITY,
             Double.NEGATIVE_INFINITY,
-            0.0 // , -0.0 // MathSat5 fails for NEGATIVE_ZERO
-            );
+            0.0);
+
+    if (solverToUse() != Solvers.MATHSAT5) {
+      dbls.add(-0.0); // MathSat5 fails for NEGATIVE_ZERO
+    }
 
     final int stepSize = solverToUse() == Solvers.BITWUZLA ? 10 : 1;
     for (int i = 1; i < 20; i += stepSize) {

From f9be507e57d0d3205eb6c0df7e85bf4d9aad2a8d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 2 Feb 2024 19:39:46 +0100
Subject: [PATCH 036/158] Fixed handling of negative numbers in JNI method
 to_fp().

---
 lib/native/source/libbitwuzla/bitwuzla.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index bd028ba3c0..c77839ce54 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -181,7 +181,7 @@ namespace bitwuzla {
     delete[] sig10;
     mpf_clear(floatMpf);
 
-    return (sign == "-") ? ("-" + result) : result;
+    return (sign == "1") ? ("-" + result) : result;
   }
 }
 

From 4c6cc93eda814bef22bbdd03dff8ea109652640a Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 6 Feb 2024 15:43:29 +0100
Subject: [PATCH 037/158] Drop "e" part when printing a float with exponent 0
 in to_fp().

---
 lib/native/source/libbitwuzla/bitwuzla.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index c77839ce54..6aaedabb64 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -177,7 +177,7 @@ namespace bitwuzla {
 
     mp_exp_t exp10;
     char* sig10 = mpf_get_str(nullptr, &exp10, 10, 0, floatMpf);
-    std::string result =  "0." + std::string(sig10) + "e" + std::to_string(exp10);
+    std::string result = "0." + std::string(sig10) + (exp10 == 0 ? "" : "e" + std::to_string(exp10));
     delete[] sig10;
     mpf_clear(floatMpf);
 

From 93956e75bc6635ff05e268d904d1ffa78a85f293 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 6 Feb 2024 15:46:04 +0100
Subject: [PATCH 038/158] Bitwuzla: Use named variables in toIeeeBitvector as
 CPAchecker can't handle variables with no symbol.

---
 .../bitwuzla/BitwuzlaFloatingPointManager.java  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index bcc58b7765..abe5b62b5d 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -9,6 +9,7 @@
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
 import java.math.BigDecimal;
+import java.util.Random;
 import org.sosy_lab.common.rationals.Rational;
 import org.sosy_lab.java_smt.api.FloatingPointFormula;
 import org.sosy_lab.java_smt.api.FloatingPointRoundingMode;
@@ -167,14 +168,30 @@ protected Term fromIeeeBitvectorImpl(Term pNumber, FloatingPointType pTargetType
         pTargetType.getMantissaSize() + 1);
   }
 
+  Random randomGenerator = new Random();
+
+  private String generateRandomName(String prefix, int length) {
+    int char_a = Character.valueOf('a');
+    int char_z = Character.valueOf('z');
+
+    String generated = randomGenerator.ints(char_a, char_z + 1)
+        .limit(length)
+        .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+        .toString();
+    return prefix + "_" + generated;
+  }
+
   @Override
   protected Term toIeeeBitvectorImpl(Term pNumber) {
+    // FIXME: We should use a reserved symbol for the fresh variables
+
     int sizeExp = pNumber.sort().fp_exp_size();
     int sizeSig = pNumber.sort().fp_sig_size();
 
     Sort bvSort = Bitwuzla.mk_bv_sort(sizeExp + sizeSig);
 
     Term bvVar = Bitwuzla.mk_const(bvSort);
+    Term bvVar = Bitwuzla.mk_const(bvSort, generateRandomName("toIeeeBitvector", 10));
     Term equal = Bitwuzla.mk_term(
         Kind.EQUAL,
         Bitwuzla.mk_term(Kind.FP_TO_FP_FROM_BV, bvVar, sizeExp, sizeSig),

From 3121a581db6a1f0500d2b38e8f7b898eaa66f786 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 6 Feb 2024 15:49:58 +0100
Subject: [PATCH 039/158] Bitwuzla: Made fp cast map in BitwuzlaFormulaCreator
 static as the solver allows terms to be shared across different contexts.

---
 .../bitwuzla/BitwuzlaFloatingPointManager.java     |  4 +---
 .../solvers/bitwuzla/BitwuzlaFormulaCreator.java   | 14 ++++++++++----
 .../solvers/bitwuzla/BitwuzlaTheoremProver.java    |  5 +++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index abe5b62b5d..c081c9520e 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -25,14 +25,12 @@
 
 public class BitwuzlaFloatingPointManager
     extends AbstractFloatingPointFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
-  private final BitwuzlaFormulaCreator bitwuzlaCreator;
   private final Term roundingMode;
 
   protected BitwuzlaFloatingPointManager(
       FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator,
       FloatingPointRoundingMode pFloatingPointRoundingMode) {
     super(pCreator);
-    bitwuzlaCreator = (BitwuzlaFormulaCreator) pCreator;
     roundingMode = getRoundingModeImpl(pFloatingPointRoundingMode);
   }
 
@@ -197,7 +195,7 @@ protected Term toIeeeBitvectorImpl(Term pNumber) {
         Bitwuzla.mk_term(Kind.FP_TO_FP_FROM_BV, bvVar, sizeExp, sizeSig),
         pNumber);
 
-    bitwuzlaCreator.addVariableCast(equal);
+    BitwuzlaFormulaCreator.addVariableCast(equal);
     return bvVar;
   }
 
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index ab8e7cd53e..af407e977c 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -16,12 +16,12 @@
 import com.google.common.collect.Table;
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.Set;
 import org.sosy_lab.java_smt.api.ArrayFormula;
 import org.sosy_lab.java_smt.api.BitvectorFormula;
 import org.sosy_lab.java_smt.api.BooleanFormula;
@@ -51,7 +51,13 @@
 public class BitwuzlaFormulaCreator extends FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> {
   private final Table<String, Sort, Term> formulaCache = HashBasedTable.create();
 
-  private final Set<Term> variableCasts = new HashSet<>();
+  // Bitwuzla has no operation for casting floats to bitvectors. We need to use a workaround
+  // where a variable "bvVar" is introduces, along with the side condition that
+  // "fpTerm = to_fp(bvVar)" holds. These side conditions are stored here and need to be added when
+  // satisfiability is checked, or when the formula is to be printed.
+  // Since Bitwuzla allows terms to be shared across solver contexts we use a static collection
+  // to store all equations.
+  private static final Collection<Term> variableCasts = new HashSet<>();
 
   protected BitwuzlaFormulaCreator() {
     super(null, Bitwuzla.mk_bool_sort(), null, null, null, null);
@@ -549,11 +555,11 @@ public Object convertValue(Term term) {
     throw new AssertionError("Unknown value type.");
   }
 
-  public void addVariableCast(Term equal) {
+  public static void addVariableCast(Term equal) {
     variableCasts.add(equal);
   }
 
-  public Iterable<Term> getVariableCasts() {
+  public static Iterable<Term> getVariableCasts() {
     return variableCasts;
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index bf419f15c3..47aca8be6d 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -41,6 +41,7 @@ class BitwuzlaTheoremProver extends AbstractProverWithAllSat<Void> implements Pr
   private final BitwuzlaFormulaManager manager;
 
   private final BitwuzlaFormulaCreator creator;
+
   protected boolean wasLastSatCheckSat = false; // and stack is not changed
 
   protected BitwuzlaTheoremProver(
@@ -128,7 +129,7 @@ private boolean readSATResult(Result resultValue) throws SolverException, Interr
   public boolean isUnsat() throws SolverException, InterruptedException {
     Preconditions.checkState(!closed);
     wasLastSatCheckSat = false;
-    final Result result = env.check_sat(new Vector_Term(creator.getVariableCasts()));
+    final Result result = env.check_sat(new Vector_Term(BitwuzlaFormulaCreator.getVariableCasts()));
     return readSATResult(result);
   }
 
@@ -143,7 +144,7 @@ public boolean isUnsatWithAssumptions(Collection<BooleanFormula> assumptions)
       throws SolverException, InterruptedException {
     Preconditions.checkState(!closed);
     wasLastSatCheckSat = false;
-    Vector_Term ass = new Vector_Term(creator.getVariableCasts());
+    Vector_Term ass = new Vector_Term(BitwuzlaFormulaCreator.getVariableCasts());
     for (BooleanFormula formula : assumptions) {
       BitwuzlaBooleanFormula bitwuzlaFormula = (BitwuzlaBooleanFormula) formula;
       ass.add(bitwuzlaFormula.getTerm());

From 7b311bd9ed49ad1885f51500823541ff7ba2abf9 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 6 Feb 2024 15:50:39 +0100
Subject: [PATCH 040/158] Bitwuzla: Added special handling of NaN in
 toIeeeBitvectorImpl.

---
 .../bitwuzla/BitwuzlaFloatingPointManager.java    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index c081c9520e..0506d7b217 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -188,12 +188,19 @@ protected Term toIeeeBitvectorImpl(Term pNumber) {
 
     Sort bvSort = Bitwuzla.mk_bv_sort(sizeExp + sizeSig);
 
-    Term bvVar = Bitwuzla.mk_const(bvSort);
+    Term bvNaN = Bitwuzla.mk_bv_value(bvSort, "1".repeat(sizeExp + sizeExp));
     Term bvVar = Bitwuzla.mk_const(bvSort, generateRandomName("toIeeeBitvector", 10));
     Term equal = Bitwuzla.mk_term(
-        Kind.EQUAL,
-        Bitwuzla.mk_term(Kind.FP_TO_FP_FROM_BV, bvVar, sizeExp, sizeSig),
-        pNumber);
+        Kind.ITE,
+        Bitwuzla.mk_term(Kind.FP_IS_NAN, pNumber),
+        Bitwuzla.mk_term(
+            Kind.EQUAL,
+            bvVar,
+            bvNaN),
+        Bitwuzla.mk_term(
+            Kind.EQUAL,
+            Bitwuzla.mk_term(Kind.FP_TO_FP_FROM_BV, bvVar, sizeExp, sizeSig),
+            pNumber));
 
     BitwuzlaFormulaCreator.addVariableCast(equal);
     return bvVar;

From 31ae39023db9824d2ad1cbc559089f818b274eee Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 6 Feb 2024 15:52:28 +0100
Subject: [PATCH 041/158] Bitwuzla: Fixed dumpFormula in
 BitwuzlaFormulaManager. We need to add the fp casting equations as addtional
 assertions. And the line "(set-logic ALL)" at the beginning of the file
 should be removed.

---
 .../java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index c1bf2e9d56..7123fe88ce 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -101,8 +101,12 @@ public Appender dumpFormula(Term pTerm) {
       @Override
       public void appendTo(Appendable out) throws IOException {
         Bitwuzla bitwuzla = new Bitwuzla(); // TODO: It would be better to keep this instance around
+        for (Term t : BitwuzlaFormulaCreator.getVariableCasts()) {
+          bitwuzla.assert_formula(t);
+        }
         bitwuzla.assert_formula(pTerm);
         String dump = bitwuzla.print_formula();
+        dump = dump.replace("(set-logic ALL)", "");
         dump = dump.replace("(check-sat)", "");
         dump = dump.replace("(exit)", "");
         out.append(dump);

From 528f06788399f0426470f0c543e68d0fe165b71c Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 6 Feb 2024 16:01:21 +0100
Subject: [PATCH 042/158] Bitwuzla: Fixed formating.

---
 .../BitwuzlaFloatingPointManager.java         | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index 0506d7b217..e7be11a537 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -172,10 +172,12 @@ private String generateRandomName(String prefix, int length) {
     int char_a = Character.valueOf('a');
     int char_z = Character.valueOf('z');
 
-    String generated = randomGenerator.ints(char_a, char_z + 1)
-        .limit(length)
-        .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
-        .toString();
+    String generated =
+        randomGenerator
+            .ints(char_a, char_z + 1)
+            .limit(length)
+            .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+            .toString();
     return prefix + "_" + generated;
   }
 
@@ -190,17 +192,15 @@ protected Term toIeeeBitvectorImpl(Term pNumber) {
 
     Term bvNaN = Bitwuzla.mk_bv_value(bvSort, "1".repeat(sizeExp + sizeExp));
     Term bvVar = Bitwuzla.mk_const(bvSort, generateRandomName("toIeeeBitvector", 10));
-    Term equal = Bitwuzla.mk_term(
-        Kind.ITE,
-        Bitwuzla.mk_term(Kind.FP_IS_NAN, pNumber),
+    Term equal =
         Bitwuzla.mk_term(
-            Kind.EQUAL,
-            bvVar,
-            bvNaN),
-        Bitwuzla.mk_term(
-            Kind.EQUAL,
-            Bitwuzla.mk_term(Kind.FP_TO_FP_FROM_BV, bvVar, sizeExp, sizeSig),
-            pNumber));
+            Kind.ITE,
+            Bitwuzla.mk_term(Kind.FP_IS_NAN, pNumber),
+            Bitwuzla.mk_term(Kind.EQUAL, bvVar, bvNaN),
+            Bitwuzla.mk_term(
+                Kind.EQUAL,
+                Bitwuzla.mk_term(Kind.FP_TO_FP_FROM_BV, bvVar, sizeExp, sizeSig),
+                pNumber));
 
     BitwuzlaFormulaCreator.addVariableCast(equal);
     return bvVar;

From 9e36ffb1e2aa70563718deb5234eda13d2345572 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 6 Feb 2024 16:03:16 +0100
Subject: [PATCH 043/158] Bitwuzla: Store Terminator callback as a member in
 BitwuzlaTheoremProver. This makes sure that the Terminator object is not
 freed by the JVM while it is still in use on the C++ side.

---
 .../solvers/bitwuzla/BitwuzlaTheoremProver.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index 47aca8be6d..d546f3af9e 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -34,7 +34,13 @@
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
 class BitwuzlaTheoremProver extends AbstractProverWithAllSat<Void> implements ProverEnvironment {
-
+  private final Terminator terminator =
+      new Terminator() {
+        @Override
+        public boolean terminate() {
+          return shutdownNotifier.shouldShutdown(); // shutdownNotifer is defined in the superclass
+        }
+      };
   private final Bitwuzla env;
 
   @SuppressWarnings("unused")
@@ -58,14 +64,7 @@ protected BitwuzlaTheoremProver(
     env = createEnvironment(pOptions, pSolverOptions);
 
     // Install shutdown hook
-    env.configure_terminator(
-        new Terminator() {
-          @Override
-          public boolean terminate() {
-            return shutdownNotifier
-                .shouldShutdown(); // shutdownNotifer is defined in the superclass
-          }
-        });
+    env.configure_terminator(terminator);
   }
 
   private Bitwuzla createEnvironment(Set<ProverOptions> pProverOptions, Options pSolverOptions) {

From ee94c0e015658417e0ee35a01cea9179e67f8c12 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 6 Feb 2024 19:10:26 +0100
Subject: [PATCH 044/158] Bugfix for negate() in
 BitwuzlaBitvectorFormulaManager: We need to negate the bitvecor, not return
 its (bitwise) not.

---
 .../solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
index 8567f3fa9d..39455198d4 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
@@ -45,7 +45,7 @@ protected Term toIntegerFormulaImpl(Term pI, boolean signed) {
 
   @Override
   protected Term negate(Term pParam1) {
-    return Bitwuzla.mk_term(Kind.BV_NOT, pParam1);
+    return Bitwuzla.mk_term(Kind.BV_NEG, pParam1);
   }
 
   @Override

From fc85356a907a990f6c0c14d80a5e030e663cde42 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 6 Feb 2024 20:42:42 +0100
Subject: [PATCH 045/158] Bitwuzla: Fixed handling of NaN in
 toIeeeBitvectorImpl.

---
 .../solvers/bitwuzla/BitwuzlaFloatingPointManager.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index e7be11a537..c87eb1d9e2 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -184,13 +184,17 @@ private String generateRandomName(String prefix, int length) {
   @Override
   protected Term toIeeeBitvectorImpl(Term pNumber) {
     // FIXME: We should use a reserved symbol for the fresh variables
-
     int sizeExp = pNumber.sort().fp_exp_size();
     int sizeSig = pNumber.sort().fp_sig_size();
 
     Sort bvSort = Bitwuzla.mk_bv_sort(sizeExp + sizeSig);
 
-    Term bvNaN = Bitwuzla.mk_bv_value(bvSort, "1".repeat(sizeExp + sizeExp));
+    // Note that NaN is handled as a special case in this method. This is not strictly necessary,
+    // but if we just use "fpTerm = to_fp(bvVar)" the NaN will be given a random payload (and
+    // sign). Since NaN payloads are not preserved here anyway we might as well pick a canonical
+    // representation.
+    Term bvNaN =
+        Bitwuzla.mk_bv_value(bvSort, "0" + "1".repeat(sizeExp + 1) + "0".repeat(sizeSig - 2));
     Term bvVar = Bitwuzla.mk_const(bvSort, generateRandomName("toIeeeBitvector", 10));
     Term equal =
         Bitwuzla.mk_term(

From a7fdfd768e5adcd10466f7310ffad611b209f79c Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 7 Feb 2024 10:06:17 +0100
Subject: [PATCH 046/158] Bitwuzla: Added support for the new
 FloatingPointNumber class in BitwuzlaFormulaCreator. See
 c9fb4d587d68de05aacdad1e8441ce47f7cb28d8.

---
 .../java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index af407e977c..fac94e6715 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -26,6 +26,7 @@
 import org.sosy_lab.java_smt.api.BitvectorFormula;
 import org.sosy_lab.java_smt.api.BooleanFormula;
 import org.sosy_lab.java_smt.api.FloatingPointFormula;
+import org.sosy_lab.java_smt.api.FloatingPointNumber;
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.api.FormulaType;
 import org.sosy_lab.java_smt.api.FormulaType.ArrayFormulaType;
@@ -550,7 +551,9 @@ public Object convertValue(Term term) {
       return new BigInteger(term.to_bv());
     }
     if (sort.is_fp()) {
-      return Double.parseDouble(term.to_fp());
+      int sizeExponent = sort.fp_exp_size();
+      int sizeMantissa = sort.fp_sig_size() - 1;
+      return FloatingPointNumber.of(term.toString(), sizeExponent, sizeMantissa);
     }
     throw new AssertionError("Unknown value type.");
   }

From e290497cc874240fd22c7486393fc24ada0a3f11 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 7 Feb 2024 10:50:47 +0100
Subject: [PATCH 047/158] Bitwuzla: Disabled a test in SolverConcurrencyTest as
 Bitwuzla does not support parallel solver threads.

---
 src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java b/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
index 3d494fbe55..c3026df1e8 100644
--- a/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
@@ -188,6 +188,11 @@ public void testIntConcurrencyWithConcurrentContext() {
    */
   @Test
   public void testBvConcurrencyWithConcurrentContext() {
+    // FIXME: Bitwuzla does not support parallel solver threads
+    assume()
+        .that(solver)
+        .isNotEqualTo(Solvers.BITWUZLA);
+
     requireBitvectors();
     assertConcurrency(
         "testBvConcurrencyWithConcurrentContext",

From edf94e5f7ceaf913873cb1264efa75d8633d822d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 7 Feb 2024 11:16:46 +0100
Subject: [PATCH 048/158] Bitwuzla: Fixed handling of (set-logic ..) at the
 start of an input file when parsing.

---
 .../java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index 7123fe88ce..3b1ab4201f 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -57,6 +57,9 @@ final class BitwuzlaFormulaManager
 
   @Override
   public BooleanFormula parse(String s) throws IllegalArgumentException {
+    if (s.startsWith("(set-logic ")) {
+      s = s.substring(1 + s.indexOf(')'));
+    }
     if (s.contains("(check-sat)")) {
       s = s.replace("(check-sat)", "");
     }

From 01e8224a9849075645626f36b06148fea029c425 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 7 Feb 2024 11:55:18 +0100
Subject: [PATCH 049/158] Bitwuzla: Fixed printing of bv and float values as
 bit strings.

---
 lib/native/source/libbitwuzla/bitwuzla.i                      | 4 ++--
 .../java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index 6aaedabb64..0567103047 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -132,8 +132,8 @@ namespace bitwuzla {
   }
 
   std::string to_bv() {
-    assert($self->is_value() && $self->sort().is_bv());
-    return $self->value<std::string>(10);
+    assert($self->is_value() && ($self->sort().is_bv() || $self->sort().is_fp()));
+    return $self->value<std::string>();
   }
 
   std::string to_fp () {
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index fac94e6715..8186b3bb2d 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -548,12 +548,12 @@ public Object convertValue(Term term) {
       return term.to_rm();
     }
     if (sort.is_bv()) {
-      return new BigInteger(term.to_bv());
+      return new BigInteger(term.to_bv(), 2);
     }
     if (sort.is_fp()) {
       int sizeExponent = sort.fp_exp_size();
       int sizeMantissa = sort.fp_sig_size() - 1;
-      return FloatingPointNumber.of(term.toString(), sizeExponent, sizeMantissa);
+      return FloatingPointNumber.of(term.to_bv(), sizeExponent, sizeMantissa);
     }
     throw new AssertionError("Unknown value type.");
   }

From dd9ee48e0f6e68aa0dda38c3b1b38bac5c363548 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 7 Feb 2024 11:56:06 +0100
Subject: [PATCH 050/158] Bitwuzla: Fixed parsing of strings with multiple
 assertions in BitwuzlaFormulaManager.parse()

---
 .../solvers/bitwuzla/BitwuzlaFormulaManager.java | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index 3b1ab4201f..a2df9d1b4a 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -9,6 +9,7 @@
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -80,17 +81,12 @@ public BooleanFormula parse(String s) throws IllegalArgumentException {
     Parser parser = new Parser(bitwuzlaOption, file.toString());
     String error = parser.parse(true);
 
-    Preconditions.checkArgument(
-        error.isEmpty(), "Could not parse input string \"%s\": Error \"%s\"", s, error);
-    Vector_Term assertions = parser.bitwuzla().get_assertions();
+    String errorMsg = String.format("Could not parse input string \"%s\": ", s);
+    Preconditions.checkArgument(error.isEmpty(), errorMsg + "Error \"%s\".", error);
 
-    Preconditions.checkArgument(
-        !assertions.isEmpty(), "Could not parse input string \"%s\": No assertion was found", s);
-    Preconditions.checkArgument(
-        assertions.size() == 1,
-        "Could not parse input string \"%s\": Only one assertion is allowed",
-        s);
-    return getFormulaCreator().encapsulateBoolean(assertions.get(0));
+    Vector_Term assertions = parser.bitwuzla().get_assertions();
+    Preconditions.checkArgument(!assertions.isEmpty(), errorMsg + "No assertion was found.");
+    return getFormulaCreator().encapsulateBoolean(Iterables.getLast(assertions));
   }
 
   @Override

From b9809f9f06eed6bd56ab2d3aa0a6739f941ed949 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 8 Feb 2024 15:15:04 +0100
Subject: [PATCH 051/158] Bitwuzla: Removed proxy class for bitwuzla.Exception
 from the JNI bindings.

---
 lib/native/source/libbitwuzla/bitwuzla.i             |  2 +-
 .../source/libbitwuzla/phantomReferences.patch       | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index 0567103047..71370e2cfd 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -68,7 +68,7 @@ namespace bitwuzla {
 %ignore operator<< (std::ostream &out, RoundingMode rm);
 
 /** Exception */
-%ignore Exception::Exception (const std::stringstream &stream);
+%ignore Exception;
 
 /** Options */
 %ignore Options::operator= (const Options &options);
diff --git a/lib/native/source/libbitwuzla/phantomReferences.patch b/lib/native/source/libbitwuzla/phantomReferences.patch
index 1718839a60..36e981702d 100644
--- a/lib/native/source/libbitwuzla/phantomReferences.patch
+++ b/lib/native/source/libbitwuzla/phantomReferences.patch
@@ -9,18 +9,6 @@ diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzl
 +    //delete();
    }
  
-   public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Exception.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Exception.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Exception.java	2024-01-30 02:17:08.706597398 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Exception.java	2024-01-30 02:13:50.576389963 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
    public synchronized void delete() {
 diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
 --- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-01-30 02:16:53.494652530 +0100

From 860a7310f4595a648af9eaf7ea10ca0972c89bf2 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 8 Feb 2024 15:15:51 +0100
Subject: [PATCH 052/158] Bitwuzla: Updated swig script for the new parser
 class.

---
 lib/native/source/libbitwuzla/bitwuzla.i | 25 ++++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index 71370e2cfd..26efaec5c3 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -17,7 +17,6 @@
 #include <sstream>
 
 #include <cassert>
-
 %}
 
 %include <stdint.i>
@@ -575,18 +574,18 @@ namespace bitwuzla {
 %include "include/bitwuzla/cpp/bitwuzla.h"
 
 namespace bitwuzla::parser {
-%ignore Parser::Parser(
-  Options &options,
-  const std::string &infile_name,
-  const std::string &language,
-  std::ostream *out = &std::cout);
-
-%ignore Parser::Parser(
-  Options &options,
-  const std::string &infile_name,
-  FILE *infile,
-  const std::string &language = "smt2",
-  std::ostream *out = &std::cout);
+%exception {
+  try {
+    $action
+  } catch(Exception& e) {
+    jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+    jenv->ThrowNew(exceptionType, e.what());
+    return $null;
+  }
+}
+
+/** Exception */
+%ignore Exception;
 }
 
 %include "include/bitwuzla/cpp/parser.h"

From a10b1b3c841be79e1ad6dda4ce12b75fb2eb2557 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 8 Feb 2024 15:29:29 +0100
Subject: [PATCH 053/158] Bitwuzla: Fixed some clean up issues in the solver
 build script.

---
 build/build-publish-solvers.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/build/build-publish-solvers.xml b/build/build-publish-solvers.xml
index c259808faf..5cb76ae8f9 100644
--- a/build/build-publish-solvers.xml
+++ b/build/build-publish-solvers.xml
@@ -883,13 +883,13 @@ SPDX-License-Identifier: Apache-2.0
         </exec>
 
         <!-- copy bitwuzla include files to the source tree -->
+        <delete dir="${source.path}/include" quiet="true"/>
         <copy todir="${source.path}">
-            <fileset dir="${bitwuzla.path}/install">
-                <include name="include/**"/>
-            </fileset>
+            <fileset dir="${bitwuzla.path}/install" includes="include/**"/>
         </copy>
 
         <!-- create ouput directory for the swig proxies -->
+        <delete dir="$source.path}/src" quiet="true"/>
         <mkdir dir="${source.path}/src/org/sosy_lab/java_smt/solvers/bitwuzla/api"/>
 
         <!-- run swig to generate java files and the c wrapper -->
@@ -915,8 +915,8 @@ SPDX-License-Identifier: Apache-2.0
 
         <!-- compile java proxies and create jar file -->
         <mkdir dir="${source.path}/build"/>
-        <javac srcdir="${source.path}/src/" destdir="${source.path}/build"
-               includeantruntime="false" failonerror="true">
+        <javac srcdir="${source.path}/src/" destdir="${source.path}/build" includeantruntime="false"
+               failonerror="true">
             <include name="org/sosy_lab/java_smt/solvers/bitwuzla/api/*.java"/>
         </javac>
         <jar destfile="bitwuzla-${bitwuzla.version}.jar" basedir="${source.path}/build"/>
@@ -929,9 +929,8 @@ SPDX-License-Identifier: Apache-2.0
         <jar destfile="bitwuzla-${bitwuzla.version}-javadoc.jar" basedir="${source.path}/doc"/>
         <delete dir="${source.path}/doc"/>
 
-        <!-- package swig generated source code, then remove the files -->
+        <!-- package swig generated source code -->
         <jar destfile="bitwuzla-${bitwuzla.version}-sources.jar" basedir="${source.path}/src"/>
-        <delete dir="${source.path}/src"/>
 
         <!-- compile the swig wrapper -->
         <exec executable="g++" dir="${source.path}" failonerror="true">
@@ -943,11 +942,6 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="-I${java.home}/include"/>
             <arg value="-I${java.home}/include/linux"/>
         </exec>
-        <delete file="${source.path}/bitwuzla_wrap.cpp"/>
-        <delete file="${source.path}/bitwuzla_wrap.h"/>
-
-        <!-- delete includes from the source tree (we're done compiling) -->
-        <delete dir="${source.path}/include"/>
 
         <!-- link the wrapper to create libbitwuzlaJNI.so -->
         <exec executable="g++" dir="${source.path}" failonerror="true">
@@ -961,7 +955,6 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="-lgmp"/>
             <arg value="-Wl,-z,defs"/>
         </exec>
-        <delete file="${source.path}/bitwuzla_wrap.o"/>
 
         <!-- copy library files into directory to be published for Ivy -->
         <move file="${source.path}/libbitwuzlaJNI.so"
@@ -1035,6 +1028,13 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="libgmp.so"/>
             <arg value="libbitwuzlaJNI-${bitwuzla.version}.so"/>
         </exec>
+
+        <!-- clean up the source tree -->
+        <delete includeemptydirs="true">
+            <fileset dir="${source.path}" includes="include/ src/"/>
+            <fileset dir="${source.path}"
+                     includes="bitwuzla_wrap.cpp bitwuzla_wrap.h bitwuzla_wrap.o"/>
+        </delete>
     </target>
 
     <target name="publish-bitwuzla" depends="package-bitwuzla, load-ivy"

From bd7b287c7b4d9fc516dff1adaca7dbd0e151db3b Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 8 Feb 2024 15:33:24 +0100
Subject: [PATCH 054/158] Updated Bitwuzla version. This new release fixes some
 issues we've had with the way the parser works in Bitwuzla. See
 https://github.com/bitwuzla/bitwuzla/discussions/101.

---
 lib/ivy.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/ivy.xml b/lib/ivy.xml
index 9b811b9386..0145739f31 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -167,8 +167,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
-        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.3.2-g9a9a8fed"
-                    conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
+        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.3.2-g8c5ec288" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->
         <dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.0-1-gc58fe5b4" conf="runtime-yices2->runtime; contrib->sources" />

From 5916a2e74c8ec3c6c819a95296893aae4584500f Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 8 Feb 2024 23:22:32 +0100
Subject: [PATCH 055/158] Bitwuzla: Updated native solver tests.

---
 .../bitwuzla/BitwuzlaNativeApiTest.java       | 70 +++++++------------
 1 file changed, 25 insertions(+), 45 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index f2468752a3..596db70e0c 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -9,12 +9,8 @@
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.common.truth.Truth;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import org.junit.After;
 import org.junit.AssumptionViolatedException;
 import org.junit.Before;
@@ -57,7 +53,7 @@ public void createEnvironment() {
   private Options createOptions() {
     Options options = new Options();
     options.set(Option.REWRITE_LEVEL, 0);
-    options.set(Option.PRODUCE_MODELS, 1);
+    options.set(Option.PRODUCE_MODELS, 2);
     return options;
   }
 
@@ -68,12 +64,14 @@ public void freeEnvironment() {
     }
   }
 
-  //  @Test
-  //  public void functionWithNoArguments() {
-  //      Sort bool_sort = Bitwuzla.mk_bool_sort();
-  //      Term a = Bitwuzla.mk_var(bool_sort, "a");
-  //      Term noArgumentUF = Bitwuzla.mk_term(Kind.LAMBDA, a);
-  //  }
+  // Bitwuzla does not support lambdas with no argument
+  @Ignore
+  @Test
+  public void functionWithNoArguments() {
+    Sort bool_sort = Bitwuzla.mk_bool_sort();
+    Term a = Bitwuzla.mk_var(bool_sort, "a");
+    Term noArgumentUF = Bitwuzla.mk_term(Kind.LAMBDA, a);
+  }
 
   @Test
   public void signedFunctions() {
@@ -100,7 +98,7 @@ public void boolType() {
   }
 
   // FIXME: Bitwuzla fails this critically!
-  @Ignore
+  // -- This seems to be working now?
   @Test
   public void repeatedTermCreationInMultipleSolversTest() {
     Term tru1 = Bitwuzla.mk_true();
@@ -219,7 +217,6 @@ public void testBvArrayModelStore() {
     assertThat(children3).isEmpty();
   }
 
-  @Ignore // FIXME
   @Test
   public void testBvArrayModelSelect() {
     Sort bvSort4 = Bitwuzla.mk_bv_sort(4);
@@ -245,7 +242,7 @@ public void testBvArrayModelSelect() {
     String arrAtZeroString = selectArrAtZero.symbol();
     assertThat(arrAtZeroString).isNull();
     // Get model value arr[0] as String
-    String arrAtZeroValueString = bitwuzla.get_value(selectArrAtZero).toString();
+    String arrAtZeroValueString = bitwuzla.get_value(selectArrAtZero).to_bv();
     // 00001011 == 11
     assertThat(arrAtZeroValueString).isEqualTo("00001011");
 
@@ -571,38 +568,28 @@ public void testExists() {
           + "(define-fun .def_14 () Bool (or e .def_13))\n"
           + "(assert .def_14)";
 
-  private Vector_Term parse(String smt2dump) throws IOException {
-    // create a temporary file and dump the formulas to it in SMTLIB2 format
-    Path file = Files.createTempFile("bitwuzla-", ".smt2");
-    Files.writeString(file, smt2dump);
-
-    // run the parser on the temporary file
-    Parser parser = new Parser(createOptions(), file.toString());
-    String error = parser.parse(true);
-
-    assertWithMessage(error).that(error).isEmpty();
+  private Vector_Term parse(String smt2dump) {
+    Parser parser = new Parser(createOptions());
+    parser.parse(smt2dump, true, false);
     return parser.bitwuzla().get_assertions();
   }
 
   // Bitwuzla currently REWRITES terms when parsing
   @Ignore
   @Test
-  public void parserTest2() throws IOException {
+  public void parserTest2() {
     Vector_Term assertions = parse(SMT2DUMP);
     bitwuzla.push(1);
     bitwuzla.assert_formula(assertions.get(0));
     String newDump = bitwuzla.print_formula();
-    if (newDump.contains("(check-sat)")) {
-      newDump = newDump.replace("(check-sat)", "");
-    }
-    if (newDump.contains("(exit)")) {
-      newDump = newDump.replace("(exit)", "");
-    }
+    newDump = newDump.replace("(set-logic ALL)", "");
+    newDump = newDump.replace("(check-sat)", "");
+    newDump = newDump.replace("(exit)", "");
     assertThat(newDump).isEqualTo(SMT2DUMP);
   }
 
   @Test
-  public void parserTest() throws IOException {
+  public void parserTest() {
     Sort boolSort = Bitwuzla.mk_bool_sort();
     Term x = Bitwuzla.mk_const(boolSort, "x");
     Term y = Bitwuzla.mk_const(boolSort, "y");
@@ -610,11 +597,8 @@ public void parserTest() throws IOException {
     bitwuzla.push(1);
     bitwuzla.assert_formula(xOrY);
 
+    // dump formulas in SMTLIB2 format
     String dump = bitwuzla.print_formula();
-    System.out.println(dump);
-    // check-sat and exit messes with the parse, in that suddenly sat is checked and the formulas
-    // are rewritten and then returned in a different form, independent of options
-
     bitwuzla.pop(1);
 
     // parse the dumped formulas
@@ -630,18 +614,14 @@ public void parserTest() throws IOException {
     assertThat(newDump).isEqualTo(dump);
   }
 
-  /*
-  @Ignore
-  @Test
-  public void parserFailTest() throws IOException {
+  @Test(expected = IllegalArgumentException.class)
+  public void parserFailTest() {
     // valid
-    String input = "(declare-const a Bool)\n(declare-const b Bool)\n(assert (or a b))";
+    String input = "(declare-const a Bool)(declare-const b Bool)(assert (or a b))";
     Vector_Term assertions = parse(input);
     assertThat(assertions).isNotEmpty();
     // invalid/fails
-    String badInput = "(declare-const a Bool)\n(assert (or a b))";
-    assertions = parse(badInput);
-    // FIXME: Throw an exception in swig if the parse failed
+    String badInput = "(declare-const a Bool)(assert (or a b))";
+    parse(badInput);
   }
-  */
 }

From bdf0313ed9bf889cf2e2459ad3f6e5f3c160b12a Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 9 Feb 2024 00:10:49 +0100
Subject: [PATCH 056/158] Bitwuzla: Rewrote parse() in BitwuzlaFormulaManager
 for the new parser interface.

---
 .../bitwuzla/BitwuzlaFormulaManager.java      | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index a2df9d1b4a..34bce15df8 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -11,8 +11,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import org.sosy_lab.common.Appender;
 import org.sosy_lab.common.Appenders;
 import org.sosy_lab.java_smt.api.BooleanFormula;
@@ -27,7 +25,7 @@
 
 final class BitwuzlaFormulaManager
     extends AbstractFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
-
+  private final BitwuzlaFormulaCreator creator;
   private final Options bitwuzlaOption;
 
   BitwuzlaFormulaManager(
@@ -52,12 +50,15 @@ final class BitwuzlaFormulaManager
         null,
         null,
         null);
-
+    creator = pFormulaCreator;
     bitwuzlaOption = pBitwuzlaOptions;
   }
 
   @Override
-  public BooleanFormula parse(String s) throws IllegalArgumentException {
+  public BooleanFormula parse(String formulaStr) throws IllegalArgumentException {
+    // Strip the input string and remove everything but declarations and assertions
+    // FIXME: We should handle this in AbstractFormulaManager as it affects all solvers
+    String s = formulaStr;
     if (s.startsWith("(set-logic ")) {
       s = s.substring(1 + s.indexOf(')'));
     }
@@ -68,25 +69,14 @@ public BooleanFormula parse(String s) throws IllegalArgumentException {
       s = s.replace("(exit)", "");
     }
 
-    // create a temporary file and dump the formulas to it in SMTLIB2 format
-    Path file;
-    try {
-      file = Files.createTempFile("bitwuzla-", ".smt2");
-      Files.writeString(file, s);
-    } catch (IOException e) {
-      throw new RuntimeException("Could not created temporary file for parsing", e);
-    }
-
-    // run the parser on the temporary file
-    Parser parser = new Parser(bitwuzlaOption, file.toString());
-    String error = parser.parse(true);
-
-    String errorMsg = String.format("Could not parse input string \"%s\": ", s);
-    Preconditions.checkArgument(error.isEmpty(), errorMsg + "Error \"%s\".", error);
+    Parser parser = new Parser(bitwuzlaOption);
+    parser.parse(s, true, false);
 
     Vector_Term assertions = parser.bitwuzla().get_assertions();
-    Preconditions.checkArgument(!assertions.isEmpty(), errorMsg + "No assertion was found.");
-    return getFormulaCreator().encapsulateBoolean(Iterables.getLast(assertions));
+    Preconditions.checkArgument(
+        !assertions.isEmpty(), "No assertion found in input string \"%s\"", formulaStr);
+
+    return creator.encapsulateBoolean(Iterables.getLast(assertions));
   }
 
   @Override
@@ -105,7 +95,9 @@ public void appendTo(Appendable out) throws IOException {
         }
         bitwuzla.assert_formula(pTerm);
         String dump = bitwuzla.print_formula();
-        dump = dump.replace("(set-logic ALL)", "");
+        if (dump.startsWith("(set-logic ")) {
+          dump = dump.substring(1 + dump.indexOf(')'));
+        }
         dump = dump.replace("(check-sat)", "");
         dump = dump.replace("(exit)", "");
         out.append(dump);

From 4f063cbb46e07c10e6b2584e41a4e36a81334bfc Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 9 Feb 2024 15:49:27 +0100
Subject: [PATCH 057/158] Fixed checkstyle issues.

---
 .../solvers/bitwuzla/BitwuzlaNativeApiTest.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index 596db70e0c..7759b843fa 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -65,13 +65,13 @@ public void freeEnvironment() {
   }
 
   // Bitwuzla does not support lambdas with no argument
-  @Ignore
-  @Test
-  public void functionWithNoArguments() {
-    Sort bool_sort = Bitwuzla.mk_bool_sort();
-    Term a = Bitwuzla.mk_var(bool_sort, "a");
-    Term noArgumentUF = Bitwuzla.mk_term(Kind.LAMBDA, a);
-  }
+  //@Ignore
+  //@Test
+  //public void functionWithNoArguments() {
+  //  Sort bool_sort = Bitwuzla.mk_bool_sort();
+  //  Term a = Bitwuzla.mk_var(bool_sort, "a");
+  //  Bitwuzla.mk_term(Kind.LAMBDA, a);
+  //}
 
   @Test
   public void signedFunctions() {
@@ -614,6 +614,7 @@ public void parserTest() {
     assertThat(newDump).isEqualTo(dump);
   }
 
+  @SuppressWarnings("unused")
   @Test(expected = IllegalArgumentException.class)
   public void parserFailTest() {
     // valid
@@ -622,6 +623,6 @@ public void parserFailTest() {
     assertThat(assertions).isNotEmpty();
     // invalid/fails
     String badInput = "(declare-const a Bool)(assert (or a b))";
-    parse(badInput);
+    assertions = parse(badInput);
   }
 }

From 59865e04fe73de754bf442cb3becfbef7e83d22f Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 28 Feb 2024 12:14:25 +0100
Subject: [PATCH 058/158] Moved clean up for bitwuzla build to clean in
 build.xml. This makes it easier to remove intermediate files when the build
 has failed.

---
 build.xml                       | 3 +++
 build/build-publish-solvers.xml | 7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index ff590fb08d..8a7e11c9ce 100644
--- a/build.xml
+++ b/build.xml
@@ -79,9 +79,12 @@ SPDX-License-Identifier: Apache-2.0
     <!-- Main targets -->
 
     <target name="clean" description="Clean">
+        <property name="bitwuzla.path" value="${user.dir}/lib/native/source/libbitwuzla"/>
         <delete includeEmptyDirs="true">
             <fileset dir="." includes="${class.dir}/** ${ivy.module}-*.jar ivy-*.xml *.so *.dll *.dylib *.jar"/>
             <fileset dir="lib/native/source/libmathsat5j" includes="*.so *.dll *.o"/>
+            <fileset dir="${bitwuzla.path}" includes="include/ src/"/>
+            <fileset dir="${bitwuzla.path}" includes="bitwuzla_wrap.cpp bitwuzla_wrap.h bitwuzla_wrap.o"/>
         </delete>
     </target>
 
diff --git a/build/build-publish-solvers.xml b/build/build-publish-solvers.xml
index 5cb76ae8f9..ac3bbc45af 100644
--- a/build/build-publish-solvers.xml
+++ b/build/build-publish-solvers.xml
@@ -1028,13 +1028,6 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="libgmp.so"/>
             <arg value="libbitwuzlaJNI-${bitwuzla.version}.so"/>
         </exec>
-
-        <!-- clean up the source tree -->
-        <delete includeemptydirs="true">
-            <fileset dir="${source.path}" includes="include/ src/"/>
-            <fileset dir="${source.path}"
-                     includes="bitwuzla_wrap.cpp bitwuzla_wrap.h bitwuzla_wrap.o"/>
-        </delete>
     </target>
 
     <target name="publish-bitwuzla" depends="package-bitwuzla, load-ivy"

From 2c85acc88b66e3186eba35bc3cf2a847cf155259 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 28 Feb 2024 14:28:04 +0100
Subject: [PATCH 059/158] Updated Bitwuzla. The new version supports a
 TermManager and no longer binds solver objects to the thread that they were
 created in.

---
 lib/ivy.xml                                   |   2 +-
 lib/native/source/libbitwuzla/bitwuzla.i      | 420 +++++-------------
 .../bitwuzla/BitwuzlaArrayFormulaManager.java |  10 +-
 .../BitwuzlaBitvectorFormulaManager.java      |  70 +--
 .../BitwuzlaBooleanFormulaManager.java        |  26 +-
 .../BitwuzlaFloatingPointManager.java         |  97 ++--
 .../bitwuzla/BitwuzlaFormulaCreator.java      |  36 +-
 .../bitwuzla/BitwuzlaFormulaManager.java      |   5 +-
 .../solvers/bitwuzla/BitwuzlaModel.java       |   2 +-
 .../bitwuzla/BitwuzlaNativeApiTest.java       | 258 +++++------
 .../BitwuzlaQuantifiedFormulaManager.java     |  14 +-
 .../bitwuzla/BitwuzlaSolverContext.java       |   4 +-
 .../bitwuzla/BitwuzlaTheoremProver.java       |   2 +-
 13 files changed, 388 insertions(+), 558 deletions(-)

diff --git a/lib/ivy.xml b/lib/ivy.xml
index 0145739f31..c2af177085 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -167,7 +167,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
-        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.3.2-g8c5ec288" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
+        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.3.2-gd711df95" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->
         <dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.0-1-gc58fe5b4" conf="runtime-yices2->runtime; contrib->sources" />
diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index 26efaec5c3..e135c9ea91 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -134,54 +134,6 @@ namespace bitwuzla {
     assert($self->is_value() && ($self->sort().is_bv() || $self->sort().is_fp()));
     return $self->value<std::string>();
   }
-
-  std::string to_fp () {
-    assert($self->is_value() && $self->sort().is_fp());
-
-    // Get Bitwuzla representation of the term value
-    auto [sign, exponent, mantissa] =
-      $self->value<std::tuple<std::string, std::string, std::string>> ();
-
-    bool isSignZero = sign == "0";
-    bool isExponentZero = exponent.find_first_not_of("0") == std::string::npos;
-    bool isExponentOnes = exponent.find_first_not_of("1") == std::string::npos;
-    bool isMantissaZero = mantissa.find_first_not_of("0") == std::string::npos;
-
-    // Handle special values
-    if (isExponentZero && isMantissaZero) {
-      return isSignZero ? "0.0" : "-0.0";
-    }
-    if (isExponentOnes && isMantissaZero) {
-      return isSignZero ? "Infinity" : "-Infinity";
-    }
-    if (isExponentOnes && !isMantissaZero) {
-      return "NaN";
-    }
-
-    // Calculate value of the exponent
-    mpz_t expMpz;
-    mpz_init_set_str(expMpz, exponent.c_str(), 2);
-    int32_t expVal = mpz_get_si(expMpz);
-    int32_t bias = -1 + (1 << -1 + exponent.length());
-    mpz_clear(expMpz);
-
-    // Rewrite Bitwuzla representation in a format GMP can understand
-    std::string significant = (expVal == 0 ? "" : "1") + mantissa;
-    std::string formated =
-      significant + "@" + std::to_string(expVal - bias - ((int32_t) significant.length() - 1));
-
-    // Convert result to base10 floating point representation
-    mpf_t floatMpf;
-    mpf_init_set_str(floatMpf, formated.c_str(), -2);
-
-    mp_exp_t exp10;
-    char* sig10 = mpf_get_str(nullptr, &exp10, 10, 0, floatMpf);
-    std::string result = "0." + std::string(sig10) + (exp10 == 0 ? "" : "e" + std::to_string(exp10));
-    delete[] sig10;
-    mpf_clear(floatMpf);
-
-    return (sign == "1") ? ("-" + result) : result;
-  }
 }
 
 %ignore operator==(const Term &a, const Term &b);
@@ -208,116 +160,104 @@ namespace bitwuzla {
   }
 %}
 
-// Add static methods for term creation
-%ignore mk_true();
-%extend Bitwuzla {
-  static Term mk_true() {
-    return bitwuzla::mk_true();
-  }
-}
-%ignore mk_false();
-%extend Bitwuzla {
-  static Term mk_false() {
-    return bitwuzla::mk_false();
-  }
-}
-%ignore mk_bv_zero(const Sort &);
-%extend Bitwuzla {
-  static Term mk_bv_zero(const Sort &sort) {
-    return bitwuzla::mk_bv_zero(sort);
-  }
-}
-%ignore mk_bv_one(const Sort &);
-%extend Bitwuzla {
-  static Term mk_bv_one(const Sort &sort) {
-    return bitwuzla::mk_bv_one(sort);
-  }
-}
-%ignore mk_bv_ones(const Sort &);
-%extend Bitwuzla {
-  static Term mk_bv_ones(const Sort &sort) {
-    return bitwuzla::mk_bv_ones(sort);
-  }
-}
-%ignore mk_bv_min_signed(const Sort &);
-%extend Bitwuzla {
-  static Term mk_bv_min_signed(const Sort &sort) {
-    return bitwuzla::mk_bv_min_signed(sort);
-  }
-}
-%ignore mk_bv_max_signed(const Sort &);
-%extend Bitwuzla {
-    static Term mk_bv_max_signed(const Sort &sort) {
-    return bitwuzla::mk_bv_max_signed(sort);
+/** Sort */
+%rename(toString) Sort::str;
+
+%ignore Sort::uninterpreted_symbol() const;
+%ignore Sort::is_uninterpreted() const;
+
+%ignore Sort::id() const;
+%extend Sort {
+  int id() {
+    return (int) $self->id();
   }
 }
-%ignore mk_bv_value(const Sort &, const std::string &, uint8_t = 2);
-%extend Bitwuzla {
-    static Term mk_bv_value(const Sort &sort, const std::string &value, int base = 2) {
-      return bitwuzla::mk_bv_value(sort, value, (int8_t) base);
+
+%ignore Sort::bv_size() const;
+%extend Sort {
+  int bv_size() {
+    return (int) $self->bv_size();
   }
 }
-%ignore mk_bv_value_uint64(const Sort &, uint64_t);
-%extend Bitwuzla {
-  static Term mk_bv_value_unsigned(const Sort &sort, int value) {
-    return bitwuzla::mk_bv_value_uint64(sort, value);
+
+%ignore Sort::fp_exp_size() const;
+%ignore Sort::fp_sig_size() const;
+%extend Sort {
+  int fp_exp_size() {
+    return (int) $self->fp_exp_size();
   }
-}
-%ignore mk_bv_value_int64(const Sort &, int64_t);
-%extend Bitwuzla {
-  static Term mk_bv_value_signed(const Sort &sort, int value) {
-    return bitwuzla::mk_bv_value_int64(sort, value);
+  int fp_sig_size() {
+    return (int) $self->fp_sig_size();
   }
 }
-%ignore mk_fp_pos_zero(const Sort &);
-%extend Bitwuzla {
-  static Term mk_fp_pos_zero(const Sort &sort) {
-    return bitwuzla::mk_fp_pos_zero(sort);
+
+%ignore Sort::fun_arity() const;
+%extend Sort {
+  int fun_arity() {
+    return (int) $self->fun_arity();
   }
 }
-%ignore mk_fp_neg_zero(const Sort &);
-%extend Bitwuzla {
-  static Term mk_fp_neg_zero(const Sort &sort) {
-    return bitwuzla::mk_fp_neg_zero(sort);
+
+%ignore operator==(const Sort &a, const Sort &b);
+%ignore operator!=(const Sort &a, const Sort &b);
+%ignore operator<< (std::ostream &out, const Sort &sort);
+%extend Sort {
+  int hashCode() {
+    std::hash<bitwuzla::Sort> f;
+    return (int) f(*$self);
   }
-}
-%ignore mk_fp_pos_inf(const Sort &);
-%extend Bitwuzla {
-  static Term mk_fp_pos_inf(const Sort &sort) {
-    return bitwuzla::mk_fp_pos_inf(sort);
+  bool isEqual(Sort other) {
+    return operator==(*$self, other);
   }
 }
-%ignore mk_fp_neg_inf(const Sort &);
-%extend Bitwuzla {
-  static Term mk_fp_neg_inf(const Sort &sort) {
-    return bitwuzla::mk_fp_neg_inf(sort);
+
+%typemap(javacode) Sort %{
+  public boolean equals(Object object) {
+    if(object instanceof $javaclassname) {
+      Sort that = ($javaclassname) object;
+      return this.isEqual(that);
+    }
+    return false;
   }
-}
-%ignore mk_fp_nan(const Sort &);
-%extend Bitwuzla {
-  static Term mk_fp_nan(const Sort &sort) {
-    return bitwuzla::mk_fp_nan(sort);
+%}
+
+/** Terminator */
+%insert("runtime") %{
+#define SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON
+%}
+
+%feature("director") Terminator;
+
+/** TermManager */
+%ignore TermManager::mk_rm_sort();
+%ignore TermManager::mk_uninterpreted_sort(const std::optional< std::string > &symbol=std::nullopt);
+
+%ignore TermManager::mk_bv_sort(uint64_t size);
+%extend TermManager {
+  Sort mk_bv_sort(int size) {
+    return $self->mk_bv_sort(size);
   }
 }
-%ignore mk_fp_value(const Term &, const Term &, const Term &);
-%extend Bitwuzla {
-  static Term mk_fp_value(
-      const Term &bv_sign, const Term &bv_exponent, const Term &bv_significand) {
-    return bitwuzla::mk_fp_value(bv_sign, bv_exponent, bv_significand);
+%ignore TermManager::mk_fp_sort(uint64_t exp_size, uint64_t sig_size);
+%extend TermManager {
+  Sort mk_fp_sort(int exp_size, int sig_size) {
+    return $self->mk_fp_sort(exp_size, sig_size);
   }
 }
-%ignore mk_fp_value(const Sort &, const Term &, const std::string &);
-%extend Bitwuzla {
-  static Term mk_fp_value(const Sort &sort, const Term &rm, const std::string &repr) {
+
+%ignore TermManager::mk_fp_value(const Sort &sort, const Term &rm, const std::string &real);
+%extend TermManager {
+  // Patch mk_fp_value to handle scientific notation in the input string
+  Term parse_fp_value(const Sort &sort, const Term &rm, const std::string &repr) {
     // Handle special values
     if (repr == "Infinity") {
-      return mk_fp_pos_inf(sort);
+      return $self->mk_fp_pos_inf(sort);
     }
     if (repr == "-Infinity") {
-      return mk_fp_neg_inf(sort);
+      return $self->mk_fp_neg_inf(sort);
     }
     if (repr == "NaN") {
-      return mk_fp_nan(sort);
+      return $self->mk_fp_nan(sort);
     }
 
     // Parse float value with GMP
@@ -340,9 +280,9 @@ namespace bitwuzla {
     if (isZeroes) {
       // GMP drops the sign for -0.0, so we have handle this as a special case
       if (repr[0] == '-') {
-        return mk_fp_neg_zero(sort);
+        return $self->mk_fp_neg_zero(sort);
       } else {
-        return mk_fp_pos_zero(sort);
+        return $self->mk_fp_pos_zero(sort);
       }
     }
 
@@ -367,197 +307,62 @@ namespace bitwuzla {
     delete[] mantissa;
 
     // Create the term
-    return bitwuzla::mk_fp_value(sort, rm, output.str());
+    return $self->mk_fp_value(sort, rm, output.str());
   }
 }
-%ignore mk_fp_value(const Sort &,
-                    const Term &,
-                    const std::string &,
-                    const std::string &);
-%extend Bitwuzla {
-  static Term mk_fp_value(
-      const Sort &sort, const Term &rm, const std::string &num, const std::string &den) {
-    return bitwuzla::mk_fp_value(sort, rm, num, den);
-  }
-}
-%ignore mk_rm_value(RoundingMode);
-%extend Bitwuzla {
-  static Term mk_rm_value(RoundingMode rm) {
-    return bitwuzla::mk_rm_value(rm);
-  }
-}
-%ignore mk_const_array(const Sort &, const Term &);
-%extend Bitwuzla {
-  static Term mk_const_array(const Sort &sort, const Term &term) {
-    return bitwuzla::mk_const_array(sort, term);
-  }
-}
-%ignore mk_term(Kind, const std::vector<Term> &, const std::vector<uint64_t> &indices = {});
-%extend Bitwuzla {
-  static Term mk_term(Kind kind, const Term &t1) {
-    return bitwuzla::mk_term(kind, {t1}, {});
-  }
-  static Term mk_term(Kind kind, const Term &t1, int i1) {
-    return bitwuzla::mk_term(kind, {t1}, {(uint64_t) i1});
+
+%ignore TermManager::mk_term(Kind, const std::vector<Term> &, const std::vector<uint64_t> &indices = {});
+%extend TermManager {
+  Term mk_term(Kind kind, const Term &t1) {
+    return $self->mk_term(kind, {t1}, {});
   }
-  static Term mk_term(Kind kind, const Term &t1, int i1, int i2) {
-    return bitwuzla::mk_term(kind, {t1}, {(uint64_t) i1, (uint64_t) i2});
+  Term mk_term(Kind kind, const Term &t1, int i1) {
+    return $self->mk_term(kind, {t1}, {(uint64_t) i1});
   }
-  static Term mk_term(Kind kind, const Term &t1, const Term &t2) {
-    return bitwuzla::mk_term(kind, {t1, t2}, {});
+  Term mk_term(Kind kind, const Term &t1, int i1, int i2) {
+    return $self->mk_term(kind, {t1}, {(uint64_t) i1, (uint64_t) i2});
   }
-  static Term mk_term(Kind kind, const Term &t1, const Term &t2, int i1) {
-    return bitwuzla::mk_term(kind, {t1, t2}, {(uint64_t) i1});
+  Term mk_term(Kind kind, const Term &t1, const Term &t2) {
+    return $self->mk_term(kind, {t1, t2}, {});
   }
-  static Term mk_term(Kind kind, const Term &t1, const Term &t2, int i1, int i2) {
-    return bitwuzla::mk_term(kind, {t1, t2}, {(uint64_t) i1, (uint64_t) i2});
+  Term mk_term(Kind kind, const Term &t1, const Term &t2, int i1) {
+    return $self->mk_term(kind, {t1, t2}, {(uint64_t) i1});
   }
-  static Term mk_term(Kind kind, const Term &t1, const Term &t2, const Term &t3) {
-    return bitwuzla::mk_term(kind, {t1, t2, t3}, {});
+  Term mk_term(Kind kind, const Term &t1, const Term &t2, int i1, int i2) {
+    return $self->mk_term(kind, {t1, t2}, {(uint64_t) i1, (uint64_t) i2});
   }
-  static Term mk_term(Kind kind, const std::vector<Term> &args) {
-    return bitwuzla::mk_term(kind, args, {});
+  Term mk_term(Kind kind, const Term &t1, const Term &t2, const Term &t3) {
+    return $self->mk_term(kind, {t1, t2, t3}, {});
   }
-  static Term mk_term(Kind kind, const std::vector<Term> &args, const std::vector<int> &indices) {
+  Term mk_term(Kind kind, const std::vector<Term> &args, const std::vector<int> &indices) {
     std::vector<uint64_t> unsigned_indices;
     for (auto i : indices) {
       unsigned_indices.emplace_back((uint64_t) i);
     }
-    return bitwuzla::mk_term(kind, args, unsigned_indices);
-  }
-}
-%ignore mk_const(const Sort &, std::optional<const std::string> = std::nullopt);
-%extend Bitwuzla {
-  static Term mk_const(const Sort &sort) {
-    return bitwuzla::mk_const(sort, std::nullopt);
-  }
-  static Term mk_const(const Sort &sort, std::string symbol) {
-    return bitwuzla::mk_const(sort, symbol);
+    return $self->mk_term(kind, args, unsigned_indices);
   }
 }
-%ignore mk_var(const Sort &, std::optional<const std::string> = std::nullopt);
-%extend Bitwuzla {
-  static Term mk_var(const Sort &sort) {
-    return bitwuzla::mk_var(sort, std::nullopt);
-  }
-  static Term mk_var(const Sort &sort, std::string symbol) {
-    return bitwuzla::mk_var(sort, symbol);
-  }
-}
-
-// Substitution: This will change the term itself!
-%ignore substitute_terms (std::vector<Term> &, const std::unordered_map<Term,Term> &);
-%ignore substitute_term (const Term &, const std::unordered_map<Term, Term> &);
-%extend Term {
-  Term substitute(const std::unordered_map<Term, Term> &map) {
-    return bitwuzla::substitute_term(*$self, map);
-  }
-}
-
-/** Sort */
-%rename(toString) Sort::str;
-
-%ignore Sort::uninterpreted_symbol() const;
-%ignore Sort::is_uninterpreted() const;
-
-%ignore Sort::id() const;
-%extend Sort {
-  int id() {
-    return (int) $self->id();
+%ignore TermManager::mk_const(const Sort &sort, const std::optional<std::string> &symbol=std::nullopt);
+%extend TermManager {
+  Term mk_const(const Sort &sort) {
+    return $self->mk_const(sort, std::nullopt);
   }
-}
-
-%ignore Sort::bv_size() const;
-%extend Sort {
-  int bv_size() {
-    return (int) $self->bv_size();
+  Term mk_const(const Sort &sort, std::string symbol) {
+    return $self->mk_const(sort, symbol);
   }
 }
-
-%ignore Sort::fp_exp_size() const;
-%ignore Sort::fp_sig_size() const;
-%extend Sort {
-  int fp_exp_size() {
-    return (int) $self->fp_exp_size();
+%ignore TermManager::mk_var(const Sort &sort, const std::optional<std::string> &symbol=std::nullopt);
+%extend TermManager {
+  Term mk_var(const Sort &sort) {
+    return $self->mk_var(sort, std::nullopt);
   }
-  int fp_sig_size() {
-    return (int) $self->fp_sig_size();
+  Term mk_var(const Sort &sort, std::string symbol) {
+    return $self->mk_var(sort, symbol);
   }
 }
 
-%ignore Sort::fun_arity() const;
-%extend Sort {
-  int fun_arity() {
-    return (int) $self->fun_arity();
-  }
-}
-
-%ignore operator==(const Sort &a, const Sort &b);
-%ignore operator!=(const Sort &a, const Sort &b);
-%ignore operator<< (std::ostream &out, const Sort &sort);
-%extend Sort {
-  int hashCode() {
-    std::hash<bitwuzla::Sort> f;
-    return (int) f(*$self);
-  }
-  bool isEqual(Sort other) {
-    return operator==(*$self, other);
-  }
-}
-
-%typemap(javacode) Sort %{
-  public boolean equals(Object object) {
-    if(object instanceof $javaclassname) {
-      Sort that = ($javaclassname) object;
-      return this.isEqual(that);
-    }
-    return false;
-  }
-%}
-
-// Add static methods for sort creation
-%ignore mk_array_sort(const Sort &, const Sort &);
-%extend Bitwuzla {
-   static Sort mk_array_sort(const Sort &index, const Sort &element) {
-     return bitwuzla::mk_array_sort(index, element);
-  }
-}
-%ignore mk_bool_sort();
-%extend Bitwuzla {
-   static Sort mk_bool_sort() {
-     return bitwuzla::mk_bool_sort();
-  }
- }
-%ignore mk_bv_sort(uint64_t);
-%extend Bitwuzla {
-  static Sort mk_bv_sort(int size) {
-    return bitwuzla::mk_bv_sort(size);
-  }
-}
-%ignore mk_fp_sort(uint64_t, uint64_t);
-%extend Bitwuzla {
-  static Sort mk_fp_sort(int exp_size, int sig_size) {
-    return bitwuzla::mk_fp_sort(exp_size, sig_size);
-  }
-}
-%ignore mk_fun_sort(const std::vector<Sort> &, const Sort &);
-%extend Bitwuzla {
-  static Sort mk_fun_sort(const std::vector<Sort> &domain, const Sort &codomain) {
-    return bitwuzla::mk_fun_sort(domain, codomain);
-  }
-}
-
-%ignore mk_uninterpreted_sort(std::optional<const std::string> = std::nullopt);
-%ignore mk_rm_sort();
-
-/** Terminator */
-%insert("runtime") %{
-#define SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON
-%}
-
-%feature("director") Terminator;
-
 /** Bitwuzla */
+%ignore Bitwuzla::Bitwuzla(const Options &options = Options());
 %ignore Bitwuzla::is_unsat_assumption (const Term &term);
 %ignore Bitwuzla::print_formula (std::ostream &out, const std::string &format="smt2") const;
 %extend Bitwuzla {
@@ -574,6 +379,11 @@ namespace bitwuzla {
 %include "include/bitwuzla/cpp/bitwuzla.h"
 
 namespace bitwuzla::parser {
+%ignore Parser::Parser(TermManager &tm, Options &options, const std::string &language, std::ostream *out);
+%ignore Parser::Parser(TermManager &tm, Options &options, std::ostream *out);
+
+%ignore Parser::parse(const std::string &infile_name, std::istream &input, bool parse_only=false);
+
 %exception {
   try {
     $action
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
index 24f6c41094..e336f34596 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
@@ -12,26 +12,28 @@
 import org.sosy_lab.java_smt.api.FormulaType;
 import org.sosy_lab.java_smt.api.FormulaType.ArrayFormulaType;
 import org.sosy_lab.java_smt.basicimpl.AbstractArrayFormulaManager;
-import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.TermManager;
 
 public class BitwuzlaArrayFormulaManager
     extends AbstractArrayFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
+  private final TermManager termManager;
 
   protected BitwuzlaArrayFormulaManager(BitwuzlaFormulaCreator pCreator) {
     super(pCreator);
+    termManager = pCreator.getTermManager();
   }
 
   @Override
   protected Term select(Term pArray, Term pIndex) {
-    return Bitwuzla.mk_term(Kind.ARRAY_SELECT, pArray, pIndex);
+    return termManager.mk_term(Kind.ARRAY_SELECT, pArray, pIndex);
   }
 
   @Override
   protected Term store(Term pArray, Term pIndex, Term pValue) {
-    return Bitwuzla.mk_term(Kind.ARRAY_STORE, pArray, pIndex, pValue);
+    return termManager.mk_term(Kind.ARRAY_STORE, pArray, pIndex, pValue);
   }
 
   @Override
@@ -47,6 +49,6 @@ protected <TI extends Formula, TE extends Formula> Term internalMakeArray(
 
   @Override
   protected Term equivalence(Term pArray1, Term pArray2) {
-    return Bitwuzla.mk_term(Kind.EQUAL, pArray1, pArray2);
+    return termManager.mk_term(Kind.EQUAL, pArray1, pArray2);
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
index 39455198d4..e9eafc6191 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
@@ -11,19 +11,21 @@
 import java.math.BigInteger;
 import org.sosy_lab.java_smt.basicimpl.AbstractBitvectorFormulaManager;
 import org.sosy_lab.java_smt.basicimpl.AbstractBooleanFormulaManager;
-import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
-import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.TermManager;
 
 public class BitwuzlaBitvectorFormulaManager
     extends AbstractBitvectorFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
 
+  private final TermManager termManager;
+
   protected BitwuzlaBitvectorFormulaManager(
-      FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator,
+      BitwuzlaFormulaCreator pCreator,
       AbstractBooleanFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> pBmgr) {
     super(pCreator, pBmgr);
+    termManager = pCreator.getTermManager();
   }
 
   @Override
@@ -34,8 +36,8 @@ protected Term makeBitvectorImpl(int length, Term pParam1) {
   @Override
   protected Term makeBitvectorImpl(int length, BigInteger pI) {
     pI = transformValueToRange(length, pI);
-    Sort sort = Bitwuzla.mk_bv_sort(length);
-    return Bitwuzla.mk_bv_value(sort, pI.toString(), 10);
+    Sort sort = termManager.mk_bv_sort(length);
+    return termManager.mk_bv_value(sort, pI.toString(), (short) 10);
   }
 
   @Override
@@ -45,139 +47,139 @@ protected Term toIntegerFormulaImpl(Term pI, boolean signed) {
 
   @Override
   protected Term negate(Term pParam1) {
-    return Bitwuzla.mk_term(Kind.BV_NEG, pParam1);
+    return termManager.mk_term(Kind.BV_NEG, pParam1);
   }
 
   @Override
   protected Term add(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.BV_ADD, pParam1, pParam2);
+    return termManager.mk_term(Kind.BV_ADD, pParam1, pParam2);
   }
 
   @Override
   protected Term subtract(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.BV_SUB, pParam1, pParam2);
+    return termManager.mk_term(Kind.BV_SUB, pParam1, pParam2);
   }
 
   @Override
   protected Term divide(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return Bitwuzla.mk_term(Kind.BV_SDIV, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_SDIV, pParam1, pParam2);
     } else {
-      return Bitwuzla.mk_term(Kind.BV_UDIV, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_UDIV, pParam1, pParam2);
     }
   }
 
   @Override
   protected Term modulo(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return Bitwuzla.mk_term(Kind.BV_SREM, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_SREM, pParam1, pParam2);
     } else {
-      return Bitwuzla.mk_term(Kind.BV_UREM, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_UREM, pParam1, pParam2);
     }
   }
 
   @Override
   protected Term multiply(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.BV_MUL, pParam1, pParam2);
+    return termManager.mk_term(Kind.BV_MUL, pParam1, pParam2);
   }
 
   @Override
   protected Term equal(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.EQUAL, pParam1, pParam2);
+    return termManager.mk_term(Kind.EQUAL, pParam1, pParam2);
   }
 
   @Override
   protected Term greaterThan(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return Bitwuzla.mk_term(Kind.BV_SGT, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_SGT, pParam1, pParam2);
     } else {
-      return Bitwuzla.mk_term(Kind.BV_UGT, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_UGT, pParam1, pParam2);
     }
   }
 
   @Override
   protected Term greaterOrEquals(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return Bitwuzla.mk_term(Kind.BV_SGE, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_SGE, pParam1, pParam2);
     } else {
-      return Bitwuzla.mk_term(Kind.BV_UGE, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_UGE, pParam1, pParam2);
     }
   }
 
   @Override
   protected Term lessThan(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return Bitwuzla.mk_term(Kind.BV_SLT, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_SLT, pParam1, pParam2);
     } else {
-      return Bitwuzla.mk_term(Kind.BV_ULT, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_ULT, pParam1, pParam2);
     }
   }
 
   @Override
   protected Term lessOrEquals(Term pParam1, Term pParam2, boolean signed) {
     if (signed) {
-      return Bitwuzla.mk_term(Kind.BV_SLE, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_SLE, pParam1, pParam2);
     } else {
-      return Bitwuzla.mk_term(Kind.BV_ULE, pParam1, pParam2);
+      return termManager.mk_term(Kind.BV_ULE, pParam1, pParam2);
     }
   }
 
   @Override
   protected Term not(Term pParam1) {
-    return Bitwuzla.mk_term(Kind.BV_NOT, pParam1);
+    return termManager.mk_term(Kind.BV_NOT, pParam1);
   }
 
   @Override
   protected Term and(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.BV_AND, pParam1, pParam2);
+    return termManager.mk_term(Kind.BV_AND, pParam1, pParam2);
   }
 
   @Override
   protected Term or(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.BV_OR, pParam1, pParam2);
+    return termManager.mk_term(Kind.BV_OR, pParam1, pParam2);
   }
 
   @Override
   protected Term xor(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.BV_XOR, pParam1, pParam2);
+    return termManager.mk_term(Kind.BV_XOR, pParam1, pParam2);
   }
 
   @Override
   protected Term makeVariableImpl(int pLength, String pVar) {
-    Sort sort = Bitwuzla.mk_bv_sort(pLength);
+    Sort sort = termManager.mk_bv_sort(pLength);
     return getFormulaCreator().makeVariable(sort, pVar);
   }
 
   @Override
   protected Term shiftRight(Term pNumber, Term toShift, boolean signed) {
     if (signed) {
-      return Bitwuzla.mk_term(Kind.BV_ASHR, pNumber, toShift);
+      return termManager.mk_term(Kind.BV_ASHR, pNumber, toShift);
     } else {
-      return Bitwuzla.mk_term(Kind.BV_SHR, pNumber, toShift);
+      return termManager.mk_term(Kind.BV_SHR, pNumber, toShift);
     }
   }
 
   @Override
   protected Term shiftLeft(Term pNumber, Term toShift) {
-    return Bitwuzla.mk_term(Kind.BV_SHL, pNumber, toShift);
+    return termManager.mk_term(Kind.BV_SHL, pNumber, toShift);
   }
 
   @Override
   protected Term concat(Term number, Term pAppend) {
-    return Bitwuzla.mk_term(Kind.BV_CONCAT, number, pAppend);
+    return termManager.mk_term(Kind.BV_CONCAT, number, pAppend);
   }
 
   @Override
   protected Term extract(Term pNumber, int pMsb, int pLsb) {
-    return Bitwuzla.mk_term(Kind.BV_EXTRACT, pNumber, pMsb, pLsb);
+    return termManager.mk_term(Kind.BV_EXTRACT, pNumber, pMsb, pLsb);
   }
 
   @Override
   protected Term extend(Term pNumber, int pExtensionBits, boolean pSigned) {
     if (pSigned) {
-      return Bitwuzla.mk_term(Kind.BV_SIGN_EXTEND, pNumber, pExtensionBits);
+      return termManager.mk_term(Kind.BV_SIGN_EXTEND, pNumber, pExtensionBits);
     } else {
-      return Bitwuzla.mk_term(Kind.BV_ZERO_EXTEND, pNumber, pExtensionBits);
+      return termManager.mk_term(Kind.BV_ZERO_EXTEND, pNumber, pExtensionBits);
     }
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
index be34898423..4f6b222f3c 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
@@ -9,24 +9,24 @@
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
 import org.sosy_lab.java_smt.basicimpl.AbstractBooleanFormulaManager;
-import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
-import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.TermManager;
 
 public class BitwuzlaBooleanFormulaManager
     extends AbstractBooleanFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
-  // private final long bitwuzla;
+  private final TermManager termManager;
+
   private final Term pTrue;
   private final Term pFalse;
 
   protected BitwuzlaBooleanFormulaManager(
-      FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator) {
+      BitwuzlaFormulaCreator pCreator) {
     super(pCreator);
-    // bitwuzla = getFormulaCreator().getEnv();
-    pTrue = Bitwuzla.mk_true();
-    pFalse = Bitwuzla.mk_false();
+    termManager = pCreator.getTermManager();
+    pTrue = termManager.mk_true();
+    pFalse = termManager.mk_false();
   }
 
   @Override
@@ -51,7 +51,7 @@ protected Term not(Term pParam1) {
     if (pParam1.kind() == Kind.NOT) {
       return pParam1.get(0);
     }
-    return Bitwuzla.mk_term(Kind.NOT, pParam1);
+    return termManager.mk_term(Kind.NOT, pParam1);
   }
 
   @Override
@@ -67,7 +67,7 @@ protected Term and(Term pParam1, Term pParam2) {
     } else if (pParam1.equals(pParam2)) {
       return pParam1;
     }
-    return Bitwuzla.mk_term(Kind.AND, pParam1, pParam2);
+    return termManager.mk_term(Kind.AND, pParam1, pParam2);
   }
 
   @Override
@@ -83,17 +83,17 @@ protected Term or(Term pParam1, Term pParam2) {
     } else if (pParam1.equals(pParam2)) {
       return pParam1;
     }
-    return Bitwuzla.mk_term(Kind.OR, pParam1, pParam2);
+    return termManager.mk_term(Kind.OR, pParam1, pParam2);
   }
 
   @Override
   protected Term xor(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.XOR, pParam1, pParam2);
+    return termManager.mk_term(Kind.XOR, pParam1, pParam2);
   }
 
   @Override
   protected Term equivalence(Term bits1, Term bits2) {
-    return Bitwuzla.mk_term(Kind.IFF, bits1, bits2);
+    return termManager.mk_term(Kind.IFF, bits1, bits2);
   }
 
   @Override
@@ -119,6 +119,6 @@ protected Term ifThenElse(Term pCond, Term pF1, Term pF2) {
     } else if (isFalse(pF1) && isTrue(pF2)) {
       return not(pCond);
     }
-    return Bitwuzla.mk_term(Kind.ITE, pCond, pF1, pF2);
+    return termManager.mk_term(Kind.ITE, pCond, pF1, pF2);
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index c87eb1d9e2..b4893a5e6b 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -16,21 +16,22 @@
 import org.sosy_lab.java_smt.api.FormulaType;
 import org.sosy_lab.java_smt.api.FormulaType.FloatingPointType;
 import org.sosy_lab.java_smt.basicimpl.AbstractFloatingPointFormulaManager;
-import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
-import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.RoundingMode;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.TermManager;
 
 public class BitwuzlaFloatingPointManager
     extends AbstractFloatingPointFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
+  private final TermManager termManager;
   private final Term roundingMode;
 
   protected BitwuzlaFloatingPointManager(
-      FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator,
+      BitwuzlaFormulaCreator pCreator,
       FloatingPointRoundingMode pFloatingPointRoundingMode) {
     super(pCreator);
+    termManager = pCreator.getTermManager();
     roundingMode = getRoundingModeImpl(pFloatingPointRoundingMode);
   }
 
@@ -44,19 +45,19 @@ protected Term getRoundingModeImpl(FloatingPointRoundingMode pFloatingPointRound
     Term out;
     switch (pFloatingPointRoundingMode) {
       case NEAREST_TIES_TO_EVEN:
-        out = Bitwuzla.mk_rm_value(RoundingMode.RNE);
+        out = termManager.mk_rm_value(RoundingMode.RNE);
         break;
       case NEAREST_TIES_AWAY:
-        out = Bitwuzla.mk_rm_value(RoundingMode.RNA);
+        out = termManager.mk_rm_value(RoundingMode.RNA);
         break;
       case TOWARD_POSITIVE:
-        out = Bitwuzla.mk_rm_value(RoundingMode.RTP);
+        out = termManager.mk_rm_value(RoundingMode.RTP);
         break;
       case TOWARD_NEGATIVE:
-        out = Bitwuzla.mk_rm_value(RoundingMode.RTN);
+        out = termManager.mk_rm_value(RoundingMode.RTN);
         break;
       case TOWARD_ZERO:
-        out = Bitwuzla.mk_rm_value(RoundingMode.RTZ);
+        out = termManager.mk_rm_value(RoundingMode.RTZ);
         break;
       default:
         throw new AssertionError("Unexpected value");
@@ -83,7 +84,7 @@ private Sort mkFpaSort(FloatingPointType pType) {
   @Override
   protected Term makeNumberAndRound(
       String pN, FloatingPointType pType, Term pFloatingPointRoundingMode) {
-    return Bitwuzla.mk_fp_value(mkFpaSort(pType), pFloatingPointRoundingMode, pN);
+    return termManager.parse_fp_value(mkFpaSort(pType), pFloatingPointRoundingMode, pN);
   }
 
   @Override
@@ -93,17 +94,17 @@ protected Term makeVariableImpl(String pVar, FloatingPointType pType) {
 
   @Override
   protected Term makePlusInfinityImpl(FloatingPointType pType) {
-    return Bitwuzla.mk_fp_pos_inf(mkFpaSort(pType));
+    return termManager.mk_fp_pos_inf(mkFpaSort(pType));
   }
 
   @Override
   protected Term makeMinusInfinityImpl(FloatingPointType pType) {
-    return Bitwuzla.mk_fp_neg_inf(mkFpaSort(pType));
+    return termManager.mk_fp_neg_inf(mkFpaSort(pType));
   }
 
   @Override
   protected Term makeNaNImpl(FloatingPointType pType) {
-    return Bitwuzla.mk_fp_nan(mkFpaSort(pType));
+    return termManager.mk_fp_nan(mkFpaSort(pType));
   }
 
   @Override
@@ -111,7 +112,7 @@ protected Term castToImpl(
       Term pNumber, boolean pSigned, FormulaType<?> pTargetType, Term pRoundingMode) {
     if (pTargetType.isFloatingPointType()) {
       FormulaType.FloatingPointType targetType = (FormulaType.FloatingPointType) pTargetType;
-      return Bitwuzla.mk_term(
+      return termManager.mk_term(
           Kind.FP_TO_FP_FROM_FP,
           pRoundingMode,
           pNumber,
@@ -120,9 +121,9 @@ protected Term castToImpl(
     } else if (pTargetType.isBitvectorType()) {
       FormulaType.BitvectorType targetType = (FormulaType.BitvectorType) pTargetType;
       if (pSigned) {
-        return Bitwuzla.mk_term(Kind.FP_TO_SBV, pRoundingMode, pNumber, targetType.getSize());
+        return termManager.mk_term(Kind.FP_TO_SBV, pRoundingMode, pNumber, targetType.getSize());
       } else {
-        return Bitwuzla.mk_term(Kind.FP_TO_UBV, pRoundingMode, pNumber, targetType.getSize());
+        return termManager.mk_term(Kind.FP_TO_UBV, pRoundingMode, pNumber, targetType.getSize());
       }
     } else {
       throw new UnsupportedOperationException("Attempted cast to an unsupported type.");
@@ -137,14 +138,14 @@ protected Term castFromImpl(
       return castToImpl(pNumber, pSigned, pTargetType, pRoundingMode);
     } else if (formulaType.isBitvectorType()) {
       if (pSigned) {
-        return Bitwuzla.mk_term(
+        return termManager.mk_term(
             Kind.FP_TO_FP_FROM_SBV,
             roundingMode,
             pNumber,
             pTargetType.getExponentSize(),
             pTargetType.getMantissaSize() + 1);
       } else {
-        return Bitwuzla.mk_term(
+        return termManager.mk_term(
             Kind.FP_TO_FP_FROM_UBV,
             roundingMode,
             pNumber,
@@ -159,7 +160,7 @@ protected Term castFromImpl(
 
   @Override
   protected Term fromIeeeBitvectorImpl(Term pNumber, FloatingPointType pTargetType) {
-    return Bitwuzla.mk_term(
+    return termManager.mk_term(
         Kind.FP_TO_FP_FROM_BV,
         pNumber,
         pTargetType.getExponentSize(),
@@ -187,23 +188,23 @@ protected Term toIeeeBitvectorImpl(Term pNumber) {
     int sizeExp = pNumber.sort().fp_exp_size();
     int sizeSig = pNumber.sort().fp_sig_size();
 
-    Sort bvSort = Bitwuzla.mk_bv_sort(sizeExp + sizeSig);
+    Sort bvSort = termManager.mk_bv_sort(sizeExp + sizeSig);
 
     // Note that NaN is handled as a special case in this method. This is not strictly necessary,
     // but if we just use "fpTerm = to_fp(bvVar)" the NaN will be given a random payload (and
     // sign). Since NaN payloads are not preserved here anyway we might as well pick a canonical
     // representation.
     Term bvNaN =
-        Bitwuzla.mk_bv_value(bvSort, "0" + "1".repeat(sizeExp + 1) + "0".repeat(sizeSig - 2));
-    Term bvVar = Bitwuzla.mk_const(bvSort, generateRandomName("toIeeeBitvector", 10));
+        termManager.mk_bv_value(bvSort, "0" + "1".repeat(sizeExp + 1) + "0".repeat(sizeSig - 2));
+    Term bvVar = termManager.mk_const(bvSort, generateRandomName("toIeeeBitvector", 10));
     Term equal =
-        Bitwuzla.mk_term(
+        termManager.mk_term(
             Kind.ITE,
-            Bitwuzla.mk_term(Kind.FP_IS_NAN, pNumber),
-            Bitwuzla.mk_term(Kind.EQUAL, bvVar, bvNaN),
-            Bitwuzla.mk_term(
+            termManager.mk_term(Kind.FP_IS_NAN, pNumber),
+            termManager.mk_term(Kind.EQUAL, bvVar, bvNaN),
+            termManager.mk_term(
                 Kind.EQUAL,
-                Bitwuzla.mk_term(Kind.FP_TO_FP_FROM_BV, bvVar, sizeExp, sizeSig),
+                termManager.mk_term(Kind.FP_TO_FP_FROM_BV, bvVar, sizeExp, sizeSig),
                 pNumber));
 
     BitwuzlaFormulaCreator.addVariableCast(equal);
@@ -212,112 +213,112 @@ protected Term toIeeeBitvectorImpl(Term pNumber) {
 
   @Override
   protected Term negate(Term pParam1) {
-    return Bitwuzla.mk_term(Kind.FP_NEG, pParam1);
+    return termManager.mk_term(Kind.FP_NEG, pParam1);
   }
 
   @Override
   protected Term abs(Term pParam1) {
-    return Bitwuzla.mk_term(Kind.FP_ABS, pParam1);
+    return termManager.mk_term(Kind.FP_ABS, pParam1);
   }
 
   @Override
   protected Term max(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.FP_MAX, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_MAX, pParam1, pParam2);
   }
 
   @Override
   protected Term min(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.FP_MIN, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_MIN, pParam1, pParam2);
   }
 
   @Override
   protected Term sqrt(Term pNumber, Term pRoundingMode) {
-    return Bitwuzla.mk_term(Kind.FP_SQRT, pRoundingMode, pNumber);
+    return termManager.mk_term(Kind.FP_SQRT, pRoundingMode, pNumber);
   }
 
   @Override
   protected Term add(Term pParam1, Term pParam2, Term pRoundingMode) {
-    return Bitwuzla.mk_term(Kind.FP_ADD, pRoundingMode, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_ADD, pRoundingMode, pParam1, pParam2);
   }
 
   @Override
   protected Term subtract(Term pParam1, Term pParam2, Term pFloatingPointRoundingMode) {
-    return Bitwuzla.mk_term(Kind.FP_SUB, pFloatingPointRoundingMode, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_SUB, pFloatingPointRoundingMode, pParam1, pParam2);
   }
 
   @Override
   protected Term divide(Term pParam1, Term pParam2, Term pFloatingPointRoundingMode) {
-    return Bitwuzla.mk_term(Kind.FP_DIV, pFloatingPointRoundingMode, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_DIV, pFloatingPointRoundingMode, pParam1, pParam2);
   }
 
   @Override
   protected Term multiply(Term pParam1, Term pParam2, Term pFloatingPointRoundingMode) {
-    return Bitwuzla.mk_term(Kind.FP_MUL, pFloatingPointRoundingMode, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_MUL, pFloatingPointRoundingMode, pParam1, pParam2);
   }
 
   @Override
   protected Term assignment(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.EQUAL, pParam1, pParam2);
+    return termManager.mk_term(Kind.EQUAL, pParam1, pParam2);
   }
 
   @Override
   protected Term equalWithFPSemantics(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.FP_EQUAL, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_EQUAL, pParam1, pParam2);
   }
 
   @Override
   protected Term greaterThan(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.FP_GT, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_GT, pParam1, pParam2);
   }
 
   @Override
   protected Term greaterOrEquals(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.FP_GEQ, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_GEQ, pParam1, pParam2);
   }
 
   @Override
   protected Term lessThan(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.FP_LT, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_LT, pParam1, pParam2);
   }
 
   @Override
   protected Term lessOrEquals(Term pParam1, Term pParam2) {
-    return Bitwuzla.mk_term(Kind.FP_LEQ, pParam1, pParam2);
+    return termManager.mk_term(Kind.FP_LEQ, pParam1, pParam2);
   }
 
   @Override
   protected Term isNaN(Term pParam) {
-    return Bitwuzla.mk_term(Kind.FP_IS_NAN, pParam);
+    return termManager.mk_term(Kind.FP_IS_NAN, pParam);
   }
 
   @Override
   protected Term isInfinity(Term pParam) {
-    return Bitwuzla.mk_term(Kind.FP_IS_INF, pParam);
+    return termManager.mk_term(Kind.FP_IS_INF, pParam);
   }
 
   @Override
   protected Term isZero(Term pParam) {
-    return Bitwuzla.mk_term(Kind.FP_IS_ZERO, pParam);
+    return termManager.mk_term(Kind.FP_IS_ZERO, pParam);
   }
 
   @Override
   protected Term isSubnormal(Term pParam) {
-    return Bitwuzla.mk_term(Kind.FP_IS_SUBNORMAL, pParam);
+    return termManager.mk_term(Kind.FP_IS_SUBNORMAL, pParam);
   }
 
   @Override
   protected Term isNormal(Term pParam) {
-    return Bitwuzla.mk_term(Kind.FP_IS_NORMAL, pParam);
+    return termManager.mk_term(Kind.FP_IS_NORMAL, pParam);
   }
 
   @Override
   protected Term isNegative(Term pParam) {
-    return Bitwuzla.mk_term(Kind.FP_IS_NEG, pParam);
+    return termManager.mk_term(Kind.FP_IS_NEG, pParam);
   }
 
   @Override
   protected Term round(Term pFormula, FloatingPointRoundingMode pRoundingMode) {
     Term rm = getRoundingModeImpl(pRoundingMode);
-    return Bitwuzla.mk_term(Kind.FP_RTI, rm, pFormula);
+    return termManager.mk_term(Kind.FP_RTI, rm, pFormula);
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index 8186b3bb2d..7f1e27165d 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -41,15 +41,18 @@
 import org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaFormula.BitwuzlaBooleanFormula;
 import org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaFormula.BitwuzlaFloatingPointFormula;
 import org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaFormula.BitwuzlaFloatingPointRoundingModeFormula;
-import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Map_TermTerm;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.TermManager;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Int;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Sort;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
 public class BitwuzlaFormulaCreator extends FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> {
+  private final TermManager termManager;
+  
   private final Table<String, Sort, Term> formulaCache = HashBasedTable.create();
 
   // Bitwuzla has no operation for casting floats to bitvectors. We need to use a workaround
@@ -60,13 +63,18 @@ public class BitwuzlaFormulaCreator extends FormulaCreator<Term, Sort, Void, Bit
   // to store all equations.
   private static final Collection<Term> variableCasts = new HashSet<>();
 
-  protected BitwuzlaFormulaCreator() {
-    super(null, Bitwuzla.mk_bool_sort(), null, null, null, null);
+  protected BitwuzlaFormulaCreator(TermManager pTermManager) {
+    super(null, pTermManager.mk_bool_sort(), null, null, null, null);
+    termManager= pTermManager;
+  }
+
+  TermManager getTermManager() {
+    return termManager;
   }
 
   @Override
   public Sort getBitvectorType(int bitwidth) {
-    return Bitwuzla.mk_bv_sort(bitwidth);
+    return termManager.mk_bv_sort(bitwidth);
   }
 
   @Override
@@ -80,7 +88,7 @@ assert getFormulaType(pTerm).isBitvectorType()
   // system instead use bitwuzla_mk_fp_value_from_real somehow or convert myself
   @Override
   public Sort getFloatingPointType(FloatingPointType type) {
-    return Bitwuzla.mk_fp_sort(type.getExponentSize(), type.getMantissaSize() + 1);
+    return termManager.mk_fp_sort(type.getExponentSize(), type.getMantissaSize() + 1);
   }
 
   @Override
@@ -99,7 +107,7 @@ protected <TI extends Formula, TE extends Formula> FormulaType<TI> getArrayFormu
 
   @Override
   public Sort getArrayType(Sort indexType, Sort elementType) {
-    return Bitwuzla.mk_array_sort(indexType, elementType);
+    return termManager.mk_array_sort(indexType, elementType);
   }
 
   @Override
@@ -125,7 +133,7 @@ public Term makeVariable(Sort pSort, String varName) {
       return maybeFormula;
     }
 
-    Term newVar = Bitwuzla.mk_const(pSort, varName);
+    Term newVar = termManager.mk_const(pSort, varName);
     formulaCache.put(varName, pSort, newVar);
     return newVar;
   }
@@ -139,7 +147,7 @@ public Term makeBoundVariable(Term var) {
     // return maybeVar;
     // }
 
-    Term newVar = Bitwuzla.mk_var(sort, name);
+    Term newVar = termManager.mk_var(sort, name);
     // boundFormulaCache.put(name, sort, newVar);
     return newVar;
   }
@@ -402,7 +410,7 @@ public <R> R visit(FormulaVisitor<R> visitor, Formula formula, Term f)
       for (int i = 0; i < boundVars.length; i++) {
         map.put(boundVars[i], freeVars[i]);
       }
-      body = body.substitute(map);
+      body = termManager.substitute_term(body, map);
 
       Quantifier quant = kind.equals(Kind.EXISTS) ? Quantifier.EXISTS : Quantifier.FORALL;
       return visitor.visitQuantifier(
@@ -458,19 +466,19 @@ public Term callFunctionImpl(BitwuzlaDeclaration declaration, List<Term> args) {
       // The term might be indexed, then we need index creation
       Term term = declaration.getTerm();
       Kind properKind = term.kind();
-      return Bitwuzla.mk_term(properKind, new Vector_Term(args), term.indices());
+      return termManager.mk_term(properKind, new Vector_Term(args), term.indices());
     }
 
     if (!declaration.isKind() && declaration.getTerm().sort().is_fun()) {
       Vector_Term functionAndArgs = new Vector_Term();
       functionAndArgs.add(declaration.getTerm());
       functionAndArgs.addAll(args);
-      return Bitwuzla.mk_term(Kind.APPLY, functionAndArgs);
+      return termManager.mk_term(Kind.APPLY, functionAndArgs, new Vector_Int());
     }
 
     assert declaration.isKind();
 
-    return Bitwuzla.mk_term(declaration.getKind(), new Vector_Term(args));
+    return termManager.mk_term(declaration.getKind(), new Vector_Term(args), new Vector_Int());
   }
 
   @Override
@@ -480,14 +488,14 @@ public BitwuzlaDeclaration declareUFImpl(String name, Sort pReturnType, List<Sor
       // TODO: implement
       throw new UnsupportedOperationException("Bitwuzla does not support 0 arity UFs.");
     }
-    Sort functionSort = Bitwuzla.mk_fun_sort(new Vector_Sort(pArgTypes), pReturnType);
+    Sort functionSort = termManager.mk_fun_sort(new Vector_Sort(pArgTypes), pReturnType);
 
     Term maybeFormula = formulaCache.get(name, functionSort);
     if (maybeFormula != null) {
       return new BitwuzlaDeclaration(maybeFormula);
     }
 
-    Term uf = Bitwuzla.mk_const(functionSort, name);
+    Term uf = termManager.mk_const(functionSort, name);
     formulaCache.put(name, functionSort, uf);
     return new BitwuzlaDeclaration(uf);
   }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index 34bce15df8..7045886ba6 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -69,7 +69,7 @@ public BooleanFormula parse(String formulaStr) throws IllegalArgumentException {
       s = s.replace("(exit)", "");
     }
 
-    Parser parser = new Parser(bitwuzlaOption);
+    Parser parser = new Parser(creator.getTermManager(), bitwuzlaOption);
     parser.parse(s, true, false);
 
     Vector_Term assertions = parser.bitwuzla().get_assertions();
@@ -89,7 +89,8 @@ public Appender dumpFormula(Term pTerm) {
     return new Appenders.AbstractAppender() {
       @Override
       public void appendTo(Appendable out) throws IOException {
-        Bitwuzla bitwuzla = new Bitwuzla(); // TODO: It would be better to keep this instance around
+        // TODO: It would be better to keep this instance around
+        Bitwuzla bitwuzla = new Bitwuzla(creator.getTermManager());
         for (Term t : BitwuzlaFormulaCreator.getVariableCasts()) {
           bitwuzla.assert_formula(t);
         }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
index 01ceb05494..004f0ce850 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
@@ -204,7 +204,7 @@ private Term buildEqForTwoTerms(Term left, Term right) {
     if (left.sort().is_fp()) {
       kind = Kind.FP_EQUAL;
     }
-    return Bitwuzla.mk_term(kind, left, right);
+    return bitwuzlaCreator.getTermManager().mk_term(kind, left, right);
   }
 
   private ValueAssignment getUFAssignment(Term pTerm) {
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index 7759b843fa..0f98d76313 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -28,11 +28,13 @@
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.RoundingMode;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.TermManager;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Int;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Sort;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
 public class BitwuzlaNativeApiTest {
+  private TermManager termManager;
   private Bitwuzla bitwuzla;
 
   @BeforeClass
@@ -46,8 +48,8 @@ public static void load() {
 
   @Before
   public void createEnvironment() {
-    Options options = createOptions();
-    bitwuzla = new Bitwuzla(options);
+    termManager = new TermManager();
+    bitwuzla = new Bitwuzla(termManager, createOptions());
   }
 
   private Options createOptions() {
@@ -68,23 +70,23 @@ public void freeEnvironment() {
   //@Ignore
   //@Test
   //public void functionWithNoArguments() {
-  //  Sort bool_sort = Bitwuzla.mk_bool_sort();
-  //  Term a = Bitwuzla.mk_var(bool_sort, "a");
-  //  Bitwuzla.mk_term(Kind.LAMBDA, a);
+  //  Sort bool_sort = termManager.mk_bool_sort();
+  //  Term a = termManager.mk_var(bool_sort, "a");
+  //  termManager.mk_term(Kind.LAMBDA, a);
   //}
 
   @Test
   public void signedFunctions() {
-    Sort sortbv4 = Bitwuzla.mk_bv_sort(4);
-    Sort sortbv8 = Bitwuzla.mk_bv_sort(8);
+    Sort sortbv4 = termManager.mk_bv_sort(4);
+    Sort sortbv8 = termManager.mk_bv_sort(8);
     // Create function sort.
     Sort[] domain = {sortbv8, sortbv4};
-    Sort sortfun = Bitwuzla.mk_fun_sort(new Vector_Sort(domain), sortbv8);
+    Sort sortfun = termManager.mk_fun_sort(new Vector_Sort(domain), sortbv8);
 
-    Term x = Bitwuzla.mk_const(sortbv8, "x");
-    Term f = Bitwuzla.mk_const(sortfun, "f");
+    Term x = termManager.mk_const(sortbv8, "x");
+    Term f = termManager.mk_const(sortfun, "f");
 
-    Term term = Bitwuzla.mk_term(Kind.APPLY, f, x, Bitwuzla.mk_term(Kind.BV_EXTRACT, x, 6, 3));
+    Term term = termManager.mk_term(Kind.APPLY, f, x, termManager.mk_term(Kind.BV_EXTRACT, x, 6, 3));
 
     Sort resultSort = term.sort();
 
@@ -93,7 +95,7 @@ public void signedFunctions() {
 
   @Test
   public void boolType() {
-    Sort pBoolType = Bitwuzla.mk_bool_sort();
+    Sort pBoolType = termManager.mk_bool_sort();
     assertThat(pBoolType.is_bool()).isTrue();
   }
 
@@ -101,8 +103,8 @@ public void boolType() {
   // -- This seems to be working now?
   @Test
   public void repeatedTermCreationInMultipleSolversTest() {
-    Term tru1 = Bitwuzla.mk_true();
-    Term tru12 = Bitwuzla.mk_true();
+    Term tru1 = termManager.mk_true();
+    Term tru12 = termManager.mk_true();
     assertThat(tru1.is_true()).isTrue();
     assertThat(tru12.is_true()).isTrue();
 
@@ -116,9 +118,9 @@ public void repeatedTermCreationInMultipleSolversTest() {
 
   @Test
   public void isFalse() {
-    Sort pBoolType = Bitwuzla.mk_bool_sort();
-    Term var1 = Bitwuzla.mk_const(pBoolType, "var1");
-    Term var2 = Bitwuzla.mk_const(pBoolType, "var2");
+    Sort pBoolType = termManager.mk_bool_sort();
+    Term var1 = termManager.mk_const(pBoolType, "var1");
+    Term var2 = termManager.mk_const(pBoolType, "var2");
 
     Truth.assertThat(var1.is_false()).isFalse();
     Truth.assertThat(var1.is_true()).isFalse();
@@ -128,14 +130,14 @@ public void isFalse() {
 
   @Test
   public void testBvModel() {
-    Sort bvSort = Bitwuzla.mk_bv_sort(32);
-    Term a = Bitwuzla.mk_const(bvSort, "a");
-    Term one = Bitwuzla.mk_bv_one(bvSort);
-    Term two = Bitwuzla.mk_bv_value_signed(bvSort, 2);
+    Sort bvSort = termManager.mk_bv_sort(32);
+    Term a = termManager.mk_const(bvSort, "a");
+    Term one = termManager.mk_bv_one(bvSort);
+    Term two = termManager.mk_bv_value_int64(bvSort, 2);
 
     // 1 + 2 = a
-    Term add = Bitwuzla.mk_term(Kind.BV_ADD, one, two);
-    Term eq = Bitwuzla.mk_term(Kind.EQUAL, add, a);
+    Term add = termManager.mk_term(Kind.BV_ADD, one, two);
+    Term eq = termManager.mk_term(Kind.EQUAL, add, a);
 
     bitwuzla.assert_formula(eq);
     Result res = bitwuzla.check_sat();
@@ -153,25 +155,25 @@ public void testBvModel() {
 
   @Test
   public void testBvArrayModelStore() {
-    Sort bvSort4 = Bitwuzla.mk_bv_sort(4);
-    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
-    Sort sortArr = Bitwuzla.mk_array_sort(bvSort4, bvSort8);
+    Sort bvSort4 = termManager.mk_bv_sort(4);
+    Sort bvSort8 = termManager.mk_bv_sort(8);
+    Sort sortArr = termManager.mk_array_sort(bvSort4, bvSort8);
 
-    Term var = Bitwuzla.mk_const(bvSort8, "var");
-    Term eleven = Bitwuzla.mk_bv_value_signed(bvSort8, 11);
-    Term zero = Bitwuzla.mk_bv_zero(bvSort4);
-    Term one = Bitwuzla.mk_bv_one(bvSort4);
+    Term var = termManager.mk_const(bvSort8, "var");
+    Term eleven = termManager.mk_bv_value_int64(bvSort8, 11);
+    Term zero = termManager.mk_bv_zero(bvSort4);
+    Term one = termManager.mk_bv_one(bvSort4);
 
-    Term arr = Bitwuzla.mk_const(sortArr, "arr");
+    Term arr = termManager.mk_const(sortArr, "arr");
 
     // Array arr = {11, var} AND arr[0] == arr[1] -> var == 11
-    Term arrW11At0 = Bitwuzla.mk_term(Kind.ARRAY_STORE, arr, zero, eleven);
-    Term arrWVarAt1 = Bitwuzla.mk_term(Kind.ARRAY_STORE, arrW11At0, one, var);
+    Term arrW11At0 = termManager.mk_term(Kind.ARRAY_STORE, arr, zero, eleven);
+    Term arrWVarAt1 = termManager.mk_term(Kind.ARRAY_STORE, arrW11At0, one, var);
     Term eq =
-        Bitwuzla.mk_term(
+        termManager.mk_term(
             Kind.EQUAL,
-            Bitwuzla.mk_term(Kind.ARRAY_SELECT, arrWVarAt1, one),
-            Bitwuzla.mk_term(Kind.ARRAY_SELECT, arrWVarAt1, zero));
+            termManager.mk_term(Kind.ARRAY_SELECT, arrWVarAt1, one),
+            termManager.mk_term(Kind.ARRAY_SELECT, arrWVarAt1, zero));
 
     bitwuzla.assert_formula(eq);
     Result res = bitwuzla.check_sat();
@@ -219,21 +221,21 @@ public void testBvArrayModelStore() {
 
   @Test
   public void testBvArrayModelSelect() {
-    Sort bvSort4 = Bitwuzla.mk_bv_sort(4);
-    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
-    Sort sortArr = Bitwuzla.mk_array_sort(bvSort4, bvSort8);
+    Sort bvSort4 = termManager.mk_bv_sort(4);
+    Sort bvSort8 = termManager.mk_bv_sort(8);
+    Sort sortArr = termManager.mk_array_sort(bvSort4, bvSort8);
 
-    Term eleven = Bitwuzla.mk_bv_value_signed(bvSort8, 11);
-    Term zero = Bitwuzla.mk_bv_zero(bvSort4);
-    Term one = Bitwuzla.mk_bv_one(bvSort4);
+    Term eleven = termManager.mk_bv_value_int64(bvSort8, 11);
+    Term zero = termManager.mk_bv_zero(bvSort4);
+    Term one = termManager.mk_bv_one(bvSort4);
 
-    Term arr = Bitwuzla.mk_const(sortArr, "arr");
+    Term arr = termManager.mk_const(sortArr, "arr");
 
     // Array arr[0] == (store arr[1] 11))[1]
-    Term selectArrAtZero = Bitwuzla.mk_term(Kind.ARRAY_SELECT, arr, zero);
-    Term arrWElevenAt1 = Bitwuzla.mk_term(Kind.ARRAY_STORE, arr, one, eleven);
-    Term selectArrWElevenAtOne = Bitwuzla.mk_term(Kind.ARRAY_SELECT, arrWElevenAt1, one);
-    Term eq = Bitwuzla.mk_term(Kind.EQUAL, selectArrAtZero, selectArrWElevenAtOne);
+    Term selectArrAtZero = termManager.mk_term(Kind.ARRAY_SELECT, arr, zero);
+    Term arrWElevenAt1 = termManager.mk_term(Kind.ARRAY_STORE, arr, one, eleven);
+    Term selectArrWElevenAtOne = termManager.mk_term(Kind.ARRAY_SELECT, arrWElevenAt1, one);
+    Term eq = termManager.mk_term(Kind.EQUAL, selectArrAtZero, selectArrWElevenAtOne);
 
     bitwuzla.assert_formula(eq);
     Result res = bitwuzla.check_sat();
@@ -259,18 +261,18 @@ public void testBvArrayModelSelect() {
 
   @Test
   public void testUfModel() {
-    Sort boolSort = Bitwuzla.mk_bool_sort();
-    Term res = Bitwuzla.mk_const(boolSort, "res");
-    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
-    Term arg1 = Bitwuzla.mk_const(bvSort8, "arg1");
-    Term arg2 = Bitwuzla.mk_bv_value_signed(bvSort8, 11);
+    Sort boolSort = termManager.mk_bool_sort();
+    Term res = termManager.mk_const(boolSort, "res");
+    Sort bvSort8 = termManager.mk_bv_sort(8);
+    Term arg1 = termManager.mk_const(bvSort8, "arg1");
+    Term arg2 = termManager.mk_bv_value_int64(bvSort8, 11);
     Sort[] domain = {bvSort8, bvSort8};
-    Sort sortFun = Bitwuzla.mk_fun_sort(new Vector_Sort(domain), boolSort);
+    Sort sortFun = termManager.mk_fun_sort(new Vector_Sort(domain), boolSort);
 
-    Term foo = Bitwuzla.mk_const(sortFun, "foo");
-    Term appliedFoo = Bitwuzla.mk_term(Kind.APPLY, foo, arg1, arg2);
+    Term foo = termManager.mk_const(sortFun, "foo");
+    Term appliedFoo = termManager.mk_term(Kind.APPLY, foo, arg1, arg2);
 
-    Term eq = Bitwuzla.mk_term(Kind.EQUAL, appliedFoo, res);
+    Term eq = termManager.mk_term(Kind.EQUAL, appliedFoo, res);
     bitwuzla.assert_formula(eq);
     Result result = bitwuzla.check_sat();
     assertThat(result).isEqualTo(Result.SAT);
@@ -299,14 +301,14 @@ public void testUfModel() {
 
   @Test
   public void testBoolModel() {
-    Sort boolSort = Bitwuzla.mk_bool_sort();
-    Term x = Bitwuzla.mk_const(boolSort, "x");
-    Term t = Bitwuzla.mk_true();
-    Term f = Bitwuzla.mk_false();
+    Sort boolSort = termManager.mk_bool_sort();
+    Term x = termManager.mk_const(boolSort, "x");
+    Term t = termManager.mk_true();
+    Term f = termManager.mk_false();
 
     // (x AND true) OR false
-    Term and = Bitwuzla.mk_term(Kind.AND, x, t);
-    Term or = Bitwuzla.mk_term(Kind.OR, and, f);
+    Term and = termManager.mk_term(Kind.AND, x, t);
+    Term or = termManager.mk_term(Kind.OR, and, f);
 
     bitwuzla.assert_formula(or);
     Result res = bitwuzla.check_sat();
@@ -339,16 +341,16 @@ public void testBoolModel() {
 
   @Test
   public void testFpModel() {
-    Sort fpSort = Bitwuzla.mk_fp_sort(5, 11);
-    Term rm = Bitwuzla.mk_rm_value(RoundingMode.RNE);
-    Term a = Bitwuzla.mk_const(fpSort, "a");
-    Term one = Bitwuzla.mk_fp_value(fpSort, rm, "1");
+    Sort fpSort = termManager.mk_fp_sort(5, 11);
+    Term rm = termManager.mk_rm_value(RoundingMode.RNE);
+    Term a = termManager.mk_const(fpSort, "a");
+    Term one = termManager.parse_fp_value(fpSort, rm, "1");
     // Rational with 0 (or only 0s) as the second argument crashes Bitwuzla!
-    Term two = Bitwuzla.mk_fp_value(fpSort, rm, "2", "1");
+    Term two = termManager.mk_fp_value(fpSort, rm, "2", "1");
 
     // 1 + 2 = a
-    Term add = Bitwuzla.mk_term(Kind.FP_ADD, rm, two, one);
-    Term eq = Bitwuzla.mk_term(Kind.EQUAL, add, a);
+    Term add = termManager.mk_term(Kind.FP_ADD, rm, two, one);
+    Term eq = termManager.mk_term(Kind.EQUAL, add, a);
 
     bitwuzla.assert_formula(eq);
     Result res = bitwuzla.check_sat();
@@ -368,20 +370,20 @@ public void testFpModel() {
   public void testFpToBv() {
     // A constant (BITWUZLA_KIND_CONSTANT) is both, a variable and a constant value
     // However a value is also a BITWUZLA_KIND_VALUE, while a variable is not
-    Sort fpSort = Bitwuzla.mk_fp_sort(5, 11);
-    Term rm = Bitwuzla.mk_rm_value(RoundingMode.RTZ);
-    Term a = Bitwuzla.mk_const(fpSort, "a");
-    Term one = Bitwuzla.mk_fp_value(fpSort, rm, "-1");
-    Term two = Bitwuzla.mk_fp_value(fpSort, rm, "2");
+    Sort fpSort = termManager.mk_fp_sort(5, 11);
+    Term rm = termManager.mk_rm_value(RoundingMode.RTZ);
+    Term a = termManager.mk_const(fpSort, "a");
+    Term one = termManager.parse_fp_value(fpSort, rm, "-1");
+    Term two = termManager.parse_fp_value(fpSort, rm, "2");
 
-    Term bvOne = Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, one, 11 + 5);
-    Term bvTwo = Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, two, 11 + 5);
-    Term add = Bitwuzla.mk_term(Kind.FP_ADD, rm, two, one);
-    Term eq = Bitwuzla.mk_term(Kind.EQUAL, add, a);
+    Term bvOne = termManager.mk_term(Kind.FP_TO_SBV, rm, one, 11 + 5);
+    Term bvTwo = termManager.mk_term(Kind.FP_TO_SBV, rm, two, 11 + 5);
+    Term add = termManager.mk_term(Kind.FP_ADD, rm, two, one);
+    Term eq = termManager.mk_term(Kind.EQUAL, add, a);
 
-    Term bvA = Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, a, 11 + 5);
-    Term bvAdd = Bitwuzla.mk_term(Kind.BV_ADD, bvOne, bvTwo);
-    Term eqBv = Bitwuzla.mk_term(Kind.EQUAL, bvAdd, bvA);
+    Term bvA = termManager.mk_term(Kind.FP_TO_SBV, rm, a, 11 + 5);
+    Term bvAdd = termManager.mk_term(Kind.BV_ADD, bvOne, bvTwo);
+    Term eqBv = termManager.mk_term(Kind.EQUAL, bvAdd, bvA);
 
     bitwuzla.assert_formula(eq);
     bitwuzla.assert_formula(eqBv);
@@ -394,13 +396,13 @@ public void testFpToBv() {
     assertThat(bitwuzla.get_value(bvOne).toString()).isEqualTo("#b1111111111111111");
     assertThat(bitwuzla.get_value(bvTwo).toString()).isEqualTo("#b0000000000000010");
     // Now test -0.9 to 0 and 0.9 to 0
-    Term nearlyMin1 = Bitwuzla.mk_fp_value(fpSort, rm, "-0.9");
-    Term nearly1 = Bitwuzla.mk_fp_value(fpSort, rm, "0.9");
-    Term bvnearlyMin1 = Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, nearlyMin1, 11 + 5);
-    Term bvnearly1 = Bitwuzla.mk_term(Kind.FP_TO_SBV, rm, nearly1, 11 + 5);
-    Term b = Bitwuzla.mk_const(Bitwuzla.mk_bv_sort(11 + 5), "b");
-    Term bvAdd2 = Bitwuzla.mk_term(Kind.BV_ADD, bvnearlyMin1, bvnearly1);
-    Term eqBv2 = Bitwuzla.mk_term(Kind.EQUAL, bvAdd2, b);
+    Term nearlyMin1 = termManager.parse_fp_value(fpSort, rm, "-0.9");
+    Term nearly1 = termManager.parse_fp_value(fpSort, rm, "0.9");
+    Term bvnearlyMin1 = termManager.mk_term(Kind.FP_TO_SBV, rm, nearlyMin1, 11 + 5);
+    Term bvnearly1 = termManager.mk_term(Kind.FP_TO_SBV, rm, nearly1, 11 + 5);
+    Term b = termManager.mk_const(termManager.mk_bv_sort(11 + 5), "b");
+    Term bvAdd2 = termManager.mk_term(Kind.BV_ADD, bvnearlyMin1, bvnearly1);
+    Term eqBv2 = termManager.mk_term(Kind.EQUAL, bvAdd2, b);
 
     bitwuzla.assert_formula(eqBv2);
     res = bitwuzla.check_sat();
@@ -414,25 +416,25 @@ public void testFpToBv() {
   public void testTypes() {
     // A constant (BITWUZLA_KIND_CONSTANT) is both, a variable and a constant value
     // However a value is also a BITWUZLA_KIND_VALUE, while a variable is not
-    Sort fpSort = Bitwuzla.mk_fp_sort(5, 11);
-    Term rm = Bitwuzla.mk_rm_value(RoundingMode.RNE);
-    Term a = Bitwuzla.mk_const(fpSort, "a");
-    Term one = Bitwuzla.mk_fp_value(fpSort, rm, "1");
-    Term two = Bitwuzla.mk_fp_value(fpSort, rm, "2");
-
-    Sort boolSort = Bitwuzla.mk_bool_sort();
-    //    Result res = Bitwuzla.mk_const(boolSort, "res");
-    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
-    Term arg1 = Bitwuzla.mk_const(bvSort8, "arg1");
-    Term arg2 = Bitwuzla.mk_bv_value_signed(bvSort8, 11);
+    Sort fpSort = termManager.mk_fp_sort(5, 11);
+    Term rm = termManager.mk_rm_value(RoundingMode.RNE);
+    Term a = termManager.mk_const(fpSort, "a");
+    Term one = termManager.parse_fp_value(fpSort, rm, "1");
+    Term two = termManager.parse_fp_value(fpSort, rm, "2");
+
+    Sort boolSort = termManager.mk_bool_sort();
+    //    Result res = termManager.mk_const(boolSort, "res");
+    Sort bvSort8 = termManager.mk_bv_sort(8);
+    Term arg1 = termManager.mk_const(bvSort8, "arg1");
+    Term arg2 = termManager.mk_bv_value_int64(bvSort8, 11);
     Sort[] domain = {bvSort8, bvSort8};
-    Sort sortFun = Bitwuzla.mk_fun_sort(new Vector_Sort(domain), boolSort);
+    Sort sortFun = termManager.mk_fun_sort(new Vector_Sort(domain), boolSort);
 
     // (applied) UFs have 1 + arity children, the UF decl (in this case foo), then the arguments
     // in order. Applied UFs are also no "fun", but can only be discerned by KIND
     // The decl has no children, but you can get domain and codomain with API calls
-    Term foo = Bitwuzla.mk_const(sortFun, "foo");
-    Term appliedFoo = Bitwuzla.mk_term(Kind.APPLY, foo, arg1, arg2);
+    Term foo = termManager.mk_const(sortFun, "foo");
+    Term appliedFoo = termManager.mk_term(Kind.APPLY, foo, arg1, arg2);
     assertThat(appliedFoo.sort().is_fun()).isFalse();
     assertThat(appliedFoo.sort().is_bool()).isTrue();
     assertThat(appliedFoo.symbol()).isNull();
@@ -446,9 +448,9 @@ public void testTypes() {
     assertThat(appliedFoo.kind()).isEqualTo(Kind.APPLY);
     assertThat(foo.kind()).isEqualTo(Kind.CONSTANT);
 
-    Term add = Bitwuzla.mk_term(Kind.FP_ADD, rm, two, one);
-    Term eq = Bitwuzla.mk_term(Kind.EQUAL, add, a);
-    Term neg = Bitwuzla.mk_term(Kind.NOT, eq);
+    Term add = termManager.mk_term(Kind.FP_ADD, rm, two, one);
+    Term eq = termManager.mk_term(Kind.EQUAL, add, a);
+    Term neg = termManager.mk_term(Kind.NOT, eq);
 
     // The type of add is fp (a bv add would be bv)
     assertThat(add.sort().is_fp()).isTrue();
@@ -505,12 +507,12 @@ public void testTypes() {
    */
   @Test
   public void testExtend() {
-    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
-    Sort bvSort10 = Bitwuzla.mk_bv_sort(10);
-    Term x = Bitwuzla.mk_const(bvSort8, "x");
-    Term y = Bitwuzla.mk_const(bvSort10, "y");
-    Term xExt = Bitwuzla.mk_term(Kind.BV_SIGN_EXTEND, x, 2);
-    Term xExtEqY = Bitwuzla.mk_term(Kind.EQUAL, xExt, y);
+    Sort bvSort8 = termManager.mk_bv_sort(8);
+    Sort bvSort10 = termManager.mk_bv_sort(10);
+    Term x = termManager.mk_const(bvSort8, "x");
+    Term y = termManager.mk_const(bvSort10, "y");
+    Term xExt = termManager.mk_term(Kind.BV_SIGN_EXTEND, x, 2);
+    Term xExtEqY = termManager.mk_term(Kind.EQUAL, xExt, y);
     bitwuzla.assert_formula(xExtEqY);
     Result res = bitwuzla.check_sat();
     assertThat(res).isEqualTo(Result.SAT);
@@ -527,27 +529,27 @@ public void testExtend() {
   @Test
   public void testExists() {
     // EXISTS x, y . x = z AND y = z implies x = y
-    Sort bvSort8 = Bitwuzla.mk_bv_sort(8);
-    Term x = Bitwuzla.mk_const(bvSort8, "x");
-    Term y = Bitwuzla.mk_const(bvSort8, "y");
-    Term z = Bitwuzla.mk_const(bvSort8, "z");
+    Sort bvSort8 = termManager.mk_bv_sort(8);
+    Term x = termManager.mk_const(bvSort8, "x");
+    Term y = termManager.mk_const(bvSort8, "y");
+    Term z = termManager.mk_const(bvSort8, "z");
 
-    Term xEqZ = Bitwuzla.mk_term(Kind.EQUAL, x, z);
-    Term yEqZ = Bitwuzla.mk_term(Kind.EQUAL, y, z);
-    Term xEqY = Bitwuzla.mk_term(Kind.EQUAL, x, y);
-    Term formula = Bitwuzla.mk_term(Kind.IMPLIES, Bitwuzla.mk_term(Kind.AND, xEqZ, yEqZ), xEqY);
+    Term xEqZ = termManager.mk_term(Kind.EQUAL, x, z);
+    Term yEqZ = termManager.mk_term(Kind.EQUAL, y, z);
+    Term xEqY = termManager.mk_term(Kind.EQUAL, x, y);
+    Term formula = termManager.mk_term(Kind.IMPLIES, termManager.mk_term(Kind.AND, xEqZ, yEqZ), xEqY);
 
     // Substitute the free vars with bound vars
-    Term xB = Bitwuzla.mk_var(bvSort8, "x");
-    Term yB = Bitwuzla.mk_var(bvSort8, "y");
+    Term xB = termManager.mk_var(bvSort8, "x");
+    Term yB = termManager.mk_var(bvSort8, "y");
     // Substitution does not return a new term, but modifies the existing!
     Map_TermTerm mapping = new Map_TermTerm();
     mapping.put(x, xB);
     mapping.put(y, yB);
-    formula.substitute(mapping);
+    termManager.substitute_term(formula, mapping);
     // Build quantifier
     Term[] argsAndBody = {xB, yB, formula};
-    Term ex = Bitwuzla.mk_term(Kind.FORALL, new Vector_Term(argsAndBody));
+    Term ex = termManager.mk_term(Kind.FORALL, new Vector_Term(argsAndBody), new Vector_Int());
 
     // Check SAT
     bitwuzla.assert_formula(ex);
@@ -569,7 +571,7 @@ public void testExists() {
           + "(assert .def_14)";
 
   private Vector_Term parse(String smt2dump) {
-    Parser parser = new Parser(createOptions());
+    Parser parser = new Parser(termManager, createOptions());
     parser.parse(smt2dump, true, false);
     return parser.bitwuzla().get_assertions();
   }
@@ -590,10 +592,10 @@ public void parserTest2() {
 
   @Test
   public void parserTest() {
-    Sort boolSort = Bitwuzla.mk_bool_sort();
-    Term x = Bitwuzla.mk_const(boolSort, "x");
-    Term y = Bitwuzla.mk_const(boolSort, "y");
-    Term xOrY = Bitwuzla.mk_term(Kind.XOR, x, y);
+    Sort boolSort = termManager.mk_bool_sort();
+    Term x = termManager.mk_const(boolSort, "x");
+    Term y = termManager.mk_const(boolSort, "y");
+    Term xOrY = termManager.mk_term(Kind.XOR, x, y);
     bitwuzla.push(1);
     bitwuzla.assert_formula(xOrY);
 
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
index 7f21a1d234..5fbf8e6a2b 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
@@ -13,20 +13,22 @@
 import java.util.List;
 import org.sosy_lab.java_smt.api.SolverException;
 import org.sosy_lab.java_smt.basicimpl.AbstractQuantifiedFormulaManager;
-import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
-import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Map_TermTerm;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.TermManager;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Int;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
 public class BitwuzlaQuantifiedFormulaManager
     extends AbstractQuantifiedFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
+  private final TermManager termManager;
 
   protected BitwuzlaQuantifiedFormulaManager(
-      FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> pCreator) {
+      BitwuzlaFormulaCreator pCreator) {
     super(pCreator);
+    termManager = pCreator.getTermManager();
   }
 
   @Override
@@ -54,7 +56,7 @@ public Term mkQuantifier(Quantifier q, List<Term> vars, Term body) {
     for (int i = 0; i < origVars.length; i++) {
       map.put(origVars[i], substVars[i]);
     }
-    body = body.substitute(map);
+    body = termManager.substitute_term(body, map);
 
     Term[] argsAndBody = new Term[2];
     argsAndBody[1] = body;
@@ -62,10 +64,10 @@ public Term mkQuantifier(Quantifier q, List<Term> vars, Term body) {
     for (int i = 0; i < vars.size(); i++) {
       argsAndBody[0] = substVars[i];
       if (q.equals(Quantifier.FORALL)) {
-        currentFormula = Bitwuzla.mk_term(Kind.FORALL, new Vector_Term(argsAndBody));
+        currentFormula = termManager.mk_term(Kind.FORALL, new Vector_Term(argsAndBody), new Vector_Int());
 
       } else {
-        currentFormula = Bitwuzla.mk_term(Kind.EXISTS, new Vector_Term(argsAndBody));
+        currentFormula = termManager.mk_term(Kind.EXISTS, new Vector_Term(argsAndBody), new Vector_Int());
       }
       argsAndBody[1] = currentFormula;
     }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
index d1a3cca073..6bd0b0f96b 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
@@ -32,6 +32,7 @@
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.BitwuzlaNative;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Option;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Options;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.TermManager;
 
 public final class BitwuzlaSolverContext extends AbstractSolverContext {
 
@@ -104,9 +105,10 @@ public static BitwuzlaSolverContext create(
       throws InvalidConfigurationException {
     pLoader.accept("bitwuzlaJNI");
 
+    TermManager termManager = new TermManager();
     Options solverOptions = buildBitwuzlaOptions(new BitwuzlaSettings(config), randomSeed);
 
-    BitwuzlaFormulaCreator creator = new BitwuzlaFormulaCreator();
+    BitwuzlaFormulaCreator creator = new BitwuzlaFormulaCreator(termManager);
     BitwuzlaUFManager functionTheory = new BitwuzlaUFManager(creator);
     BitwuzlaBooleanFormulaManager booleanTheory = new BitwuzlaBooleanFormulaManager(creator);
     BitwuzlaBitvectorFormulaManager bitvectorTheory =
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index d546f3af9e..7d55eb4bf1 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -79,7 +79,7 @@ private Bitwuzla createEnvironment(Set<ProverOptions> pProverOptions, Options pS
       pSolverOptions.set(Option.PRODUCE_UNSAT_ASSUMPTIONS, 2);
     }
 
-    return new Bitwuzla(pSolverOptions);
+    return new Bitwuzla(creator.getTermManager(), pSolverOptions);
   }
 
   /**

From 6b98093c6edd94fd8b2f54a554e1a71ea1c4ff1a Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 28 Feb 2024 14:28:50 +0100
Subject: [PATCH 060/158] Blacklisted Bitwuzla in
 SolverThreadLocalityTest.wrongContextTest as the new version no longer allows
 formulas to be shared accross contexts.

---
 .../java_smt/test/SolverThreadLocalityTest.java       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java b/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java
index 54d09f7a44..007d6466b1 100644
--- a/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java
@@ -342,13 +342,10 @@ public void wrongContextTest()
       throws InterruptedException, SolverException, InvalidConfigurationException {
     assume()
         .that(solverToUse())
-        .isNoneOf(
-            Solvers.OPENSMT,
-            Solvers.MATHSAT5,
-            Solvers.SMTINTERPOL,
-            Solvers.Z3,
-            Solvers.PRINCESS,
-            Solvers.BOOLECTOR);
+        .isAnyOf(
+            Solvers.CVC4,
+            Solvers.CVC5,
+            Solvers.YICES2);
 
     // FIXME: This test tries to use a formula that was created in a different context. We expect
     //  this test to fail for most solvers, but there should be a unique error message.

From 89420ebbd9efcd82d4ff2ffae535e6cf3bc19d2b Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 28 Feb 2024 14:44:13 +0100
Subject: [PATCH 061/158] (Temporarily) fixed failing tests by using a shared
 TermManager for all SolverContext instances.

---
 .../solvers/bitwuzla/BitwuzlaSolverContext.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
index 6bd0b0f96b..8dfcef8f97 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
@@ -19,6 +19,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.sosy_lab.common.NativeLibraries;
 import org.sosy_lab.common.ShutdownNotifier;
 import org.sosy_lab.common.configuration.Configuration;
 import org.sosy_lab.common.configuration.InvalidConfigurationException;
@@ -94,6 +95,14 @@ protected String getFurtherOptions() {
     solverOptions = pOptions;
   }
 
+  // TODO: This should be moved back into create()
+  private static TermManager makeTermManager() {
+    NativeLibraries.loadLibrary("bitwuzlaJNI");
+    return new TermManager();
+  }
+
+  private static final TermManager termManager = makeTermManager();
+
   @SuppressWarnings("unused")
   public static BitwuzlaSolverContext create(
       Configuration config,
@@ -103,9 +112,7 @@ public static BitwuzlaSolverContext create(
       FloatingPointRoundingMode pFloatingPointRoundingMode,
       Consumer<String> pLoader)
       throws InvalidConfigurationException {
-    pLoader.accept("bitwuzlaJNI");
 
-    TermManager termManager = new TermManager();
     Options solverOptions = buildBitwuzlaOptions(new BitwuzlaSettings(config), randomSeed);
 
     BitwuzlaFormulaCreator creator = new BitwuzlaFormulaCreator(termManager);

From 472891b7ef485eb68229394a3c5fccabf52fcc72 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 28 Feb 2024 14:44:33 +0100
Subject: [PATCH 062/158] Fixed formatting.

---
 .../bitwuzla/BitwuzlaBooleanFormulaManager.java    |  3 +--
 .../bitwuzla/BitwuzlaFloatingPointManager.java     |  3 +--
 .../solvers/bitwuzla/BitwuzlaFormulaCreator.java   |  4 ++--
 .../solvers/bitwuzla/BitwuzlaNativeApiTest.java    | 14 ++++++++------
 .../bitwuzla/BitwuzlaQuantifiedFormulaManager.java |  9 +++++----
 .../java_smt/test/SolverConcurrencyTest.java       |  4 +---
 .../java_smt/test/SolverThreadLocalityTest.java    |  7 +------
 7 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
index 4f6b222f3c..6dbd1da7a3 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
@@ -21,8 +21,7 @@ public class BitwuzlaBooleanFormulaManager
   private final Term pTrue;
   private final Term pFalse;
 
-  protected BitwuzlaBooleanFormulaManager(
-      BitwuzlaFormulaCreator pCreator) {
+  protected BitwuzlaBooleanFormulaManager(BitwuzlaFormulaCreator pCreator) {
     super(pCreator);
     termManager = pCreator.getTermManager();
     pTrue = termManager.mk_true();
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index b4893a5e6b..b25317d60a 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -28,8 +28,7 @@ public class BitwuzlaFloatingPointManager
   private final Term roundingMode;
 
   protected BitwuzlaFloatingPointManager(
-      BitwuzlaFormulaCreator pCreator,
-      FloatingPointRoundingMode pFloatingPointRoundingMode) {
+      BitwuzlaFormulaCreator pCreator, FloatingPointRoundingMode pFloatingPointRoundingMode) {
     super(pCreator);
     termManager = pCreator.getTermManager();
     roundingMode = getRoundingModeImpl(pFloatingPointRoundingMode);
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index 7f1e27165d..28173c592a 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -52,7 +52,7 @@
 
 public class BitwuzlaFormulaCreator extends FormulaCreator<Term, Sort, Void, BitwuzlaDeclaration> {
   private final TermManager termManager;
-  
+
   private final Table<String, Sort, Term> formulaCache = HashBasedTable.create();
 
   // Bitwuzla has no operation for casting floats to bitvectors. We need to use a workaround
@@ -65,7 +65,7 @@ public class BitwuzlaFormulaCreator extends FormulaCreator<Term, Sort, Void, Bit
 
   protected BitwuzlaFormulaCreator(TermManager pTermManager) {
     super(null, pTermManager.mk_bool_sort(), null, null, null, null);
-    termManager= pTermManager;
+    termManager = pTermManager;
   }
 
   TermManager getTermManager() {
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index 0f98d76313..ac492277f6 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -67,13 +67,13 @@ public void freeEnvironment() {
   }
 
   // Bitwuzla does not support lambdas with no argument
-  //@Ignore
-  //@Test
-  //public void functionWithNoArguments() {
+  // @Ignore
+  // @Test
+  // public void functionWithNoArguments() {
   //  Sort bool_sort = termManager.mk_bool_sort();
   //  Term a = termManager.mk_var(bool_sort, "a");
   //  termManager.mk_term(Kind.LAMBDA, a);
-  //}
+  // }
 
   @Test
   public void signedFunctions() {
@@ -86,7 +86,8 @@ public void signedFunctions() {
     Term x = termManager.mk_const(sortbv8, "x");
     Term f = termManager.mk_const(sortfun, "f");
 
-    Term term = termManager.mk_term(Kind.APPLY, f, x, termManager.mk_term(Kind.BV_EXTRACT, x, 6, 3));
+    Term term =
+        termManager.mk_term(Kind.APPLY, f, x, termManager.mk_term(Kind.BV_EXTRACT, x, 6, 3));
 
     Sort resultSort = term.sort();
 
@@ -537,7 +538,8 @@ public void testExists() {
     Term xEqZ = termManager.mk_term(Kind.EQUAL, x, z);
     Term yEqZ = termManager.mk_term(Kind.EQUAL, y, z);
     Term xEqY = termManager.mk_term(Kind.EQUAL, x, y);
-    Term formula = termManager.mk_term(Kind.IMPLIES, termManager.mk_term(Kind.AND, xEqZ, yEqZ), xEqY);
+    Term formula =
+        termManager.mk_term(Kind.IMPLIES, termManager.mk_term(Kind.AND, xEqZ, yEqZ), xEqY);
 
     // Substitute the free vars with bound vars
     Term xB = termManager.mk_var(bvSort8, "x");
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
index 5fbf8e6a2b..168133d9e6 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
@@ -25,8 +25,7 @@ public class BitwuzlaQuantifiedFormulaManager
     extends AbstractQuantifiedFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
   private final TermManager termManager;
 
-  protected BitwuzlaQuantifiedFormulaManager(
-      BitwuzlaFormulaCreator pCreator) {
+  protected BitwuzlaQuantifiedFormulaManager(BitwuzlaFormulaCreator pCreator) {
     super(pCreator);
     termManager = pCreator.getTermManager();
   }
@@ -64,10 +63,12 @@ public Term mkQuantifier(Quantifier q, List<Term> vars, Term body) {
     for (int i = 0; i < vars.size(); i++) {
       argsAndBody[0] = substVars[i];
       if (q.equals(Quantifier.FORALL)) {
-        currentFormula = termManager.mk_term(Kind.FORALL, new Vector_Term(argsAndBody), new Vector_Int());
+        currentFormula =
+            termManager.mk_term(Kind.FORALL, new Vector_Term(argsAndBody), new Vector_Int());
 
       } else {
-        currentFormula = termManager.mk_term(Kind.EXISTS, new Vector_Term(argsAndBody), new Vector_Int());
+        currentFormula =
+            termManager.mk_term(Kind.EXISTS, new Vector_Term(argsAndBody), new Vector_Int());
       }
       argsAndBody[1] = currentFormula;
     }
diff --git a/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java b/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
index c3026df1e8..a553620e42 100644
--- a/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
@@ -189,9 +189,7 @@ public void testIntConcurrencyWithConcurrentContext() {
   @Test
   public void testBvConcurrencyWithConcurrentContext() {
     // FIXME: Bitwuzla does not support parallel solver threads
-    assume()
-        .that(solver)
-        .isNotEqualTo(Solvers.BITWUZLA);
+    assume().that(solver).isNotEqualTo(Solvers.BITWUZLA);
 
     requireBitvectors();
     assertConcurrency(
diff --git a/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java b/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java
index 007d6466b1..20736b98ea 100644
--- a/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java
@@ -340,12 +340,7 @@ public <T> void nonLocalInterpolationTest() throws InterruptedException, Executi
   @Test
   public void wrongContextTest()
       throws InterruptedException, SolverException, InvalidConfigurationException {
-    assume()
-        .that(solverToUse())
-        .isAnyOf(
-            Solvers.CVC4,
-            Solvers.CVC5,
-            Solvers.YICES2);
+    assume().that(solverToUse()).isAnyOf(Solvers.CVC4, Solvers.CVC5, Solvers.YICES2);
 
     // FIXME: This test tries to use a formula that was created in a different context. We expect
     //  this test to fail for most solvers, but there should be a unique error message.

From 680e75bb2ebe398344362770af8ff62f5645ca9f Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 28 Feb 2024 15:53:10 +0100
Subject: [PATCH 063/158] Bitwuzla: Updated phantomReferences patch to include
 the new class TermManager.

---
 .../libbitwuzla/phantomReferences.patch       | 292 +++++++++---------
 1 file changed, 152 insertions(+), 140 deletions(-)

diff --git a/lib/native/source/libbitwuzla/phantomReferences.patch b/lib/native/source/libbitwuzla/phantomReferences.patch
index 36e981702d..762875bccd 100644
--- a/lib/native/source/libbitwuzla/phantomReferences.patch
+++ b/lib/native/source/libbitwuzla/phantomReferences.patch
@@ -1,141 +1,153 @@
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java	2024-01-30 02:17:29.958540211 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java	2024-01-30 02:13:50.700388020 +0100
-@@ -27,7 +27,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-01-30 02:16:53.494652530 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-01-30 02:13:50.564390151 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {
-@@ -171,7 +171,7 @@
-   
-     @SuppressWarnings("deprecation")
-     protected void finalize() {
--      delete();
-+      //delete();
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java	2024-02-28 15:41:51.242097065 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java	2024-02-28 15:44:53.024398221 +0100
+@@ -34,7 +34,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Bitwuzla(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Bitwuzla(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-02-28 15:41:51.090094941 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-02-28 15:45:50.689042441 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Map_TermTerm(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Map_TermTerm(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+@@ -178,7 +178,7 @@
+       if (swigCPtr != 0) {
+         if (swigCMemOwn) {
+           swigCMemOwn = false;
+-          BitwuzlaNativeJNI.delete_Map_TermTerm_Iterator(swigCPtr);
++          //BitwuzlaNativeJNI.delete_Map_TermTerm_Iterator(swigCPtr);
+         }
+         swigCPtr = 0;
+       }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java	2024-02-28 15:41:51.122095389 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java	2024-02-28 15:44:28.532113367 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Options(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Options(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java	2024-02-28 15:41:51.254097233 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java	2024-02-28 15:45:16.476664563 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Parser(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Parser(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java	2024-02-28 15:41:51.158095891 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java	2024-02-28 15:44:38.132225856 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Sort(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Sort(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java	2024-02-28 15:41:51.158095891 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java	2024-02-28 15:43:30.935414605 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Terminator(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Terminator(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-02-28 15:41:51.146095724 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-02-28 15:45:08.800578060 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Term(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Term(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java	2024-02-28 15:41:51.230096898 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java	2024-02-28 15:45:02.164502752 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_TermManager(swigCPtr);
++        //BitwuzlaNativeJNI.delete_TermManager(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java	2024-02-28 15:41:50.978093376 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java	2024-02-28 15:44:08.099870263 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Vector_Int(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Vector_Int(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java	2024-02-28 15:41:51.054094438 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java	2024-02-28 15:44:44.748302748 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Vector_Sort(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Vector_Sort(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java	2024-02-28 15:41:51.002093712 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java	2024-02-28 15:43:22.031302740 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Vector_String(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Vector_String(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-02-28 15:41:51.030094103 +0100
++++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-02-28 15:44:17.651984547 +0100
+@@ -42,7 +42,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Vector_Term(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Vector_Term(swigCPtr);
+       }
+       swigCPtr = 0;
      }
-   
-     public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java	2024-01-30 02:17:14.802578662 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java	2024-01-30 02:13:50.596389650 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java	2024-01-30 02:17:40.450520255 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java	2024-01-30 02:13:50.704387957 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java	2024-01-30 02:17:20.062564011 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java	2024-01-30 02:13:50.636389023 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java	2024-01-30 02:16:42.862698311 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java	2024-01-30 02:13:50.640388960 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-01-30 02:17:34.346531214 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-01-30 02:13:50.624389211 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java	2024-01-30 02:16:58.418633361 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java	2024-01-30 02:13:50.460391781 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java	2024-01-30 02:17:24.998551530 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java	2024-01-30 02:13:50.532390653 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java	2024-01-30 02:16:35.794732123 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java	2024-01-30 02:13:50.484391405 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {
-diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-01-30 02:17:03.534614791 +0100
-+++ lib/native/source/libbitwuzla/src.patched/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-01-30 02:13:50.508391029 +0100
-@@ -35,7 +35,7 @@
- 
-   @SuppressWarnings("deprecation")
-   protected void finalize() {
--    delete();
-+    //delete();
-   }
- 
-   public synchronized void delete() {

From 6deda76659338d7ea94fb0e38cc97cbb11bd266e Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 28 Feb 2024 21:15:23 +0100
Subject: [PATCH 064/158] Revert "Bitwuzla: Made fp cast map in
 BitwuzlaFormulaCreator static as the solver allows terms to be shared across
 different contexts."

This reverts commit 3121a581
---
 .../bitwuzla/BitwuzlaFloatingPointManager.java     |  4 +++-
 .../solvers/bitwuzla/BitwuzlaFormulaCreator.java   | 14 ++++----------
 .../solvers/bitwuzla/BitwuzlaFormulaManager.java   |  2 +-
 .../solvers/bitwuzla/BitwuzlaTheoremProver.java    |  5 ++---
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index b25317d60a..f23544391a 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -24,12 +24,14 @@
 
 public class BitwuzlaFloatingPointManager
     extends AbstractFloatingPointFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
+  private final BitwuzlaFormulaCreator bitwuzlaCreator;
   private final TermManager termManager;
   private final Term roundingMode;
 
   protected BitwuzlaFloatingPointManager(
       BitwuzlaFormulaCreator pCreator, FloatingPointRoundingMode pFloatingPointRoundingMode) {
     super(pCreator);
+    bitwuzlaCreator = pCreator;
     termManager = pCreator.getTermManager();
     roundingMode = getRoundingModeImpl(pFloatingPointRoundingMode);
   }
@@ -206,7 +208,7 @@ protected Term toIeeeBitvectorImpl(Term pNumber) {
                 termManager.mk_term(Kind.FP_TO_FP_FROM_BV, bvVar, sizeExp, sizeSig),
                 pNumber));
 
-    BitwuzlaFormulaCreator.addVariableCast(equal);
+    bitwuzlaCreator.addVariableCast(equal);
     return bvVar;
   }
 
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index 28173c592a..0de3ddf238 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -16,12 +16,12 @@
 import com.google.common.collect.Table;
 import java.math.BigInteger;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.Set;
 import org.sosy_lab.java_smt.api.ArrayFormula;
 import org.sosy_lab.java_smt.api.BitvectorFormula;
 import org.sosy_lab.java_smt.api.BooleanFormula;
@@ -55,13 +55,7 @@ public class BitwuzlaFormulaCreator extends FormulaCreator<Term, Sort, Void, Bit
 
   private final Table<String, Sort, Term> formulaCache = HashBasedTable.create();
 
-  // Bitwuzla has no operation for casting floats to bitvectors. We need to use a workaround
-  // where a variable "bvVar" is introduces, along with the side condition that
-  // "fpTerm = to_fp(bvVar)" holds. These side conditions are stored here and need to be added when
-  // satisfiability is checked, or when the formula is to be printed.
-  // Since Bitwuzla allows terms to be shared across solver contexts we use a static collection
-  // to store all equations.
-  private static final Collection<Term> variableCasts = new HashSet<>();
+  private final Set<Term> variableCasts = new HashSet<>();
 
   protected BitwuzlaFormulaCreator(TermManager pTermManager) {
     super(null, pTermManager.mk_bool_sort(), null, null, null, null);
@@ -566,11 +560,11 @@ public Object convertValue(Term term) {
     throw new AssertionError("Unknown value type.");
   }
 
-  public static void addVariableCast(Term equal) {
+  public void addVariableCast(Term equal) {
     variableCasts.add(equal);
   }
 
-  public static Iterable<Term> getVariableCasts() {
+  public Iterable<Term> getVariableCasts() {
     return variableCasts;
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index 7045886ba6..e39406c4db 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -91,7 +91,7 @@ public Appender dumpFormula(Term pTerm) {
       public void appendTo(Appendable out) throws IOException {
         // TODO: It would be better to keep this instance around
         Bitwuzla bitwuzla = new Bitwuzla(creator.getTermManager());
-        for (Term t : BitwuzlaFormulaCreator.getVariableCasts()) {
+        for (Term t : creator.getVariableCasts()) {
           bitwuzla.assert_formula(t);
         }
         bitwuzla.assert_formula(pTerm);
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index 7d55eb4bf1..3f3817f5ed 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -47,7 +47,6 @@ public boolean terminate() {
   private final BitwuzlaFormulaManager manager;
 
   private final BitwuzlaFormulaCreator creator;
-
   protected boolean wasLastSatCheckSat = false; // and stack is not changed
 
   protected BitwuzlaTheoremProver(
@@ -128,7 +127,7 @@ private boolean readSATResult(Result resultValue) throws SolverException, Interr
   public boolean isUnsat() throws SolverException, InterruptedException {
     Preconditions.checkState(!closed);
     wasLastSatCheckSat = false;
-    final Result result = env.check_sat(new Vector_Term(BitwuzlaFormulaCreator.getVariableCasts()));
+    final Result result = env.check_sat(new Vector_Term(creator.getVariableCasts()));
     return readSATResult(result);
   }
 
@@ -143,7 +142,7 @@ public boolean isUnsatWithAssumptions(Collection<BooleanFormula> assumptions)
       throws SolverException, InterruptedException {
     Preconditions.checkState(!closed);
     wasLastSatCheckSat = false;
-    Vector_Term ass = new Vector_Term(BitwuzlaFormulaCreator.getVariableCasts());
+    Vector_Term ass = new Vector_Term(creator.getVariableCasts());
     for (BooleanFormula formula : assumptions) {
       BitwuzlaBooleanFormula bitwuzlaFormula = (BitwuzlaBooleanFormula) formula;
       ass.add(bitwuzlaFormula.getTerm());

From 4087901258b3defdab5b7ac43dea04cc677b1edd Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 28 Feb 2024 21:15:33 +0100
Subject: [PATCH 065/158] Revert "(Temporarily) fixed failing tests by using a
 shared TermManager for all SolverContext instances."

This reverts commit 89420ebbd9efcd82d4ff2ffae535e6cf3bc19d2b.
---
 .../solvers/bitwuzla/BitwuzlaSolverContext.java       | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
index 8dfcef8f97..6bd0b0f96b 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
@@ -19,7 +19,6 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.sosy_lab.common.NativeLibraries;
 import org.sosy_lab.common.ShutdownNotifier;
 import org.sosy_lab.common.configuration.Configuration;
 import org.sosy_lab.common.configuration.InvalidConfigurationException;
@@ -95,14 +94,6 @@ protected String getFurtherOptions() {
     solverOptions = pOptions;
   }
 
-  // TODO: This should be moved back into create()
-  private static TermManager makeTermManager() {
-    NativeLibraries.loadLibrary("bitwuzlaJNI");
-    return new TermManager();
-  }
-
-  private static final TermManager termManager = makeTermManager();
-
   @SuppressWarnings("unused")
   public static BitwuzlaSolverContext create(
       Configuration config,
@@ -112,7 +103,9 @@ public static BitwuzlaSolverContext create(
       FloatingPointRoundingMode pFloatingPointRoundingMode,
       Consumer<String> pLoader)
       throws InvalidConfigurationException {
+    pLoader.accept("bitwuzlaJNI");
 
+    TermManager termManager = new TermManager();
     Options solverOptions = buildBitwuzlaOptions(new BitwuzlaSettings(config), randomSeed);
 
     BitwuzlaFormulaCreator creator = new BitwuzlaFormulaCreator(termManager);

From 14a6dc8e850a00ed1541093267c60b0dd39f6a83 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 28 Feb 2024 21:44:38 +0100
Subject: [PATCH 066/158] Reduced phantomReferences patch. We still need to
 disable finalizers for Term, TermManager and Vector_Term, but all other
 objects can now be garbage collected. This should help improve the memory
 leak.

---
 .../libbitwuzla/phantomReferences.patch       | 117 ------------------
 1 file changed, 117 deletions(-)

diff --git a/lib/native/source/libbitwuzla/phantomReferences.patch b/lib/native/source/libbitwuzla/phantomReferences.patch
index 762875bccd..b4dabfdca3 100644
--- a/lib/native/source/libbitwuzla/phantomReferences.patch
+++ b/lib/native/source/libbitwuzla/phantomReferences.patch
@@ -1,84 +1,3 @@
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java	2024-02-28 15:41:51.242097065 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java	2024-02-28 15:44:53.024398221 +0100
-@@ -34,7 +34,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Bitwuzla(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Bitwuzla(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-02-28 15:41:51.090094941 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-02-28 15:45:50.689042441 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Map_TermTerm(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Map_TermTerm(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
-@@ -178,7 +178,7 @@
-       if (swigCPtr != 0) {
-         if (swigCMemOwn) {
-           swigCMemOwn = false;
--          BitwuzlaNativeJNI.delete_Map_TermTerm_Iterator(swigCPtr);
-+          //BitwuzlaNativeJNI.delete_Map_TermTerm_Iterator(swigCPtr);
-         }
-         swigCPtr = 0;
-       }
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java	2024-02-28 15:41:51.122095389 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java	2024-02-28 15:44:28.532113367 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Options(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Options(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java	2024-02-28 15:41:51.254097233 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java	2024-02-28 15:45:16.476664563 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Parser(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Parser(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java	2024-02-28 15:41:51.158095891 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java	2024-02-28 15:44:38.132225856 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Sort(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Sort(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java	2024-02-28 15:41:51.158095891 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java	2024-02-28 15:43:30.935414605 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Terminator(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Terminator(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
 diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
 --- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-02-28 15:41:51.146095724 +0100
 +++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-02-28 15:45:08.800578060 +0100
@@ -103,42 +22,6 @@ diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzl
        }
        swigCPtr = 0;
      }
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java	2024-02-28 15:41:50.978093376 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java	2024-02-28 15:44:08.099870263 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Vector_Int(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Vector_Int(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java	2024-02-28 15:41:51.054094438 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java	2024-02-28 15:44:44.748302748 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Vector_Sort(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Vector_Sort(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java	2024-02-28 15:41:51.002093712 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java	2024-02-28 15:43:22.031302740 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Vector_String(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Vector_String(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
 diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
 --- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-02-28 15:41:51.030094103 +0100
 +++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-02-28 15:44:17.651984547 +0100

From af60de3dd51c3e0a18ac559fc5bc55ef6e531e20 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 28 Feb 2024 22:15:46 +0100
Subject: [PATCH 067/158] Bitwuzla: Re-enabled concurrency tests for Bitwuzla.

---
 .../java_smt/test/FormulaClassifierTest.java      |  3 ---
 .../java_smt/test/SolverConcurrencyTest.java      | 15 ---------------
 2 files changed, 18 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/FormulaClassifierTest.java b/src/org/sosy_lab/java_smt/test/FormulaClassifierTest.java
index 40f0078252..68e0198be0 100644
--- a/src/org/sosy_lab/java_smt/test/FormulaClassifierTest.java
+++ b/src/org/sosy_lab/java_smt/test/FormulaClassifierTest.java
@@ -159,7 +159,6 @@ public void test_ABV() {
 
   @Test
   public void test_QF_AUFBV() {
-    // FIXME: This formula actually uses integers (and reals) and is not in QF_AUFBV"
     requireParser();
     requireArrays();
     requireBitvectors();
@@ -233,7 +232,6 @@ public void test_QF_UFLIRA() {
 
   @Test
   public void test_QF_UF() {
-    // FIXME: This formula uses integers/reals and is not in QF_UF
     requireParser();
     String query = BOOL_VARS + "(assert (= (foo x) x))";
     assume()
@@ -262,7 +260,6 @@ public void test_QF_UFBVLIRA() {
 
   @Test
   public void test_QF_UFBV() {
-    // FIXME: This formula uses integers/reals and is not in QF_UFBV"
     requireParser();
     requireBitvectors();
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
diff --git a/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java b/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
index a553620e42..c0e7b96374 100644
--- a/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
@@ -188,9 +188,6 @@ public void testIntConcurrencyWithConcurrentContext() {
    */
   @Test
   public void testBvConcurrencyWithConcurrentContext() {
-    // FIXME: Bitwuzla does not support parallel solver threads
-    assume().that(solver).isNotEqualTo(Solvers.BITWUZLA);
-
     requireBitvectors();
     assertConcurrency(
         "testBvConcurrencyWithConcurrentContext",
@@ -208,13 +205,6 @@ public void testBvConcurrencyWithConcurrentContext() {
    */
   @Test
   public void testConcurrencyWithConcurrentManagers() throws InvalidConfigurationException {
-    assume()
-        .withMessage(
-            "Solver does not support usage of managers in threads distinct to the "
-                + "creating thread")
-        .that(solver)
-        .isNotEqualTo(Solvers.BITWUZLA);
-
     ConcurrentLinkedQueue<ContextAndFormula> contextAndFormulaList = new ConcurrentLinkedQueue<>();
     SolverContext context = initSolver();
     FormulaManager mgr = context.getFormulaManager();
@@ -378,11 +368,6 @@ public void testIntConcurrencyWithoutConcurrentContext() throws InvalidConfigura
   public void testBvConcurrencyWithoutConcurrentContext() throws InvalidConfigurationException {
     requireBitvectors();
 
-    assume()
-        .withMessage("Solver does not support concurrency without concurrent context.")
-        .that(solver)
-        .isNoneOf(Solvers.CVC5, Solvers.BITWUZLA);
-
     ConcurrentLinkedQueue<SolverContext> contextList = new ConcurrentLinkedQueue<>();
     // Initialize contexts before using them in the threads
     for (int i = 0; i < NUMBER_OF_THREADS; i++) {

From 3e5d5df5ab942f629829d4541fde22eda88a7542 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 1 Mar 2024 14:28:06 +0100
Subject: [PATCH 068/158] Bitwuzla: Removed method parse_fp_value from the Swig
 script. We're now using BigDecimal to convert the input string for
 mk_fp_value from scientific to decimal representation. This removes the
 dependency on gmp for the wrapper.

---
 lib/native/source/libbitwuzla/bitwuzla.i      | 83 ++-----------------
 .../BitwuzlaFloatingPointManager.java         | 24 +++++-
 .../bitwuzla/BitwuzlaNativeApiTest.java       | 14 ++--
 3 files changed, 35 insertions(+), 86 deletions(-)

diff --git a/lib/native/source/libbitwuzla/bitwuzla.i b/lib/native/source/libbitwuzla/bitwuzla.i
index e135c9ea91..2703b9f16e 100644
--- a/lib/native/source/libbitwuzla/bitwuzla.i
+++ b/lib/native/source/libbitwuzla/bitwuzla.i
@@ -11,8 +11,6 @@
 #include <bitwuzla/cpp/bitwuzla.h>
 #include <bitwuzla/cpp/parser.h>
 
-#include <gmp.h>
-
 #include <string>
 #include <sstream>
 
@@ -23,18 +21,13 @@
 %include <std_string.i>
 
 %include <std_vector.i>
-%template(Vector_Int)
-  std::vector<int>;
-%template(Vector_String)
-  std::vector<std::string>;
-%template(Vector_Term)
-  std::vector<bitwuzla::Term>;
-%template(Vector_Sort)
-  std::vector<bitwuzla::Sort>;
+%template(Vector_Int) std::vector<int>;
+%template(Vector_String) std::vector<std::string>;
+%template(Vector_Term) std::vector<bitwuzla::Term>;
+%template(Vector_Sort) std::vector<bitwuzla::Sort>;
 
 %include <std_unordered_map.i>
-%template(Map_TermTerm)
-  std::unordered_map<bitwuzla::Term, bitwuzla::Term>;
+%template(Map_TermTerm) std::unordered_map<bitwuzla::Term, bitwuzla::Term>;
 
 %include <std_shared_ptr.i>
 %shared_ptr(bitwuzla::Bitwuzla);
@@ -245,72 +238,6 @@ namespace bitwuzla {
   }
 }
 
-%ignore TermManager::mk_fp_value(const Sort &sort, const Term &rm, const std::string &real);
-%extend TermManager {
-  // Patch mk_fp_value to handle scientific notation in the input string
-  Term parse_fp_value(const Sort &sort, const Term &rm, const std::string &repr) {
-    // Handle special values
-    if (repr == "Infinity") {
-      return $self->mk_fp_pos_inf(sort);
-    }
-    if (repr == "-Infinity") {
-      return $self->mk_fp_neg_inf(sort);
-    }
-    if (repr == "NaN") {
-      return $self->mk_fp_nan(sort);
-    }
-
-    // Parse float value with GMP
-    mpf_t floatVal;
-    std::string prev_loc = std::setlocale(LC_ALL, nullptr);
-    std::setlocale(LC_ALL, "en_US.UTF-8");
-    int error = mpf_init_set_str(floatVal, repr.c_str(), 10);
-    std::setlocale(LC_ALL, prev_loc.c_str());
-    if (error != 0) {
-      throw bitwuzla::Exception(
-        "String \"" + repr + "\" can't be parsed as a floating point number.");
-    }
-
-    // Convert to decimal format for Bitwuzla
-    mp_exp_t exponent;
-    char* mantissa = mpf_get_str(nullptr, &exponent, 10, 0, floatVal);
-    std::string input = std::string(mantissa);
-    mpf_clear(floatVal);
-    bool isZeroes = input.find_first_not_of("0") == std::string::npos;
-    if (isZeroes) {
-      // GMP drops the sign for -0.0, so we have handle this as a special case
-      if (repr[0] == '-') {
-        return $self->mk_fp_neg_zero(sort);
-      } else {
-        return $self->mk_fp_pos_zero(sort);
-      }
-    }
-
-    std::ostringstream output;
-    if (input[0] == '-') {
-      output << "-";
-      input.erase(0, 1);
-    }
-    if (exponent <= 0) {
-      output << "0.";
-      output << std::string(-exponent, '0');
-      output << input;
-    } else {
-      output << input.substr(0, exponent);
-      if (exponent > input.length()) {
-        output << std::string(exponent - input.length(), '0');
-      }
-      if (exponent < input.length()) {
-        output << '.' << input.substr(exponent);
-      }
-    }
-    delete[] mantissa;
-
-    // Create the term
-    return $self->mk_fp_value(sort, rm, output.str());
-  }
-}
-
 %ignore TermManager::mk_term(Kind, const std::vector<Term> &, const std::vector<uint64_t> &indices = {});
 %extend TermManager {
   Term mk_term(Kind kind, const Term &t1) {
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index f23544391a..219f45350f 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -85,7 +85,29 @@ private Sort mkFpaSort(FloatingPointType pType) {
   @Override
   protected Term makeNumberAndRound(
       String pN, FloatingPointType pType, Term pFloatingPointRoundingMode) {
-    return termManager.parse_fp_value(mkFpaSort(pType), pFloatingPointRoundingMode, pN);
+    // Convert input string to "canonical" format, that is without trailing zeroes, but at least
+    // one digit after the dot
+    String canonical = pN.replaceAll("(\\.[0-9]+?)0*$", "$1");
+    if (!canonical.contains(".")) {
+      canonical = canonical + ".0";
+    }
+
+    // Handle special cases
+    if (canonical.equals("-inf")) {
+      return termManager.mk_fp_neg_inf(mkFpaSort(pType));
+    }
+    if (canonical.equals("-0.0")) {
+      return termManager.mk_fp_neg_zero(mkFpaSort(pType));
+    }
+    if (canonical.equals("nan")) {
+      return termManager.mk_fp_nan(mkFpaSort(pType));
+    }
+    if (canonical.equals("inf")) {
+      return termManager.mk_fp_pos_inf(mkFpaSort(pType));
+    }
+
+    String decimalString = new BigDecimal(canonical).toPlainString();
+    return termManager.mk_fp_value(mkFpaSort(pType), pFloatingPointRoundingMode, decimalString);
   }
 
   @Override
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index ac492277f6..777b1bb59a 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -345,7 +345,7 @@ public void testFpModel() {
     Sort fpSort = termManager.mk_fp_sort(5, 11);
     Term rm = termManager.mk_rm_value(RoundingMode.RNE);
     Term a = termManager.mk_const(fpSort, "a");
-    Term one = termManager.parse_fp_value(fpSort, rm, "1");
+    Term one = termManager.mk_fp_value(fpSort, rm, "1");
     // Rational with 0 (or only 0s) as the second argument crashes Bitwuzla!
     Term two = termManager.mk_fp_value(fpSort, rm, "2", "1");
 
@@ -374,8 +374,8 @@ public void testFpToBv() {
     Sort fpSort = termManager.mk_fp_sort(5, 11);
     Term rm = termManager.mk_rm_value(RoundingMode.RTZ);
     Term a = termManager.mk_const(fpSort, "a");
-    Term one = termManager.parse_fp_value(fpSort, rm, "-1");
-    Term two = termManager.parse_fp_value(fpSort, rm, "2");
+    Term one = termManager.mk_fp_value(fpSort, rm, "-1");
+    Term two = termManager.mk_fp_value(fpSort, rm, "2");
 
     Term bvOne = termManager.mk_term(Kind.FP_TO_SBV, rm, one, 11 + 5);
     Term bvTwo = termManager.mk_term(Kind.FP_TO_SBV, rm, two, 11 + 5);
@@ -397,8 +397,8 @@ public void testFpToBv() {
     assertThat(bitwuzla.get_value(bvOne).toString()).isEqualTo("#b1111111111111111");
     assertThat(bitwuzla.get_value(bvTwo).toString()).isEqualTo("#b0000000000000010");
     // Now test -0.9 to 0 and 0.9 to 0
-    Term nearlyMin1 = termManager.parse_fp_value(fpSort, rm, "-0.9");
-    Term nearly1 = termManager.parse_fp_value(fpSort, rm, "0.9");
+    Term nearlyMin1 = termManager.mk_fp_value(fpSort, rm, "-0.9");
+    Term nearly1 = termManager.mk_fp_value(fpSort, rm, "0.9");
     Term bvnearlyMin1 = termManager.mk_term(Kind.FP_TO_SBV, rm, nearlyMin1, 11 + 5);
     Term bvnearly1 = termManager.mk_term(Kind.FP_TO_SBV, rm, nearly1, 11 + 5);
     Term b = termManager.mk_const(termManager.mk_bv_sort(11 + 5), "b");
@@ -420,8 +420,8 @@ public void testTypes() {
     Sort fpSort = termManager.mk_fp_sort(5, 11);
     Term rm = termManager.mk_rm_value(RoundingMode.RNE);
     Term a = termManager.mk_const(fpSort, "a");
-    Term one = termManager.parse_fp_value(fpSort, rm, "1");
-    Term two = termManager.parse_fp_value(fpSort, rm, "2");
+    Term one = termManager.mk_fp_value(fpSort, rm, "1");
+    Term two = termManager.mk_fp_value(fpSort, rm, "2");
 
     Sort boolSort = termManager.mk_bool_sort();
     //    Result res = termManager.mk_const(boolSort, "res");

From 0244742b2e7039dccbc3a1c7340946d02774bdc4 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Sat, 9 Mar 2024 21:53:21 +0100
Subject: [PATCH 069/158] Bitwuzla: Update to release 0.4.0

---
 lib/ivy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ivy.xml b/lib/ivy.xml
index c2af177085..84daee4886 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -167,7 +167,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
-        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.3.2-gd711df95" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
+        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-gbfc680c8" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->
         <dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.0-1-gc58fe5b4" conf="runtime-yices2->runtime; contrib->sources" />

From f39d450d38eeb3a41f01fb240146f4bca756a4bf Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Sat, 9 Mar 2024 21:54:50 +0100
Subject: [PATCH 070/158] Bitwuzla: Remove old build files before recompiling
 bitwuzla source.

---
 build/build-publish-solvers.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/build-publish-solvers.xml b/build/build-publish-solvers.xml
index ac3bbc45af..0f2a30dbe8 100644
--- a/build/build-publish-solvers.xml
+++ b/build/build-publish-solvers.xml
@@ -872,6 +872,7 @@ SPDX-License-Identifier: Apache-2.0
         <!-- build bitwuzla -->
         <exec executable="./configure.py" dir="${bitwuzla.path}" failonerror="true">
             <arg value="--shared"/>
+            <arg value="--wipe"/>
             <arg value="--prefix"/>
             <arg value="${bitwuzla.path}/install"/>
         </exec>

From e6d705d1dc8d26647c2046506416dd388a47f7b3 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 14 Mar 2024 16:11:09 +0100
Subject: [PATCH 071/158] Bitwuzla: Update Bitwuzla to the latest git commit.
 The new version includes a method that allows us to read out all symbols that
 were defined during a parser run. This will help us fix some issues with our
 current parser code for Bitwuzla.

---
 lib/ivy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ivy.xml b/lib/ivy.xml
index 84daee4886..076290130d 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -167,7 +167,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
-        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-gbfc680c8" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
+        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-ge94e1f51" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->
         <dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.0-1-gc58fe5b4" conf="runtime-yices2->runtime; contrib->sources" />

From b4a347e8507fcdbd4530a0ac054f15adf5cfa48b Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 14 Mar 2024 16:13:53 +0100
Subject: [PATCH 072/158] Bitwuzla: Updated BitwuzlaFormulaManager.parse to use
 the new method from the Bitwuzla API. We're now able to keep our variable
 cache synchronized with the variable context of the Bitwuzla solver. This
 allows us to mix API calls with parser calls that all use the same variables.

---
 .../bitwuzla/BitwuzlaFormulaManager.java      | 131 +++++++++++++++++-
 1 file changed, 128 insertions(+), 3 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index e39406c4db..4186b96f8f 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -9,21 +9,26 @@
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Table;
+import com.google.common.collect.Table.Cell;
 import java.io.IOException;
+import java.util.List;
 import org.sosy_lab.common.Appender;
 import org.sosy_lab.common.Appenders;
 import org.sosy_lab.java_smt.api.BooleanFormula;
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormulaManager;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Bitwuzla;
+import org.sosy_lab.java_smt.solvers.bitwuzla.api.Map_TermTerm;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Options;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Parser;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Sort;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Vector_Term;
 
-final class BitwuzlaFormulaManager
+public final class BitwuzlaFormulaManager
     extends AbstractFormulaManager<Term, Sort, Void, BitwuzlaDeclaration> {
   private final BitwuzlaFormulaCreator creator;
   private final Options bitwuzlaOption;
@@ -54,6 +59,50 @@ final class BitwuzlaFormulaManager
     bitwuzlaOption = pBitwuzlaOptions;
   }
 
+  // Split up a sequence of lisp expressions
+  // f.ex "(define-const a Int)(assert (= a 0)" becomes ["(define-const a Int)", "(assert (= a 0))"]
+  public static List<String> tokenize(String input) {
+    ImmutableList.Builder<String> builder = ImmutableList.builder();
+    int level = 0;
+    StringBuilder read = new StringBuilder();
+    for (char c : input.toCharArray()) {
+      if (level == 0) {
+        if (!Character.isWhitespace(c)) {
+          if (c == '(') {
+            read.append("(");
+            level++;
+          } else {
+            // All top-level expressions should have parentheses around them
+            throw new IllegalArgumentException();
+          }
+        }
+      } else {
+        read.append(c);
+        if (c == '(') {
+          level++;
+        }
+        if (c == ')') {
+          if (level == 1) {
+            builder.add(read.toString());
+            read = new StringBuilder();
+          }
+          level--;
+        }
+      }
+    }
+    if (level != 0) {
+      // Missing closing parenthesis
+      throw new IllegalArgumentException();
+    }
+    return builder.build();
+  }
+
+  // Check if the token is a function or variable declaration
+  public static boolean isDecl(String token) {
+    // TODO: How to handle function *definitions*? And are they supported by Bitwuzla?
+    return token.matches("\\(\\s*(declare-const|declare-fun).*");
+  }
+
   @Override
   public BooleanFormula parse(String formulaStr) throws IllegalArgumentException {
     // Strip the input string and remove everything but declarations and assertions
@@ -69,14 +118,90 @@ public BooleanFormula parse(String formulaStr) throws IllegalArgumentException {
       s = s.replace("(exit)", "");
     }
 
+    // Split the input string into a list of SMT-LIB2 commands
+    List<String> tokens = tokenize(s);
+
+    Table<String, Sort, Term> cache = creator.getCache();
+
+    // Process the declarations
+    ImmutableList.Builder<String> processed = ImmutableList.builder();
+    for (String token : tokens) {
+      if (isDecl(token)) {
+        Parser declParser = new Parser(creator.getTermManager(), bitwuzlaOption);
+        declParser.parse(token, true, false);
+        Term parsed = declParser.get_declared_funs().get(0);
+
+        // Check if the symbol is already defined in the variable cache
+        if (cache.containsRow(parsed.symbol())) {
+          if (!cache.contains(parsed.symbol(), parsed.sort())) {
+            // Sort of the definition that we parsed does not match the sort from the variable
+            // cache.
+            throw new IllegalArgumentException();
+          }
+          // Skip if it's just a redefinition
+          continue;
+        }
+      }
+      // Otherwise, keep the command
+      processed.add(token);
+    }
+
+    // Build SMT-LIB2 declarations for all variables in the cache
+    ImmutableList.Builder<String> builder = ImmutableList.builder();
+    for (Cell<String, Sort, Term> c : cache.cellSet()) {
+      String symbol = c.getRowKey();
+      List<Sort> args = ImmutableList.of();
+      Sort sort = c.getColumnKey();
+      if (sort.is_fun()) {
+        args = sort.fun_domain();
+        sort = sort.fun_codomain();
+      }
+      StringBuilder decl = new StringBuilder();
+      decl.append("(declare-fun").append(" ");
+      decl.append(symbol).append(" ");
+      decl.append("(");
+      for (Sort p : args) {
+        decl.append(p).append(" ");
+      }
+      decl.append(")").append(" ");
+      decl.append(sort);
+      decl.append(")");
+
+      builder.add(decl.toString());
+    }
+    String decls = String.join("\n", builder.build());
+    String input = String.join("\n", processed.build());
+
+    // Add the declarations to the input and parse everything
     Parser parser = new Parser(creator.getTermManager(), bitwuzlaOption);
-    parser.parse(s, true, false);
+    parser.parse(decls + input, true, false);
 
+    // After the run, get the final assertion from the parser
     Vector_Term assertions = parser.bitwuzla().get_assertions();
     Preconditions.checkArgument(
         !assertions.isEmpty(), "No assertion found in input string \"%s\"", formulaStr);
+    Term result = Iterables.getLast(assertions);
+
+    // Now get all symbols that were declared in the input
+    Vector_Term declared = parser.get_declared_funs();
+
+    // Process the symbols from the parser
+    Map_TermTerm subst = new Map_TermTerm();
+    for (Term term : declared) {
+      if (cache.containsRow(term.symbol())) {
+        // Symbol is from the context: add the original term to the substitution map
+        subst.put(term, cache.get(term.symbol(), term.sort()));
+      } else {
+        // Symbol is new, add it to the context
+        cache.put(term.symbol(), term.sort(), term);
+      }
+    }
+
+    // Substitude all symbols from the context with their original terms
+    result = creator.getTermManager().substitute_term(result, subst);
 
-    return creator.encapsulateBoolean(Iterables.getLast(assertions));
+    // Return the updated term
+    return creator.encapsulateBoolean(result);
   }
 
   @Override

From dbe1dceced8ba90bed95d8c17411a678a91ae950 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 14 Mar 2024 16:37:44 +0100
Subject: [PATCH 073/158] Bitwuzla: Enabled tests that were blocked by the
 missing parser features.

---
 .../test/SolverFormulaIODeclarationsTest.java | 29 ++++++++-----------
 .../java_smt/test/SolverFormulaIOTest.java    | 24 ---------------
 2 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java b/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
index 07108a75fe..3316fcdda0 100644
--- a/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
@@ -9,7 +9,6 @@
 package org.sosy_lab.java_smt.test;
 
 import static com.google.common.truth.Truth.assert_;
-import static com.google.common.truth.TruthJUnit.assume;
 import static org.junit.Assert.assertThrows;
 import static org.sosy_lab.java_smt.api.FormulaType.BooleanType;
 import static org.sosy_lab.java_smt.api.FormulaType.IntegerType;
@@ -68,9 +67,6 @@ public void parseDeclareAfterQueryTest1() {
     String query = "(declare-fun var () Bool)(assert var)";
     BooleanFormula formula = mgr.parse(query);
     BooleanFormula var = bmgr.makeVariable("var");
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla returns 2 distinct variables
-    // TODO: investigate and fix
     Truth.assertThat(mgr.extractVariables(formula).values()).containsExactly(var);
   }
 
@@ -129,9 +125,6 @@ public void parseDeclareNeverTest4() {
 
   @Test
   public void parseDeclareBeforeTest() {
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla just throws an error for this case
-    // TODO: investigate and report to the devs
     String query = "(assert var)";
     BooleanFormula var = bmgr.makeVariable("var");
     BooleanFormula formula = mgr.parse(query);
@@ -167,6 +160,18 @@ public void parseDeclareRedundantTest2() {
       Truth.assertThat(mgr.extractVariablesAndUFs(formula).values()).containsExactly(var);
     }
   }
+  @Test
+  public void parseDeclareRedundantBvTest() {
+    requireBitvectors();
+    BitvectorFormula var = bvmgr.makeVariable(8, "x");
+    String query = "(declare-fun x () (_ BitVec 8))(declare-fun x () (_ BitVec 8))(assert (= x x))";
+    if (EnumSet.of(Solvers.BITWUZLA).contains(solverToUse())) {
+      BooleanFormula formula = mgr.parse(query);
+      Truth.assertThat(mgr.extractVariables(formula).values()).containsExactly(var);
+    } else {
+      assertThrows(IllegalArgumentException.class, () -> mgr.parse(query));
+    }
+  }
 
   @Test
   public void parseDeclareConflictInQueryTest1() {
@@ -233,9 +238,6 @@ public void parseDeclareOnceNotTwiceTest1() {
     String query2 = "(assert (not x))";
     BooleanFormula formula1 = mgr.parse(query1);
     Truth.assertThat(mgr.extractVariables(formula1).values()).hasSize(1);
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla just throws an error for this case
-    // TODO: investigate and report to the devs
     BooleanFormula formula2 = mgr.parse(query2);
     Truth.assertThat(mgr.extractVariables(formula2).values()).hasSize(1);
     Truth.assertThat(mgr.extractVariables(formula1)).isEqualTo(mgr.extractVariables(formula2));
@@ -249,9 +251,6 @@ public void parseTwiceTest1() {
     Truth.assertThat(mgr.extractVariables(formula1).values()).hasSize(1);
     BooleanFormula formula2 = mgr.parse(query2);
     Truth.assertThat(mgr.extractVariables(formula2).values()).hasSize(1);
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla returns 2 distinct variables
-    // TODO: investigate and fix
     Truth.assertThat(formula1).isEqualTo(formula2);
   }
 
@@ -275,9 +274,6 @@ public void parseDeclareOnceNotTwiceTest3() {
     String query2 = "(assert y)";
     BooleanFormula formula1 = mgr.parse(query1);
     Truth.assertThat(mgr.extractVariablesAndUFs(formula1).values()).hasSize(1);
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla just throws an error for this case
-    // TODO: investigate and report to the devs
     if (Solvers.Z3 == solverToUse()) {
       // "y" is unknown for the second query.
       assertThrows(IllegalArgumentException.class, () -> mgr.parse(query2));
@@ -290,7 +286,6 @@ public void parseDeclareOnceNotTwiceTest3() {
   @Test
   public void parseAbbreviation() throws SolverException, InterruptedException {
     requireBitvectors();
-
     String query =
         "(declare-fun bb () Bool)\n"
             + "(declare-fun b () Bool)\n"
diff --git a/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java b/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
index 4cd505f661..155651f13a 100644
--- a/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
@@ -239,9 +239,6 @@ public void funcsDumpTest() {
   @Test
   public void parseMathSatTestParseFirst1() throws SolverException, InterruptedException {
     requireParser();
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla returns 2 distinct variables
-    // TODO: investigate and fix
     compareParseWithOrgParseFirst(MATHSAT_DUMP1, this::genBoolExpr);
   }
 
@@ -254,36 +251,24 @@ public void parseMathSatTestExprFirst1() throws SolverException, InterruptedExce
   @Test
   public void parseSmtinterpolTestParseFirst1() throws SolverException, InterruptedException {
     requireParser();
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla returns 2 distinct variables
-    // TODO: investigate and fix
     compareParseWithOrgParseFirst(SMTINTERPOL_DUMP1, this::genBoolExpr);
   }
 
   @Test
   public void parseSmtinterpolTestExprFirst1() throws SolverException, InterruptedException {
     requireParser();
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla returns 2 distinct variables
-    // TODO: investigate and fix
     compareParseWithOrgExprFirst(SMTINTERPOL_DUMP1, this::genBoolExpr);
   }
 
   @Test
   public void parseZ3TestParseFirst1() throws SolverException, InterruptedException {
     requireParser();
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla returns 2 distinct variables
-    // TODO: investigate and fix
     compareParseWithOrgParseFirst(Z3_DUMP1, this::genBoolExpr);
   }
 
   @Test
   public void parseZ3TestExprFirst1() throws SolverException, InterruptedException {
     requireParser();
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla returns 2 distinct variables
-    // TODO: investigate and fix
     compareParseWithOrgExprFirst(Z3_DUMP1, this::genBoolExpr);
   }
 
@@ -405,9 +390,6 @@ private void compareParseWithOrgExprFirst(String textToParse, Supplier<BooleanFo
     // Boolector will fail this anyway since bools are bitvecs for btor
     TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BOOLECTOR);
 
-    // FIXME: Bitwuzla seems to have similar issues?
-    TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BITWUZLA);
-
     // check if input is correct
     checkThatFunOnlyDeclaredOnce(textToParse);
     checkThatAssertIsInLastLine(textToParse);
@@ -415,9 +397,6 @@ private void compareParseWithOrgExprFirst(String textToParse, Supplier<BooleanFo
     // actual test
     BooleanFormula expr = fun.get();
     BooleanFormula parsedForm = mgr.parse(textToParse);
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BITWUZLA);
-    // Bitwuzla returns 2 distinct variables
-    // TODO: investigate and fix
     assertThatFormula(parsedForm).isEquivalentTo(expr);
   }
 
@@ -426,9 +405,6 @@ private void compareParseWithOrgParseFirst(String textToParse, Supplier<BooleanF
     // Boolector will fail this anyway since bools are bitvecs for btor
     TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BOOLECTOR);
 
-    // FIXME: Bitwuzla seems to have similar issues?
-    TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BITWUZLA);
-
     // check if input is correct
     checkThatFunOnlyDeclaredOnce(textToParse);
     checkThatAssertIsInLastLine(textToParse);

From f71a7be3ab9305c4e5bf7d4a4bbd4fe896ef8cb4 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 14 Mar 2024 16:42:38 +0100
Subject: [PATCH 074/158] Bitwuzla: Enabled 2 more tests that were blocked by
 missing features that have now been added to Bitwuzla.

---
 .../java_smt/test/FloatingPointFormulaManagerTest.java     | 5 -----
 src/org/sosy_lab/java_smt/test/SolverVisitorTest.java      | 7 +++----
 src/org/sosy_lab/java_smt/test/TimeoutTest.java            | 4 ----
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
index 4013d233a9..a8b2799807 100644
--- a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
@@ -680,11 +680,6 @@ public void fpTraversalWithRoundingMode() {
 
   @Test
   public void fpIeeeConversionTypes() {
-    assume()
-        .withMessage("FP-to-BV conversion not available for %s", solverToUse())
-        .that(solverToUse())
-        .isNoneOf(Solvers.CVC4, Solvers.CVC5, Solvers.BITWUZLA);
-
     FloatingPointFormula var = fpmgr.makeVariable("var", singlePrecType);
     assertThat(mgr.getFormulaType(fpmgr.toIeeeBitvector(var)))
         .isEqualTo(FormulaType.getBitvectorTypeWithSize(32));
diff --git a/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java b/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
index ed4cd4932b..409eff4dec 100644
--- a/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
@@ -362,10 +362,9 @@ public void floatMoreVisit() {
     checkKind(fpmgr.sqrt(x), FunctionDeclarationKind.FP_SQRT);
     if (!List.of(Solvers.CVC4, Solvers.CVC5, Solvers.BITWUZLA)
         .contains(solverToUse())) { // CVC4/CVC5 and bitwuzla do not support this operation
-      // On Bitwuzla we now use a workaround that replaces "fp_to_bv(fpTerm)" with "newVar" and then
-      // adds the assertion "fpTerm = bv_to_fp(newVar)" as a side condition.
-      // Unfortunately this does not solve the problem in this test and there is no way of fixing
-      // it.
+      // On Bitwuzla we replaces "fp_to_bv(fpTerm)" with "newVar" and the adds the assertion
+      // "fpTerm = bv_to_fp(newVar)" as a side condition. Unfortunately this workaround will not
+      // work for this test.
       checkKind(fpmgr.toIeeeBitvector(x), FunctionDeclarationKind.FP_AS_IEEEBV);
     }
     checkKind(
diff --git a/src/org/sosy_lab/java_smt/test/TimeoutTest.java b/src/org/sosy_lab/java_smt/test/TimeoutTest.java
index e75926a2c4..aa79d0ca53 100644
--- a/src/org/sosy_lab/java_smt/test/TimeoutTest.java
+++ b/src/org/sosy_lab/java_smt/test/TimeoutTest.java
@@ -96,10 +96,6 @@ public void testProverTimeoutBv() throws InterruptedException {
         .withMessage(solverToUse() + " does not support interruption")
         .that(solverToUse())
         .isNoneOf(Solvers.PRINCESS, Solvers.CVC5);
-    TruthJUnit.assume()
-        .withMessage(solverToUse() + " does not support sort/term creation in different threads.")
-        .that(solverToUse())
-        .isNotEqualTo(Solvers.BITWUZLA);
     testBasicProverTimeoutBv(() -> context.newProverEnvironment());
   }
 

From 77781cc97a72c74d30b8d4dd374919555ae5b24a Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 14 Mar 2024 17:22:52 +0100
Subject: [PATCH 075/158] Bitwuzla: Fixed handling of quoted symbols in the
 parser.

---
 .../solvers/bitwuzla/BitwuzlaFormulaManager.java  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index 4186b96f8f..b7c7aa3483 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -131,9 +131,16 @@ public BooleanFormula parse(String formulaStr) throws IllegalArgumentException {
         declParser.parse(token, true, false);
         Term parsed = declParser.get_declared_funs().get(0);
 
+        String symbol = parsed.symbol();
+        if (symbol.startsWith("|") && symbol.endsWith("|")) {
+          // Strip quotes from the name
+          symbol = symbol.substring(1, symbol.length() - 1);
+        }
+        Sort sort = parsed.sort();
+
         // Check if the symbol is already defined in the variable cache
-        if (cache.containsRow(parsed.symbol())) {
-          if (!cache.contains(parsed.symbol(), parsed.sort())) {
+        if (cache.containsRow(symbol)) {
+          if (!cache.contains(symbol, sort)) {
             // Sort of the definition that we parsed does not match the sort from the variable
             // cache.
             throw new IllegalArgumentException();
@@ -149,7 +156,7 @@ public BooleanFormula parse(String formulaStr) throws IllegalArgumentException {
     // Build SMT-LIB2 declarations for all variables in the cache
     ImmutableList.Builder<String> builder = ImmutableList.builder();
     for (Cell<String, Sort, Term> c : cache.cellSet()) {
-      String symbol = c.getRowKey();
+      String symbol = c.getValue().toString();
       List<Sort> args = ImmutableList.of();
       Sort sort = c.getColumnKey();
       if (sort.is_fun()) {
@@ -197,7 +204,7 @@ public BooleanFormula parse(String formulaStr) throws IllegalArgumentException {
       }
     }
 
-    // Substitude all symbols from the context with their original terms
+    // Substitute all symbols from the context with their original terms
     result = creator.getTermManager().substitute_term(result, subst);
 
     // Return the updated term

From 4c223cb4a2a9f62ed026193813966abd18833641 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 14 Mar 2024 17:23:40 +0100
Subject: [PATCH 076/158] Bitwuzla: Fixed formating.

---
 .../sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java b/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
index 3316fcdda0..5d2bc6948c 100644
--- a/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
@@ -160,6 +160,7 @@ public void parseDeclareRedundantTest2() {
       Truth.assertThat(mgr.extractVariablesAndUFs(formula).values()).containsExactly(var);
     }
   }
+
   @Test
   public void parseDeclareRedundantBvTest() {
     requireBitvectors();

From 6137a9592e9034e4f2408b171f662deb8296a3c8 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 3 Apr 2024 19:48:01 +0200
Subject: [PATCH 077/158] Bitwuzla: Added a case for Kind.BV_SMOD in
 BitwuzlaFormulaCreator.getDeclarationKind to fix two tests in
 SolverVisitorTest.

---
 .../java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index 0de3ddf238..2c52e68f2c 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -223,6 +223,8 @@ private FunctionDeclarationKind getDeclarationKind(Term term) {
       return FunctionDeclarationKind.BV_SLE;
     } else if (kind.equals(Kind.BV_SLT)) {
       return FunctionDeclarationKind.BV_SLT;
+    } else if (kind.equals(Kind.BV_SMOD)) {
+      return FunctionDeclarationKind.BV_SMOD;
     } else if (kind.equals(Kind.BV_SREM)) {
       return FunctionDeclarationKind.BV_SREM;
     } else if (kind.equals(Kind.BV_SUB)) {

From 658a3de610ef73a1236df1c2b87e77fae9bdee7b Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 3 Apr 2024 19:48:40 +0200
Subject: [PATCH 078/158] Bitwuzla: Added missing methods to
 BitwuzlaFloatingPointManager.

---
 .../bitwuzla/BitwuzlaFloatingPointManager.java       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index af9063d817..4630f82071 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -85,8 +85,16 @@ protected Term makeNumberImpl(
       BigInteger mantissa,
       boolean signBit,
       FloatingPointType type) {
-    // FIXME: Implement by converting the arguments to bitvectors?
-    throw new UnsupportedOperationException();
+    Sort signSort = termManager.mk_bv_sort(1);
+    Term signTerm = termManager.mk_bv_value(signSort, signBit ? "1" : "0");
+
+    Sort expSort = termManager.mk_bv_sort(type.getExponentSize());
+    Term expTerm = termManager.mk_bv_value(expSort, exponent.toString(2));
+
+    Sort mantissaSort = termManager.mk_bv_sort(type.getMantissaSize());
+    Term mantissaTerm = termManager.mk_bv_value(mantissaSort, mantissa.toString(2));
+
+    return termManager.mk_fp_value(signTerm, expTerm, mantissaTerm);
   }
 
   private Sort mkFpaSort(FloatingPointType pType) {

From 4b2f4e1169c0de3999e91db783e6588bc8e0f89d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 3 Apr 2024 21:41:21 +0200
Subject: [PATCH 079/158] Bitwuzla: Add native Bitwuzla support for rotate by
 constant in BitwuzlaBitvectorFormulaManager.

---
 .../BitwuzlaBitvectorFormulaManager.java      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
index c76d392efa..8c449e473d 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
@@ -165,6 +165,26 @@ protected Term shiftLeft(Term pNumber, Term toShift) {
     return termManager.mk_term(Kind.BV_SHL, pNumber, toShift);
   }
 
+  @Override
+  public Term rotateLeftByConstant(Term bitVec, int toRotate) {
+    return termManager.mk_term(Kind.BV_ROLI, bitVec, toRotate);
+  }
+
+  @Override
+  public Term rotateLeft(Term bitVec, Term toRotate) {
+    return termManager.mk_term(Kind.BV_ROL, bitVec, toRotate);
+  }
+
+  @Override
+  public Term rotateRightByConstant(Term bitVec, int toRotate) {
+    return termManager.mk_term(Kind.BV_RORI, bitVec, toRotate);
+  }
+
+  @Override
+  public Term rotateRight(Term bitVec, Term toRotate) {
+    return termManager.mk_term(Kind.BV_ROR, bitVec, toRotate);
+  }
+
   @Override
   protected Term concat(Term number, Term pAppend) {
     return termManager.mk_term(Kind.BV_CONCAT, number, pAppend);

From cbe27b6b55d191c02ca79424a66d9d2347ea5a1d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 3 Apr 2024 22:20:41 +0200
Subject: [PATCH 080/158] Bitwuzla: Removed unused file and cleaned up some of
 the changes from the merge.

---
 .idea/misc.xml                                |  18 ++-
 .../solvers/bitwuzla/NumericValue.java        |  79 ------------
 .../solvers/yices2/Yices2FormulaCreator.java  | 112 +++++++++++++++++-
 3 files changed, 124 insertions(+), 85 deletions(-)
 delete mode 100644 src/org/sosy_lab/java_smt/solvers/bitwuzla/NumericValue.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a29838dd3d..ce7f947e76 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+This file is part of JavaSMT,
+an API wrapper for a collection of SMT solvers:
+https://github.com/sosy-lab/java-smt
+
+SPDX-FileCopyrightText: 2020 Dirk Beyer <https://www.sosy-lab.org>
+
+SPDX-License-Identifier: Apache-2.0
+-->
+
 <project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="javax.annotation.Nullable" />
     <option name="myDefaultNotNull" value="javax.annotation.Nonnull" />
@@ -37,7 +51,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/bin" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/NumericValue.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/NumericValue.java
deleted file mode 100644
index 8b631533ce..0000000000
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/NumericValue.java
+++ /dev/null
@@ -1,79 +0,0 @@
-// This file is part of JavaSMT,
-// an API wrapper for a collection of SMT solvers:
-// https://github.com/sosy-lab/java-smt
-//
-// SPDX-FileCopyrightText: 2023 Dirk Beyer <https://www.sosy-lab.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package org.sosy_lab.java_smt.solvers.bitwuzla;
-
-/*
-public class NumericValue {
-  private transient long swigCPtr;
-  protected transient boolean swigCMemOwn;
-
-  protected NumericValue(long cPtr, boolean cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  protected static long getCPtr(NumericValue obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-
-  public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        BitwuzlaJNI.delete_NumericValue(swigCPtr);
-      }
-      swigCPtr = 0;
-    }
-  }
-
-  public void setCur(long value) {
-    BitwuzlaJNI.NumericValue_cur_set(swigCPtr, this, value);
-  }
-
-  public long getCur() {
-    return BitwuzlaJNI.NumericValue_cur_get(swigCPtr, this);
-  }
-
-  public void setDflt(long value) {
-    BitwuzlaJNI.NumericValue_dflt_set(swigCPtr, this, value);
-  }
-
-  public long getDflt() {
-    return BitwuzlaJNI.NumericValue_dflt_get(swigCPtr, this);
-  }
-
-  public void setMin(long value) {
-    BitwuzlaJNI.NumericValue_min_set(swigCPtr, this, value);
-  }
-
-  public long getMin() {
-    return BitwuzlaJNI.NumericValue_min_get(swigCPtr, this);
-  }
-
-  public void setMax(long value) {
-    BitwuzlaJNI.NumericValue_max_set(swigCPtr, this, value);
-  }
-
-  public long getMax() {
-    return BitwuzlaJNI.NumericValue_max_get(swigCPtr, this);
-  }
-
-  public NumericValue() {
-    this(BitwuzlaJNI.new_NumericValue(), true);
-  }
-}
-*/
diff --git a/src/org/sosy_lab/java_smt/solvers/yices2/Yices2FormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/yices2/Yices2FormulaCreator.java
index 5bcf3f1ded..b6c78c91e8 100644
--- a/src/org/sosy_lab/java_smt/solvers/yices2/Yices2FormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/yices2/Yices2FormulaCreator.java
@@ -8,7 +8,114 @@
 
 package org.sosy_lab.java_smt.solvers.yices2;
 
-import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.*;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_ABS;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_AND;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_APP_TERM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_ARITH_CONST;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_ARITH_GE_ATOM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_ARITH_SUM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BIT_TERM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BOOL_CONST;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_ARRAY;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_ASHR;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_CONST;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_DIV;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_GE_ATOM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_LSHR;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_MUL;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_REM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_SDIV;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_SGE_ATOM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_SHL;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_SMOD;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_SREM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_BV_SUM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_CEIL;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_DISTINCT_TERM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_DIVIDES_ATOM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_EQ_TERM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_FLOOR;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_IDIV;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_IMOD;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_IS_INT_ATOM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_ITE_TERM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_NOT_TERM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_OR_TERM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_POWER_PRODUCT;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_RDIV;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_SELECT_TERM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_UNINTERPRETED_TERM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_VARIABLE;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.YICES_XOR_TERM;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_abs;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_and;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_application;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_arith_geq_atom;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bitextract;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bool_const_value;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bool_type;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bv_const_value;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bv_type;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvarray;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvashr;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvconst_from_array;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvdiv;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvge_atom;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvlshr;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvmul;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvpower;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvproduct;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvrem;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvsdiv;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvsge_atom;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvshl;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvsmod;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvsrem;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvsum;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvsum_component;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_bvtype_size;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_ceil;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_distinct;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_divides_atom;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_division;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_eq;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_floor;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_function_type;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_get_term_name;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_idiv;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_imod;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_int32;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_int_type;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_is_int_atom;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_ite;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_mul;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_named_variable;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_not;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_or;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_parse_rational;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_power;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_product;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_product_component;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_proj_arg;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_proj_index;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_rational_const_value;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_real_type;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_sum;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_sum_component;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_term_bitsize;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_term_child;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_term_constructor;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_term_is_bitvector;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_term_is_bool;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_term_is_int;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_term_is_real;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_term_num_children;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_term_to_string;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_true;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_type_is_bitvector;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_type_of_term;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_type_to_string;
+import static org.sosy_lab.java_smt.solvers.yices2.Yices2NativeApi.yices_xor;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
@@ -215,9 +322,6 @@ private <R> R visitFunctionApplication(
       case YICES_BV_SREM:
         functionKind = FunctionDeclarationKind.BV_SREM;
         break;
-      case YICES_BV_SMOD:
-        functionKind = FunctionDeclarationKind.BV_SMOD;
-        break;
       case YICES_BV_SHL:
         functionKind = FunctionDeclarationKind.BV_SHL;
         break;

From 4bf6a714b05941434d5eec1ad4fc63ddca45e6a0 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 12:46:53 +0200
Subject: [PATCH 081/158] Bitwuzla: Restored changes that were lost in the
 merge.

---
 .idea/JavaSMT.iml                             |  9 +++++++
 README.md                                     | 25 ++++++++++---------
 build.xml                                     |  1 +
 lib/native/x86_64-linux/libbitwuzla.so        |  1 +
 lib/native/x86_64-linux/libbitwuzlaJNI.so     |  1 +
 lib/native/x86_64-linux/libbitwuzlabb.so      |  1 +
 lib/native/x86_64-linux/libbitwuzlabv.so      |  1 +
 lib/native/x86_64-linux/libbitwuzlals.so      |  1 +
 lib/native/x86_64-linux/libgmp.so             |  1 +
 .../java_smt/SolverContextFactory.java        |  8 +++++-
 .../solvers/bitwuzla/package-info.java        | 14 +++++++++++
 .../test/BitvectorFormulaManagerTest.java     |  2 +-
 .../test/SolverContextFactoryTest.java        | 16 ++++++++++++
 .../test/SolverFormulaIODeclarationsTest.java |  1 +
 .../java_smt/test/SolverTheoriesTest.java     |  2 +-
 15 files changed, 69 insertions(+), 15 deletions(-)
 create mode 120000 lib/native/x86_64-linux/libbitwuzla.so
 create mode 120000 lib/native/x86_64-linux/libbitwuzlaJNI.so
 create mode 120000 lib/native/x86_64-linux/libbitwuzlabb.so
 create mode 120000 lib/native/x86_64-linux/libbitwuzlabv.so
 create mode 120000 lib/native/x86_64-linux/libbitwuzlals.so
 create mode 120000 lib/native/x86_64-linux/libgmp.so
 create mode 100644 src/org/sosy_lab/java_smt/solvers/bitwuzla/package-info.java

diff --git a/.idea/JavaSMT.iml b/.idea/JavaSMT.iml
index 6923bc643d..4062ca5f6b 100644
--- a/.idea/JavaSMT.iml
+++ b/.idea/JavaSMT.iml
@@ -331,6 +331,15 @@ SPDX-License-Identifier: Apache-2.0
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/java/runtime-bitwuzla/bitwuzla.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
diff --git a/README.md b/README.md
index 0ed6cb8148..897dc66eaf 100644
--- a/README.md
+++ b/README.md
@@ -56,18 +56,19 @@ Only a few SMT solvers provide support for theories like Arrays, Floating Point,
 
 Currently JavaSMT supports several SMT solvers (see [Getting Started](doc/Getting-started.md) for installation):
 
-| SMT Solver | Linux64 | Windows64 | MacOS | Description |
-| --- |:---:|:---:|:---:|:--- |
-| [Boolector](https://boolector.github.io/) | :heavy_check_mark: |  |  | a fast solver for bitvector logic, misses formula introspection |
-| [CVC4](https://cvc4.github.io/) | :heavy_check_mark: |  |  |  |
-| [CVC5](https://cvc5.github.io/) | :heavy_check_mark: |  |  | new! |
-| [MathSAT5](http://mathsat.fbk.eu/) | :heavy_check_mark: | :heavy_check_mark: |  |  |
-| [OpenSMT](https://verify.inf.usi.ch/opensmt) | :heavy_check_mark: |  |  | new! |
-| [OptiMathSAT](http://optimathsat.disi.unitn.it/) | :heavy_check_mark: |  |  | based on MathSAT5, with support for optimization |
-| [Princess](http://www.philipp.ruemmer.org/princess.shtml) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver |
-| [SMTInterpol](https://ultimate.informatik.uni-freiburg.de/smtinterpol/) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver |
-| [Yices2](https://yices.csl.sri.com/) | :heavy_check_mark: | [soon](https://github.com/sosy-lab/java-smt/pull/215) |  |  |
-| [Z3](https://github.com/Z3Prover/z3) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | mature and well-known solver |
+| SMT Solver                                                              | Linux64 | Windows64 | MacOS | Description                                                                  |
+|-------------------------------------------------------------------------|:---:|:---:|:---:|:-----------------------------------------------------------------------------|
+| [Bitwuzla](https://boolector.github.io/)                                | :heavy_check_mark: |  |  | a fast solver for bitvector and floating-point logic, successor of Boolector |
+| [Boolector](https://boolector.github.io/)                               | :heavy_check_mark: |  |  | a fast solver for bitvector logic, misses formula introspection              |
+| [CVC4](https://cvc4.github.io/)                                         | :heavy_check_mark: |  |  |                                                                              |
+| [CVC5](https://cvc5.github.io/)                                         | :heavy_check_mark: |  |  | new!                                                                         |
+| [MathSAT5](http://mathsat.fbk.eu/)                                      | :heavy_check_mark: | :heavy_check_mark: |  |                                                                              |
+| [OpenSMT](https://verify.inf.usi.ch/opensmt)                            | :heavy_check_mark: |  |  | new!                                                                         |
+| [OptiMathSAT](http://optimathsat.disi.unitn.it/)                        | :heavy_check_mark: |  |  | based on MathSAT5, with support for optimization                             |
+| [Princess](http://www.philipp.ruemmer.org/princess.shtml)               | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver                                                        |
+| [SMTInterpol](https://ultimate.informatik.uni-freiburg.de/smtinterpol/) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver                                                        |
+| [Yices2](https://yices.csl.sri.com/)                                    | :heavy_check_mark: | [soon](https://github.com/sosy-lab/java-smt/pull/215) |  |                                                                              |
+| [Z3](https://github.com/Z3Prover/z3)                                    | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | mature and well-known solver                                                 |
 
 The following features are supported (depending on the used SMT solver):
 
diff --git a/build.xml b/build.xml
index 3004ad1a45..8a7e11c9ce 100644
--- a/build.xml
+++ b/build.xml
@@ -22,6 +22,7 @@ SPDX-License-Identifier: Apache-2.0
 
     <!-- one configuration per solver -->
     <property name="ivy.solver.configurations" value="
+        runtime-bitwuzla,
         runtime-boolector,
         runtime-cvc4,
         runtime-cvc5,
diff --git a/lib/native/x86_64-linux/libbitwuzla.so b/lib/native/x86_64-linux/libbitwuzla.so
new file mode 120000
index 0000000000..932b20f6f2
--- /dev/null
+++ b/lib/native/x86_64-linux/libbitwuzla.so
@@ -0,0 +1 @@
+../../java/runtime-bitwuzla/libbitwuzla.so
\ No newline at end of file
diff --git a/lib/native/x86_64-linux/libbitwuzlaJNI.so b/lib/native/x86_64-linux/libbitwuzlaJNI.so
new file mode 120000
index 0000000000..e395b705de
--- /dev/null
+++ b/lib/native/x86_64-linux/libbitwuzlaJNI.so
@@ -0,0 +1 @@
+../../java/runtime-bitwuzla/libbitwuzlaJNI.so
\ No newline at end of file
diff --git a/lib/native/x86_64-linux/libbitwuzlabb.so b/lib/native/x86_64-linux/libbitwuzlabb.so
new file mode 120000
index 0000000000..c9ee34f14b
--- /dev/null
+++ b/lib/native/x86_64-linux/libbitwuzlabb.so
@@ -0,0 +1 @@
+../../java/runtime-bitwuzla/libbitwuzlabb.so
\ No newline at end of file
diff --git a/lib/native/x86_64-linux/libbitwuzlabv.so b/lib/native/x86_64-linux/libbitwuzlabv.so
new file mode 120000
index 0000000000..ad3a78e455
--- /dev/null
+++ b/lib/native/x86_64-linux/libbitwuzlabv.so
@@ -0,0 +1 @@
+../../java/runtime-bitwuzla/libbitwuzlabv.so
\ No newline at end of file
diff --git a/lib/native/x86_64-linux/libbitwuzlals.so b/lib/native/x86_64-linux/libbitwuzlals.so
new file mode 120000
index 0000000000..d08186feaf
--- /dev/null
+++ b/lib/native/x86_64-linux/libbitwuzlals.so
@@ -0,0 +1 @@
+../../java/runtime-bitwuzla/libbitwuzlals.so
\ No newline at end of file
diff --git a/lib/native/x86_64-linux/libgmp.so b/lib/native/x86_64-linux/libgmp.so
new file mode 120000
index 0000000000..08e3760a31
--- /dev/null
+++ b/lib/native/x86_64-linux/libgmp.so
@@ -0,0 +1 @@
+../../java/runtime-bitwuzla/libgmp.so
\ No newline at end of file
diff --git a/src/org/sosy_lab/java_smt/SolverContextFactory.java b/src/org/sosy_lab/java_smt/SolverContextFactory.java
index f5754b32ad..1f9e1387b6 100644
--- a/src/org/sosy_lab/java_smt/SolverContextFactory.java
+++ b/src/org/sosy_lab/java_smt/SolverContextFactory.java
@@ -29,6 +29,7 @@
 import org.sosy_lab.java_smt.delegate.logging.LoggingSolverContext;
 import org.sosy_lab.java_smt.delegate.statistics.StatisticsSolverContext;
 import org.sosy_lab.java_smt.delegate.synchronize.SynchronizedSolverContext;
+import org.sosy_lab.java_smt.solvers.bitwuzla.BitwuzlaSolverContext;
 import org.sosy_lab.java_smt.solvers.boolector.BoolectorSolverContext;
 import org.sosy_lab.java_smt.solvers.cvc4.CVC4SolverContext;
 import org.sosy_lab.java_smt.solvers.cvc5.CVC5SolverContext;
@@ -57,7 +58,8 @@ public enum Solvers {
     BOOLECTOR,
     CVC4,
     CVC5,
-    YICES2
+    YICES2,
+    BITWUZLA
   }
 
   @Option(secure = true, description = "Export solver queries in SmtLib format into a file.")
@@ -290,6 +292,10 @@ private SolverContext generateContext0(Solvers solverToCreate)
       case BOOLECTOR:
         return BoolectorSolverContext.create(config, shutdownNotifier, logfile, randomSeed, loader);
 
+      case BITWUZLA:
+        return BitwuzlaSolverContext.create(
+            config, shutdownNotifier, logfile, randomSeed, floatingPointRoundingMode, loader);
+
       default:
         throw new AssertionError("no solver selected");
     }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/package-info.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/package-info.java
new file mode 100644
index 0000000000..2db2c54c78
--- /dev/null
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/package-info.java
@@ -0,0 +1,14 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2023 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+/** Interface to the SMT solver Bitwuzla (based on the native C/C++ API and JNI). */
+@com.google.errorprone.annotations.CheckReturnValue
+@javax.annotation.ParametersAreNonnullByDefault
+@org.sosy_lab.common.annotations.FieldsAreNonnullByDefault
+@org.sosy_lab.common.annotations.ReturnValuesAreNonnullByDefault
+package org.sosy_lab.java_smt.solvers.bitwuzla;
diff --git a/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java
index 0c6d1247f0..8ab062564e 100644
--- a/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java
@@ -347,7 +347,7 @@ public void bvIntArray() {
     assume()
         .withMessage("Solver %s does not support arrays with integer index", solverToUse())
         .that(solverToUse())
-        .isNotEqualTo(Solvers.BOOLECTOR);
+        .isNoneOf(Solvers.BOOLECTOR, Solvers.BITWUZLA);
 
     BitvectorFormula bv = bvmgr.makeBitvector(4, 3);
     ArrayFormula<IntegerFormula, BitvectorFormula> arr =
diff --git a/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java b/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java
index c145b1b181..9579196a89 100644
--- a/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java
@@ -97,6 +97,10 @@ private void requireSupportedOperatingSystem() {
       case YICES2:
         assume.that(IS_LINUX).isTrue();
         return;
+      case BITWUZLA:
+        assume.that(IS_LINUX).isTrue();
+        assume.that(isSufficientVersionOfLibc()).isTrue();
+        return;
       case MATHSAT5:
         assume.that(IS_LINUX || IS_WINDOWS).isTrue();
         return;
@@ -126,6 +130,18 @@ private boolean isSufficientVersionOfLibcxx() {
     return true;
   }
 
+  /** Bitwuzla requires GLIB version 2.20 or newer. This is not included in Ubuntu 18.04. */
+  private boolean isSufficientVersionOfLibc() {
+    try {
+      NativeLibraries.loadLibrary("bitwuzla");
+    } catch (UnsatisfiedLinkError e) {
+      if (e.getMessage().contains("version `GLIBC_2.29' not found")) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   @Before
   public final void initSolver() throws InvalidConfigurationException {
     config = Configuration.builder().setOption("solver.solver", solverToUse().toString()).build();
diff --git a/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java b/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
index 8c3cf8b153..6aa54e8de9 100644
--- a/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
@@ -18,6 +18,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.sosy_lab.java_smt.SolverContextFactory.Solvers;
+import org.sosy_lab.java_smt.api.BitvectorFormula;
 import org.sosy_lab.java_smt.api.BooleanFormula;
 import org.sosy_lab.java_smt.api.NumeralFormula.IntegerFormula;
 import org.sosy_lab.java_smt.api.SolverException;
diff --git a/src/org/sosy_lab/java_smt/test/SolverTheoriesTest.java b/src/org/sosy_lab/java_smt/test/SolverTheoriesTest.java
index c9dda2adf0..a8cc9081d8 100644
--- a/src/org/sosy_lab/java_smt/test/SolverTheoriesTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverTheoriesTest.java
@@ -1143,7 +1143,7 @@ public void testVariableAndUFWithEqualSort() {
     assume()
         .withMessage("Solver %s does not support UFs without arguments", solverToUse())
         .that(solverToUse())
-        .isNoneOf(Solvers.BOOLECTOR, Solvers.CVC5);
+        .isNoneOf(Solvers.BOOLECTOR, Solvers.CVC5, Solvers.BITWUZLA);
 
     BooleanFormula z1 = bmgr.makeVariable("z");
     BooleanFormula z2 = fmgr.declareAndCallUF("z", FormulaType.BooleanType);

From 53cf8c92bbd578b4ef8a8c39b84a0488852e32dd Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 12:47:38 +0200
Subject: [PATCH 082/158] Bitwuzla: Fixed the build script and updated the git
 version.

---
 build/build-publish-solvers/solver-bitwuzla.xml | 4 ++--
 lib/ivy.xml                                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index a452f8eff5..5460432524 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -11,7 +11,7 @@ SPDX-License-Identifier: Apache-2.0
 -->
 
 <!-- vim: set tabstop=8 shiftwidth=4 expandtab sts=4 filetype=ant fdm=marker: -->
-<project name="publish-solvers-cvc4" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="publish-solvers-bitwuzla" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <import file="macros.xml"/>
 
@@ -215,7 +215,7 @@ SPDX-License-Identifier: Apache-2.0
     </target>
 
 
-    <target name="publish-cvc5" depends="package-cvc5, load-ivy"
+    <target name="publish-bitwuzla" depends="package-bitwuzla, load-ivy"
             description="Publish Bitwuzla binaries to Ivy repository.">
         <ivy:resolve conf="solver-bitwuzla" file="solvers_ivy_conf/ivy_bitwuzla.xml"/>
         <publishToRepository solverName="Bitwuzla" solverVersion="${bitwuzla.version}"/>
diff --git a/lib/ivy.xml b/lib/ivy.xml
index a1247c6f77..b968dd7311 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -167,7 +167,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
-        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-ge94e1f51" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
+        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-g954bcfb0" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->
         <dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.1-59-gaf9c0520c" conf="runtime-yices2->runtime; contrib->sources" />

From 9acfed282e2092a16bd16462a3bde0e61fb3475d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 12:48:09 +0200
Subject: [PATCH 083/158] Bitwuzla: Added new method for constant array
 creation to BitwuzlaArrayFormulaManager.

---
 .../solvers/bitwuzla/BitwuzlaArrayFormulaManager.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
index e336f34596..7fe369734e 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
@@ -47,6 +47,17 @@ protected <TI extends Formula, TE extends Formula> Term internalMakeArray(
     return newVar;
   }
 
+  @Override
+  protected <TI extends Formula, TE extends Formula> Term internalMakeArray(
+      FormulaType<TI> pIndexType,
+      FormulaType<TE> pElementType,
+      Term elseElem) {
+    final ArrayFormulaType<TI, TE> arrayFormulaType =
+        FormulaType.getArrayType(pIndexType, pElementType);
+    final Sort bitwuzlaArrayType = toSolverType(arrayFormulaType);
+    return termManager.mk_const_array(bitwuzlaArrayType, elseElem);
+  }
+
   @Override
   protected Term equivalence(Term pArray1, Term pArray2) {
     return termManager.mk_term(Kind.EQUAL, pArray1, pArray2);

From b0feace903a5d9e2e0c81c29d6a62f263f04cf94 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 13:33:15 +0200
Subject: [PATCH 084/158] Bitwuzla: Restored changed to FormulaClassifierTest
 from 3372315caa47dfba03dcf92f0e1419c2c183967e

---
 .../java_smt/test/FormulaClassifierTest.java  | 135 ++++++++++++++----
 1 file changed, 107 insertions(+), 28 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/FormulaClassifierTest.java b/src/org/sosy_lab/java_smt/test/FormulaClassifierTest.java
index 7153a68204..68e0198be0 100644
--- a/src/org/sosy_lab/java_smt/test/FormulaClassifierTest.java
+++ b/src/org/sosy_lab/java_smt/test/FormulaClassifierTest.java
@@ -20,7 +20,10 @@ public class FormulaClassifierTest extends SolverBasedTest0.ParameterizedSolverB
 
   private FormulaClassifier classifier;
 
-  private static final String VARS =
+  private static final String BOOL_VARS =
+      "(declare-fun x () Bool)" + "(declare-fun foo (Bool) Bool)";
+
+  private static final String NUMERAL_VARS =
       "(declare-fun x () Int)"
           + "(declare-fun xx () Int)"
           + "(declare-fun y () Real)"
@@ -30,8 +33,12 @@ public class FormulaClassifierTest extends SolverBasedTest0.ParameterizedSolverB
           + "(declare-fun foo (Int) Int)"
           + "(declare-fun bar (Real) Real)";
 
-  private static final String BVS =
-      "(declare-fun bv () (_ BitVec 4))" + "(declare-fun bv2 () (_ BitVec 4))";
+  private static final String BV_VARS =
+      "(declare-fun bv () (_ BitVec 4))"
+          + "(declare-fun bv2 () (_ BitVec 4))"
+          + "(declare-fun bvarr () (Array (_ BitVec 4) (_ BitVec 4)))"
+          + "(declare-fun bvarr2 () (Array (_ BitVec 4) (_ BitVec 4)))"
+          + "(declare-fun bvfoo ((_ BitVec 4)) (_ BitVec 4))";
 
   @Before
   public void init() {
@@ -49,8 +56,10 @@ private void requireNonlinear() {
   @Test
   public void test_AUFLIA() {
     requireParser();
+    requireArrays();
+    requireIntegers();
     requireQuantifiers(); // TODO SMTInterpol fails when parsing this
-    String query = VARS + "(assert (exists ((z Int)) (= (select arr x) (foo z))))";
+    String query = NUMERAL_VARS + "(assert (exists ((z Int)) (= (select arr x) (foo z))))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("AUFLIA");
   }
@@ -58,7 +67,9 @@ public void test_AUFLIA() {
   @Test
   public void test_QF_AUFLIA() {
     requireParser();
-    String query = VARS + "(assert (= (select arr x) (foo 0)))";
+    requireArrays();
+    requireIntegers();
+    String query = NUMERAL_VARS + "(assert (= (select arr x) (foo 0)))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_AUFLIA");
   }
@@ -72,8 +83,10 @@ public void test_QF_AUFLIRA() {
         .isNotEqualTo(Solvers.OPENSMT);
 
     requireParser();
+    requireArrays();
+    requireIntegers();
     requireRationals();
-    String query = VARS + "(assert (= (select arr x) (bar (/ 1 2))))";
+    String query = NUMERAL_VARS + "(assert (= (select arr x) (bar (/ 1 2))))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_AUFLIRA");
   }
@@ -81,9 +94,11 @@ public void test_QF_AUFLIRA() {
   @Test
   public void test_QF_AUFNIRA() {
     requireParser();
+    requireArrays();
+    requireIntegers();
     requireRationals();
     requireNonlinear();
-    String query = VARS + "(assert (= (select arr (* x x)) (bar (/ 1 2))))";
+    String query = NUMERAL_VARS + "(assert (= (select arr (* x x)) (bar (/ 1 2))))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_AUFNIRA");
   }
@@ -91,8 +106,9 @@ public void test_QF_AUFNIRA() {
   @Test
   public void test_LIA() {
     requireParser();
+    requireIntegers();
     requireQuantifiers();
-    String query = VARS + "(assert (exists ((z Int)) (= (+ x 1) 0)))";
+    String query = NUMERAL_VARS + "(assert (exists ((z Int)) (= (+ x 1) 0)))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("LIA");
   }
@@ -100,22 +116,43 @@ public void test_LIA() {
   @Test
   public void test_LRA() {
     requireParser();
+    requireRationals();
     requireQuantifiers();
     requireRationals();
-    String query = VARS + "(assert (exists ((zz Real)) (= (+ y y) zz)))";
+    String query = NUMERAL_VARS + "(assert (exists ((zz Real)) (= (+ y y) zz)))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("LRA");
   }
 
+  @Test
+  public void test_ABVIRA() {
+    requireParser();
+    requireArrays();
+    requireQuantifiers();
+    requireBitvectors();
+    requireIntegers();
+    requireRationals();
+    assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
+    String query =
+        NUMERAL_VARS
+            + BV_VARS
+            + "(assert (and (exists ((bv2 (_ BitVec 4))) (= bv bv2)) (= arr arr2)))";
+    classifier.visit(mgr.parse(query));
+    assertThat(classifier.toString()).isEqualTo("ABV");
+  }
+
   @Test
   public void test_ABV() {
     requireParser();
-    assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
+    requireArrays();
     requireQuantifiers();
     requireBitvectors();
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
     String query =
-        VARS + BVS + "(assert (and (exists ((bv2 (_ BitVec 4))) (= bv bv2)) (= arr arr2)))";
+        BOOL_VARS
+            + BV_VARS
+            + "(assert (and (exists ((bv2 (_ BitVec 4))) (= bv bv2)) (= bvarr "
+            + "bvarr2)))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("ABV");
   }
@@ -123,9 +160,10 @@ public void test_ABV() {
   @Test
   public void test_QF_AUFBV() {
     requireParser();
+    requireArrays();
     requireBitvectors();
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
-    String query = VARS + BVS + "(assert (and (= bv bv2) (= arr arr2) (= (foo x) x)))";
+    String query = BV_VARS + "(assert (and (= bv bv2) (= bvarr bvarr2) (= (bvfoo bv) bv2)" + "))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_AUFBV");
   }
@@ -135,7 +173,7 @@ public void test_QF_BV() {
     requireParser();
     requireBitvectors();
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
-    String query = BVS + "(assert (bvult bv (bvadd bv #x1)))";
+    String query = BV_VARS + "(assert (bvult bv (bvadd bv #x1)))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_BV");
   }
@@ -143,7 +181,8 @@ public void test_QF_BV() {
   @Test
   public void test_QF_LIA() {
     requireParser();
-    String query = VARS + "(assert (< xx (* x 2)))";
+    requireIntegers();
+    String query = NUMERAL_VARS + "(assert (< xx (* x 2)))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_LIA");
   }
@@ -151,7 +190,8 @@ public void test_QF_LIA() {
   @Test
   public void test_QF_LRA() {
     requireParser();
-    String query = VARS + "(assert (< yy y))";
+    requireRationals();
+    String query = NUMERAL_VARS + "(assert (< yy y))";
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_LRA");
@@ -160,8 +200,9 @@ public void test_QF_LRA() {
   @Test
   public void test_QF_NIA() {
     requireParser();
+    requireIntegers();
     requireNonlinear();
-    String query = VARS + "(assert (< xx (* x x)))";
+    String query = NUMERAL_VARS + "(assert (< xx (* x x)))";
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_NIA");
@@ -170,36 +211,69 @@ public void test_QF_NIA() {
   @Test
   public void test_QF_NRA() {
     requireParser();
+    requireRationals();
     requireNonlinear();
-    String query = VARS + "(assert (< yy (* y y)))";
+    String query = NUMERAL_VARS + "(assert (< yy (* y y)))";
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_NRA");
   }
 
   @Test
-  public void test_QF_UF() {
+  public void test_QF_UFLIRA() {
     requireParser();
-    String query = VARS + "(assert (= (foo x) x))";
+    requireIntegers();
+    requireRationals(); // NUMERAL_VARS includes REALs
+    String query = NUMERAL_VARS + "(assert (= (foo x) x))";
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_UF");
   }
 
+  @Test
+  public void test_QF_UF() {
+    requireParser();
+    String query = BOOL_VARS + "(assert (= (foo x) x))";
+    assume()
+        .withMessage("MathSAT does not support functions with Bool arguments")
+        .that(solverToUse())
+        .isNotEqualTo(Solvers.MATHSAT5);
+    classifier.visit(mgr.parse(query));
+    assume()
+        .that(solverToUse())
+        .isNotEqualTo(Solvers.PRINCESS); // Princess classifies it as QF_UFLIA
+    // TODO: see why Princess classifies this wrongly
+    assertThat(classifier.toString()).isEqualTo("QF_UF");
+  }
+
+  @Test
+  public void test_QF_UFBVLIRA() {
+    requireParser();
+    requireBitvectors();
+    requireRationals();
+    requireIntegers();
+    assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
+    String query = NUMERAL_VARS + BV_VARS + "(assert (and (= bv bv2) (= (foo x) x)))";
+    classifier.visit(mgr.parse(query));
+    assertThat(classifier.toString()).isEqualTo("QF_UFBV");
+  }
+
   @Test
   public void test_QF_UFBV() {
     requireParser();
     requireBitvectors();
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
-    String query = VARS + BVS + "(assert (and (= bv bv2) (= (foo x) x)))";
+    String query = BV_VARS + "(assert (and (= bv bv2) (= (bvfoo bv) bv2)))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_UFBV");
   }
 
   @Test
-  public void test_QF_UFLIA() {
+  public void test_QF_UFLIRA2() {
     requireParser();
-    String query = VARS + "(assert (< xx (+ x (foo x))))";
+    requireIntegers();
+    requireRationals(); // NUMERAL_VARS includes REALs
+    String query = NUMERAL_VARS + "(assert (< xx (+ x (foo x))))";
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_UFLIA");
@@ -208,7 +282,8 @@ public void test_QF_UFLIA() {
   @Test
   public void test_QF_UFLRA() {
     requireParser();
-    String query = VARS + "(assert (< yy (bar y)))";
+    requireRationals();
+    String query = NUMERAL_VARS + "(assert (< yy (bar y)))";
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_UFLRA");
@@ -217,8 +292,9 @@ public void test_QF_UFLRA() {
   @Test
   public void test_QF_UFNRA() {
     requireParser();
+    requireRationals();
     requireNonlinear();
-    String query = VARS + "(assert (< (* y yy) (bar y)))";
+    String query = NUMERAL_VARS + "(assert (< (* y yy) (bar y)))";
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_UFNRA");
@@ -227,8 +303,9 @@ public void test_QF_UFNRA() {
   @Test
   public void test_UFLRA() {
     requireParser();
+    requireRationals();
     requireQuantifiers();
-    String query = VARS + "(assert (exists ((zz Real)) (< (+ y yy) (bar y))))";
+    String query = NUMERAL_VARS + "(assert (exists ((zz Real)) (< (+ y yy) (bar y))))";
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("UFLRA");
@@ -237,8 +314,10 @@ public void test_UFLRA() {
   @Test
   public void test_UFNRA() {
     requireParser();
+    requireRationals();
+    requireNonlinear();
     requireQuantifiers(); // TODO SMTInterpol fails when parsing this
-    String query = VARS + "(assert (exists ((zz Real)) (< (* y yy) (bar y))))";
+    String query = NUMERAL_VARS + "(assert (exists ((zz Real)) (< (* y yy) (bar y))))";
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS); // Princess rewrites the formula
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("UFNRA");
@@ -248,7 +327,7 @@ public void test_UFNRA() {
   public void test_QF_FP() {
     requireParser();
     requireFloats();
-    String query = VARS + "(declare-fun a () Float32) (assert (fp.eq a (fp.add RNE a a)))";
+    String query = "(declare-fun a () Float32) (assert (fp.eq a (fp.add RNE a a)))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("QF_FP");
   }
@@ -258,7 +337,7 @@ public void test_FP() {
     requireParser();
     requireFloats();
     requireQuantifiers();
-    String query = VARS + "(declare-fun a () Float32) (assert (exists ((zz Real)) (fp.eq a a)))";
+    String query = "(declare-fun a () Float32) (assert (exists ((zz Float32)) (fp.eq a a)))";
     classifier.visit(mgr.parse(query));
     assertThat(classifier.toString()).isEqualTo("FP");
   }

From 4066a3e1450c6131c74a376c3a14cbd89a1d4f6e Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 13:35:55 +0200
Subject: [PATCH 085/158] Bitwuzla: Add requireInteger() checks to tests that
 need them. Bitwuzla does not support integer variables and will fail during
 parsing, even if integers are just mentioned in the signature of a function.

---
 .../test/FloatingPointFormulaManagerTest.java |  1 +
 .../java_smt/test/FormulaManagerTest.java     |  4 ++++
 src/org/sosy_lab/java_smt/test/ModelTest.java | 19 ++++++++++++++++---
 .../java_smt/test/PrettyPrinterTest.java      | 16 ++++++++++++++++
 .../java_smt/test/ProverEnvironmentTest.java  |  2 ++
 .../java_smt/test/QuantifierManagerTest.java  |  4 ++++
 .../test/SolverFormulaIODeclarationsTest.java | 18 +++++++++++++++++-
 .../java_smt/test/SolverFormulaIOTest.java    |  2 ++
 .../java_smt/test/SolverVisitorTest.java      | 13 ++++++++++++-
 .../java_smt/test/TranslateFormulaTest.java   |  4 +++-
 .../sosy_lab/java_smt/test/UFManagerTest.java |  2 ++
 11 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
index f71cce664f..50d629a905 100644
--- a/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/FloatingPointFormulaManagerTest.java
@@ -566,6 +566,7 @@ private void assertEqualsAsFormula(FloatingPointFormula f1, FloatingPointFormula
 
   @Test
   public void round() throws SolverException, InterruptedException {
+    requireIntegers();
 
     // constants
     round0(0, 0, 0, 0, 0, 0);
diff --git a/src/org/sosy_lab/java_smt/test/FormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/FormulaManagerTest.java
index fffdcb36e7..8c91fa5268 100644
--- a/src/org/sosy_lab/java_smt/test/FormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/FormulaManagerTest.java
@@ -34,6 +34,7 @@ public class FormulaManagerTest extends SolverBasedTest0.ParameterizedSolverBase
   @Test
   public void testEmptySubstitution() throws SolverException, InterruptedException {
     requireSubstitution();
+    requireIntegers();
     assume().withMessage("Princess fails").that(solver).isNotEqualTo(Solvers.PRINCESS);
 
     IntegerFormula variable1 = imgr.makeVariable("variable1");
@@ -54,6 +55,7 @@ public void testEmptySubstitution() throws SolverException, InterruptedException
   @Test
   public void testNoSubstitution() throws SolverException, InterruptedException {
     requireSubstitution();
+    requireIntegers();
     assume().withMessage("Princess fails").that(solver).isNotEqualTo(Solvers.PRINCESS);
 
     IntegerFormula variable1 = imgr.makeVariable("variable1");
@@ -171,6 +173,8 @@ public void testSubstitutionSelfReference() throws SolverException, InterruptedE
 
   @Test
   public void formulaEqualsAndHashCode() {
+    requireIntegers();
+
     // Solvers without integers (Boolector) get their own test below
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
     FunctionDeclaration<IntegerFormula> fb = fmgr.declareUF("f_b", IntegerType, IntegerType);
diff --git a/src/org/sosy_lab/java_smt/test/ModelTest.java b/src/org/sosy_lab/java_smt/test/ModelTest.java
index f1622b109b..c7c8b03210 100644
--- a/src/org/sosy_lab/java_smt/test/ModelTest.java
+++ b/src/org/sosy_lab/java_smt/test/ModelTest.java
@@ -828,15 +828,15 @@ public void testPartialModels2() throws SolverException, InterruptedException {
         prover.push(bvmgr.greaterThan(x, bvmgr.makeBitvector(8, 0), true));
         assertThat(prover).isSatisfiable();
         try (Model m = prover.getModel()) {
-          if (solver != Solvers.BOOLECTOR) {
+          if (solver != Solvers.BOOLECTOR && solver != Solvers.BITWUZLA) {
             assertThat(m.evaluate(x)).isEqualTo(BigInteger.ONE);
           } else {
             assertThat(m.evaluate(x)).isEqualTo(BigInteger.valueOf(64));
           }
           // it works now, but maybe the model "x=1" for the constraint "x>0" is not valid for new
           // solvers.
-          // Can confirm ;D Boolector likes to take the "max" values for bitvectors instead of the
-          // min; as a result it returns 64
+          // Can confirm ;D Boolector/Bitwuzla like to take the "max" values for bitvectors
+          // instead of the min; as a result it returns 64
         }
       }
     }
@@ -1111,6 +1111,7 @@ public void testGetArrays2() throws SolverException, InterruptedException {
   @Test
   public void testGetArrays6() throws SolverException, InterruptedException {
     requireArrays();
+    requireIntegers();
     requireArrayModel();
     requireParser();
 
@@ -1138,6 +1139,7 @@ public void testGetArrays6() throws SolverException, InterruptedException {
   @Test
   public void testGetArrays3() throws SolverException, InterruptedException {
     requireParser();
+    requireIntegers();
     requireArrays();
     requireArrayModel();
 
@@ -1180,6 +1182,7 @@ public void testGetArrays3() throws SolverException, InterruptedException {
   @Test
   public void testGetArrays4() throws SolverException, InterruptedException {
     requireParser();
+    requireIntegers();
     requireArrays();
     requireArrayModel();
 
@@ -1236,6 +1239,7 @@ public void testGetArrays5() throws SolverException, InterruptedException {
     requireParser();
     requireArrays();
     requireArrayModel();
+    requireIntegers();
 
     // create formula for "arr[5:6]==[x,x] && x==123"
     BooleanFormula f =
@@ -1261,6 +1265,7 @@ public void testGetArrays5() throws SolverException, InterruptedException {
   @Test
   public void testGetArrays5b() throws SolverException, InterruptedException {
     requireParser();
+    requireIntegers();
     requireArrays();
     requireArrayModel();
 
@@ -1316,6 +1321,7 @@ public void testGetArrays5b() throws SolverException, InterruptedException {
   @Test
   public void testGetArrays5c() throws SolverException, InterruptedException {
     requireParser();
+    requireIntegers();
     requireArrays();
     requireArrayModel();
 
@@ -1352,6 +1358,7 @@ public void testGetArrays5c() throws SolverException, InterruptedException {
   @Test
   public void testGetArrays5d() throws SolverException, InterruptedException {
     requireParser();
+    requireIntegers();
     requireArrays();
     requireArrayModel();
 
@@ -1388,6 +1395,7 @@ public void testGetArrays5d() throws SolverException, InterruptedException {
   @Test
   public void testGetArrays5e() throws SolverException, InterruptedException {
     requireParser();
+    requireIntegers();
     requireArrays();
     requireArrayModel();
 
@@ -1424,6 +1432,7 @@ public void testGetArrays5e() throws SolverException, InterruptedException {
   @Test
   public void testGetArrays5f() throws SolverException, InterruptedException {
     requireParser();
+    requireIntegers();
     requireArrays();
     requireArrayModel();
 
@@ -2141,6 +2150,7 @@ public void arrayTest1() throws SolverException, InterruptedException {
     requireParser();
     requireArrays();
     requireArrayModel();
+    requireIntegers();
 
     for (String query :
         ImmutableList.of(
@@ -2156,6 +2166,7 @@ public void arrayTest2() throws SolverException, InterruptedException {
     requireArrays();
     requireArrayModel();
     requireOptimization();
+    requireIntegers();
     requireFloats();
     requireBitvectors();
     // only Z3 fulfills these requirements
@@ -2193,6 +2204,7 @@ public void arrayTest2() throws SolverException, InterruptedException {
   @Test
   public void arrayTest3() throws SolverException, InterruptedException {
     requireParser();
+    requireIntegers();
     requireArrays();
     requireArrayModel();
 
@@ -2204,6 +2216,7 @@ public void arrayTest3() throws SolverException, InterruptedException {
   public void arrayTest4() throws SolverException, InterruptedException {
     requireParser();
     requireArrays();
+    requireIntegers();
     requireBitvectors();
     BooleanFormula formula = context.getFormulaManager().parse(ARRAY_QUERY_BV);
     checkModelIteration(formula, false);
diff --git a/src/org/sosy_lab/java_smt/test/PrettyPrinterTest.java b/src/org/sosy_lab/java_smt/test/PrettyPrinterTest.java
index dbfd48d8ea..5c9e990436 100644
--- a/src/org/sosy_lab/java_smt/test/PrettyPrinterTest.java
+++ b/src/org/sosy_lab/java_smt/test/PrettyPrinterTest.java
@@ -39,6 +39,10 @@ public void init() {
   @Test
   public void testPrettyPrintOnlyBoolean() {
     requireParser();
+    requireIntegers();
+    requireRationals();
+    requireArrays();
+
     String expected;
     switch (solverToUse()) {
       case MATHSAT5:
@@ -79,6 +83,10 @@ public void testPrettyPrintOnlyBoolean() {
   @Test
   public void testPrettyPrintAll() {
     requireParser();
+    requireIntegers();
+    requireRationals();
+    requireArrays();
+
     String expected;
     switch (solverToUse()) {
       case MATHSAT5:
@@ -178,6 +186,10 @@ public void testPrettyPrintAll() {
   @Test
   public void testDotOnlyBoolean() {
     requireParser();
+    requireIntegers();
+    requireRationals();
+    requireArrays();
+
     String expected;
     switch (solverToUse()) {
       case MATHSAT5:
@@ -258,6 +270,10 @@ public void testDotOnlyBoolean() {
   @Test
   public void testDotAll() {
     requireParser();
+    requireIntegers();
+    requireRationals();
+    requireArrays();
+
     String expected;
     switch (solverToUse()) {
       case MATHSAT5:
diff --git a/src/org/sosy_lab/java_smt/test/ProverEnvironmentTest.java b/src/org/sosy_lab/java_smt/test/ProverEnvironmentTest.java
index 5380e5d4b3..af22a9dc1a 100644
--- a/src/org/sosy_lab/java_smt/test/ProverEnvironmentTest.java
+++ b/src/org/sosy_lab/java_smt/test/ProverEnvironmentTest.java
@@ -100,6 +100,7 @@ public void unsatCoreTestForOptimizationProver() throws SolverException, Interru
 
   private void unsatCoreTest0(BasicProverEnvironment<?> pe)
       throws InterruptedException, SolverException {
+    requireIntegers();
     pe.push();
     pe.addConstraint(imgr.equal(imgr.makeVariable("x"), imgr.makeNumber(1)));
     pe.addConstraint(imgr.equal(imgr.makeVariable("x"), imgr.makeNumber(2)));
@@ -129,6 +130,7 @@ public void unsatCoreWithAssumptionsNullTest() {
 
   @Test
   public void unsatCoreWithAssumptionsTest() throws SolverException, InterruptedException {
+    requireIntegers();
     requireUnsatCore();
     assume()
         .withMessage(
diff --git a/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java b/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
index 293ebdbfbc..cf712ef5d7 100644
--- a/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
@@ -888,6 +888,7 @@ public void checkBVQuantifierElimination2() throws InterruptedException, SolverE
 
   @Test
   public void testExistsRestrictedRange() throws SolverException, InterruptedException {
+    requireIntegers();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -921,6 +922,7 @@ public void testExistsRestrictedRange() throws SolverException, InterruptedExcep
   @Test
   public void testExistsRestrictedRangeWithoutInconclusiveSolvers()
       throws SolverException, InterruptedException {
+    requireIntegers();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -944,6 +946,7 @@ public void testExistsRestrictedRangeWithoutInconclusiveSolvers()
 
   @Test
   public void testForallRestrictedRange() throws SolverException, InterruptedException {
+    requireIntegers();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -978,6 +981,7 @@ public void testForallRestrictedRange() throws SolverException, InterruptedExcep
   @Test
   public void testForallRestrictedRangeWithoutConclusiveSolvers()
       throws SolverException, InterruptedException {
+    requireIntegers();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
diff --git a/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java b/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
index 6aa54e8de9..cd8540dff6 100644
--- a/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
@@ -40,6 +40,7 @@ public void parseDeclareInQueryTest1() {
 
   @Test
   public void parseDeclareInQueryTest2() {
+    requireIntegers();
     String query = "(declare-fun x () Int)(assert (= 0 x))";
     BooleanFormula formula = mgr.parse(query);
     Truth.assertThat(mgr.extractVariables(formula)).hasSize(1);
@@ -47,6 +48,7 @@ public void parseDeclareInQueryTest2() {
 
   @Test
   public void parseDeclareInQueryTest3() {
+    requireIntegers();
     String query = "(declare-fun foo (Int Int) Bool)(assert (foo 1 2))";
     BooleanFormula formula = mgr.parse(query);
     Truth.assertThat(mgr.extractVariablesAndUFs(formula)).hasSize(1);
@@ -54,6 +56,7 @@ public void parseDeclareInQueryTest3() {
 
   @Test
   public void parseDeclareInQueryTest4() {
+    requireIntegers();
     String query = "(declare-fun x () Int)(declare-fun foo (Int Int) Bool)(assert (foo x 2))";
     BooleanFormula formula = mgr.parse(query);
     Truth.assertThat(mgr.extractVariablesAndUFs(formula)).hasSize(2);
@@ -69,6 +72,7 @@ public void parseDeclareAfterQueryTest1() {
 
   @Test
   public void parseDeclareAfterQueryTest2() {
+    requireIntegers();
     String query = "(declare-fun x () Int)(assert (= 0 x))";
     BooleanFormula formula = mgr.parse(query);
     IntegerFormula var = imgr.makeVariable("x");
@@ -77,6 +81,7 @@ public void parseDeclareAfterQueryTest2() {
 
   @Test
   public void parseDeclareAfterQueryTest3() {
+    requireIntegers();
     String query = "(declare-fun foo (Int Int) Bool)(assert (foo 1 2))";
     BooleanFormula formula = mgr.parse(query);
     BooleanFormula calledFoo =
@@ -86,6 +91,7 @@ public void parseDeclareAfterQueryTest3() {
 
   @Test
   public void parseDeclareAfterQueryTest4() {
+    requireIntegers();
     String query = "(declare-fun x () Int)(declare-fun foo (Int Int) Bool)(assert (foo 1 x))";
     BooleanFormula formula = mgr.parse(query);
     IntegerFormula var = imgr.makeVariable("x");
@@ -127,6 +133,7 @@ public void parseDeclareBeforeTest() {
 
   @Test
   public void parseDeclareRedundantTest1() {
+    requireIntegers();
     IntegerFormula var = imgr.makeVariable("x");
     String query = "(declare-fun x () Int)(declare-fun x () Int)(assert (= 0 x))";
     if (EnumSet.of(Solvers.PRINCESS, Solvers.Z3).contains(solverToUse())) {
@@ -140,6 +147,7 @@ public void parseDeclareRedundantTest1() {
 
   @Test
   public void parseDeclareRedundantTest2() {
+    requireIntegers();
     IntegerFormula var =
         fmgr.declareAndCallUF("foo", IntegerType, imgr.makeNumber(1), imgr.makeNumber(2));
     String query =
@@ -168,12 +176,14 @@ public void parseDeclareRedundantBvTest() {
 
   @Test
   public void parseDeclareConflictInQueryTest1() {
+    requireIntegers();
     String query = "(declare-fun x () Bool)(declare-fun x () Int)(assert (= 0 x))";
     assertThrows(IllegalArgumentException.class, () -> mgr.parse(query));
   }
 
   @Test
   public void parseDeclareConflictInQueryTest2() {
+    requireIntegers();
     String query = "(declare-fun x () Bool)(declare-fun x (Int Int) Bool)(assert (x 2 3))";
     if (Solvers.Z3 != solverToUse()) {
       assertThrows(IllegalArgumentException.class, () -> mgr.parse(query));
@@ -182,6 +192,7 @@ public void parseDeclareConflictInQueryTest2() {
 
   @Test
   public void parseDeclareConflictInQueryTest3() {
+    requireIntegers();
     String query = "(declare-fun x (Int) Bool)(declare-fun x (Int) Int)(assert (x 0))";
     if (Solvers.Z3 != solverToUse()) {
       assertThrows(IllegalArgumentException.class, () -> mgr.parse(query));
@@ -190,6 +201,7 @@ public void parseDeclareConflictInQueryTest3() {
 
   @Test
   public void parseDeclareConflictBeforeQueryTest() {
+    requireIntegers();
     @SuppressWarnings("unused")
     IntegerFormula var = imgr.makeVariable("x");
     String query = "(declare-fun x () Bool)(assert (= 0 x))";
@@ -201,8 +213,11 @@ public void parseDeclareConflictAfterQueryTest() {
     String query = "(declare-fun x () Bool)(assert x)";
     BooleanFormula formula = mgr.parse(query);
     Truth.assertThat(mgr.extractVariables(formula).values()).hasSize(1);
-    if (!EnumSet.of(Solvers.PRINCESS, Solvers.Z3).contains(solverToUse())) {
+    if (!EnumSet.of(Solvers.PRINCESS, Solvers.Z3, Solvers.BITWUZLA).contains(solverToUse())) {
       assertThrows(IllegalArgumentException.class, () -> imgr.makeVariable("x"));
+    } else if (EnumSet.of(Solvers.BITWUZLA).contains(solverToUse())) {
+      Truth.assertThat(mgr.extractVariables(formula).values())
+          .doesNotContain(bvmgr.makeVariable(32, "x"));
     } else {
       Truth.assertThat(mgr.extractVariables(formula).values())
           .doesNotContain(imgr.makeVariable("x"));
@@ -233,6 +248,7 @@ public void parseTwiceTest1() {
 
   @Test
   public void parseDeclareOnceNotTwiceTest2() {
+    requireIntegers();
     String query1 =
         "(declare-fun x () Bool)(declare-fun foo (Int Int) Bool)(assert (= (foo 1 2) x))";
     String query2 = "(assert (and (not x) (foo 3 4)))";
diff --git a/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java b/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
index 4381e86f9b..62fb1a85cf 100644
--- a/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
@@ -253,6 +253,7 @@ public void parseZ3TestExprFirst1() throws SolverException, InterruptedException
   @Test
   public void parseMathSatTestParseFirst2() throws SolverException, InterruptedException {
     requireParser();
+    requireIntegers();
     compareParseWithOrgParseFirst(MATHSAT_DUMP2, this::redundancyExprGen);
   }
 
@@ -442,6 +443,7 @@ private BooleanFormula genBoolExpr() {
   }
 
   private BooleanFormula redundancyExprGen() {
+    requireIntegers();
     IntegerFormula i1 = imgr.makeVariable("a");
     IntegerFormula i2 = imgr.makeVariable("b");
     IntegerFormula erg = imgr.makeVariable("c");
diff --git a/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java b/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
index 5d78a3d7c9..8a7eb0eb1d 100644
--- a/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
@@ -337,7 +337,7 @@ public void arrayVisit() {
   @Test
   public void arrayTransform() throws SolverException, InterruptedException {
     requireArrays();
-    requireArrays();
+    requireIntegers();
 
     ArrayFormulaType<IntegerFormula, IntegerFormula> arrayType =
         getArrayType(FormulaType.IntegerType, FormulaType.IntegerType);
@@ -764,6 +764,7 @@ private void checkKind(Formula f, FunctionDeclarationKind expected) {
 
   @Test
   public void booleanIdVisitWithAtoms() {
+    requireIntegers();
     IntegerFormula n12 = imgr.makeNumber(12);
     IntegerFormula a = imgr.makeVariable("a");
     IntegerFormula b = imgr.makeVariable("b");
@@ -787,6 +788,7 @@ public void booleanIdVisitWithAtoms() {
    */
   @Test
   public void testFormulaVisitor() {
+    requireIntegers();
     IntegerFormula x = imgr.makeVariable("x");
     IntegerFormula y = imgr.makeVariable("y");
     IntegerFormula z = imgr.makeVariable("z");
@@ -1017,6 +1019,8 @@ public TraversalProcess visitFreeVariable(Formula f, String name) {
 
   @Test
   public void recursiveTransformationVisitorTest() throws Exception {
+    requireIntegers();
+
     BooleanFormula f =
         bmgr.or(
             imgr.equal(
@@ -1041,6 +1045,7 @@ public Formula visitFreeVariable(Formula formula, String name) {
 
   @Test
   public void recursiveTransformationVisitorTest2() throws Exception {
+    requireIntegers();
     BooleanFormula f = imgr.equal(imgr.makeVariable("y"), imgr.makeNumber(1));
     BooleanFormula transformed =
         mgr.transformRecursively(
@@ -1057,6 +1062,7 @@ public Formula visitFreeVariable(Formula formula, String name) {
 
   @Test
   public void booleanRecursiveTraversalTest() {
+    requireIntegers();
     BooleanFormula f =
         bmgr.or(
             bmgr.and(bmgr.makeVariable("x"), bmgr.makeVariable("y")),
@@ -1127,6 +1133,7 @@ public BooleanFormula visitAtom(
   public void testTransformationInsideQuantifiersWithTrue()
       throws SolverException, InterruptedException {
     requireQuantifiers();
+    requireIntegers();
     List<IntegerFormula> quantifiedVars = ImmutableList.of(imgr.makeVariable("x"));
     BooleanFormula body = bmgr.makeTrue();
     BooleanFormula f = qmgr.exists(quantifiedVars, body);
@@ -1139,6 +1146,7 @@ public void testTransformationInsideQuantifiersWithTrue()
   public void testTransformationInsideQuantifiersWithFalse()
       throws SolverException, InterruptedException {
     requireQuantifiers();
+    requireIntegers();
     List<IntegerFormula> quantifiedVars = ImmutableList.of(imgr.makeVariable("x"));
     BooleanFormula body = bmgr.makeFalse();
     BooleanFormula f = qmgr.exists(quantifiedVars, body);
@@ -1151,6 +1159,7 @@ public void testTransformationInsideQuantifiersWithFalse()
   public void testTransformationInsideQuantifiersWithVariable()
       throws SolverException, InterruptedException {
     requireQuantifiers();
+    requireIntegers();
     List<IntegerFormula> quantifiedVars = ImmutableList.of(imgr.makeVariable("x"));
     BooleanFormula body = bmgr.makeVariable("b");
     BooleanFormula f = qmgr.exists(quantifiedVars, body);
@@ -1161,6 +1170,7 @@ public void testTransformationInsideQuantifiersWithVariable()
 
   @Test
   public void extractionTest1() {
+    requireIntegers();
     IntegerFormula v = imgr.makeVariable("v");
     BooleanFormula q = fmgr.declareAndCallUF("q", FormulaType.BooleanType, v);
     Map<String, Formula> mapping = mgr.extractVariablesAndUFs(q);
@@ -1171,6 +1181,7 @@ public void extractionTest1() {
 
   @Test
   public void extractionTest2() {
+    requireIntegers();
     // the same as above, but with nullary UF.
     IntegerFormula v = fmgr.declareAndCallUF("v", FormulaType.IntegerType);
     BooleanFormula q = fmgr.declareAndCallUF("q", FormulaType.BooleanType, v);
diff --git a/src/org/sosy_lab/java_smt/test/TranslateFormulaTest.java b/src/org/sosy_lab/java_smt/test/TranslateFormulaTest.java
index 28d3851267..25006d6cb6 100644
--- a/src/org/sosy_lab/java_smt/test/TranslateFormulaTest.java
+++ b/src/org/sosy_lab/java_smt/test/TranslateFormulaTest.java
@@ -107,7 +107,7 @@ private void requireIntegers() {
     assume()
         .withMessage("Solver %s does not support integer theory", translateFrom)
         .that(translateFrom)
-        .isNotEqualTo(Solvers.BOOLECTOR);
+        .isNoneOf(Solvers.BOOLECTOR, Solvers.BITWUZLA);
   }
 
   @Test
@@ -134,6 +134,7 @@ public void testTranslating() throws SolverException, InterruptedException {
 
   @Test
   public void testTranslatingForIContextIdentity() throws SolverException, InterruptedException {
+    requireIntegers();
     assume().that(translateTo).isEqualTo(translateFrom);
     FormulaManager manager = managerFrom;
 
@@ -146,6 +147,7 @@ public void testTranslatingForIContextIdentity() throws SolverException, Interru
 
   @Test
   public void testTranslatingForContextSibling() throws SolverException, InterruptedException {
+    requireIntegers();
     assume().that(translateTo).isEqualTo(translateFrom);
 
     assume()
diff --git a/src/org/sosy_lab/java_smt/test/UFManagerTest.java b/src/org/sosy_lab/java_smt/test/UFManagerTest.java
index a14e90d21f..9a8fa079e5 100644
--- a/src/org/sosy_lab/java_smt/test/UFManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/UFManagerTest.java
@@ -301,6 +301,7 @@ public void testDeclareAndCallUFWithTypedArgs() {
     requireBooleanArgument();
     createAndCallUF("fooBool1", FormulaType.BooleanType, bmgr.makeTrue());
     createAndCallUF("fooBool2", FormulaType.BooleanType, bmgr.makeTrue(), bmgr.makeTrue());
+    requireIntegers();
     createAndCallUF(
         "fooBool3", FormulaType.IntegerType, bmgr.makeTrue(), bmgr.makeTrue(), bmgr.makeTrue());
 
@@ -337,6 +338,7 @@ public void testDeclareAndCallUFWithRationalArgs() {
   @Test
   public void testDeclareAndCallUFWithBVArgs() {
     requireBitvectors();
+    requireIntegers();
     createAndCallUF("fooBV1", FormulaType.getBitvectorTypeWithSize(5), bvmgr.makeBitvector(3, 3L));
     requireBooleanArgument();
     createAndCallUF(

From 8a50a25c270b4cfcbb721e7f2ad0558d732cb58d Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 13:48:03 +0200
Subject: [PATCH 086/158] Bitwuzla: Restored checkVariableIsDeclared in
 SolverFormulaIOTest. Bitwuzla will print variable declarations as
 define-const and not define-fun, so we have to check for both versions.

---
 .../java_smt/test/SolverFormulaIOTest.java    | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java b/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
index 62fb1a85cf..7f4c231545 100644
--- a/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
@@ -108,8 +108,26 @@ public void varDumpTest() {
     BooleanFormula d = bmgr.and(c1, c2);
 
     String formDump = mgr.dumpFormula(d).toString();
-    assertThat(formDump).contains("(declare-fun |main::a| () Bool)");
-    assertThat(formDump).contains("(declare-fun b () Bool)");
+    checkVariableIsDeclared(formDump, "|main::a|", "Bool");
+    checkVariableIsDeclared(formDump, "b", "Bool");
+    checkThatAssertIsInLastLine(formDump);
+    checkThatDumpIsParseable(formDump);
+  }
+
+  @Test
+  public void varWithSpaceDumpTest() {
+    // Boolector will fail this anyway since bools are bitvecs for btor
+    TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BOOLECTOR);
+
+    BooleanFormula a = bmgr.makeVariable("main a");
+    BooleanFormula b = bmgr.makeVariable("b");
+    BooleanFormula c1 = bmgr.xor(a, b);
+    BooleanFormula c2 = bmgr.xor(a, b);
+    BooleanFormula d = bmgr.and(c1, c2);
+
+    String formDump = mgr.dumpFormula(d).toString();
+    checkVariableIsDeclared(formDump, "|main a|", "Bool");
+    checkVariableIsDeclared(formDump, "b", "Bool");
     checkThatAssertIsInLastLine(formDump);
     checkThatDumpIsParseable(formDump);
   }
@@ -138,8 +156,9 @@ public void varDumpTest2() {
     BooleanFormula branchComp = bmgr.or(branch1, branch2);
 
     String formDump = mgr.dumpFormula(branchComp).toString();
-    assertThat(formDump).contains("(declare-fun a () Bool)");
-    assertThat(formDump).contains("(declare-fun b () Bool)");
+
+    checkVariableIsDeclared(formDump, "a", "Bool");
+    checkVariableIsDeclared(formDump, "b", "Bool");
 
     // The serialization has to be parse-able.
     checkThatDumpIsParseable(formDump);
@@ -190,7 +209,7 @@ public void bvDumpTest() {
     String formDump = mgr.dumpFormula(formula).toString();
 
     // check that int variable is declared correctly + necessary assert that has to be there
-    assertThat(formDump).contains("(declare-fun a () (_ BitVec 8))");
+    checkVariableIsDeclared(formDump, "a", "(_ BitVec 8)");
     checkThatAssertIsInLastLine(formDump);
     checkThatDumpIsParseable(formDump);
   }
@@ -407,6 +426,14 @@ private void checkThatFunOnlyDeclaredOnce(String formDump) {
     assertWithMessage("duplicate function declarations").that(funDeclares).isEmpty();
   }
 
+  private void checkVariableIsDeclared(String dump, String var, String type) {
+    try {
+      assertThat(dump).contains("(declare-fun " + var + " () " + type + ")");
+    } catch (AssertionError err) {
+      assertThat(dump).contains("(declare-const " + var + " " + type + ")");
+    }
+  }
+
   private void checkThatAssertIsInLastLine(String dump) {
     // Boolector will fail this anyway since bools are bitvecs for btor
     TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BOOLECTOR);

From 49f26aa0eb584646b7369a87acfa19b98192d207 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 14:05:51 +0200
Subject: [PATCH 087/158] Bitwuzla: Cleaned up some unnecessary changes.

---
 README.md                                     | 25 +++++++++----------
 build/build-publish-solvers.xml               |  2 +-
 .../solvers/yices2/Yices2FormulaCreator.java  |  3 +++
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 897dc66eaf..0ed6cb8148 100644
--- a/README.md
+++ b/README.md
@@ -56,19 +56,18 @@ Only a few SMT solvers provide support for theories like Arrays, Floating Point,
 
 Currently JavaSMT supports several SMT solvers (see [Getting Started](doc/Getting-started.md) for installation):
 
-| SMT Solver                                                              | Linux64 | Windows64 | MacOS | Description                                                                  |
-|-------------------------------------------------------------------------|:---:|:---:|:---:|:-----------------------------------------------------------------------------|
-| [Bitwuzla](https://boolector.github.io/)                                | :heavy_check_mark: |  |  | a fast solver for bitvector and floating-point logic, successor of Boolector |
-| [Boolector](https://boolector.github.io/)                               | :heavy_check_mark: |  |  | a fast solver for bitvector logic, misses formula introspection              |
-| [CVC4](https://cvc4.github.io/)                                         | :heavy_check_mark: |  |  |                                                                              |
-| [CVC5](https://cvc5.github.io/)                                         | :heavy_check_mark: |  |  | new!                                                                         |
-| [MathSAT5](http://mathsat.fbk.eu/)                                      | :heavy_check_mark: | :heavy_check_mark: |  |                                                                              |
-| [OpenSMT](https://verify.inf.usi.ch/opensmt)                            | :heavy_check_mark: |  |  | new!                                                                         |
-| [OptiMathSAT](http://optimathsat.disi.unitn.it/)                        | :heavy_check_mark: |  |  | based on MathSAT5, with support for optimization                             |
-| [Princess](http://www.philipp.ruemmer.org/princess.shtml)               | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver                                                        |
-| [SMTInterpol](https://ultimate.informatik.uni-freiburg.de/smtinterpol/) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver                                                        |
-| [Yices2](https://yices.csl.sri.com/)                                    | :heavy_check_mark: | [soon](https://github.com/sosy-lab/java-smt/pull/215) |  |                                                                              |
-| [Z3](https://github.com/Z3Prover/z3)                                    | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | mature and well-known solver                                                 |
+| SMT Solver | Linux64 | Windows64 | MacOS | Description |
+| --- |:---:|:---:|:---:|:--- |
+| [Boolector](https://boolector.github.io/) | :heavy_check_mark: |  |  | a fast solver for bitvector logic, misses formula introspection |
+| [CVC4](https://cvc4.github.io/) | :heavy_check_mark: |  |  |  |
+| [CVC5](https://cvc5.github.io/) | :heavy_check_mark: |  |  | new! |
+| [MathSAT5](http://mathsat.fbk.eu/) | :heavy_check_mark: | :heavy_check_mark: |  |  |
+| [OpenSMT](https://verify.inf.usi.ch/opensmt) | :heavy_check_mark: |  |  | new! |
+| [OptiMathSAT](http://optimathsat.disi.unitn.it/) | :heavy_check_mark: |  |  | based on MathSAT5, with support for optimization |
+| [Princess](http://www.philipp.ruemmer.org/princess.shtml) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver |
+| [SMTInterpol](https://ultimate.informatik.uni-freiburg.de/smtinterpol/) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver |
+| [Yices2](https://yices.csl.sri.com/) | :heavy_check_mark: | [soon](https://github.com/sosy-lab/java-smt/pull/215) |  |  |
+| [Z3](https://github.com/Z3Prover/z3) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | mature and well-known solver |
 
 The following features are supported (depending on the used SMT solver):
 
diff --git a/build/build-publish-solvers.xml b/build/build-publish-solvers.xml
index 994a64a8d9..cac2f77648 100644
--- a/build/build-publish-solvers.xml
+++ b/build/build-publish-solvers.xml
@@ -11,7 +11,7 @@ SPDX-License-Identifier: Apache-2.0
 -->
 
 <!-- vim: set tabstop=8 shiftwidth=4 expandtab sts=4 filetype=ant fdm=marker: -->
-<project name="publish-solvers" basedir=".">
+<project name="publish-solvers" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <import file="build-publish-solvers/solver-bitwuzla.xml"/>
     <import file="build-publish-solvers/solver-boolector.xml"/>
diff --git a/src/org/sosy_lab/java_smt/solvers/yices2/Yices2FormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/yices2/Yices2FormulaCreator.java
index b6c78c91e8..3d336c0d80 100644
--- a/src/org/sosy_lab/java_smt/solvers/yices2/Yices2FormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/yices2/Yices2FormulaCreator.java
@@ -322,6 +322,9 @@ private <R> R visitFunctionApplication(
       case YICES_BV_SREM:
         functionKind = FunctionDeclarationKind.BV_SREM;
         break;
+      case YICES_BV_SMOD:
+        functionKind = FunctionDeclarationKind.BV_SMOD;
+        break;
       case YICES_BV_SHL:
         functionKind = FunctionDeclarationKind.BV_SHL;
         break;

From c3d65dd447ad42c10ce0eacc408bd23dd838fff5 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 14:11:51 +0200
Subject: [PATCH 088/158] Bitwuzla: Fixed format.

---
 .../solvers/bitwuzla/BitwuzlaArrayFormulaManager.java        | 4 +---
 .../solvers/bitwuzla/BitwuzlaFloatingPointManager.java       | 5 +----
 .../java_smt/test/NonLinearArithmeticWithModuloTest.java     | 3 ++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
index 7fe369734e..c97eaa2b84 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
@@ -49,9 +49,7 @@ protected <TI extends Formula, TE extends Formula> Term internalMakeArray(
 
   @Override
   protected <TI extends Formula, TE extends Formula> Term internalMakeArray(
-      FormulaType<TI> pIndexType,
-      FormulaType<TE> pElementType,
-      Term elseElem) {
+      FormulaType<TI> pIndexType, FormulaType<TE> pElementType, Term elseElem) {
     final ArrayFormulaType<TI, TE> arrayFormulaType =
         FormulaType.getArrayType(pIndexType, pElementType);
     final Sort bitwuzlaArrayType = toSolverType(arrayFormulaType);
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index 4630f82071..3435456794 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -81,10 +81,7 @@ protected Term makeNumberImpl(double n, FloatingPointType type, Term pFloatingPo
 
   @Override
   protected Term makeNumberImpl(
-      BigInteger exponent,
-      BigInteger mantissa,
-      boolean signBit,
-      FloatingPointType type) {
+      BigInteger exponent, BigInteger mantissa, boolean signBit, FloatingPointType type) {
     Sort signSort = termManager.mk_bv_sort(1);
     Term signTerm = termManager.mk_bv_value(signSort, signBit ? "1" : "0");
 
diff --git a/src/org/sosy_lab/java_smt/test/NonLinearArithmeticWithModuloTest.java b/src/org/sosy_lab/java_smt/test/NonLinearArithmeticWithModuloTest.java
index 16b811f764..5213773d40 100644
--- a/src/org/sosy_lab/java_smt/test/NonLinearArithmeticWithModuloTest.java
+++ b/src/org/sosy_lab/java_smt/test/NonLinearArithmeticWithModuloTest.java
@@ -34,7 +34,8 @@ public class NonLinearArithmeticWithModuloTest extends SolverBasedTest0 {
   @Parameters(name = "{0} {1}")
   public static Iterable<Object[]> getAllSolversAndTheories() {
     return Lists.cartesianProduct(
-            Arrays.asList(Solvers.values()), Arrays.asList(NonLinearArithmetic.values()))
+            Arrays.asList(new Solvers[] {Solvers.BITWUZLA}),
+            Arrays.asList(NonLinearArithmetic.values()))
         .stream()
         .map(List::toArray)
         .collect(toImmutableList());

From c9ea122360c432351124221acb5025eff9433e88 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 14:16:40 +0200
Subject: [PATCH 089/158] Bitwuzla: Fixed some checkstyle issues.

---
 .../solvers/bitwuzla/BitwuzlaArrayFormulaManager.java       | 1 +
 .../solvers/bitwuzla/BitwuzlaFloatingPointManager.java      | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
index c97eaa2b84..8b5ca1278e 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
@@ -48,6 +48,7 @@ protected <TI extends Formula, TE extends Formula> Term internalMakeArray(
   }
 
   @Override
+  @SuppressWarnings("MethodTypeParameterName")
   protected <TI extends Formula, TE extends Formula> Term internalMakeArray(
       FormulaType<TI> pIndexType, FormulaType<TE> pElementType, Term elseElem) {
     final ArrayFormulaType<TI, TE> arrayFormulaType =
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index 3435456794..0fc938a39b 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -209,12 +209,12 @@ protected Term fromIeeeBitvectorImpl(Term pNumber, FloatingPointType pTargetType
   Random randomGenerator = new Random();
 
   private String generateRandomName(String prefix, int length) {
-    int char_a = Character.valueOf('a');
-    int char_z = Character.valueOf('z');
+    int charA = Character.valueOf('a');
+    int charZ = Character.valueOf('z');
 
     String generated =
         randomGenerator
-            .ints(char_a, char_z + 1)
+            .ints(charA, charZ + 1)
             .limit(length)
             .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
             .toString();

From 49c6bc61b5d7f0807b0a3ee6005a5e7093a34a09 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Tue, 9 Apr 2024 18:53:54 +0200
Subject: [PATCH 090/158] Switch to current Bitwuzla dev version

---
 lib/ivy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ivy.xml b/lib/ivy.xml
index b968dd7311..cbf960c4a1 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -167,7 +167,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
-        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-g954bcfb0" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
+        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-g18bc7dbc-dev1" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->
         <dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.1-59-gaf9c0520c" conf="runtime-yices2->runtime; contrib->sources" />

From 54e90b9868a93bb67dfcebbdc4f2e1a603e3a771 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Tue, 9 Apr 2024 18:55:09 +0200
Subject: [PATCH 091/158] Format

---
 src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java
index 8ab062564e..1bc55a311a 100644
--- a/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java
@@ -533,6 +533,7 @@ public void bvInRange() throws SolverException, InterruptedException {
   @Test
   @SuppressWarnings("CheckReturnValue")
   public void bvOutOfRange() {
+    assume().that(solver).isNotEqualTo(Solvers.BITWUZLA);
     for (int[] sizeAndValue : new int[][] {{4, 32}, {4, -9}, {8, 300}, {8, -160}}) {
       try {
         bvmgr.makeBitvector(sizeAndValue[0], sizeAndValue[1]);

From c32a817dfc16bd277817f11d0663b82816dbe040 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Tue, 9 Apr 2024 18:56:37 +0200
Subject: [PATCH 092/158] Add support for SMTLIB2 comments to parse() for
 Bitwuzla

---
 .../solvers/bitwuzla/BitwuzlaFormulaManager.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index b7c7aa3483..0d01d84342 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -65,7 +65,20 @@ public static List<String> tokenize(String input) {
     ImmutableList.Builder<String> builder = ImmutableList.builder();
     int level = 0;
     StringBuilder read = new StringBuilder();
-    for (char c : input.toCharArray()) {
+    boolean inComment = false;
+    for (int i = 0; i < input.length(); i++) {
+      char c = input.charAt(i);
+      if (inComment) {
+        if (c == '\n') {
+          inComment = false;
+        }
+        continue;
+      }
+      if (c == ';') {
+        // Comment
+        inComment = true;
+        continue;
+      }
       if (level == 0) {
         if (!Character.isWhitespace(c)) {
           if (c == '(') {

From 1516d6e2db5bae361b6ea95e0d1cba0388f20d08 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Tue, 9 Apr 2024 18:57:38 +0200
Subject: [PATCH 093/158] Fix Java version when building bitwuzla script based
 jar

---
 build/build-publish-solvers/solver-bitwuzla.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index 5460432524..f9fbfe1e71 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -93,7 +93,7 @@ SPDX-License-Identifier: Apache-2.0
 
         <!-- compile java proxies and create jar file -->
         <mkdir dir="${source.path}/build"/>
-        <javac srcdir="${source.path}/src/" destdir="${source.path}/build" includeantruntime="false"
+        <javac target="11" srcdir="${source.path}/src/" destdir="${source.path}/build" includeantruntime="false"
                failonerror="true">
             <include name="org/sosy_lab/java_smt/solvers/bitwuzla/api/*.java"/>
         </javac>

From 5d1d85aa59a0f3c852239d804a888d2014e25184 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Tue, 9 Apr 2024 18:58:59 +0200
Subject: [PATCH 094/158] Disable tests that translate int formulas to SMTLIB2
 and try to parse with a solver that does not support int

---
 src/org/sosy_lab/java_smt/test/TranslateFormulaTest.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/test/TranslateFormulaTest.java b/src/org/sosy_lab/java_smt/test/TranslateFormulaTest.java
index 25006d6cb6..f789912019 100644
--- a/src/org/sosy_lab/java_smt/test/TranslateFormulaTest.java
+++ b/src/org/sosy_lab/java_smt/test/TranslateFormulaTest.java
@@ -108,6 +108,10 @@ private void requireIntegers() {
         .withMessage("Solver %s does not support integer theory", translateFrom)
         .that(translateFrom)
         .isNoneOf(Solvers.BOOLECTOR, Solvers.BITWUZLA);
+    assume()
+        .withMessage("Solver %s does not support integer theory", translateTo)
+        .that(translateTo)
+        .isNoneOf(Solvers.BOOLECTOR, Solvers.BITWUZLA);
   }
 
   @Test

From 50235099d2fc85e34c81a971dd0c63400cea268f Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Tue, 9 Apr 2024 19:07:06 +0200
Subject: [PATCH 095/158] Improve ressource handling of Bitwuzla model

---
 .../bitwuzla/BitwuzlaTheoremProver.java        | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
index 3f3817f5ed..56ea0f8d2c 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java
@@ -160,12 +160,19 @@ public boolean isUnsatWithAssumptions(Collection<BooleanFormula> assumptions)
    * <p>A model might contain additional symbols with their evaluation, if a solver uses its own
    * temporary symbols. There should be at least a value-assignment for each free symbol.
    */
+  @SuppressWarnings("resource")
   @Override
   public Model getModel() throws SolverException {
     Preconditions.checkState(!closed);
     Preconditions.checkState(wasLastSatCheckSat, NO_MODEL_HELP);
     checkGenerateModels();
-    return new CachingModel(getEvaluatorWithoutChecks());
+    return new CachingModel(
+        registerEvaluator(
+            new BitwuzlaModel(
+                env,
+                this,
+                creator,
+                Collections2.transform(getAssertedFormulas(), creator::extractInfo))));
   }
 
   private List<BooleanFormula> getUnsatCore0() {
@@ -221,10 +228,15 @@ public void close() {
     super.close();
   }
 
+  @SuppressWarnings("resource")
   @Override
   protected BitwuzlaModel getEvaluatorWithoutChecks() {
-    return new BitwuzlaModel(
-        env, this, creator, Collections2.transform(getAssertedFormulas(), creator::extractInfo));
+    return registerEvaluator(
+        new BitwuzlaModel(
+            env,
+            this,
+            creator,
+            Collections2.transform(getAssertedFormulas(), creator::extractInfo)));
   }
 
   public boolean isClosed() {

From 3ae78606fa77759e28dadd20226fad0432091652 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 23:05:28 +0200
Subject: [PATCH 096/158] Bitwuzla: Use -release=11 when building the jar to
 also specify the language level and avoid a warning.

---
 build/build-publish-solvers/solver-bitwuzla.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index f9fbfe1e71..06ecd753cd 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -93,7 +93,7 @@ SPDX-License-Identifier: Apache-2.0
 
         <!-- compile java proxies and create jar file -->
         <mkdir dir="${source.path}/build"/>
-        <javac target="11" srcdir="${source.path}/src/" destdir="${source.path}/build" includeantruntime="false"
+        <javac release="11" srcdir="${source.path}/src/" destdir="${source.path}/build" includeantruntime="false"
                failonerror="true">
             <include name="org/sosy_lab/java_smt/solvers/bitwuzla/api/*.java"/>
         </javac>

From 566363dac835ed0c0348d23d46bdecdbb4cf8cd0 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 23:07:45 +0200
Subject: [PATCH 097/158] Bitwuzla: Add an option -Dbitwuzla.rebuildWrapper=on
 to the build script. If this option is not specified, or set to false the
 SWIG wrapper will not be recreated.

---
 build.xml                                     |  4 ++--
 .../build-publish-solvers/solver-bitwuzla.xml | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 8a7e11c9ce..9710d2cc88 100644
--- a/build.xml
+++ b/build.xml
@@ -83,8 +83,8 @@ SPDX-License-Identifier: Apache-2.0
         <delete includeEmptyDirs="true">
             <fileset dir="." includes="${class.dir}/** ${ivy.module}-*.jar ivy-*.xml *.so *.dll *.dylib *.jar"/>
             <fileset dir="lib/native/source/libmathsat5j" includes="*.so *.dll *.o"/>
-            <fileset dir="${bitwuzla.path}" includes="include/ src/"/>
-            <fileset dir="${bitwuzla.path}" includes="bitwuzla_wrap.cpp bitwuzla_wrap.h bitwuzla_wrap.o"/>
+            <fileset dir="${bitwuzla.path}" includes="include/"/>
+            <fileset dir="${bitwuzla.path}" includes="bitwuzla_wrap.o"/>
         </delete>
     </target>
 
diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index 06ecd753cd..d7b4e6bae0 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -15,7 +15,8 @@ SPDX-License-Identifier: Apache-2.0
 
     <import file="macros.xml"/>
 
-    <target name="package-bitwuzla" depends="">
+    <!-- Determine version and build the Bitwuzla binaries -->
+    <target name="build-bitwuzla">
         <fail unless="bitwuzla.path">
             Please specify the path to Bitwuzla with the flag -Dbitwuzla.path=/path/to/bitwuzla.
             The path has to point to the root Bitwuzla folder, i.e.,
@@ -60,6 +61,14 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="install"/>
         </exec>
 
+        <!-- check if -Dbitwuzla.rebuildWrapper=on was used-->
+        <condition property="rebuild">
+            <istrue value="${bitwuzla.rebuildWrapper}"/>
+        </condition>
+    </target>
+
+    <!-- Run swig to generate a new wrapper. Only executed if rebuildWrapper was specified. -->
+    <target name="build-wrapper" if="rebuild" depends="build-bitwuzla">
         <!-- copy bitwuzla include files to the source tree -->
         <delete dir="${source.path}/include" quiet="true"/>
         <copy todir="${source.path}">
@@ -90,7 +99,17 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="-i"/>
             <arg value="lib/native/source/libbitwuzla/phantomReferences.patch"/>
         </exec>
+    </target>
 
+    <!-- Skip rebuilding the swig header if rebuildWrapper was not specified -->
+    <target name="skip-wrapper" unless="rebuild" depends="build-bitwuzla">
+        <echo>WARNING: Skipping the build step for the SWIG wrapper.
+        If the Bitwuzla API has changed since the last release the wrapper should be updated. Use
+        option -Dbitwuzla.rebuildWrapper to run SWIG and automatically generate a new wrapper.</echo>
+    </target>
+
+    <!-- Continue with the build and package everything -->
+    <target name="package-bitwuzla" depends="build-wrapper, skip-wrapper">
         <!-- compile java proxies and create jar file -->
         <mkdir dir="${source.path}/build"/>
         <javac release="11" srcdir="${source.path}/src/" destdir="${source.path}/build" includeantruntime="false"
@@ -214,7 +233,6 @@ SPDX-License-Identifier: Apache-2.0
         </exec>
     </target>
 
-
     <target name="publish-bitwuzla" depends="package-bitwuzla, load-ivy"
             description="Publish Bitwuzla binaries to Ivy repository.">
         <ivy:resolve conf="solver-bitwuzla" file="solvers_ivy_conf/ivy_bitwuzla.xml"/>

From 10c62f83f7ff08b83195a1e2be85c5fb9a1c7f28 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Tue, 9 Apr 2024 23:12:49 +0200
Subject: [PATCH 098/158] Bitwuzla: Added auto-generated wrapper files to the
 repository.

---
 .gitignore                                    |    4 +-
 .../source/libbitwuzla/bitwuzla_wrap.cpp      | 7085 +++++++++++++++++
 lib/native/source/libbitwuzla/bitwuzla_wrap.h |   28 +
 .../solvers/bitwuzla/api/Bitwuzla.java        |   99 +
 .../solvers/bitwuzla/api/BitwuzlaNative.java  |   24 +
 .../bitwuzla/api/BitwuzlaNativeJNI.java       |  260 +
 .../java_smt/solvers/bitwuzla/api/Kind.java   |  153 +
 .../solvers/bitwuzla/api/Map_TermTerm.java    |  245 +
 .../java_smt/solvers/bitwuzla/api/Option.java |   90 +
 .../solvers/bitwuzla/api/Options.java         |  119 +
 .../java_smt/solvers/bitwuzla/api/Parser.java |   92 +
 .../java_smt/solvers/bitwuzla/api/Result.java |   55 +
 .../solvers/bitwuzla/api/RoundingMode.java    |   57 +
 .../java_smt/solvers/bitwuzla/api/Sort.java   |  139 +
 .../java_smt/solvers/bitwuzla/api/Term.java   |  211 +
 .../solvers/bitwuzla/api/TermManager.java     |  207 +
 .../solvers/bitwuzla/api/Terminator.java      |   75 +
 .../solvers/bitwuzla/api/Vector_Int.java      |  156 +
 .../solvers/bitwuzla/api/Vector_Sort.java     |  156 +
 .../solvers/bitwuzla/api/Vector_String.java   |  156 +
 .../solvers/bitwuzla/api/Vector_Term.java     |  156 +
 21 files changed, 9564 insertions(+), 3 deletions(-)
 create mode 100644 lib/native/source/libbitwuzla/bitwuzla_wrap.cpp
 create mode 100644 lib/native/source/libbitwuzla/bitwuzla_wrap.h
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
 create mode 100644 lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java

diff --git a/.gitignore b/.gitignore
index 1ac22eb376..17d3d3d4cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,11 +18,9 @@
 /lib/java/runtime/*.jar
 /lib/java/test/*.jar
 lib/native/source/libz3j/org_sosy_lab_solver_z3_Z3NativeApi.c
-lib/native/source/libbitwuzla/bitwuzla_wrap.cpp
-lib/native/source/libbitwuzla/bitwuzla_wrap.h
 lib/native/source/*/*.so
 lib/native/source/*/*.o
-lib/native/source/**/*.java
+lib/native/source/opensmt/**/*.java
 lib/native/*/*.asc
 
 doc/Example-Maven-Project/target*
diff --git a/lib/native/source/libbitwuzla/bitwuzla_wrap.cpp b/lib/native/source/libbitwuzla/bitwuzla_wrap.cpp
new file mode 100644
index 0000000000..26dbd8fe27
--- /dev/null
+++ b/lib/native/source/libbitwuzla/bitwuzla_wrap.cpp
@@ -0,0 +1,7085 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+
+#define SWIG_VERSION 0x040100
+#define SWIGJAVA
+#define SWIG_DIRECTORS
+
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__))
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__))
+# else
+#   define SWIGUNUSED
+# endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* exporting methods */
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
+
+
+#include <jni.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/* Support for throwing Java exceptions */
+typedef enum {
+  SWIG_JavaOutOfMemoryError = 1,
+  SWIG_JavaIOException,
+  SWIG_JavaRuntimeException,
+  SWIG_JavaIndexOutOfBoundsException,
+  SWIG_JavaArithmeticException,
+  SWIG_JavaIllegalArgumentException,
+  SWIG_JavaNullPointerException,
+  SWIG_JavaDirectorPureVirtual,
+  SWIG_JavaUnknownError,
+  SWIG_JavaIllegalStateException,
+} SWIG_JavaExceptionCodes;
+
+typedef struct {
+  SWIG_JavaExceptionCodes code;
+  const char *java_exception;
+} SWIG_JavaExceptions_t;
+
+
+static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) {
+  jclass excep;
+  static const SWIG_JavaExceptions_t java_exceptions[] = {
+    { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" },
+    { SWIG_JavaIOException, "java/io/IOException" },
+    { SWIG_JavaRuntimeException, "java/lang/RuntimeException" },
+    { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" },
+    { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" },
+    { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" },
+    { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
+    { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
+    { SWIG_JavaUnknownError,  "java/lang/UnknownError" },
+    { SWIG_JavaIllegalStateException, "java/lang/IllegalStateException" },
+    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" }
+  };
+  const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
+
+  while (except_ptr->code != code && except_ptr->code)
+    except_ptr++;
+
+  jenv->ExceptionClear();
+  excep = jenv->FindClass(except_ptr->java_exception);
+  if (excep)
+    jenv->ThrowNew(excep, msg);
+}
+
+
+/* Contract support */
+
+#define SWIG_contract_assert(nullreturn, expr, msg) do { if (!(expr)) {SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, msg); return nullreturn; } } while (0)
+
+
+#define SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON
+
+/* -----------------------------------------------------------------------------
+ * director_common.swg
+ *
+ * This file contains support for director classes which is common between
+ * languages.
+ * ----------------------------------------------------------------------------- */
+
+/*
+  Use -DSWIG_DIRECTOR_STATIC if you prefer to avoid the use of the
+  'Swig' namespace. This could be useful for multi-modules projects.
+*/
+#ifdef SWIG_DIRECTOR_STATIC
+/* Force anonymous (static) namespace */
+#define Swig
+#endif
+/* -----------------------------------------------------------------------------
+ * director.swg
+ *
+ * This file contains support for director classes so that Java proxy
+ * methods can be called from C++.
+ * ----------------------------------------------------------------------------- */
+
+#if defined(DEBUG_DIRECTOR_OWNED) || defined(DEBUG_DIRECTOR_EXCEPTION) || defined(DEBUG_DIRECTOR_THREAD_NAME)
+#include <iostream>
+#endif
+
+#include <exception>
+
+#if defined(SWIG_JAVA_USE_THREAD_NAME)
+
+#if !defined(SWIG_JAVA_GET_THREAD_NAME)
+namespace Swig {
+  SWIGINTERN int GetThreadName(char *name, size_t len);
+}
+
+#if defined(__linux__)
+
+#include <sys/prctl.h>
+SWIGINTERN int Swig::GetThreadName(char *name, size_t len) {
+  (void)len;
+#if defined(PR_GET_NAME)
+  return prctl(PR_GET_NAME, (unsigned long)name, 0, 0, 0);
+#else
+  (void)name;
+  return 1;
+#endif
+}
+
+#elif defined(__unix__) || defined(__APPLE__)
+
+#include <pthread.h>
+SWIGINTERN int Swig::GetThreadName(char *name, size_t len) {
+  return pthread_getname_np(pthread_self(), name, len);
+}
+
+#else
+
+SWIGINTERN int Swig::GetThreadName(char *name, size_t len) {
+  (void)len;
+  (void)name;
+  return 1;
+}
+#endif
+
+#endif
+
+#endif
+
+#if defined(SWIG_JAVA_DETACH_ON_THREAD_END)
+#include <pthread.h>
+#endif
+
+namespace Swig {
+
+  /* Java object wrapper */
+  class JObjectWrapper {
+  public:
+    JObjectWrapper() : jthis_(NULL), weak_global_(true) {
+    }
+
+    ~JObjectWrapper() {
+      jthis_ = NULL;
+      weak_global_ = true;
+    }
+
+    bool set(JNIEnv *jenv, jobject jobj, bool mem_own, bool weak_global) {
+      if (!jthis_) {
+        weak_global_ = weak_global || !mem_own; // hold as weak global if explicitly requested or not owned
+        if (jobj)
+          jthis_ = weak_global_ ? jenv->NewWeakGlobalRef(jobj) : jenv->NewGlobalRef(jobj);
+#if defined(DEBUG_DIRECTOR_OWNED)
+        std::cout << "JObjectWrapper::set(" << jobj << ", " << (weak_global ? "weak_global" : "global_ref") << ") -> " << jthis_ << std::endl;
+#endif
+        return true;
+      } else {
+#if defined(DEBUG_DIRECTOR_OWNED)
+        std::cout << "JObjectWrapper::set(" << jobj << ", " << (weak_global ? "weak_global" : "global_ref") << ") -> already set" << std::endl;
+#endif
+        return false;
+      }
+    }
+
+    jobject get(JNIEnv *jenv) const {
+#if defined(DEBUG_DIRECTOR_OWNED)
+      std::cout << "JObjectWrapper::get(";
+      if (jthis_)
+        std::cout << jthis_;
+      else
+        std::cout << "null";
+      std::cout << ") -> return new local ref" << std::endl;
+#endif
+      return (jthis_ ? jenv->NewLocalRef(jthis_) : jthis_);
+    }
+
+    void release(JNIEnv *jenv) {
+#if defined(DEBUG_DIRECTOR_OWNED)
+      std::cout << "JObjectWrapper::release(" << jthis_ << "): " << (weak_global_ ? "weak global ref" : "global ref") << std::endl;
+#endif
+      if (jthis_) {
+        if (weak_global_) {
+          if (jenv->IsSameObject(jthis_, NULL) == JNI_FALSE)
+            jenv->DeleteWeakGlobalRef((jweak)jthis_);
+        } else
+          jenv->DeleteGlobalRef(jthis_);
+      }
+
+      jthis_ = NULL;
+      weak_global_ = true;
+    }
+
+    /* Only call peek if you know what you are doing wrt to weak/global references */
+    jobject peek() {
+      return jthis_;
+    }
+
+    /* Java proxy releases ownership of C++ object, C++ object is now
+       responsible for destruction (creates NewGlobalRef to pin Java proxy) */
+    void java_change_ownership(JNIEnv *jenv, jobject jself, bool take_or_release) {
+      if (take_or_release) {  /* Java takes ownership of C++ object's lifetime. */
+        if (!weak_global_) {
+          jenv->DeleteGlobalRef(jthis_);
+          jthis_ = jenv->NewWeakGlobalRef(jself);
+          weak_global_ = true;
+        }
+      } else {
+	/* Java releases ownership of C++ object's lifetime */
+        if (weak_global_) {
+          jenv->DeleteWeakGlobalRef((jweak)jthis_);
+          jthis_ = jenv->NewGlobalRef(jself);
+          weak_global_ = false;
+        }
+      }
+    }
+
+#if defined(SWIG_JAVA_DETACH_ON_THREAD_END)
+    static void detach(void *jvm) {
+      static_cast<JavaVM *>(jvm)->DetachCurrentThread();
+    }
+
+    static void make_detach_key() {
+      pthread_key_create(&detach_key_, detach);
+    }
+
+    /* thread-local key to register a destructor */
+    static pthread_key_t detach_key_;
+#endif
+
+  private:
+    /* pointer to Java object */
+    jobject jthis_;
+    /* Local or global reference flag */
+    bool weak_global_;
+  };
+
+#if defined(SWIG_JAVA_DETACH_ON_THREAD_END)
+  pthread_key_t JObjectWrapper::detach_key_;
+#endif
+
+  /* Local JNI reference deleter */
+  class LocalRefGuard {
+    JNIEnv *jenv_;
+    jobject jobj_;
+
+    // non-copyable
+    LocalRefGuard(const LocalRefGuard &);
+    LocalRefGuard &operator=(const LocalRefGuard &);
+  public:
+    LocalRefGuard(JNIEnv *jenv, jobject jobj): jenv_(jenv), jobj_(jobj) {}
+    ~LocalRefGuard() {
+      if (jobj_)
+        jenv_->DeleteLocalRef(jobj_);
+    }
+  };
+
+  /* director base class */
+  class Director {
+    /* pointer to Java virtual machine */
+    JavaVM *swig_jvm_;
+
+  protected:
+#if defined (_MSC_VER) && (_MSC_VER<1300)
+    class JNIEnvWrapper;
+    friend class JNIEnvWrapper;
+#endif
+    /* Utility class for managing the JNI environment */
+    class JNIEnvWrapper {
+      const Director *director_;
+      JNIEnv *jenv_;
+      int env_status;
+    public:
+      JNIEnvWrapper(const Director *director) : director_(director), jenv_(0), env_status(0) {
+#if defined(__ANDROID__)
+        JNIEnv **jenv = &jenv_;
+#else
+        void **jenv = (void **)&jenv_;
+#endif
+        env_status = director_->swig_jvm_->GetEnv((void **)&jenv_, JNI_VERSION_1_2);
+        JavaVMAttachArgs args;
+        args.version = JNI_VERSION_1_2;
+        args.group = NULL;
+        args.name = NULL;
+#if defined(SWIG_JAVA_USE_THREAD_NAME)
+        char thread_name[64];  // MAX_TASK_COMM_LEN=16 is hard-coded in the Linux kernel and MacOS has MAXTHREADNAMESIZE=64.
+        if (Swig::GetThreadName(thread_name, sizeof(thread_name)) == 0) {
+          args.name = thread_name;
+#if defined(DEBUG_DIRECTOR_THREAD_NAME)
+          std::cout << "JNIEnvWrapper: thread name: " << thread_name << std::endl;
+        } else {
+          std::cout << "JNIEnvWrapper: Couldn't set Java thread name" << std::endl;
+#endif
+        }
+#endif
+#if defined(SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON)
+        // Attach a daemon thread to the JVM. Useful when the JVM should not wait for
+        // the thread to exit upon shutdown. Only for jdk-1.4 and later.
+        director_->swig_jvm_->AttachCurrentThreadAsDaemon(jenv, &args);
+#else
+        director_->swig_jvm_->AttachCurrentThread(jenv, &args);
+#endif
+
+#if defined(SWIG_JAVA_DETACH_ON_THREAD_END)
+        // At least on Android 6, detaching after every call causes a memory leak.
+        // Instead, register a thread desructor and detach only when the thread ends.
+        // See https://developer.android.com/training/articles/perf-jni#threads
+        static pthread_once_t once = PTHREAD_ONCE_INIT;
+
+        pthread_once(&once, JObjectWrapper::make_detach_key);
+        pthread_setspecific(JObjectWrapper::detach_key_, director->swig_jvm_);
+#endif
+      }
+      ~JNIEnvWrapper() {
+#if !defined(SWIG_JAVA_DETACH_ON_THREAD_END) && !defined(SWIG_JAVA_NO_DETACH_CURRENT_THREAD)
+        // Some JVMs, eg jdk-1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call.
+        // However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak.
+        if (env_status == JNI_EDETACHED)
+          director_->swig_jvm_->DetachCurrentThread();
+#endif
+      }
+      JNIEnv *getJNIEnv() const {
+        return jenv_;
+      }
+    };
+
+    struct SwigDirectorMethod {
+      const char *name;
+      const char *desc;
+      jmethodID methid;
+      SwigDirectorMethod(JNIEnv *jenv, jclass baseclass, const char *name, const char *desc) : name(name), desc(desc) {
+        methid = jenv->GetMethodID(baseclass, name, desc);
+      }
+    };
+
+    /* Java object wrapper */
+    JObjectWrapper swig_self_;
+
+    /* Disconnect director from Java object */
+    void swig_disconnect_director_self(const char *disconn_method) {
+      JNIEnvWrapper jnienv(this) ;
+      JNIEnv *jenv = jnienv.getJNIEnv() ;
+      jobject jobj = swig_self_.get(jenv);
+      LocalRefGuard ref_deleter(jenv, jobj);
+#if defined(DEBUG_DIRECTOR_OWNED)
+      std::cout << "Swig::Director::disconnect_director_self(" << jobj << ")" << std::endl;
+#endif
+      if (jobj && jenv->IsSameObject(jobj, NULL) == JNI_FALSE) {
+        jmethodID disconn_meth = jenv->GetMethodID(jenv->GetObjectClass(jobj), disconn_method, "()V");
+        if (disconn_meth) {
+#if defined(DEBUG_DIRECTOR_OWNED)
+          std::cout << "Swig::Director::disconnect_director_self upcall to " << disconn_method << std::endl;
+#endif
+          jenv->CallVoidMethod(jobj, disconn_meth);
+        }
+      }
+    }
+
+    jclass swig_new_global_ref(JNIEnv *jenv, const char *classname) {
+      jclass clz = jenv->FindClass(classname);
+      return clz ? (jclass)jenv->NewGlobalRef(clz) : 0;
+    }
+
+  public:
+    Director(JNIEnv *jenv) : swig_jvm_((JavaVM *) NULL), swig_self_() {
+      /* Acquire the Java VM pointer */
+      jenv->GetJavaVM(&swig_jvm_);
+    }
+
+    virtual ~Director() {
+      JNIEnvWrapper jnienv(this) ;
+      JNIEnv *jenv = jnienv.getJNIEnv() ;
+      swig_self_.release(jenv);
+    }
+
+    bool swig_set_self(JNIEnv *jenv, jobject jself, bool mem_own, bool weak_global) {
+      return swig_self_.set(jenv, jself, mem_own, weak_global);
+    }
+
+    jobject swig_get_self(JNIEnv *jenv) const {
+      return swig_self_.get(jenv);
+    }
+
+    // Change C++ object's ownership, relative to Java
+    void swig_java_change_ownership(JNIEnv *jenv, jobject jself, bool take_or_release) {
+      swig_self_.java_change_ownership(jenv, jself, take_or_release);
+    }
+  };
+
+  // Zero initialized bool array
+  template<size_t N> class BoolArray {
+    bool array_[N];
+  public:
+    BoolArray() {
+      memset(array_, 0, sizeof(array_));
+    }
+    bool& operator[](size_t n) {
+      return array_[n];
+    }
+    bool operator[](size_t n) const {
+      return array_[n];
+    }
+  };
+
+  // Utility classes and functions for exception handling.
+
+  // Simple holder for a Java string during exception handling, providing access to a c-style string
+  class JavaString {
+  public:
+    JavaString(JNIEnv *jenv, jstring jstr) : jenv_(jenv), jstr_(jstr), cstr_(0) {
+      if (jenv_ && jstr_)
+	cstr_ = (const char *) jenv_->GetStringUTFChars(jstr_, NULL);
+    }
+
+    ~JavaString() {
+      if (jenv_ && jstr_ && cstr_)
+	jenv_->ReleaseStringUTFChars(jstr_, cstr_);
+    }
+
+    const char *c_str(const char *null_string = "null JavaString") const {
+      return cstr_ ? cstr_ : null_string;
+    }
+
+  private:
+    // non-copyable
+    JavaString(const JavaString &);
+    JavaString &operator=(const JavaString &);
+
+    JNIEnv *jenv_;
+    jstring jstr_;
+    const char *cstr_;
+  };
+
+  // Helper class to extract the exception message from a Java throwable
+  class JavaExceptionMessage {
+  public:
+    JavaExceptionMessage(JNIEnv *jenv, jthrowable throwable) : message_(jenv, exceptionMessageFromThrowable(jenv, throwable)) {
+    }
+
+    // Return a C string of the exception message in the jthrowable passed in the constructor
+    // If no message is available, null_string is return instead
+    const char *message(const char *null_string = "Could not get exception message in JavaExceptionMessage") const {
+      return message_.c_str(null_string);
+    }
+
+  private:
+    // non-copyable
+    JavaExceptionMessage(const JavaExceptionMessage &);
+    JavaExceptionMessage &operator=(const JavaExceptionMessage &);
+
+    // Get exception message by calling Java method Throwable.getMessage()
+    static jstring exceptionMessageFromThrowable(JNIEnv *jenv, jthrowable throwable) {
+      jstring jmsg = NULL;
+      if (jenv && throwable) {
+	jenv->ExceptionClear(); // Cannot invoke methods with any pending exceptions
+	jclass throwclz = jenv->GetObjectClass(throwable);
+	if (throwclz) {
+	  // All Throwable classes have a getMessage() method, so call it to extract the exception message
+	  jmethodID getMessageMethodID = jenv->GetMethodID(throwclz, "getMessage", "()Ljava/lang/String;");
+	  if (getMessageMethodID)
+	    jmsg = (jstring)jenv->CallObjectMethod(throwable, getMessageMethodID);
+	}
+	if (jmsg == NULL && jenv->ExceptionCheck())
+	  jenv->ExceptionClear();
+      }
+      return jmsg;
+    }
+
+    JavaString message_;
+  };
+
+  // C++ Exception class for handling Java exceptions thrown during a director method Java upcall
+  class DirectorException : public std::exception {
+  public:
+
+    // Construct exception from a Java throwable
+    DirectorException(JNIEnv *jenv, jthrowable throwable) : jenv_(jenv), throwable_(throwable), classname_(0), msg_(0) {
+
+      // Call Java method Object.getClass().getName() to obtain the throwable's class name (delimited by '/')
+      if (jenv && throwable) {
+	jenv->ExceptionClear(); // Cannot invoke methods with any pending exceptions
+	jclass throwclz = jenv->GetObjectClass(throwable);
+	if (throwclz) {
+	  jclass clzclz = jenv->GetObjectClass(throwclz);
+	  if (clzclz) {
+	    jmethodID getNameMethodID = jenv->GetMethodID(clzclz, "getName", "()Ljava/lang/String;");
+	    if (getNameMethodID) {
+	      jstring jstr_classname = (jstring)(jenv->CallObjectMethod(throwclz, getNameMethodID));
+              // Copy strings, since there is no guarantee that jenv will be active when handled
+              if (jstr_classname) {
+                JavaString jsclassname(jenv, jstr_classname);
+                const char *classname = jsclassname.c_str(0);
+                if (classname)
+                  classname_ = copypath(classname);
+              }
+	    }
+	  }
+	}
+      }
+
+      JavaExceptionMessage exceptionmsg(jenv, throwable);
+      msg_ = copystr(exceptionmsg.message(0));
+    }
+
+    // More general constructor for handling as a java.lang.RuntimeException
+    DirectorException(const char *msg) : jenv_(0), throwable_(0), classname_(0), msg_(msg ? copystr(msg) : 0) {
+    }
+
+    ~DirectorException() throw() {
+      delete[] classname_;
+      delete[] msg_;
+    }
+
+    const char *what() const throw() {
+      return msg_ ? msg_ : "Unspecified DirectorException message";
+    }
+
+    // Reconstruct and raise/throw the Java Exception that caused the DirectorException
+    // Note that any error in the JNI exception handling results in a Java RuntimeException
+    void throwException(JNIEnv *jenv) const {
+      if (jenv) {
+        if (jenv == jenv_ && throwable_) {
+          // Throw original exception if not already pending
+          jthrowable throwable = jenv->ExceptionOccurred();
+          if (throwable && jenv->IsSameObject(throwable, throwable_) == JNI_FALSE) {
+            jenv->ExceptionClear();
+            throwable = 0;
+          }
+          if (!throwable)
+            jenv->Throw(throwable_);
+        } else {
+          // Try and reconstruct original exception, but original stacktrace is not reconstructed
+          jenv->ExceptionClear();
+
+          jmethodID ctorMethodID = 0;
+          jclass throwableclass = 0;
+          if (classname_) {
+            throwableclass = jenv->FindClass(classname_);
+            if (throwableclass)
+              ctorMethodID = jenv->GetMethodID(throwableclass, "<init>", "(Ljava/lang/String;)V");
+          }
+
+          if (ctorMethodID) {
+            jenv->ThrowNew(throwableclass, what());
+          } else {
+            SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, what());
+          }
+        }
+      }
+    }
+
+    // Deprecated - use throwException
+    void raiseJavaException(JNIEnv *jenv) const {
+      throwException(jenv);
+    }
+
+    // Create and throw the DirectorException
+    static void raise(JNIEnv *jenv, jthrowable throwable) {
+      throw DirectorException(jenv, throwable);
+    }
+
+  private:
+    static char *copypath(const char *srcmsg) {
+      char *target = copystr(srcmsg);
+      for (char *c=target; *c; ++c) {
+        if ('.' == *c)
+          *c = '/';
+      }
+      return target;
+    }
+
+    static char *copystr(const char *srcmsg) {
+      char *target = 0;
+      if (srcmsg) {
+	size_t msglen = strlen(srcmsg) + 1;
+	target = new char[msglen];
+	strncpy(target, srcmsg, msglen);
+      }
+      return target;
+    }
+
+    JNIEnv *jenv_;
+    jthrowable throwable_;
+    const char *classname_;
+    const char *msg_;
+  };
+
+  // Helper method to determine if a Java throwable matches a particular Java class type
+  // Note side effect of clearing any pending exceptions
+  SWIGINTERN bool ExceptionMatches(JNIEnv *jenv, jthrowable throwable, const char *classname) {
+    bool matches = false;
+
+    if (throwable && jenv && classname) {
+      // Exceptions need to be cleared for correct behavior.
+      // The caller of ExceptionMatches should restore pending exceptions if desired -
+      // the caller already has the throwable.
+      jenv->ExceptionClear();
+
+      jclass clz = jenv->FindClass(classname);
+      if (clz) {
+	jclass classclz = jenv->GetObjectClass(clz);
+	jmethodID isInstanceMethodID = jenv->GetMethodID(classclz, "isInstance", "(Ljava/lang/Object;)Z");
+	if (isInstanceMethodID) {
+	  matches = jenv->CallBooleanMethod(clz, isInstanceMethodID, throwable) != 0;
+	}
+      }
+
+#if defined(DEBUG_DIRECTOR_EXCEPTION)
+      if (jenv->ExceptionCheck()) {
+        // Typically occurs when an invalid classname argument is passed resulting in a ClassNotFoundException
+        JavaExceptionMessage exc(jenv, jenv->ExceptionOccurred());
+        std::cout << "Error: ExceptionMatches: class '" << classname << "' : " << exc.message() << std::endl;
+      }
+#endif
+    }
+    return matches;
+  }
+}
+
+namespace Swig {
+  namespace {
+    jclass jclass_BitwuzlaNativeJNI = NULL;
+    jmethodID director_method_ids[1];
+  }
+}
+
+#ifdef __cplusplus
+#include <utility>
+/* SwigValueWrapper is described in swig.swg */
+template<typename T> class SwigValueWrapper {
+  struct SwigSmartPointer {
+    T *ptr;
+    SwigSmartPointer(T *p) : ptr(p) { }
+    ~SwigSmartPointer() { delete ptr; }
+    SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+    void reset(T *p) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = p; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
+public:
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; }
+#if __cplusplus >=201103L
+  SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; }
+  operator T&&() const { return std::move(*pointer.ptr); }
+#else
+  operator T&() const { return *pointer.ptr; }
+#endif
+  T *operator&() const { return pointer.ptr; }
+  static void reset(SwigValueWrapper& t, T *p) { t.pointer.reset(p); }
+};
+
+/*
+ * SwigValueInit() is a generic initialisation solution as the following approach:
+ * 
+ *       T c_result = T();
+ * 
+ * doesn't compile for all types for example:
+ * 
+ *       unsigned int c_result = unsigned int();
+ */
+template <typename T> T SwigValueInit() {
+  return T();
+}
+
+#if __cplusplus >=201103L
+# define SWIG_STD_MOVE(OBJ) std::move(OBJ)
+#else
+# define SWIG_STD_MOVE(OBJ) OBJ
+#endif
+
+#endif
+
+
+#include <bitwuzla/cpp/bitwuzla.h>
+#include <bitwuzla/cpp/parser.h>
+
+#include <string>
+#include <sstream>
+
+#include <cassert>
+
+
+#include <stdint.h>		// Use the C99 official header
+
+
+#include <string>
+
+
+#include <typeinfo>
+#include <stdexcept>
+
+
+#include <vector>
+#include <stdexcept>
+
+
+/* Check for overflow converting to Java int (always signed 32-bit) from (unsigned variable-bit) size_t */
+SWIGINTERN jint SWIG_JavaIntFromSize_t(size_t size) {
+  static const jint JINT_MAX = 0x7FFFFFFF;
+  return (size > (size_t)JINT_MAX) ? -1 : (jint)size;
+}
+
+
+SWIGINTERN jint SWIG_VectorSize(size_t size) {
+  jint sz = SWIG_JavaIntFromSize_t(size);
+  if (sz == -1)
+    throw std::out_of_range("vector size is too large to fit into a Java int");
+  return sz;
+}
+
+SWIGINTERN std::vector< int > *new_std_vector_Sl_int_Sg___SWIG_2(jint count,int const &value){
+        if (count < 0)
+          throw std::out_of_range("vector count must be positive");
+        return new std::vector< int >(static_cast<std::vector< int >::size_type>(count), value);
+      }
+SWIGINTERN jint std_vector_Sl_int_Sg__doSize(std::vector< int > const *self){
+        return SWIG_VectorSize(self->size());
+      }
+SWIGINTERN void std_vector_Sl_int_Sg__doAdd__SWIG_0(std::vector< int > *self,std::vector< int >::value_type const &x){
+        self->push_back(x);
+      }
+SWIGINTERN void std_vector_Sl_int_Sg__doAdd__SWIG_1(std::vector< int > *self,jint index,std::vector< int >::value_type const &x){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= index && index <= size) {
+          self->insert(self->begin() + index, x);
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< int >::value_type std_vector_Sl_int_Sg__doRemove(std::vector< int > *self,jint index){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= index && index < size) {
+          int const old_value = (*self)[index];
+          self->erase(self->begin() + index);
+          return old_value;
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< int >::value_type const &std_vector_Sl_int_Sg__doGet(std::vector< int > *self,jint index){
+        jint size = static_cast<jint>(self->size());
+        if (index >= 0 && index < size)
+          return (*self)[index];
+        else
+          throw std::out_of_range("vector index out of range");
+      }
+SWIGINTERN std::vector< int >::value_type std_vector_Sl_int_Sg__doSet(std::vector< int > *self,jint index,std::vector< int >::value_type const &val){
+        jint size = static_cast<jint>(self->size());
+        if (index >= 0 && index < size) {
+          int const old_value = (*self)[index];
+          (*self)[index] = val;
+          return old_value;
+        }
+        else
+          throw std::out_of_range("vector index out of range");
+      }
+SWIGINTERN void std_vector_Sl_int_Sg__doRemoveRange(std::vector< int > *self,jint fromIndex,jint toIndex){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= fromIndex && fromIndex <= toIndex && toIndex <= size) {
+          self->erase(self->begin() + fromIndex, self->begin() + toIndex);
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< std::string > *new_std_vector_Sl_std_string_Sg___SWIG_2(jint count,std::string const &value){
+        if (count < 0)
+          throw std::out_of_range("vector count must be positive");
+        return new std::vector< std::string >(static_cast<std::vector< std::string >::size_type>(count), value);
+      }
+SWIGINTERN jint std_vector_Sl_std_string_Sg__doSize(std::vector< std::string > const *self){
+        return SWIG_VectorSize(self->size());
+      }
+SWIGINTERN void std_vector_Sl_std_string_Sg__doAdd__SWIG_0(std::vector< std::string > *self,std::vector< std::string >::value_type const &x){
+        self->push_back(x);
+      }
+SWIGINTERN void std_vector_Sl_std_string_Sg__doAdd__SWIG_1(std::vector< std::string > *self,jint index,std::vector< std::string >::value_type const &x){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= index && index <= size) {
+          self->insert(self->begin() + index, x);
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< std::string >::value_type std_vector_Sl_std_string_Sg__doRemove(std::vector< std::string > *self,jint index){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= index && index < size) {
+          std::string const old_value = (*self)[index];
+          self->erase(self->begin() + index);
+          return old_value;
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< std::string >::value_type const &std_vector_Sl_std_string_Sg__doGet(std::vector< std::string > *self,jint index){
+        jint size = static_cast<jint>(self->size());
+        if (index >= 0 && index < size)
+          return (*self)[index];
+        else
+          throw std::out_of_range("vector index out of range");
+      }
+SWIGINTERN std::vector< std::string >::value_type std_vector_Sl_std_string_Sg__doSet(std::vector< std::string > *self,jint index,std::vector< std::string >::value_type const &val){
+        jint size = static_cast<jint>(self->size());
+        if (index >= 0 && index < size) {
+          std::string const old_value = (*self)[index];
+          (*self)[index] = val;
+          return old_value;
+        }
+        else
+          throw std::out_of_range("vector index out of range");
+      }
+SWIGINTERN void std_vector_Sl_std_string_Sg__doRemoveRange(std::vector< std::string > *self,jint fromIndex,jint toIndex){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= fromIndex && fromIndex <= toIndex && toIndex <= size) {
+          self->erase(self->begin() + fromIndex, self->begin() + toIndex);
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< bitwuzla::Term > *new_std_vector_Sl_bitwuzla_Term_Sg___SWIG_2(jint count,bitwuzla::Term const &value){
+        if (count < 0)
+          throw std::out_of_range("vector count must be positive");
+        return new std::vector< bitwuzla::Term >(static_cast<std::vector< bitwuzla::Term >::size_type>(count), value);
+      }
+SWIGINTERN jint std_vector_Sl_bitwuzla_Term_Sg__doSize(std::vector< bitwuzla::Term > const *self){
+        return SWIG_VectorSize(self->size());
+      }
+SWIGINTERN void std_vector_Sl_bitwuzla_Term_Sg__doAdd__SWIG_0(std::vector< bitwuzla::Term > *self,std::vector< bitwuzla::Term >::value_type const &x){
+        self->push_back(x);
+      }
+SWIGINTERN void std_vector_Sl_bitwuzla_Term_Sg__doAdd__SWIG_1(std::vector< bitwuzla::Term > *self,jint index,std::vector< bitwuzla::Term >::value_type const &x){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= index && index <= size) {
+          self->insert(self->begin() + index, x);
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< bitwuzla::Term >::value_type std_vector_Sl_bitwuzla_Term_Sg__doRemove(std::vector< bitwuzla::Term > *self,jint index){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= index && index < size) {
+          bitwuzla::Term const old_value = (*self)[index];
+          self->erase(self->begin() + index);
+          return old_value;
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< bitwuzla::Term >::value_type const &std_vector_Sl_bitwuzla_Term_Sg__doGet(std::vector< bitwuzla::Term > *self,jint index){
+        jint size = static_cast<jint>(self->size());
+        if (index >= 0 && index < size)
+          return (*self)[index];
+        else
+          throw std::out_of_range("vector index out of range");
+      }
+SWIGINTERN std::vector< bitwuzla::Term >::value_type std_vector_Sl_bitwuzla_Term_Sg__doSet(std::vector< bitwuzla::Term > *self,jint index,std::vector< bitwuzla::Term >::value_type const &val){
+        jint size = static_cast<jint>(self->size());
+        if (index >= 0 && index < size) {
+          bitwuzla::Term const old_value = (*self)[index];
+          (*self)[index] = val;
+          return old_value;
+        }
+        else
+          throw std::out_of_range("vector index out of range");
+      }
+SWIGINTERN void std_vector_Sl_bitwuzla_Term_Sg__doRemoveRange(std::vector< bitwuzla::Term > *self,jint fromIndex,jint toIndex){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= fromIndex && fromIndex <= toIndex && toIndex <= size) {
+          self->erase(self->begin() + fromIndex, self->begin() + toIndex);
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< bitwuzla::Sort > *new_std_vector_Sl_bitwuzla_Sort_Sg___SWIG_2(jint count,bitwuzla::Sort const &value){
+        if (count < 0)
+          throw std::out_of_range("vector count must be positive");
+        return new std::vector< bitwuzla::Sort >(static_cast<std::vector< bitwuzla::Sort >::size_type>(count), value);
+      }
+SWIGINTERN jint std_vector_Sl_bitwuzla_Sort_Sg__doSize(std::vector< bitwuzla::Sort > const *self){
+        return SWIG_VectorSize(self->size());
+      }
+SWIGINTERN void std_vector_Sl_bitwuzla_Sort_Sg__doAdd__SWIG_0(std::vector< bitwuzla::Sort > *self,std::vector< bitwuzla::Sort >::value_type const &x){
+        self->push_back(x);
+      }
+SWIGINTERN void std_vector_Sl_bitwuzla_Sort_Sg__doAdd__SWIG_1(std::vector< bitwuzla::Sort > *self,jint index,std::vector< bitwuzla::Sort >::value_type const &x){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= index && index <= size) {
+          self->insert(self->begin() + index, x);
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< bitwuzla::Sort >::value_type std_vector_Sl_bitwuzla_Sort_Sg__doRemove(std::vector< bitwuzla::Sort > *self,jint index){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= index && index < size) {
+          bitwuzla::Sort const old_value = (*self)[index];
+          self->erase(self->begin() + index);
+          return old_value;
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+SWIGINTERN std::vector< bitwuzla::Sort >::value_type const &std_vector_Sl_bitwuzla_Sort_Sg__doGet(std::vector< bitwuzla::Sort > *self,jint index){
+        jint size = static_cast<jint>(self->size());
+        if (index >= 0 && index < size)
+          return (*self)[index];
+        else
+          throw std::out_of_range("vector index out of range");
+      }
+SWIGINTERN std::vector< bitwuzla::Sort >::value_type std_vector_Sl_bitwuzla_Sort_Sg__doSet(std::vector< bitwuzla::Sort > *self,jint index,std::vector< bitwuzla::Sort >::value_type const &val){
+        jint size = static_cast<jint>(self->size());
+        if (index >= 0 && index < size) {
+          bitwuzla::Sort const old_value = (*self)[index];
+          (*self)[index] = val;
+          return old_value;
+        }
+        else
+          throw std::out_of_range("vector index out of range");
+      }
+SWIGINTERN void std_vector_Sl_bitwuzla_Sort_Sg__doRemoveRange(std::vector< bitwuzla::Sort > *self,jint fromIndex,jint toIndex){
+        jint size = static_cast<jint>(self->size());
+        if (0 <= fromIndex && fromIndex <= toIndex && toIndex <= size) {
+          self->erase(self->begin() + fromIndex, self->begin() + toIndex);
+        } else {
+          throw std::out_of_range("vector index out of range");
+        }
+      }
+
+#include <unordered_map>
+#include <stdexcept>
+
+SWIGINTERN std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__iterator_getNextUnchecked(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *self){
+          std::unordered_map< bitwuzla::Term, bitwuzla::Term >::iterator copy = (*self);
+          return ++copy;
+        }
+SWIGINTERN bool std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__iterator_isNot(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator const *self,std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator other){
+          return (*self != other);
+        }
+SWIGINTERN bitwuzla::Term std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__iterator_getKey(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator const *self){
+          return (*self)->first;
+        }
+SWIGINTERN bitwuzla::Term std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__iterator_getValue(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator const *self){
+          return (*self)->second;
+        }
+SWIGINTERN void std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__iterator_setValue(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *self,bitwuzla::Term const &newValue){
+          (*self)->second = newValue;
+        }
+
+  SWIGINTERN jint SWIG_MapSize(size_t size) {
+    jint sz = SWIG_JavaIntFromSize_t(size);
+    if (sz == -1) {
+      throw std::out_of_range("map size is too large to fit into a Java int");
+    }
+
+    return sz;
+  }
+
+SWIGINTERN jint std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__sizeImpl(std::unordered_map< bitwuzla::Term,bitwuzla::Term > const *self){
+        return SWIG_MapSize(self->size());
+      }
+SWIGINTERN bool std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__containsImpl(std::unordered_map< bitwuzla::Term,bitwuzla::Term > *self,bitwuzla::Term const &key){
+        return (self->count(key) > 0);
+      }
+SWIGINTERN void std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__putUnchecked(std::unordered_map< bitwuzla::Term,bitwuzla::Term > *self,bitwuzla::Term const &key,bitwuzla::Term const &value){
+        (*self)[key] = value;
+      }
+SWIGINTERN void std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__removeUnchecked(std::unordered_map< bitwuzla::Term,bitwuzla::Term > *self,std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator const itr){
+        self->erase(itr);
+      }
+SWIGINTERN void bitwuzla_Options_set__SWIG_3(bitwuzla::Options *self,bitwuzla::Option option,int value){
+    self->set(option, value);
+  }
+SWIGINTERN int bitwuzla_Term_id(bitwuzla::Term *self){
+    return (int) self->id();
+  }
+SWIGINTERN std::vector< int > bitwuzla_Term_indices(bitwuzla::Term *self){
+    std::vector<int> result;
+    for(auto v : self->indices()) {
+      result.emplace_back(v);
+    }
+    return result;
+  }
+SWIGINTERN std::string bitwuzla_Term_symbol(bitwuzla::Term *self){
+    return self->symbol().value();
+  }
+SWIGINTERN bool bitwuzla_Term_to_bool(bitwuzla::Term *self){
+    assert(self->is_value() && self->sort().is_bool());
+    return self->value<bool>();
+  }
+SWIGINTERN bitwuzla::RoundingMode bitwuzla_Term_to_rm(bitwuzla::Term *self){
+    assert(self->is_value() && self->sort().is_rm());
+    return self->value<bitwuzla::RoundingMode>();
+  }
+SWIGINTERN std::string bitwuzla_Term_to_bv(bitwuzla::Term *self){
+    assert(self->is_value() && (self->sort().is_bv() || self->sort().is_fp()));
+    return self->value<std::string>();
+  }
+SWIGINTERN int bitwuzla_Term_hashCode(bitwuzla::Term *self){
+    std::hash<bitwuzla::Term> f;
+    return (int) f(*self);
+  }
+SWIGINTERN bool bitwuzla_Term_isEqual(bitwuzla::Term *self,bitwuzla::Term other){
+    return operator==(*self, other);
+  }
+SWIGINTERN int bitwuzla_Sort_id(bitwuzla::Sort *self){
+    return (int) self->id();
+  }
+SWIGINTERN int bitwuzla_Sort_bv_size(bitwuzla::Sort *self){
+    return (int) self->bv_size();
+  }
+SWIGINTERN int bitwuzla_Sort_fp_exp_size(bitwuzla::Sort *self){
+    return (int) self->fp_exp_size();
+  }
+SWIGINTERN int bitwuzla_Sort_fp_sig_size(bitwuzla::Sort *self){
+    return (int) self->fp_sig_size();
+  }
+SWIGINTERN int bitwuzla_Sort_fun_arity(bitwuzla::Sort *self){
+    return (int) self->fun_arity();
+  }
+SWIGINTERN int bitwuzla_Sort_hashCode(bitwuzla::Sort *self){
+    std::hash<bitwuzla::Sort> f;
+    return (int) f(*self);
+  }
+SWIGINTERN bool bitwuzla_Sort_isEqual(bitwuzla::Sort *self,bitwuzla::Sort other){
+    return operator==(*self, other);
+  }
+SWIGINTERN bitwuzla::Sort bitwuzla_TermManager_mk_bv_sort(bitwuzla::TermManager *self,int size){
+    return self->mk_bv_sort(size);
+  }
+SWIGINTERN bitwuzla::Sort bitwuzla_TermManager_mk_fp_sort(bitwuzla::TermManager *self,int exp_size,int sig_size){
+    return self->mk_fp_sort(exp_size, sig_size);
+  }
+SWIGINTERN bitwuzla::Term bitwuzla_TermManager_mk_term__SWIG_0(bitwuzla::TermManager *self,bitwuzla::Kind kind,bitwuzla::Term const &t1){
+    return self->mk_term(kind, {t1}, {});
+  }
+SWIGINTERN bitwuzla::Term bitwuzla_TermManager_mk_term__SWIG_1(bitwuzla::TermManager *self,bitwuzla::Kind kind,bitwuzla::Term const &t1,int i1){
+    return self->mk_term(kind, {t1}, {(uint64_t) i1});
+  }
+SWIGINTERN bitwuzla::Term bitwuzla_TermManager_mk_term__SWIG_2(bitwuzla::TermManager *self,bitwuzla::Kind kind,bitwuzla::Term const &t1,int i1,int i2){
+    return self->mk_term(kind, {t1}, {(uint64_t) i1, (uint64_t) i2});
+  }
+SWIGINTERN bitwuzla::Term bitwuzla_TermManager_mk_term__SWIG_3(bitwuzla::TermManager *self,bitwuzla::Kind kind,bitwuzla::Term const &t1,bitwuzla::Term const &t2){
+    return self->mk_term(kind, {t1, t2}, {});
+  }
+SWIGINTERN bitwuzla::Term bitwuzla_TermManager_mk_term__SWIG_4(bitwuzla::TermManager *self,bitwuzla::Kind kind,bitwuzla::Term const &t1,bitwuzla::Term const &t2,int i1){
+    return self->mk_term(kind, {t1, t2}, {(uint64_t) i1});
+  }
+SWIGINTERN bitwuzla::Term bitwuzla_TermManager_mk_term__SWIG_5(bitwuzla::TermManager *self,bitwuzla::Kind kind,bitwuzla::Term const &t1,bitwuzla::Term const &t2,int i1,int i2){
+    return self->mk_term(kind, {t1, t2}, {(uint64_t) i1, (uint64_t) i2});
+  }
+SWIGINTERN bitwuzla::Term bitwuzla_TermManager_mk_term__SWIG_6(bitwuzla::TermManager *self,bitwuzla::Kind kind,bitwuzla::Term const &t1,bitwuzla::Term const &t2,bitwuzla::Term const &t3){
+    return self->mk_term(kind, {t1, t2, t3}, {});
+  }
+SWIGINTERN bitwuzla::Term bitwuzla_TermManager_mk_term__SWIG_7(bitwuzla::TermManager *self,bitwuzla::Kind kind,std::vector< bitwuzla::Term > const &args,std::vector< int > const &indices){
+    std::vector<uint64_t> unsigned_indices;
+    for (auto i : indices) {
+      unsigned_indices.emplace_back((uint64_t) i);
+    }
+    return self->mk_term(kind, args, unsigned_indices);
+  }
+SWIGINTERN bitwuzla::Term bitwuzla_TermManager_mk_const(bitwuzla::TermManager *self,bitwuzla::Sort const &sort,std::string symbol){
+    return self->mk_const(sort, symbol);
+  }
+SWIGINTERN bitwuzla::Term bitwuzla_TermManager_mk_var(bitwuzla::TermManager *self,bitwuzla::Sort const &sort,std::string symbol){
+    return self->mk_var(sort, symbol);
+  }
+
+struct SWIG_null_deleter {
+  void operator() (void const *) const {
+  }
+};
+#define SWIG_NO_NULL_DELETER_0 , SWIG_null_deleter()
+#define SWIG_NO_NULL_DELETER_1
+#define SWIG_NO_NULL_DELETER_SWIG_POINTER_NEW
+#define SWIG_NO_NULL_DELETER_SWIG_POINTER_OWN
+
+SWIGINTERN std::string bitwuzla_Bitwuzla_print_formula(bitwuzla::Bitwuzla *self){
+    std::ostringstream out;
+    self->print_formula(out);
+    return out.str();
+  }
+
+
+/* ---------------------------------------------------
+ * C++ director class methods
+ * --------------------------------------------------- */
+
+#include "bitwuzla_wrap.h"
+
+SwigDirector_Terminator::SwigDirector_Terminator(JNIEnv *jenv) : bitwuzla::Terminator(), Swig::Director(jenv) {
+}
+
+SwigDirector_Terminator::~SwigDirector_Terminator() {
+  swig_disconnect_director_self("swigDirectorDisconnect");
+}
+
+
+bool SwigDirector_Terminator::terminate() {
+  bool c_result = SwigValueInit< bool >() ;
+  jboolean jresult = 0 ;
+  JNIEnvWrapper swigjnienv(this) ;
+  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
+  jobject swigjobj = (jobject) NULL ;
+  
+  if (!swig_override[0]) {
+    SWIG_JavaThrowException(JNIEnvWrapper(this).getJNIEnv(), SWIG_JavaDirectorPureVirtual, "Attempted to invoke pure virtual method bitwuzla::Terminator::terminate.");
+    return c_result;
+  }
+  swigjobj = swig_get_self(jenv);
+  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
+    jresult = (jboolean) jenv->CallStaticBooleanMethod(Swig::jclass_BitwuzlaNativeJNI, Swig::director_method_ids[0], swigjobj);
+    jthrowable swigerror = jenv->ExceptionOccurred();
+    if (swigerror) {
+      Swig::DirectorException::raise(jenv, swigerror);
+    }
+    
+    c_result = jresult ? true : false; 
+  } else {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in bitwuzla::Terminator::terminate ");
+  }
+  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
+  return c_result;
+}
+
+void SwigDirector_Terminator::swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global) {
+  static jclass baseclass = swig_new_global_ref(jenv, "org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator");
+  if (!baseclass) return;
+  static SwigDirectorMethod methods[] = {
+    SwigDirectorMethod(jenv, baseclass, "terminate", "()Z")
+  };
+  
+  if (swig_set_self(jenv, jself, swig_mem_own, weak_global)) {
+    bool derived = (jenv->IsSameObject(baseclass, jcls) ? false : true);
+    for (int i = 0; i < 1; ++i) {
+      swig_override[i] = false;
+      if (derived) {
+        jmethodID methid = jenv->GetMethodID(jcls, methods[i].name, methods[i].desc);
+        swig_override[i] = methods[i].methid && (methid != methods[i].methid);
+        jenv->ExceptionClear();
+      }
+    }
+  }
+}
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1Int_1_1SWIG_10(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  std::vector< int > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  result = (std::vector< int > *)new std::vector< int >();
+  *(std::vector< int > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1Int_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::vector< int > *arg1 = 0 ;
+  std::vector< int > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1;
+  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< int > const & is null");
+    return 0;
+  } 
+  result = (std::vector< int > *)new std::vector< int >((std::vector< int > const &)*arg1);
+  *(std::vector< int > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1capacity(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  result = ((std::vector< int > const *)arg1)->capacity();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1reserve(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type arg2 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  arg2 = (std::vector< int >::size_type)jarg2; 
+  try {
+    (arg1)->reserve(arg2);
+  } catch(std::length_error &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1isEmpty(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  result = (bool)((std::vector< int > const *)arg1)->empty();
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1clear(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  (arg1)->clear();
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1Int_1_1SWIG_12(JNIEnv *jenv, jclass jcls, jint jarg1, jint jarg2) {
+  jlong jresult = 0 ;
+  jint arg1 ;
+  int *arg2 = 0 ;
+  int temp2 ;
+  std::vector< int > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = jarg1; 
+  temp2 = (int)jarg2; 
+  arg2 = &temp2; 
+  try {
+    result = (std::vector< int > *)new_std_vector_Sl_int_Sg___SWIG_2(SWIG_STD_MOVE(arg1),(int const &)*arg2);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  *(std::vector< int > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1doSize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  jint result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  try {
+    result = std_vector_Sl_int_Sg__doSize((std::vector< int > const *)arg1);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1doAdd_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type *arg2 = 0 ;
+  std::vector< int >::value_type temp2 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  temp2 = (std::vector< int >::value_type)jarg2; 
+  arg2 = &temp2; 
+  std_vector_Sl_int_Sg__doAdd__SWIG_0(arg1,(int const &)*arg2);
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1doAdd_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) {
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  jint arg2 ;
+  std::vector< int >::value_type *arg3 = 0 ;
+  std::vector< int >::value_type temp3 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  arg2 = jarg2; 
+  temp3 = (std::vector< int >::value_type)jarg3; 
+  arg3 = &temp3; 
+  try {
+    std_vector_Sl_int_Sg__doAdd__SWIG_1(arg1,SWIG_STD_MOVE(arg2),(int const &)*arg3);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1doRemove(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jint jresult = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  jint arg2 ;
+  std::vector< int >::value_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  arg2 = jarg2; 
+  try {
+    result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__doRemove(arg1,SWIG_STD_MOVE(arg2));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1doGet(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jint jresult = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  jint arg2 ;
+  std::vector< int >::value_type *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  arg2 = jarg2; 
+  try {
+    result = (std::vector< int >::value_type *) &std_vector_Sl_int_Sg__doGet(arg1,SWIG_STD_MOVE(arg2));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = (jint)*result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1doSet(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) {
+  jint jresult = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  jint arg2 ;
+  std::vector< int >::value_type *arg3 = 0 ;
+  std::vector< int >::value_type temp3 ;
+  std::vector< int >::value_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  arg2 = jarg2; 
+  temp3 = (std::vector< int >::value_type)jarg3; 
+  arg3 = &temp3; 
+  try {
+    result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__doSet(arg1,SWIG_STD_MOVE(arg2),(int const &)*arg3);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Int_1doRemoveRange(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) {
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  jint arg2 ;
+  jint arg3 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  arg2 = jarg2; 
+  arg3 = jarg3; 
+  try {
+    std_vector_Sl_int_Sg__doRemoveRange(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Vector_1Int(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(std::vector< int > **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1String_1_1SWIG_10(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  std::vector< std::string > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  result = (std::vector< std::string > *)new std::vector< std::string >();
+  *(std::vector< std::string > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1String_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::vector< std::string > *arg1 = 0 ;
+  std::vector< std::string > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1;
+  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< std::string > const & is null");
+    return 0;
+  } 
+  result = (std::vector< std::string > *)new std::vector< std::string >((std::vector< std::string > const &)*arg1);
+  *(std::vector< std::string > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1capacity(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  std::vector< std::string >::size_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  result = ((std::vector< std::string > const *)arg1)->capacity();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1reserve(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  std::vector< std::string >::size_type arg2 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  arg2 = (std::vector< std::string >::size_type)jarg2; 
+  try {
+    (arg1)->reserve(arg2);
+  } catch(std::length_error &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1isEmpty(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  result = (bool)((std::vector< std::string > const *)arg1)->empty();
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1clear(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  (arg1)->clear();
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1String_1_1SWIG_12(JNIEnv *jenv, jclass jcls, jint jarg1, jstring jarg2) {
+  jlong jresult = 0 ;
+  jint arg1 ;
+  std::string *arg2 = 0 ;
+  std::vector< std::string > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = jarg1; 
+  if(!jarg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
+  if (!arg2_pstr) return 0;
+  std::string arg2_str(arg2_pstr);
+  arg2 = &arg2_str;
+  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
+  try {
+    result = (std::vector< std::string > *)new_std_vector_Sl_std_string_Sg___SWIG_2(SWIG_STD_MOVE(arg1),(std::string const &)*arg2);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  *(std::vector< std::string > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1doSize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  jint result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  try {
+    result = std_vector_Sl_std_string_Sg__doSize((std::vector< std::string > const *)arg1);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1doAdd_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  std::vector< std::string >::value_type *arg2 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  if(!jarg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return ;
+  }
+  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
+  if (!arg2_pstr) return ;
+  std::vector< std::string >::value_type arg2_str(arg2_pstr);
+  arg2 = &arg2_str;
+  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
+  std_vector_Sl_std_string_Sg__doAdd__SWIG_0(arg1,(std::string const &)*arg2);
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1doAdd_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jstring jarg3) {
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  jint arg2 ;
+  std::vector< std::string >::value_type *arg3 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  arg2 = jarg2; 
+  if(!jarg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return ;
+  }
+  const char *arg3_pstr = (const char *)jenv->GetStringUTFChars(jarg3, 0); 
+  if (!arg3_pstr) return ;
+  std::vector< std::string >::value_type arg3_str(arg3_pstr);
+  arg3 = &arg3_str;
+  jenv->ReleaseStringUTFChars(jarg3, arg3_pstr); 
+  try {
+    std_vector_Sl_std_string_Sg__doAdd__SWIG_1(arg1,SWIG_STD_MOVE(arg2),(std::string const &)*arg3);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1doRemove(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jstring jresult = 0 ;
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  jint arg2 ;
+  std::vector< std::string >::value_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  arg2 = jarg2; 
+  try {
+    result = std_vector_Sl_std_string_Sg__doRemove(arg1,SWIG_STD_MOVE(arg2));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1doGet(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jstring jresult = 0 ;
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  jint arg2 ;
+  std::vector< std::string >::value_type *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  arg2 = jarg2; 
+  try {
+    result = (std::vector< std::string >::value_type *) &std_vector_Sl_std_string_Sg__doGet(arg1,SWIG_STD_MOVE(arg2));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = jenv->NewStringUTF(result->c_str()); 
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1doSet(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jstring jarg3) {
+  jstring jresult = 0 ;
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  jint arg2 ;
+  std::vector< std::string >::value_type *arg3 = 0 ;
+  std::vector< std::string >::value_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  arg2 = jarg2; 
+  if(!jarg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg3_pstr = (const char *)jenv->GetStringUTFChars(jarg3, 0); 
+  if (!arg3_pstr) return 0;
+  std::vector< std::string >::value_type arg3_str(arg3_pstr);
+  arg3 = &arg3_str;
+  jenv->ReleaseStringUTFChars(jarg3, arg3_pstr); 
+  try {
+    result = std_vector_Sl_std_string_Sg__doSet(arg1,SWIG_STD_MOVE(arg2),(std::string const &)*arg3);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1String_1doRemoveRange(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) {
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  jint arg2 ;
+  jint arg3 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  arg2 = jarg2; 
+  arg3 = jarg3; 
+  try {
+    std_vector_Sl_std_string_Sg__doRemoveRange(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Vector_1String(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(std::vector< std::string > **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1Term_1_1SWIG_10(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Term > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  result = (std::vector< bitwuzla::Term > *)new std::vector< bitwuzla::Term >();
+  *(std::vector< bitwuzla::Term > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1Term_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Term > *arg1 = 0 ;
+  std::vector< bitwuzla::Term > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1;
+  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Term > const & is null");
+    return 0;
+  } 
+  result = (std::vector< bitwuzla::Term > *)new std::vector< bitwuzla::Term >((std::vector< bitwuzla::Term > const &)*arg1);
+  *(std::vector< bitwuzla::Term > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1capacity(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  std::vector< bitwuzla::Term >::size_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  result = ((std::vector< bitwuzla::Term > const *)arg1)->capacity();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1reserve(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  std::vector< bitwuzla::Term >::size_type arg2 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  arg2 = (std::vector< bitwuzla::Term >::size_type)jarg2; 
+  try {
+    (arg1)->reserve(arg2);
+  } catch(std::length_error &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1isEmpty(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  result = (bool)((std::vector< bitwuzla::Term > const *)arg1)->empty();
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1clear(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  (arg1)->clear();
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1Term_1_1SWIG_12(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  jint arg1 ;
+  bitwuzla::Term *arg2 = 0 ;
+  std::vector< bitwuzla::Term > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg2_;
+  arg1 = jarg1; 
+  arg2 = *(bitwuzla::Term **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  try {
+    result = (std::vector< bitwuzla::Term > *)new_std_vector_Sl_bitwuzla_Term_Sg___SWIG_2(SWIG_STD_MOVE(arg1),(bitwuzla::Term const &)*arg2);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  *(std::vector< bitwuzla::Term > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1doSize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  jint result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  try {
+    result = std_vector_Sl_bitwuzla_Term_Sg__doSize((std::vector< bitwuzla::Term > const *)arg1);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1doAdd_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  std::vector< bitwuzla::Term >::value_type *arg2 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  arg2 = *(std::vector< bitwuzla::Term >::value_type **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Term >::value_type const & is null");
+    return ;
+  } 
+  std_vector_Sl_bitwuzla_Term_Sg__doAdd__SWIG_0(arg1,(bitwuzla::Term const &)*arg2);
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1doAdd_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_) {
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  jint arg2 ;
+  std::vector< bitwuzla::Term >::value_type *arg3 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  arg2 = jarg2; 
+  arg3 = *(std::vector< bitwuzla::Term >::value_type **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Term >::value_type const & is null");
+    return ;
+  } 
+  try {
+    std_vector_Sl_bitwuzla_Term_Sg__doAdd__SWIG_1(arg1,SWIG_STD_MOVE(arg2),(bitwuzla::Term const &)*arg3);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1doRemove(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  jint arg2 ;
+  std::vector< bitwuzla::Term >::value_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  arg2 = jarg2; 
+  try {
+    result = std_vector_Sl_bitwuzla_Term_Sg__doRemove(arg1,SWIG_STD_MOVE(arg2));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  *(std::vector< bitwuzla::Term >::value_type **)&jresult = new std::vector< bitwuzla::Term >::value_type(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1doGet(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  jint arg2 ;
+  std::vector< bitwuzla::Term >::value_type *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  arg2 = jarg2; 
+  try {
+    result = (std::vector< bitwuzla::Term >::value_type *) &std_vector_Sl_bitwuzla_Term_Sg__doGet(arg1,SWIG_STD_MOVE(arg2));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  *(std::vector< bitwuzla::Term >::value_type **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1doSet(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  jint arg2 ;
+  std::vector< bitwuzla::Term >::value_type *arg3 = 0 ;
+  std::vector< bitwuzla::Term >::value_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  arg2 = jarg2; 
+  arg3 = *(std::vector< bitwuzla::Term >::value_type **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Term >::value_type const & is null");
+    return 0;
+  } 
+  try {
+    result = std_vector_Sl_bitwuzla_Term_Sg__doSet(arg1,SWIG_STD_MOVE(arg2),(bitwuzla::Term const &)*arg3);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  *(std::vector< bitwuzla::Term >::value_type **)&jresult = new std::vector< bitwuzla::Term >::value_type(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Term_1doRemoveRange(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) {
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  jint arg2 ;
+  jint arg3 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  arg2 = jarg2; 
+  arg3 = jarg3; 
+  try {
+    std_vector_Sl_bitwuzla_Term_Sg__doRemoveRange(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Vector_1Term(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  std::vector< bitwuzla::Term > *arg1 = (std::vector< bitwuzla::Term > *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(std::vector< bitwuzla::Term > **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1Sort_1_1SWIG_10(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Sort > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  result = (std::vector< bitwuzla::Sort > *)new std::vector< bitwuzla::Sort >();
+  *(std::vector< bitwuzla::Sort > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1Sort_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Sort > *arg1 = 0 ;
+  std::vector< bitwuzla::Sort > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1;
+  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Sort > const & is null");
+    return 0;
+  } 
+  result = (std::vector< bitwuzla::Sort > *)new std::vector< bitwuzla::Sort >((std::vector< bitwuzla::Sort > const &)*arg1);
+  *(std::vector< bitwuzla::Sort > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1capacity(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  std::vector< bitwuzla::Sort >::size_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  result = ((std::vector< bitwuzla::Sort > const *)arg1)->capacity();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1reserve(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  std::vector< bitwuzla::Sort >::size_type arg2 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  arg2 = (std::vector< bitwuzla::Sort >::size_type)jarg2; 
+  try {
+    (arg1)->reserve(arg2);
+  } catch(std::length_error &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1isEmpty(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  result = (bool)((std::vector< bitwuzla::Sort > const *)arg1)->empty();
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1clear(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  (arg1)->clear();
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Vector_1Sort_1_1SWIG_12(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  jint arg1 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  std::vector< bitwuzla::Sort > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg2_;
+  arg1 = jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  try {
+    result = (std::vector< bitwuzla::Sort > *)new_std_vector_Sl_bitwuzla_Sort_Sg___SWIG_2(SWIG_STD_MOVE(arg1),(bitwuzla::Sort const &)*arg2);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  *(std::vector< bitwuzla::Sort > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1doSize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  jint result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  try {
+    result = std_vector_Sl_bitwuzla_Sort_Sg__doSize((std::vector< bitwuzla::Sort > const *)arg1);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1doAdd_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  std::vector< bitwuzla::Sort >::value_type *arg2 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  arg2 = *(std::vector< bitwuzla::Sort >::value_type **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Sort >::value_type const & is null");
+    return ;
+  } 
+  std_vector_Sl_bitwuzla_Sort_Sg__doAdd__SWIG_0(arg1,(bitwuzla::Sort const &)*arg2);
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1doAdd_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_) {
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  jint arg2 ;
+  std::vector< bitwuzla::Sort >::value_type *arg3 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  arg2 = jarg2; 
+  arg3 = *(std::vector< bitwuzla::Sort >::value_type **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Sort >::value_type const & is null");
+    return ;
+  } 
+  try {
+    std_vector_Sl_bitwuzla_Sort_Sg__doAdd__SWIG_1(arg1,SWIG_STD_MOVE(arg2),(bitwuzla::Sort const &)*arg3);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1doRemove(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  jint arg2 ;
+  std::vector< bitwuzla::Sort >::value_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  arg2 = jarg2; 
+  try {
+    result = std_vector_Sl_bitwuzla_Sort_Sg__doRemove(arg1,SWIG_STD_MOVE(arg2));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  *(std::vector< bitwuzla::Sort >::value_type **)&jresult = new std::vector< bitwuzla::Sort >::value_type(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1doGet(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  jint arg2 ;
+  std::vector< bitwuzla::Sort >::value_type *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  arg2 = jarg2; 
+  try {
+    result = (std::vector< bitwuzla::Sort >::value_type *) &std_vector_Sl_bitwuzla_Sort_Sg__doGet(arg1,SWIG_STD_MOVE(arg2));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  *(std::vector< bitwuzla::Sort >::value_type **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1doSet(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_) {
+  jlong jresult = 0 ;
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  jint arg2 ;
+  std::vector< bitwuzla::Sort >::value_type *arg3 = 0 ;
+  std::vector< bitwuzla::Sort >::value_type result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  arg2 = jarg2; 
+  arg3 = *(std::vector< bitwuzla::Sort >::value_type **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Sort >::value_type const & is null");
+    return 0;
+  } 
+  try {
+    result = std_vector_Sl_bitwuzla_Sort_Sg__doSet(arg1,SWIG_STD_MOVE(arg2),(bitwuzla::Sort const &)*arg3);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  *(std::vector< bitwuzla::Sort >::value_type **)&jresult = new std::vector< bitwuzla::Sort >::value_type(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Vector_1Sort_1doRemoveRange(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) {
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  jint arg2 ;
+  jint arg3 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  arg2 = jarg2; 
+  arg3 = jarg3; 
+  try {
+    std_vector_Sl_bitwuzla_Sort_Sg__doRemoveRange(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return ;
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Vector_1Sort(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  std::vector< bitwuzla::Sort > *arg1 = (std::vector< bitwuzla::Sort > *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(std::vector< bitwuzla::Sort > **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Map_1TermTerm_1_1SWIG_10(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  result = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *)new std::unordered_map< bitwuzla::Term,bitwuzla::Term >();
+  *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Map_1TermTerm_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1;
+  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::unordered_map< bitwuzla::Term,bitwuzla::Term > const & is null");
+    return 0;
+  } 
+  result = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *)new std::unordered_map< bitwuzla::Term,bitwuzla::Term >((std::unordered_map< bitwuzla::Term,bitwuzla::Term > const &)*arg1);
+  *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1Iterator_1getNextUnchecked(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *) 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jarg1; 
+  result = std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__iterator_getNextUnchecked(arg1);
+  *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jresult = new std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1Iterator_1isNot(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jboolean jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *) 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator arg2 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *argp2 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jarg1; 
+  argp2 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jarg2; 
+  if (!argp2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator");
+    return 0;
+  }
+  arg2 = *argp2; 
+  result = (bool)std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__iterator_isNot((std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator const *)arg1,SWIG_STD_MOVE(arg2));
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1Iterator_1getKey(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *) 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jarg1; 
+  result = std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__iterator_getKey((std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator const *)arg1);
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1Iterator_1getValue(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *) 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jarg1; 
+  result = std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__iterator_getValue((std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator const *)arg1);
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1Iterator_1setValue(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *) 0 ;
+  bitwuzla::Term *arg2 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jarg1; 
+  arg2 = *(bitwuzla::Term **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return ;
+  } 
+  std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__iterator_setValue(arg1,(bitwuzla::Term const &)*arg2);
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Map_1TermTerm_1Iterator(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1isEmpty(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1; 
+  result = (bool)((std::unordered_map< bitwuzla::Term,bitwuzla::Term > const *)arg1)->empty();
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1clear(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1; 
+  (arg1)->clear();
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1find(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *) 0 ;
+  bitwuzla::Term *arg2 = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1; 
+  arg2 = *(bitwuzla::Term **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  result = (arg1)->find((bitwuzla::Term const &)*arg2);
+  *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jresult = new std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1begin(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *) 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1; 
+  result = (arg1)->begin();
+  *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jresult = new std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1end(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *) 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1; 
+  result = (arg1)->end();
+  *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jresult = new std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1sizeImpl(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *) 0 ;
+  jint result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1; 
+  try {
+    result = std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__sizeImpl((std::unordered_map< bitwuzla::Term,bitwuzla::Term > const *)arg1);
+  } catch(std::out_of_range &_e) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, (&_e)->what());
+    return 0;
+  }
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1containsImpl(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jboolean jresult = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *) 0 ;
+  bitwuzla::Term *arg2 = 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1; 
+  arg2 = *(bitwuzla::Term **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  result = (bool)std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__containsImpl(arg1,(bitwuzla::Term const &)*arg2);
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1putUnchecked(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_) {
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *) 0 ;
+  bitwuzla::Term *arg2 = 0 ;
+  bitwuzla::Term *arg3 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  (void)jarg3_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1; 
+  arg2 = *(bitwuzla::Term **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return ;
+  } 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return ;
+  } 
+  std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__putUnchecked(arg1,(bitwuzla::Term const &)*arg2,(bitwuzla::Term const &)*arg3);
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Map_1TermTerm_1removeUnchecked(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *) 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator arg2 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator const *argp2 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1; 
+  argp2 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator **)&jarg2; 
+  if (!argp2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null std::unordered_map< bitwuzla::Term,bitwuzla::Term >::iterator const");
+    return ;
+  }
+  arg2 = *argp2; 
+  std_unordered_map_Sl_bitwuzla_Term_Sc_bitwuzla_Term_Sg__removeUnchecked(arg1,SWIG_STD_MOVE(arg2));
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Map_1TermTerm(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg1 = (std::unordered_map< bitwuzla::Term,bitwuzla::Term > *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Result_1SAT_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  bitwuzla::Result result;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::Result)bitwuzla::Result::SAT;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Result_1UNSAT_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  bitwuzla::Result result;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::Result)bitwuzla::Result::UNSAT;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Result_1UNKNOWN_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  bitwuzla::Result result;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::Result)bitwuzla::Result::UNKNOWN;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_RoundingMode_1RNE_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  bitwuzla::RoundingMode result;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::RoundingMode)bitwuzla::RoundingMode::RNE;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_RoundingMode_1RNA_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  bitwuzla::RoundingMode result;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::RoundingMode)bitwuzla::RoundingMode::RNA;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_RoundingMode_1RTN_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  bitwuzla::RoundingMode result;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::RoundingMode)bitwuzla::RoundingMode::RTN;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_RoundingMode_1RTP_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  bitwuzla::RoundingMode result;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::RoundingMode)bitwuzla::RoundingMode::RTP;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_RoundingMode_1RTZ_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  bitwuzla::RoundingMode result;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::RoundingMode)bitwuzla::RoundingMode::RTZ;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Kind_1CONSTANT_1get(JNIEnv *jenv, jclass jcls) {
+  jint jresult = 0 ;
+  bitwuzla::Kind result;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::Kind)bitwuzla::Kind::CONSTANT;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_copyright(JNIEnv *jenv, jclass jcls) {
+  jstring jresult = 0 ;
+  char *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (char *)bitwuzla::copyright();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_version(JNIEnv *jenv, jclass jcls) {
+  jstring jresult = 0 ;
+  char *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (char *)bitwuzla::version();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_git_1id(JNIEnv *jenv, jclass jcls) {
+  jstring jresult = 0 ;
+  char *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (char *)bitwuzla::git_id();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Options_1_1SWIG_10(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  bitwuzla::Options *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::Options *)new bitwuzla::Options();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Options **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Options(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Options_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Options *arg1 = 0 ;
+  bitwuzla::Options *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1;
+  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Options const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (bitwuzla::Options *)new bitwuzla::Options((bitwuzla::Options const &)*arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Options **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1is_1valid(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  jboolean jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  std::string *arg2 = 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  if(!jarg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
+  if (!arg2_pstr) return 0;
+  std::string arg2_str(arg2_pstr);
+  arg2 = &arg2_str;
+  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
+  {
+    try {
+      result = (bool)((bitwuzla::Options const *)arg1)->is_valid((std::string const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1is_1bool(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jboolean jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  {
+    try {
+      result = (bool)((bitwuzla::Options const *)arg1)->is_bool(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1is_1numeric(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jboolean jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  {
+    try {
+      result = (bool)((bitwuzla::Options const *)arg1)->is_numeric(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1is_1mode(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jboolean jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  {
+    try {
+      result = (bool)((bitwuzla::Options const *)arg1)->is_mode(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1shrt(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jstring jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  char *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  {
+    try {
+      result = (char *)((bitwuzla::Options const *)arg1)->shrt(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1lng(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jstring jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  char *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  {
+    try {
+      result = (char *)((bitwuzla::Options const *)arg1)->lng(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1description(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jstring jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  char *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  {
+    try {
+      result = (char *)((bitwuzla::Options const *)arg1)->description(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1modes(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jlong jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  std::vector< std::string > result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  {
+    try {
+      result = ((bitwuzla::Options const *)arg1)->modes(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(std::vector< std::string > **)&jresult = new std::vector< std::string >(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1option(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  jint jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  char *arg2 = (char *) 0 ;
+  bitwuzla::Option result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = 0;
+  if (jarg2) {
+    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
+    if (!arg2) return 0;
+  }
+  {
+    try {
+      result = (bitwuzla::Option)((bitwuzla::Options const *)arg1)->option((char const *)arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1set_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jstring jarg3) {
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  std::string *arg3 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  if(!jarg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return ;
+  }
+  const char *arg3_pstr = (const char *)jenv->GetStringUTFChars(jarg3, 0); 
+  if (!arg3_pstr) return ;
+  std::string arg3_str(arg3_pstr);
+  arg3 = &arg3_str;
+  jenv->ReleaseStringUTFChars(jarg3, arg3_pstr); 
+  {
+    try {
+      (arg1)->set(arg2,(std::string const &)*arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1set_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3) {
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  std::string *arg2 = 0 ;
+  std::string *arg3 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  if(!jarg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return ;
+  }
+  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
+  if (!arg2_pstr) return ;
+  std::string arg2_str(arg2_pstr);
+  arg2 = &arg2_str;
+  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
+  if(!jarg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return ;
+  }
+  const char *arg3_pstr = (const char *)jenv->GetStringUTFChars(jarg3, 0); 
+  if (!arg3_pstr) return ;
+  std::string arg3_str(arg3_pstr);
+  arg3 = &arg3_str;
+  jenv->ReleaseStringUTFChars(jarg3, arg3_pstr); 
+  {
+    try {
+      (arg1)->set((std::string const &)*arg2,(std::string const &)*arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1set_1_1SWIG_12(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  std::vector< std::string > *arg2 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = *(std::vector< std::string > **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< std::string > const & is null");
+    return ;
+  } 
+  {
+    try {
+      (arg1)->set((std::vector< std::string > const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jobject JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jobject jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  uint64_t result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  {
+    try {
+      result = (uint64_t)((bitwuzla::Options const *)arg1)->get(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  {
+    jbyteArray ba = jenv->NewByteArray(9);
+    jbyte* bae = jenv->GetByteArrayElements(ba, 0);
+    jclass clazz = jenv->FindClass("java/math/BigInteger");
+    jmethodID mid = jenv->GetMethodID(clazz, "<init>", "([B)V");
+    jobject bigint;
+    int i;
+    
+    bae[0] = 0;
+    for(i=1; i<9; i++ ) {
+      bae[i] = (jbyte)(result>>8*(8-i));
+    }
+    
+    jenv->ReleaseByteArrayElements(ba, bae, 0);
+    bigint = jenv->NewObject(clazz, mid, ba);
+    jenv->DeleteLocalRef(ba);
+    jresult = bigint;
+  }
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1get_1mode(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jstring jresult = 0 ;
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  std::string *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  {
+    try {
+      result = (std::string *) &((bitwuzla::Options const *)arg1)->get_mode(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = jenv->NewStringUTF(result->c_str()); 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Options_1set_1_1SWIG_13(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) {
+  bitwuzla::Options *arg1 = (bitwuzla::Options *) 0 ;
+  bitwuzla::Option arg2 ;
+  int arg3 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Options **)&jarg1; 
+  arg2 = (bitwuzla::Option)jarg2; 
+  arg3 = (int)jarg3; 
+  {
+    try {
+      bitwuzla_Options_set__SWIG_3(arg1,arg2,arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Term(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  bitwuzla::Term *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::Term *)new bitwuzla::Term();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Term(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1null(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_null();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1kind(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bitwuzla::Kind result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bitwuzla::Kind)((bitwuzla::Term const *)arg1)->kind();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bitwuzla::Sort result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::Term const *)arg1)->sort();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = new bitwuzla::Sort(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1num_1children(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  size_t result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::Term const *)arg1)->num_children();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1children(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  std::vector< bitwuzla::Term > result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::Term const *)arg1)->children();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(std::vector< bitwuzla::Term > **)&jresult = new std::vector< bitwuzla::Term >(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  jlong jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  size_t arg2 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  arg2 = (size_t)jarg2; 
+  {
+    try {
+      result = ((bitwuzla::Term const *)arg1)->operator [](arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1num_1indices(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  size_t result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::Term const *)arg1)->num_indices();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1const(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_const();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1variable(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_variable();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1value(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_value();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1true(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_true();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1false(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_false();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1bv_1value_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_bv_value_zero();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1bv_1value_1one(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_bv_value_one();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1bv_1value_1ones(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_bv_value_ones();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1bv_1value_1min_1signed(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_bv_value_min_signed();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1bv_1value_1max_1signed(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_bv_value_max_signed();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1fp_1value_1pos_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_fp_value_pos_zero();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1fp_1value_1neg_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_fp_value_neg_zero();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1fp_1value_1pos_1inf(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_fp_value_pos_inf();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1fp_1value_1neg_1inf(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_fp_value_neg_inf();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1fp_1value_1nan(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_fp_value_nan();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1rm_1value_1rna(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_rm_value_rna();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1rm_1value_1rne(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_rm_value_rne();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1rm_1value_1rtn(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_rm_value_rtn();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1rm_1value_1rtp(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_rm_value_rtp();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1is_1rm_1value_1rtz(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Term const *)arg1)->is_rm_value_rtz();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1toString_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jshort jarg2) {
+  jstring jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  uint8_t arg2 ;
+  std::string result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  {
+    try {
+      result = ((bitwuzla::Term const *)arg1)->str(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1toString_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jstring jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  std::string result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::Term const *)arg1)->str();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1id(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (int)bitwuzla_Term_id(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1indices(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  std::vector< int > result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = bitwuzla_Term_indices(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(std::vector< int > **)&jresult = new std::vector< int >(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1symbol(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jstring jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  std::string result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = bitwuzla_Term_symbol(arg1);
+    } catch(std::bad_optional_access& e) {
+      return 0;
+    }
+  }
+  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1to_1bool(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bool)bitwuzla_Term_to_bool(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1to_1rm(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bitwuzla::RoundingMode result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (bitwuzla::RoundingMode)bitwuzla_Term_to_rm(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1to_1bv(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jstring jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  std::string result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = bitwuzla_Term_to_bv(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1hashCode(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  {
+    try {
+      result = (int)bitwuzla_Term_hashCode(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Term_1isEqual(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Term *arg1 = (bitwuzla::Term *) 0 ;
+  bitwuzla::Term arg2 ;
+  bitwuzla::Term *argp2 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::Term **)&jarg1; 
+  argp2 = *(bitwuzla::Term **)&jarg2; 
+  if (!argp2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null bitwuzla::Term");
+    return 0;
+  }
+  arg2 = *argp2; 
+  {
+    try {
+      result = (bool)bitwuzla_Term_isEqual(arg1,SWIG_STD_MOVE(arg2));
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Sort(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  bitwuzla::Sort *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::Sort *)new bitwuzla::Sort();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Sort(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1is_1null(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Sort const *)arg1)->is_null();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1array_1index(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bitwuzla::Sort result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::Sort const *)arg1)->array_index();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = new bitwuzla::Sort(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1array_1element(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bitwuzla::Sort result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::Sort const *)arg1)->array_element();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = new bitwuzla::Sort(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1fun_1domain(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  std::vector< bitwuzla::Sort > result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::Sort const *)arg1)->fun_domain();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(std::vector< bitwuzla::Sort > **)&jresult = new std::vector< bitwuzla::Sort >(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1fun_1codomain(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bitwuzla::Sort result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::Sort const *)arg1)->fun_codomain();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = new bitwuzla::Sort(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1is_1array(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Sort const *)arg1)->is_array();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1is_1bool(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Sort const *)arg1)->is_bool();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1is_1bv(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Sort const *)arg1)->is_bv();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1is_1fp(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Sort const *)arg1)->is_fp();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1is_1fun(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Sort const *)arg1)->is_fun();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1is_1rm(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (bool)((bitwuzla::Sort const *)arg1)->is_rm();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1toString(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jstring jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  std::string result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::Sort const *)arg1)->str();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1id(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (int)bitwuzla_Sort_id(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1bv_1size(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (int)bitwuzla_Sort_bv_size(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1fp_1exp_1size(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (int)bitwuzla_Sort_fp_exp_size(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1fp_1sig_1size(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (int)bitwuzla_Sort_fp_sig_size(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1fun_1arity(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (int)bitwuzla_Sort_fun_arity(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1hashCode(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  {
+    try {
+      result = (int)bitwuzla_Sort_hashCode(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Sort_1isEqual(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Sort *arg1 = (bitwuzla::Sort *) 0 ;
+  bitwuzla::Sort arg2 ;
+  bitwuzla::Sort *argp2 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::Sort **)&jarg1; 
+  argp2 = *(bitwuzla::Sort **)&jarg2; 
+  if (!argp2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null bitwuzla::Sort");
+    return 0;
+  }
+  arg2 = *argp2; 
+  {
+    try {
+      result = (bool)bitwuzla_Sort_isEqual(arg1,SWIG_STD_MOVE(arg2));
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Terminator(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  bitwuzla::Terminator *arg1 = (bitwuzla::Terminator *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(bitwuzla::Terminator **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Terminator_1terminate(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jboolean jresult = 0 ;
+  bitwuzla::Terminator *arg1 = (bitwuzla::Terminator *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::Terminator **)&jarg1; 
+  {
+    try {
+      result = (bool)(arg1)->terminate();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Terminator(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  bitwuzla::Terminator *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::Terminator *)new SwigDirector_Terminator(jenv);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Terminator **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Terminator_1director_1connect(JNIEnv *jenv, jclass jcls, jobject jself, jlong objarg, jboolean jswig_mem_own, jboolean jweak_global) {
+  bitwuzla::Terminator *obj = *((bitwuzla::Terminator **)&objarg);
+  (void)jcls;
+  SwigDirector_Terminator *director = static_cast<SwigDirector_Terminator *>(obj);
+  director->swig_connect_director(jenv, jself, jenv->GetObjectClass(jself), (jswig_mem_own == JNI_TRUE), (jweak_global == JNI_TRUE));
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Terminator_1change_1ownership(JNIEnv *jenv, jclass jcls, jobject jself, jlong objarg, jboolean jtake_or_release) {
+  bitwuzla::Terminator *obj = *((bitwuzla::Terminator **)&objarg);
+  SwigDirector_Terminator *director = dynamic_cast<SwigDirector_Terminator *>(obj);
+  (void)jcls;
+  if (director) {
+    director->swig_java_change_ownership(jenv, jself, jtake_or_release ? true : false);
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1TermManager(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (bitwuzla::TermManager *)new bitwuzla::TermManager();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::TermManager **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1TermManager(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1array_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Sort *arg3 = 0 ;
+  bitwuzla::Sort result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  (void)jarg3_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  arg3 = *(bitwuzla::Sort **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_array_sort((bitwuzla::Sort const &)*arg2,(bitwuzla::Sort const &)*arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = new bitwuzla::Sort(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bool_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  {
+    try {
+      result = (arg1)->mk_bool_sort();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = new bitwuzla::Sort(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1fun_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  std::vector< bitwuzla::Sort > *arg2 = 0 ;
+  bitwuzla::Sort *arg3 = 0 ;
+  bitwuzla::Sort result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  (void)jarg3_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(std::vector< bitwuzla::Sort > **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Sort > const & is null");
+    return 0;
+  } 
+  arg3 = *(bitwuzla::Sort **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_fun_sort((std::vector< bitwuzla::Sort > const &)*arg2,(bitwuzla::Sort const &)*arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = new bitwuzla::Sort(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1true(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  {
+    try {
+      result = (arg1)->mk_true();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1false(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  {
+    try {
+      result = (arg1)->mk_false();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bv_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_bv_zero((bitwuzla::Sort const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bv_1one(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_bv_one((bitwuzla::Sort const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bv_1ones(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_bv_ones((bitwuzla::Sort const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bv_1min_1signed(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_bv_min_signed((bitwuzla::Sort const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bv_1max_1signed(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_bv_max_signed((bitwuzla::Sort const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bv_1value_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jstring jarg3, jshort jarg4) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  std::string *arg3 = 0 ;
+  uint8_t arg4 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  if(!jarg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg3_pstr = (const char *)jenv->GetStringUTFChars(jarg3, 0); 
+  if (!arg3_pstr) return 0;
+  std::string arg3_str(arg3_pstr);
+  arg3 = &arg3_str;
+  jenv->ReleaseStringUTFChars(jarg3, arg3_pstr); 
+  arg4 = (uint8_t)jarg4; 
+  {
+    try {
+      result = (arg1)->mk_bv_value((bitwuzla::Sort const &)*arg2,(std::string const &)*arg3,arg4);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bv_1value_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jstring jarg3) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  std::string *arg3 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  if(!jarg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg3_pstr = (const char *)jenv->GetStringUTFChars(jarg3, 0); 
+  if (!arg3_pstr) return 0;
+  std::string arg3_str(arg3_pstr);
+  arg3 = &arg3_str;
+  jenv->ReleaseStringUTFChars(jarg3, arg3_pstr); 
+  {
+    try {
+      result = (arg1)->mk_bv_value((bitwuzla::Sort const &)*arg2,(std::string const &)*arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bv_1value_1uint64(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jobject jarg3) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  uint64_t arg3 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    jclass clazz;
+    jmethodID mid;
+    jbyteArray ba;
+    jbyte* bae;
+    jsize sz;
+    int i;
+    
+    if (!jarg3) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null");
+      return 0;
+    }
+    clazz = jenv->GetObjectClass(jarg3);
+    mid = jenv->GetMethodID(clazz, "toByteArray", "()[B");
+    ba = (jbyteArray)jenv->CallObjectMethod(jarg3, mid);
+    bae = jenv->GetByteArrayElements(ba, 0);
+    sz = jenv->GetArrayLength(ba);
+    arg3 = 0;
+    if (sz > 0) {
+      arg3 = (uint64_t)(signed char)bae[0];
+      for(i=1; i<sz; i++) {
+        arg3 = (arg3 << 8) | (uint64_t)(unsigned char)bae[i];
+      }
+    }
+    jenv->ReleaseByteArrayElements(ba, bae, 0);
+  }
+  {
+    try {
+      result = (arg1)->mk_bv_value_uint64((bitwuzla::Sort const &)*arg2,arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bv_1value_1int64(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  int64_t arg3 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  arg3 = (int64_t)jarg3; 
+  {
+    try {
+      result = (arg1)->mk_bv_value_int64((bitwuzla::Sort const &)*arg2,arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1fp_1pos_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_fp_pos_zero((bitwuzla::Sort const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1fp_1neg_1zero(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_fp_neg_zero((bitwuzla::Sort const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1fp_1pos_1inf(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_fp_pos_inf((bitwuzla::Sort const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1fp_1neg_1inf(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_fp_neg_inf((bitwuzla::Sort const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1fp_1nan(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_fp_nan((bitwuzla::Sort const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1fp_1value_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_, jlong jarg4, jobject jarg4_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Term *arg2 = 0 ;
+  bitwuzla::Term *arg3 = 0 ;
+  bitwuzla::Term *arg4 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  (void)jarg3_;
+  (void)jarg4_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Term **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg4 = *(bitwuzla::Term **)&jarg4;
+  if (!arg4) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_fp_value((bitwuzla::Term const &)*arg2,(bitwuzla::Term const &)*arg3,(bitwuzla::Term const &)*arg4);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1fp_1value_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_, jstring jarg4) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term *arg3 = 0 ;
+  std::string *arg4 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  (void)jarg3_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  if(!jarg4) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg4_pstr = (const char *)jenv->GetStringUTFChars(jarg4, 0); 
+  if (!arg4_pstr) return 0;
+  std::string arg4_str(arg4_pstr);
+  arg4 = &arg4_str;
+  jenv->ReleaseStringUTFChars(jarg4, arg4_pstr); 
+  {
+    try {
+      result = (arg1)->mk_fp_value((bitwuzla::Sort const &)*arg2,(bitwuzla::Term const &)*arg3,(std::string const &)*arg4);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1fp_1value_1_1SWIG_12(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_, jstring jarg4, jstring jarg5) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term *arg3 = 0 ;
+  std::string *arg4 = 0 ;
+  std::string *arg5 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  (void)jarg3_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  if(!jarg4) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg4_pstr = (const char *)jenv->GetStringUTFChars(jarg4, 0); 
+  if (!arg4_pstr) return 0;
+  std::string arg4_str(arg4_pstr);
+  arg4 = &arg4_str;
+  jenv->ReleaseStringUTFChars(jarg4, arg4_pstr); 
+  if(!jarg5) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg5_pstr = (const char *)jenv->GetStringUTFChars(jarg5, 0); 
+  if (!arg5_pstr) return 0;
+  std::string arg5_str(arg5_pstr);
+  arg5 = &arg5_str;
+  jenv->ReleaseStringUTFChars(jarg5, arg5_pstr); 
+  {
+    try {
+      result = (arg1)->mk_fp_value((bitwuzla::Sort const &)*arg2,(bitwuzla::Term const &)*arg3,(std::string const &)*arg4,(std::string const &)*arg5);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1const_1array(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  bitwuzla::Term *arg3 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  (void)jarg3_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->mk_const_array((bitwuzla::Sort const &)*arg2,(bitwuzla::Term const &)*arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1rm_1value(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::RoundingMode arg2 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (bitwuzla::RoundingMode)jarg2; 
+  {
+    try {
+      result = (arg1)->mk_rm_value(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1substitute_1term(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Term *arg2 = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg3 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  (void)jarg3_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Term **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg3 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::unordered_map< bitwuzla::Term,bitwuzla::Term > const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->substitute_term((bitwuzla::Term const &)*arg2,(std::unordered_map< bitwuzla::Term,bitwuzla::Term > const &)*arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1substitute_1terms(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jlong jarg3, jobject jarg3_) {
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  std::vector< bitwuzla::Term > *arg2 = 0 ;
+  std::unordered_map< bitwuzla::Term,bitwuzla::Term > *arg3 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  (void)jarg3_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(std::vector< bitwuzla::Term > **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Term > & is null");
+    return ;
+  } 
+  arg3 = *(std::unordered_map< bitwuzla::Term,bitwuzla::Term > **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::unordered_map< bitwuzla::Term,bitwuzla::Term > const & is null");
+    return ;
+  } 
+  {
+    try {
+      (arg1)->substitute_terms(*arg2,(std::unordered_map< bitwuzla::Term,bitwuzla::Term > const &)*arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1bv_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  int arg2 ;
+  bitwuzla::Sort result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (int)jarg2; 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_bv_sort(arg1,arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = new bitwuzla::Sort(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1fp_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  bitwuzla::Sort result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_fp_sort(arg1,arg2,arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = new bitwuzla::Sort(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1term_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Kind arg2 ;
+  bitwuzla::Term *arg3 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (bitwuzla::Kind)jarg2; 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_term__SWIG_0(arg1,arg2,(bitwuzla::Term const &)*arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1term_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_, jint jarg4) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Kind arg2 ;
+  bitwuzla::Term *arg3 = 0 ;
+  int arg4 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (bitwuzla::Kind)jarg2; 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg4 = (int)jarg4; 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_term__SWIG_1(arg1,arg2,(bitwuzla::Term const &)*arg3,arg4);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1term_1_1SWIG_12(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_, jint jarg4, jint jarg5) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Kind arg2 ;
+  bitwuzla::Term *arg3 = 0 ;
+  int arg4 ;
+  int arg5 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (bitwuzla::Kind)jarg2; 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg4 = (int)jarg4; 
+  arg5 = (int)jarg5; 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_term__SWIG_2(arg1,arg2,(bitwuzla::Term const &)*arg3,arg4,arg5);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1term_1_1SWIG_13(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_, jlong jarg4, jobject jarg4_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Kind arg2 ;
+  bitwuzla::Term *arg3 = 0 ;
+  bitwuzla::Term *arg4 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  (void)jarg4_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (bitwuzla::Kind)jarg2; 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg4 = *(bitwuzla::Term **)&jarg4;
+  if (!arg4) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_term__SWIG_3(arg1,arg2,(bitwuzla::Term const &)*arg3,(bitwuzla::Term const &)*arg4);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1term_1_1SWIG_14(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_, jlong jarg4, jobject jarg4_, jint jarg5) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Kind arg2 ;
+  bitwuzla::Term *arg3 = 0 ;
+  bitwuzla::Term *arg4 = 0 ;
+  int arg5 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  (void)jarg4_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (bitwuzla::Kind)jarg2; 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg4 = *(bitwuzla::Term **)&jarg4;
+  if (!arg4) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg5 = (int)jarg5; 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_term__SWIG_4(arg1,arg2,(bitwuzla::Term const &)*arg3,(bitwuzla::Term const &)*arg4,arg5);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1term_1_1SWIG_15(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_, jlong jarg4, jobject jarg4_, jint jarg5, jint jarg6) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Kind arg2 ;
+  bitwuzla::Term *arg3 = 0 ;
+  bitwuzla::Term *arg4 = 0 ;
+  int arg5 ;
+  int arg6 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  (void)jarg4_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (bitwuzla::Kind)jarg2; 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg4 = *(bitwuzla::Term **)&jarg4;
+  if (!arg4) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg5 = (int)jarg5; 
+  arg6 = (int)jarg6; 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_term__SWIG_5(arg1,arg2,(bitwuzla::Term const &)*arg3,(bitwuzla::Term const &)*arg4,arg5,arg6);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1term_1_1SWIG_16(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_, jlong jarg4, jobject jarg4_, jlong jarg5, jobject jarg5_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Kind arg2 ;
+  bitwuzla::Term *arg3 = 0 ;
+  bitwuzla::Term *arg4 = 0 ;
+  bitwuzla::Term *arg5 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  (void)jarg4_;
+  (void)jarg5_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (bitwuzla::Kind)jarg2; 
+  arg3 = *(bitwuzla::Term **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg4 = *(bitwuzla::Term **)&jarg4;
+  if (!arg4) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  arg5 = *(bitwuzla::Term **)&jarg5;
+  if (!arg5) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_term__SWIG_6(arg1,arg2,(bitwuzla::Term const &)*arg3,(bitwuzla::Term const &)*arg4,(bitwuzla::Term const &)*arg5);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1term_1_1SWIG_17(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_, jlong jarg4, jobject jarg4_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Kind arg2 ;
+  std::vector< bitwuzla::Term > *arg3 = 0 ;
+  std::vector< int > *arg4 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg3_;
+  (void)jarg4_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = (bitwuzla::Kind)jarg2; 
+  arg3 = *(std::vector< bitwuzla::Term > **)&jarg3;
+  if (!arg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Term > const & is null");
+    return 0;
+  } 
+  arg4 = *(std::vector< int > **)&jarg4;
+  if (!arg4) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< int > const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_term__SWIG_7(arg1,arg2,(std::vector< bitwuzla::Term > const &)*arg3,(std::vector< int > const &)*arg4);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1const(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jstring jarg3) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  std::string arg3 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  if(!jarg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  } 
+  const char *arg3_pstr = (const char *)jenv->GetStringUTFChars(jarg3, 0); 
+  if (!arg3_pstr) return 0;
+  (&arg3)->assign(arg3_pstr);
+  jenv->ReleaseStringUTFChars(jarg3, arg3_pstr); 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_const(arg1,(bitwuzla::Sort const &)*arg2,SWIG_STD_MOVE(arg3));
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_TermManager_1mk_1var(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jstring jarg3) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = (bitwuzla::TermManager *) 0 ;
+  bitwuzla::Sort *arg2 = 0 ;
+  std::string arg3 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1; 
+  arg2 = *(bitwuzla::Sort **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Sort const & is null");
+    return 0;
+  } 
+  if(!jarg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  } 
+  const char *arg3_pstr = (const char *)jenv->GetStringUTFChars(jarg3, 0); 
+  if (!arg3_pstr) return 0;
+  (&arg3)->assign(arg3_pstr);
+  jenv->ReleaseStringUTFChars(jarg3, arg3_pstr); 
+  {
+    try {
+      result = bitwuzla_TermManager_mk_var(arg1,(bitwuzla::Sort const &)*arg2,SWIG_STD_MOVE(arg3));
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Bitwuzla_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = 0 ;
+  bitwuzla::Options *arg2 = 0 ;
+  bitwuzla::Bitwuzla *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1;
+  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::TermManager & is null");
+    return 0;
+  } 
+  arg2 = *(bitwuzla::Options **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Options const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (bitwuzla::Bitwuzla *)new bitwuzla::Bitwuzla(*arg1,(bitwuzla::Options const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  
+  *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jresult = result ? new std::shared_ptr<  bitwuzla::Bitwuzla >(result SWIG_NO_NULL_DELETER_1) : 0;
+  
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Bitwuzla_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = 0 ;
+  bitwuzla::Bitwuzla *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1;
+  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::TermManager & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (bitwuzla::Bitwuzla *)new bitwuzla::Bitwuzla(*arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  
+  *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jresult = result ? new std::shared_ptr<  bitwuzla::Bitwuzla >(result SWIG_NO_NULL_DELETER_1) : 0;
+  
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Bitwuzla(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  {
+    try {
+      (void)arg1; delete smartarg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1configure_1terminator(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  bitwuzla::Terminator *arg2 = (bitwuzla::Terminator *) 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  arg2 = *(bitwuzla::Terminator **)&jarg2; 
+  {
+    try {
+      (arg1)->configure_terminator(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1push(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  uint32_t arg2 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  arg2 = (uint32_t)jarg2; 
+  {
+    try {
+      (arg1)->push(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1pop(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  uint32_t arg2 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  arg2 = (uint32_t)jarg2; 
+  {
+    try {
+      (arg1)->pop(arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1assert_1formula(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  bitwuzla::Term *arg2 = 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  arg2 = *(bitwuzla::Term **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return ;
+  } 
+  {
+    try {
+      (arg1)->assert_formula((bitwuzla::Term const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1get_1assertions(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  std::vector< bitwuzla::Term > result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  {
+    try {
+      result = (arg1)->get_assertions();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(std::vector< bitwuzla::Term > **)&jresult = new std::vector< bitwuzla::Term >(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1get_1unsat_1assumptions(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  std::vector< bitwuzla::Term > result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  {
+    try {
+      result = (arg1)->get_unsat_assumptions();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(std::vector< bitwuzla::Term > **)&jresult = new std::vector< bitwuzla::Term >(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1get_1unsat_1core(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  std::vector< bitwuzla::Term > result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  {
+    try {
+      result = (arg1)->get_unsat_core();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(std::vector< bitwuzla::Term > **)&jresult = new std::vector< bitwuzla::Term >(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1check_1sat_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jint jresult = 0 ;
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  std::vector< bitwuzla::Term > *arg2 = 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  bitwuzla::Result result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  arg2 = *(std::vector< bitwuzla::Term > **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "std::vector< bitwuzla::Term > const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (bitwuzla::Result)(arg1)->check_sat((std::vector< bitwuzla::Term > const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1check_1sat_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jint jresult = 0 ;
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  bitwuzla::Result result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  {
+    try {
+      result = (bitwuzla::Result)(arg1)->check_sat();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = (jint)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1get_1value(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  bitwuzla::Term *arg2 = 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  arg2 = *(bitwuzla::Term **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Term const & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (arg1)->get_value((bitwuzla::Term const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1term_1mgr(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  bitwuzla::TermManager *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  {
+    try {
+      result = (bitwuzla::TermManager *) &(arg1)->term_mgr();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::TermManager **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jstring JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Bitwuzla_1print_1formula(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jstring jresult = 0 ;
+  bitwuzla::Bitwuzla *arg1 = (bitwuzla::Bitwuzla *) 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > *smartarg1 = 0 ;
+  std::string result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  
+  smartarg1 = *(std::shared_ptr<  bitwuzla::Bitwuzla > **)&jarg1;
+  arg1 = (bitwuzla::Bitwuzla *)(smartarg1 ? smartarg1->get() : 0); 
+  {
+    try {
+      result = bitwuzla_Bitwuzla_print_formula(arg1);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  jresult = jenv->NewStringUTF((&result)->c_str()); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Parser_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jstring jarg3) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = 0 ;
+  bitwuzla::Options *arg2 = 0 ;
+  std::string *arg3 = 0 ;
+  bitwuzla::parser::Parser *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1;
+  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::TermManager & is null");
+    return 0;
+  } 
+  arg2 = *(bitwuzla::Options **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Options & is null");
+    return 0;
+  } 
+  if(!jarg3) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg3_pstr = (const char *)jenv->GetStringUTFChars(jarg3, 0); 
+  if (!arg3_pstr) return 0;
+  std::string arg3_str(arg3_pstr);
+  arg3 = &arg3_str;
+  jenv->ReleaseStringUTFChars(jarg3, arg3_pstr); 
+  {
+    try {
+      result = (bitwuzla::parser::Parser *)new bitwuzla::parser::Parser(*arg1,*arg2,(std::string const &)*arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::parser::Parser **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_new_1Parser_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+  jlong jresult = 0 ;
+  bitwuzla::TermManager *arg1 = 0 ;
+  bitwuzla::Options *arg2 = 0 ;
+  bitwuzla::parser::Parser *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  (void)jarg2_;
+  arg1 = *(bitwuzla::TermManager **)&jarg1;
+  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::TermManager & is null");
+    return 0;
+  } 
+  arg2 = *(bitwuzla::Options **)&jarg2;
+  if (!arg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "bitwuzla::Options & is null");
+    return 0;
+  } 
+  {
+    try {
+      result = (bitwuzla::parser::Parser *)new bitwuzla::parser::Parser(*arg1,*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::parser::Parser **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_delete_1Parser(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  bitwuzla::parser::Parser *arg1 = (bitwuzla::parser::Parser *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(bitwuzla::parser::Parser **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Parser_1parse_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jboolean jarg3, jboolean jarg4) {
+  bitwuzla::parser::Parser *arg1 = (bitwuzla::parser::Parser *) 0 ;
+  std::string *arg2 = 0 ;
+  bool arg3 ;
+  bool arg4 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::parser::Parser **)&jarg1; 
+  if(!jarg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return ;
+  }
+  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
+  if (!arg2_pstr) return ;
+  std::string arg2_str(arg2_pstr);
+  arg2 = &arg2_str;
+  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
+  arg3 = jarg3 ? true : false; 
+  arg4 = jarg4 ? true : false; 
+  {
+    try {
+      (arg1)->parse((std::string const &)*arg2,arg3,arg4);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Parser_1parse_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jboolean jarg3) {
+  bitwuzla::parser::Parser *arg1 = (bitwuzla::parser::Parser *) 0 ;
+  std::string *arg2 = 0 ;
+  bool arg3 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::parser::Parser **)&jarg1; 
+  if(!jarg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return ;
+  }
+  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
+  if (!arg2_pstr) return ;
+  std::string arg2_str(arg2_pstr);
+  arg2 = &arg2_str;
+  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
+  arg3 = jarg3 ? true : false; 
+  {
+    try {
+      (arg1)->parse((std::string const &)*arg2,arg3);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Parser_1parse_1_1SWIG_12(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  bitwuzla::parser::Parser *arg1 = (bitwuzla::parser::Parser *) 0 ;
+  std::string *arg2 = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::parser::Parser **)&jarg1; 
+  if(!jarg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return ;
+  }
+  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
+  if (!arg2_pstr) return ;
+  std::string arg2_str(arg2_pstr);
+  arg2 = &arg2_str;
+  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
+  {
+    try {
+      (arg1)->parse((std::string const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Parser_1parse_1term(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  jlong jresult = 0 ;
+  bitwuzla::parser::Parser *arg1 = (bitwuzla::parser::Parser *) 0 ;
+  std::string *arg2 = 0 ;
+  bitwuzla::Term result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::parser::Parser **)&jarg1; 
+  if(!jarg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
+  if (!arg2_pstr) return 0;
+  std::string arg2_str(arg2_pstr);
+  arg2 = &arg2_str;
+  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
+  {
+    try {
+      result = (arg1)->parse_term((std::string const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Term **)&jresult = new bitwuzla::Term(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Parser_1parse_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  jlong jresult = 0 ;
+  bitwuzla::parser::Parser *arg1 = (bitwuzla::parser::Parser *) 0 ;
+  std::string *arg2 = 0 ;
+  bitwuzla::Sort result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::parser::Parser **)&jarg1; 
+  if(!jarg2) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
+    return 0;
+  }
+  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
+  if (!arg2_pstr) return 0;
+  std::string arg2_str(arg2_pstr);
+  arg2 = &arg2_str;
+  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
+  {
+    try {
+      result = (arg1)->parse_sort((std::string const &)*arg2);
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(bitwuzla::Sort **)&jresult = new bitwuzla::Sort(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Parser_1get_1declared_1sorts(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::parser::Parser *arg1 = (bitwuzla::parser::Parser *) 0 ;
+  std::vector< bitwuzla::Sort > result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::parser::Parser **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::parser::Parser const *)arg1)->get_declared_sorts();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(std::vector< bitwuzla::Sort > **)&jresult = new std::vector< bitwuzla::Sort >(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Parser_1get_1declared_1funs(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::parser::Parser *arg1 = (bitwuzla::parser::Parser *) 0 ;
+  std::vector< bitwuzla::Term > result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::parser::Parser **)&jarg1; 
+  {
+    try {
+      result = ((bitwuzla::parser::Parser const *)arg1)->get_declared_funs();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(std::vector< bitwuzla::Term > **)&jresult = new std::vector< bitwuzla::Term >(result); 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_Parser_1bitwuzla(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  bitwuzla::parser::Parser *arg1 = (bitwuzla::parser::Parser *) 0 ;
+  std::shared_ptr< bitwuzla::Bitwuzla > result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(bitwuzla::parser::Parser **)&jarg1; 
+  {
+    try {
+      result = (arg1)->bitwuzla();
+    } catch(bitwuzla::Exception& e) {
+      jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
+      jenv->ThrowNew(exceptionType, e.what());
+      return 0;
+    }
+  }
+  *(std::shared_ptr< bitwuzla::Bitwuzla > **)&jresult = result ? new std::shared_ptr< bitwuzla::Bitwuzla >(result) : 0; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_bitwuzla_api_BitwuzlaNativeJNI_swig_1module_1init(JNIEnv *jenv, jclass jcls) {
+  int i;
+  
+  static struct {
+    const char *method;
+    const char *signature;
+  } methods[1] = {
+    {
+      "SwigDirector_Terminator_terminate", "(Lorg/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator;)Z" 
+    }
+  };
+  Swig::jclass_BitwuzlaNativeJNI = (jclass) jenv->NewGlobalRef(jcls);
+  if (!Swig::jclass_BitwuzlaNativeJNI) return;
+  for (i = 0; i < (int) (sizeof(methods)/sizeof(methods[0])); ++i) {
+    Swig::director_method_ids[i] = jenv->GetStaticMethodID(jcls, methods[i].method, methods[i].signature);
+    if (!Swig::director_method_ids[i]) return;
+  }
+}
+
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/lib/native/source/libbitwuzla/bitwuzla_wrap.h b/lib/native/source/libbitwuzla/bitwuzla_wrap.h
new file mode 100644
index 0000000000..b76889f515
--- /dev/null
+++ b/lib/native/source/libbitwuzla/bitwuzla_wrap.h
@@ -0,0 +1,28 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+#ifndef SWIG_BitwuzlaNative_WRAP_H_
+#define SWIG_BitwuzlaNative_WRAP_H_
+
+class SwigDirector_Terminator : public bitwuzla::Terminator, public Swig::Director {
+
+public:
+    void swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global);
+    SwigDirector_Terminator(JNIEnv *jenv);
+    virtual ~SwigDirector_Terminator();
+    virtual bool terminate();
+public:
+    bool swig_overrides(int n) {
+      return (n < 1 ? swig_override[n] : false);
+    }
+protected:
+    Swig::BoolArray<1> swig_override;
+};
+
+
+#endif
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
new file mode 100644
index 0000000000..6c0ee5018d
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
@@ -0,0 +1,99 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Bitwuzla {
+  private transient long swigCPtr;
+  private transient boolean swigCMemOwn;
+
+  protected Bitwuzla(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Bitwuzla obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void swigSetCMemOwn(boolean own) {
+    swigCMemOwn = own;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        BitwuzlaNativeJNI.delete_Bitwuzla(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public Bitwuzla(TermManager tm, Options options) {
+    this(BitwuzlaNativeJNI.new_Bitwuzla__SWIG_0(TermManager.getCPtr(tm), tm, Options.getCPtr(options), options), true);
+  }
+
+  public Bitwuzla(TermManager tm) {
+    this(BitwuzlaNativeJNI.new_Bitwuzla__SWIG_1(TermManager.getCPtr(tm), tm), true);
+  }
+
+  public void configure_terminator(Terminator terminator) {
+    BitwuzlaNativeJNI.Bitwuzla_configure_terminator(swigCPtr, this, Terminator.getCPtr(terminator), terminator);
+  }
+
+  public void push(long nlevels) {
+    BitwuzlaNativeJNI.Bitwuzla_push(swigCPtr, this, nlevels);
+  }
+
+  public void pop(long nlevels) {
+    BitwuzlaNativeJNI.Bitwuzla_pop(swigCPtr, this, nlevels);
+  }
+
+  public void assert_formula(Term term) {
+    BitwuzlaNativeJNI.Bitwuzla_assert_formula(swigCPtr, this, Term.getCPtr(term), term);
+  }
+
+  public Vector_Term get_assertions() {
+    return new Vector_Term(BitwuzlaNativeJNI.Bitwuzla_get_assertions(swigCPtr, this), true);
+  }
+
+  public Vector_Term get_unsat_assumptions() {
+    return new Vector_Term(BitwuzlaNativeJNI.Bitwuzla_get_unsat_assumptions(swigCPtr, this), true);
+  }
+
+  public Vector_Term get_unsat_core() {
+    return new Vector_Term(BitwuzlaNativeJNI.Bitwuzla_get_unsat_core(swigCPtr, this), true);
+  }
+
+  public Result check_sat(Vector_Term assumptions) {
+    return Result.swigToEnum(BitwuzlaNativeJNI.Bitwuzla_check_sat__SWIG_0(swigCPtr, this, Vector_Term.getCPtr(assumptions), assumptions));
+  }
+
+  public Result check_sat() {
+    return Result.swigToEnum(BitwuzlaNativeJNI.Bitwuzla_check_sat__SWIG_1(swigCPtr, this));
+  }
+
+  public Term get_value(Term term) {
+    return new Term(BitwuzlaNativeJNI.Bitwuzla_get_value(swigCPtr, this, Term.getCPtr(term), term), true);
+  }
+
+  public TermManager term_mgr() {
+    return new TermManager(BitwuzlaNativeJNI.Bitwuzla_term_mgr(swigCPtr, this), false);
+  }
+
+  public String print_formula() {
+    return BitwuzlaNativeJNI.Bitwuzla_print_formula(swigCPtr, this);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java
new file mode 100644
index 0000000000..8590694338
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java
@@ -0,0 +1,24 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class BitwuzlaNative {
+  public static String copyright() {
+    return BitwuzlaNativeJNI.copyright();
+  }
+
+  public static String version() {
+    return BitwuzlaNativeJNI.version();
+  }
+
+  public static String git_id() {
+    return BitwuzlaNativeJNI.git_id();
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java
new file mode 100644
index 0000000000..8e2e56e7db
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java
@@ -0,0 +1,260 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class BitwuzlaNativeJNI {
+  public final static native long new_Vector_Int__SWIG_0();
+  public final static native long new_Vector_Int__SWIG_1(long jarg1, Vector_Int jarg1_);
+  public final static native long Vector_Int_capacity(long jarg1, Vector_Int jarg1_);
+  public final static native void Vector_Int_reserve(long jarg1, Vector_Int jarg1_, long jarg2);
+  public final static native boolean Vector_Int_isEmpty(long jarg1, Vector_Int jarg1_);
+  public final static native void Vector_Int_clear(long jarg1, Vector_Int jarg1_);
+  public final static native long new_Vector_Int__SWIG_2(int jarg1, int jarg2);
+  public final static native int Vector_Int_doSize(long jarg1, Vector_Int jarg1_);
+  public final static native void Vector_Int_doAdd__SWIG_0(long jarg1, Vector_Int jarg1_, int jarg2);
+  public final static native void Vector_Int_doAdd__SWIG_1(long jarg1, Vector_Int jarg1_, int jarg2, int jarg3);
+  public final static native int Vector_Int_doRemove(long jarg1, Vector_Int jarg1_, int jarg2);
+  public final static native int Vector_Int_doGet(long jarg1, Vector_Int jarg1_, int jarg2);
+  public final static native int Vector_Int_doSet(long jarg1, Vector_Int jarg1_, int jarg2, int jarg3);
+  public final static native void Vector_Int_doRemoveRange(long jarg1, Vector_Int jarg1_, int jarg2, int jarg3);
+  public final static native void delete_Vector_Int(long jarg1);
+  public final static native long new_Vector_String__SWIG_0();
+  public final static native long new_Vector_String__SWIG_1(long jarg1, Vector_String jarg1_);
+  public final static native long Vector_String_capacity(long jarg1, Vector_String jarg1_);
+  public final static native void Vector_String_reserve(long jarg1, Vector_String jarg1_, long jarg2);
+  public final static native boolean Vector_String_isEmpty(long jarg1, Vector_String jarg1_);
+  public final static native void Vector_String_clear(long jarg1, Vector_String jarg1_);
+  public final static native long new_Vector_String__SWIG_2(int jarg1, String jarg2);
+  public final static native int Vector_String_doSize(long jarg1, Vector_String jarg1_);
+  public final static native void Vector_String_doAdd__SWIG_0(long jarg1, Vector_String jarg1_, String jarg2);
+  public final static native void Vector_String_doAdd__SWIG_1(long jarg1, Vector_String jarg1_, int jarg2, String jarg3);
+  public final static native String Vector_String_doRemove(long jarg1, Vector_String jarg1_, int jarg2);
+  public final static native String Vector_String_doGet(long jarg1, Vector_String jarg1_, int jarg2);
+  public final static native String Vector_String_doSet(long jarg1, Vector_String jarg1_, int jarg2, String jarg3);
+  public final static native void Vector_String_doRemoveRange(long jarg1, Vector_String jarg1_, int jarg2, int jarg3);
+  public final static native void delete_Vector_String(long jarg1);
+  public final static native long new_Vector_Term__SWIG_0();
+  public final static native long new_Vector_Term__SWIG_1(long jarg1, Vector_Term jarg1_);
+  public final static native long Vector_Term_capacity(long jarg1, Vector_Term jarg1_);
+  public final static native void Vector_Term_reserve(long jarg1, Vector_Term jarg1_, long jarg2);
+  public final static native boolean Vector_Term_isEmpty(long jarg1, Vector_Term jarg1_);
+  public final static native void Vector_Term_clear(long jarg1, Vector_Term jarg1_);
+  public final static native long new_Vector_Term__SWIG_2(int jarg1, long jarg2, Term jarg2_);
+  public final static native int Vector_Term_doSize(long jarg1, Vector_Term jarg1_);
+  public final static native void Vector_Term_doAdd__SWIG_0(long jarg1, Vector_Term jarg1_, long jarg2, Term jarg2_);
+  public final static native void Vector_Term_doAdd__SWIG_1(long jarg1, Vector_Term jarg1_, int jarg2, long jarg3, Term jarg3_);
+  public final static native long Vector_Term_doRemove(long jarg1, Vector_Term jarg1_, int jarg2);
+  public final static native long Vector_Term_doGet(long jarg1, Vector_Term jarg1_, int jarg2);
+  public final static native long Vector_Term_doSet(long jarg1, Vector_Term jarg1_, int jarg2, long jarg3, Term jarg3_);
+  public final static native void Vector_Term_doRemoveRange(long jarg1, Vector_Term jarg1_, int jarg2, int jarg3);
+  public final static native void delete_Vector_Term(long jarg1);
+  public final static native long new_Vector_Sort__SWIG_0();
+  public final static native long new_Vector_Sort__SWIG_1(long jarg1, Vector_Sort jarg1_);
+  public final static native long Vector_Sort_capacity(long jarg1, Vector_Sort jarg1_);
+  public final static native void Vector_Sort_reserve(long jarg1, Vector_Sort jarg1_, long jarg2);
+  public final static native boolean Vector_Sort_isEmpty(long jarg1, Vector_Sort jarg1_);
+  public final static native void Vector_Sort_clear(long jarg1, Vector_Sort jarg1_);
+  public final static native long new_Vector_Sort__SWIG_2(int jarg1, long jarg2, Sort jarg2_);
+  public final static native int Vector_Sort_doSize(long jarg1, Vector_Sort jarg1_);
+  public final static native void Vector_Sort_doAdd__SWIG_0(long jarg1, Vector_Sort jarg1_, long jarg2, Sort jarg2_);
+  public final static native void Vector_Sort_doAdd__SWIG_1(long jarg1, Vector_Sort jarg1_, int jarg2, long jarg3, Sort jarg3_);
+  public final static native long Vector_Sort_doRemove(long jarg1, Vector_Sort jarg1_, int jarg2);
+  public final static native long Vector_Sort_doGet(long jarg1, Vector_Sort jarg1_, int jarg2);
+  public final static native long Vector_Sort_doSet(long jarg1, Vector_Sort jarg1_, int jarg2, long jarg3, Sort jarg3_);
+  public final static native void Vector_Sort_doRemoveRange(long jarg1, Vector_Sort jarg1_, int jarg2, int jarg3);
+  public final static native void delete_Vector_Sort(long jarg1);
+  public final static native long new_Map_TermTerm__SWIG_0();
+  public final static native long new_Map_TermTerm__SWIG_1(long jarg1, Map_TermTerm jarg1_);
+  public final static native long Map_TermTerm_Iterator_getNextUnchecked(long jarg1, Map_TermTerm.Iterator jarg1_);
+  public final static native boolean Map_TermTerm_Iterator_isNot(long jarg1, Map_TermTerm.Iterator jarg1_, long jarg2, Map_TermTerm.Iterator jarg2_);
+  public final static native long Map_TermTerm_Iterator_getKey(long jarg1, Map_TermTerm.Iterator jarg1_);
+  public final static native long Map_TermTerm_Iterator_getValue(long jarg1, Map_TermTerm.Iterator jarg1_);
+  public final static native void Map_TermTerm_Iterator_setValue(long jarg1, Map_TermTerm.Iterator jarg1_, long jarg2, Term jarg2_);
+  public final static native void delete_Map_TermTerm_Iterator(long jarg1);
+  public final static native boolean Map_TermTerm_isEmpty(long jarg1, Map_TermTerm jarg1_);
+  public final static native void Map_TermTerm_clear(long jarg1, Map_TermTerm jarg1_);
+  public final static native long Map_TermTerm_find(long jarg1, Map_TermTerm jarg1_, long jarg2, Term jarg2_);
+  public final static native long Map_TermTerm_begin(long jarg1, Map_TermTerm jarg1_);
+  public final static native long Map_TermTerm_end(long jarg1, Map_TermTerm jarg1_);
+  public final static native int Map_TermTerm_sizeImpl(long jarg1, Map_TermTerm jarg1_);
+  public final static native boolean Map_TermTerm_containsImpl(long jarg1, Map_TermTerm jarg1_, long jarg2, Term jarg2_);
+  public final static native void Map_TermTerm_putUnchecked(long jarg1, Map_TermTerm jarg1_, long jarg2, Term jarg2_, long jarg3, Term jarg3_);
+  public final static native void Map_TermTerm_removeUnchecked(long jarg1, Map_TermTerm jarg1_, long jarg2, Map_TermTerm.Iterator jarg2_);
+  public final static native void delete_Map_TermTerm(long jarg1);
+  public final static native int Result_SAT_get();
+  public final static native int Result_UNSAT_get();
+  public final static native int Result_UNKNOWN_get();
+  public final static native int RoundingMode_RNE_get();
+  public final static native int RoundingMode_RNA_get();
+  public final static native int RoundingMode_RTN_get();
+  public final static native int RoundingMode_RTP_get();
+  public final static native int RoundingMode_RTZ_get();
+  public final static native int Kind_CONSTANT_get();
+  public final static native String copyright();
+  public final static native String version();
+  public final static native String git_id();
+  public final static native long new_Options__SWIG_0();
+  public final static native void delete_Options(long jarg1);
+  public final static native long new_Options__SWIG_1(long jarg1, Options jarg1_);
+  public final static native boolean Options_is_valid(long jarg1, Options jarg1_, String jarg2);
+  public final static native boolean Options_is_bool(long jarg1, Options jarg1_, int jarg2);
+  public final static native boolean Options_is_numeric(long jarg1, Options jarg1_, int jarg2);
+  public final static native boolean Options_is_mode(long jarg1, Options jarg1_, int jarg2);
+  public final static native String Options_shrt(long jarg1, Options jarg1_, int jarg2);
+  public final static native String Options_lng(long jarg1, Options jarg1_, int jarg2);
+  public final static native String Options_description(long jarg1, Options jarg1_, int jarg2);
+  public final static native long Options_modes(long jarg1, Options jarg1_, int jarg2);
+  public final static native int Options_option(long jarg1, Options jarg1_, String jarg2);
+  public final static native void Options_set__SWIG_0(long jarg1, Options jarg1_, int jarg2, String jarg3);
+  public final static native void Options_set__SWIG_1(long jarg1, Options jarg1_, String jarg2, String jarg3);
+  public final static native void Options_set__SWIG_2(long jarg1, Options jarg1_, long jarg2, Vector_String jarg2_);
+  public final static native java.math.BigInteger Options_get(long jarg1, Options jarg1_, int jarg2);
+  public final static native String Options_get_mode(long jarg1, Options jarg1_, int jarg2);
+  public final static native void Options_set__SWIG_3(long jarg1, Options jarg1_, int jarg2, int jarg3);
+  public final static native long new_Term();
+  public final static native void delete_Term(long jarg1);
+  public final static native boolean Term_is_null(long jarg1, Term jarg1_);
+  public final static native int Term_kind(long jarg1, Term jarg1_);
+  public final static native long Term_sort(long jarg1, Term jarg1_);
+  public final static native long Term_num_children(long jarg1, Term jarg1_);
+  public final static native long Term_children(long jarg1, Term jarg1_);
+  public final static native long Term_get(long jarg1, Term jarg1_, long jarg2);
+  public final static native long Term_num_indices(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_const(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_variable(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_value(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_true(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_false(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_bv_value_zero(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_bv_value_one(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_bv_value_ones(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_bv_value_min_signed(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_bv_value_max_signed(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_fp_value_pos_zero(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_fp_value_neg_zero(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_fp_value_pos_inf(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_fp_value_neg_inf(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_fp_value_nan(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_rm_value_rna(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_rm_value_rne(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_rm_value_rtn(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_rm_value_rtp(long jarg1, Term jarg1_);
+  public final static native boolean Term_is_rm_value_rtz(long jarg1, Term jarg1_);
+  public final static native String Term_toString__SWIG_0(long jarg1, Term jarg1_, short jarg2);
+  public final static native String Term_toString__SWIG_1(long jarg1, Term jarg1_);
+  public final static native int Term_id(long jarg1, Term jarg1_);
+  public final static native long Term_indices(long jarg1, Term jarg1_);
+  public final static native String Term_symbol(long jarg1, Term jarg1_);
+  public final static native boolean Term_to_bool(long jarg1, Term jarg1_);
+  public final static native int Term_to_rm(long jarg1, Term jarg1_);
+  public final static native String Term_to_bv(long jarg1, Term jarg1_);
+  public final static native int Term_hashCode(long jarg1, Term jarg1_);
+  public final static native boolean Term_isEqual(long jarg1, Term jarg1_, long jarg2, Term jarg2_);
+  public final static native long new_Sort();
+  public final static native void delete_Sort(long jarg1);
+  public final static native boolean Sort_is_null(long jarg1, Sort jarg1_);
+  public final static native long Sort_array_index(long jarg1, Sort jarg1_);
+  public final static native long Sort_array_element(long jarg1, Sort jarg1_);
+  public final static native long Sort_fun_domain(long jarg1, Sort jarg1_);
+  public final static native long Sort_fun_codomain(long jarg1, Sort jarg1_);
+  public final static native boolean Sort_is_array(long jarg1, Sort jarg1_);
+  public final static native boolean Sort_is_bool(long jarg1, Sort jarg1_);
+  public final static native boolean Sort_is_bv(long jarg1, Sort jarg1_);
+  public final static native boolean Sort_is_fp(long jarg1, Sort jarg1_);
+  public final static native boolean Sort_is_fun(long jarg1, Sort jarg1_);
+  public final static native boolean Sort_is_rm(long jarg1, Sort jarg1_);
+  public final static native String Sort_toString(long jarg1, Sort jarg1_);
+  public final static native int Sort_id(long jarg1, Sort jarg1_);
+  public final static native int Sort_bv_size(long jarg1, Sort jarg1_);
+  public final static native int Sort_fp_exp_size(long jarg1, Sort jarg1_);
+  public final static native int Sort_fp_sig_size(long jarg1, Sort jarg1_);
+  public final static native int Sort_fun_arity(long jarg1, Sort jarg1_);
+  public final static native int Sort_hashCode(long jarg1, Sort jarg1_);
+  public final static native boolean Sort_isEqual(long jarg1, Sort jarg1_, long jarg2, Sort jarg2_);
+  public final static native void delete_Terminator(long jarg1);
+  public final static native boolean Terminator_terminate(long jarg1, Terminator jarg1_);
+  public final static native long new_Terminator();
+  public final static native void Terminator_director_connect(Terminator obj, long cptr, boolean mem_own, boolean weak_global);
+  public final static native void Terminator_change_ownership(Terminator obj, long cptr, boolean take_or_release);
+  public final static native long new_TermManager();
+  public final static native void delete_TermManager(long jarg1);
+  public final static native long TermManager_mk_array_sort(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_, long jarg3, Sort jarg3_);
+  public final static native long TermManager_mk_bool_sort(long jarg1, TermManager jarg1_);
+  public final static native long TermManager_mk_fun_sort(long jarg1, TermManager jarg1_, long jarg2, Vector_Sort jarg2_, long jarg3, Sort jarg3_);
+  public final static native long TermManager_mk_true(long jarg1, TermManager jarg1_);
+  public final static native long TermManager_mk_false(long jarg1, TermManager jarg1_);
+  public final static native long TermManager_mk_bv_zero(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_);
+  public final static native long TermManager_mk_bv_one(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_);
+  public final static native long TermManager_mk_bv_ones(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_);
+  public final static native long TermManager_mk_bv_min_signed(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_);
+  public final static native long TermManager_mk_bv_max_signed(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_);
+  public final static native long TermManager_mk_bv_value__SWIG_0(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_, String jarg3, short jarg4);
+  public final static native long TermManager_mk_bv_value__SWIG_1(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_, String jarg3);
+  public final static native long TermManager_mk_bv_value_uint64(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_, java.math.BigInteger jarg3);
+  public final static native long TermManager_mk_bv_value_int64(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_, long jarg3);
+  public final static native long TermManager_mk_fp_pos_zero(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_);
+  public final static native long TermManager_mk_fp_neg_zero(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_);
+  public final static native long TermManager_mk_fp_pos_inf(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_);
+  public final static native long TermManager_mk_fp_neg_inf(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_);
+  public final static native long TermManager_mk_fp_nan(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_);
+  public final static native long TermManager_mk_fp_value__SWIG_0(long jarg1, TermManager jarg1_, long jarg2, Term jarg2_, long jarg3, Term jarg3_, long jarg4, Term jarg4_);
+  public final static native long TermManager_mk_fp_value__SWIG_1(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_, long jarg3, Term jarg3_, String jarg4);
+  public final static native long TermManager_mk_fp_value__SWIG_2(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_, long jarg3, Term jarg3_, String jarg4, String jarg5);
+  public final static native long TermManager_mk_const_array(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_, long jarg3, Term jarg3_);
+  public final static native long TermManager_mk_rm_value(long jarg1, TermManager jarg1_, int jarg2);
+  public final static native long TermManager_substitute_term(long jarg1, TermManager jarg1_, long jarg2, Term jarg2_, long jarg3, Map_TermTerm jarg3_);
+  public final static native void TermManager_substitute_terms(long jarg1, TermManager jarg1_, long jarg2, Vector_Term jarg2_, long jarg3, Map_TermTerm jarg3_);
+  public final static native long TermManager_mk_bv_sort(long jarg1, TermManager jarg1_, int jarg2);
+  public final static native long TermManager_mk_fp_sort(long jarg1, TermManager jarg1_, int jarg2, int jarg3);
+  public final static native long TermManager_mk_term__SWIG_0(long jarg1, TermManager jarg1_, int jarg2, long jarg3, Term jarg3_);
+  public final static native long TermManager_mk_term__SWIG_1(long jarg1, TermManager jarg1_, int jarg2, long jarg3, Term jarg3_, int jarg4);
+  public final static native long TermManager_mk_term__SWIG_2(long jarg1, TermManager jarg1_, int jarg2, long jarg3, Term jarg3_, int jarg4, int jarg5);
+  public final static native long TermManager_mk_term__SWIG_3(long jarg1, TermManager jarg1_, int jarg2, long jarg3, Term jarg3_, long jarg4, Term jarg4_);
+  public final static native long TermManager_mk_term__SWIG_4(long jarg1, TermManager jarg1_, int jarg2, long jarg3, Term jarg3_, long jarg4, Term jarg4_, int jarg5);
+  public final static native long TermManager_mk_term__SWIG_5(long jarg1, TermManager jarg1_, int jarg2, long jarg3, Term jarg3_, long jarg4, Term jarg4_, int jarg5, int jarg6);
+  public final static native long TermManager_mk_term__SWIG_6(long jarg1, TermManager jarg1_, int jarg2, long jarg3, Term jarg3_, long jarg4, Term jarg4_, long jarg5, Term jarg5_);
+  public final static native long TermManager_mk_term__SWIG_7(long jarg1, TermManager jarg1_, int jarg2, long jarg3, Vector_Term jarg3_, long jarg4, Vector_Int jarg4_);
+  public final static native long TermManager_mk_const(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_, String jarg3);
+  public final static native long TermManager_mk_var(long jarg1, TermManager jarg1_, long jarg2, Sort jarg2_, String jarg3);
+  public final static native long new_Bitwuzla__SWIG_0(long jarg1, TermManager jarg1_, long jarg2, Options jarg2_);
+  public final static native long new_Bitwuzla__SWIG_1(long jarg1, TermManager jarg1_);
+  public final static native void delete_Bitwuzla(long jarg1);
+  public final static native void Bitwuzla_configure_terminator(long jarg1, Bitwuzla jarg1_, long jarg2, Terminator jarg2_);
+  public final static native void Bitwuzla_push(long jarg1, Bitwuzla jarg1_, long jarg2);
+  public final static native void Bitwuzla_pop(long jarg1, Bitwuzla jarg1_, long jarg2);
+  public final static native void Bitwuzla_assert_formula(long jarg1, Bitwuzla jarg1_, long jarg2, Term jarg2_);
+  public final static native long Bitwuzla_get_assertions(long jarg1, Bitwuzla jarg1_);
+  public final static native long Bitwuzla_get_unsat_assumptions(long jarg1, Bitwuzla jarg1_);
+  public final static native long Bitwuzla_get_unsat_core(long jarg1, Bitwuzla jarg1_);
+  public final static native int Bitwuzla_check_sat__SWIG_0(long jarg1, Bitwuzla jarg1_, long jarg2, Vector_Term jarg2_);
+  public final static native int Bitwuzla_check_sat__SWIG_1(long jarg1, Bitwuzla jarg1_);
+  public final static native long Bitwuzla_get_value(long jarg1, Bitwuzla jarg1_, long jarg2, Term jarg2_);
+  public final static native long Bitwuzla_term_mgr(long jarg1, Bitwuzla jarg1_);
+  public final static native String Bitwuzla_print_formula(long jarg1, Bitwuzla jarg1_);
+  public final static native long new_Parser__SWIG_0(long jarg1, TermManager jarg1_, long jarg2, Options jarg2_, String jarg3);
+  public final static native long new_Parser__SWIG_1(long jarg1, TermManager jarg1_, long jarg2, Options jarg2_);
+  public final static native void delete_Parser(long jarg1);
+  public final static native void Parser_parse__SWIG_0(long jarg1, Parser jarg1_, String jarg2, boolean jarg3, boolean jarg4);
+  public final static native void Parser_parse__SWIG_1(long jarg1, Parser jarg1_, String jarg2, boolean jarg3);
+  public final static native void Parser_parse__SWIG_2(long jarg1, Parser jarg1_, String jarg2);
+  public final static native long Parser_parse_term(long jarg1, Parser jarg1_, String jarg2);
+  public final static native long Parser_parse_sort(long jarg1, Parser jarg1_, String jarg2);
+  public final static native long Parser_get_declared_sorts(long jarg1, Parser jarg1_);
+  public final static native long Parser_get_declared_funs(long jarg1, Parser jarg1_);
+  public final static native long Parser_bitwuzla(long jarg1, Parser jarg1_);
+
+  public static boolean SwigDirector_Terminator_terminate(Terminator jself) {
+    return jself.terminate();
+  }
+
+  private final static native void swig_module_init();
+  static {
+    swig_module_init();
+  }
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java
new file mode 100644
index 0000000000..094b221a31
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java
@@ -0,0 +1,153 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public final class Kind {
+  public final static Kind CONSTANT = new Kind("CONSTANT", BitwuzlaNativeJNI.Kind_CONSTANT_get());
+  public final static Kind CONST_ARRAY = new Kind("CONST_ARRAY");
+  public final static Kind VALUE = new Kind("VALUE");
+  public final static Kind VARIABLE = new Kind("VARIABLE");
+  public final static Kind AND = new Kind("AND");
+  public final static Kind DISTINCT = new Kind("DISTINCT");
+  public final static Kind EQUAL = new Kind("EQUAL");
+  public final static Kind IFF = new Kind("IFF");
+  public final static Kind IMPLIES = new Kind("IMPLIES");
+  public final static Kind NOT = new Kind("NOT");
+  public final static Kind OR = new Kind("OR");
+  public final static Kind XOR = new Kind("XOR");
+  public final static Kind ITE = new Kind("ITE");
+  public final static Kind EXISTS = new Kind("EXISTS");
+  public final static Kind FORALL = new Kind("FORALL");
+  public final static Kind APPLY = new Kind("APPLY");
+  public final static Kind LAMBDA = new Kind("LAMBDA");
+  public final static Kind ARRAY_SELECT = new Kind("ARRAY_SELECT");
+  public final static Kind ARRAY_STORE = new Kind("ARRAY_STORE");
+  public final static Kind BV_ADD = new Kind("BV_ADD");
+  public final static Kind BV_AND = new Kind("BV_AND");
+  public final static Kind BV_ASHR = new Kind("BV_ASHR");
+  public final static Kind BV_COMP = new Kind("BV_COMP");
+  public final static Kind BV_CONCAT = new Kind("BV_CONCAT");
+  public final static Kind BV_DEC = new Kind("BV_DEC");
+  public final static Kind BV_INC = new Kind("BV_INC");
+  public final static Kind BV_MUL = new Kind("BV_MUL");
+  public final static Kind BV_NAND = new Kind("BV_NAND");
+  public final static Kind BV_NEG = new Kind("BV_NEG");
+  public final static Kind BV_NEG_OVERFLOW = new Kind("BV_NEG_OVERFLOW");
+  public final static Kind BV_NOR = new Kind("BV_NOR");
+  public final static Kind BV_NOT = new Kind("BV_NOT");
+  public final static Kind BV_OR = new Kind("BV_OR");
+  public final static Kind BV_REDAND = new Kind("BV_REDAND");
+  public final static Kind BV_REDOR = new Kind("BV_REDOR");
+  public final static Kind BV_REDXOR = new Kind("BV_REDXOR");
+  public final static Kind BV_ROL = new Kind("BV_ROL");
+  public final static Kind BV_ROR = new Kind("BV_ROR");
+  public final static Kind BV_SADD_OVERFLOW = new Kind("BV_SADD_OVERFLOW");
+  public final static Kind BV_SDIV_OVERFLOW = new Kind("BV_SDIV_OVERFLOW");
+  public final static Kind BV_SDIV = new Kind("BV_SDIV");
+  public final static Kind BV_SGE = new Kind("BV_SGE");
+  public final static Kind BV_SGT = new Kind("BV_SGT");
+  public final static Kind BV_SHL = new Kind("BV_SHL");
+  public final static Kind BV_SHR = new Kind("BV_SHR");
+  public final static Kind BV_SLE = new Kind("BV_SLE");
+  public final static Kind BV_SLT = new Kind("BV_SLT");
+  public final static Kind BV_SMOD = new Kind("BV_SMOD");
+  public final static Kind BV_SMUL_OVERFLOW = new Kind("BV_SMUL_OVERFLOW");
+  public final static Kind BV_SREM = new Kind("BV_SREM");
+  public final static Kind BV_SSUB_OVERFLOW = new Kind("BV_SSUB_OVERFLOW");
+  public final static Kind BV_SUB = new Kind("BV_SUB");
+  public final static Kind BV_UADD_OVERFLOW = new Kind("BV_UADD_OVERFLOW");
+  public final static Kind BV_UDIV = new Kind("BV_UDIV");
+  public final static Kind BV_UGE = new Kind("BV_UGE");
+  public final static Kind BV_UGT = new Kind("BV_UGT");
+  public final static Kind BV_ULE = new Kind("BV_ULE");
+  public final static Kind BV_ULT = new Kind("BV_ULT");
+  public final static Kind BV_UMUL_OVERFLOW = new Kind("BV_UMUL_OVERFLOW");
+  public final static Kind BV_UREM = new Kind("BV_UREM");
+  public final static Kind BV_USUB_OVERFLOW = new Kind("BV_USUB_OVERFLOW");
+  public final static Kind BV_XNOR = new Kind("BV_XNOR");
+  public final static Kind BV_XOR = new Kind("BV_XOR");
+  public final static Kind BV_EXTRACT = new Kind("BV_EXTRACT");
+  public final static Kind BV_REPEAT = new Kind("BV_REPEAT");
+  public final static Kind BV_ROLI = new Kind("BV_ROLI");
+  public final static Kind BV_RORI = new Kind("BV_RORI");
+  public final static Kind BV_SIGN_EXTEND = new Kind("BV_SIGN_EXTEND");
+  public final static Kind BV_ZERO_EXTEND = new Kind("BV_ZERO_EXTEND");
+  public final static Kind FP_ABS = new Kind("FP_ABS");
+  public final static Kind FP_ADD = new Kind("FP_ADD");
+  public final static Kind FP_DIV = new Kind("FP_DIV");
+  public final static Kind FP_EQUAL = new Kind("FP_EQUAL");
+  public final static Kind FP_FMA = new Kind("FP_FMA");
+  public final static Kind FP_FP = new Kind("FP_FP");
+  public final static Kind FP_GEQ = new Kind("FP_GEQ");
+  public final static Kind FP_GT = new Kind("FP_GT");
+  public final static Kind FP_IS_INF = new Kind("FP_IS_INF");
+  public final static Kind FP_IS_NAN = new Kind("FP_IS_NAN");
+  public final static Kind FP_IS_NEG = new Kind("FP_IS_NEG");
+  public final static Kind FP_IS_NORMAL = new Kind("FP_IS_NORMAL");
+  public final static Kind FP_IS_POS = new Kind("FP_IS_POS");
+  public final static Kind FP_IS_SUBNORMAL = new Kind("FP_IS_SUBNORMAL");
+  public final static Kind FP_IS_ZERO = new Kind("FP_IS_ZERO");
+  public final static Kind FP_LEQ = new Kind("FP_LEQ");
+  public final static Kind FP_LT = new Kind("FP_LT");
+  public final static Kind FP_MAX = new Kind("FP_MAX");
+  public final static Kind FP_MIN = new Kind("FP_MIN");
+  public final static Kind FP_MUL = new Kind("FP_MUL");
+  public final static Kind FP_NEG = new Kind("FP_NEG");
+  public final static Kind FP_REM = new Kind("FP_REM");
+  public final static Kind FP_RTI = new Kind("FP_RTI");
+  public final static Kind FP_SQRT = new Kind("FP_SQRT");
+  public final static Kind FP_SUB = new Kind("FP_SUB");
+  public final static Kind FP_TO_FP_FROM_BV = new Kind("FP_TO_FP_FROM_BV");
+  public final static Kind FP_TO_FP_FROM_FP = new Kind("FP_TO_FP_FROM_FP");
+  public final static Kind FP_TO_FP_FROM_SBV = new Kind("FP_TO_FP_FROM_SBV");
+  public final static Kind FP_TO_FP_FROM_UBV = new Kind("FP_TO_FP_FROM_UBV");
+  public final static Kind FP_TO_SBV = new Kind("FP_TO_SBV");
+  public final static Kind FP_TO_UBV = new Kind("FP_TO_UBV");
+  public final static Kind NUM_KINDS = new Kind("NUM_KINDS");
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public String toString() {
+    return swigName;
+  }
+
+  public static Kind swigToEnum(int swigValue) {
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (int i = 0; i < swigValues.length; i++)
+      if (swigValues[i].swigValue == swigValue)
+        return swigValues[i];
+    throw new IllegalArgumentException("No enum " + Kind.class + " with value " + swigValue);
+  }
+
+  private Kind(String swigName) {
+    this.swigName = swigName;
+    this.swigValue = swigNext++;
+  }
+
+  private Kind(String swigName, int swigValue) {
+    this.swigName = swigName;
+    this.swigValue = swigValue;
+    swigNext = swigValue+1;
+  }
+
+  private Kind(String swigName, Kind swigEnum) {
+    this.swigName = swigName;
+    this.swigValue = swigEnum.swigValue;
+    swigNext = this.swigValue+1;
+  }
+
+  private static Kind[] swigValues = { CONSTANT, CONST_ARRAY, VALUE, VARIABLE, AND, DISTINCT, EQUAL, IFF, IMPLIES, NOT, OR, XOR, ITE, EXISTS, FORALL, APPLY, LAMBDA, ARRAY_SELECT, ARRAY_STORE, BV_ADD, BV_AND, BV_ASHR, BV_COMP, BV_CONCAT, BV_DEC, BV_INC, BV_MUL, BV_NAND, BV_NEG, BV_NEG_OVERFLOW, BV_NOR, BV_NOT, BV_OR, BV_REDAND, BV_REDOR, BV_REDXOR, BV_ROL, BV_ROR, BV_SADD_OVERFLOW, BV_SDIV_OVERFLOW, BV_SDIV, BV_SGE, BV_SGT, BV_SHL, BV_SHR, BV_SLE, BV_SLT, BV_SMOD, BV_SMUL_OVERFLOW, BV_SREM, BV_SSUB_OVERFLOW, BV_SUB, BV_UADD_OVERFLOW, BV_UDIV, BV_UGE, BV_UGT, BV_ULE, BV_ULT, BV_UMUL_OVERFLOW, BV_UREM, BV_USUB_OVERFLOW, BV_XNOR, BV_XOR, BV_EXTRACT, BV_REPEAT, BV_ROLI, BV_RORI, BV_SIGN_EXTEND, BV_ZERO_EXTEND, FP_ABS, FP_ADD, FP_DIV, FP_EQUAL, FP_FMA, FP_FP, FP_GEQ, FP_GT, FP_IS_INF, FP_IS_NAN, FP_IS_NEG, FP_IS_NORMAL, FP_IS_POS, FP_IS_SUBNORMAL, FP_IS_ZERO, FP_LEQ, FP_LT, FP_MAX, FP_MIN, FP_MUL, FP_NEG, FP_REM, FP_RTI, FP_SQRT, FP_SUB, FP_TO_FP_FROM_BV, FP_TO_FP_FROM_FP, FP_TO_FP_FROM_SBV, FP_TO_FP_FROM_UBV, FP_TO_SBV, FP_TO_UBV, NUM_KINDS };
+  private static int swigNext = 0;
+  private final int swigValue;
+  private final String swigName;
+}
+
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
new file mode 100644
index 0000000000..587adec89a
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
@@ -0,0 +1,245 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Map_TermTerm extends java.util.AbstractMap<Term, Term> {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected Map_TermTerm(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Map_TermTerm obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(Map_TermTerm obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        BitwuzlaNativeJNI.delete_Map_TermTerm(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+
+  public int size() {
+    return sizeImpl();
+  }
+
+  public boolean containsKey(java.lang.Object key) {
+    if (!(key instanceof Term)) {
+      return false;
+    }
+
+    return containsImpl((Term)key);
+  }
+
+  public Term get(java.lang.Object key) {
+    if (!(key instanceof Term)) {
+      return null;
+    }
+
+    Iterator itr = find((Term) key);
+    if (itr.isNot(end())) {
+      return itr.getValue();
+    }
+
+    return null;
+  }
+
+  public Term put(Term key, Term value) {
+    Iterator itr = find((Term) key);
+    if (itr.isNot(end())) {
+      Term oldValue = itr.getValue();
+      itr.setValue(value);
+      return oldValue;
+    } else {
+      putUnchecked(key, value);
+      return null;
+    }
+  }
+
+  public Term remove(java.lang.Object key) {
+    if (!(key instanceof Term)) {
+      return null;
+    }
+
+    Iterator itr = find((Term) key);
+    if (itr.isNot(end())) {
+      Term oldValue = itr.getValue();
+      removeUnchecked(itr);
+      return oldValue;
+    } else {
+      return null;
+    }
+  }
+
+  public java.util.Set<Entry<Term, Term>> entrySet() {
+    java.util.Set<Entry<Term, Term>> setToReturn =
+        new java.util.HashSet<Entry<Term, Term>>();
+
+    Iterator itr = begin();
+    final Iterator end = end();
+    while (itr.isNot(end)) {
+      setToReturn.add(new Entry<Term, Term>() {
+        private Iterator iterator;
+
+        private Entry<Term, Term> init(Iterator iterator) {
+          this.iterator = iterator;
+          return this;
+        }
+
+        public Term getKey() {
+          return iterator.getKey();
+        }
+
+        public Term getValue() {
+          return iterator.getValue();
+        }
+
+        public Term setValue(Term newValue) {
+          Term oldValue = iterator.getValue();
+          iterator.setValue(newValue);
+          return oldValue;
+        }
+      }.init(itr));
+      itr = itr.getNextUnchecked();
+    }
+
+    return setToReturn;
+  }
+
+  public Map_TermTerm() {
+    this(BitwuzlaNativeJNI.new_Map_TermTerm__SWIG_0(), true);
+  }
+
+  public Map_TermTerm(Map_TermTerm other) {
+    this(BitwuzlaNativeJNI.new_Map_TermTerm__SWIG_1(Map_TermTerm.getCPtr(other), other), true);
+  }
+
+  static protected class Iterator {
+    private transient long swigCPtr;
+    protected transient boolean swigCMemOwn;
+  
+    protected Iterator(long cPtr, boolean cMemoryOwn) {
+      swigCMemOwn = cMemoryOwn;
+      swigCPtr = cPtr;
+    }
+  
+    protected static long getCPtr(Iterator obj) {
+      return (obj == null) ? 0 : obj.swigCPtr;
+    }
+  
+    protected static long swigRelease(Iterator obj) {
+      long ptr = 0;
+      if (obj != null) {
+        if (!obj.swigCMemOwn)
+          throw new RuntimeException("Cannot release ownership as memory is not owned");
+        ptr = obj.swigCPtr;
+        obj.swigCMemOwn = false;
+        obj.delete();
+      }
+      return ptr;
+    }
+  
+    @SuppressWarnings("deprecation")
+    protected void finalize() {
+      delete();
+    }
+  
+    public synchronized void delete() {
+      if (swigCPtr != 0) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          BitwuzlaNativeJNI.delete_Map_TermTerm_Iterator(swigCPtr);
+        }
+        swigCPtr = 0;
+      }
+    }
+  
+    private Map_TermTerm.Iterator getNextUnchecked() {
+      return new Map_TermTerm.Iterator(BitwuzlaNativeJNI.Map_TermTerm_Iterator_getNextUnchecked(swigCPtr, this), true);
+    }
+  
+    private boolean isNot(Map_TermTerm.Iterator other) {
+      return BitwuzlaNativeJNI.Map_TermTerm_Iterator_isNot(swigCPtr, this, Map_TermTerm.Iterator.getCPtr(other), other);
+    }
+  
+    private Term getKey() {
+      return new Term(BitwuzlaNativeJNI.Map_TermTerm_Iterator_getKey(swigCPtr, this), true);
+    }
+  
+    private Term getValue() {
+      return new Term(BitwuzlaNativeJNI.Map_TermTerm_Iterator_getValue(swigCPtr, this), true);
+    }
+  
+    private void setValue(Term newValue) {
+      BitwuzlaNativeJNI.Map_TermTerm_Iterator_setValue(swigCPtr, this, Term.getCPtr(newValue), newValue);
+    }
+  
+  }
+
+  public boolean isEmpty() {
+    return BitwuzlaNativeJNI.Map_TermTerm_isEmpty(swigCPtr, this);
+  }
+
+  public void clear() {
+    BitwuzlaNativeJNI.Map_TermTerm_clear(swigCPtr, this);
+  }
+
+  private Map_TermTerm.Iterator find(Term key) {
+    return new Map_TermTerm.Iterator(BitwuzlaNativeJNI.Map_TermTerm_find(swigCPtr, this, Term.getCPtr(key), key), true);
+  }
+
+  private Map_TermTerm.Iterator begin() {
+    return new Map_TermTerm.Iterator(BitwuzlaNativeJNI.Map_TermTerm_begin(swigCPtr, this), true);
+  }
+
+  private Map_TermTerm.Iterator end() {
+    return new Map_TermTerm.Iterator(BitwuzlaNativeJNI.Map_TermTerm_end(swigCPtr, this), true);
+  }
+
+  private int sizeImpl() {
+    return BitwuzlaNativeJNI.Map_TermTerm_sizeImpl(swigCPtr, this);
+  }
+
+  private boolean containsImpl(Term key) {
+    return BitwuzlaNativeJNI.Map_TermTerm_containsImpl(swigCPtr, this, Term.getCPtr(key), key);
+  }
+
+  private void putUnchecked(Term key, Term value) {
+    BitwuzlaNativeJNI.Map_TermTerm_putUnchecked(swigCPtr, this, Term.getCPtr(key), key, Term.getCPtr(value), value);
+  }
+
+  private void removeUnchecked(Map_TermTerm.Iterator itr) {
+    BitwuzlaNativeJNI.Map_TermTerm_removeUnchecked(swigCPtr, this, Map_TermTerm.Iterator.getCPtr(itr), itr);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java
new file mode 100644
index 0000000000..6477998871
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java
@@ -0,0 +1,90 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public final class Option {
+  public final static Option LOGLEVEL = new Option("LOGLEVEL");
+  public final static Option PRODUCE_MODELS = new Option("PRODUCE_MODELS");
+  public final static Option PRODUCE_UNSAT_ASSUMPTIONS = new Option("PRODUCE_UNSAT_ASSUMPTIONS");
+  public final static Option PRODUCE_UNSAT_CORES = new Option("PRODUCE_UNSAT_CORES");
+  public final static Option SEED = new Option("SEED");
+  public final static Option VERBOSITY = new Option("VERBOSITY");
+  public final static Option TIME_LIMIT_PER = new Option("TIME_LIMIT_PER");
+  public final static Option MEMORY_LIMIT = new Option("MEMORY_LIMIT");
+  public final static Option BV_SOLVER = new Option("BV_SOLVER");
+  public final static Option REWRITE_LEVEL = new Option("REWRITE_LEVEL");
+  public final static Option SAT_SOLVER = new Option("SAT_SOLVER");
+  public final static Option PROP_CONST_BITS = new Option("PROP_CONST_BITS");
+  public final static Option PROP_INFER_INEQ_BOUNDS = new Option("PROP_INFER_INEQ_BOUNDS");
+  public final static Option PROP_NPROPS = new Option("PROP_NPROPS");
+  public final static Option PROP_NUPDATES = new Option("PROP_NUPDATES");
+  public final static Option PROP_OPT_LT_CONCAT_SEXT = new Option("PROP_OPT_LT_CONCAT_SEXT");
+  public final static Option PROP_PATH_SEL = new Option("PROP_PATH_SEL");
+  public final static Option PROP_PROB_RANDOM_INPUT = new Option("PROP_PROB_RANDOM_INPUT");
+  public final static Option PROP_PROB_USE_INV_VALUE = new Option("PROP_PROB_USE_INV_VALUE");
+  public final static Option PROP_SEXT = new Option("PROP_SEXT");
+  public final static Option PROP_NORMALIZE = new Option("PROP_NORMALIZE");
+  public final static Option PREPROCESS = new Option("PREPROCESS");
+  public final static Option PP_CONTRADICTING_ANDS = new Option("PP_CONTRADICTING_ANDS");
+  public final static Option PP_ELIM_BV_EXTRACTS = new Option("PP_ELIM_BV_EXTRACTS");
+  public final static Option PP_EMBEDDED_CONSTR = new Option("PP_EMBEDDED_CONSTR");
+  public final static Option PP_FLATTEN_AND = new Option("PP_FLATTEN_AND");
+  public final static Option PP_NORMALIZE = new Option("PP_NORMALIZE");
+  public final static Option PP_NORMALIZE_SHARE_AWARE = new Option("PP_NORMALIZE_SHARE_AWARE");
+  public final static Option PP_SKELETON_PREPROC = new Option("PP_SKELETON_PREPROC");
+  public final static Option PP_VARIABLE_SUBST = new Option("PP_VARIABLE_SUBST");
+  public final static Option PP_VARIABLE_SUBST_NORM_EQ = new Option("PP_VARIABLE_SUBST_NORM_EQ");
+  public final static Option PP_VARIABLE_SUBST_NORM_DISEQ = new Option("PP_VARIABLE_SUBST_NORM_DISEQ");
+  public final static Option PP_VARIABLE_SUBST_NORM_BV_INEQ = new Option("PP_VARIABLE_SUBST_NORM_BV_INEQ");
+  public final static Option DBG_RW_NODE_THRESH = new Option("DBG_RW_NODE_THRESH");
+  public final static Option DBG_PP_NODE_THRESH = new Option("DBG_PP_NODE_THRESH");
+  public final static Option DBG_CHECK_MODEL = new Option("DBG_CHECK_MODEL");
+  public final static Option DBG_CHECK_UNSAT_CORE = new Option("DBG_CHECK_UNSAT_CORE");
+  public final static Option NUM_OPTS = new Option("NUM_OPTS");
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public String toString() {
+    return swigName;
+  }
+
+  public static Option swigToEnum(int swigValue) {
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (int i = 0; i < swigValues.length; i++)
+      if (swigValues[i].swigValue == swigValue)
+        return swigValues[i];
+    throw new IllegalArgumentException("No enum " + Option.class + " with value " + swigValue);
+  }
+
+  private Option(String swigName) {
+    this.swigName = swigName;
+    this.swigValue = swigNext++;
+  }
+
+  private Option(String swigName, int swigValue) {
+    this.swigName = swigName;
+    this.swigValue = swigValue;
+    swigNext = swigValue+1;
+  }
+
+  private Option(String swigName, Option swigEnum) {
+    this.swigName = swigName;
+    this.swigValue = swigEnum.swigValue;
+    swigNext = this.swigValue+1;
+  }
+
+  private static Option[] swigValues = { LOGLEVEL, PRODUCE_MODELS, PRODUCE_UNSAT_ASSUMPTIONS, PRODUCE_UNSAT_CORES, SEED, VERBOSITY, TIME_LIMIT_PER, MEMORY_LIMIT, BV_SOLVER, REWRITE_LEVEL, SAT_SOLVER, PROP_CONST_BITS, PROP_INFER_INEQ_BOUNDS, PROP_NPROPS, PROP_NUPDATES, PROP_OPT_LT_CONCAT_SEXT, PROP_PATH_SEL, PROP_PROB_RANDOM_INPUT, PROP_PROB_USE_INV_VALUE, PROP_SEXT, PROP_NORMALIZE, PREPROCESS, PP_CONTRADICTING_ANDS, PP_ELIM_BV_EXTRACTS, PP_EMBEDDED_CONSTR, PP_FLATTEN_AND, PP_NORMALIZE, PP_NORMALIZE_SHARE_AWARE, PP_SKELETON_PREPROC, PP_VARIABLE_SUBST, PP_VARIABLE_SUBST_NORM_EQ, PP_VARIABLE_SUBST_NORM_DISEQ, PP_VARIABLE_SUBST_NORM_BV_INEQ, DBG_RW_NODE_THRESH, DBG_PP_NODE_THRESH, DBG_CHECK_MODEL, DBG_CHECK_UNSAT_CORE, NUM_OPTS };
+  private static int swigNext = 0;
+  private final int swigValue;
+  private final String swigName;
+}
+
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
new file mode 100644
index 0000000000..9ee9ff77c3
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
@@ -0,0 +1,119 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Options {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected Options(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Options obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(Options obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        BitwuzlaNativeJNI.delete_Options(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public Options() {
+    this(BitwuzlaNativeJNI.new_Options__SWIG_0(), true);
+  }
+
+  public Options(Options options) {
+    this(BitwuzlaNativeJNI.new_Options__SWIG_1(Options.getCPtr(options), options), true);
+  }
+
+  public boolean is_valid(String name) {
+    return BitwuzlaNativeJNI.Options_is_valid(swigCPtr, this, name);
+  }
+
+  public boolean is_bool(Option option) {
+    return BitwuzlaNativeJNI.Options_is_bool(swigCPtr, this, option.swigValue());
+  }
+
+  public boolean is_numeric(Option option) {
+    return BitwuzlaNativeJNI.Options_is_numeric(swigCPtr, this, option.swigValue());
+  }
+
+  public boolean is_mode(Option option) {
+    return BitwuzlaNativeJNI.Options_is_mode(swigCPtr, this, option.swigValue());
+  }
+
+  public String shrt(Option option) {
+    return BitwuzlaNativeJNI.Options_shrt(swigCPtr, this, option.swigValue());
+  }
+
+  public String lng(Option option) {
+    return BitwuzlaNativeJNI.Options_lng(swigCPtr, this, option.swigValue());
+  }
+
+  public String description(Option option) {
+    return BitwuzlaNativeJNI.Options_description(swigCPtr, this, option.swigValue());
+  }
+
+  public Vector_String modes(Option option) {
+    return new Vector_String(BitwuzlaNativeJNI.Options_modes(swigCPtr, this, option.swigValue()), true);
+  }
+
+  public Option option(String name) {
+    return Option.swigToEnum(BitwuzlaNativeJNI.Options_option(swigCPtr, this, name));
+  }
+
+  public void set(Option option, String mode) {
+    BitwuzlaNativeJNI.Options_set__SWIG_0(swigCPtr, this, option.swigValue(), mode);
+  }
+
+  public void set(String lng, String value) {
+    BitwuzlaNativeJNI.Options_set__SWIG_1(swigCPtr, this, lng, value);
+  }
+
+  public void set(Vector_String args) {
+    BitwuzlaNativeJNI.Options_set__SWIG_2(swigCPtr, this, Vector_String.getCPtr(args), args);
+  }
+
+  public java.math.BigInteger get(Option option) {
+    return BitwuzlaNativeJNI.Options_get(swigCPtr, this, option.swigValue());
+  }
+
+  public String get_mode(Option option) {
+    return BitwuzlaNativeJNI.Options_get_mode(swigCPtr, this, option.swigValue());
+  }
+
+  public void set(Option option, int value) {
+    BitwuzlaNativeJNI.Options_set__SWIG_3(swigCPtr, this, option.swigValue(), value);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
new file mode 100644
index 0000000000..9b1eafbec6
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
@@ -0,0 +1,92 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Parser {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected Parser(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Parser obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(Parser obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        BitwuzlaNativeJNI.delete_Parser(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public Parser(TermManager tm, Options options, String language) {
+    this(BitwuzlaNativeJNI.new_Parser__SWIG_0(TermManager.getCPtr(tm), tm, Options.getCPtr(options), options, language), true);
+  }
+
+  public Parser(TermManager tm, Options options) {
+    this(BitwuzlaNativeJNI.new_Parser__SWIG_1(TermManager.getCPtr(tm), tm, Options.getCPtr(options), options), true);
+  }
+
+  public void parse(String input, boolean parse_only, boolean parse_file) {
+    BitwuzlaNativeJNI.Parser_parse__SWIG_0(swigCPtr, this, input, parse_only, parse_file);
+  }
+
+  public void parse(String input, boolean parse_only) {
+    BitwuzlaNativeJNI.Parser_parse__SWIG_1(swigCPtr, this, input, parse_only);
+  }
+
+  public void parse(String input) {
+    BitwuzlaNativeJNI.Parser_parse__SWIG_2(swigCPtr, this, input);
+  }
+
+  public Term parse_term(String input) {
+    return new Term(BitwuzlaNativeJNI.Parser_parse_term(swigCPtr, this, input), true);
+  }
+
+  public Sort parse_sort(String input) {
+    return new Sort(BitwuzlaNativeJNI.Parser_parse_sort(swigCPtr, this, input), true);
+  }
+
+  public Vector_Sort get_declared_sorts() {
+    return new Vector_Sort(BitwuzlaNativeJNI.Parser_get_declared_sorts(swigCPtr, this), true);
+  }
+
+  public Vector_Term get_declared_funs() {
+    return new Vector_Term(BitwuzlaNativeJNI.Parser_get_declared_funs(swigCPtr, this), true);
+  }
+
+  public Bitwuzla bitwuzla() {
+    long cPtr = BitwuzlaNativeJNI.Parser_bitwuzla(swigCPtr, this);
+    return (cPtr == 0) ? null : new Bitwuzla(cPtr, true);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java
new file mode 100644
index 0000000000..7846736e90
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java
@@ -0,0 +1,55 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public final class Result {
+  public final static Result SAT = new Result("SAT", BitwuzlaNativeJNI.Result_SAT_get());
+  public final static Result UNSAT = new Result("UNSAT", BitwuzlaNativeJNI.Result_UNSAT_get());
+  public final static Result UNKNOWN = new Result("UNKNOWN", BitwuzlaNativeJNI.Result_UNKNOWN_get());
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public String toString() {
+    return swigName;
+  }
+
+  public static Result swigToEnum(int swigValue) {
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (int i = 0; i < swigValues.length; i++)
+      if (swigValues[i].swigValue == swigValue)
+        return swigValues[i];
+    throw new IllegalArgumentException("No enum " + Result.class + " with value " + swigValue);
+  }
+
+  private Result(String swigName) {
+    this.swigName = swigName;
+    this.swigValue = swigNext++;
+  }
+
+  private Result(String swigName, int swigValue) {
+    this.swigName = swigName;
+    this.swigValue = swigValue;
+    swigNext = swigValue+1;
+  }
+
+  private Result(String swigName, Result swigEnum) {
+    this.swigName = swigName;
+    this.swigValue = swigEnum.swigValue;
+    swigNext = this.swigValue+1;
+  }
+
+  private static Result[] swigValues = { SAT, UNSAT, UNKNOWN };
+  private static int swigNext = 0;
+  private final int swigValue;
+  private final String swigName;
+}
+
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java
new file mode 100644
index 0000000000..aaf46475ac
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java
@@ -0,0 +1,57 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public final class RoundingMode {
+  public final static RoundingMode RNE = new RoundingMode("RNE", BitwuzlaNativeJNI.RoundingMode_RNE_get());
+  public final static RoundingMode RNA = new RoundingMode("RNA", BitwuzlaNativeJNI.RoundingMode_RNA_get());
+  public final static RoundingMode RTN = new RoundingMode("RTN", BitwuzlaNativeJNI.RoundingMode_RTN_get());
+  public final static RoundingMode RTP = new RoundingMode("RTP", BitwuzlaNativeJNI.RoundingMode_RTP_get());
+  public final static RoundingMode RTZ = new RoundingMode("RTZ", BitwuzlaNativeJNI.RoundingMode_RTZ_get());
+
+  public final int swigValue() {
+    return swigValue;
+  }
+
+  public String toString() {
+    return swigName;
+  }
+
+  public static RoundingMode swigToEnum(int swigValue) {
+    if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue)
+      return swigValues[swigValue];
+    for (int i = 0; i < swigValues.length; i++)
+      if (swigValues[i].swigValue == swigValue)
+        return swigValues[i];
+    throw new IllegalArgumentException("No enum " + RoundingMode.class + " with value " + swigValue);
+  }
+
+  private RoundingMode(String swigName) {
+    this.swigName = swigName;
+    this.swigValue = swigNext++;
+  }
+
+  private RoundingMode(String swigName, int swigValue) {
+    this.swigName = swigName;
+    this.swigValue = swigValue;
+    swigNext = swigValue+1;
+  }
+
+  private RoundingMode(String swigName, RoundingMode swigEnum) {
+    this.swigName = swigName;
+    this.swigValue = swigEnum.swigValue;
+    swigNext = this.swigValue+1;
+  }
+
+  private static RoundingMode[] swigValues = { RNE, RNA, RTN, RTP, RTZ };
+  private static int swigNext = 0;
+  private final int swigValue;
+  private final String swigName;
+}
+
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
new file mode 100644
index 0000000000..f4aeeb0aa3
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
@@ -0,0 +1,139 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Sort {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected Sort(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Sort obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(Sort obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        BitwuzlaNativeJNI.delete_Sort(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public boolean equals(Object object) {
+    if(object instanceof Sort) {
+      Sort that = (Sort) object;
+      return this.isEqual(that);
+    }
+    return false;
+  }
+
+  public Sort() {
+    this(BitwuzlaNativeJNI.new_Sort(), true);
+  }
+
+  public boolean is_null() {
+    return BitwuzlaNativeJNI.Sort_is_null(swigCPtr, this);
+  }
+
+  public Sort array_index() {
+    return new Sort(BitwuzlaNativeJNI.Sort_array_index(swigCPtr, this), true);
+  }
+
+  public Sort array_element() {
+    return new Sort(BitwuzlaNativeJNI.Sort_array_element(swigCPtr, this), true);
+  }
+
+  public Vector_Sort fun_domain() {
+    return new Vector_Sort(BitwuzlaNativeJNI.Sort_fun_domain(swigCPtr, this), true);
+  }
+
+  public Sort fun_codomain() {
+    return new Sort(BitwuzlaNativeJNI.Sort_fun_codomain(swigCPtr, this), true);
+  }
+
+  public boolean is_array() {
+    return BitwuzlaNativeJNI.Sort_is_array(swigCPtr, this);
+  }
+
+  public boolean is_bool() {
+    return BitwuzlaNativeJNI.Sort_is_bool(swigCPtr, this);
+  }
+
+  public boolean is_bv() {
+    return BitwuzlaNativeJNI.Sort_is_bv(swigCPtr, this);
+  }
+
+  public boolean is_fp() {
+    return BitwuzlaNativeJNI.Sort_is_fp(swigCPtr, this);
+  }
+
+  public boolean is_fun() {
+    return BitwuzlaNativeJNI.Sort_is_fun(swigCPtr, this);
+  }
+
+  public boolean is_rm() {
+    return BitwuzlaNativeJNI.Sort_is_rm(swigCPtr, this);
+  }
+
+  public String toString() {
+    return BitwuzlaNativeJNI.Sort_toString(swigCPtr, this);
+  }
+
+  public int id() {
+    return BitwuzlaNativeJNI.Sort_id(swigCPtr, this);
+  }
+
+  public int bv_size() {
+    return BitwuzlaNativeJNI.Sort_bv_size(swigCPtr, this);
+  }
+
+  public int fp_exp_size() {
+    return BitwuzlaNativeJNI.Sort_fp_exp_size(swigCPtr, this);
+  }
+
+  public int fp_sig_size() {
+    return BitwuzlaNativeJNI.Sort_fp_sig_size(swigCPtr, this);
+  }
+
+  public int fun_arity() {
+    return BitwuzlaNativeJNI.Sort_fun_arity(swigCPtr, this);
+  }
+
+  public int hashCode() {
+    return BitwuzlaNativeJNI.Sort_hashCode(swigCPtr, this);
+  }
+
+  public boolean isEqual(Sort other) {
+    return BitwuzlaNativeJNI.Sort_isEqual(swigCPtr, this, Sort.getCPtr(other), other);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
new file mode 100644
index 0000000000..074f00e709
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
@@ -0,0 +1,211 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Term {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected Term(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Term obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(Term obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        //BitwuzlaNativeJNI.delete_Term(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public boolean equals(Object object) {
+    if(object instanceof Term) {
+      Term that = (Term) object;
+      return this.isEqual(that);
+    }
+    return false;
+  }
+
+  public Term() {
+    this(BitwuzlaNativeJNI.new_Term(), true);
+  }
+
+  public boolean is_null() {
+    return BitwuzlaNativeJNI.Term_is_null(swigCPtr, this);
+  }
+
+  public Kind kind() {
+    return Kind.swigToEnum(BitwuzlaNativeJNI.Term_kind(swigCPtr, this));
+  }
+
+  public Sort sort() {
+    return new Sort(BitwuzlaNativeJNI.Term_sort(swigCPtr, this), true);
+  }
+
+  public long num_children() {
+    return BitwuzlaNativeJNI.Term_num_children(swigCPtr, this);
+  }
+
+  public Vector_Term children() {
+    return new Vector_Term(BitwuzlaNativeJNI.Term_children(swigCPtr, this), true);
+  }
+
+  public Term get(long index) {
+    return new Term(BitwuzlaNativeJNI.Term_get(swigCPtr, this, index), true);
+  }
+
+  public long num_indices() {
+    return BitwuzlaNativeJNI.Term_num_indices(swigCPtr, this);
+  }
+
+  public boolean is_const() {
+    return BitwuzlaNativeJNI.Term_is_const(swigCPtr, this);
+  }
+
+  public boolean is_variable() {
+    return BitwuzlaNativeJNI.Term_is_variable(swigCPtr, this);
+  }
+
+  public boolean is_value() {
+    return BitwuzlaNativeJNI.Term_is_value(swigCPtr, this);
+  }
+
+  public boolean is_true() {
+    return BitwuzlaNativeJNI.Term_is_true(swigCPtr, this);
+  }
+
+  public boolean is_false() {
+    return BitwuzlaNativeJNI.Term_is_false(swigCPtr, this);
+  }
+
+  public boolean is_bv_value_zero() {
+    return BitwuzlaNativeJNI.Term_is_bv_value_zero(swigCPtr, this);
+  }
+
+  public boolean is_bv_value_one() {
+    return BitwuzlaNativeJNI.Term_is_bv_value_one(swigCPtr, this);
+  }
+
+  public boolean is_bv_value_ones() {
+    return BitwuzlaNativeJNI.Term_is_bv_value_ones(swigCPtr, this);
+  }
+
+  public boolean is_bv_value_min_signed() {
+    return BitwuzlaNativeJNI.Term_is_bv_value_min_signed(swigCPtr, this);
+  }
+
+  public boolean is_bv_value_max_signed() {
+    return BitwuzlaNativeJNI.Term_is_bv_value_max_signed(swigCPtr, this);
+  }
+
+  public boolean is_fp_value_pos_zero() {
+    return BitwuzlaNativeJNI.Term_is_fp_value_pos_zero(swigCPtr, this);
+  }
+
+  public boolean is_fp_value_neg_zero() {
+    return BitwuzlaNativeJNI.Term_is_fp_value_neg_zero(swigCPtr, this);
+  }
+
+  public boolean is_fp_value_pos_inf() {
+    return BitwuzlaNativeJNI.Term_is_fp_value_pos_inf(swigCPtr, this);
+  }
+
+  public boolean is_fp_value_neg_inf() {
+    return BitwuzlaNativeJNI.Term_is_fp_value_neg_inf(swigCPtr, this);
+  }
+
+  public boolean is_fp_value_nan() {
+    return BitwuzlaNativeJNI.Term_is_fp_value_nan(swigCPtr, this);
+  }
+
+  public boolean is_rm_value_rna() {
+    return BitwuzlaNativeJNI.Term_is_rm_value_rna(swigCPtr, this);
+  }
+
+  public boolean is_rm_value_rne() {
+    return BitwuzlaNativeJNI.Term_is_rm_value_rne(swigCPtr, this);
+  }
+
+  public boolean is_rm_value_rtn() {
+    return BitwuzlaNativeJNI.Term_is_rm_value_rtn(swigCPtr, this);
+  }
+
+  public boolean is_rm_value_rtp() {
+    return BitwuzlaNativeJNI.Term_is_rm_value_rtp(swigCPtr, this);
+  }
+
+  public boolean is_rm_value_rtz() {
+    return BitwuzlaNativeJNI.Term_is_rm_value_rtz(swigCPtr, this);
+  }
+
+  public String toString(short base) {
+    return BitwuzlaNativeJNI.Term_toString__SWIG_0(swigCPtr, this, base);
+  }
+
+  public String toString() {
+    return BitwuzlaNativeJNI.Term_toString__SWIG_1(swigCPtr, this);
+  }
+
+  public int id() {
+    return BitwuzlaNativeJNI.Term_id(swigCPtr, this);
+  }
+
+  public Vector_Int indices() {
+    return new Vector_Int(BitwuzlaNativeJNI.Term_indices(swigCPtr, this), true);
+  }
+
+  public String symbol() {
+    return BitwuzlaNativeJNI.Term_symbol(swigCPtr, this);
+  }
+
+  public boolean to_bool() {
+    return BitwuzlaNativeJNI.Term_to_bool(swigCPtr, this);
+  }
+
+  public RoundingMode to_rm() {
+    return RoundingMode.swigToEnum(BitwuzlaNativeJNI.Term_to_rm(swigCPtr, this));
+  }
+
+  public String to_bv() {
+    return BitwuzlaNativeJNI.Term_to_bv(swigCPtr, this);
+  }
+
+  public int hashCode() {
+    return BitwuzlaNativeJNI.Term_hashCode(swigCPtr, this);
+  }
+
+  public boolean isEqual(Term other) {
+    return BitwuzlaNativeJNI.Term_isEqual(swigCPtr, this, Term.getCPtr(other), other);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java
new file mode 100644
index 0000000000..fe8f3f9766
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java
@@ -0,0 +1,207 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class TermManager {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected TermManager(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(TermManager obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(TermManager obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        //BitwuzlaNativeJNI.delete_TermManager(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public TermManager() {
+    this(BitwuzlaNativeJNI.new_TermManager(), true);
+  }
+
+  public Sort mk_array_sort(Sort index, Sort element) {
+    return new Sort(BitwuzlaNativeJNI.TermManager_mk_array_sort(swigCPtr, this, Sort.getCPtr(index), index, Sort.getCPtr(element), element), true);
+  }
+
+  public Sort mk_bool_sort() {
+    return new Sort(BitwuzlaNativeJNI.TermManager_mk_bool_sort(swigCPtr, this), true);
+  }
+
+  public Sort mk_fun_sort(Vector_Sort domain, Sort codomain) {
+    return new Sort(BitwuzlaNativeJNI.TermManager_mk_fun_sort(swigCPtr, this, Vector_Sort.getCPtr(domain), domain, Sort.getCPtr(codomain), codomain), true);
+  }
+
+  public Term mk_true() {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_true(swigCPtr, this), true);
+  }
+
+  public Term mk_false() {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_false(swigCPtr, this), true);
+  }
+
+  public Term mk_bv_zero(Sort sort) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_bv_zero(swigCPtr, this, Sort.getCPtr(sort), sort), true);
+  }
+
+  public Term mk_bv_one(Sort sort) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_bv_one(swigCPtr, this, Sort.getCPtr(sort), sort), true);
+  }
+
+  public Term mk_bv_ones(Sort sort) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_bv_ones(swigCPtr, this, Sort.getCPtr(sort), sort), true);
+  }
+
+  public Term mk_bv_min_signed(Sort sort) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_bv_min_signed(swigCPtr, this, Sort.getCPtr(sort), sort), true);
+  }
+
+  public Term mk_bv_max_signed(Sort sort) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_bv_max_signed(swigCPtr, this, Sort.getCPtr(sort), sort), true);
+  }
+
+  public Term mk_bv_value(Sort sort, String value, short base) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_bv_value__SWIG_0(swigCPtr, this, Sort.getCPtr(sort), sort, value, base), true);
+  }
+
+  public Term mk_bv_value(Sort sort, String value) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_bv_value__SWIG_1(swigCPtr, this, Sort.getCPtr(sort), sort, value), true);
+  }
+
+  public Term mk_bv_value_uint64(Sort sort, java.math.BigInteger value) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_bv_value_uint64(swigCPtr, this, Sort.getCPtr(sort), sort, value), true);
+  }
+
+  public Term mk_bv_value_int64(Sort sort, long value) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_bv_value_int64(swigCPtr, this, Sort.getCPtr(sort), sort, value), true);
+  }
+
+  public Term mk_fp_pos_zero(Sort sort) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_fp_pos_zero(swigCPtr, this, Sort.getCPtr(sort), sort), true);
+  }
+
+  public Term mk_fp_neg_zero(Sort sort) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_fp_neg_zero(swigCPtr, this, Sort.getCPtr(sort), sort), true);
+  }
+
+  public Term mk_fp_pos_inf(Sort sort) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_fp_pos_inf(swigCPtr, this, Sort.getCPtr(sort), sort), true);
+  }
+
+  public Term mk_fp_neg_inf(Sort sort) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_fp_neg_inf(swigCPtr, this, Sort.getCPtr(sort), sort), true);
+  }
+
+  public Term mk_fp_nan(Sort sort) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_fp_nan(swigCPtr, this, Sort.getCPtr(sort), sort), true);
+  }
+
+  public Term mk_fp_value(Term bv_sign, Term bv_exponent, Term bv_significand) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_fp_value__SWIG_0(swigCPtr, this, Term.getCPtr(bv_sign), bv_sign, Term.getCPtr(bv_exponent), bv_exponent, Term.getCPtr(bv_significand), bv_significand), true);
+  }
+
+  public Term mk_fp_value(Sort sort, Term rm, String real) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_fp_value__SWIG_1(swigCPtr, this, Sort.getCPtr(sort), sort, Term.getCPtr(rm), rm, real), true);
+  }
+
+  public Term mk_fp_value(Sort sort, Term rm, String num, String den) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_fp_value__SWIG_2(swigCPtr, this, Sort.getCPtr(sort), sort, Term.getCPtr(rm), rm, num, den), true);
+  }
+
+  public Term mk_const_array(Sort sort, Term term) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_const_array(swigCPtr, this, Sort.getCPtr(sort), sort, Term.getCPtr(term), term), true);
+  }
+
+  public Term mk_rm_value(RoundingMode rm) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_rm_value(swigCPtr, this, rm.swigValue()), true);
+  }
+
+  public Term substitute_term(Term term, Map_TermTerm map) {
+    return new Term(BitwuzlaNativeJNI.TermManager_substitute_term(swigCPtr, this, Term.getCPtr(term), term, Map_TermTerm.getCPtr(map), map), true);
+  }
+
+  public void substitute_terms(Vector_Term terms, Map_TermTerm map) {
+    BitwuzlaNativeJNI.TermManager_substitute_terms(swigCPtr, this, Vector_Term.getCPtr(terms), terms, Map_TermTerm.getCPtr(map), map);
+  }
+
+  public Sort mk_bv_sort(int size) {
+    return new Sort(BitwuzlaNativeJNI.TermManager_mk_bv_sort(swigCPtr, this, size), true);
+  }
+
+  public Sort mk_fp_sort(int exp_size, int sig_size) {
+    return new Sort(BitwuzlaNativeJNI.TermManager_mk_fp_sort(swigCPtr, this, exp_size, sig_size), true);
+  }
+
+  public Term mk_term(Kind kind, Term t1) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_term__SWIG_0(swigCPtr, this, kind.swigValue(), Term.getCPtr(t1), t1), true);
+  }
+
+  public Term mk_term(Kind kind, Term t1, int i1) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_term__SWIG_1(swigCPtr, this, kind.swigValue(), Term.getCPtr(t1), t1, i1), true);
+  }
+
+  public Term mk_term(Kind kind, Term t1, int i1, int i2) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_term__SWIG_2(swigCPtr, this, kind.swigValue(), Term.getCPtr(t1), t1, i1, i2), true);
+  }
+
+  public Term mk_term(Kind kind, Term t1, Term t2) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_term__SWIG_3(swigCPtr, this, kind.swigValue(), Term.getCPtr(t1), t1, Term.getCPtr(t2), t2), true);
+  }
+
+  public Term mk_term(Kind kind, Term t1, Term t2, int i1) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_term__SWIG_4(swigCPtr, this, kind.swigValue(), Term.getCPtr(t1), t1, Term.getCPtr(t2), t2, i1), true);
+  }
+
+  public Term mk_term(Kind kind, Term t1, Term t2, int i1, int i2) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_term__SWIG_5(swigCPtr, this, kind.swigValue(), Term.getCPtr(t1), t1, Term.getCPtr(t2), t2, i1, i2), true);
+  }
+
+  public Term mk_term(Kind kind, Term t1, Term t2, Term t3) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_term__SWIG_6(swigCPtr, this, kind.swigValue(), Term.getCPtr(t1), t1, Term.getCPtr(t2), t2, Term.getCPtr(t3), t3), true);
+  }
+
+  public Term mk_term(Kind kind, Vector_Term args, Vector_Int indices) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_term__SWIG_7(swigCPtr, this, kind.swigValue(), Vector_Term.getCPtr(args), args, Vector_Int.getCPtr(indices), indices), true);
+  }
+
+  public Term mk_const(Sort sort, String symbol) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_const(swigCPtr, this, Sort.getCPtr(sort), sort, symbol), true);
+  }
+
+  public Term mk_var(Sort sort, String symbol) {
+    return new Term(BitwuzlaNativeJNI.TermManager_mk_var(swigCPtr, this, Sort.getCPtr(sort), sort, symbol), true);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
new file mode 100644
index 0000000000..8b14041dd5
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
@@ -0,0 +1,75 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Terminator {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected Terminator(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Terminator obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(Terminator obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        BitwuzlaNativeJNI.delete_Terminator(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  protected void swigDirectorDisconnect() {
+    swigCMemOwn = false;
+    delete();
+  }
+
+  public void swigReleaseOwnership() {
+    swigCMemOwn = false;
+    BitwuzlaNativeJNI.Terminator_change_ownership(this, swigCPtr, false);
+  }
+
+  public void swigTakeOwnership() {
+    swigCMemOwn = true;
+    BitwuzlaNativeJNI.Terminator_change_ownership(this, swigCPtr, true);
+  }
+
+  public boolean terminate() {
+    return BitwuzlaNativeJNI.Terminator_terminate(swigCPtr, this);
+  }
+
+  public Terminator() {
+    this(BitwuzlaNativeJNI.new_Terminator(), true);
+    BitwuzlaNativeJNI.Terminator_director_connect(this, swigCPtr, true, true);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
new file mode 100644
index 0000000000..7efbe6f543
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
@@ -0,0 +1,156 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Vector_Int extends java.util.AbstractList<Integer> implements java.util.RandomAccess {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected Vector_Int(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Vector_Int obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(Vector_Int obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        BitwuzlaNativeJNI.delete_Vector_Int(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public Vector_Int(int[] initialElements) {
+    this();
+    reserve(initialElements.length);
+
+    for (int element : initialElements) {
+      add(element);
+    }
+  }
+
+  public Vector_Int(Iterable<Integer> initialElements) {
+    this();
+    for (int element : initialElements) {
+      add(element);
+    }
+  }
+
+  public Integer get(int index) {
+    return doGet(index);
+  }
+
+  public Integer set(int index, Integer e) {
+    return doSet(index, e);
+  }
+
+  public boolean add(Integer e) {
+    modCount++;
+    doAdd(e);
+    return true;
+  }
+
+  public void add(int index, Integer e) {
+    modCount++;
+    doAdd(index, e);
+  }
+
+  public Integer remove(int index) {
+    modCount++;
+    return doRemove(index);
+  }
+
+  protected void removeRange(int fromIndex, int toIndex) {
+    modCount++;
+    doRemoveRange(fromIndex, toIndex);
+  }
+
+  public int size() {
+    return doSize();
+  }
+
+  public Vector_Int() {
+    this(BitwuzlaNativeJNI.new_Vector_Int__SWIG_0(), true);
+  }
+
+  public Vector_Int(Vector_Int other) {
+    this(BitwuzlaNativeJNI.new_Vector_Int__SWIG_1(Vector_Int.getCPtr(other), other), true);
+  }
+
+  public long capacity() {
+    return BitwuzlaNativeJNI.Vector_Int_capacity(swigCPtr, this);
+  }
+
+  public void reserve(long n) {
+    BitwuzlaNativeJNI.Vector_Int_reserve(swigCPtr, this, n);
+  }
+
+  public boolean isEmpty() {
+    return BitwuzlaNativeJNI.Vector_Int_isEmpty(swigCPtr, this);
+  }
+
+  public void clear() {
+    BitwuzlaNativeJNI.Vector_Int_clear(swigCPtr, this);
+  }
+
+  public Vector_Int(int count, int value) {
+    this(BitwuzlaNativeJNI.new_Vector_Int__SWIG_2(count, value), true);
+  }
+
+  private int doSize() {
+    return BitwuzlaNativeJNI.Vector_Int_doSize(swigCPtr, this);
+  }
+
+  private void doAdd(int x) {
+    BitwuzlaNativeJNI.Vector_Int_doAdd__SWIG_0(swigCPtr, this, x);
+  }
+
+  private void doAdd(int index, int x) {
+    BitwuzlaNativeJNI.Vector_Int_doAdd__SWIG_1(swigCPtr, this, index, x);
+  }
+
+  private int doRemove(int index) {
+    return BitwuzlaNativeJNI.Vector_Int_doRemove(swigCPtr, this, index);
+  }
+
+  private int doGet(int index) {
+    return BitwuzlaNativeJNI.Vector_Int_doGet(swigCPtr, this, index);
+  }
+
+  private int doSet(int index, int val) {
+    return BitwuzlaNativeJNI.Vector_Int_doSet(swigCPtr, this, index, val);
+  }
+
+  private void doRemoveRange(int fromIndex, int toIndex) {
+    BitwuzlaNativeJNI.Vector_Int_doRemoveRange(swigCPtr, this, fromIndex, toIndex);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
new file mode 100644
index 0000000000..5243342402
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
@@ -0,0 +1,156 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Vector_Sort extends java.util.AbstractList<Sort> implements java.util.RandomAccess {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected Vector_Sort(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Vector_Sort obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(Vector_Sort obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        BitwuzlaNativeJNI.delete_Vector_Sort(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public Vector_Sort(Sort[] initialElements) {
+    this();
+    reserve(initialElements.length);
+
+    for (Sort element : initialElements) {
+      add(element);
+    }
+  }
+
+  public Vector_Sort(Iterable<Sort> initialElements) {
+    this();
+    for (Sort element : initialElements) {
+      add(element);
+    }
+  }
+
+  public Sort get(int index) {
+    return doGet(index);
+  }
+
+  public Sort set(int index, Sort e) {
+    return doSet(index, e);
+  }
+
+  public boolean add(Sort e) {
+    modCount++;
+    doAdd(e);
+    return true;
+  }
+
+  public void add(int index, Sort e) {
+    modCount++;
+    doAdd(index, e);
+  }
+
+  public Sort remove(int index) {
+    modCount++;
+    return doRemove(index);
+  }
+
+  protected void removeRange(int fromIndex, int toIndex) {
+    modCount++;
+    doRemoveRange(fromIndex, toIndex);
+  }
+
+  public int size() {
+    return doSize();
+  }
+
+  public Vector_Sort() {
+    this(BitwuzlaNativeJNI.new_Vector_Sort__SWIG_0(), true);
+  }
+
+  public Vector_Sort(Vector_Sort other) {
+    this(BitwuzlaNativeJNI.new_Vector_Sort__SWIG_1(Vector_Sort.getCPtr(other), other), true);
+  }
+
+  public long capacity() {
+    return BitwuzlaNativeJNI.Vector_Sort_capacity(swigCPtr, this);
+  }
+
+  public void reserve(long n) {
+    BitwuzlaNativeJNI.Vector_Sort_reserve(swigCPtr, this, n);
+  }
+
+  public boolean isEmpty() {
+    return BitwuzlaNativeJNI.Vector_Sort_isEmpty(swigCPtr, this);
+  }
+
+  public void clear() {
+    BitwuzlaNativeJNI.Vector_Sort_clear(swigCPtr, this);
+  }
+
+  public Vector_Sort(int count, Sort value) {
+    this(BitwuzlaNativeJNI.new_Vector_Sort__SWIG_2(count, Sort.getCPtr(value), value), true);
+  }
+
+  private int doSize() {
+    return BitwuzlaNativeJNI.Vector_Sort_doSize(swigCPtr, this);
+  }
+
+  private void doAdd(Sort x) {
+    BitwuzlaNativeJNI.Vector_Sort_doAdd__SWIG_0(swigCPtr, this, Sort.getCPtr(x), x);
+  }
+
+  private void doAdd(int index, Sort x) {
+    BitwuzlaNativeJNI.Vector_Sort_doAdd__SWIG_1(swigCPtr, this, index, Sort.getCPtr(x), x);
+  }
+
+  private Sort doRemove(int index) {
+    return new Sort(BitwuzlaNativeJNI.Vector_Sort_doRemove(swigCPtr, this, index), true);
+  }
+
+  private Sort doGet(int index) {
+    return new Sort(BitwuzlaNativeJNI.Vector_Sort_doGet(swigCPtr, this, index), false);
+  }
+
+  private Sort doSet(int index, Sort val) {
+    return new Sort(BitwuzlaNativeJNI.Vector_Sort_doSet(swigCPtr, this, index, Sort.getCPtr(val), val), true);
+  }
+
+  private void doRemoveRange(int fromIndex, int toIndex) {
+    BitwuzlaNativeJNI.Vector_Sort_doRemoveRange(swigCPtr, this, fromIndex, toIndex);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
new file mode 100644
index 0000000000..892450e496
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
@@ -0,0 +1,156 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Vector_String extends java.util.AbstractList<String> implements java.util.RandomAccess {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected Vector_String(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Vector_String obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(Vector_String obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        BitwuzlaNativeJNI.delete_Vector_String(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public Vector_String(String[] initialElements) {
+    this();
+    reserve(initialElements.length);
+
+    for (String element : initialElements) {
+      add(element);
+    }
+  }
+
+  public Vector_String(Iterable<String> initialElements) {
+    this();
+    for (String element : initialElements) {
+      add(element);
+    }
+  }
+
+  public String get(int index) {
+    return doGet(index);
+  }
+
+  public String set(int index, String e) {
+    return doSet(index, e);
+  }
+
+  public boolean add(String e) {
+    modCount++;
+    doAdd(e);
+    return true;
+  }
+
+  public void add(int index, String e) {
+    modCount++;
+    doAdd(index, e);
+  }
+
+  public String remove(int index) {
+    modCount++;
+    return doRemove(index);
+  }
+
+  protected void removeRange(int fromIndex, int toIndex) {
+    modCount++;
+    doRemoveRange(fromIndex, toIndex);
+  }
+
+  public int size() {
+    return doSize();
+  }
+
+  public Vector_String() {
+    this(BitwuzlaNativeJNI.new_Vector_String__SWIG_0(), true);
+  }
+
+  public Vector_String(Vector_String other) {
+    this(BitwuzlaNativeJNI.new_Vector_String__SWIG_1(Vector_String.getCPtr(other), other), true);
+  }
+
+  public long capacity() {
+    return BitwuzlaNativeJNI.Vector_String_capacity(swigCPtr, this);
+  }
+
+  public void reserve(long n) {
+    BitwuzlaNativeJNI.Vector_String_reserve(swigCPtr, this, n);
+  }
+
+  public boolean isEmpty() {
+    return BitwuzlaNativeJNI.Vector_String_isEmpty(swigCPtr, this);
+  }
+
+  public void clear() {
+    BitwuzlaNativeJNI.Vector_String_clear(swigCPtr, this);
+  }
+
+  public Vector_String(int count, String value) {
+    this(BitwuzlaNativeJNI.new_Vector_String__SWIG_2(count, value), true);
+  }
+
+  private int doSize() {
+    return BitwuzlaNativeJNI.Vector_String_doSize(swigCPtr, this);
+  }
+
+  private void doAdd(String x) {
+    BitwuzlaNativeJNI.Vector_String_doAdd__SWIG_0(swigCPtr, this, x);
+  }
+
+  private void doAdd(int index, String x) {
+    BitwuzlaNativeJNI.Vector_String_doAdd__SWIG_1(swigCPtr, this, index, x);
+  }
+
+  private String doRemove(int index) {
+    return BitwuzlaNativeJNI.Vector_String_doRemove(swigCPtr, this, index);
+  }
+
+  private String doGet(int index) {
+    return BitwuzlaNativeJNI.Vector_String_doGet(swigCPtr, this, index);
+  }
+
+  private String doSet(int index, String val) {
+    return BitwuzlaNativeJNI.Vector_String_doSet(swigCPtr, this, index, val);
+  }
+
+  private void doRemoveRange(int fromIndex, int toIndex) {
+    BitwuzlaNativeJNI.Vector_String_doRemoveRange(swigCPtr, this, fromIndex, toIndex);
+  }
+
+}
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
new file mode 100644
index 0000000000..48f0ce3292
--- /dev/null
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
@@ -0,0 +1,156 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
+ *
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.sosy_lab.java_smt.solvers.bitwuzla.api;
+
+public class Vector_Term extends java.util.AbstractList<Term> implements java.util.RandomAccess {
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
+
+  protected Vector_Term(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Vector_Term obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected static long swigRelease(Vector_Term obj) {
+    long ptr = 0;
+    if (obj != null) {
+      if (!obj.swigCMemOwn)
+        throw new RuntimeException("Cannot release ownership as memory is not owned");
+      ptr = obj.swigCPtr;
+      obj.swigCMemOwn = false;
+      obj.delete();
+    }
+    return ptr;
+  }
+
+  @SuppressWarnings("deprecation")
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        //BitwuzlaNativeJNI.delete_Vector_Term(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public Vector_Term(Term[] initialElements) {
+    this();
+    reserve(initialElements.length);
+
+    for (Term element : initialElements) {
+      add(element);
+    }
+  }
+
+  public Vector_Term(Iterable<Term> initialElements) {
+    this();
+    for (Term element : initialElements) {
+      add(element);
+    }
+  }
+
+  public Term get(int index) {
+    return doGet(index);
+  }
+
+  public Term set(int index, Term e) {
+    return doSet(index, e);
+  }
+
+  public boolean add(Term e) {
+    modCount++;
+    doAdd(e);
+    return true;
+  }
+
+  public void add(int index, Term e) {
+    modCount++;
+    doAdd(index, e);
+  }
+
+  public Term remove(int index) {
+    modCount++;
+    return doRemove(index);
+  }
+
+  protected void removeRange(int fromIndex, int toIndex) {
+    modCount++;
+    doRemoveRange(fromIndex, toIndex);
+  }
+
+  public int size() {
+    return doSize();
+  }
+
+  public Vector_Term() {
+    this(BitwuzlaNativeJNI.new_Vector_Term__SWIG_0(), true);
+  }
+
+  public Vector_Term(Vector_Term other) {
+    this(BitwuzlaNativeJNI.new_Vector_Term__SWIG_1(Vector_Term.getCPtr(other), other), true);
+  }
+
+  public long capacity() {
+    return BitwuzlaNativeJNI.Vector_Term_capacity(swigCPtr, this);
+  }
+
+  public void reserve(long n) {
+    BitwuzlaNativeJNI.Vector_Term_reserve(swigCPtr, this, n);
+  }
+
+  public boolean isEmpty() {
+    return BitwuzlaNativeJNI.Vector_Term_isEmpty(swigCPtr, this);
+  }
+
+  public void clear() {
+    BitwuzlaNativeJNI.Vector_Term_clear(swigCPtr, this);
+  }
+
+  public Vector_Term(int count, Term value) {
+    this(BitwuzlaNativeJNI.new_Vector_Term__SWIG_2(count, Term.getCPtr(value), value), true);
+  }
+
+  private int doSize() {
+    return BitwuzlaNativeJNI.Vector_Term_doSize(swigCPtr, this);
+  }
+
+  private void doAdd(Term x) {
+    BitwuzlaNativeJNI.Vector_Term_doAdd__SWIG_0(swigCPtr, this, Term.getCPtr(x), x);
+  }
+
+  private void doAdd(int index, Term x) {
+    BitwuzlaNativeJNI.Vector_Term_doAdd__SWIG_1(swigCPtr, this, index, Term.getCPtr(x), x);
+  }
+
+  private Term doRemove(int index) {
+    return new Term(BitwuzlaNativeJNI.Vector_Term_doRemove(swigCPtr, this, index), true);
+  }
+
+  private Term doGet(int index) {
+    return new Term(BitwuzlaNativeJNI.Vector_Term_doGet(swigCPtr, this, index), false);
+  }
+
+  private Term doSet(int index, Term val) {
+    return new Term(BitwuzlaNativeJNI.Vector_Term_doSet(swigCPtr, this, index, Term.getCPtr(val), val), true);
+  }
+
+  private void doRemoveRange(int fromIndex, int toIndex) {
+    BitwuzlaNativeJNI.Vector_Term_doRemoveRange(swigCPtr, this, fromIndex, toIndex);
+  }
+
+}

From 961a4efbcef3aa32bda247106fffc5f27242ac0e Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 10 Apr 2024 00:10:03 +0200
Subject: [PATCH 099/158] Bitwuzla: Fixed test parseDeclareRedundantBv for
 MathSAT5 by using a less trivial formula to parse. MathSAT would reduce the
 old formula to just "true", causing the failure.

---
 .../java_smt/test/SolverFormulaIODeclarationsTest.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java b/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
index cd8540dff6..2ea0975084 100644
--- a/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverFormulaIODeclarationsTest.java
@@ -165,8 +165,9 @@ public void parseDeclareRedundantTest2() {
   public void parseDeclareRedundantBvTest() {
     requireBitvectors();
     BitvectorFormula var = bvmgr.makeVariable(8, "x");
-    String query = "(declare-fun x () (_ BitVec 8))(declare-fun x () (_ BitVec 8))(assert (= x x))";
-    if (EnumSet.of(Solvers.BITWUZLA).contains(solverToUse())) {
+    String query =
+        "(declare-fun x () (_ BitVec 8))(declare-fun x () (_ BitVec 8))(assert (= x #b00000000))";
+    if (EnumSet.of(Solvers.MATHSAT5, Solvers.BITWUZLA).contains(solverToUse())) {
       BooleanFormula formula = mgr.parse(query);
       Truth.assertThat(mgr.extractVariables(formula).values()).containsExactly(var);
     } else {

From 0df9aca06ab361a7c4bcb680be9588cbe865f7ea Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 10 Apr 2024 00:50:13 +0200
Subject: [PATCH 100/158] Bitwuzla: Fixed the build script.

---
 build/build-publish-solvers/solver-bitwuzla.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index d7b4e6bae0..c27ec8f3fc 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -61,6 +61,12 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="install"/>
         </exec>
 
+        <!-- copy bitwuzla include files to the source tree -->
+        <delete dir="${source.path}/include" quiet="true"/>
+        <copy todir="${source.path}">
+            <fileset dir="${bitwuzla.path}/install" includes="include/**"/>
+        </copy>
+
         <!-- check if -Dbitwuzla.rebuildWrapper=on was used-->
         <condition property="rebuild">
             <istrue value="${bitwuzla.rebuildWrapper}"/>
@@ -69,12 +75,6 @@ SPDX-License-Identifier: Apache-2.0
 
     <!-- Run swig to generate a new wrapper. Only executed if rebuildWrapper was specified. -->
     <target name="build-wrapper" if="rebuild" depends="build-bitwuzla">
-        <!-- copy bitwuzla include files to the source tree -->
-        <delete dir="${source.path}/include" quiet="true"/>
-        <copy todir="${source.path}">
-            <fileset dir="${bitwuzla.path}/install" includes="include/**"/>
-        </copy>
-
         <!-- create ouput directory for the swig proxies -->
         <delete dir="$source.path}/src" quiet="true"/>
         <mkdir dir="${source.path}/src/org/sosy_lab/java_smt/solvers/bitwuzla/api"/>

From c1a256e207260ab9b7dcf3d19546ee892c61d019 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 10 Apr 2024 01:10:40 +0200
Subject: [PATCH 101/158] Bitwuzla: Removed unnecessary dependency on libgmp
 while building libbitwuzlaJNI.

---
 build/build-publish-solvers/solver-bitwuzla.xml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index c27ec8f3fc..cc3566cfc7 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -147,9 +147,7 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="libbitwuzlaJNI.so"/>
             <arg value="bitwuzla_wrap.o"/>
             <arg value="-L${bitwuzla.path}/install/lib/x86_64-linux-gnu"/>
-            <arg value="-L${gmp.path}/.libs"/>
             <arg value="-lbitwuzla"/>
-            <arg value="-lgmp"/>
             <arg value="-Wl,-z,defs"/>
         </exec>
 
@@ -214,21 +212,6 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="--replace-needed"/>
             <arg value="libbitwuzla.so.0"/>
             <arg value="libbitwuzla.so"/>
-            <arg value="--replace-needed"/>
-            <arg value="libgmp.so.10"/>
-            <arg value="libgmp.so"/>
-            <arg value="libbitwuzlaJNI-${bitwuzla.version}.so"/>
-        </exec>
-        <!-- We need to run this twice? -->
-        <exec executable="patchelf" failonerror="true">
-            <arg value="--set-rpath"/>
-            <arg value="$ORIGIN"/>
-            <arg value="--replace-needed"/>
-            <arg value="libbitwuzla.so.0"/>
-            <arg value="libbitwuzla.so"/>
-            <arg value="--replace-needed"/>
-            <arg value="libgmp.so.10"/>
-            <arg value="libgmp.so"/>
             <arg value="libbitwuzlaJNI-${bitwuzla.version}.so"/>
         </exec>
     </target>

From 6449569f6c232d35108e9458cbf89af268214630 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Wed, 10 Apr 2024 13:11:10 +0200
Subject: [PATCH 102/158] Change Bitwuzla build script so that the JNI lib is
 patchelfed before moving

---
 .../build-publish-solvers/solver-bitwuzla.xml  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index cc3566cfc7..3ac77e5758 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -151,6 +151,14 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="-Wl,-z,defs"/>
         </exec>
 
+        <!-- patch JNI library as it fails to do later for some reason -->
+        <exec executable="patchelf" failonerror="true">
+            <arg value="--set-rpath"/>
+            <arg value="$ORIGIN"/>
+            <arg value="--replace-needed"/><arg value="libbitwuzla.so.0"/><arg value="libbitwuzla.so"/>
+            <arg value="${source.path}/libbitwuzlaJNI.so"/>
+        </exec>
+
         <!-- copy library files into directory to be published for Ivy -->
         <move file="${source.path}/libbitwuzlaJNI.so"
               tofile="libbitwuzlaJNI-${bitwuzla.version}.so"
@@ -171,7 +179,7 @@ SPDX-License-Identifier: Apache-2.0
               tofile="libgmp-${bitwuzla.version}.so"
               failonerror="true"/>
 
-        <!-- patch libraries -->
+        <!-- patch all other libraries -->
         <exec executable="patchelf" failonerror="true">
             <arg value="--set-rpath"/>
             <arg value="$ORIGIN"/>
@@ -206,14 +214,6 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="libgmp.so"/>
             <arg value="libbitwuzla-${bitwuzla.version}.so"/>
         </exec>
-        <exec executable="patchelf" failonerror="true">
-            <arg value="--set-rpath"/>
-            <arg value="$ORIGIN"/>
-            <arg value="--replace-needed"/>
-            <arg value="libbitwuzla.so.0"/>
-            <arg value="libbitwuzla.so"/>
-            <arg value="libbitwuzlaJNI-${bitwuzla.version}.so"/>
-        </exec>
     </target>
 
     <target name="publish-bitwuzla" depends="package-bitwuzla, load-ivy"

From 1d86ad27a43db56956c9c80db6dd9859a5ef1ce1 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Wed, 10 Apr 2024 15:43:59 +0200
Subject: [PATCH 103/158] Switch to correctly compiled version of Bitwuzla
 0.4.0 commit 954bcfb0 (because the release is missing features for parse)

---
 lib/ivy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ivy.xml b/lib/ivy.xml
index cbf960c4a1..73a8b67463 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -167,7 +167,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
-        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-g18bc7dbc-dev1" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
+        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-g954bcfb0-dev3" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->
         <dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.1-59-gaf9c0520c" conf="runtime-yices2->runtime; contrib->sources" />

From 71a6808e496f8469a50a7781ac68b9ce1784c3d5 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 10 Apr 2024 17:05:20 +0200
Subject: [PATCH 104/158] Bitwuzla: Re-enabled test bvOutOfRange as it works
 with Bitwuzla now.

---
 src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java b/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java
index 1bc55a311a..8ab062564e 100644
--- a/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/BitvectorFormulaManagerTest.java
@@ -533,7 +533,6 @@ public void bvInRange() throws SolverException, InterruptedException {
   @Test
   @SuppressWarnings("CheckReturnValue")
   public void bvOutOfRange() {
-    assume().that(solver).isNotEqualTo(Solvers.BITWUZLA);
     for (int[] sizeAndValue : new int[][] {{4, 32}, {4, -9}, {8, 300}, {8, -160}}) {
       try {
         bvmgr.makeBitvector(sizeAndValue[0], sizeAndValue[1]);

From 52e09ae8cacfd31d4f3f0101abcdc3549cdfaed9 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Wed, 10 Apr 2024 17:06:04 +0200
Subject: [PATCH 105/158] Bitwuzla: Run patchelf twice on libbitwuzlaJNI to
 resolve the dependency on libbitwuzla.so.0

---
 build/build-publish-solvers/solver-bitwuzla.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index 3ac77e5758..8760d17251 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -158,6 +158,12 @@ SPDX-License-Identifier: Apache-2.0
             <arg value="--replace-needed"/><arg value="libbitwuzla.so.0"/><arg value="libbitwuzla.so"/>
             <arg value="${source.path}/libbitwuzlaJNI.so"/>
         </exec>
+        <exec executable="patchelf" failonerror="true">
+            <arg value="--set-rpath"/>
+            <arg value="$ORIGIN"/>
+            <arg value="--replace-needed"/><arg value="libbitwuzla.so.0"/><arg value="libbitwuzla.so"/>
+            <arg value="${source.path}/libbitwuzlaJNI.so"/>
+        </exec>
 
         <!-- copy library files into directory to be published for Ivy -->
         <move file="${source.path}/libbitwuzlaJNI.so"

From a569f47c116b2fb2e43da7bfcbc2bc6b7aabb1d9 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 10:06:34 +0200
Subject: [PATCH 106/158] Use non-dev version for Biwuzla 0.4.0-g954bcfb0

---
 lib/ivy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ivy.xml b/lib/ivy.xml
index 73a8b67463..b968dd7311 100644
--- a/lib/ivy.xml
+++ b/lib/ivy.xml
@@ -167,7 +167,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
         <dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
         <dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
-        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-g954bcfb0-dev3" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
+        <dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.4.0-g954bcfb0" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
 
         <!-- additional JavaSMT components with Solver Binaries -->
         <dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.1-59-gaf9c0520c" conf="runtime-yices2->runtime; contrib->sources" />

From 2cd624dcfd5fdd241f15e33137ad3d25e48cb332 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 10:30:58 +0200
Subject: [PATCH 107/158] Make gitignore more general

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 17d3d3d4cc..f3b7eae669 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,8 @@
 lib/native/source/libz3j/org_sosy_lab_solver_z3_Z3NativeApi.c
 lib/native/source/*/*.so
 lib/native/source/*/*.o
-lib/native/source/opensmt/**/*.java
+lib/native/source/**/*.java
+lib/native/source/**/**/*.java
 lib/native/*/*.asc
 
 doc/Example-Maven-Project/target*

From 698c73ca541313d0b82adf949dbcccf968aa9f66 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 11:02:12 +0200
Subject: [PATCH 108/158] Some small improvements in the code and comments of
 Bitwuzla

---
 .../solvers/bitwuzla/BitwuzlaArrayFormulaManager.java         | 3 +--
 .../solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java     | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
index 8b5ca1278e..3094024f07 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaArrayFormulaManager.java
@@ -43,8 +43,7 @@ protected <TI extends Formula, TE extends Formula> Term internalMakeArray(
     final ArrayFormulaType<TI, TE> arrayFormulaType =
         FormulaType.getArrayType(pIndexType, pElementType);
     final Sort bitwuzlaArrayType = toSolverType(arrayFormulaType);
-    Term newVar = getFormulaCreator().makeVariable(bitwuzlaArrayType, pName);
-    return newVar;
+    return getFormulaCreator().makeVariable(bitwuzlaArrayType, pName);
   }
 
   @Override
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
index 8c449e473d..e99b5cbe16 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBitvectorFormulaManager.java
@@ -30,7 +30,7 @@ protected BitwuzlaBitvectorFormulaManager(
 
   @Override
   protected Term makeBitvectorImpl(int length, Term pParam1) {
-    throw new UnsupportedOperationException("Bitwuzla does not support INT theory");
+    throw new UnsupportedOperationException("Bitwuzla does not support the theory of Integers.");
   }
 
   @Override
@@ -42,7 +42,7 @@ protected Term makeBitvectorImpl(int length, BigInteger pI) {
 
   @Override
   protected Term toIntegerFormulaImpl(Term pI, boolean signed) {
-    throw new UnsupportedOperationException("BV to INT conversion is not supported.");
+    throw new UnsupportedOperationException("Bitvector to Integers conversion is not supported.");
   }
 
   @Override

From 371e7868042dce882f2521cbd0362a344adfd0d6 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 11:31:14 +0200
Subject: [PATCH 109/158] Use the initial symbol name + a prefix for Fp to IEEE
 BV transformation and some clarification of exceptions in FP manager for
 Bitwuzla

---
 .../BitwuzlaFloatingPointManager.java         | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index 0fc938a39b..64a746cee4 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -10,7 +10,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Random;
 import org.sosy_lab.common.rationals.Rational;
 import org.sosy_lab.java_smt.api.FloatingPointFormula;
 import org.sosy_lab.java_smt.api.FloatingPointRoundingMode;
@@ -62,7 +61,7 @@ protected Term getRoundingModeImpl(FloatingPointRoundingMode pFloatingPointRound
         out = termManager.mk_rm_value(RoundingMode.RTZ);
         break;
       default:
-        throw new AssertionError("Unexpected value");
+        throw new AssertionError("Unexpected value for Floating-Point rounding mode.");
     }
     return out;
   }
@@ -165,7 +164,8 @@ protected Term castToImpl(
         return termManager.mk_term(Kind.FP_TO_UBV, pRoundingMode, pNumber, targetType.getSize());
       }
     } else {
-      throw new UnsupportedOperationException("Attempted cast to an unsupported type.");
+      throw new UnsupportedOperationException(
+          "Attempted cast of FP to an unsupported type: " + pTargetType + ".");
     }
   }
 
@@ -193,7 +193,8 @@ protected Term castFromImpl(
       }
 
     } else {
-      throw new UnsupportedOperationException("Attempted cast from an unsupported type.");
+      throw new UnsupportedOperationException(
+          "Attempted cast towards FP from an unsupported type" + ": " + formulaType + ".");
     }
   }
 
@@ -206,21 +207,6 @@ protected Term fromIeeeBitvectorImpl(Term pNumber, FloatingPointType pTargetType
         pTargetType.getMantissaSize() + 1);
   }
 
-  Random randomGenerator = new Random();
-
-  private String generateRandomName(String prefix, int length) {
-    int charA = Character.valueOf('a');
-    int charZ = Character.valueOf('z');
-
-    String generated =
-        randomGenerator
-            .ints(charA, charZ + 1)
-            .limit(length)
-            .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
-            .toString();
-    return prefix + "_" + generated;
-  }
-
   @Override
   protected Term toIeeeBitvectorImpl(Term pNumber) {
     // FIXME: We should use a reserved symbol for the fresh variables
@@ -235,7 +221,8 @@ protected Term toIeeeBitvectorImpl(Term pNumber) {
     // representation.
     Term bvNaN =
         termManager.mk_bv_value(bvSort, "0" + "1".repeat(sizeExp + 1) + "0".repeat(sizeSig - 2));
-    Term bvVar = termManager.mk_const(bvSort, generateRandomName("toIeeeBitvector", 10));
+
+    Term bvVar = termManager.mk_const(bvSort, pNumber.symbol() + "_toIeeeBitvector");
     Term equal =
         termManager.mk_term(
             Kind.ITE,

From 3ef4a9ee2aee9ccb7a0199441cd9bba43ac29120 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 11:39:22 +0200
Subject: [PATCH 110/158] Make Term given to BitwuzlaFormula final

---
 src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
index 46dabbfc45..2ebf691d8b 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
@@ -24,7 +24,7 @@ abstract class BitwuzlaFormula implements Formula {
   @SuppressWarnings("Immutable")
   private final Term bitwuzlaTerm;
 
-  BitwuzlaFormula(Term term) {
+  BitwuzlaFormula(final Term term) {
     bitwuzlaTerm = term;
   }
 

From b2428386f1fff10662f20300b2b7ef2e2b924c5b Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 12:12:22 +0200
Subject: [PATCH 111/158] Simplify parsing in Bitwuzla a little and correctly
 remove (set-logic xxx) in all cases

---
 .../bitwuzla/BitwuzlaFormulaManager.java      | 145 +++++++++---------
 1 file changed, 76 insertions(+), 69 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index 0d01d84342..0f9470e001 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -59,77 +59,10 @@ public final class BitwuzlaFormulaManager
     bitwuzlaOption = pBitwuzlaOptions;
   }
 
-  // Split up a sequence of lisp expressions
-  // f.ex "(define-const a Int)(assert (= a 0)" becomes ["(define-const a Int)", "(assert (= a 0))"]
-  public static List<String> tokenize(String input) {
-    ImmutableList.Builder<String> builder = ImmutableList.builder();
-    int level = 0;
-    StringBuilder read = new StringBuilder();
-    boolean inComment = false;
-    for (int i = 0; i < input.length(); i++) {
-      char c = input.charAt(i);
-      if (inComment) {
-        if (c == '\n') {
-          inComment = false;
-        }
-        continue;
-      }
-      if (c == ';') {
-        // Comment
-        inComment = true;
-        continue;
-      }
-      if (level == 0) {
-        if (!Character.isWhitespace(c)) {
-          if (c == '(') {
-            read.append("(");
-            level++;
-          } else {
-            // All top-level expressions should have parentheses around them
-            throw new IllegalArgumentException();
-          }
-        }
-      } else {
-        read.append(c);
-        if (c == '(') {
-          level++;
-        }
-        if (c == ')') {
-          if (level == 1) {
-            builder.add(read.toString());
-            read = new StringBuilder();
-          }
-          level--;
-        }
-      }
-    }
-    if (level != 0) {
-      // Missing closing parenthesis
-      throw new IllegalArgumentException();
-    }
-    return builder.build();
-  }
-
-  // Check if the token is a function or variable declaration
-  public static boolean isDecl(String token) {
-    // TODO: How to handle function *definitions*? And are they supported by Bitwuzla?
-    return token.matches("\\(\\s*(declare-const|declare-fun).*");
-  }
-
   @Override
   public BooleanFormula parse(String formulaStr) throws IllegalArgumentException {
     // Strip the input string and remove everything but declarations and assertions
-    // FIXME: We should handle this in AbstractFormulaManager as it affects all solvers
-    String s = formulaStr;
-    if (s.startsWith("(set-logic ")) {
-      s = s.substring(1 + s.indexOf(')'));
-    }
-    if (s.contains("(check-sat)")) {
-      s = s.replace("(check-sat)", "");
-    }
-    if (s.contains("(exit)")) {
-      s = s.replace("(exit)", "");
-    }
+    String s = stripSMTLIB2String(formulaStr);
 
     // Split the input string into a list of SMT-LIB2 commands
     List<String> tokens = tokenize(s);
@@ -224,6 +157,24 @@ public BooleanFormula parse(String formulaStr) throws IllegalArgumentException {
     return creator.encapsulateBoolean(result);
   }
 
+  private String stripSMTLIB2String(String pFormulaStr) {
+    String s = pFormulaStr;
+    int setLogicIndex = s.indexOf("(set-logic ");
+    if (setLogicIndex != -1) {
+      int endLogicIndex = s.indexOf(')', setLogicIndex + 1);
+      String s1 = s.substring(0, setLogicIndex);
+      String s2 = s.substring(endLogicIndex + 1);
+      s = s1 + s2;
+    }
+    if (s.contains("(check-sat)")) {
+      s = s.replace("(check-sat)", "");
+    }
+    if (s.contains("(exit)")) {
+      s = s.replace("(exit)", "");
+    }
+    return s;
+  }
+
   @Override
   public Appender dumpFormula(Term pTerm) {
     // There are 2 ways of SMT2 printing in Bitwuzla, bitwuzla_term_print() and
@@ -234,7 +185,6 @@ public Appender dumpFormula(Term pTerm) {
     return new Appenders.AbstractAppender() {
       @Override
       public void appendTo(Appendable out) throws IOException {
-        // TODO: It would be better to keep this instance around
         Bitwuzla bitwuzla = new Bitwuzla(creator.getTermManager());
         for (Term t : creator.getVariableCasts()) {
           bitwuzla.assert_formula(t);
@@ -254,4 +204,61 @@ public void appendTo(Appendable out) throws IOException {
   static Term getBitwuzlaTerm(Formula pT) {
     return ((BitwuzlaFormula) pT).getTerm();
   }
+
+  // Split up a sequence of lisp expressions
+  // f.ex "(define-const a Int)(assert (= a 0)" becomes ["(define-const a Int)", "(assert (= a 0))"]
+  public static List<String> tokenize(String input) {
+    ImmutableList.Builder<String> builder = ImmutableList.builder();
+    int level = 0;
+    StringBuilder read = new StringBuilder();
+    boolean inComment = false;
+    for (int i = 0; i < input.length(); i++) {
+      char c = input.charAt(i);
+      if (inComment) {
+        if (c == '\n') {
+          inComment = false;
+        }
+        continue;
+      }
+      if (c == ';') {
+        // Comment
+        inComment = true;
+        continue;
+      }
+      if (level == 0) {
+        if (!Character.isWhitespace(c)) {
+          if (c == '(') {
+            read.append("(");
+            level++;
+          } else {
+            // All top-level expressions should have parentheses around them
+            throw new IllegalArgumentException();
+          }
+        }
+      } else {
+        read.append(c);
+        if (c == '(') {
+          level++;
+        }
+        if (c == ')') {
+          if (level == 1) {
+            builder.add(read.toString());
+            read = new StringBuilder();
+          }
+          level--;
+        }
+      }
+    }
+    if (level != 0) {
+      // Missing closing parenthesis
+      throw new IllegalArgumentException();
+    }
+    return builder.build();
+  }
+
+  // Check if the token is a function or variable declaration
+  public static boolean isDecl(String token) {
+    // TODO: How to handle function *definitions*? And are they supported by Bitwuzla?
+    return token.matches("\\(\\s*(declare-const|declare-fun).*");
+  }
 }

From 181d75050714eee67982fe86f6534c75bf0b10b3 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 13:54:02 +0200
Subject: [PATCH 112/158] Add a test for comments and logic settings in parse
 tests (As this is problematic for OpenSMT2 and Bitwuzla)

---
 .../java_smt/test/SolverFormulaIOTest.java    | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java b/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
index 7f4c231545..eb38f1e9dd 100644
--- a/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
@@ -32,6 +32,14 @@
 
 @SuppressWarnings("checkstyle:linelength")
 public class SolverFormulaIOTest extends SolverBasedTest0.ParameterizedSolverBasedTest0 {
+  private static final String BOOL_CHECK =
+      "(declare-fun x () Bool)(declare-fun y () Bool)(assert (= y x))";
+
+  private static final String BOOL_VARS_W_LOGIC = "(set-logic all)" + BOOL_CHECK;
+
+  private static final String BOOL_VARS_W_LOGIC_AND_COMMENT =
+      ";; Some comment in SMTLIB2\n" + BOOL_VARS_W_LOGIC;
+
   private static final String MATHSAT_DUMP1 =
       "(set-info :source |printed by MathSAT|)\n"
           + "(declare-fun a () Bool)\n"
@@ -97,6 +105,40 @@ public class SolverFormulaIOTest extends SolverBasedTest0.ParameterizedSolverBas
           + "(assert  (let (($x35 (and (xor q (= (+ a b) c)) (>= a b)))) (let (($x9 (= a b))) (and"
           + " (and (or $x35 u) q) (and $x9 $x35)))))";
 
+  @Test
+  public void logicsParseTest() throws SolverException, InterruptedException {
+    requireParser();
+    // Some solvers have problems with (set-logic xxx) in the beginning
+
+    // Boolector will fail this anyway since bools are bitvecs for btor
+    TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BOOLECTOR);
+
+    BooleanFormula x = bmgr.makeVariable("x");
+    BooleanFormula y = bmgr.makeVariable("y");
+    BooleanFormula expr = bmgr.equivalence(y, x);
+
+    // actual test
+    BooleanFormula parsedForm = mgr.parse(BOOL_VARS_W_LOGIC);
+    assertThatFormula(parsedForm).isEquivalentTo(expr);
+  }
+
+  @Test
+  public void commentsParseTest() throws SolverException, InterruptedException {
+    requireParser();
+    // Some solvers have problems with comments in the beginning
+
+    // Boolector will fail this anyway since bools are bitvecs for btor
+    TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BOOLECTOR);
+
+    BooleanFormula x = bmgr.makeVariable("x");
+    BooleanFormula y = bmgr.makeVariable("y");
+    BooleanFormula expr = bmgr.equivalence(y, x);
+
+    // actual test
+    BooleanFormula parsedForm = mgr.parse(BOOL_VARS_W_LOGIC_AND_COMMENT);
+    assertThatFormula(parsedForm).isEquivalentTo(expr);
+  }
+
   @Test
   public void varDumpTest() {
     // Boolector will fail this anyway since bools are bitvecs for btor

From b979f74073937d7f943651b290f94f99bd4d7dfe Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 13:54:22 +0200
Subject: [PATCH 113/158] Fix comments and logic settings in parsing for
 OpenSMT2

---
 .../opensmt/OpenSmtFormulaManager.java        | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/opensmt/OpenSmtFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/opensmt/OpenSmtFormulaManager.java
index 464d133fe5..d08b454feb 100644
--- a/src/org/sosy_lab/java_smt/solvers/opensmt/OpenSmtFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/opensmt/OpenSmtFormulaManager.java
@@ -54,7 +54,7 @@ class OpenSmtFormulaManager extends AbstractFormulaManager<PTRef, SRef, Logic, S
 
   @Override
   public BooleanFormula parse(String pS) throws IllegalArgumentException {
-    return creator.encapsulateBoolean(osmtLogic.parseFormula(pS));
+    return creator.encapsulateBoolean(osmtLogic.parseFormula(stripSMTLIB2String(pS)));
   }
 
   @Override
@@ -83,4 +83,24 @@ public void appendTo(Appendable out) throws IOException {
       }
     };
   }
+
+  private String stripSMTLIB2String(String pFormulaStr) {
+    String s = pFormulaStr;
+    int commentIndex = s.indexOf(";;");
+    while (commentIndex != -1) {
+      int endCommentIndex = s.indexOf('\n', commentIndex + 1);
+      String s1 = s.substring(0, commentIndex);
+      String s2 = s.substring(endCommentIndex + 1);
+      s = s1 + s2;
+      commentIndex = s.indexOf(";;");
+    }
+    int setLogicIndex = s.indexOf("(set-logic ");
+    if (setLogicIndex != -1) {
+      int endLogicIndex = s.indexOf(')', setLogicIndex + 1);
+      String s1 = s.substring(0, setLogicIndex);
+      String s2 = s.substring(endLogicIndex + 1);
+      s = s1 + s2;
+    }
+    return s;
+  }
 }

From 78ee2ea19ddd5b69cf24ac23d1a895ac6a04c036 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 13:58:03 +0200
Subject: [PATCH 114/158] Clean up BitwuzlaNativeApiTest

---
 .../solvers/bitwuzla/BitwuzlaNativeApiTest.java  | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index 777b1bb59a..87fdecd5ce 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -11,6 +11,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.truth.Truth;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import org.junit.After;
 import org.junit.AssumptionViolatedException;
 import org.junit.Before;
@@ -66,15 +67,6 @@ public void freeEnvironment() {
     }
   }
 
-  // Bitwuzla does not support lambdas with no argument
-  // @Ignore
-  // @Test
-  // public void functionWithNoArguments() {
-  //  Sort bool_sort = termManager.mk_bool_sort();
-  //  Term a = termManager.mk_var(bool_sort, "a");
-  //  termManager.mk_term(Kind.LAMBDA, a);
-  // }
-
   @Test
   public void signedFunctions() {
     Sort sortbv4 = termManager.mk_bv_sort(4);
@@ -100,8 +92,6 @@ public void boolType() {
     assertThat(pBoolType.is_bool()).isTrue();
   }
 
-  // FIXME: Bitwuzla fails this critically!
-  // -- This seems to be working now?
   @Test
   public void repeatedTermCreationInMultipleSolversTest() {
     Term tru1 = termManager.mk_true();
@@ -618,7 +608,7 @@ public void parserTest() {
     assertThat(newDump).isEqualTo(dump);
   }
 
-  @SuppressWarnings("unused")
+  @CanIgnoreReturnValue
   @Test(expected = IllegalArgumentException.class)
   public void parserFailTest() {
     // valid
@@ -627,6 +617,6 @@ public void parserFailTest() {
     assertThat(assertions).isNotEmpty();
     // invalid/fails
     String badInput = "(declare-const a Bool)(assert (or a b))";
-    assertions = parse(badInput);
+    parse(badInput);
   }
 }

From bfeae7fdb23841179e7964abc4b637b285a62dc0 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 14:26:27 +0200
Subject: [PATCH 115/158] Use suppression of warning instead of annotation in
 BitwuzlaNativeApiTest

---
 .../java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index 87fdecd5ce..2ae3f5e68b 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -11,7 +11,6 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.truth.Truth;
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import org.junit.After;
 import org.junit.AssumptionViolatedException;
 import org.junit.Before;
@@ -608,7 +607,7 @@ public void parserTest() {
     assertThat(newDump).isEqualTo(dump);
   }
 
-  @CanIgnoreReturnValue
+  @SuppressWarnings("CheckReturnValue")
   @Test(expected = IllegalArgumentException.class)
   public void parserFailTest() {
     // valid

From 37bf4f7073ed5ddefcbbb4ea554beb395a498f6e Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 14:26:40 +0200
Subject: [PATCH 116/158] Clean up the TermManager in close()

---
 .../java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
index 6bd0b0f96b..d905e251e6 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
@@ -221,6 +221,7 @@ public Solvers getSolverName() {
   @Override
   public void close() {
     if (!closed) {
+      creator.getTermManager().delete();
       closed = true;
     }
   }

From f176424c3de4a79d936f20e336ece5b3843642d9 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 14:45:29 +0200
Subject: [PATCH 117/158] Bitwuzla: Suppress a warning about the number of
 parameters in the BitwuzlaFormulaManager constructor.

---
 .../java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
index 0f9470e001..9a644f2b60 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaManager.java
@@ -33,6 +33,7 @@ public final class BitwuzlaFormulaManager
   private final BitwuzlaFormulaCreator creator;
   private final Options bitwuzlaOption;
 
+  @SuppressWarnings("checkstyle:parameternumber")
   BitwuzlaFormulaManager(
       BitwuzlaFormulaCreator pFormulaCreator,
       BitwuzlaUFManager pFunctionManager,

From 15505d6ce8addd2ac51ba6d864b9e5b47e3e2f52 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 14:46:47 +0200
Subject: [PATCH 118/158] Bitwuzla: Applied refaster patch.

---
 .../java_smt/solvers/bitwuzla/BitwuzlaModel.java |  2 +-
 .../solvers/bitwuzla/BitwuzlaNativeApiTest.java  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
index 004f0ce850..cfe958c7ca 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
@@ -135,7 +135,7 @@ private Collection<ValueAssignment> getArrayAssignments(Term pTerm, List<Object>
       List<Object> innerIndices = new ArrayList<>(upperIndices);
       String name = getArrayName(array);
       assert name != null;
-      if (children.size() == 0) {
+      if (children.isEmpty()) {
         // Empty array
         return assignments;
       } else if (children.size() == 2) {
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index 2ae3f5e68b..d4c445afb0 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -196,12 +196,12 @@ public void testBvArrayModelStore() {
     // {starting array, index, value} in "we add value at index to array"
     // Just declared (empty) arrays return an empty array
     Vector_Term children = arrWVarAt1.children();
-    assertThat(children.size()).isEqualTo(3);
+    assertThat(children).hasSize(3);
     assertThat(children.get(0)).isEqualTo(arrW11At0);
     assertThat(children.get(1)).isEqualTo(one);
     assertThat(children.get(2)).isEqualTo(var);
     Vector_Term children2 = arrW11At0.children();
-    assertThat(children.size()).isEqualTo(3);
+    assertThat(children).hasSize(3);
     assertThat(children2.get(0)).isEqualTo(arr);
     assertThat(children2.get(1)).isEqualTo(zero);
     assertThat(children2.get(2)).isEqualTo(eleven);
@@ -242,7 +242,7 @@ public void testBvArrayModelSelect() {
     // {starting array, index} in "we select index from array"
     // Just declared (empty) arrays return an empty children array
     Vector_Term children = selectArrAtZero.children();
-    assertThat(children.size()).isEqualTo(2);
+    assertThat(children).hasSize(2);
     assertThat(children.get(0)).isEqualTo(arr);
     String arrSymbol = children.get(0).symbol();
     assertThat(arrSymbol).isEqualTo("arr");
@@ -281,7 +281,7 @@ public void testUfModel() {
     // {function, arguments...}
     // Declaration is empty array
     Vector_Term childrenAppliedFoo = appliedFoo.children();
-    assertThat(childrenAppliedFoo.size()).isEqualTo(3);
+    assertThat(childrenAppliedFoo).hasSize(3);
     assertThat(childrenAppliedFoo.get(0)).isEqualTo(foo);
     assertThat(childrenAppliedFoo.get(1)).isEqualTo(arg1);
     assertThat(childrenAppliedFoo.get(2)).isEqualTo(arg2);
@@ -315,14 +315,14 @@ public void testBoolModel() {
 
     // Children of AND and OR
     Vector_Term childrenOr = or.children();
-    assertThat(childrenOr.size()).isEqualTo(2);
+    assertThat(childrenOr).hasSize(2);
     assertThat(childrenOr.get(0)).isEqualTo(and);
     assertThat(childrenOr.get(1)).isEqualTo(f);
 
     assertThat(or.kind()).isEqualTo(Kind.OR);
 
     Vector_Term childrenAnd = and.children();
-    assertThat(childrenOr.size()).isEqualTo(2);
+    assertThat(childrenOr).hasSize(2);
     assertThat(childrenAnd.get(0)).isEqualTo(x);
     assertThat(childrenAnd.get(1)).isEqualTo(t);
 
@@ -510,7 +510,7 @@ public void testExtend() {
     assertThat(xExt.num_children()).isEqualTo(1);
     assertThat(xExt.num_indices()).isGreaterThan(0);
     Vector_Int indices = xExt.indices();
-    assertThat(indices.size()).isEqualTo(1);
+    assertThat(indices).hasSize(1);
     assertThat(indices.get(0)).isEqualTo(2);
   }
 
@@ -599,7 +599,7 @@ public void parserTest() {
 
     // add the parsed assertion to our stack
     bitwuzla.push(1);
-    assertThat(assertions.size()).isEqualTo(1);
+    assertThat(assertions).hasSize(1);
     bitwuzla.assert_formula(assertions.get(0));
 
     // the output of print_formula should stay the same

From 0920e6d9f3b4877917610f2e619507a369955e02 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 14:56:19 +0200
Subject: [PATCH 119/158] Bitwuzla: Updated libc requirement to version 2.32 in
  SolverContextFactoryTest.

---
 src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java b/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java
index 9579196a89..3fb6ff56ed 100644
--- a/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java
@@ -130,12 +130,12 @@ private boolean isSufficientVersionOfLibcxx() {
     return true;
   }
 
-  /** Bitwuzla requires GLIB version 2.20 or newer. This is not included in Ubuntu 18.04. */
+  /** Bitwuzla requires GLIB version 2.32 or newer. This is not included in Ubuntu 18.04. */
   private boolean isSufficientVersionOfLibc() {
     try {
       NativeLibraries.loadLibrary("bitwuzla");
     } catch (UnsatisfiedLinkError e) {
-      if (e.getMessage().contains("version `GLIBC_2.29' not found")) {
+      if (e.getMessage().contains("version `GLIBC_2.32' not found")) {
         return false;
       }
     }

From 7ff25987fd30b558abc2ca82410d4185f2fb76e1 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 14:59:49 +0200
Subject: [PATCH 120/158] Bitwuzla: Added a license for the SWIG patch.

---
 .../source/libbitwuzla/phantomReferences.patch.license     | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 lib/native/source/libbitwuzla/phantomReferences.patch.license

diff --git a/lib/native/source/libbitwuzla/phantomReferences.patch.license b/lib/native/source/libbitwuzla/phantomReferences.patch.license
new file mode 100644
index 0000000000..fba0bf85e6
--- /dev/null
+++ b/lib/native/source/libbitwuzla/phantomReferences.patch.license
@@ -0,0 +1,7 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0 OR MIT

From 263e60c6004a7f9ef1c19c27fc749427a23277d1 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 15:18:22 +0200
Subject: [PATCH 121/158] Bitwuzla: Reverted unintended change to
 NonLinearArithmeticWithModuloTest.

---
 .../java_smt/test/NonLinearArithmeticWithModuloTest.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/NonLinearArithmeticWithModuloTest.java b/src/org/sosy_lab/java_smt/test/NonLinearArithmeticWithModuloTest.java
index 5213773d40..16b811f764 100644
--- a/src/org/sosy_lab/java_smt/test/NonLinearArithmeticWithModuloTest.java
+++ b/src/org/sosy_lab/java_smt/test/NonLinearArithmeticWithModuloTest.java
@@ -34,8 +34,7 @@ public class NonLinearArithmeticWithModuloTest extends SolverBasedTest0 {
   @Parameters(name = "{0} {1}")
   public static Iterable<Object[]> getAllSolversAndTheories() {
     return Lists.cartesianProduct(
-            Arrays.asList(new Solvers[] {Solvers.BITWUZLA}),
-            Arrays.asList(NonLinearArithmetic.values()))
+            Arrays.asList(Solvers.values()), Arrays.asList(NonLinearArithmetic.values()))
         .stream()
         .map(List::toArray)
         .collect(toImmutableList());

From 35e731efc1ad5932a7875bd18984bb036bd3c9d9 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 14:35:24 +0200
Subject: [PATCH 122/158] Make a model test better readable

---
 src/org/sosy_lab/java_smt/test/ModelTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/ModelTest.java b/src/org/sosy_lab/java_smt/test/ModelTest.java
index c7c8b03210..3fa91e29bc 100644
--- a/src/org/sosy_lab/java_smt/test/ModelTest.java
+++ b/src/org/sosy_lab/java_smt/test/ModelTest.java
@@ -828,10 +828,10 @@ public void testPartialModels2() throws SolverException, InterruptedException {
         prover.push(bvmgr.greaterThan(x, bvmgr.makeBitvector(8, 0), true));
         assertThat(prover).isSatisfiable();
         try (Model m = prover.getModel()) {
-          if (solver != Solvers.BOOLECTOR && solver != Solvers.BITWUZLA) {
-            assertThat(m.evaluate(x)).isEqualTo(BigInteger.ONE);
-          } else {
+          if (solver == Solvers.BOOLECTOR || solver == Solvers.BITWUZLA) {
             assertThat(m.evaluate(x)).isEqualTo(BigInteger.valueOf(64));
+          } else {
+            assertThat(m.evaluate(x)).isEqualTo(BigInteger.ONE);
           }
           // it works now, but maybe the model "x=1" for the constraint "x>0" is not valid for new
           // solvers.

From e9487464370eebeada82be918272df8968128e10 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 14:48:13 +0200
Subject: [PATCH 123/158] Use explicit list of solvers not supported in
 SolverThreadLocalityTest test case as otherwise we might miss this test when
 adding new solvers

---
 .../java_smt/test/SolverThreadLocalityTest.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java b/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java
index 20736b98ea..2cda68f4f0 100644
--- a/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverThreadLocalityTest.java
@@ -340,7 +340,16 @@ public <T> void nonLocalInterpolationTest() throws InterruptedException, Executi
   @Test
   public void wrongContextTest()
       throws InterruptedException, SolverException, InvalidConfigurationException {
-    assume().that(solverToUse()).isAnyOf(Solvers.CVC4, Solvers.CVC5, Solvers.YICES2);
+    assume()
+        .that(solverToUse())
+        .isNoneOf(
+            Solvers.OPENSMT,
+            Solvers.MATHSAT5,
+            Solvers.SMTINTERPOL,
+            Solvers.Z3,
+            Solvers.PRINCESS,
+            Solvers.BOOLECTOR,
+            Solvers.BITWUZLA);
 
     // FIXME: This test tries to use a formula that was created in a different context. We expect
     //  this test to fail for most solvers, but there should be a unique error message.
@@ -361,6 +370,10 @@ public void wrongContextTest()
     //    key not found: i@15
     //  Boolector crashes with a segfault:
     //    boolector_assert: argument 'exp' belongs to different Boolector instance
+    //  Bitwuzla:
+    //    java.lang.IllegalArgumentException: invalid call to
+    //    'void bitwuzla::Bitwuzla::assert_formula(const bitwuzla::Term&)',
+    //    mismatching term manager for asserted formula
     //
     // To fix this issue, we would need to track which formula was created in which context,
     // which might result in quite some management and memory overhead.

From b9a81c28bbc27b6263408ae41885879a649a1194 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 16:08:32 +0200
Subject: [PATCH 124/158] Bitwuzla: Tried to fix SolverContextFactoryTest
 again.

---
 src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java b/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java
index 3fb6ff56ed..9b81cb0d02 100644
--- a/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverContextFactoryTest.java
@@ -133,7 +133,7 @@ private boolean isSufficientVersionOfLibcxx() {
   /** Bitwuzla requires GLIB version 2.32 or newer. This is not included in Ubuntu 18.04. */
   private boolean isSufficientVersionOfLibc() {
     try {
-      NativeLibraries.loadLibrary("bitwuzla");
+      NativeLibraries.loadLibrary("bitwuzlaJNI");
     } catch (UnsatisfiedLinkError e) {
       if (e.getMessage().contains("version `GLIBC_2.32' not found")) {
         return false;

From 1fdc1eb511794208f9f0f0635abe19f70c1454be Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 16:22:39 +0200
Subject: [PATCH 125/158] Bitwuzla: Add license headers to all auto-generated
 files.

---
 lib/native/source/libbitwuzla/bitwuzla_wrap.cpp           | 8 ++++++++
 lib/native/source/libbitwuzla/bitwuzla_wrap.h             | 8 ++++++++
 .../sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java  | 8 ++++++++
 .../java_smt/solvers/bitwuzla/api/BitwuzlaNative.java     | 8 ++++++++
 .../java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java  | 8 ++++++++
 .../org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java  | 8 ++++++++
 .../java_smt/solvers/bitwuzla/api/Map_TermTerm.java       | 8 ++++++++
 .../sosy_lab/java_smt/solvers/bitwuzla/api/Option.java    | 8 ++++++++
 .../sosy_lab/java_smt/solvers/bitwuzla/api/Options.java   | 8 ++++++++
 .../sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java    | 8 ++++++++
 .../sosy_lab/java_smt/solvers/bitwuzla/api/Result.java    | 8 ++++++++
 .../java_smt/solvers/bitwuzla/api/RoundingMode.java       | 8 ++++++++
 .../org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java  | 8 ++++++++
 .../org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java  | 8 ++++++++
 .../java_smt/solvers/bitwuzla/api/TermManager.java        | 8 ++++++++
 .../java_smt/solvers/bitwuzla/api/Terminator.java         | 8 ++++++++
 .../java_smt/solvers/bitwuzla/api/Vector_Int.java         | 8 ++++++++
 .../java_smt/solvers/bitwuzla/api/Vector_Sort.java        | 8 ++++++++
 .../java_smt/solvers/bitwuzla/api/Vector_String.java      | 8 ++++++++
 .../java_smt/solvers/bitwuzla/api/Vector_Term.java        | 8 ++++++++
 20 files changed, 160 insertions(+)

diff --git a/lib/native/source/libbitwuzla/bitwuzla_wrap.cpp b/lib/native/source/libbitwuzla/bitwuzla_wrap.cpp
index 26dbd8fe27..fdc5701117 100644
--- a/lib/native/source/libbitwuzla/bitwuzla_wrap.cpp
+++ b/lib/native/source/libbitwuzla/bitwuzla_wrap.cpp
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/bitwuzla_wrap.h b/lib/native/source/libbitwuzla/bitwuzla_wrap.h
index b76889f515..0c92445bf9 100644
--- a/lib/native/source/libbitwuzla/bitwuzla_wrap.h
+++ b/lib/native/source/libbitwuzla/bitwuzla_wrap.h
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
index 6c0ee5018d..a33c5048bc 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java
index 8590694338..2cdf31d79f 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java
index 8e2e56e7db..96563dc3af 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java
index 094b221a31..c3910b41b2 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
index 587adec89a..e748464431 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java
index 6477998871..6336b0437b 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
index 9ee9ff77c3..56e94aac49 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
index 9b1eafbec6..2e8a8a0559 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java
index 7846736e90..ff5149147c 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java
index aaf46475ac..67099de349 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
index f4aeeb0aa3..683af26e02 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
index 074f00e709..9a04c198c8 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java
index fe8f3f9766..baf89b4002 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
index 8b14041dd5..13b3518eb9 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
index 7efbe6f543..875d967887 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
index 5243342402..1e2c2ee372 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
index 892450e496..07ae78c7ef 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0
diff --git a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
index 48f0ce3292..980a18ab49 100644
--- a/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
+++ b/lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
@@ -1,3 +1,11 @@
+// This file is part of JavaSMT,
+// an API wrapper for a collection of SMT solvers:
+// https://github.com/sosy-lab/java-smt
+//
+// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
  * Version 4.1.0

From 048f636155ac6684984cef579572c54e0bf977be Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 16:54:58 +0200
Subject: [PATCH 126/158] Bitwuzla: Added Bitwuzla to
 testFormulaAccessAfterClose.

---
 src/org/sosy_lab/java_smt/test/SolverContextTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverContextTest.java b/src/org/sosy_lab/java_smt/test/SolverContextTest.java
index e1a5708096..e74606355c 100644
--- a/src/org/sosy_lab/java_smt/test/SolverContextTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverContextTest.java
@@ -99,7 +99,7 @@ public void testFormulaAccessAfterClose() {
     assertThat(term.hashCode()).isEqualTo(hash);
     assertThat(term).isEqualTo(term2);
 
-    // For CVC4, we close the solver, however do not finalize and cleanup the terms,
+    // For CVC4 and Bitwuzla, we close the solver, however do not finalize and cleanup the terms,
     // thus direct access is possible, operations are forbidden.
     // See https://github.com/sosy-lab/java-smt/issues/169
     assume()
@@ -107,7 +107,7 @@ public void testFormulaAccessAfterClose() {
             "Solver %s does not support to access formulae after closing the context",
             solverToUse())
         .that(solverToUse())
-        .isNotEqualTo(Solvers.CVC4);
+        .isNoneOf(Solvers.CVC4, Solvers.BITWUZLA);
 
     // Java-based solvers allow more, i.e. they wait for GC, which is nice.
 

From 58e73e640252d9f2a61d19bbb86561f55f1f5355 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 16:59:25 +0200
Subject: [PATCH 127/158] Enable and improve exists quantifier Bitwuzla native
 test

---
 .../bitwuzla/BitwuzlaNativeApiTest.java       | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index d4c445afb0..62b084d8d1 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -514,11 +514,9 @@ public void testExtend() {
     assertThat(indices.get(0)).isEqualTo(2);
   }
 
-  // Todo:
-  @Ignore
   @Test
   public void testExists() {
-    // EXISTS x, y . x = z AND y = z implies x = y
+    // EXISTS x, y . (z != 0) AND (x = z AND y = z) implies x = y
     Sort bvSort8 = termManager.mk_bv_sort(8);
     Term x = termManager.mk_const(bvSort8, "x");
     Term y = termManager.mk_const(bvSort8, "y");
@@ -527,8 +525,12 @@ public void testExists() {
     Term xEqZ = termManager.mk_term(Kind.EQUAL, x, z);
     Term yEqZ = termManager.mk_term(Kind.EQUAL, y, z);
     Term xEqY = termManager.mk_term(Kind.EQUAL, x, y);
-    Term formula =
+    Term zNotEq0 =
+        termManager.mk_term(
+            Kind.NOT, termManager.mk_term(Kind.EQUAL, z, termManager.mk_bv_zero(bvSort8)));
+    Term implies =
         termManager.mk_term(Kind.IMPLIES, termManager.mk_term(Kind.AND, xEqZ, yEqZ), xEqY);
+    Term formula = termManager.mk_term(Kind.AND, zNotEq0, implies);
 
     // Substitute the free vars with bound vars
     Term xB = termManager.mk_var(bvSort8, "x");
@@ -545,9 +547,21 @@ public void testExists() {
     // Check SAT
     bitwuzla.assert_formula(ex);
     Result res = bitwuzla.check_sat();
-    assertThat(res).isEqualTo(Result.UNSAT);
+    assertThat(res).isEqualTo(Result.SAT);
 
-    // Model
+    // Get model values and compare
+    String xString = x.toString();
+    assertThat(xString).isEqualTo("x");
+    String xValue = bitwuzla.get_value(x).toString();
+    String yString = y.toString();
+    assertThat(yString).isEqualTo("y");
+    String yValue = bitwuzla.get_value(y).toString();
+    String zString = z.toString();
+    assertThat(zString).isEqualTo("z");
+    String zValue = bitwuzla.get_value(z).toString();
+    assertThat(xValue).isEqualTo(yValue);
+    assertThat(zValue).isEqualTo(xValue);
+    assertThat(zValue).doesNotContain("00000000");
   }
 
   private static final String SMT2DUMP =

From 140ba93fe228650411e71b2db7e3e7274202d53e Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 17:08:12 +0200
Subject: [PATCH 128/158] Bitwuzla: Added Bitwuzla to
 testFormulaAccessAfterClose.

---
 build/build-publish-solvers/solver-bitwuzla.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index 8760d17251..11fa1a21c0 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -33,6 +33,12 @@ SPDX-License-Identifier: Apache-2.0
             The path has to point to the root GMP folder with version equal to or larger than 6.1.
             Note that shell substitutions do not work and a full absolute path has to be specified.
         </fail>
+        <fail unless="bitwuzla.rebuildWrapper">
+            Please specify if the Bitwuzla wrapper should be rebuild with the flag
+            -Dbitwuzla.rebuildWrapper=BOOL. Rebuilding the wrapper is necessary if the Bitwuzla API
+            has changed since the last release, but requires the SWIG tool to be installed on
+            this machine.
+        </fail>
 
         <!-- get a naive version -->
         <exec executable="git" dir="${bitwuzla.path}" outputproperty="bitwuzla.revision"

From 60638622339a72fcf34f2a57c39539dc0abd9ba1 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 11 Apr 2024 18:08:12 +0200
Subject: [PATCH 129/158] Add Bitvector concurrency test for stack and disable
 Bitwuzla for this test category as it does not support it

---
 .../java_smt/test/SolverConcurrencyTest.java  | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java b/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
index eb3bd0bf3a..01fa2e3241 100644
--- a/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverConcurrencyTest.java
@@ -128,6 +128,7 @@ private void requireConcurrentMultipleStackSupport() {
         .that(solver)
         .isNoneOf(
             Solvers.SMTINTERPOL,
+            Solvers.BITWUZLA,
             Solvers.BOOLECTOR,
             Solvers.OPENSMT, // INFO: OpenSMT does not support concurrent stacks
             Solvers.MATHSAT5,
@@ -410,7 +411,8 @@ public void testConcurrentOptimization() {
    * the Threads).
    */
   @Test
-  public void testConcurrentStack() throws InvalidConfigurationException, InterruptedException {
+  public void testConcurrentIntegerStack()
+      throws InvalidConfigurationException, InterruptedException {
     requireIntegers();
     requireConcurrentMultipleStackSupport();
     SolverContext context = initSolver();
@@ -437,6 +439,39 @@ public void testConcurrentStack() throws InvalidConfigurationException, Interrup
     closeSolver(context);
   }
 
+  /**
+   * Test solving of large formula on concurrent stacks in one context (Stacks are not created in
+   * the Threads).
+   */
+  @Test
+  public void testConcurrentBitvectorStack()
+      throws InvalidConfigurationException, InterruptedException {
+    requireBitvectors();
+    requireConcurrentMultipleStackSupport();
+    SolverContext context = initSolver();
+    FormulaManager mgr = context.getFormulaManager();
+    BitvectorFormulaManager bvmgr = mgr.getBitvectorFormulaManager();
+    BooleanFormulaManager bmgr = mgr.getBooleanFormulaManager();
+    HardBitvectorFormulaGenerator gen = new HardBitvectorFormulaGenerator(bvmgr, bmgr);
+
+    ConcurrentLinkedQueue<BasicProverEnvironment<?>> proverList = new ConcurrentLinkedQueue<>();
+    for (int i = 0; i < NUMBER_OF_THREADS; i++) {
+      BooleanFormula instance = gen.generate(INTEGER_FORMULA_GEN.getOrDefault(solver, 9));
+      BasicProverEnvironment<?> pe = context.newProverEnvironment();
+      pe.push(instance);
+      proverList.add(pe);
+    }
+    assertConcurrency(
+        "testConcurrentStack",
+        () -> {
+          BasicProverEnvironment<?> stack = proverList.poll();
+          assertWithMessage("Solver %s failed a concurrency test", solverToUse())
+              .that(stack.isUnsat())
+              .isTrue();
+        });
+    closeSolver(context);
+  }
+
   /**
    * Uses HardBitvectorFormulaGenerator for longer test-cases to assess concurrency problems. Length
    * is very solver depended, so make sure you choose an appropriate number for the used solver.

From 01bacf64e9fd23c2ff27ca9fd414638eea1a8a2a Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 23:24:50 +0200
Subject: [PATCH 130/158] Bitwuzla: Renamed phantomReferences.patch to
 swigWrapper.patch and included the copyright headers for all autogenerated
 files in it.

---
 .../build-publish-solvers/solver-bitwuzla.xml |   2 +-
 .../libbitwuzla/phantomReferences.patch       |  36 --
 .../source/libbitwuzla/swigWrapper.patch      | 327 ++++++++++++++++++
 ...atch.license => swigWrapper.patch.license} |   0
 4 files changed, 328 insertions(+), 37 deletions(-)
 delete mode 100644 lib/native/source/libbitwuzla/phantomReferences.patch
 create mode 100644 lib/native/source/libbitwuzla/swigWrapper.patch
 rename lib/native/source/libbitwuzla/{phantomReferences.patch.license => swigWrapper.patch.license} (100%)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index 11fa1a21c0..cde3e0b588 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -103,7 +103,7 @@ SPDX-License-Identifier: Apache-2.0
         <exec executable="patch" failonerror="true">
             <arg value="-p0"/>
             <arg value="-i"/>
-            <arg value="lib/native/source/libbitwuzla/phantomReferences.patch"/>
+            <arg value="lib/native/source/libbitwuzla/swigWrapper.patch"/>
         </exec>
     </target>
 
diff --git a/lib/native/source/libbitwuzla/phantomReferences.patch b/lib/native/source/libbitwuzla/phantomReferences.patch
deleted file mode 100644
index b4dabfdca3..0000000000
--- a/lib/native/source/libbitwuzla/phantomReferences.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-02-28 15:41:51.146095724 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-02-28 15:45:08.800578060 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Term(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Term(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java	2024-02-28 15:41:51.230096898 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java	2024-02-28 15:45:02.164502752 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_TermManager(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_TermManager(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
-diff -ur lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
---- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-02-28 15:41:51.030094103 +0100
-+++ lib/native/source/libbitwuzla/dst/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-02-28 15:44:17.651984547 +0100
-@@ -42,7 +42,7 @@
-     if (swigCPtr != 0) {
-       if (swigCMemOwn) {
-         swigCMemOwn = false;
--        BitwuzlaNativeJNI.delete_Vector_Term(swigCPtr);
-+        //BitwuzlaNativeJNI.delete_Vector_Term(swigCPtr);
-       }
-       swigCPtr = 0;
-     }
diff --git a/lib/native/source/libbitwuzla/swigWrapper.patch b/lib/native/source/libbitwuzla/swigWrapper.patch
new file mode 100644
index 0000000000..a7a12b0707
--- /dev/null
+++ b/lib/native/source/libbitwuzla/swigWrapper.patch
@@ -0,0 +1,327 @@
+diff -ru lib/native/source/libbitwuzla/bitwuzla_wrap.cpp lib/native/source/libbitwuzla.patched/bitwuzla_wrap.cpp
+--- lib/native/source/libbitwuzla/bitwuzla_wrap.cpp	2024-04-11 23:15:32.672163826 +0200
++++ lib/native/source/libbitwuzla.patched/bitwuzla_wrap.cpp	2024-04-11 23:09:55.299051564 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/bitwuzla_wrap.h lib/native/source/libbitwuzla.patched/bitwuzla_wrap.h
+--- lib/native/source/libbitwuzla/bitwuzla_wrap.h	2024-04-11 23:15:32.672163826 +0200
++++ lib/native/source/libbitwuzla.patched/bitwuzla_wrap.h	2024-04-11 23:09:55.299051564 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java	2024-04-11 23:15:32.656163580 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Bitwuzla.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java	2024-04-11 23:15:32.672163826 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNative.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java	2024-04-11 23:15:32.672163826 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/BitwuzlaNativeJNI.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java	2024-04-11 23:15:32.500161180 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Kind.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-04-11 23:15:32.488160995 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Map_TermTerm.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java	2024-04-11 23:15:32.500161180 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Option.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java	2024-04-11 23:15:32.524161549 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Options.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java	2024-04-11 23:15:32.672163826 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Parser.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java	2024-04-11 23:15:32.492161057 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Result.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java	2024-04-11 23:15:32.496161118 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/RoundingMode.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java	2024-04-11 23:15:32.564162164 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Sort.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java	2024-04-11 23:15:32.568162226 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Terminator.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-04-11 23:15:32.552161980 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Term.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+@@ -42,7 +50,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Term(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Term(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java	2024-04-11 23:15:32.640163334 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/TermManager.java	2024-04-11 23:09:55.303051623 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+@@ -42,7 +50,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_TermManager(swigCPtr);
++        //BitwuzlaNativeJNI.delete_TermManager(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java	2024-04-11 23:15:32.376159272 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Int.java	2024-04-11 23:09:55.307051682 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java	2024-04-11 23:15:32.452160441 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Sort.java	2024-04-11 23:09:55.307051682 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java	2024-04-11 23:15:32.400159641 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_String.java	2024-04-11 23:09:55.307051682 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+diff -ru lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java
+--- lib/native/source/libbitwuzla/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-04-11 23:15:32.428160072 +0200
++++ lib/native/source/libbitwuzla.patched/src/org/sosy_lab/java_smt/solvers/bitwuzla/api/Vector_Term.java	2024-04-11 23:09:55.307051682 +0200
+@@ -1,3 +1,11 @@
++// This file is part of JavaSMT,
++// an API wrapper for a collection of SMT solvers:
++// https://github.com/sosy-lab/java-smt
++//
++// SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
++//
++// SPDX-License-Identifier: Apache-2.0
++
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (https://www.swig.org).
+  * Version 4.1.0
+@@ -42,7 +50,7 @@
+     if (swigCPtr != 0) {
+       if (swigCMemOwn) {
+         swigCMemOwn = false;
+-        BitwuzlaNativeJNI.delete_Vector_Term(swigCPtr);
++        //BitwuzlaNativeJNI.delete_Vector_Term(swigCPtr);
+       }
+       swigCPtr = 0;
+     }
diff --git a/lib/native/source/libbitwuzla/phantomReferences.patch.license b/lib/native/source/libbitwuzla/swigWrapper.patch.license
similarity index 100%
rename from lib/native/source/libbitwuzla/phantomReferences.patch.license
rename to lib/native/source/libbitwuzla/swigWrapper.patch.license

From 2259126acfef3df92516b15eb6778b76101b3b53 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 23:36:20 +0200
Subject: [PATCH 131/158] Bitwuzla: Added build commands for gmp to the
 Bitwuzla build script.

---
 build/build-publish-solvers/solver-bitwuzla.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index cde3e0b588..29049d5c5e 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -53,6 +53,13 @@ SPDX-License-Identifier: Apache-2.0
         <!-- path to our local directory in lib/native -->
         <property name="source.path" value="${user.dir}/lib/native/source/libbitwuzla"/>
 
+        <!-- build gmp -->
+        <exec executable="./configure" dir="${gmp.path}" failonerror="true"/>
+        <exec executable="make" dir="${gmp.path}" failonerror="true">
+            <arg value="clean"/>
+        </exec>
+        <exec executable="make" dir="${gmp.path}" failonerror="true"/>
+
         <!-- build bitwuzla -->
         <exec executable="./configure.py" dir="${bitwuzla.path}" failonerror="true">
             <arg value="--shared"/>

From 5b7fb542fbe19d096974fe53457778951ea055b7 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Thu, 11 Apr 2024 23:56:50 +0200
Subject: [PATCH 132/158] Bitwuzla: Documented the build script.

---
 .../build-publish-solvers/solver-bitwuzla.xml | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index 29049d5c5e..9ea9f0b1f7 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -15,6 +15,28 @@ SPDX-License-Identifier: Apache-2.0
 
     <import file="macros.xml"/>
 
+    <!-- This file is split into four parts:
+    * Target build-bitwuzla checks that all required options were used on the command line.
+      We need the paths to gmp and the Bitwuzla source, along with an option that specified which
+      version tag to use with the compiled binaries. In addition, we require the user to specify
+      whether the JNI bindings should be recreated or not. This step is necessary if the API of
+      Bitwuzla has changed since the last release, but it requires SWIG to be installed on the
+      local machine.
+    * After that build-wrapper is run if -Dbitwuzla.rebuildWrapper was set to "true".
+      In this build step we execute SWIG to automatically generate Java bindings for Bitwuzla from
+      our SWIG interface script. The bindings are then patched to handle some phantom reference
+      issues, and to add copyright headers to all generated files.
+    * If the option -Dbitwuzla.rebuildWrapper was set to "false" instead, the target skip-wrapper
+      is run and simply outputs a warning message about having to rebuild the bindings after API
+      changes.
+    * Either way the next step is package-bitwuzla, which continues the build by compiling the
+      autogenerated code and then patching the dependencies in the final library files with
+      patchelf.
+
+    After all these steps are executed target publish-bitwuzla is used to copy the files to the
+    repository.
+    -->
+
     <!-- Determine version and build the Bitwuzla binaries -->
     <target name="build-bitwuzla">
         <fail unless="bitwuzla.path">

From 18f406c41b88f5215f6fe7e5e3923f5c19ab8980 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 12 Apr 2024 01:46:39 +0200
Subject: [PATCH 133/158] Bitwuzla: Avoid possible performance issue in isTrue
 and isFalse from BitwuzlaBooleanFormulaManager.

---
 .../solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
index 6dbd1da7a3..364b665ee0 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
@@ -97,12 +97,12 @@ protected Term equivalence(Term bits1, Term bits2) {
 
   @Override
   protected boolean isTrue(Term bits) {
-    return bits.is_true();
+    return bits == pTrue || bits.is_true();
   }
 
   @Override
   protected boolean isFalse(Term bits) {
-    return bits.is_false();
+    return bits == pFalse || bits.is_false();
   }
 
   @Override

From c2b7709e839d74efc35eae15570f47a73d1b103e Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 12 Apr 2024 01:50:48 +0200
Subject: [PATCH 134/158] Bitwuzla: Cleaned up getRoundingModeImpl from
 BitwuzlaFloatingPointManager.

---
 .../bitwuzla/BitwuzlaFloatingPointManager.java  | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
index 64a746cee4..95b72a9400 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFloatingPointManager.java
@@ -43,27 +43,20 @@ protected Term getDefaultRoundingMode() {
 
   @Override
   protected Term getRoundingModeImpl(FloatingPointRoundingMode pFloatingPointRoundingMode) {
-    Term out;
     switch (pFloatingPointRoundingMode) {
       case NEAREST_TIES_TO_EVEN:
-        out = termManager.mk_rm_value(RoundingMode.RNE);
-        break;
+        return termManager.mk_rm_value(RoundingMode.RNE);
       case NEAREST_TIES_AWAY:
-        out = termManager.mk_rm_value(RoundingMode.RNA);
-        break;
+        return termManager.mk_rm_value(RoundingMode.RNA);
       case TOWARD_POSITIVE:
-        out = termManager.mk_rm_value(RoundingMode.RTP);
-        break;
+        return termManager.mk_rm_value(RoundingMode.RTP);
       case TOWARD_NEGATIVE:
-        out = termManager.mk_rm_value(RoundingMode.RTN);
-        break;
+        return termManager.mk_rm_value(RoundingMode.RTN);
       case TOWARD_ZERO:
-        out = termManager.mk_rm_value(RoundingMode.RTZ);
-        break;
+        return termManager.mk_rm_value(RoundingMode.RTZ);
       default:
         throw new AssertionError("Unexpected value for Floating-Point rounding mode.");
     }
-    return out;
   }
 
   @Override

From 1ad1d6a6e313e91a8c20d760af95ef50a269a194 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 12 Apr 2024 01:51:57 +0200
Subject: [PATCH 135/158] Bitwuzla: Removed duplicate comments from
 BitwuzlaFormula.

---
 .../solvers/bitwuzla/BitwuzlaFormula.java         | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
index 2ebf691d8b..9605595e85 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
@@ -32,26 +32,11 @@ final Term getTerm() {
     return bitwuzlaTerm;
   }
 
-  /**
-   * returns an arbitrary representation of the formula, might be human- or machine-readable.
-   *
-   * <p>We do not guarantee that the returned String is in any way related to the formula. The
-   * solver might apply escaping or even un-escaping. A user should not use the returned String for
-   * further processing. For analyzing formulas, we recommend using a {@link FormulaVisitor}.
-   */
   @Override
   public String toString() {
     return bitwuzlaTerm.toString();
   }
 
-  /**
-   * checks whether the other object is a formula of the same structure. Does not apply an expensive
-   * SAT-check to check equisatisfiability.
-   *
-   * <p>Two formulas that are structured in the same way, are determined as "equal". Due to
-   * transformations and simplifications, two equisatisfiable formulas with different structure
-   * might not be determined as "equal".
-   */
   @Override
   public boolean equals(Object other) {
     if (other == this) {

From 45691bc86ed564716b3c5a6604d7f95ee17ebcca Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 12 Apr 2024 02:19:15 +0200
Subject: [PATCH 136/158] Bitwuzla: Fixed commit
 18f406c41b88f5215f6fe7e5e3923f5c19ab8980

---
 .../solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
index 364b665ee0..95c72f65df 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaBooleanFormulaManager.java
@@ -97,12 +97,12 @@ protected Term equivalence(Term bits1, Term bits2) {
 
   @Override
   protected boolean isTrue(Term bits) {
-    return bits == pTrue || bits.is_true();
+    return pTrue.equals(bits);
   }
 
   @Override
   protected boolean isFalse(Term bits) {
-    return bits == pFalse || bits.is_false();
+    return pFalse.equals(bits);
   }
 
   @Override

From b11228b165365605b15a6ef5b9bce6cb293ddfb9 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Fri, 12 Apr 2024 02:23:34 +0200
Subject: [PATCH 137/158] Bitwuzla: Fixed formatting.

---
 src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
index 9605595e85..8a2c8842c5 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormula.java
@@ -16,7 +16,6 @@
 import org.sosy_lab.java_smt.api.FloatingPointRoundingModeFormula;
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.api.FormulaType;
-import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
 
 @Immutable

From 28c8469694bda1305114f9fd30083f9304838d76 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 10:31:02 +0200
Subject: [PATCH 138/158] Add comment about ressources to the phantom reference
 comment in the build script

---
 build/build-publish-solvers/solver-bitwuzla.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/build-publish-solvers/solver-bitwuzla.xml b/build/build-publish-solvers/solver-bitwuzla.xml
index 9ea9f0b1f7..6c2967819c 100644
--- a/build/build-publish-solvers/solver-bitwuzla.xml
+++ b/build/build-publish-solvers/solver-bitwuzla.xml
@@ -129,6 +129,8 @@ SPDX-License-Identifier: Apache-2.0
 
         <!-- apply patch for the phantom reference issue -->
         <!-- FIXME: This will lead to memory leaks. We should look for a proper fix. -->
+        <!-- Update: the TermManger introduced in 0.4.0 handles memory of Terms/Sorts 
+             now and should clean up everything when we destroy it. -->
         <exec executable="patch" failonerror="true">
             <arg value="-p0"/>
             <arg value="-i"/>

From ada557cceb9d148d9759ad54f0771d36e52acaf9 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 11:27:52 +0200
Subject: [PATCH 139/158] Add a native Bitwuzla test for FP special value
 equality + documentation

---
 .../bitwuzla/BitwuzlaNativeApiTest.java       | 147 ++++++++++++++++++
 1 file changed, 147 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index 62b084d8d1..5375f8e76b 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -10,6 +10,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.truth.Truth;
 import org.junit.After;
 import org.junit.AssumptionViolatedException;
@@ -329,6 +330,152 @@ public void testBoolModel() {
     assertThat(and.kind()).isEqualTo(Kind.AND);
   }
 
+  // -0 == 0 for FP equals is SAT
+  // -0 != 0 for equals
+  // -------  NAN  --------
+  // nan != nan for FP equals
+  // nan == nan for equals is SAT
+  // ------  pos infinity and neg infinity  ------
+  // pos inf != neg inf FP eq
+  // pos inf != neg inf eq
+  @Test
+  public void testFpSpecialValueEquality() {
+    Sort fpSort = termManager.mk_fp_sort(5, 11);
+    for (RoundingMode roundMode :
+        ImmutableList.of(
+            RoundingMode.RNE,
+            RoundingMode.RTZ,
+            RoundingMode.RNA,
+            RoundingMode.RTN,
+            RoundingMode.RTP)) {
+      Term rm = termManager.mk_rm_value(roundMode);
+      Term zero = termManager.mk_fp_pos_zero(fpSort);
+      assertThat(zero.is_fp_value_pos_zero()).isTrue();
+      assertThat(zero.is_fp_value_neg_zero()).isFalse();
+      Term negZero = termManager.mk_fp_neg_zero(fpSort);
+      assertThat(negZero.is_fp_value_neg_zero()).isTrue();
+      assertThat(negZero.is_fp_value_pos_zero()).isFalse();
+
+      // -0 == 0 for FP equals is SAT
+      Term negZeroFpEqZero = termManager.mk_term(Kind.FP_EQUAL, zero, negZero);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(negZeroFpEqZero);
+      Result res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.SAT);
+      bitwuzla.pop(1);
+
+      // -0 != 0 for fp equals is UNSAT
+      Term notNegZeroFpEqZero = termManager.mk_term(Kind.NOT, negZeroFpEqZero);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(notNegZeroFpEqZero);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.UNSAT);
+      bitwuzla.pop(1);
+
+      // -0 == 0 for equals is UNSAT
+      Term negZeroEqZero = termManager.mk_term(Kind.EQUAL, zero, negZero);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(negZeroEqZero);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.UNSAT);
+      bitwuzla.pop(1);
+
+      // -0 != 0 for equals is SAT
+      Term notnegZeroEqZero = termManager.mk_term(Kind.NOT, negZeroEqZero);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(notnegZeroEqZero);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.SAT);
+      bitwuzla.pop(1);
+
+      // -------  NAN  --------
+      Term nan = termManager.mk_fp_nan(fpSort);
+      assertThat(nan.is_fp_value_nan()).isTrue();
+      assertThat(negZero.is_fp_value_nan()).isFalse();
+      assertThat(zero.is_fp_value_nan()).isFalse();
+      assertThat(nan.is_fp_value_neg_zero()).isFalse();
+      assertThat(nan.is_fp_value_pos_zero()).isFalse();
+
+      // nan == nan for FP equals is UNSAT
+      Term nanFpEqNan = termManager.mk_term(Kind.FP_EQUAL, nan, nan);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(nanFpEqNan);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.UNSAT);
+      bitwuzla.pop(1);
+
+      // nan != nan for fp equals is SAT
+      Term notNanFpEqNan = termManager.mk_term(Kind.NOT, nanFpEqNan);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(notNanFpEqNan);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.SAT);
+      bitwuzla.pop(1);
+
+      // nan == nan for equals is SAT
+      Term nanEqNan = termManager.mk_term(Kind.EQUAL, nan, nan);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(nanEqNan);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.SAT);
+      bitwuzla.pop(1);
+
+      // nan != nan for equals is UNSAT
+      Term notNanEqNan = termManager.mk_term(Kind.NOT, nanEqNan);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(notNanEqNan);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.UNSAT);
+      bitwuzla.pop(1);
+
+      // ------  pos infinity and neg infinity  ------
+      Term posInf = termManager.mk_fp_pos_inf(fpSort);
+      Term negInf = termManager.mk_fp_neg_inf(fpSort);
+      assertThat(posInf.is_fp_value_pos_inf()).isTrue();
+      assertThat(posInf.is_fp_value_neg_inf()).isFalse();
+      assertThat(negInf.is_fp_value_pos_inf()).isFalse();
+      assertThat(negInf.is_fp_value_neg_inf()).isTrue();
+      assertThat(nan.is_fp_value_pos_inf()).isFalse();
+      assertThat(nan.is_fp_value_neg_inf()).isFalse();
+      assertThat(zero.is_fp_value_pos_inf()).isFalse();
+      assertThat(zero.is_fp_value_neg_inf()).isFalse();
+      assertThat(negZero.is_fp_value_pos_inf()).isFalse();
+      assertThat(negZero.is_fp_value_neg_inf()).isFalse();
+
+      // pos inf == neg inf fp eq is UNSAT
+      Term posInfFpEqNegInf = termManager.mk_term(Kind.FP_EQUAL, posInf, negInf);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(posInfFpEqNegInf);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.UNSAT);
+      bitwuzla.pop(1);
+
+      // pos inf != neg inf fp eq is SAT
+      Term notPosInfFpEqNegInf = termManager.mk_term(Kind.NOT, posInfFpEqNegInf);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(notPosInfFpEqNegInf);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.SAT);
+      bitwuzla.pop(1);
+
+      // pos inf == neg inf eq is UNSAT
+      Term posInfEqNegInf = termManager.mk_term(Kind.EQUAL, posInf, negInf);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(posInfEqNegInf);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.UNSAT);
+      bitwuzla.pop(1);
+
+      // pos inf != neg inf eq is SAT
+      Term notPosInfEqNegInf = termManager.mk_term(Kind.NOT, posInfEqNegInf);
+      bitwuzla.push(1);
+      bitwuzla.assert_formula(notPosInfEqNegInf);
+      res = bitwuzla.check_sat();
+      assertThat(res).isEqualTo(Result.SAT);
+      bitwuzla.pop(1);
+    }
+  }
+
   @Test
   public void testFpModel() {
     Sort fpSort = termManager.mk_fp_sort(5, 11);

From 7e3499e4d37816afa8cb1909ac506e086ab11add Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 11:28:14 +0200
Subject: [PATCH 140/158] Better choose FP equality in the Bitwuzla model

---
 src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
index cfe958c7ca..42eec05d10 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaModel.java
@@ -201,7 +201,7 @@ private String getArrayName(Term array) {
   private Term buildEqForTwoTerms(Term left, Term right) {
     assert left.sort().equals(right.sort());
     Kind kind = Kind.EQUAL;
-    if (left.sort().is_fp()) {
+    if (left.sort().is_fp() || right.sort().is_fp()) {
       kind = Kind.FP_EQUAL;
     }
     return bitwuzlaCreator.getTermManager().mk_term(kind, left, right);

From 454833d0d9590cb377386cda369bc862b2087022 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 13:04:40 +0200
Subject: [PATCH 141/158] Improve readability of Bitwuzlas quantifier creation

---
 .../solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
index 168133d9e6..21831de58b 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaQuantifiedFormulaManager.java
@@ -57,11 +57,11 @@ public Term mkQuantifier(Quantifier q, List<Term> vars, Term body) {
     }
     body = termManager.substitute_term(body, map);
 
-    Term[] argsAndBody = new Term[2];
-    argsAndBody[1] = body;
     Term currentFormula = body;
     for (int i = 0; i < vars.size(); i++) {
+      Term[] argsAndBody = new Term[2];
       argsAndBody[0] = substVars[i];
+      argsAndBody[1] = currentFormula;
       if (q.equals(Quantifier.FORALL)) {
         currentFormula =
             termManager.mk_term(Kind.FORALL, new Vector_Term(argsAndBody), new Vector_Int());
@@ -70,7 +70,6 @@ public Term mkQuantifier(Quantifier q, List<Term> vars, Term body) {
         currentFormula =
             termManager.mk_term(Kind.EXISTS, new Vector_Term(argsAndBody), new Vector_Int());
       }
-      argsAndBody[1] = currentFormula;
     }
     return currentFormula;
   }

From ba8be95fca6635795a2b2b38bad9fc86a9235705 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 13:05:03 +0200
Subject: [PATCH 142/158] Add requireQuantifierElimination() to
 SolverBasedTest0

---
 .../java_smt/test/SolverBasedTest0.java         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java b/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
index d57494e017..96cade3027 100644
--- a/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
+++ b/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
@@ -241,6 +241,23 @@ protected final void requireQuantifiers() {
         .isNotNull();
   }
 
+  /** Skip test if the solver does not support quantifier elimination. */
+  protected final void requireQuantifierElimination() {
+    try {
+      assume()
+          .withMessage("Solver %s does not support quantifier elimination", solverToUse())
+          .that(qmgr.eliminateQuantifiers(bmgr.makeTrue()))
+          .isNotNull();
+    } catch (InterruptedException | SolverException pE) {
+      throw new RuntimeException(pE);
+    } catch (UnsupportedOperationException uoe) {
+      assume()
+          .withMessage("Solver %s does not support quantifier elimination", solverToUse())
+          .that(uoe)
+          .isNotInstanceOf(Exception.class);
+    }
+  }
+
   /** Skip test if the solver does not support arrays. */
   protected /*final*/ void requireArrays() {
     assume()

From a0b02d3cc11187b34a4233a13ac2558eb2e6f9fc Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 13:05:54 +0200
Subject: [PATCH 143/158] Decouple LIA and BV setups in QuantifierManagerTest
 from the Before annotation, as this filters all solvers that don't support
 both and add requireQuantifierElimination()

---
 .../java_smt/test/QuantifierManagerTest.java  | 133 +++++++++++-------
 1 file changed, 80 insertions(+), 53 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java b/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
index cf712ef5d7..a38e68ac10 100644
--- a/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
@@ -18,7 +18,6 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.Before;
 import org.junit.Test;
 import org.sosy_lab.common.UniqueIdGenerator;
 import org.sosy_lab.java_smt.SolverContextFactory.Solvers;
@@ -64,7 +63,6 @@ public class QuantifierManagerTest extends SolverBasedTest0.ParameterizedSolverB
   @SuppressWarnings("checkstyle:membername")
   private BooleanFormula bv_forall_x_a_at_x_eq_0;
 
-  @Before
   public void setUpLIA() {
     requireIntegers();
     requireArrays();
@@ -79,7 +77,6 @@ public void setUpLIA() {
     forall_x_a_at_x_eq_0 = qmgr.forall(ImmutableList.of(x), a_at_x_eq_0);
   }
 
-  @Before
   public void setUpBV() {
     requireBitvectors();
     requireArrays();
@@ -122,7 +119,7 @@ public void testLIAForallArrayConjunctUnsat() throws SolverException, Interrupte
         .isNotEqualTo(Solvers.CVC5);
 
     // (forall x . b[x] = 0) AND (b[123] = 1) is UNSAT
-    requireIntegers();
+    setUpLIA();
 
     BooleanFormula f =
         bmgr.and(
@@ -139,7 +136,7 @@ public void testBVForallArrayConjunctUnsat() throws SolverException, Interrupted
         .isNotEqualTo(Solvers.CVC5);
 
     // (forall x . b[x] = 0) AND (b[123] = 1) is UNSAT
-    requireBitvectors();
+    setUpBV();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -162,7 +159,7 @@ public void testLIAForallArrayConjunctSat() throws SolverException, InterruptedE
         .isNotEqualTo(Solvers.CVC5);
 
     // (forall x . b[x] = 0) AND (b[123] = 0) is SAT
-    requireIntegers();
+    setUpLIA();
 
     BooleanFormula f =
         bmgr.and(
@@ -184,7 +181,7 @@ public void testBVForallArrayConjunctSat() throws SolverException, InterruptedEx
         .isNotEqualTo(Solvers.CVC5);
 
     // (forall x . b[x] = 0) AND (b[123] = 0) is SAT
-    requireBitvectors();
+    setUpBV();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -212,7 +209,7 @@ public void testLIAForallArrayDisjunct1() throws SolverException, InterruptedExc
         .isNotEqualTo(Solvers.CVC5);
 
     // (forall x . b[x] = 0) AND (b[123] = 1 OR b[123] = 0) is SAT
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.and(
             qmgr.forall(ImmutableList.of(x), a_at_x_eq_0),
@@ -234,7 +231,7 @@ public void testLIAForallArrayDisjunctSat2() throws SolverException, Interrupted
         .that(solverToUse())
         .isNotEqualTo(Solvers.CVC5);
     // (forall x . b[x] = 0) OR (b[123] = 1) is SAT
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.or(
             qmgr.forall(ImmutableList.of(x), a_at_x_eq_0),
@@ -255,7 +252,7 @@ public void testLIANotExistsArrayConjunct1() throws SolverException, Interrupted
         .isNotEqualTo(Solvers.CVC5);
 
     // (not exists x . not b[x] = 0) AND (b[123] = 1) is UNSAT
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.and(
             bmgr.not(qmgr.exists(ImmutableList.of(x), bmgr.not(a_at_x_eq_0))),
@@ -275,7 +272,7 @@ public void testLIANotExistsArrayConjunct2() throws SolverException, Interrupted
         .isNotEqualTo(Solvers.CVC5);
 
     // (not exists x . not b[x] = 0) AND (b[123] = 0) is SAT
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.and(
             bmgr.not(qmgr.exists(ImmutableList.of(x), bmgr.not(a_at_x_eq_0))),
@@ -295,7 +292,7 @@ public void testLIANotExistsArrayConjunct3() throws SolverException, Interrupted
         .isNotEqualTo(Solvers.CVC5);
 
     // (not exists x . b[x] = 0) AND (b[123] = 0) is UNSAT
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.and(
             bmgr.not(qmgr.exists(ImmutableList.of(x), a_at_x_eq_0)),
@@ -311,7 +308,7 @@ public void testLIANotExistsArrayDisjunct1() throws SolverException, Interrupted
         .isNotEqualTo(Solvers.CVC5);
 
     // (not exists x . not b[x] = 0) AND (b[123] = 1 OR b[123] = 0) is SAT
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.and(
             bmgr.not(qmgr.exists(ImmutableList.of(x), bmgr.not(a_at_x_eq_0))),
@@ -333,7 +330,7 @@ public void testLIANotExistsArrayDisjunct2() throws SolverException, Interrupted
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
         .isNotEqualTo(Solvers.CVC5);
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.or(
             bmgr.not(qmgr.exists(ImmutableList.of(x), bmgr.not(a_at_x_eq_0))),
@@ -349,7 +346,7 @@ public void testLIANotExistsArrayDisjunct2() throws SolverException, Interrupted
   @Test
   public void testLIAExistsArrayConjunct1() throws SolverException, InterruptedException {
     // (exists x . b[x] = 0) AND (b[123] = 1) is SAT
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.and(
             qmgr.exists(ImmutableList.of(x), a_at_x_eq_0),
@@ -360,7 +357,8 @@ public void testLIAExistsArrayConjunct1() throws SolverException, InterruptedExc
   @Test
   public void testBVExistsArrayConjunct1() throws SolverException, InterruptedException {
     // (exists x . b[x] = 0) AND (b[123] = 1) is SAT
-    requireBitvectors();
+    setUpBV();
+    setUpLIA();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -384,7 +382,7 @@ public void testLIAExistsArrayConjunct2() throws SolverException, InterruptedExc
 
     // (exists x . b[x] = 1) AND  (forall x . b[x] = 0) is UNSAT
 
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.and(qmgr.exists(ImmutableList.of(x), a_at_x_eq_1), forall_x_a_at_x_eq_0);
     assertThatFormula(f).isUnsatisfiable();
@@ -398,7 +396,7 @@ public void testBVExistsArrayConjunct2() throws SolverException, InterruptedExce
         .isNotEqualTo(Solvers.CVC5);
 
     // (exists x . b[x] = 1) AND (forall x . b[x] = 0) is UNSAT
-    requireBitvectors();
+    setUpBV();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -417,7 +415,7 @@ public void testLIAExistsArrayConjunct3() throws SolverException, InterruptedExc
         .isNotEqualTo(Solvers.CVC5);
 
     // (exists x . b[x] = 0) AND  (forall x . b[x] = 0) is SAT
-    requireIntegers();
+    setUpLIA();
 
     BooleanFormula f =
         bmgr.and(qmgr.exists(ImmutableList.of(x), a_at_x_eq_0), forall_x_a_at_x_eq_0);
@@ -432,7 +430,7 @@ public void testLIAExistsArrayConjunct3() throws SolverException, InterruptedExc
   @Test
   public void testBVExistsArrayConjunct3() throws SolverException, InterruptedException {
     // (exists x . b[x] = 0) AND (forall x . b[x] = 0) is SAT
-    requireBitvectors();
+    setUpBV();
     // Princess does not support bitvectors in arrays
     // Boolector quants need to be reworked
     assume()
@@ -454,7 +452,7 @@ public void testBVExistsArrayConjunct3() throws SolverException, InterruptedExce
   public void testLIAExistsArrayDisjunct1() throws SolverException, InterruptedException {
     // (exists x . b[x] = 0) OR  (forall x . b[x] = 1) is SAT
 
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.or(
             qmgr.exists(ImmutableList.of(x), a_at_x_eq_0),
@@ -470,7 +468,7 @@ public void testLIAExistsArrayDisjunct1() throws SolverException, InterruptedExc
   @Test
   public void testBVExistsArrayDisjunct1() throws SolverException, InterruptedException {
     // (exists x . b[x] = 0) OR (forall x . b[x] = 1) is SAT
-    requireBitvectors();
+    setUpBV();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -487,7 +485,7 @@ public void testBVExistsArrayDisjunct1() throws SolverException, InterruptedExce
   public void testLIAExistsArrayDisjunct2() throws SolverException, InterruptedException {
     // (exists x . b[x] = 1) OR (exists x . b[x] = 1) is SAT
 
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         bmgr.or(
             qmgr.exists(ImmutableList.of(x), a_at_x_eq_1),
@@ -498,7 +496,7 @@ public void testLIAExistsArrayDisjunct2() throws SolverException, InterruptedExc
   @Test
   public void testBVExistsArrayDisjunct2() throws SolverException, InterruptedException {
     // (exists x . b[x] = 1) OR (exists x . b[x] = 1) is SAT
-    requireBitvectors();
+    setUpBV();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -515,7 +513,7 @@ public void testBVExistsArrayDisjunct2() throws SolverException, InterruptedExce
   public void testLIAContradiction() throws SolverException, InterruptedException {
     // forall x . x = x+1  is UNSAT
 
-    requireIntegers();
+    setUpLIA();
     BooleanFormula f =
         qmgr.forall(ImmutableList.of(x), imgr.equal(x, imgr.add(x, imgr.makeNumber(1))));
     assertThatFormula(f).isUnsatisfiable();
@@ -524,7 +522,7 @@ public void testLIAContradiction() throws SolverException, InterruptedException
   @Test
   public void testBVContradiction() throws SolverException, InterruptedException {
     // forall x . x = x+1 is UNSAT
-    requireBitvectors();
+    setUpBV();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -539,7 +537,7 @@ public void testBVContradiction() throws SolverException, InterruptedException {
   @Test
   public void testLIASimple() throws SolverException, InterruptedException {
     // forall x . x+2 = x+1+1  is SAT
-    requireIntegers();
+    setUpLIA();
 
     BooleanFormula f =
         qmgr.forall(
@@ -553,7 +551,7 @@ public void testLIASimple() throws SolverException, InterruptedException {
   @Test
   public void testBVSimple() throws SolverException, InterruptedException {
     // forall z . z+2 = z+1+1 is SAT
-    requireBitvectors();
+    setUpBV();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -571,7 +569,7 @@ public void testBVSimple() throws SolverException, InterruptedException {
 
   @Test
   public void testLIAEquality() throws SolverException, InterruptedException {
-    requireIntegers();
+    setUpLIA();
 
     // Note that due to the variable cache we simply get the existing var x here!
     IntegerFormula z = imgr.makeVariable("x");
@@ -583,7 +581,7 @@ public void testLIAEquality() throws SolverException, InterruptedException {
 
   @Test
   public void testBVEquality() throws SolverException, InterruptedException {
-    requireBitvectors();
+    setUpBV();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -596,7 +594,7 @@ public void testBVEquality() throws SolverException, InterruptedException {
 
   @Test
   public void testBVEquality2() throws SolverException, InterruptedException {
-    requireBitvectors();
+    setUpBV();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -610,7 +608,7 @@ public void testBVEquality2() throws SolverException, InterruptedException {
   public void testBVEquality3() throws SolverException, InterruptedException {
     // exists z . (forall y . z = y && z + 2 > z)
     // UNSAT because of bv behaviour
-    requireBitvectors();
+    setUpBV();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -630,7 +628,7 @@ public void testBVEquality3() throws SolverException, InterruptedException {
   @Test
   public void testLIABoundVariables() throws SolverException, InterruptedException {
     // If the free and bound vars are equal, this will be UNSAT
-    requireIntegers();
+    setUpLIA();
     IntegerFormula aa = imgr.makeVariable("aa");
     IntegerFormula one = imgr.makeNumber(1);
     BooleanFormula restrict = bmgr.not(imgr.equal(aa, one));
@@ -642,7 +640,7 @@ public void testLIABoundVariables() throws SolverException, InterruptedException
   @Test
   public void testBVBoundVariables() throws SolverException, InterruptedException {
     // If the free and bound vars are equal, this will be UNSAT
-    requireBitvectors();
+    setUpBV();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -657,7 +655,7 @@ public void testBVBoundVariables() throws SolverException, InterruptedException
 
   @Test
   public void testQELight() throws InterruptedException {
-    requireIntegers();
+    setUpLIA();
     assume().that(solverToUse()).isEqualTo(Solvers.Z3);
     // exists y : (y=4 && x=y+3) --> simplified: x=7
     IntegerFormula y = imgr.makeVariable("y");
@@ -672,7 +670,7 @@ public void testQELight() throws InterruptedException {
 
   @Test
   public void testIntrospectionForall() {
-    requireIntegers();
+    setUpLIA();
     BooleanFormula forall = qmgr.forall(ImmutableList.of(x), a_at_x_eq_0);
 
     final AtomicBoolean isQuantifier = new AtomicBoolean(false);
@@ -704,7 +702,7 @@ public Void visitQuantifier(
 
   @Test
   public void testIntrospectionExists() {
-    requireIntegers();
+    setUpLIA();
     BooleanFormula exists = qmgr.exists(ImmutableList.of(x), a_at_x_eq_0);
     final AtomicBoolean isQuantifier = new AtomicBoolean(false);
     final AtomicBoolean isForall = new AtomicBoolean(false);
@@ -744,11 +742,35 @@ public Void visitQuantifier(
 
   @Test(expected = IllegalArgumentException.class)
   public void testEmpty() {
+    assume()
+        .withMessage(
+            "TODO: The JavaSMT code for Princess explicitly allows this. The others "
+                + "throw a NullPointerException.")
+        .that(solverToUse())
+        .isNoneOf(
+            Solvers.OPENSMT,
+            Solvers.MATHSAT5,
+            Solvers.SMTINTERPOL,
+            Solvers.YICES2,
+            Solvers.PRINCESS);
 
+    // An empty list of quantified variables throws an exception.
+    @SuppressWarnings("unused")
+    BooleanFormula quantified = qmgr.exists(ImmutableList.of(), bmgr.makeVariable("b"));
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void testEmpty2() {
     assume()
-        .withMessage("TODO: The JavaSMT code for Princess explicitly allows this.")
+        .withMessage("These solvers throw a IllegalArgumentException")
         .that(solverToUse())
-        .isNotEqualTo(Solvers.PRINCESS);
+        .isNoneOf(
+            Solvers.Z3,
+            Solvers.PRINCESS,
+            Solvers.BOOLECTOR,
+            Solvers.CVC4,
+            Solvers.CVC5,
+            Solvers.BITWUZLA);
 
     // An empty list of quantified variables throws an exception.
     @SuppressWarnings("unused")
@@ -759,7 +781,7 @@ public void testEmpty() {
   public void checkLIAQuantifierElimination() throws InterruptedException, SolverException {
     // build formula: (forall x . ((x < 5) | (7 < x + y)))
     // quantifier-free equivalent: (2 < y)
-    requireIntegers();
+    setUpLIA();
     IntegerFormula xx = imgr.makeVariable("x");
     IntegerFormula yy = imgr.makeVariable("y");
     BooleanFormula f =
@@ -781,7 +803,7 @@ public void checkLIAQuantifierEliminationFail() throws InterruptedException, Sol
 
     // build formula: (exists x : arr[x] = 3) && (forall y: arr[y] = 2)
     // as there is no quantifier free equivalent, it should return the input formula.
-    requireIntegers();
+    setUpLIA();
     IntegerFormula xx = imgr.makeVariable("x");
     IntegerFormula yy = imgr.makeVariable("y");
     ArrayFormula<IntegerFormula, IntegerFormula> a1 =
@@ -800,7 +822,8 @@ public void checkLIAQuantifierEliminationFail() throws InterruptedException, Sol
   public void checkBVQuantifierEliminationFail() throws InterruptedException, SolverException {
     // build formula: (exists x : arr[x] = 3) && (forall y: arr[y] = 2)
     // as there is no quantifier free equivalent, it should return the input formula.
-    requireBitvectors();
+    setUpBV();
+    requireQuantifierElimination();
     // Boolector quants need to be reworked
     // Princess does not support bitvectors in arrays
     assume()
@@ -821,6 +844,7 @@ public void checkBVQuantifierEliminationFail() throws InterruptedException, Solv
         bmgr.and(
             qmgr.exists(xx, bvmgr.equal(amgr.select(array, xx), bvmgr.makeBitvector(width, 3))),
             qmgr.forall(yy, bvmgr.equal(amgr.select(array, yy), bvmgr.makeBitvector(width, 2))));
+
     BooleanFormula qFreeF = qmgr.eliminateQuantifiers(f);
 
     assertThatFormula(qFreeF).isEquivalentTo(f);
@@ -828,7 +852,9 @@ public void checkBVQuantifierEliminationFail() throws InterruptedException, Solv
 
   @Test
   public void checkBVQuantifierElimination() throws InterruptedException, SolverException {
-    requireBitvectors();
+    setUpBV();
+    requireQuantifiers();
+    requireQuantifierElimination();
 
     // build formula: exists y : bv[2]. x * y = 1
     // quantifier-free equivalent: x = 1 | x = 3
@@ -852,7 +878,8 @@ public void checkBVQuantifierElimination() throws InterruptedException, SolverEx
   /** Quant elim test based on a crash in Z3. */
   @Test
   public void checkBVQuantifierElimination2() throws InterruptedException, SolverException {
-    requireBitvectors();
+    setUpBV();
+    requireQuantifierElimination();
 
     // build formula: exists a2 : (and (= a2 #x00000006)
     //                                 (= b2 #x00000006)
@@ -863,7 +890,7 @@ public void checkBVQuantifierElimination2() throws InterruptedException, SolverE
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
     // Z3 fails this currently. Remove once thats not longer the case!
-    assume().that(solverToUse()).isNotEqualTo(Solvers.Z3);
+    // assume().that(solverToUse()).isNotEqualTo(Solvers.Z3);
     int width = 32;
 
     BitvectorFormula a2 = bvmgr.makeVariable(width, "a2");
@@ -888,7 +915,7 @@ public void checkBVQuantifierElimination2() throws InterruptedException, SolverE
 
   @Test
   public void testExistsRestrictedRange() throws SolverException, InterruptedException {
-    requireIntegers();
+    setUpLIA();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -922,7 +949,7 @@ public void testExistsRestrictedRange() throws SolverException, InterruptedExcep
   @Test
   public void testExistsRestrictedRangeWithoutInconclusiveSolvers()
       throws SolverException, InterruptedException {
-    requireIntegers();
+    setUpLIA();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -946,7 +973,7 @@ public void testExistsRestrictedRangeWithoutInconclusiveSolvers()
 
   @Test
   public void testForallRestrictedRange() throws SolverException, InterruptedException {
-    requireIntegers();
+    setUpLIA();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -981,7 +1008,7 @@ public void testForallRestrictedRange() throws SolverException, InterruptedExcep
   @Test
   public void testForallRestrictedRangeWithoutConclusiveSolvers()
       throws SolverException, InterruptedException {
-    requireIntegers();
+    setUpLIA();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -1025,7 +1052,7 @@ public void testForallRestrictedRangeWithoutConclusiveSolvers()
   @Test
   public void testExistsBasicStringTheorie() throws SolverException, InterruptedException {
     requireStrings();
-    requireIntegers();
+    setUpLIA();
 
     // exists var ("a" < var < "c") & length var == 1  -> var == "b"
     StringFormula stringA = smgr.makeString("a");
@@ -1045,7 +1072,7 @@ public void testExistsBasicStringTheorie() throws SolverException, InterruptedEx
   @Test
   public void testForallBasicStringTheorie() throws SolverException, InterruptedException {
     requireStrings();
-    requireIntegers();
+    setUpLIA();
 
     // forall var ("a" < var < "c") & length var == 1
     StringFormula stringA = smgr.makeString("a");
@@ -1065,7 +1092,7 @@ public void testForallBasicStringTheorie() throws SolverException, InterruptedEx
   @Test
   public void testExistsBasicStringArray() throws SolverException, InterruptedException {
     requireStrings();
-    requireIntegers();
+    setUpLIA();
 
     // exists var (var = select(store(arr, 2, "bla"), 2)
     IntegerFormula two = imgr.makeNumber(2);
@@ -1081,7 +1108,7 @@ public void testExistsBasicStringArray() throws SolverException, InterruptedExce
   @Test
   public void testForallBasicStringArray() throws SolverException, InterruptedException {
     requireStrings();
-    requireIntegers();
+    setUpLIA();
 
     // forall var (var = select(store(arr, 2, "bla"), 2)
     IntegerFormula two = imgr.makeNumber(2);

From fb8376be820a465f1186dc766121fff245e8ab69 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 13:09:11 +0200
Subject: [PATCH 144/158] Add correct catch block for CVC5 quant elim by using
 a pseudo function call that does throw the exception in its signature

---
 .../solvers/cvc5/CVC5QuantifiedFormulaManager.java        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
index 8230abf702..22f650a40d 100644
--- a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
@@ -8,6 +8,7 @@
 
 package org.sosy_lab.java_smt.solvers.cvc5;
 
+import io.github.cvc5.CVC5ApiException;
 import io.github.cvc5.Kind;
 import io.github.cvc5.Solver;
 import io.github.cvc5.Sort;
@@ -46,10 +47,13 @@ protected CVC5QuantifiedFormulaManager(FormulaCreator<Term, Sort, Solver, Term>
    */
   @Override
   protected Term eliminateQuantifiers(Term input) throws SolverException, InterruptedException {
+    // This sometimes fails for (even simple) bv input in an exception. We can not catch the
+    // exception from getQuantifierElim() (CVC5ApiException) and we don't know if the state is
+    // recoverable afterward
     try {
+      input.getKind(); // Pseudo call that throws the exception, but does not really throw it
       return solver.getQuantifierElimination(input);
-    } catch (RuntimeException e) {
-      // quantifier elimination failed, simply return the input
+    } catch (CVC5ApiException pE) {
       return input;
     }
   }

From 4c9622f246b7bc8f122ba1cca4e126232a3ac976 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 13:09:39 +0200
Subject: [PATCH 145/158] Remove unnecessary rounding mode loop in Bitwuzla
 native test

---
 .../bitwuzla/BitwuzlaNativeApiTest.java       | 258 +++++++++---------
 1 file changed, 124 insertions(+), 134 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
index 5375f8e76b..d531087efa 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaNativeApiTest.java
@@ -10,7 +10,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.truth.Truth;
 import org.junit.After;
 import org.junit.AssumptionViolatedException;
@@ -341,139 +340,130 @@ public void testBoolModel() {
   @Test
   public void testFpSpecialValueEquality() {
     Sort fpSort = termManager.mk_fp_sort(5, 11);
-    for (RoundingMode roundMode :
-        ImmutableList.of(
-            RoundingMode.RNE,
-            RoundingMode.RTZ,
-            RoundingMode.RNA,
-            RoundingMode.RTN,
-            RoundingMode.RTP)) {
-      Term rm = termManager.mk_rm_value(roundMode);
-      Term zero = termManager.mk_fp_pos_zero(fpSort);
-      assertThat(zero.is_fp_value_pos_zero()).isTrue();
-      assertThat(zero.is_fp_value_neg_zero()).isFalse();
-      Term negZero = termManager.mk_fp_neg_zero(fpSort);
-      assertThat(negZero.is_fp_value_neg_zero()).isTrue();
-      assertThat(negZero.is_fp_value_pos_zero()).isFalse();
-
-      // -0 == 0 for FP equals is SAT
-      Term negZeroFpEqZero = termManager.mk_term(Kind.FP_EQUAL, zero, negZero);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(negZeroFpEqZero);
-      Result res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.SAT);
-      bitwuzla.pop(1);
-
-      // -0 != 0 for fp equals is UNSAT
-      Term notNegZeroFpEqZero = termManager.mk_term(Kind.NOT, negZeroFpEqZero);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(notNegZeroFpEqZero);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.UNSAT);
-      bitwuzla.pop(1);
-
-      // -0 == 0 for equals is UNSAT
-      Term negZeroEqZero = termManager.mk_term(Kind.EQUAL, zero, negZero);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(negZeroEqZero);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.UNSAT);
-      bitwuzla.pop(1);
-
-      // -0 != 0 for equals is SAT
-      Term notnegZeroEqZero = termManager.mk_term(Kind.NOT, negZeroEqZero);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(notnegZeroEqZero);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.SAT);
-      bitwuzla.pop(1);
-
-      // -------  NAN  --------
-      Term nan = termManager.mk_fp_nan(fpSort);
-      assertThat(nan.is_fp_value_nan()).isTrue();
-      assertThat(negZero.is_fp_value_nan()).isFalse();
-      assertThat(zero.is_fp_value_nan()).isFalse();
-      assertThat(nan.is_fp_value_neg_zero()).isFalse();
-      assertThat(nan.is_fp_value_pos_zero()).isFalse();
-
-      // nan == nan for FP equals is UNSAT
-      Term nanFpEqNan = termManager.mk_term(Kind.FP_EQUAL, nan, nan);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(nanFpEqNan);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.UNSAT);
-      bitwuzla.pop(1);
-
-      // nan != nan for fp equals is SAT
-      Term notNanFpEqNan = termManager.mk_term(Kind.NOT, nanFpEqNan);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(notNanFpEqNan);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.SAT);
-      bitwuzla.pop(1);
-
-      // nan == nan for equals is SAT
-      Term nanEqNan = termManager.mk_term(Kind.EQUAL, nan, nan);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(nanEqNan);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.SAT);
-      bitwuzla.pop(1);
-
-      // nan != nan for equals is UNSAT
-      Term notNanEqNan = termManager.mk_term(Kind.NOT, nanEqNan);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(notNanEqNan);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.UNSAT);
-      bitwuzla.pop(1);
-
-      // ------  pos infinity and neg infinity  ------
-      Term posInf = termManager.mk_fp_pos_inf(fpSort);
-      Term negInf = termManager.mk_fp_neg_inf(fpSort);
-      assertThat(posInf.is_fp_value_pos_inf()).isTrue();
-      assertThat(posInf.is_fp_value_neg_inf()).isFalse();
-      assertThat(negInf.is_fp_value_pos_inf()).isFalse();
-      assertThat(negInf.is_fp_value_neg_inf()).isTrue();
-      assertThat(nan.is_fp_value_pos_inf()).isFalse();
-      assertThat(nan.is_fp_value_neg_inf()).isFalse();
-      assertThat(zero.is_fp_value_pos_inf()).isFalse();
-      assertThat(zero.is_fp_value_neg_inf()).isFalse();
-      assertThat(negZero.is_fp_value_pos_inf()).isFalse();
-      assertThat(negZero.is_fp_value_neg_inf()).isFalse();
-
-      // pos inf == neg inf fp eq is UNSAT
-      Term posInfFpEqNegInf = termManager.mk_term(Kind.FP_EQUAL, posInf, negInf);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(posInfFpEqNegInf);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.UNSAT);
-      bitwuzla.pop(1);
-
-      // pos inf != neg inf fp eq is SAT
-      Term notPosInfFpEqNegInf = termManager.mk_term(Kind.NOT, posInfFpEqNegInf);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(notPosInfFpEqNegInf);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.SAT);
-      bitwuzla.pop(1);
-
-      // pos inf == neg inf eq is UNSAT
-      Term posInfEqNegInf = termManager.mk_term(Kind.EQUAL, posInf, negInf);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(posInfEqNegInf);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.UNSAT);
-      bitwuzla.pop(1);
-
-      // pos inf != neg inf eq is SAT
-      Term notPosInfEqNegInf = termManager.mk_term(Kind.NOT, posInfEqNegInf);
-      bitwuzla.push(1);
-      bitwuzla.assert_formula(notPosInfEqNegInf);
-      res = bitwuzla.check_sat();
-      assertThat(res).isEqualTo(Result.SAT);
-      bitwuzla.pop(1);
-    }
+    Term zero = termManager.mk_fp_pos_zero(fpSort);
+    assertThat(zero.is_fp_value_pos_zero()).isTrue();
+    assertThat(zero.is_fp_value_neg_zero()).isFalse();
+    Term negZero = termManager.mk_fp_neg_zero(fpSort);
+    assertThat(negZero.is_fp_value_neg_zero()).isTrue();
+    assertThat(negZero.is_fp_value_pos_zero()).isFalse();
+
+    // -0 == 0 for FP equals is SAT
+    Term negZeroFpEqZero = termManager.mk_term(Kind.FP_EQUAL, zero, negZero);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(negZeroFpEqZero);
+    Result res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
+    bitwuzla.pop(1);
+
+    // -0 != 0 for fp equals is UNSAT
+    Term notNegZeroFpEqZero = termManager.mk_term(Kind.NOT, negZeroFpEqZero);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(notNegZeroFpEqZero);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.UNSAT);
+    bitwuzla.pop(1);
+
+    // -0 == 0 for equals is UNSAT
+    Term negZeroEqZero = termManager.mk_term(Kind.EQUAL, zero, negZero);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(negZeroEqZero);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.UNSAT);
+    bitwuzla.pop(1);
+
+    // -0 != 0 for equals is SAT
+    Term notnegZeroEqZero = termManager.mk_term(Kind.NOT, negZeroEqZero);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(notnegZeroEqZero);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
+    bitwuzla.pop(1);
+
+    // -------  NAN  --------
+    Term nan = termManager.mk_fp_nan(fpSort);
+    assertThat(nan.is_fp_value_nan()).isTrue();
+    assertThat(negZero.is_fp_value_nan()).isFalse();
+    assertThat(zero.is_fp_value_nan()).isFalse();
+    assertThat(nan.is_fp_value_neg_zero()).isFalse();
+    assertThat(nan.is_fp_value_pos_zero()).isFalse();
+
+    // nan == nan for FP equals is UNSAT
+    Term nanFpEqNan = termManager.mk_term(Kind.FP_EQUAL, nan, nan);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(nanFpEqNan);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.UNSAT);
+    bitwuzla.pop(1);
+
+    // nan != nan for fp equals is SAT
+    Term notNanFpEqNan = termManager.mk_term(Kind.NOT, nanFpEqNan);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(notNanFpEqNan);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
+    bitwuzla.pop(1);
+
+    // nan == nan for equals is SAT
+    Term nanEqNan = termManager.mk_term(Kind.EQUAL, nan, nan);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(nanEqNan);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
+    bitwuzla.pop(1);
+
+    // nan != nan for equals is UNSAT
+    Term notNanEqNan = termManager.mk_term(Kind.NOT, nanEqNan);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(notNanEqNan);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.UNSAT);
+    bitwuzla.pop(1);
+
+    // ------  pos infinity and neg infinity  ------
+    Term posInf = termManager.mk_fp_pos_inf(fpSort);
+    Term negInf = termManager.mk_fp_neg_inf(fpSort);
+    assertThat(posInf.is_fp_value_pos_inf()).isTrue();
+    assertThat(posInf.is_fp_value_neg_inf()).isFalse();
+    assertThat(negInf.is_fp_value_pos_inf()).isFalse();
+    assertThat(negInf.is_fp_value_neg_inf()).isTrue();
+    assertThat(nan.is_fp_value_pos_inf()).isFalse();
+    assertThat(nan.is_fp_value_neg_inf()).isFalse();
+    assertThat(zero.is_fp_value_pos_inf()).isFalse();
+    assertThat(zero.is_fp_value_neg_inf()).isFalse();
+    assertThat(negZero.is_fp_value_pos_inf()).isFalse();
+    assertThat(negZero.is_fp_value_neg_inf()).isFalse();
+
+    // pos inf == neg inf fp eq is UNSAT
+    Term posInfFpEqNegInf = termManager.mk_term(Kind.FP_EQUAL, posInf, negInf);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(posInfFpEqNegInf);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.UNSAT);
+    bitwuzla.pop(1);
+
+    // pos inf != neg inf fp eq is SAT
+    Term notPosInfFpEqNegInf = termManager.mk_term(Kind.NOT, posInfFpEqNegInf);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(notPosInfFpEqNegInf);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
+    bitwuzla.pop(1);
+
+    // pos inf == neg inf eq is UNSAT
+    Term posInfEqNegInf = termManager.mk_term(Kind.EQUAL, posInf, negInf);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(posInfEqNegInf);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.UNSAT);
+    bitwuzla.pop(1);
+
+    // pos inf != neg inf eq is SAT
+    Term notPosInfEqNegInf = termManager.mk_term(Kind.NOT, posInfEqNegInf);
+    bitwuzla.push(1);
+    bitwuzla.assert_formula(notPosInfEqNegInf);
+    res = bitwuzla.check_sat();
+    assertThat(res).isEqualTo(Result.SAT);
+    bitwuzla.pop(1);
   }
 
   @Test

From dd009bdf0d85996ebb327b2b4f66ca3f0282910e Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 13:21:39 +0200
Subject: [PATCH 146/158] Improve CVC5 quantifier elim handling and not reuse
 the formula, as they state that it might be corrupted

---
 .../solvers/cvc5/CVC5QuantifiedFormulaManager.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
index 22f650a40d..ededb93983 100644
--- a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
@@ -49,12 +49,16 @@ protected CVC5QuantifiedFormulaManager(FormulaCreator<Term, Sort, Solver, Term>
   protected Term eliminateQuantifiers(Term input) throws SolverException, InterruptedException {
     // This sometimes fails for (even simple) bv input in an exception. We can not catch the
     // exception from getQuantifierElim() (CVC5ApiException) and we don't know if the state is
-    // recoverable afterward
+    // recoverable afterward (they state that the object should not be used afterward, i guess
+    // they mean the input formula, they might however reference to the solver instance!)
     try {
       input.getKind(); // Pseudo call that throws the exception, but does not really throw it
-      return solver.getQuantifierElimination(input);
+      return solver.getQuantifierElimination(input); // CVC5ApiException throw missing in native
     } catch (CVC5ApiException pE) {
-      return input;
+      throw new SolverException(
+          "CVC5 encountered an error when eliminating quantifiers. Please "
+              + "do not reuse the input formula, as it might be corrupted."
+              + pE);
     }
   }
 

From b2479c6ead98ee0ecd4e6bfa93b44941087459fc Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 13:24:39 +0200
Subject: [PATCH 147/158] Improve requireQuantififerElimination guard, as CVC5
 now behaves differently

---
 src/org/sosy_lab/java_smt/test/SolverBasedTest0.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java b/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
index 96cade3027..797e9d400a 100644
--- a/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
+++ b/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
@@ -249,12 +249,16 @@ protected final void requireQuantifierElimination() {
           .that(qmgr.eliminateQuantifiers(bmgr.makeTrue()))
           .isNotNull();
     } catch (InterruptedException | SolverException pE) {
-      throw new RuntimeException(pE);
+      assume()
+          .withMessage("Solver %s does not support quantifier elimination", solverToUse())
+          .that(pE)
+          .hasMessageThat()
+          .contains("CVC5");
     } catch (UnsupportedOperationException uoe) {
       assume()
           .withMessage("Solver %s does not support quantifier elimination", solverToUse())
           .that(uoe)
-          .isNotInstanceOf(Exception.class);
+          .isNull();
     }
   }
 

From 18372ac241611ee64f4f95e5769bb297199930ce Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Fri, 12 Apr 2024 13:48:50 +0200
Subject: [PATCH 148/158] Add issue to CVC5 quantifier elim exception problem

---
 .../java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
index ededb93983..8e7d9defb1 100644
--- a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
@@ -51,6 +51,7 @@ protected Term eliminateQuantifiers(Term input) throws SolverException, Interrup
     // exception from getQuantifierElim() (CVC5ApiException) and we don't know if the state is
     // recoverable afterward (they state that the object should not be used afterward, i guess
     // they mean the input formula, they might however reference to the solver instance!)
+    // See https://github.com/cvc5/cvc5/issues/10624 for updates
     try {
       input.getKind(); // Pseudo call that throws the exception, but does not really throw it
       return solver.getQuantifierElimination(input); // CVC5ApiException throw missing in native

From 0d9a64b08d110d31cb89ad1b6f4319137ceb0a41 Mon Sep 17 00:00:00 2001
From: Daniel Raffler <daniel-raffler@gmx.de>
Date: Sun, 14 Apr 2024 22:21:27 +0200
Subject: [PATCH 149/158] Bitwuzla: Rewrote BitwuzlaDeclaration using Google
 AutoValue as suggested in
 https://github.com/sosy-lab/java-smt/pull/370#discussion_r1561620713 and
 https://github.com/sosy-lab/java-smt/pull/370#discussion_r1561626131.

---
 .../solvers/bitwuzla/BitwuzlaDeclaration.java | 52 +++++--------------
 .../bitwuzla/BitwuzlaFormulaCreator.java      | 14 ++---
 2 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaDeclaration.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaDeclaration.java
index d771d6fa2d..db73ebb023 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaDeclaration.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaDeclaration.java
@@ -8,56 +8,32 @@
 
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
-import java.util.Objects;
+import com.google.auto.value.AutoValue;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Kind;
 import org.sosy_lab.java_smt.solvers.bitwuzla.api.Term;
 
 // Declarations sometimes need the info of a Term, but mostly those of Kinds.
 // We can not discern between the two however, hence this wrapper
-public class BitwuzlaDeclaration {
-  private final Object decl;
+@AutoValue
+public abstract class BitwuzlaDeclaration {
+  public abstract @Nullable Term getTerm();
 
-  // If isKind, decl == KIND; else decl == term
-  private final boolean isKind;
+  public abstract @Nullable Kind getKind();
 
-  BitwuzlaDeclaration(Term pTerm) {
-    decl = pTerm;
-    isKind = false;
+  public static BitwuzlaDeclaration create(Term pTerm) {
+    return new AutoValue_BitwuzlaDeclaration(pTerm, null);
   }
 
-  BitwuzlaDeclaration(Kind pKind) {
-    decl = pKind;
-    isKind = true;
+  public static BitwuzlaDeclaration create(Kind pKind) {
+    return new AutoValue_BitwuzlaDeclaration(null, pKind);
   }
 
-  public boolean isKind() {
-    return isKind;
-  }
-
-  public Term getTerm() {
-    assert !isKind;
-    return (Term) decl;
-  }
-
-  public Kind getKind() {
-    assert isKind;
-    return (Kind) decl;
-  }
-
-  @Override
-  public boolean equals(Object any) {
-    if (any == this) {
-      return true;
-    }
-    if (any instanceof BitwuzlaDeclaration) {
-      BitwuzlaDeclaration otherDecl = (BitwuzlaDeclaration) any;
-      return isKind == otherDecl.isKind && Objects.equals(decl, otherDecl.decl);
-    }
-    return false;
+  public boolean isTerm() {
+    return getTerm() != null;
   }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(decl, isKind);
+  public boolean isKind() {
+    return getKind() != null;
   }
 }
diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
index 2c52e68f2c..6285f8cc56 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaFormulaCreator.java
@@ -424,7 +424,7 @@ public <R> R visit(FormulaVisitor<R> visitor, Formula formula, Term f)
         Term argument = args.get(i);
         if (kind == Kind.APPLY && i == 0) {
           // UFs carry the decl in the first child and the decl has the name
-          decl = new BitwuzlaDeclaration(argument);
+          decl = BitwuzlaDeclaration.create(argument);
           name = argument.symbol();
           continue;
         }
@@ -437,12 +437,12 @@ public <R> R visit(FormulaVisitor<R> visitor, Formula formula, Term f)
         name = f.kind().toString();
       }
       if (decl == null) {
-        decl = new BitwuzlaDeclaration(f.kind());
+        decl = BitwuzlaDeclaration.create(f.kind());
       }
       if (f.num_indices() > 0) {
         // We need to retain the original formula as the declaration for indexed formulas,
         // otherwise we loose the index info, but we also need to know if its a kind or term
-        decl = new BitwuzlaDeclaration(f);
+        decl = BitwuzlaDeclaration.create(f);
       }
 
       return visitor.visitFunction(
@@ -488,12 +488,12 @@ public BitwuzlaDeclaration declareUFImpl(String name, Sort pReturnType, List<Sor
 
     Term maybeFormula = formulaCache.get(name, functionSort);
     if (maybeFormula != null) {
-      return new BitwuzlaDeclaration(maybeFormula);
+      return BitwuzlaDeclaration.create(maybeFormula);
     }
 
     Term uf = termManager.mk_const(functionSort, name);
     formulaCache.put(name, functionSort, uf);
-    return new BitwuzlaDeclaration(uf);
+    return BitwuzlaDeclaration.create(uf);
   }
 
   @Override
@@ -504,9 +504,9 @@ protected BitwuzlaDeclaration getBooleanVarDeclarationImpl(Term pTerm) {
     assert kind == Kind.APPLY || kind == Kind.CONSTANT : kind.toString();
     if (kind == Kind.APPLY) {
       // Returns pointer to Uninterpreted Function used in Apply
-      return new BitwuzlaDeclaration(pTerm.get(0));
+      return BitwuzlaDeclaration.create(pTerm.get(0));
     } else {
-      return new BitwuzlaDeclaration(pTerm);
+      return BitwuzlaDeclaration.create(pTerm);
     }
   }
 

From 3d9a1dd619904ce25652571e00ec7159578f8ca3 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Mon, 15 Apr 2024 10:04:57 +0200
Subject: [PATCH 150/158] Revert "Add issue to CVC5 quantifier elim exception
 problem"

This reverts commit 18372ac241611ee64f4f95e5769bb297199930ce.
---
 .../java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
index 8e7d9defb1..ededb93983 100644
--- a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
@@ -51,7 +51,6 @@ protected Term eliminateQuantifiers(Term input) throws SolverException, Interrup
     // exception from getQuantifierElim() (CVC5ApiException) and we don't know if the state is
     // recoverable afterward (they state that the object should not be used afterward, i guess
     // they mean the input formula, they might however reference to the solver instance!)
-    // See https://github.com/cvc5/cvc5/issues/10624 for updates
     try {
       input.getKind(); // Pseudo call that throws the exception, but does not really throw it
       return solver.getQuantifierElimination(input); // CVC5ApiException throw missing in native

From 9e8d75699e07b9c46e5935f22a385dac8c3a4575 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Mon, 15 Apr 2024 10:05:15 +0200
Subject: [PATCH 151/158] Revert "Improve requireQuantififerElimination guard,
 as CVC5 now behaves differently"

This reverts commit b2479c6ead98ee0ecd4e6bfa93b44941087459fc.
---
 src/org/sosy_lab/java_smt/test/SolverBasedTest0.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java b/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
index 797e9d400a..96cade3027 100644
--- a/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
+++ b/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
@@ -249,16 +249,12 @@ protected final void requireQuantifierElimination() {
           .that(qmgr.eliminateQuantifiers(bmgr.makeTrue()))
           .isNotNull();
     } catch (InterruptedException | SolverException pE) {
-      assume()
-          .withMessage("Solver %s does not support quantifier elimination", solverToUse())
-          .that(pE)
-          .hasMessageThat()
-          .contains("CVC5");
+      throw new RuntimeException(pE);
     } catch (UnsupportedOperationException uoe) {
       assume()
           .withMessage("Solver %s does not support quantifier elimination", solverToUse())
           .that(uoe)
-          .isNull();
+          .isNotInstanceOf(Exception.class);
     }
   }
 

From 261eb527e60ec135c8d701af54df80bf32c53730 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Mon, 15 Apr 2024 10:05:27 +0200
Subject: [PATCH 152/158] Revert "Improve CVC5 quantifier elim handling and not
 reuse the formula, as they state that it might be corrupted"

This reverts commit dd009bdf0d85996ebb327b2b4f66ca3f0282910e.
---
 .../solvers/cvc5/CVC5QuantifiedFormulaManager.java     | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
index ededb93983..22f650a40d 100644
--- a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
@@ -49,16 +49,12 @@ protected CVC5QuantifiedFormulaManager(FormulaCreator<Term, Sort, Solver, Term>
   protected Term eliminateQuantifiers(Term input) throws SolverException, InterruptedException {
     // This sometimes fails for (even simple) bv input in an exception. We can not catch the
     // exception from getQuantifierElim() (CVC5ApiException) and we don't know if the state is
-    // recoverable afterward (they state that the object should not be used afterward, i guess
-    // they mean the input formula, they might however reference to the solver instance!)
+    // recoverable afterward
     try {
       input.getKind(); // Pseudo call that throws the exception, but does not really throw it
-      return solver.getQuantifierElimination(input); // CVC5ApiException throw missing in native
+      return solver.getQuantifierElimination(input);
     } catch (CVC5ApiException pE) {
-      throw new SolverException(
-          "CVC5 encountered an error when eliminating quantifiers. Please "
-              + "do not reuse the input formula, as it might be corrupted."
-              + pE);
+      return input;
     }
   }
 

From 1036d43e103d05faecee5a95d49b531d8b484dfe Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Mon, 15 Apr 2024 10:06:00 +0200
Subject: [PATCH 153/158] Revert "Add correct catch block for CVC5 quant elim
 by using a pseudo function call that does throw the exception in its
 signature"

This reverts commit fb8376be820a465f1186dc766121fff245e8ab69.
---
 .../solvers/cvc5/CVC5QuantifiedFormulaManager.java        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
index 22f650a40d..8230abf702 100644
--- a/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/cvc5/CVC5QuantifiedFormulaManager.java
@@ -8,7 +8,6 @@
 
 package org.sosy_lab.java_smt.solvers.cvc5;
 
-import io.github.cvc5.CVC5ApiException;
 import io.github.cvc5.Kind;
 import io.github.cvc5.Solver;
 import io.github.cvc5.Sort;
@@ -47,13 +46,10 @@ protected CVC5QuantifiedFormulaManager(FormulaCreator<Term, Sort, Solver, Term>
    */
   @Override
   protected Term eliminateQuantifiers(Term input) throws SolverException, InterruptedException {
-    // This sometimes fails for (even simple) bv input in an exception. We can not catch the
-    // exception from getQuantifierElim() (CVC5ApiException) and we don't know if the state is
-    // recoverable afterward
     try {
-      input.getKind(); // Pseudo call that throws the exception, but does not really throw it
       return solver.getQuantifierElimination(input);
-    } catch (CVC5ApiException pE) {
+    } catch (RuntimeException e) {
+      // quantifier elimination failed, simply return the input
       return input;
     }
   }

From 161d3195a31927a14f303e9c965c1e6dc99bcec6 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Mon, 15 Apr 2024 10:08:15 +0200
Subject: [PATCH 154/158] Revert "Fix comments and logic settings in parsing
 for OpenSMT2"

This reverts commit b979f74073937d7f943651b290f94f99bd4d7dfe.
---
 .../opensmt/OpenSmtFormulaManager.java        | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/opensmt/OpenSmtFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/opensmt/OpenSmtFormulaManager.java
index d08b454feb..464d133fe5 100644
--- a/src/org/sosy_lab/java_smt/solvers/opensmt/OpenSmtFormulaManager.java
+++ b/src/org/sosy_lab/java_smt/solvers/opensmt/OpenSmtFormulaManager.java
@@ -54,7 +54,7 @@ class OpenSmtFormulaManager extends AbstractFormulaManager<PTRef, SRef, Logic, S
 
   @Override
   public BooleanFormula parse(String pS) throws IllegalArgumentException {
-    return creator.encapsulateBoolean(osmtLogic.parseFormula(stripSMTLIB2String(pS)));
+    return creator.encapsulateBoolean(osmtLogic.parseFormula(pS));
   }
 
   @Override
@@ -83,24 +83,4 @@ public void appendTo(Appendable out) throws IOException {
       }
     };
   }
-
-  private String stripSMTLIB2String(String pFormulaStr) {
-    String s = pFormulaStr;
-    int commentIndex = s.indexOf(";;");
-    while (commentIndex != -1) {
-      int endCommentIndex = s.indexOf('\n', commentIndex + 1);
-      String s1 = s.substring(0, commentIndex);
-      String s2 = s.substring(endCommentIndex + 1);
-      s = s1 + s2;
-      commentIndex = s.indexOf(";;");
-    }
-    int setLogicIndex = s.indexOf("(set-logic ");
-    if (setLogicIndex != -1) {
-      int endLogicIndex = s.indexOf(')', setLogicIndex + 1);
-      String s1 = s.substring(0, setLogicIndex);
-      String s2 = s.substring(endLogicIndex + 1);
-      s = s1 + s2;
-    }
-    return s;
-  }
 }

From 09d0690efe06597006ad3b23f9d95584eb86e912 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Mon, 15 Apr 2024 10:13:02 +0200
Subject: [PATCH 155/158] Revert "Add a test for comments and logic settings in
 parse tests (As this is problematic for OpenSMT2 and Bitwuzla)"

This reverts commit 181d75050714eee67982fe86f6534c75bf0b10b3.
---
 .../java_smt/test/SolverFormulaIOTest.java    | 42 -------------------
 1 file changed, 42 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java b/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
index eb38f1e9dd..7f4c231545 100644
--- a/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
+++ b/src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java
@@ -32,14 +32,6 @@
 
 @SuppressWarnings("checkstyle:linelength")
 public class SolverFormulaIOTest extends SolverBasedTest0.ParameterizedSolverBasedTest0 {
-  private static final String BOOL_CHECK =
-      "(declare-fun x () Bool)(declare-fun y () Bool)(assert (= y x))";
-
-  private static final String BOOL_VARS_W_LOGIC = "(set-logic all)" + BOOL_CHECK;
-
-  private static final String BOOL_VARS_W_LOGIC_AND_COMMENT =
-      ";; Some comment in SMTLIB2\n" + BOOL_VARS_W_LOGIC;
-
   private static final String MATHSAT_DUMP1 =
       "(set-info :source |printed by MathSAT|)\n"
           + "(declare-fun a () Bool)\n"
@@ -105,40 +97,6 @@ public class SolverFormulaIOTest extends SolverBasedTest0.ParameterizedSolverBas
           + "(assert  (let (($x35 (and (xor q (= (+ a b) c)) (>= a b)))) (let (($x9 (= a b))) (and"
           + " (and (or $x35 u) q) (and $x9 $x35)))))";
 
-  @Test
-  public void logicsParseTest() throws SolverException, InterruptedException {
-    requireParser();
-    // Some solvers have problems with (set-logic xxx) in the beginning
-
-    // Boolector will fail this anyway since bools are bitvecs for btor
-    TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BOOLECTOR);
-
-    BooleanFormula x = bmgr.makeVariable("x");
-    BooleanFormula y = bmgr.makeVariable("y");
-    BooleanFormula expr = bmgr.equivalence(y, x);
-
-    // actual test
-    BooleanFormula parsedForm = mgr.parse(BOOL_VARS_W_LOGIC);
-    assertThatFormula(parsedForm).isEquivalentTo(expr);
-  }
-
-  @Test
-  public void commentsParseTest() throws SolverException, InterruptedException {
-    requireParser();
-    // Some solvers have problems with comments in the beginning
-
-    // Boolector will fail this anyway since bools are bitvecs for btor
-    TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BOOLECTOR);
-
-    BooleanFormula x = bmgr.makeVariable("x");
-    BooleanFormula y = bmgr.makeVariable("y");
-    BooleanFormula expr = bmgr.equivalence(y, x);
-
-    // actual test
-    BooleanFormula parsedForm = mgr.parse(BOOL_VARS_W_LOGIC_AND_COMMENT);
-    assertThatFormula(parsedForm).isEquivalentTo(expr);
-  }
-
   @Test
   public void varDumpTest() {
     // Boolector will fail this anyway since bools are bitvecs for btor

From 8a653de95b4fe0302fd1a9560db5cd44cba21a0a Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Mon, 15 Apr 2024 10:23:02 +0200
Subject: [PATCH 156/158] Revert "Decouple LIA and BV setups in
 QuantifierManagerTest from the Before annotation, as this filters all solvers
 that don't support both and add requireQuantifierElimination()"

This reverts commit a0b02d3cc11187b34a4233a13ac2558eb2e6f9fc.
---
 .../java_smt/test/QuantifierManagerTest.java  | 133 +++++++-----------
 1 file changed, 53 insertions(+), 80 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java b/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
index a38e68ac10..cf712ef5d7 100644
--- a/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
+++ b/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
@@ -18,6 +18,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.Before;
 import org.junit.Test;
 import org.sosy_lab.common.UniqueIdGenerator;
 import org.sosy_lab.java_smt.SolverContextFactory.Solvers;
@@ -63,6 +64,7 @@ public class QuantifierManagerTest extends SolverBasedTest0.ParameterizedSolverB
   @SuppressWarnings("checkstyle:membername")
   private BooleanFormula bv_forall_x_a_at_x_eq_0;
 
+  @Before
   public void setUpLIA() {
     requireIntegers();
     requireArrays();
@@ -77,6 +79,7 @@ public void setUpLIA() {
     forall_x_a_at_x_eq_0 = qmgr.forall(ImmutableList.of(x), a_at_x_eq_0);
   }
 
+  @Before
   public void setUpBV() {
     requireBitvectors();
     requireArrays();
@@ -119,7 +122,7 @@ public void testLIAForallArrayConjunctUnsat() throws SolverException, Interrupte
         .isNotEqualTo(Solvers.CVC5);
 
     // (forall x . b[x] = 0) AND (b[123] = 1) is UNSAT
-    setUpLIA();
+    requireIntegers();
 
     BooleanFormula f =
         bmgr.and(
@@ -136,7 +139,7 @@ public void testBVForallArrayConjunctUnsat() throws SolverException, Interrupted
         .isNotEqualTo(Solvers.CVC5);
 
     // (forall x . b[x] = 0) AND (b[123] = 1) is UNSAT
-    setUpBV();
+    requireBitvectors();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -159,7 +162,7 @@ public void testLIAForallArrayConjunctSat() throws SolverException, InterruptedE
         .isNotEqualTo(Solvers.CVC5);
 
     // (forall x . b[x] = 0) AND (b[123] = 0) is SAT
-    setUpLIA();
+    requireIntegers();
 
     BooleanFormula f =
         bmgr.and(
@@ -181,7 +184,7 @@ public void testBVForallArrayConjunctSat() throws SolverException, InterruptedEx
         .isNotEqualTo(Solvers.CVC5);
 
     // (forall x . b[x] = 0) AND (b[123] = 0) is SAT
-    setUpBV();
+    requireBitvectors();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -209,7 +212,7 @@ public void testLIAForallArrayDisjunct1() throws SolverException, InterruptedExc
         .isNotEqualTo(Solvers.CVC5);
 
     // (forall x . b[x] = 0) AND (b[123] = 1 OR b[123] = 0) is SAT
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.and(
             qmgr.forall(ImmutableList.of(x), a_at_x_eq_0),
@@ -231,7 +234,7 @@ public void testLIAForallArrayDisjunctSat2() throws SolverException, Interrupted
         .that(solverToUse())
         .isNotEqualTo(Solvers.CVC5);
     // (forall x . b[x] = 0) OR (b[123] = 1) is SAT
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.or(
             qmgr.forall(ImmutableList.of(x), a_at_x_eq_0),
@@ -252,7 +255,7 @@ public void testLIANotExistsArrayConjunct1() throws SolverException, Interrupted
         .isNotEqualTo(Solvers.CVC5);
 
     // (not exists x . not b[x] = 0) AND (b[123] = 1) is UNSAT
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.and(
             bmgr.not(qmgr.exists(ImmutableList.of(x), bmgr.not(a_at_x_eq_0))),
@@ -272,7 +275,7 @@ public void testLIANotExistsArrayConjunct2() throws SolverException, Interrupted
         .isNotEqualTo(Solvers.CVC5);
 
     // (not exists x . not b[x] = 0) AND (b[123] = 0) is SAT
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.and(
             bmgr.not(qmgr.exists(ImmutableList.of(x), bmgr.not(a_at_x_eq_0))),
@@ -292,7 +295,7 @@ public void testLIANotExistsArrayConjunct3() throws SolverException, Interrupted
         .isNotEqualTo(Solvers.CVC5);
 
     // (not exists x . b[x] = 0) AND (b[123] = 0) is UNSAT
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.and(
             bmgr.not(qmgr.exists(ImmutableList.of(x), a_at_x_eq_0)),
@@ -308,7 +311,7 @@ public void testLIANotExistsArrayDisjunct1() throws SolverException, Interrupted
         .isNotEqualTo(Solvers.CVC5);
 
     // (not exists x . not b[x] = 0) AND (b[123] = 1 OR b[123] = 0) is SAT
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.and(
             bmgr.not(qmgr.exists(ImmutableList.of(x), bmgr.not(a_at_x_eq_0))),
@@ -330,7 +333,7 @@ public void testLIANotExistsArrayDisjunct2() throws SolverException, Interrupted
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
         .isNotEqualTo(Solvers.CVC5);
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.or(
             bmgr.not(qmgr.exists(ImmutableList.of(x), bmgr.not(a_at_x_eq_0))),
@@ -346,7 +349,7 @@ public void testLIANotExistsArrayDisjunct2() throws SolverException, Interrupted
   @Test
   public void testLIAExistsArrayConjunct1() throws SolverException, InterruptedException {
     // (exists x . b[x] = 0) AND (b[123] = 1) is SAT
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.and(
             qmgr.exists(ImmutableList.of(x), a_at_x_eq_0),
@@ -357,8 +360,7 @@ public void testLIAExistsArrayConjunct1() throws SolverException, InterruptedExc
   @Test
   public void testBVExistsArrayConjunct1() throws SolverException, InterruptedException {
     // (exists x . b[x] = 0) AND (b[123] = 1) is SAT
-    setUpBV();
-    setUpLIA();
+    requireBitvectors();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -382,7 +384,7 @@ public void testLIAExistsArrayConjunct2() throws SolverException, InterruptedExc
 
     // (exists x . b[x] = 1) AND  (forall x . b[x] = 0) is UNSAT
 
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.and(qmgr.exists(ImmutableList.of(x), a_at_x_eq_1), forall_x_a_at_x_eq_0);
     assertThatFormula(f).isUnsatisfiable();
@@ -396,7 +398,7 @@ public void testBVExistsArrayConjunct2() throws SolverException, InterruptedExce
         .isNotEqualTo(Solvers.CVC5);
 
     // (exists x . b[x] = 1) AND (forall x . b[x] = 0) is UNSAT
-    setUpBV();
+    requireBitvectors();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -415,7 +417,7 @@ public void testLIAExistsArrayConjunct3() throws SolverException, InterruptedExc
         .isNotEqualTo(Solvers.CVC5);
 
     // (exists x . b[x] = 0) AND  (forall x . b[x] = 0) is SAT
-    setUpLIA();
+    requireIntegers();
 
     BooleanFormula f =
         bmgr.and(qmgr.exists(ImmutableList.of(x), a_at_x_eq_0), forall_x_a_at_x_eq_0);
@@ -430,7 +432,7 @@ public void testLIAExistsArrayConjunct3() throws SolverException, InterruptedExc
   @Test
   public void testBVExistsArrayConjunct3() throws SolverException, InterruptedException {
     // (exists x . b[x] = 0) AND (forall x . b[x] = 0) is SAT
-    setUpBV();
+    requireBitvectors();
     // Princess does not support bitvectors in arrays
     // Boolector quants need to be reworked
     assume()
@@ -452,7 +454,7 @@ public void testBVExistsArrayConjunct3() throws SolverException, InterruptedExce
   public void testLIAExistsArrayDisjunct1() throws SolverException, InterruptedException {
     // (exists x . b[x] = 0) OR  (forall x . b[x] = 1) is SAT
 
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.or(
             qmgr.exists(ImmutableList.of(x), a_at_x_eq_0),
@@ -468,7 +470,7 @@ public void testLIAExistsArrayDisjunct1() throws SolverException, InterruptedExc
   @Test
   public void testBVExistsArrayDisjunct1() throws SolverException, InterruptedException {
     // (exists x . b[x] = 0) OR (forall x . b[x] = 1) is SAT
-    setUpBV();
+    requireBitvectors();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -485,7 +487,7 @@ public void testBVExistsArrayDisjunct1() throws SolverException, InterruptedExce
   public void testLIAExistsArrayDisjunct2() throws SolverException, InterruptedException {
     // (exists x . b[x] = 1) OR (exists x . b[x] = 1) is SAT
 
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         bmgr.or(
             qmgr.exists(ImmutableList.of(x), a_at_x_eq_1),
@@ -496,7 +498,7 @@ public void testLIAExistsArrayDisjunct2() throws SolverException, InterruptedExc
   @Test
   public void testBVExistsArrayDisjunct2() throws SolverException, InterruptedException {
     // (exists x . b[x] = 1) OR (exists x . b[x] = 1) is SAT
-    setUpBV();
+    requireBitvectors();
     // Princess does not support bitvectors in arrays
     assume().that(solverToUse()).isNotEqualTo(Solvers.PRINCESS);
     // Boolector quants need to be reworked
@@ -513,7 +515,7 @@ public void testBVExistsArrayDisjunct2() throws SolverException, InterruptedExce
   public void testLIAContradiction() throws SolverException, InterruptedException {
     // forall x . x = x+1  is UNSAT
 
-    setUpLIA();
+    requireIntegers();
     BooleanFormula f =
         qmgr.forall(ImmutableList.of(x), imgr.equal(x, imgr.add(x, imgr.makeNumber(1))));
     assertThatFormula(f).isUnsatisfiable();
@@ -522,7 +524,7 @@ public void testLIAContradiction() throws SolverException, InterruptedException
   @Test
   public void testBVContradiction() throws SolverException, InterruptedException {
     // forall x . x = x+1 is UNSAT
-    setUpBV();
+    requireBitvectors();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -537,7 +539,7 @@ public void testBVContradiction() throws SolverException, InterruptedException {
   @Test
   public void testLIASimple() throws SolverException, InterruptedException {
     // forall x . x+2 = x+1+1  is SAT
-    setUpLIA();
+    requireIntegers();
 
     BooleanFormula f =
         qmgr.forall(
@@ -551,7 +553,7 @@ public void testLIASimple() throws SolverException, InterruptedException {
   @Test
   public void testBVSimple() throws SolverException, InterruptedException {
     // forall z . z+2 = z+1+1 is SAT
-    setUpBV();
+    requireBitvectors();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -569,7 +571,7 @@ public void testBVSimple() throws SolverException, InterruptedException {
 
   @Test
   public void testLIAEquality() throws SolverException, InterruptedException {
-    setUpLIA();
+    requireIntegers();
 
     // Note that due to the variable cache we simply get the existing var x here!
     IntegerFormula z = imgr.makeVariable("x");
@@ -581,7 +583,7 @@ public void testLIAEquality() throws SolverException, InterruptedException {
 
   @Test
   public void testBVEquality() throws SolverException, InterruptedException {
-    setUpBV();
+    requireBitvectors();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -594,7 +596,7 @@ public void testBVEquality() throws SolverException, InterruptedException {
 
   @Test
   public void testBVEquality2() throws SolverException, InterruptedException {
-    setUpBV();
+    requireBitvectors();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -608,7 +610,7 @@ public void testBVEquality2() throws SolverException, InterruptedException {
   public void testBVEquality3() throws SolverException, InterruptedException {
     // exists z . (forall y . z = y && z + 2 > z)
     // UNSAT because of bv behaviour
-    setUpBV();
+    requireBitvectors();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -628,7 +630,7 @@ public void testBVEquality3() throws SolverException, InterruptedException {
   @Test
   public void testLIABoundVariables() throws SolverException, InterruptedException {
     // If the free and bound vars are equal, this will be UNSAT
-    setUpLIA();
+    requireIntegers();
     IntegerFormula aa = imgr.makeVariable("aa");
     IntegerFormula one = imgr.makeNumber(1);
     BooleanFormula restrict = bmgr.not(imgr.equal(aa, one));
@@ -640,7 +642,7 @@ public void testLIABoundVariables() throws SolverException, InterruptedException
   @Test
   public void testBVBoundVariables() throws SolverException, InterruptedException {
     // If the free and bound vars are equal, this will be UNSAT
-    setUpBV();
+    requireBitvectors();
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
 
@@ -655,7 +657,7 @@ public void testBVBoundVariables() throws SolverException, InterruptedException
 
   @Test
   public void testQELight() throws InterruptedException {
-    setUpLIA();
+    requireIntegers();
     assume().that(solverToUse()).isEqualTo(Solvers.Z3);
     // exists y : (y=4 && x=y+3) --> simplified: x=7
     IntegerFormula y = imgr.makeVariable("y");
@@ -670,7 +672,7 @@ public void testQELight() throws InterruptedException {
 
   @Test
   public void testIntrospectionForall() {
-    setUpLIA();
+    requireIntegers();
     BooleanFormula forall = qmgr.forall(ImmutableList.of(x), a_at_x_eq_0);
 
     final AtomicBoolean isQuantifier = new AtomicBoolean(false);
@@ -702,7 +704,7 @@ public Void visitQuantifier(
 
   @Test
   public void testIntrospectionExists() {
-    setUpLIA();
+    requireIntegers();
     BooleanFormula exists = qmgr.exists(ImmutableList.of(x), a_at_x_eq_0);
     final AtomicBoolean isQuantifier = new AtomicBoolean(false);
     final AtomicBoolean isForall = new AtomicBoolean(false);
@@ -742,35 +744,11 @@ public Void visitQuantifier(
 
   @Test(expected = IllegalArgumentException.class)
   public void testEmpty() {
-    assume()
-        .withMessage(
-            "TODO: The JavaSMT code for Princess explicitly allows this. The others "
-                + "throw a NullPointerException.")
-        .that(solverToUse())
-        .isNoneOf(
-            Solvers.OPENSMT,
-            Solvers.MATHSAT5,
-            Solvers.SMTINTERPOL,
-            Solvers.YICES2,
-            Solvers.PRINCESS);
 
-    // An empty list of quantified variables throws an exception.
-    @SuppressWarnings("unused")
-    BooleanFormula quantified = qmgr.exists(ImmutableList.of(), bmgr.makeVariable("b"));
-  }
-
-  @Test(expected = NullPointerException.class)
-  public void testEmpty2() {
     assume()
-        .withMessage("These solvers throw a IllegalArgumentException")
+        .withMessage("TODO: The JavaSMT code for Princess explicitly allows this.")
         .that(solverToUse())
-        .isNoneOf(
-            Solvers.Z3,
-            Solvers.PRINCESS,
-            Solvers.BOOLECTOR,
-            Solvers.CVC4,
-            Solvers.CVC5,
-            Solvers.BITWUZLA);
+        .isNotEqualTo(Solvers.PRINCESS);
 
     // An empty list of quantified variables throws an exception.
     @SuppressWarnings("unused")
@@ -781,7 +759,7 @@ public void testEmpty2() {
   public void checkLIAQuantifierElimination() throws InterruptedException, SolverException {
     // build formula: (forall x . ((x < 5) | (7 < x + y)))
     // quantifier-free equivalent: (2 < y)
-    setUpLIA();
+    requireIntegers();
     IntegerFormula xx = imgr.makeVariable("x");
     IntegerFormula yy = imgr.makeVariable("y");
     BooleanFormula f =
@@ -803,7 +781,7 @@ public void checkLIAQuantifierEliminationFail() throws InterruptedException, Sol
 
     // build formula: (exists x : arr[x] = 3) && (forall y: arr[y] = 2)
     // as there is no quantifier free equivalent, it should return the input formula.
-    setUpLIA();
+    requireIntegers();
     IntegerFormula xx = imgr.makeVariable("x");
     IntegerFormula yy = imgr.makeVariable("y");
     ArrayFormula<IntegerFormula, IntegerFormula> a1 =
@@ -822,8 +800,7 @@ public void checkLIAQuantifierEliminationFail() throws InterruptedException, Sol
   public void checkBVQuantifierEliminationFail() throws InterruptedException, SolverException {
     // build formula: (exists x : arr[x] = 3) && (forall y: arr[y] = 2)
     // as there is no quantifier free equivalent, it should return the input formula.
-    setUpBV();
-    requireQuantifierElimination();
+    requireBitvectors();
     // Boolector quants need to be reworked
     // Princess does not support bitvectors in arrays
     assume()
@@ -844,7 +821,6 @@ public void checkBVQuantifierEliminationFail() throws InterruptedException, Solv
         bmgr.and(
             qmgr.exists(xx, bvmgr.equal(amgr.select(array, xx), bvmgr.makeBitvector(width, 3))),
             qmgr.forall(yy, bvmgr.equal(amgr.select(array, yy), bvmgr.makeBitvector(width, 2))));
-
     BooleanFormula qFreeF = qmgr.eliminateQuantifiers(f);
 
     assertThatFormula(qFreeF).isEquivalentTo(f);
@@ -852,9 +828,7 @@ public void checkBVQuantifierEliminationFail() throws InterruptedException, Solv
 
   @Test
   public void checkBVQuantifierElimination() throws InterruptedException, SolverException {
-    setUpBV();
-    requireQuantifiers();
-    requireQuantifierElimination();
+    requireBitvectors();
 
     // build formula: exists y : bv[2]. x * y = 1
     // quantifier-free equivalent: x = 1 | x = 3
@@ -878,8 +852,7 @@ public void checkBVQuantifierElimination() throws InterruptedException, SolverEx
   /** Quant elim test based on a crash in Z3. */
   @Test
   public void checkBVQuantifierElimination2() throws InterruptedException, SolverException {
-    setUpBV();
-    requireQuantifierElimination();
+    requireBitvectors();
 
     // build formula: exists a2 : (and (= a2 #x00000006)
     //                                 (= b2 #x00000006)
@@ -890,7 +863,7 @@ public void checkBVQuantifierElimination2() throws InterruptedException, SolverE
     // Boolector quants need to be reworked
     assume().that(solverToUse()).isNotEqualTo(Solvers.BOOLECTOR);
     // Z3 fails this currently. Remove once thats not longer the case!
-    // assume().that(solverToUse()).isNotEqualTo(Solvers.Z3);
+    assume().that(solverToUse()).isNotEqualTo(Solvers.Z3);
     int width = 32;
 
     BitvectorFormula a2 = bvmgr.makeVariable(width, "a2");
@@ -915,7 +888,7 @@ public void checkBVQuantifierElimination2() throws InterruptedException, SolverE
 
   @Test
   public void testExistsRestrictedRange() throws SolverException, InterruptedException {
-    setUpLIA();
+    requireIntegers();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -949,7 +922,7 @@ public void testExistsRestrictedRange() throws SolverException, InterruptedExcep
   @Test
   public void testExistsRestrictedRangeWithoutInconclusiveSolvers()
       throws SolverException, InterruptedException {
-    setUpLIA();
+    requireIntegers();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -973,7 +946,7 @@ public void testExistsRestrictedRangeWithoutInconclusiveSolvers()
 
   @Test
   public void testForallRestrictedRange() throws SolverException, InterruptedException {
-    setUpLIA();
+    requireIntegers();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -1008,7 +981,7 @@ public void testForallRestrictedRange() throws SolverException, InterruptedExcep
   @Test
   public void testForallRestrictedRangeWithoutConclusiveSolvers()
       throws SolverException, InterruptedException {
-    setUpLIA();
+    requireIntegers();
     assume()
         .withMessage("Solver %s does not support the complete theory of quantifiers", solverToUse())
         .that(solverToUse())
@@ -1052,7 +1025,7 @@ public void testForallRestrictedRangeWithoutConclusiveSolvers()
   @Test
   public void testExistsBasicStringTheorie() throws SolverException, InterruptedException {
     requireStrings();
-    setUpLIA();
+    requireIntegers();
 
     // exists var ("a" < var < "c") & length var == 1  -> var == "b"
     StringFormula stringA = smgr.makeString("a");
@@ -1072,7 +1045,7 @@ public void testExistsBasicStringTheorie() throws SolverException, InterruptedEx
   @Test
   public void testForallBasicStringTheorie() throws SolverException, InterruptedException {
     requireStrings();
-    setUpLIA();
+    requireIntegers();
 
     // forall var ("a" < var < "c") & length var == 1
     StringFormula stringA = smgr.makeString("a");
@@ -1092,7 +1065,7 @@ public void testForallBasicStringTheorie() throws SolverException, InterruptedEx
   @Test
   public void testExistsBasicStringArray() throws SolverException, InterruptedException {
     requireStrings();
-    setUpLIA();
+    requireIntegers();
 
     // exists var (var = select(store(arr, 2, "bla"), 2)
     IntegerFormula two = imgr.makeNumber(2);
@@ -1108,7 +1081,7 @@ public void testExistsBasicStringArray() throws SolverException, InterruptedExce
   @Test
   public void testForallBasicStringArray() throws SolverException, InterruptedException {
     requireStrings();
-    setUpLIA();
+    requireIntegers();
 
     // forall var (var = select(store(arr, 2, "bla"), 2)
     IntegerFormula two = imgr.makeNumber(2);

From 0097668de741a5764755cabbd8113e0fe7e638ec Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Mon, 15 Apr 2024 10:23:17 +0200
Subject: [PATCH 157/158] Revert "Add requireQuantifierElimination() to
 SolverBasedTest0"

This reverts commit ba8be95fca6635795a2b2b38bad9fc86a9235705.
---
 .../java_smt/test/SolverBasedTest0.java         | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java b/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
index 96cade3027..d57494e017 100644
--- a/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
+++ b/src/org/sosy_lab/java_smt/test/SolverBasedTest0.java
@@ -241,23 +241,6 @@ protected final void requireQuantifiers() {
         .isNotNull();
   }
 
-  /** Skip test if the solver does not support quantifier elimination. */
-  protected final void requireQuantifierElimination() {
-    try {
-      assume()
-          .withMessage("Solver %s does not support quantifier elimination", solverToUse())
-          .that(qmgr.eliminateQuantifiers(bmgr.makeTrue()))
-          .isNotNull();
-    } catch (InterruptedException | SolverException pE) {
-      throw new RuntimeException(pE);
-    } catch (UnsupportedOperationException uoe) {
-      assume()
-          .withMessage("Solver %s does not support quantifier elimination", solverToUse())
-          .that(uoe)
-          .isNotInstanceOf(Exception.class);
-    }
-  }
-
   /** Skip test if the solver does not support arrays. */
   protected /*final*/ void requireArrays() {
     assume()

From 7162b64cc81699de9508650176639363e08f5f32 Mon Sep 17 00:00:00 2001
From: BaierD <daniel.baier@sosy.ifi.lmu.de>
Date: Thu, 2 May 2024 14:30:17 +0200
Subject: [PATCH 158/158] Remove reflection based solution to Bitwuzla options
 and add a less elegant but readable solution

---
 .../bitwuzla/BitwuzlaSolverContext.java       | 155 ++++++++++++++++--
 1 file changed, 140 insertions(+), 15 deletions(-)

diff --git a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
index d905e251e6..54d1679ff4 100644
--- a/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
+++ b/src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaSolverContext.java
@@ -8,11 +8,49 @@
 
 package org.sosy_lab.java_smt.solvers.bitwuzla;
 
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.BV_SOLVER;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.DBG_CHECK_MODEL;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.DBG_CHECK_UNSAT_CORE;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.DBG_PP_NODE_THRESH;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.DBG_RW_NODE_THRESH;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.LOGLEVEL;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.MEMORY_LIMIT;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.NUM_OPTS;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_CONTRADICTING_ANDS;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_ELIM_BV_EXTRACTS;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_EMBEDDED_CONSTR;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_FLATTEN_AND;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_NORMALIZE;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_NORMALIZE_SHARE_AWARE;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_SKELETON_PREPROC;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_VARIABLE_SUBST;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_VARIABLE_SUBST_NORM_BV_INEQ;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_VARIABLE_SUBST_NORM_DISEQ;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PP_VARIABLE_SUBST_NORM_EQ;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PREPROCESS;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PRODUCE_MODELS;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PRODUCE_UNSAT_ASSUMPTIONS;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PRODUCE_UNSAT_CORES;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PROP_CONST_BITS;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PROP_INFER_INEQ_BOUNDS;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PROP_NORMALIZE;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PROP_NPROPS;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PROP_NUPDATES;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PROP_OPT_LT_CONCAT_SEXT;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PROP_PATH_SEL;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PROP_PROB_RANDOM_INPUT;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PROP_PROB_USE_INV_VALUE;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.PROP_SEXT;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.REWRITE_LEVEL;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.SAT_SOLVER;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.SEED;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.TIME_LIMIT_PER;
+import static org.sosy_lab.java_smt.solvers.bitwuzla.api.Option.VERBOSITY;
+
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.base.Splitter.MapSplitter;
 import com.google.common.collect.ImmutableMap;
-import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.Locale;
 import java.util.Map;
@@ -156,20 +194,22 @@ private static Options setFurtherOptions(Options pOptions, String pFurtherOption
           "Invalid Bitwuzla option in \"" + pFurtherOptions + "\": " + e.getMessage(), e);
     }
     for (Map.Entry<String, String> option : furtherOptionsMap.entrySet()) {
+      String optionName = option.getKey();
+      String optionValue = option.getValue();
+      Option bitwuzlaOption = getBitwuzlaOptByString(optionName);
       try {
-        Class<?> optionClass = Option.class;
-        Field optionField = optionClass.getField(option.getKey());
-        // Get the value of the public fields
-        Option value = (Option) optionField.get(null);
-        if (pOptions.is_numeric(value)) {
-          pOptions.set(value, Integer.parseInt(option.getValue()));
+        if (pOptions.is_numeric(bitwuzlaOption)) {
+          pOptions.set(bitwuzlaOption, Integer.parseInt(optionValue));
         } else {
-          pOptions.set(value, option.getValue());
+          pOptions.set(bitwuzlaOption, option.getValue());
         }
-      } catch (java.lang.NoSuchFieldException e) {
-        throw new InvalidConfigurationException(e.getMessage(), e);
-      } catch (IllegalAccessException pE) {
-        throw new RuntimeException("Problem with access to BitwuzlaOption Field", pE);
+      } catch (NumberFormatException e) {
+        throw new InvalidConfigurationException(
+            "Option "
+                + bitwuzlaOption
+                + " needs a numeric "
+                + "value as option value, but you entered "
+                + optionValue);
       }
     }
     return pOptions;
@@ -180,9 +220,9 @@ private static Options buildBitwuzlaOptions(BitwuzlaSettings settings, long rand
     Preconditions.checkNotNull(settings.getSatSolver());
 
     Options options = new Options();
-    options.set(Option.SAT_SOLVER, settings.getSatSolver().name().toLowerCase(Locale.getDefault()));
-    options.set(Option.SEED, (int) randomSeed);
-    options.set(Option.REWRITE_LEVEL, 0); // Stop Bitwuzla from rewriting formulas in outputs
+    options.set(SAT_SOLVER, settings.getSatSolver().name().toLowerCase(Locale.getDefault()));
+    options.set(SEED, (int) randomSeed);
+    options.set(REWRITE_LEVEL, 0); // Stop Bitwuzla from rewriting formulas in outputs
 
     return setFurtherOptions(options, settings.getFurtherOptions());
   }
@@ -263,4 +303,89 @@ protected OptimizationProverEnvironment newOptimizationProverEnvironment0(
   protected boolean supportsAssumptionSolving() {
     return true;
   }
+
+  public static Option getBitwuzlaOptByString(String optionName) {
+    switch (optionName) {
+      case "LOGLEVEL":
+        return LOGLEVEL;
+      case "PRODUCE_MODELS":
+        return PRODUCE_MODELS;
+      case "PRODUCE_UNSAT_ASSUMPTIONS":
+        return PRODUCE_UNSAT_ASSUMPTIONS;
+      case "PRODUCE_UNSAT_CORES":
+        return PRODUCE_UNSAT_CORES;
+      case "SEED":
+        return SEED;
+      case "VERBOSITY":
+        return VERBOSITY;
+      case "TIME_LIMIT_PER":
+        return TIME_LIMIT_PER;
+      case "MEMORY_LIMIT":
+        return MEMORY_LIMIT;
+      case "BV_SOLVER":
+        return BV_SOLVER;
+      case "REWRITE_LEVEL":
+        return REWRITE_LEVEL;
+      case "SAT_SOLVER":
+        return SAT_SOLVER;
+      case "PROP_CONST_BITS":
+        return PROP_CONST_BITS;
+      case "PROP_INFER_INEQ_BOUNDS":
+        return PROP_INFER_INEQ_BOUNDS;
+      case "PROP_NPROPS":
+        return PROP_NPROPS;
+      case "PROP_NUPDATES":
+        return PROP_NUPDATES;
+      case "PROP_OPT_LT_CONCAT_SEXT":
+        return PROP_OPT_LT_CONCAT_SEXT;
+      case "PROP_PATH_SEL":
+        return PROP_PATH_SEL;
+      case "PROP_PROB_RANDOM_INPUT":
+        return PROP_PROB_RANDOM_INPUT;
+      case "PROP_PROB_USE_INV_VALUE":
+        return PROP_PROB_USE_INV_VALUE;
+      case "PROP_SEXT":
+        return PROP_SEXT;
+      case "PROP_NORMALIZE":
+        return PROP_NORMALIZE;
+      case "PREPROCESS":
+        return PREPROCESS;
+      case "PP_CONTRADICTING_ANDS":
+        return PP_CONTRADICTING_ANDS;
+      case "PP_ELIM_BV_EXTRACTS":
+        return PP_ELIM_BV_EXTRACTS;
+      case "PP_EMBEDDED_CONSTR":
+        return PP_EMBEDDED_CONSTR;
+      case "PP_FLATTEN_AND":
+        return PP_FLATTEN_AND;
+      case "PP_NORMALIZE":
+        return PP_NORMALIZE;
+      case "PP_NORMALIZE_SHARE_AWARE":
+        return PP_NORMALIZE_SHARE_AWARE;
+      case "PP_SKELETON_PREPROC":
+        return PP_SKELETON_PREPROC;
+      case "PP_VARIABLE_SUBST":
+        return PP_VARIABLE_SUBST;
+      case "PP_VARIABLE_SUBST_NORM_EQ":
+        return PP_VARIABLE_SUBST_NORM_EQ;
+      case "PP_VARIABLE_SUBST_NORM_DISEQ":
+        return PP_VARIABLE_SUBST_NORM_DISEQ;
+      case "PP_VARIABLE_SUBST_NORM_BV_INEQ":
+        return PP_VARIABLE_SUBST_NORM_BV_INEQ;
+      case "DBG_RW_NODE_THRESH":
+        return DBG_RW_NODE_THRESH;
+      case "DBG_PP_NODE_THRESH":
+        return DBG_PP_NODE_THRESH;
+      case "DBG_CHECK_MODEL":
+        return DBG_CHECK_MODEL;
+      case "DBG_CHECK_UNSAT_CORE":
+        return DBG_CHECK_UNSAT_CORE;
+      case "NUM_OPTS":
+        return NUM_OPTS;
+      default:
+        // Possibly new option that needs to be entered into the switch case
+        throw new IllegalArgumentException(
+            "Unknown option: " + optionName + ". Please use the C++ " + "options of Bitwuzla.");
+    }
+  }
 }