minor updates all around

Author: benedekkupper

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 project(bitfilled
@@ -14,13 +14,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 add_library(${PROJECT_NAME} INTERFACE)
 add_subdirectory(${PROJECT_NAME})
 
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    set(IS_TOPLEVEL_PROJECT TRUE)
-else()
-    set(IS_TOPLEVEL_PROJECT FALSE)
-endif()
-
-option(BITFILLED_TESTS "Enable unit testing" ${IS_TOPLEVEL_PROJECT})
+option(BITFILLED_TESTS "Enable unit testing" ${PROJECT_IS_TOP_LEVEL})
 if(BITFILLED_TESTS)
     enable_testing()
     add_subdirectory(test)

bitfilled/bitfilled/integer.hpp

@@ -59,7 +59,10 @@ struct integer_storage : public std::array<sized_unsigned_t<1>, SIZE>
     using base_type::operator=;
 
     constexpr integer_storage() : base_type() {}
-
+    constexpr explicit integer_storage(const sized_unsigned_t<1> (&arr)[SIZE])
+    {
+        std::copy_n(arr, SIZE, base_type::data());
+    }
     template <std::integral T>
     constexpr explicit integer_storage(T value, std::endian endianness = std::endian::native)
         : base_type()
@@ -185,6 +188,8 @@ struct packed_integer
 
     constexpr packed_integer() : storage_() {}
     constexpr packed_integer(value_type value) : storage_(value, endianness) {}
+    constexpr explicit packed_integer(const sized_unsigned_t<1> (&arr)[SIZE]) : storage_(arr) {}
+
     constexpr packed_integer& operator=(value_type value)
     {
         storage_ = integer_storage<SIZE>(value, endianness);

bitfilled/bitfilled/mmreg.hpp

@@ -127,6 +127,12 @@ struct mmreg : public detail::accesscondition<ACCESS, detail::mmr_r<T>, detail::
     constexpr mmreg& operator=(const mmreg&)
         requires(!is_readwrite<ACCESS>)
     = delete;
+    constexpr mmreg(const mmreg&)
+        requires(is_readwrite<ACCESS>)
+    = default;
+    constexpr mmreg& operator=(const mmreg&)
+        requires(is_readwrite<ACCESS>)
+    = default;
 
     BITFILLED_OPS_FORWARDING
 };

tools/svd2mmregmap.py

@@ -38,7 +38,7 @@ def generate_peripheral(peripheral, bitband):
     # TODO: in the first round of iteration, generate enum types where enumeratedValues is provided
     # also de-duplicate enum types across registers
 
-    nametrim = peripheral.name + "_"
+    nametrim = peripheral_name + "_"
     offset = 0
     for register in peripheral.get_registers():
         # filling gaps in the register map with reserved