summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-01-26 18:02:29 +1100
committer Vas Crabb <vas@vastheman.com>2018-01-26 18:02:29 +1100
commit1c92473f25a248f1110d6cc0f682efce875e7c6b (patch)
tree22a7044d4ac648cf7d747c1a0bf8d97715a9b3b2
parent3490320d58f32f2b76888c9f057eeb2e6f6e75c5 (diff)
let's be dimensionally correct
-rw-r--r--src/emu/attotime.h2
-rw-r--r--src/emu/xtal.h18
2 files changed, 6 insertions, 14 deletions
diff --git a/src/emu/attotime.h b/src/emu/attotime.h
index 414e65d81d2..b7bd090bfed 100644
--- a/src/emu/attotime.h
+++ b/src/emu/attotime.h
@@ -72,7 +72,7 @@ inline constexpr attoseconds_t DOUBLE_TO_ATTOSECONDS(double x) { return attoseco
// convert between hertz (as a double) and attoseconds
inline constexpr double ATTOSECONDS_TO_HZ(attoseconds_t x) { return double(ATTOSECONDS_PER_SECOND) / double(x); }
template <typename T> inline constexpr attoseconds_t HZ_TO_ATTOSECONDS(T &&x) { return attoseconds_t(ATTOSECONDS_PER_SECOND / x); }
-inline constexpr attoseconds_t HZ_TO_ATTOSECONDS(const XTAL &x) { return attoseconds_t(ATTOSECONDS_PER_SECOND / x.dvalue()); }
+inline constexpr attoseconds_t HZ_TO_ATTOSECONDS(const XTAL &x) { return attoseconds_t(ATTOSECONDS_PER_SECOND / x); }
// macros for converting other seconds types to attoseconds
template <typename T> inline constexpr attoseconds_t ATTOSECONDS_IN_SEC(T &&x) { return attoseconds_t(x) * ATTOSECONDS_PER_SECOND; }
diff --git a/src/emu/xtal.h b/src/emu/xtal.h
index 6860d38fae6..8e2f6db053a 100644
--- a/src/emu/xtal.h
+++ b/src/emu/xtal.h
@@ -46,22 +46,15 @@ Usage:
class XTAL {
public:
- constexpr XTAL(double base_clock) : m_base_clock(base_clock), m_current_clock(base_clock) {}
+ constexpr explicit XTAL(double base_clock) : m_base_clock(base_clock), m_current_clock(base_clock) {}
constexpr double dvalue() const noexcept { return m_current_clock; }
constexpr u32 value() const noexcept { return u32(m_current_clock); }
constexpr double base() const noexcept { return m_base_clock; }
- constexpr XTAL operator *(int mult) const noexcept { return XTAL(m_base_clock, m_current_clock * mult); }
- constexpr XTAL operator *(unsigned int mult) const noexcept { return XTAL(m_base_clock, m_current_clock * mult); }
- constexpr XTAL operator *(double mult) const noexcept { return XTAL(m_base_clock, m_current_clock * mult); }
- constexpr XTAL operator /(int div) const noexcept { return XTAL(m_base_clock, m_current_clock / div); }
- constexpr XTAL operator /(unsigned int div) const noexcept { return XTAL(m_base_clock, m_current_clock / div); }
- constexpr XTAL operator /(double div) const noexcept { return XTAL(m_base_clock, m_current_clock / div); }
+ template <typename T> constexpr XTAL operator *(T &&mult) const noexcept { return XTAL(m_base_clock, m_current_clock * mult); }
+ template <typename T> constexpr XTAL operator /(T &&div) const noexcept { return XTAL(m_base_clock, m_current_clock / div); }
- friend constexpr XTAL operator /(int div, const XTAL &xtal);
- friend constexpr XTAL operator /(unsigned int div, const XTAL &xtal);
- friend constexpr XTAL operator /(double div, const XTAL &xtal);
friend constexpr XTAL operator *(int mult, const XTAL &xtal);
friend constexpr XTAL operator *(unsigned int mult, const XTAL &xtal);
friend constexpr XTAL operator *(double mult, const XTAL &xtal);
@@ -81,9 +74,8 @@ private:
static void check_ordering();
};
-constexpr XTAL operator /(int div, const XTAL &xtal) { return XTAL(xtal.base(), div / xtal.dvalue()); }
-constexpr XTAL operator /(unsigned int div, const XTAL &xtal) { return XTAL(xtal.base(), div / xtal.dvalue()); }
-constexpr XTAL operator /(double div, const XTAL &xtal) { return XTAL(xtal.base(), div / xtal.dvalue()); }
+template <typename T> constexpr auto operator /(T &&div, const XTAL &xtal) { return div / xtal.dvalue(); }
+
constexpr XTAL operator *(int mult, const XTAL &xtal) { return XTAL(xtal.base(), mult * xtal.dvalue()); }
constexpr XTAL operator *(unsigned int mult, const XTAL &xtal) { return XTAL(xtal.base(), mult * xtal.dvalue()); }
constexpr XTAL operator *(double mult, const XTAL &xtal) { return XTAL(xtal.base(), mult * xtal.dvalue()); }