summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-11-09 15:32:15 -0500
committer AJR <ajrhacker@users.noreply.github.com>2019-11-09 16:10:14 -0500
commitd267384837d6bdd12ebff16162750d38803f6287 (patch)
treee361aa86f4fa1e4f80f74167a89268fe4719b22d /src/devices/machine
parentedb7eb0bf0582f984f2e035a4c96f728f92c8a63 (diff)
Make many device_execute_interface functions noexcept, including the "information" overrides. This also covers several time-related functions in attotime, running_machine and emu_timer. (nw)
m6805: Calculate min_cycles and max_cycles once at device_start time (Nw) attotime: Add as_khz and as_mhz (nw)
Diffstat (limited to 'src/devices/machine')
-rw-r--r--src/devices/machine/68307.h3
-rw-r--r--src/devices/machine/netlist.cpp4
-rw-r--r--src/devices/machine/netlist.h4
-rw-r--r--src/devices/machine/scc68070.h4
4 files changed, 6 insertions, 9 deletions
diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h
index 59698a93d91..135a51c723d 100644
--- a/src/devices/machine/68307.h
+++ b/src/devices/machine/68307.h
@@ -40,9 +40,6 @@ protected:
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
- virtual uint32_t execute_min_cycles() const override { return 4; }
- virtual uint32_t execute_max_cycles() const override { return 158; }
-
virtual void m68k_reset_peripherals() override;
private:
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 7c13d04b25d..543a56faf33 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -1290,12 +1290,12 @@ void netlist_mame_cpu_device::nl_register_devices(netlist::setup_t &lsetup) cons
lsetup.factory().register_device<nld_analog_callback>( "NETDEV_CALLBACK", "nld_analog_callback", "-");
}
-ATTR_COLD uint64_t netlist_mame_cpu_device::execute_clocks_to_cycles(uint64_t clocks) const
+ATTR_COLD uint64_t netlist_mame_cpu_device::execute_clocks_to_cycles(uint64_t clocks) const noexcept
{
return clocks;
}
-ATTR_COLD uint64_t netlist_mame_cpu_device::execute_cycles_to_clocks(uint64_t cycles) const
+ATTR_COLD uint64_t netlist_mame_cpu_device::execute_cycles_to_clocks(uint64_t cycles) const noexcept
{
return cycles;
}
diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index 75dc47af491..2a58d956f68 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -173,8 +173,8 @@ protected:
virtual void device_start() override;
// device_execute_interface overrides
- virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override;
- virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override;
+ virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override;
+ virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override;
ATTR_HOT virtual void execute_run() override;
diff --git a/src/devices/machine/scc68070.h b/src/devices/machine/scc68070.h
index edd9559056c..84d160fec9d 100644
--- a/src/devices/machine/scc68070.h
+++ b/src/devices/machine/scc68070.h
@@ -263,8 +263,8 @@ protected:
virtual void device_reset() override;
// device_execute_interface overrides
- virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return (clocks + 2 - 1) / 2; }
- virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return (cycles * 2); }
+ virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 2 - 1) / 2; }
+ virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * 2); }
// m68000_base_device overrides
virtual void m68k_reset_peripherals() override;