Simplicity cmake

cmake/module/ProcessConfigurations.cmake

@@ -104,6 +104,23 @@ function(remove_cxx_flag_from_all_configs flag)
   endforeach()
 endfunction()
 
+function(remove_c_flag_from_all_configs flag)
+  get_all_configs(all_configs)
+  foreach(config IN LISTS all_configs)
+    string(TOUPPER "${config}" config_uppercase)
+    set(flags "${CMAKE_C_FLAGS_${config_uppercase}}")
+    separate_arguments(flags)
+    list(FILTER flags EXCLUDE REGEX "${flag}")
+    list(JOIN flags " " new_flags)
+    set(CMAKE_C_FLAGS_${config_uppercase} "${new_flags}" PARENT_SCOPE)
+    set(CMAKE_C_FLAGS_${config_uppercase} "${new_flags}"
+      CACHE STRING
+      "Flags used by the C compiler during ${config_uppercase} builds."
+      FORCE
+    )
+  endforeach()
+endfunction()
+
 function(replace_cxx_flag_in_config config old_flag new_flag)
   string(TOUPPER "CMAKE_CXX_FLAGS_${config}" var_name)
   if("${var_name}" IN_LIST precious_variables)
@@ -121,8 +138,10 @@ include(TryAppendCXXFlags)
 # We leave assertions on.
 if(MSVC)
   remove_cxx_flag_from_all_configs(/DNDEBUG)
+  remove_c_flag_from_all_configs(/DNDEBUG)
 else()
   remove_cxx_flag_from_all_configs(-DNDEBUG)
+  remove_c_flag_from_all_configs(-DNDEBUG)
 
   # Adjust flags used by the CXX compiler during RELEASE builds.
   # Prefer -O2 optimization level. (-O3 is CMake's default for Release for many compilers.)

src/CMakeLists.txt

@@ -19,6 +19,7 @@ include(../cmake/crc32c.cmake)
 include(../cmake/leveldb.cmake)
 include(../cmake/minisketch.cmake)
 add_subdirectory(univalue)
+add_subdirectory(simplicity)
 if (ENABLE_IPC AND NOT WITH_EXTERNAL_LIBMULTIPROCESS)
   include(../cmake/libmultiprocess.cmake)
   add_libmultiprocess(ipc/libmultiprocess)
@@ -76,6 +77,7 @@ target_link_libraries(bitcoin_consensus
     core_interface
     bitcoin_crypto
     secp256k1
+    BitcoinSimplicity
 )
 
 if(WITH_ZMQ)

src/simplicity/CMakeLists.txt

@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(BitcoinSimplicity)
+
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_EXTENSIONS OFF)
+
+add_library(BitcoinSimplicity STATIC
+  bitstream.c
+  dag.c
+  deserialize.c
+  eval.c
+  frame.c
+  jets-secp256k1.c
+  jets.c
+  rsort.c
+  sha256.c
+  type.c
+  typeInference.c
+  bitcoin/env.c
+  bitcoin/exec.c
+  bitcoin/bitcoinJets.c
+  bitcoin/ops.c
+  bitcoin/primitive.c
+  bitcoin/txEnv.c
+)
+
+option(PRODUCTION "Enable production build" ON)
+if (PRODUCTION)
+  target_compile_definitions(BitcoinSimplicity PRIVATE "PRODUCTION")
+endif()
+
+target_include_directories(BitcoinSimplicity PUBLIC
+                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+                           $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+                          )

src/simplicity/Makefile

@@ -0,0 +1,48 @@
+CORE_OBJS := bitstream.o cmr.o dag.o deserialize.o eval.o frame.o jets.o jets-secp256k1.o rsort.o sha256.o type.o typeInference.o
+BITCOIN_OBJS := bitcoin/env.o bitcoin/exec.o bitcoin/ops.o bitcoin/bitcoinJets.o bitcoin/primitive.o bitcoin/cmr.o bitcoin/txEnv.o
+ELEMENTS_OBJS := elements/env.o elements/exec.o elements/ops.o elements/elementsJets.o elements/primitive.o elements/cmr.o elements/txEnv.o
+TEST_OBJS := test.o ctx8Pruned.o ctx8Unpruned.o hashBlock.o regression4.o schnorr0.o schnorr6.o typeSkipTest.o elements/checkSigHashAllTx1.o
+
+# From https://fastcompression.blogspot.com/2019/01/compiler-warnings.html
+CWARN := -Werror -Wall -Wextra -Wcast-qual -Wcast-align -Wstrict-aliasing -Wpointer-arith -Winit-self -Wshadow -Wswitch-enum -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wfloat-equal -Wundef -Wconversion
+
+ifneq ($(doCheck), 1)
+CPPFLAGS := $(CPPFLAGS) -DPRODUCTION
+endif
+
+CFLAGS := $(CFLAGS) -I include
+
+# libsecp256k1 is full of conversion warnings, so we compile jets-secp256k1.c separately.
+jets-secp256k1.o: jets-secp256k1.c
+	$(CC) -c $(CFLAGS) $(CWARN) -Wno-conversion $(CPPFLAGS) -o $@ $<
+
+elements/elementsJets.o: elements/elementsJets.c
+	$(CC) -c $(CFLAGS) $(CWARN) -Wno-switch-enum -Wswitch $(CPPFLAGS) -o $@ $<
+
+sha256.o: sha256.c
+	$(CC) -c $(CFLAGS) $(X86_SHANI_CXXFLAGS) $(CWARN) -Wno-cast-align -Wno-sign-conversion $(CPPFLAGS) -o $@ $<
+
+%.o: %.c
+	$(CC) -c $(CFLAGS) $(CWARN) $(CPPFLAGS) -o $@ $<
+
+libBitcoinSimplicity.a: $(CORE_OBJS) $(BITCOIN_OBJS)
+	ar rcs $@ $^
+
+libElementsSimplicity.a: $(CORE_OBJS) $(ELEMENTS_OBJS)
+	ar rcs $@ $^
+
+test: $(TEST_OBJS) libElementsSimplicity.a
+	$(CC) $^ -o $@ $(LDFLAGS)
+
+install: libBitcoinSimplicity.a libElementsSimplicity.a
+	mkdir -p $(out)/lib
+	cp $^ $(out)/lib/
+	cp -R include $(out)/include
+
+check: test
+	./test
+
+clean:
+	-rm -f test libElementsSimplicity.a $(TEST_OBJS) $(OBJS)
+
+.PHONY: install check clean