summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/nl_time.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/nl_time.h')
-rw-r--r--src/lib/netlist/nl_time.h43
1 files changed, 22 insertions, 21 deletions
diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h
index 7c81f890e07..d5223db3140 100644
--- a/src/lib/netlist/nl_time.h
+++ b/src/lib/netlist/nl_time.h
@@ -40,24 +40,26 @@ namespace netlist
constexpr ptime(const ptime &rhs) noexcept = default;
constexpr ptime(ptime &&rhs) noexcept = default;
+ constexpr explicit ptime(const internal_type &time) noexcept : m_time(time) {}
+ constexpr explicit ptime(internal_type &&time) noexcept : m_time(time) {}
C14CONSTEXPR ptime &operator=(const ptime &rhs) noexcept = default;
C14CONSTEXPR ptime &operator=(ptime &&rhs) noexcept = default;
constexpr explicit ptime(const double t) = delete;
//: m_time((internal_type) ( t * (double) resolution)) { }
- constexpr explicit ptime(const internal_type &nom, const internal_type &den) noexcept
+ constexpr explicit ptime(const internal_type nom, const internal_type den) noexcept
: m_time(nom * (RES / den)) { }
- C14CONSTEXPR ptime &operator+=(const ptime &rhs) noexcept { m_time += rhs.m_time; return *this; }
- C14CONSTEXPR ptime &operator-=(const ptime &rhs) noexcept { m_time -= rhs.m_time; return *this; }
- C14CONSTEXPR ptime &operator*=(const mult_type &factor) noexcept { m_time *= static_cast<internal_type>(factor); return *this; }
+ C14CONSTEXPR ptime &operator+=(const ptime rhs) noexcept { m_time += rhs.m_time; return *this; }
+ C14CONSTEXPR ptime &operator-=(const ptime rhs) noexcept { m_time -= rhs.m_time; return *this; }
+ C14CONSTEXPR ptime &operator*=(const mult_type factor) noexcept { m_time *= static_cast<internal_type>(factor); return *this; }
- friend C14CONSTEXPR ptime operator-(ptime lhs, const ptime &rhs) noexcept
+ friend C14CONSTEXPR ptime operator-(ptime lhs, const ptime rhs) noexcept
{
return lhs -= rhs;
}
- friend C14CONSTEXPR ptime operator+(ptime lhs, const ptime &rhs) noexcept
+ friend C14CONSTEXPR ptime operator+(ptime lhs, const ptime rhs) noexcept
{
return lhs += rhs;
}
@@ -67,37 +69,37 @@ namespace netlist
return lhs *= factor;
}
- friend constexpr mult_type operator/(const ptime &lhs, const ptime &rhs) noexcept
+ friend constexpr mult_type operator/(const ptime lhs, const ptime rhs) noexcept
{
return static_cast<mult_type>(lhs.m_time / rhs.m_time);
}
- friend constexpr bool operator<(const ptime &lhs, const ptime &rhs) noexcept
+ friend constexpr bool operator<(const ptime lhs, const ptime rhs) noexcept
{
return (lhs.m_time < rhs.m_time);
}
- friend constexpr bool operator>(const ptime &lhs, const ptime &rhs) noexcept
+ friend constexpr bool operator>(const ptime lhs, const ptime rhs) noexcept
{
return (rhs < lhs);
}
- friend constexpr bool operator<=(const ptime &lhs, const ptime &rhs) noexcept
+ friend constexpr bool operator<=(const ptime lhs, const ptime rhs) noexcept
{
return !(lhs > rhs);
}
- friend constexpr bool operator>=(const ptime &lhs, const ptime &rhs) noexcept
+ friend constexpr bool operator>=(const ptime lhs, const ptime rhs) noexcept
{
return !(lhs < rhs);
}
- friend constexpr bool operator==(const ptime &lhs, const ptime &rhs) noexcept
+ friend constexpr bool operator==(const ptime lhs, const ptime rhs) noexcept
{
return lhs.m_time == rhs.m_time;
}
- friend constexpr bool operator!=(const ptime &lhs, const ptime &rhs) noexcept
+ friend constexpr bool operator!=(const ptime lhs, const ptime rhs) noexcept
{
return !(lhs == rhs);
}
@@ -105,17 +107,17 @@ namespace netlist
constexpr internal_type as_raw() const noexcept { return m_time; }
constexpr double as_double() const noexcept
{
- return static_cast<double>(m_time) / static_cast<double>(RES);
+ return static_cast<double>(m_time) * inv_res;
}
// for save states ....
C14CONSTEXPR internal_type *get_internaltype_ptr() noexcept { return &m_time; }
- static constexpr ptime from_nsec(const internal_type &ns) noexcept { return ptime(ns, UINT64_C(1000000000)); }
- static constexpr ptime from_usec(const internal_type &us) noexcept { return ptime(us, UINT64_C(1000000)); }
- static constexpr ptime from_msec(const internal_type &ms) noexcept { return ptime(ms, UINT64_C(1000)); }
- static constexpr ptime from_hz(const internal_type &hz) noexcept { return ptime(1 , hz); }
- static constexpr ptime from_raw(const internal_type &raw) noexcept { return ptime(raw); }
+ static constexpr ptime from_nsec(const internal_type ns) noexcept { return ptime(ns, UINT64_C(1000000000)); }
+ static constexpr ptime from_usec(const internal_type us) noexcept { return ptime(us, UINT64_C(1000000)); }
+ static constexpr ptime from_msec(const internal_type ms) noexcept { return ptime(ms, UINT64_C(1000)); }
+ static constexpr ptime from_hz(const internal_type hz) noexcept { return ptime(1 , hz); }
+ static constexpr ptime from_raw(const internal_type raw) noexcept { return ptime(raw); }
static constexpr ptime from_double(const double t) noexcept { return ptime(static_cast<internal_type>( t * static_cast<double>(RES)), RES); }
static constexpr ptime zero() noexcept { return ptime(0, RES); }
@@ -123,8 +125,7 @@ namespace netlist
static constexpr ptime never() noexcept { return ptime(plib::numeric_limits<internal_type>::max(), RES); }
static constexpr internal_type resolution() noexcept { return RES; }
private:
- constexpr explicit ptime(const internal_type &time) : m_time(time) {}
- constexpr explicit ptime(internal_type &&time) : m_time(time) {}
+ static constexpr const double inv_res = 1.0 / static_cast<double>(RES);
internal_type m_time;
};