Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-02 00:29:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

let's be dimensionally correct

Browse Source
This commit is contained in:
Vas Crabb 2018-01-26 18:02:29 +11:00
parent 3490320d58
commit 1c92473f25
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/attotime.h
View File

@ -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; }

18
src/emu/xtal.h
View File

@ -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()); }