removed INIT component from LUTs, fixed INIT handling in gates; some plugins missing

Author: julianspeith

include/hal_core/netlist/gate.h

@@ -522,21 +522,54 @@ 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.
+         * Get the INIT string owned by the given LUT output or internal pin.
+         * Returns the pin's hex slice, or the full INIT string when no bit range is configured.
+         * An error is returned when the gate has no LUT component, the pin does not exist,
+         * its type is not `PinType::lut`, or its direction is neither `output` nor `internal`.
+         *
+         * @param[in] pin_name - Name of the LUT pin.
+         * @returns The INIT string as an uppercase hex string on success, an error otherwise.
          */
-        Result<std::vector<std::string>> get_init_data() const;
+        Result<std::string> get_init_string(const std::string& pin_name) 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.
+         * Get the INIT string owned by the given LUT output or internal pin.
+         * Returns the pin's hex slice, or the full INIT string when no bit range is configured.
+         * An error is returned when the gate has no LUT component, the pin is nullptr,
+         * its type is not `PinType::lut`, or its direction is neither `output` nor `internal`.
+         *
+         * @param[in] pin - The LUT pin.
+         * @returns The INIT string as an uppercase hex string on success, an error otherwise.
+         */
+        Result<std::string> get_init_string(const GatePin* pin) const;
+
+        /**
+         * Set the INIT string for the given LUT output or internal pin.
+         * The hex string must consist only of hex digits (no '0x' prefix). When a bit range
+         * is configured for the pin its length must equal (bit_count + 3) / 4 characters.
+         * An error is returned when the gate has no LUT component, the pin does not exist,
+         * its type is not `PinType::lut`, its direction is neither `output` nor `internal`,
+         * the pin has no INIT config, or the hex string has an invalid format or length.
+         *
+         * @param[in] pin_name - Name of the LUT output or internal pin.
+         * @param[in] hex - The INIT string as a hex string without '0x' prefix.
+         * @returns Ok on success, an error otherwise.
+         */
+        Result<std::monostate> set_init_string(const std::string& pin_name, const std::string& hex);
+
+        /**
+         * Set the INIT string for the given LUT output or internal pin.
+         * The hex string must consist only of hex digits (no '0x' prefix). When a bit range
+         * is configured for the pin its length must equal (bit_count + 3) / 4 characters.
+         * An error is returned when the gate has no LUT component, the pin is nullptr,
+         * its type is not `PinType::lut`, its direction is neither `output` nor `internal`,
+         * the pin has no INIT config, or the hex string has an invalid format or length.
+         *
+         * @param[in] pin - The LUT output or internal pin.
+         * @param[in] hex - The INIT string as a hex string without '0x' prefix.
+         * @returns Ok on success, an error otherwise.
          */
-        Result<std::monostate> set_init_data(const std::vector<std::string>& init_data);
+        Result<std::monostate> set_init_string(const GatePin* pin, const std::string& hex);
 
     private:
         friend class NetlistInternalManager;

include/hal_core/netlist/gate_library/gate_type_component/gate_type_component.h

@@ -57,13 +57,12 @@ namespace hal
         };
 
         /**
-         * Create a new LUTComponent with given child component and bit-order.
-         * 
-         * @param[in] component - Another component to be added as a child component.
+         * Create a new LUTComponent.
+         *
          * @param[in] init_ascending - True if ascending bit-order, false otherwise.
          * @returns The LUTComponent.
          */
-        static std::unique_ptr<GateTypeComponent> create_lut_component(std::unique_ptr<GateTypeComponent> component, bool init_ascending);
+        static std::unique_ptr<GateTypeComponent> create_lut_component(bool init_ascending);
 
         /**
          * Create a new FFComponent with given child component and tzhe Boolean functions describing the next state and the clock signal.

include/hal_core/netlist/gate_library/gate_type_component/lut_component.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "hal_core/netlist/gate_library/gate_type_component/gate_type_component.h"
+#include "hal_core/netlist/pins/gate_pin.h"
 
 #include <unordered_map>
 
@@ -36,22 +37,20 @@ namespace hal
     public:
         /**
          * Maps an output pin to a specific slice of an INIT string.
-         * When bit_count is 0 the full INIT string is used (legacy behaviour).
          */
         struct LUTOutputConfig
         {
             std::string init_identifier;
-            u32 bit_offset = 0;
-            u32 bit_count  = 0;
+            u32 bit_offset;
+            u32 bit_count;
         };
 
         /**
-         * Construct a new LUTComponent with given child component and bit-order.
+         * Construct a new LUTComponent.
          *
-         * @param[in] component - Another component to be added as a child component.
          * @param[in] init_ascending - True if ascending bit-order, false otherwise.
          */
-        LUTComponent(std::unique_ptr<GateTypeComponent> component, bool init_ascending);
+        explicit LUTComponent(bool init_ascending);
 
         /**
          * Get the type of the gate type component.
@@ -92,15 +91,42 @@ namespace hal
         void set_init_ascending(bool init_ascending = true);
 
         /**
-         * Associate an output pin with a specific INIT identifier and an optional bit range.
-         * When bit_count is 0 the full INIT string starting at bit_offset is used.
+         * Associate an output pin with a specific INIT identifier and a bit range.
+         * Overwrites any existing configuration for the same pin name.
          *
          * @param[in] pin_name - Name of the LUT output pin.
          * @param[in] init_identifier - The data identifier within the INIT category.
          * @param[in] bit_offset - First bit (LSB = 0) of the slice within the parsed INIT value.
-         * @param[in] bit_count - Number of bits in the slice; must be a power of two, or 0 for full string.
+         * @param[in] bit_count - Number of bits in the slice; must be a non-zero power of two.
          */
-        void set_output_pin_config(const std::string& pin_name, const std::string& init_identifier, u32 bit_offset = 0, u32 bit_count = 0);
+        void add_output_pin_config(const std::string& pin_name, const std::string& init_identifier, u32 bit_offset, u32 bit_count);
+
+        /**
+         * Associate an output pin with a specific INIT identifier and a bit range.
+         * Overwrites any existing configuration for the same pin.
+         *
+         * @param[in] pin - The LUT output pin.
+         * @param[in] init_identifier - The data identifier within the INIT category.
+         * @param[in] bit_offset - First bit (LSB = 0) of the slice within the parsed INIT value.
+         * @param[in] bit_count - Number of bits in the slice; must be a non-zero power of two.
+         */
+        void add_output_pin_config(const GatePin* pin, const std::string& init_identifier, u32 bit_offset, u32 bit_count);
+
+        /**
+         * Remove the output configuration for a specific pin.
+         *
+         * @param[in] pin_name - Name of the LUT output pin.
+         * @returns True if an entry was removed, false if no entry existed for that pin.
+         */
+        bool remove_output_pin_config(const std::string& pin_name);
+
+        /**
+         * Remove the output configuration for a specific pin.
+         *
+         * @param[in] pin - The LUT output pin.
+         * @returns True if an entry was removed, false if no entry existed for that pin.
+         */
+        bool remove_output_pin_config(const GatePin* pin);
 
         /**
          * Get the output configuration for a specific pin, or nullptr if none is set.
@@ -119,35 +145,32 @@ namespace hal
 
         /**
          * Extract a bit slice from a full INIT hex string.
-         * Returns the slice as an uppercase hex string padded to (bit_count+3)/4 characters.
-         * If bit_count is 0 or full_hex is empty the string is returned unchanged.
+         * Returns the slice as an uppercase hex string padded to `(bit_count+3)/4` characters.
          *
-         * @param[in] full_hex   - Full INIT value as a hex string.
+         * @param[in] full_hex   - Full INIT value as a hex string; must not be empty and must
+         *                         contain at least `(bit_offset+bit_count+3)/4` hex chars.
          * @param[in] bit_offset - First bit (LSB = 0) of the slice.
-         * @param[in] bit_count  - Number of bits in the slice; 0 means full string.
-         * @returns OK with the extracted hex string, or ERR on parse failure.
+         * @param[in] bit_count  - Number of bits in the slice; must be non-zero.
+         * @returns OK with the extracted hex string on success, an error if `full_hex` is empty, too short, or invalid.
          */
         static Result<std::string> extract_init_slice(const std::string& full_hex, u32 bit_offset, u32 bit_count);
 
         /**
-         * Splice a new slice value into a full INIT hex string at [bit_offset, bit_offset+bit_count).
-         * When bit_count is 0 the slice_hex is treated as the full replacement value (uppercased).
-         * The output preserves the digit width of full_hex; if full_hex is empty the minimum width
+         * Splice a new slice value into a full INIT hex string at `[bit_offset, bit_offset+bit_count)`.
+         * The output preserves the digit width of `full_hex`; if `full_hex` is empty the minimum width
          * needed to hold the splice is used.
          *
          * @param[in] full_hex   - Current full INIT value as a hex string (may be empty).
-         * @param[in] slice_hex  - New value for the bit slice (or full replacement when bit_count==0).
+         * @param[in] slice_hex  - New value for the bit slice.
          * @param[in] bit_offset - First bit (LSB = 0) of the slice.
-         * @param[in] bit_count  - Number of bits in the slice; 0 means full replacement.
-         * @returns OK with the updated full hex string, or ERR on parse failure.
+         * @param[in] bit_count  - Number of bits in the slice; must be non-zero.
+         * @returns OK with the updated full hex string on success, an error on parse failure.
          */
         static Result<std::string> splice_init_slice(const std::string& full_hex, const std::string& slice_hex, u32 bit_offset, u32 bit_count);
 
     private:
-        static constexpr ComponentType m_type          = ComponentType::lut;
-        std::unique_ptr<GateTypeComponent> m_component = nullptr;
-
-        bool m_init_ascending = true;
+        static constexpr ComponentType m_type = ComponentType::lut;
+        bool m_init_ascending                 = true;
         std::unordered_map<std::string, LUTOutputConfig> m_output_pin_configs;
     };
 }    // namespace hal

plugins/gui/src/gatelibrary_management/gatelibrary_pages/lut_wizardpage.cpp

@@ -127,9 +127,8 @@ namespace hal
         mPinConfigTable->setCellWidget(row, 2, offsetSpin);
 
         auto* countSpin = new QSpinBox(mPinConfigTable);
-        countSpin->setRange(0, 1 << 20);
-        countSpin->setSpecialValueText("full");
-        countSpin->setValue(static_cast<int>(bitCount));
+        countSpin->setRange(1, 1 << 20);
+        countSpin->setValue(static_cast<int>(bitCount > 0 ? bitCount : 1));
         mPinConfigTable->setCellWidget(row, 3, countSpin);
     }
 
@@ -149,7 +148,7 @@ namespace hal
 
     void LUTWizardPage::addRow()
     {
-        addTableRow("", "INIT", 0, 0, getOutputPinsFromWizard());
+        addTableRow("", "INIT", 0, 1, getOutputPinsFromWizard());
     }
 
     void LUTWizardPage::removeSelectedRow()