Merge branch 'master' of github.com:emsec/hal

Author: SJulianS

include/hal_core/hal_version.h.in

@@ -35,28 +35,28 @@ namespace hal
         const std::string version = "@HAL_VERSION_RETURN@";
 
         // Major Version Number
-        const int major = @HAL_VERSION_MAJOR @;
+        const int major = @HAL_VERSION_MAJOR@;
 
         // Minor Version Number
-        const int minor = @HAL_VERSION_MINOR @;
+        const int minor = @HAL_VERSION_MINOR@;
 
         // Patch Version Number
-        const int patch = @HAL_VERSION_PATCH @;
+        const int patch = @HAL_VERSION_PATCH@;
 
         // Tweak Version Number
-        const int tweak = @HAL_VERSION_TWEAK @;
+        const int tweak = @HAL_VERSION_TWEAK@;
 
         // Additional number of commits since last assigned version number
-        const int additional_commits = @HAL_VERSION_ADDITIONAL_COMMITS @;
+        const int additional_commits = @HAL_VERSION_ADDITIONAL_COMMITS@;
 
         // Git Hash used for the current build
         const std::string git_hash = "@HAL_VERSION_HASH@";
 
         // Is it build from a dirty source directory?
-        const bool is_dirty = @HAL_VERSION_DIRTY @;
+        const bool is_dirty = @HAL_VERSION_DIRTY@;
 
         // Is the git repository broken on the development machine?
-        const bool is_broken = @HAL_VERSION_BROKEN @;
+        const bool is_broken = @HAL_VERSION_BROKEN@;
 
         // Build Timestamp.
         const std::string build_timestamp = "@BUILD_TIMESTAMP@";

include/hal_core/netlist/gate.h

@@ -443,14 +443,31 @@ namespace hal
          */
         Endpoint* get_successor(const GatePin* pin) const;
 
+        /**
+         * Get the INIT data of the gate, if available. 
+         * An error is returned in case the gate does not hold any INIT data.
+         * 
+         * @return The INIT data as a vector on success, an error message otherwise.
+         */
+        Result<std::vector<std::string>> get_init_data() const;
+
+        /**
+         * Set the INIT data of the gate, if available. 
+         * An error is returned in case the gate does not hold any INIT data.
+         * 
+         * @param[in] init_data - The INIT data as a vector.
+         * @returns Ok on success, an error message otherwise.
+         */
+        Result<std::monostate> set_init_data(const std::vector<std::string>& init_data);
+
     private:
         friend class NetlistInternalManager;
         Gate(NetlistInternalManager* mgr, EventHandler* event_handler, u32 id, GateType* gt, const std::string& name, i32 x, i32 y);
 
-        Gate(const Gate&) = delete;
-        Gate(Gate&&)      = delete;
+        Gate(const Gate&)            = delete;
+        Gate(Gate&&)                 = delete;
         Gate& operator=(const Gate&) = delete;
-        Gate& operator=(Gate&&) = delete;
+        Gate& operator=(Gate&&)      = delete;
 
         BooleanFunction get_lut_function(const GatePin* pin) const;
 

include/hal_core/netlist/gate_library/enums/gate_type_property.h

@@ -0,0 +1,67 @@
+//  MIT License
+//
+//  Copyright (c) 2019 Ruhr University Bochum, Chair for Embedded Security. All Rights reserved.
+//  Copyright (c) 2021 Max Planck Institute for Security and Privacy. All Rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+
+#pragma once
+
+#include "hal_core/utilities/enums.h"
+
+namespace hal
+{
+    /**
+     * A set of available properties for a gate type.
+     */
+    enum class GateTypeProperty
+    {
+        combinational, /**< Combinational gate type. **/
+        sequential,    /**< Sequential gate type. **/
+        tristate,      /**< Tristate gate type. **/
+        power,         /**< Power gate type. **/
+        ground,        /**< Ground gate type. **/
+        ff,            /**< Flip-flop gate type. **/
+        latch,         /**< Latch gate type. **/
+        ram,           /**< RAM gate type. **/
+        io,            /**< IO gate type. **/
+        dsp,           /**< DSP gate type. **/
+        pll,           /**< PLL gate type. **/
+        oscillator,    /**< Oscillator gate type. **/
+        scan,          /**< Scan gate type. **/
+        c_buffer,      /**< Buffer gate type. **/
+        c_inverter,    /**< Inverter gate type. **/
+        c_and,         /**< AND gate type. **/
+        c_nand,        /**< NAND gate type. **/
+        c_or,          /**< OR gate type. **/
+        c_nor,         /**< NOR gate type. **/
+        c_xor,         /**< XOR gate type. **/
+        c_xnor,        /**< XNOR gate type. **/
+        c_aoi,         /**< AOI gate type. **/
+        c_oai,         /**< OAI gate type. **/
+        c_mux,         /**< MUX gate type. **/
+        c_carry,       /**< Carry gate type. **/
+        c_half_adder,  /**< Half adder gate type. **/
+        c_full_adder,  /**< Full adder gate type. **/
+        c_lut          /**< LUT gate type. **/
+    };
+
+    template<>
+    std::map<GateTypeProperty, std::string> EnumStrings<GateTypeProperty>::data;
+}    // namespace hal

include/hal_core/netlist/gate_library/enums/pin_type.h

@@ -47,7 +47,9 @@ namespace hal
         data,      /**< Data pin. **/
         address,   /**< Address pin. **/
         io_pad,    /**< IO pad pin. **/
-        select     /**< Select pin. **/
+        select,    /**< Select pin. **/
+        carry,     /**< Carry pin. **/
+        sum        /**< Sum pin. **/
     };
 
     template<>

include/hal_core/netlist/gate_library/gate_type.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "hal_core/netlist/boolean_function.h"
+#include "hal_core/netlist/gate_library/enums/gate_type_property.h"
 #include "hal_core/netlist/gate_library/gate_type_component/gate_type_component.h"
 #include "hal_core/netlist/pins/gate_pin.h"
 #include "hal_core/netlist/pins/pin_group.h"
@@ -41,31 +42,6 @@ namespace hal
 {
     class GateLibrary;
 
-    /**
-     * A set of available properties for a gate type.
-     */
-    enum class GateTypeProperty
-    {
-        combinational, /**< Combinational gate type. **/
-        sequential,    /**< Sequential gate type. **/
-        power,         /**< Power gate type. **/
-        ground,        /**< Ground gate type. **/
-        lut,           /**< LUT gate type. **/
-        ff,            /**< Flip-flop gate type. **/
-        latch,         /**< Latch gate type. **/
-        ram,           /**< RAM gate type. **/
-        io,            /**< IO gate type. **/
-        dsp,           /**< DSP gate type. **/
-        mux,           /**< MUX gate type. **/
-        buffer,        /**< Buffer gate type. **/
-        carry,         /**< Carry gate type. **/
-        pll,           /**< PLL gate type. **/
-        oscillator,    /**< Oscillator gate type. **/
-    };
-
-    template<>
-    std::map<GateTypeProperty, std::string> EnumStrings<GateTypeProperty>::data;
-
     /**
      * A gate type contains information about its internals such as input and output pins as well as its Boolean functions.
      *