Code cleanup

Signed-off-by: Alan Jowett <[email protected]>

.gitignore

@@ -0,0 +1,118 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+.vscode/
+.vs/

libfuzzer/CMakeLists.txt

@@ -6,36 +6,54 @@ if (UBPF_SKIP_EXTERNAL)
     return()
 endif()
 
+set(UBPF_FUZZER_INCLUDES "${CMAKE_SOURCE_DIR}/vm"
+    "${CMAKE_BINARY_DIR}/vm"
+    "${CMAKE_BINARY_DIR}/_deps/gsl-src/include"
+    "${CMAKE_SOURCE_DIR}/vm/inc"
+    "${CMAKE_BINARY_DIR}/vm/inc"
+    "${CMAKE_SOURCE_DIR}/ubpf_plugin"
+    "${CMAKE_SOURCE_DIR}/external/ebpf-verifier/src"
+    "${CMAKE_SOURCE_DIR}/external/ebpf-verifier/src/crab"
+    "${CMAKE_SOURCE_DIR}/external/ebpf-verifier/src/crab_utils"
+    "${CMAKE_CURRENT_BINARY_DIR}")
+
+set(UBPF_FUZZER_LIBS
+    ubpf
+    ubpf_settings
+    ebpfverifier)
+
+# include(CheckCXXSymbolExists)
+
+set(CMAKE_REQUIRED_INCLUDES ${UBPF_FUZZER_INCLUDES})
+
+# check_cxx_symbol_exists(ebpf_verifier_options_t::store_pre_invariants "config.hpp" HAVE_EBPF_CHECK_CONSTRAINTS_AT_LABEL)
+
+include(CheckCXXSourceCompiles)
+
+set(CHECK_CONFIG_STORE_PRE_INVARIANTS "
+#include <config.hpp>
+int main() {
+    ebpf_verifier_options_t options;
+    options.store_pre_invariants = true;
+    return 0;
+}
+")
+
+check_cxx_source_compiles("${CHECK_CONFIG_STORE_PRE_INVARIANTS}" HAVE_EBPF_VERIFIER_CHECK_CONSTRAINTS_AT_LABEL)
+
 set(CMAKE_CXX_STANDARD 20)
 
 configure_file(
     libfuzzer_config.h.inc
     "${CMAKE_CURRENT_BINARY_DIR}/libfuzzer_config.h"
 )
 
-
 add_executable(
     ubpf_fuzzer
     libfuzz_harness.cc
 )
 
-target_include_directories("ubpf_fuzzer" PRIVATE
-    "${CMAKE_SOURCE_DIR}/vm"
-    "${CMAKE_BINARY_DIR}/vm"
-    "${CMAKE_BINARY_DIR}/_deps/gsl-src/include"
-    "${CMAKE_SOURCE_DIR}/vm/inc"
-    "${CMAKE_BINARY_DIR}/vm/inc"
-    "${CMAKE_SOURCE_DIR}/ubpf_plugin"
-    "${CMAKE_SOURCE_DIR}/external/ebpf-verifier/src"
-    "${CMAKE_SOURCE_DIR}/external/ebpf-verifier/src/crab"
-    "${CMAKE_SOURCE_DIR}/external/ebpf-verifier/src/crab_utils"
-    "${CMAKE_CURRENT_BINARY_DIR}"
-)
+target_include_directories("ubpf_fuzzer" PRIVATE ${UBPF_FUZZER_INCLUDES})
 
-target_link_libraries(
-    ubpf_fuzzer
-    ubpf
-    ubpf_settings
-    ebpfverifier
-)
+target_link_libraries(ubpf_fuzzer PRIVATE ${UBPF_FUZZER_LIBS})