diff --git a/src/lib/netlist/devices/nld_truthtable.cpp b/src/lib/netlist/devices/nld_truthtable.cpp index e4249713df4..5aa4be0b572 100644 --- a/src/lib/netlist/devices/nld_truthtable.cpp +++ b/src/lib/netlist/devices/nld_truthtable.cpp @@ -67,7 +67,7 @@ UINT32 truthtable_desc_t::get_ignored_extended(UINT32 i) * may change the output */ UINT32 bits = (1< t(bits); + std::vector t(bits); for (UINT32 j=1; j &timing_index) + UINT64 state,UINT16 val, std::vector &timing_index) { pstring elem = list[cur].trim(); int start = 0; @@ -178,7 +178,7 @@ void truthtable_desc_t::setup(const plib::pstring_vector_t &truthtable, UINT32 d nl_assert_always(times.size() == m_NO, "timing count not matching"); UINT16 val = 0; - plib::array_t tindex(m_NO); + std::vector tindex; for (unsigned j=0; j ign(m_size); - - for (UINT32 j=0; j < m_size; j++) - ign[j] = ~0U; + std::vector ign(m_size, ~0U); for (UINT32 i=0; i &timing_index); + UINT64 state,UINT16 val, std::vector &timing_index); static unsigned count_bits(UINT32 v); static UINT32 set_bits(UINT32 v, UINT32 b); UINT32 get_ignored_simple(UINT32 i); diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index 14b6ed17e61..6ccdb735b12 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -1053,8 +1053,8 @@ namespace netlist private: struct names_t { char m_buf[64]; }; int m_qsize; - plib::array_t m_times; - plib::array_t m_names; + std::vector m_times; + std::vector m_names; }; // ----------------------------------------------------------------------------- diff --git a/src/lib/netlist/nl_lists.h b/src/lib/netlist/nl_lists.h index 20e2392243e..da5e2ca8967 100644 --- a/src/lib/netlist/nl_lists.h +++ b/src/lib/netlist/nl_lists.h @@ -126,7 +126,7 @@ namespace netlist volatile std::atomic m_lock; #endif entry_t * m_end; - plib::array_t m_list; + std::vector m_list; }; } diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h index bad35a34034..ae62e1dd886 100644 --- a/src/lib/netlist/plib/plists.h +++ b/src/lib/netlist/plib/plists.h @@ -15,78 +15,13 @@ #include #include #include +#include #include "palloc.h" #include "pstring.h" namespace plib { -// ---------------------------------------------------------------------------------------- -// parray_t: dynamic array -// ---------------------------------------------------------------------------------------- - -template -class array_t -{ -public: - - ATTR_COLD array_t(std::size_t numElements) - : m_list(0), m_capacity(0) - { - set_capacity(numElements); - } - - ATTR_COLD array_t(const array_t &rhs) - : m_list(0), m_capacity(0) - { - set_capacity(rhs.size()); - for (std::size_t i=0; i 0) - m_list = palloc_array(new_capacity); - else - m_list = nullptr; - m_capacity = new_capacity; - } - -private: - - LC * m_list; - int m_capacity; -}; - /* ---------------------------------------------------------------------------------------- * uninitialised_array_t: * fixed size array allowing to override constructor and initialize @@ -637,7 +572,7 @@ private: } pvector_t m_values; - array_t m_hash; + std::vector m_hash; }; // ----------------------------------------------------------------------------------------