diff --git a/src/lib/netlist/devices/nld_2102A.cpp b/src/lib/netlist/devices/nld_2102A.cpp index da8ffc3cc1d..8dbd5be8fec 100644 --- a/src/lib/netlist/devices/nld_2102A.cpp +++ b/src/lib/netlist/devices/nld_2102A.cpp @@ -38,7 +38,7 @@ namespace netlist logic_output_t m_DO; - state_var m_ram; // 1024x1 bits + state_var m_ram; // 1024x1 bits param_ptr_t m_RAM; }; @@ -81,8 +81,8 @@ namespace netlist if (!m_RWQ()) { - m_ram[byte] &= ~(static_cast(1) << bit); - m_ram[byte] |= (static_cast(m_DI()) << bit); + m_ram[byte] &= ~(static_cast(1) << bit); + m_ram[byte] |= (static_cast(m_DI()) << bit); } m_DO.push((m_ram[byte] >> bit) & 1, max_delay); diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp index 051fcd18ebe..fccdc8b1044 100644 --- a/src/lib/netlist/devices/nld_82S16.cpp +++ b/src/lib/netlist/devices/nld_82S16.cpp @@ -37,7 +37,7 @@ namespace netlist logic_input_t m_DIN; logic_output_t m_DOUTQ; - state_var m_ram; // 256 bits + state_var m_ram; // 256 bits }; NETLIB_OBJECT_DERIVED(82S16_dip, 82S16) @@ -87,8 +87,8 @@ namespace netlist if (!m_WEQ()) { m_ram[adr >> 6] = (m_ram[adr >> 6] - & ~(static_cast(1) << (adr & 0x3f))) - | (static_cast(m_DIN()) << (adr & 0x3f)); + & ~(static_cast(1) << (adr & 0x3f))) + | (static_cast(m_DIN()) << (adr & 0x3f)); } m_DOUTQ.push(((m_ram[adr >> 6] >> (adr & 0x3f)) & 1) ^ 1, NLTIME_FROM_NS(20)); } diff --git a/src/lib/netlist/devices/nld_am2847.cpp b/src/lib/netlist/devices/nld_am2847.cpp index ec4eafc8dd6..f0517f20cf2 100644 --- a/src/lib/netlist/devices/nld_am2847.cpp +++ b/src/lib/netlist/devices/nld_am2847.cpp @@ -27,7 +27,7 @@ namespace netlist logic_input_t m_RC; logic_input_t m_IN; - state_var m_buffer; + state_var m_buffer; logic_output_t m_OUT; }; @@ -66,7 +66,7 @@ namespace netlist NETLIB_SUB(Am2847_shifter) m_D; logic_input_t m_CP; - state_var m_last_CP; + state_var m_last_CP; }; NETLIB_OBJECT_DERIVED(AM2847_dip, AM2847) @@ -111,10 +111,10 @@ namespace netlist inline NETLIB_FUNC_VOID(Am2847_shifter, shift, (void)) { unsigned out = m_buffer[0] & 1; - uint_fast32_t in = (m_RC() ? out : m_IN()); + uint32_t in = (m_RC() ? out : m_IN()); for (std::size_t i=0; i < 5; i++) { - uint_fast16_t shift_in = (i == 4) ? in : m_buffer[i + 1]; + uint16_t shift_in = (i == 4) ? in : m_buffer[i + 1]; m_buffer[i] >>= 1; m_buffer[i] |= shift_in << 15; } diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index 7392d531877..ebfe65c14cc 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -355,15 +355,15 @@ namespace netlist // State variables - predefined and c++11 non-optional // ----------------------------------------------------------------------------- - /*! predefined state variable type for uint_fast8_t */ - using state_var_u8 = state_var; - /*! predefined state variable type for int_fast8_t */ - using state_var_s8 = state_var; + /*! predefined state variable type for uint8_t */ + using state_var_u8 = state_var; + /*! predefined state variable type for int8_t */ + using state_var_s8 = state_var; - /*! predefined state variable type for uint_fast32_t */ - using state_var_u32 = state_var; - /*! predefined state variable type for int_fast32_t */ - using state_var_s32 = state_var; + /*! predefined state variable type for uint32_t */ + using state_var_u32 = state_var; + /*! predefined state variable type for int32_t */ + using state_var_s32 = state_var; // ----------------------------------------------------------------------------- // object_t diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h index 9eb1dae0ad8..4edc9524a43 100644 --- a/src/lib/netlist/nl_time.h +++ b/src/lib/netlist/nl_time.h @@ -33,7 +33,7 @@ namespace netlist public: using internal_type = TYPE; - using mult_type = std::uint_fast64_t; + using mult_type = std::uint64_t; static constexpr internal_type resolution = RES; constexpr ptime() noexcept : m_time(0) {} @@ -127,7 +127,7 @@ namespace netlist #if (PHAS_INT128) using netlist_time = ptime; #else - using netlist_time = ptime; + using netlist_time = ptime; #endif }