diff options
author | 2019-11-09 15:32:15 -0500 | |
---|---|---|
committer | 2019-11-09 16:10:14 -0500 | |
commit | d267384837d6bdd12ebff16162750d38803f6287 (patch) | |
tree | e361aa86f4fa1e4f80f74167a89268fe4719b22d /src/devices/cpu | |
parent | edb7eb0bf0582f984f2e035a4c96f728f92c8a63 (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/cpu')
171 files changed, 683 insertions, 680 deletions
diff --git a/src/devices/cpu/8x300/8x300.h b/src/devices/cpu/8x300/8x300.h index 155079d225a..b37acb119e0 100644 --- a/src/devices/cpu/8x300/8x300.h +++ b/src/devices/cpu/8x300/8x300.h @@ -59,9 +59,9 @@ protected: virtual void state_import(const device_state_entry &entry) override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/adsp2100/adsp2100.cpp b/src/devices/cpu/adsp2100/adsp2100.cpp index ff08e96b72b..7ef7136f66d 100644 --- a/src/devices/cpu/adsp2100/adsp2100.cpp +++ b/src/devices/cpu/adsp2100/adsp2100.cpp @@ -1104,7 +1104,7 @@ void adsp21xx_device::create_tables() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t adsp21xx_device::execute_min_cycles() const +uint32_t adsp21xx_device::execute_min_cycles() const noexcept { return 1; } @@ -1115,7 +1115,7 @@ uint32_t adsp21xx_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t adsp21xx_device::execute_max_cycles() const +uint32_t adsp21xx_device::execute_max_cycles() const noexcept { return 1; } @@ -1126,17 +1126,17 @@ uint32_t adsp21xx_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t adsp2100_device::execute_input_lines() const +uint32_t adsp2100_device::execute_input_lines() const noexcept { return 4; } -uint32_t adsp2101_device::execute_input_lines() const +uint32_t adsp2101_device::execute_input_lines() const noexcept { return 5; } -uint32_t adsp2181_device::execute_input_lines() const +uint32_t adsp2181_device::execute_input_lines() const noexcept { return 9; } diff --git a/src/devices/cpu/adsp2100/adsp2100.h b/src/devices/cpu/adsp2100/adsp2100.h index 29e61f277a7..6f0e3b07160 100644 --- a/src/devices/cpu/adsp2100/adsp2100.h +++ b/src/devices/cpu/adsp2100/adsp2100.h @@ -215,8 +215,8 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -471,7 +471,7 @@ public: protected: // device_execute_interface overrides - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_input_lines() const noexcept override; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; @@ -494,7 +494,7 @@ protected: adsp2101_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t chiptype); // device_execute_interface overrides - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_input_lines() const noexcept override; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; @@ -515,7 +515,7 @@ public: protected: // device_execute_interface overrides - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_input_lines() const noexcept override; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/alph8201/alph8201.h b/src/devices/cpu/alph8201/alph8201.h index 46c00143f6b..fa735606215 100644 --- a/src/devices/cpu/alph8201/alph8201.h +++ b/src/devices/cpu/alph8201/alph8201.h @@ -68,9 +68,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 16; } - virtual u32 execute_input_lines() const override { return 1; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 16; } + virtual u32 execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/alpha/alpha.h b/src/devices/cpu/alpha/alpha.h index ac1f5e60e2f..bf374d227b0 100644 --- a/src/devices/cpu/alpha/alpha.h +++ b/src/devices/cpu/alpha/alpha.h @@ -25,8 +25,8 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 1; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -84,7 +84,7 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_input_lines() const override { return 6; } + virtual u32 execute_input_lines() const noexcept override { return 6; } virtual void cpu_execute(u32 const op) override; virtual bool cpu_translate(u64 &address, int intention) override; diff --git a/src/devices/cpu/alto2/alto2cpu.h b/src/devices/cpu/alto2/alto2cpu.h index c701ab59a77..e1e66f5bcaf 100644 --- a/src/devices/cpu/alto2/alto2cpu.h +++ b/src/devices/cpu/alto2/alto2cpu.h @@ -217,9 +217,9 @@ protected: void interface_post_reset() override; //! device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/am29000/am29000.h b/src/devices/cpu/am29000/am29000.h index 4061fadbe64..673ee6237fe 100644 --- a/src/devices/cpu/am29000/am29000.h +++ b/src/devices/cpu/am29000/am29000.h @@ -444,9 +444,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 2; } - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 2; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/amis2000/amis2000.h b/src/devices/cpu/amis2000/amis2000.h index 58665c7f6bc..50f6973db8f 100644 --- a/src/devices/cpu/amis2000/amis2000.h +++ b/src/devices/cpu/amis2000/amis2000.h @@ -61,11 +61,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle - virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return (cycles * 4); } // " - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 2; } - virtual u32 execute_input_lines() const override { return 1; } + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * 4); } // " + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 2; } + virtual u32 execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/apexc/apexc.h b/src/devices/cpu/apexc/apexc.h index fc579824388..84b44add940 100644 --- a/src/devices/cpu/apexc/apexc.h +++ b/src/devices/cpu/apexc/apexc.h @@ -32,9 +32,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 2; } - virtual uint32_t execute_max_cycles() const override { return 75; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 2; } + virtual uint32_t execute_max_cycles() const noexcept override { return 75; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/arc/arc.h b/src/devices/cpu/arc/arc.h index ba9bfe02fe4..fd4fa0582e1 100644 --- a/src/devices/cpu/arc/arc.h +++ b/src/devices/cpu/arc/arc.h @@ -29,9 +29,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 5; } - virtual uint32_t execute_max_cycles() const override { return 5; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 5; } + virtual uint32_t execute_max_cycles() const noexcept override { return 5; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/arcompact/arcompact.h b/src/devices/cpu/arcompact/arcompact.h index 8025510a203..7d8be5453f0 100644 --- a/src/devices/cpu/arcompact/arcompact.h +++ b/src/devices/cpu/arcompact/arcompact.h @@ -89,9 +89,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 5; } - virtual uint32_t execute_max_cycles() const override { return 5; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 5; } + virtual uint32_t execute_max_cycles() const noexcept override { return 5; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/arm/arm.h b/src/devices/cpu/arm/arm.h index 27f764e26df..1c018f16763 100644 --- a/src/devices/cpu/arm/arm.h +++ b/src/devices/cpu/arm/arm.h @@ -48,9 +48,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 3; } - virtual uint32_t execute_max_cycles() const override { return 4; } - virtual uint32_t execute_input_lines() const override { return 2; } + virtual uint32_t execute_min_cycles() const noexcept override { return 3; } + virtual uint32_t execute_max_cycles() const noexcept override { return 4; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/arm7/arm7.h b/src/devices/cpu/arm7/arm7.h index 663a7564d5c..fa88ff1cd4c 100644 --- a/src/devices/cpu/arm7/arm7.h +++ b/src/devices/cpu/arm7/arm7.h @@ -120,9 +120,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 3; } - virtual uint32_t execute_max_cycles() const override { return 4; } - virtual uint32_t execute_input_lines() const override { return 4; } /* There are actually only 2 input lines: we use 3 variants of the ABORT line while there is only 1 real one */ + virtual uint32_t execute_min_cycles() const noexcept override { return 3; } + virtual uint32_t execute_max_cycles() const noexcept override { return 4; } + virtual uint32_t execute_input_lines() const noexcept override { return 4; } /* There are actually only 2 input lines: we use 3 variants of the ABORT line while there is only 1 real one */ virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/asap/asap.cpp b/src/devices/cpu/asap/asap.cpp index e87c8f9b326..4b2505d847a 100644 --- a/src/devices/cpu/asap/asap.cpp +++ b/src/devices/cpu/asap/asap.cpp @@ -503,7 +503,7 @@ inline void asap_device::execute_instruction() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t asap_device::execute_min_cycles() const +uint32_t asap_device::execute_min_cycles() const noexcept { return 1; } @@ -514,7 +514,7 @@ uint32_t asap_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t asap_device::execute_max_cycles() const +uint32_t asap_device::execute_max_cycles() const noexcept { return 2; } @@ -525,7 +525,7 @@ uint32_t asap_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t asap_device::execute_input_lines() const +uint32_t asap_device::execute_input_lines() const noexcept { return 1; } diff --git a/src/devices/cpu/asap/asap.h b/src/devices/cpu/asap/asap.h index 912932f9e36..fe14835f247 100644 --- a/src/devices/cpu/asap/asap.h +++ b/src/devices/cpu/asap/asap.h @@ -74,9 +74,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp index 5bc83e55511..62460f94f8f 100644 --- a/src/devices/cpu/avr8/avr8.cpp +++ b/src/devices/cpu/avr8/avr8.cpp @@ -2895,7 +2895,7 @@ READ8_MEMBER( avr8_device::regs_r ) // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t avr8_device::execute_min_cycles() const +uint32_t avr8_device::execute_min_cycles() const noexcept { return 1; } @@ -2906,7 +2906,7 @@ uint32_t avr8_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t avr8_device::execute_max_cycles() const +uint32_t avr8_device::execute_max_cycles() const noexcept { return 4; } @@ -2917,7 +2917,7 @@ uint32_t avr8_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t avr8_device::execute_input_lines() const +uint32_t avr8_device::execute_input_lines() const noexcept { return 0; } diff --git a/src/devices/cpu/avr8/avr8.h b/src/devices/cpu/avr8/avr8.h index 36b20738979..e29c3198d35 100644 --- a/src/devices/cpu/avr8/avr8.h +++ b/src/devices/cpu/avr8/avr8.h @@ -89,9 +89,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/bcp/dp8344.h b/src/devices/cpu/bcp/dp8344.h index 70624254b8a..b256a175dd6 100644 --- a/src/devices/cpu/bcp/dp8344.h +++ b/src/devices/cpu/bcp/dp8344.h @@ -70,9 +70,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 2; } - virtual u32 execute_max_cycles() const override { return 4; } - virtual u32 execute_input_lines() const override { return 3; } + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 4; } + virtual u32 execute_input_lines() const noexcept override { return 3; } virtual void execute_run() override; virtual void execute_set_input(int irqline, int state) override; diff --git a/src/devices/cpu/capricorn/capricorn.h b/src/devices/cpu/capricorn/capricorn.h index 4204f136b31..a44834c866b 100644 --- a/src/devices/cpu/capricorn/capricorn.h +++ b/src/devices/cpu/capricorn/capricorn.h @@ -23,11 +23,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override + virtual u32 execute_min_cycles() const noexcept override { return 2; } - virtual u32 execute_max_cycles() const override + virtual u32 execute_max_cycles() const noexcept override { return 17; } - virtual u32 execute_input_lines() const override + virtual u32 execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int linenum, int state) override; diff --git a/src/devices/cpu/ccpu/ccpu.h b/src/devices/cpu/ccpu/ccpu.h index 359bac3e4ce..4a996310b48 100644 --- a/src/devices/cpu/ccpu/ccpu.h +++ b/src/devices/cpu/ccpu/ccpu.h @@ -58,9 +58,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/clipper/clipper.h b/src/devices/cpu/clipper/clipper.h index b54a661c1a0..47d035ec3b0 100644 --- a/src/devices/cpu/clipper/clipper.h +++ b/src/devices/cpu/clipper/clipper.h @@ -155,9 +155,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 1; } // FIXME: don't know, especially macro instructions - virtual u32 execute_input_lines() const override { return 2; } // number of input/interrupt lines (irq/nmi) + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 1; } // FIXME: don't know, especially macro instructions + virtual u32 execute_input_lines() const noexcept override { return 2; } // number of input/interrupt lines (irq/nmi) virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/cop400/cop400.h b/src/devices/cpu/cop400/cop400.h index e97f8a135a7..bf3a6ef61e1 100644 --- a/src/devices/cpu/cop400/cop400.h +++ b/src/devices/cpu/cop400/cop400.h @@ -131,11 +131,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + m_cki - 1) / m_cki; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * m_cki); } - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 2; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + m_cki - 1) / m_cki; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * m_cki); } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 2; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp index 7038a26a470..617cad553ed 100644 --- a/src/devices/cpu/cosmac/cosmac.cpp +++ b/src/devices/cpu/cosmac/cosmac.cpp @@ -711,7 +711,7 @@ offs_t cosmac_device::get_memory_address() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t cosmac_device::execute_min_cycles() const +uint32_t cosmac_device::execute_min_cycles() const noexcept { return 8 * 2; } @@ -722,7 +722,7 @@ uint32_t cosmac_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t cosmac_device::execute_max_cycles() const +uint32_t cosmac_device::execute_max_cycles() const noexcept { return 8 * 3; } @@ -733,7 +733,7 @@ uint32_t cosmac_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t cosmac_device::execute_input_lines() const +uint32_t cosmac_device::execute_input_lines() const noexcept { return 7; } diff --git a/src/devices/cpu/cosmac/cosmac.h b/src/devices/cpu/cosmac/cosmac.h index 3607ce37d59..1c287ab18e7 100644 --- a/src/devices/cpu/cosmac/cosmac.h +++ b/src/devices/cpu/cosmac/cosmac.h @@ -190,9 +190,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/cp1610/cp1610.h b/src/devices/cpu/cp1610/cp1610.h index d300f2876da..176aa98f112 100644 --- a/src/devices/cpu/cp1610/cp1610.h +++ b/src/devices/cpu/cp1610/cp1610.h @@ -40,10 +40,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 7; } - virtual uint32_t execute_input_lines() const override { return 2; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == CP1610_RESET || inputnum == CP1610_INT_INTR; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 7; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == CP1610_RESET || inputnum == CP1610_INT_INTR; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.h b/src/devices/cpu/cubeqcpu/cubeqcpu.h index 0adca48faae..9f3f215566a 100644 --- a/src/devices/cpu/cubeqcpu/cubeqcpu.h +++ b/src/devices/cpu/cubeqcpu/cubeqcpu.h @@ -60,9 +60,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 1; } - virtual u32 execute_input_lines() const override { return 0; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 1; } + virtual u32 execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides @@ -158,9 +158,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 1; } - virtual u32 execute_input_lines() const override { return 0; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 1; } + virtual u32 execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides @@ -270,9 +270,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 1; } - virtual u32 execute_input_lines() const override { return 0; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 1; } + virtual u32 execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/diablo/diablo1300.cpp b/src/devices/cpu/diablo/diablo1300.cpp index 5dea003291d..e9eef2275a9 100644 --- a/src/devices/cpu/diablo/diablo1300.cpp +++ b/src/devices/cpu/diablo/diablo1300.cpp @@ -183,7 +183,7 @@ std::unique_ptr<util::disasm_interface> diablo1300_cpu_device::create_disassembl // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t diablo1300_cpu_device::execute_min_cycles() const +uint32_t diablo1300_cpu_device::execute_min_cycles() const noexcept { return 1; } @@ -194,7 +194,7 @@ uint32_t diablo1300_cpu_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t diablo1300_cpu_device::execute_max_cycles() const +uint32_t diablo1300_cpu_device::execute_max_cycles() const noexcept { return 1; } diff --git a/src/devices/cpu/diablo/diablo1300.h b/src/devices/cpu/diablo/diablo1300.h index 00328a28007..c4af0f1c56e 100644 --- a/src/devices/cpu/diablo/diablo1300.h +++ b/src/devices/cpu/diablo/diablo1300.h @@ -28,9 +28,9 @@ protected: virtual void device_stop() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - //virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + //virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; //virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/dsp16/dsp16.h b/src/devices/cpu/dsp16/dsp16.h index 1f08a6ed6a0..13fa045341b 100644 --- a/src/devices/cpu/dsp16/dsp16.h +++ b/src/devices/cpu/dsp16/dsp16.h @@ -81,9 +81,9 @@ protected: virtual void device_reset() override; // device_execute_interface implementation - virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return (clocks + 2 - 1) >> 1; } - virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return cycles << 1; } - virtual u32 execute_input_lines() const override { return 5U; } + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 2 - 1) >> 1; } + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return cycles << 1; } + virtual u32 execute_input_lines() const noexcept override { return 5U; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/dsp32/dsp32.cpp b/src/devices/cpu/dsp32/dsp32.cpp index 26310c760ad..6586276395f 100644 --- a/src/devices/cpu/dsp32/dsp32.cpp +++ b/src/devices/cpu/dsp32/dsp32.cpp @@ -542,7 +542,7 @@ void dsp32c_device::update_pins(void) // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t dsp32c_device::execute_min_cycles() const +uint32_t dsp32c_device::execute_min_cycles() const noexcept { return 4; } @@ -553,7 +553,7 @@ uint32_t dsp32c_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t dsp32c_device::execute_max_cycles() const +uint32_t dsp32c_device::execute_max_cycles() const noexcept { return 4; } @@ -564,7 +564,7 @@ uint32_t dsp32c_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t dsp32c_device::execute_input_lines() const +uint32_t dsp32c_device::execute_input_lines() const noexcept { return 2; } diff --git a/src/devices/cpu/dsp32/dsp32.h b/src/devices/cpu/dsp32/dsp32.h index 9aa02201dd5..e30de0a29b6 100644 --- a/src/devices/cpu/dsp32/dsp32.h +++ b/src/devices/cpu/dsp32/dsp32.h @@ -107,9 +107,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/dsp56156/dsp56156.h b/src/devices/cpu/dsp56156/dsp56156.h index 9276e4e8702..4b1169f07d9 100644 --- a/src/devices/cpu/dsp56156/dsp56156.h +++ b/src/devices/cpu/dsp56156/dsp56156.h @@ -221,12 +221,12 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 2 - 1) / 2; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); } - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 8; } - virtual uint32_t execute_input_lines() const override { return 4; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == DSP56156_IRQ_RESET; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 2 - 1) / 2; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 2); } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 8; } + virtual uint32_t execute_input_lines() const noexcept override { return 4; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == DSP56156_IRQ_RESET; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/dspp/dspp.cpp b/src/devices/cpu/dspp/dspp.cpp index f93f841717f..587df951f45 100644 --- a/src/devices/cpu/dspp/dspp.cpp +++ b/src/devices/cpu/dspp/dspp.cpp @@ -653,7 +653,7 @@ inline uint16_t dspp_device::translate_reg(uint16_t reg) // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t dspp_device::execute_min_cycles() const +uint32_t dspp_device::execute_min_cycles() const noexcept { return 1; } @@ -664,7 +664,7 @@ uint32_t dspp_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t dspp_device::execute_max_cycles() const +uint32_t dspp_device::execute_max_cycles() const noexcept { return 5; // TODO ? } diff --git a/src/devices/cpu/dspp/dspp.h b/src/devices/cpu/dspp/dspp.h index 2f44eda22ce..1137400da3f 100644 --- a/src/devices/cpu/dspp/dspp.h +++ b/src/devices/cpu/dspp/dspp.h @@ -78,8 +78,8 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/e0c6200/e0c6200.h b/src/devices/cpu/e0c6200/e0c6200.h index a51f9aaf1fe..5222983e09b 100644 --- a/src/devices/cpu/e0c6200/e0c6200.h +++ b/src/devices/cpu/e0c6200/e0c6200.h @@ -22,9 +22,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 5; } - virtual u32 execute_max_cycles() const override { return 14; } // longest opcode is 12 cycles, but interrupt service takes up to 14 - virtual u32 execute_input_lines() const override { return 1; } + virtual u32 execute_min_cycles() const noexcept override { return 5; } + virtual u32 execute_max_cycles() const noexcept override { return 14; } // longest opcode is 12 cycles, but interrupt service takes up to 14 + virtual u32 execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_one(); virtual bool check_interrupt() { return false; } // nothing to do by default diff --git a/src/devices/cpu/e0c6200/e0c6s46.h b/src/devices/cpu/e0c6200/e0c6s46.h index 2448654d948..7afe49b43f1 100644 --- a/src/devices/cpu/e0c6200/e0c6s46.h +++ b/src/devices/cpu/e0c6200/e0c6s46.h @@ -73,7 +73,7 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_input_lines() const override { return 8; } + virtual u32 execute_input_lines() const noexcept override { return 8; } virtual void execute_set_input(int line, int state) override; virtual void execute_one() override; virtual bool check_interrupt() override; diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp index eaebc6d2d84..cce03566729 100644 --- a/src/devices/cpu/e132xs/e132xs.cpp +++ b/src/devices/cpu/e132xs/e132xs.cpp @@ -1574,7 +1574,7 @@ void hyperstone_device::hyperstone_trap() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t hyperstone_device::execute_min_cycles() const +uint32_t hyperstone_device::execute_min_cycles() const noexcept { return 1; } @@ -1585,7 +1585,7 @@ uint32_t hyperstone_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t hyperstone_device::execute_max_cycles() const +uint32_t hyperstone_device::execute_max_cycles() const noexcept { return 36; } @@ -1596,7 +1596,7 @@ uint32_t hyperstone_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t hyperstone_device::execute_input_lines() const +uint32_t hyperstone_device::execute_input_lines() const noexcept { return 8; } diff --git a/src/devices/cpu/e132xs/e132xs.h b/src/devices/cpu/e132xs/e132xs.h index 335aeab8898..6c838fefb37 100644 --- a/src/devices/cpu/e132xs/e132xs.h +++ b/src/devices/cpu/e132xs/e132xs.h @@ -284,9 +284,9 @@ protected: virtual void device_stop() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp index 2349b789646..d3be96272fe 100644 --- a/src/devices/cpu/es5510/es5510.cpp +++ b/src/devices/cpu/es5510/es5510.cpp @@ -647,23 +647,23 @@ device_memory_interface::space_config_vector es5510_device::memory_space_config( }; } -uint64_t es5510_device::execute_clocks_to_cycles(uint64_t clocks) const { +uint64_t es5510_device::execute_clocks_to_cycles(uint64_t clocks) const noexcept { return clocks / 3; } -uint64_t es5510_device::execute_cycles_to_clocks(uint64_t cycles) const { +uint64_t es5510_device::execute_cycles_to_clocks(uint64_t cycles) const noexcept { return cycles * 3; } -uint32_t es5510_device::execute_min_cycles() const { +uint32_t es5510_device::execute_min_cycles() const noexcept { return 1; } -uint32_t es5510_device::execute_max_cycles() const { +uint32_t es5510_device::execute_max_cycles() const noexcept { return 1; } -uint32_t es5510_device::execute_input_lines() const { +uint32_t es5510_device::execute_input_lines() const noexcept { return 1; } diff --git a/src/devices/cpu/es5510/es5510.h b/src/devices/cpu/es5510/es5510.h index da5d6eb716d..5f424724979 100644 --- a/src/devices/cpu/es5510/es5510.h +++ b/src/devices/cpu/es5510/es5510.h @@ -129,11 +129,11 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual space_config_vector memory_space_config() const override; - 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 uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() 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; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int linenum, int state) override; virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; diff --git a/src/devices/cpu/esrip/esrip.cpp b/src/devices/cpu/esrip/esrip.cpp index 023d3038670..f085851bbbc 100644 --- a/src/devices/cpu/esrip/esrip.cpp +++ b/src/devices/cpu/esrip/esrip.cpp @@ -1725,7 +1725,7 @@ void esrip_device::am29116_execute(uint16_t inst, int _sre) // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t esrip_device::execute_min_cycles() const +uint32_t esrip_device::execute_min_cycles() const noexcept { return 1; } @@ -1736,7 +1736,7 @@ uint32_t esrip_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t esrip_device::execute_max_cycles() const +uint32_t esrip_device::execute_max_cycles() const noexcept { return 1; } @@ -1747,7 +1747,7 @@ uint32_t esrip_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t esrip_device::execute_input_lines() const +uint32_t esrip_device::execute_input_lines() const noexcept { return 0; } diff --git a/src/devices/cpu/esrip/esrip.h b/src/devices/cpu/esrip/esrip.h index 878a9836265..19a4cde150d 100644 --- a/src/devices/cpu/esrip/esrip.h +++ b/src/devices/cpu/esrip/esrip.h @@ -110,9 +110,9 @@ protected: void make_ops(); // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/f8/f8.h b/src/devices/cpu/f8/f8.h index 5185b938a05..a3f341ef8f6 100644 --- a/src/devices/cpu/f8/f8.h +++ b/src/devices/cpu/f8/f8.h @@ -40,9 +40,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 4; } - virtual u32 execute_max_cycles() const override { return 26; } - virtual u32 execute_input_lines() const override { return 1; } + virtual u32 execute_min_cycles() const noexcept override { return 4; } + virtual u32 execute_max_cycles() const noexcept override { return 26; } + virtual u32 execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/g65816/g65816.h b/src/devices/cpu/g65816/g65816.h index f7028697880..ede7f0f3eaf 100644 --- a/src/devices/cpu/g65816/g65816.h +++ b/src/devices/cpu/g65816/g65816.h @@ -75,9 +75,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 20; } - virtual uint32_t execute_input_lines() const override { return 5; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 20; } + virtual uint32_t execute_input_lines() const noexcept override { return 5; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/h6280/h6280.cpp b/src/devices/cpu/h6280/h6280.cpp index 2746e637ba8..40dde50f0ae 100644 --- a/src/devices/cpu/h6280/h6280.cpp +++ b/src/devices/cpu/h6280/h6280.cpp @@ -2256,7 +2256,7 @@ std::unique_ptr<util::disasm_interface> h6280_device::create_disassembler() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t h6280_device::execute_min_cycles() const +uint32_t h6280_device::execute_min_cycles() const noexcept { return 2; } @@ -2267,7 +2267,7 @@ uint32_t h6280_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t h6280_device::execute_max_cycles() const +uint32_t h6280_device::execute_max_cycles() const noexcept { return 17 + 6*65536; } @@ -2278,7 +2278,7 @@ uint32_t h6280_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t h6280_device::execute_input_lines() const +uint32_t h6280_device::execute_input_lines() const noexcept { return 4; } @@ -2289,7 +2289,7 @@ uint32_t h6280_device::execute_input_lines() const // the input line has an asynchronous edge trigger //------------------------------------------------- -bool h6280_device::execute_input_edge_triggered(int inputnum) const +bool h6280_device::execute_input_edge_triggered(int inputnum) const noexcept { return inputnum == H6280_NMI_STATE; } diff --git a/src/devices/cpu/h6280/h6280.h b/src/devices/cpu/h6280/h6280.h index 5cb61d3689a..10ddbeaf77b 100644 --- a/src/devices/cpu/h6280/h6280.h +++ b/src/devices/cpu/h6280/h6280.h @@ -81,10 +81,10 @@ protected: virtual void device_stop() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; - virtual bool execute_input_edge_triggered(int inputnum) const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/h8/h8.cpp b/src/devices/cpu/h8/h8.cpp index 154d941148d..eaca5b2a8ea 100644 --- a/src/devices/cpu/h8/h8.cpp +++ b/src/devices/cpu/h8/h8.cpp @@ -176,22 +176,22 @@ void h8_device::request_state(int state) requested_state = state; } -uint32_t h8_device::execute_min_cycles() const +uint32_t h8_device::execute_min_cycles() const noexcept { return 1; } -uint32_t h8_device::execute_max_cycles() const +uint32_t h8_device::execute_max_cycles() const noexcept { return 1; } -uint32_t h8_device::execute_input_lines() const +uint32_t h8_device::execute_input_lines() const noexcept { return 0; } -bool h8_device::execute_input_edge_triggered(int inputnum) const +bool h8_device::execute_input_edge_triggered(int inputnum) const noexcept { return inputnum == INPUT_LINE_NMI; } diff --git a/src/devices/cpu/h8/h8.h b/src/devices/cpu/h8/h8.h index ddde514f476..e343be4fe90 100644 --- a/src/devices/cpu/h8/h8.h +++ b/src/devices/cpu/h8/h8.h @@ -95,10 +95,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; - virtual bool execute_input_edge_triggered(int inputnum) const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override; virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/hcd62121/hcd62121.h b/src/devices/cpu/hcd62121/hcd62121.h index 27399de7494..d7d35a881dd 100644 --- a/src/devices/cpu/hcd62121/hcd62121.h +++ b/src/devices/cpu/hcd62121/hcd62121.h @@ -39,9 +39,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 4; } - virtual u32 execute_max_cycles() const override { return 48; } - virtual u32 execute_input_lines() const override { return 2; } + virtual u32 execute_min_cycles() const noexcept override { return 4; } + virtual u32 execute_max_cycles() const noexcept override { return 48; } + virtual u32 execute_input_lines() const noexcept override { return 2; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/hd61700/hd61700.h b/src/devices/cpu/hd61700/hd61700.h index bb8b7dc4ba9..f11da04a4bd 100644 --- a/src/devices/cpu/hd61700/hd61700.h +++ b/src/devices/cpu/hd61700/hd61700.h @@ -50,9 +50,9 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 52; } - virtual uint32_t execute_input_lines() const override { return 6; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 52; } + virtual uint32_t execute_input_lines() const noexcept override { return 6; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h index a19161f5dcf..78203849835 100644 --- a/src/devices/cpu/hmcs40/hmcs40.h +++ b/src/devices/cpu/hmcs40/hmcs40.h @@ -108,11 +108,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle - virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return (cycles * 4); } // " - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 2; } - virtual u32 execute_input_lines() const override { return 2+1; } // 3rd one is internal + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * 4); } // " + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 2; } + virtual u32 execute_input_lines() const noexcept override { return 2+1; } // 3rd one is internal virtual void execute_set_input(int line, int state) override; virtual void execute_run() override; diff --git a/src/devices/cpu/hphybrid/hphybrid.h b/src/devices/cpu/hphybrid/hphybrid.h index 5059e114bb7..db704d1d2fe 100644 --- a/src/devices/cpu/hphybrid/hphybrid.h +++ b/src/devices/cpu/hphybrid/hphybrid.h @@ -95,9 +95,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return m_r_cycles; } - virtual uint32_t execute_input_lines() const override { return 2; } - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return 0xff; } + virtual uint32_t execute_min_cycles() const noexcept override { return m_r_cycles; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return 0xff; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -227,7 +227,7 @@ public: protected: hp_5061_3011_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t addrwidth); // TODO: fix - virtual uint32_t execute_max_cycles() const override { return 25; } + virtual uint32_t execute_max_cycles() const noexcept override { return 25; } virtual bool execute_no_bpc(uint16_t opcode , uint16_t& next_pc) override; virtual bool read_non_common_reg(uint16_t addr , uint16_t& v) override; virtual bool write_non_common_reg(uint16_t addr , uint16_t v) override; @@ -249,7 +249,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; // TODO: fix - virtual uint32_t execute_max_cycles() const override { return 237; } // FMP 15 + virtual uint32_t execute_max_cycles() const noexcept override { return 237; } // FMP 15 virtual bool execute_no_bpc(uint16_t opcode , uint16_t& next_pc) override; virtual uint32_t add_mae(aec_cases_t aec_case, uint16_t addr) override; @@ -275,7 +275,7 @@ protected: // device_execute_interface overrides // TODO: fix - virtual uint32_t execute_max_cycles() const override { return 237; } // FMP 15 + virtual uint32_t execute_max_cycles() const noexcept override { return 237; } // FMP 15 virtual bool execute_no_bpc(uint16_t opcode , uint16_t& next_pc) override; diff --git a/src/devices/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h index 23128aaf45c..f10cfee4a04 100644 --- a/src/devices/cpu/i386/i386.h +++ b/src/devices/cpu/i386/i386.h @@ -51,10 +51,10 @@ protected: virtual void device_debug_setup() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 40; } - virtual uint32_t execute_input_lines() const override { return 32; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 40; } + virtual uint32_t execute_input_lines() const noexcept override { return 32; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -1575,7 +1575,7 @@ public: protected: pentium_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI || inputnum == INPUT_LINE_SMI; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI || inputnum == INPUT_LINE_SMI; } virtual void execute_set_input(int inputnum, int state) override; virtual uint64_t opcode_rdmsr(bool &valid_msr) override; virtual void opcode_wrmsr(uint64_t data, bool &valid_msr) override; diff --git a/src/devices/cpu/i8008/i8008.cpp b/src/devices/cpu/i8008/i8008.cpp index c0414390f4d..ec404c8902d 100644 --- a/src/devices/cpu/i8008/i8008.cpp +++ b/src/devices/cpu/i8008/i8008.cpp @@ -222,7 +222,7 @@ std::unique_ptr<util::disasm_interface> i8008_device::create_disassembler() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t i8008_device::execute_min_cycles() const +uint32_t i8008_device::execute_min_cycles() const noexcept { return 8; } @@ -232,7 +232,7 @@ uint32_t i8008_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t i8008_device::execute_max_cycles() const +uint32_t i8008_device::execute_max_cycles() const noexcept { return 16; } diff --git a/src/devices/cpu/i8008/i8008.h b/src/devices/cpu/i8008/i8008.h index 15667390abb..c5b00a1033b 100644 --- a/src/devices/cpu/i8008/i8008.h +++ b/src/devices/cpu/i8008/i8008.h @@ -29,8 +29,8 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/i8085/i8085.h b/src/devices/cpu/i8085/i8085.h index 5dac2de7f75..f97a9020852 100644 --- a/src/devices/cpu/i8085/i8085.h +++ b/src/devices/cpu/i8085/i8085.h @@ -67,15 +67,15 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 4; } - virtual u32 execute_max_cycles() const override { return 16; } - virtual u32 execute_input_lines() const override { return 4; } - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return 0xff; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == I8085_RST75_LINE; } + virtual u32 execute_min_cycles() const noexcept override { return 4; } + virtual u32 execute_max_cycles() const noexcept override { return 16; } + virtual u32 execute_input_lines() const noexcept override { return 4; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return 0xff; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == I8085_RST75_LINE; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - 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); } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; @@ -179,9 +179,9 @@ public: i8080_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); protected: - virtual u32 execute_input_lines() const override { return 1; } - virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return clocks; } - virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return cycles; } + virtual u32 execute_input_lines() const noexcept override { return 1; } + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return clocks; } + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return cycles; } }; @@ -192,9 +192,9 @@ public: i8080a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); protected: - virtual u32 execute_input_lines() const override { return 1; } - virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return clocks; } - virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return cycles; } + virtual u32 execute_input_lines() const noexcept override { return 1; } + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return clocks; } + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return cycles; } }; diff --git a/src/devices/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h index c90429e8447..562b75c6182 100644 --- a/src/devices/cpu/i86/i186.h +++ b/src/devices/cpu/i86/i186.h @@ -57,13 +57,13 @@ protected: i80186_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int data_bus_size); // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks / 2); } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks / 2); } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 2); } virtual void execute_run() override; virtual void device_start() override; virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual uint8_t fetch() override; uint32_t update_pc() { return m_pc = (m_sregs[CS] << 4) + m_ip; } diff --git a/src/devices/cpu/i86/i286.h b/src/devices/cpu/i86/i286.h index 594442622aa..8c028b44571 100644 --- a/src/devices/cpu/i86/i286.h +++ b/src/devices/cpu/i86/i286.h @@ -85,7 +85,7 @@ protected: virtual void state_import(const device_state_entry &entry) override; virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual void execute_set_input(int inputnum, int state) override; bool memory_translate(int spacenum, int intention, offs_t &address) override; diff --git a/src/devices/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h index 3d0a372b7d5..6943cc6a7eb 100644 --- a/src/devices/cpu/i86/i86.h +++ b/src/devices/cpu/i86/i86.h @@ -114,10 +114,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 50; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 50; } virtual void execute_set_input(int inputnum, int state) override; - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } // device_disasm_interface overrides virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; @@ -354,7 +354,7 @@ protected: virtual void execute_run() override; virtual void device_start() override; - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual uint8_t fetch() override; inline address_space *sreg_to_space(int sreg) const; virtual uint8_t read_byte(uint32_t addr) override; diff --git a/src/devices/cpu/i860/i860.h b/src/devices/cpu/i860/i860.h index 9666a238e3f..3f37dda5b87 100644 --- a/src/devices/cpu/i860/i860.h +++ b/src/devices/cpu/i860/i860.h @@ -67,9 +67,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 8; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 8; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/i960/i960.h b/src/devices/cpu/i960/i960.h index 3b6e7758f13..5880c0aa484 100644 --- a/src/devices/cpu/i960/i960.h +++ b/src/devices/cpu/i960/i960.h @@ -87,9 +87,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } /* ???? TODO: Exact timing unknown */ - virtual uint32_t execute_max_cycles() const override { return 1; } /* ???? TODO: Exact timing unknown */ - virtual uint32_t execute_input_lines() const override { return 4; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } /* ???? TODO: Exact timing unknown */ + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } /* ???? TODO: Exact timing unknown */ + virtual uint32_t execute_input_lines() const noexcept override { return 4; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/ie15/ie15.cpp b/src/devices/cpu/ie15/ie15.cpp index 90a58f83e9f..7d4b8499245 100644 --- a/src/devices/cpu/ie15/ie15.cpp +++ b/src/devices/cpu/ie15/ie15.cpp @@ -167,7 +167,7 @@ std::unique_ptr<util::disasm_interface> ie15_cpu_device::create_disassembler() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t ie15_cpu_device::execute_min_cycles() const +uint32_t ie15_cpu_device::execute_min_cycles() const noexcept { return 1; } @@ -177,7 +177,7 @@ uint32_t ie15_cpu_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t ie15_cpu_device::execute_max_cycles() const +uint32_t ie15_cpu_device::execute_max_cycles() const noexcept { return 1; } diff --git a/src/devices/cpu/ie15/ie15.h b/src/devices/cpu/ie15/ie15.h index 6b4b21e8dfc..14f4d82357c 100644 --- a/src/devices/cpu/ie15/ie15.h +++ b/src/devices/cpu/ie15/ie15.h @@ -31,8 +31,8 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/jaguar/jaguar.h b/src/devices/cpu/jaguar/jaguar.h index cf8cf88ecbd..3324ca3facd 100644 --- a/src/devices/cpu/jaguar/jaguar.h +++ b/src/devices/cpu/jaguar/jaguar.h @@ -102,9 +102,9 @@ protected: virtual void device_post_load() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 1; } - virtual u32 execute_input_lines() const override { return 5; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 1; } + virtual u32 execute_input_lines() const noexcept override { return 5; } virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides @@ -276,7 +276,7 @@ public: u32 ctrl_r(offs_t offset) override; protected: - virtual u32 execute_input_lines() const override { return 6; } + virtual u32 execute_input_lines() const noexcept override { return 6; } virtual void execute_run() override; virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; diff --git a/src/devices/cpu/lc8670/lc8670.h b/src/devices/cpu/lc8670/lc8670.h index f4845bf0cf9..5613771ab0f 100644 --- a/src/devices/cpu/lc8670/lc8670.h +++ b/src/devices/cpu/lc8670/lc8670.h @@ -96,9 +96,9 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 7; } - virtual uint32_t execute_input_lines() const override { return 4; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 7; } + virtual uint32_t execute_input_lines() const noexcept override { return 4; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/lh5801/lh5801.h b/src/devices/cpu/lh5801/lh5801.h index cb3237027b3..ee8e54c04d2 100644 --- a/src/devices/cpu/lh5801/lh5801.h +++ b/src/devices/cpu/lh5801/lh5801.h @@ -75,10 +75,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 2; } - virtual uint32_t execute_max_cycles() const override { return 19; } - virtual uint32_t execute_input_lines() const override { return 2; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == LH5801_LINE_MI || inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 2; } + virtual uint32_t execute_max_cycles() const noexcept override { return 19; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == LH5801_LINE_MI || inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/lr35902/lr35902.h b/src/devices/cpu/lr35902/lr35902.h index a15462080c8..db950b6b48c 100644 --- a/src/devices/cpu/lr35902/lr35902.h +++ b/src/devices/cpu/lr35902/lr35902.h @@ -68,9 +68,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 16; } - virtual uint32_t execute_input_lines() const override { return 5; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 16; } + virtual uint32_t execute_input_lines() const noexcept override { return 5; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/m37710/m37710.h b/src/devices/cpu/m37710/m37710.h index def929186b5..667dcbd1e13 100644 --- a/src/devices/cpu/m37710/m37710.h +++ b/src/devices/cpu/m37710/m37710.h @@ -191,11 +191,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 2 - 1) / 2; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); } - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 20; /* rough guess */ } - virtual uint32_t execute_input_lines() const override { return M37710_LINE_MAX; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 2 - 1) / 2; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 2); } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 20; /* rough guess */ } + virtual uint32_t execute_input_lines() const noexcept override { return M37710_LINE_MAX; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/m6502/m6500_1.cpp b/src/devices/cpu/m6502/m6500_1.cpp index cb3630e6668..7f1bcda0dab 100644 --- a/src/devices/cpu/m6502/m6500_1.cpp +++ b/src/devices/cpu/m6502/m6500_1.cpp @@ -189,12 +189,12 @@ void m6500_1_device::device_reset() } -u64 m6500_1_device::execute_clocks_to_cycles(u64 clocks) const +u64 m6500_1_device::execute_clocks_to_cycles(u64 clocks) const noexcept { return (clocks + 1) / 2; } -u64 m6500_1_device::execute_cycles_to_clocks(u64 cycles) const +u64 m6500_1_device::execute_cycles_to_clocks(u64 cycles) const noexcept { return cycles * 2; } diff --git a/src/devices/cpu/m6502/m6500_1.h b/src/devices/cpu/m6502/m6500_1.h index 5b48d358b77..c05be55f70b 100644 --- a/src/devices/cpu/m6502/m6500_1.h +++ b/src/devices/cpu/m6502/m6500_1.h @@ -81,8 +81,8 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual u64 execute_clocks_to_cycles(u64 clocks) const override; - virtual u64 execute_cycles_to_clocks(u64 cycles) const override; + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override; + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override; virtual void state_import(device_state_entry const &entry) override; virtual void state_export(device_state_entry const &entry) override; diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp index 130b49fbe4b..18e8b57cd79 100644 --- a/src/devices/cpu/m6502/m6502.cpp +++ b/src/devices/cpu/m6502/m6502.cpp @@ -122,22 +122,22 @@ void m6502_device::device_reset() } -uint32_t m6502_device::execute_min_cycles() const +uint32_t m6502_device::execute_min_cycles() const noexcept { return 1; } -uint32_t m6502_device::execute_max_cycles() const +uint32_t m6502_device::execute_max_cycles() const noexcept { return 10; } -uint32_t m6502_device::execute_input_lines() const +uint32_t m6502_device::execute_input_lines() const noexcept { return NMI_LINE+1; } -bool m6502_device::execute_input_edge_triggered(int inputnum) const +bool m6502_device::execute_input_edge_triggered(int inputnum) const noexcept { return inputnum == NMI_LINE; } diff --git a/src/devices/cpu/m6502/m6502.h b/src/devices/cpu/m6502/m6502.h index 615f9becad6..4e9e71b2eed 100644 --- a/src/devices/cpu/m6502/m6502.h +++ b/src/devices/cpu/m6502/m6502.h @@ -77,12 +77,12 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - virtual bool execute_input_edge_triggered(int inputnum) const override; + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/m6800/m6800.h b/src/devices/cpu/m6800/m6800.h index 72fc1ada619..0e8ef732058 100644 --- a/src/devices/cpu/m6800/m6800.h +++ b/src/devices/cpu/m6800/m6800.h @@ -52,10 +52,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 12; } - virtual uint32_t execute_input_lines() const override { return 2; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 12; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -371,8 +371,8 @@ public: protected: m6802_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const m6800_cpu_device::op_func *insn, const uint8_t *cycles); - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 4 - 1) / 4; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 4); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 4 - 1) / 4; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 4); } virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; }; diff --git a/src/devices/cpu/m6800/m6801.h b/src/devices/cpu/m6800/m6801.h index 1bf068bb73a..efc12e13b34 100644 --- a/src/devices/cpu/m6800/m6801.h +++ b/src/devices/cpu/m6800/m6801.h @@ -69,8 +69,8 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 4 - 1) / 4; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 4); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 4 - 1) / 4; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 4); } virtual void execute_set_input(int inputnum, int state) override; // device_disasm_interface overrides diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index 6fd29612ef6..f4a3438c182 100644 --- a/src/devices/cpu/m68000/m68000.h +++ b/src/devices/cpu/m68000/m68000.h @@ -137,10 +137,10 @@ protected: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 4; }; - virtual u32 execute_max_cycles() const override { return 158; }; - virtual u32 execute_input_lines() const override { return m_interrupt_mixer ? 8 : 3; }; // number of input lines - virtual bool execute_input_edge_triggered(int inputnum) const override { return m_interrupt_mixer ? inputnum == M68K_IRQ_7 : false; } + virtual u32 execute_min_cycles() const noexcept override { return 4; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_input_lines() const noexcept override { return m_interrupt_mixer ? 8 : 3; }; // number of input lines + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return m_interrupt_mixer ? inputnum == M68K_IRQ_7 : false; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -385,8 +385,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 4; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 4; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -409,8 +409,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 4; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 4; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -424,8 +424,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 4; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 4; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -439,8 +439,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 4; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 4; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -454,8 +454,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -469,8 +469,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -484,8 +484,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -499,8 +499,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -514,8 +514,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; virtual bool memory_translate(int space, int intention, offs_t &address) override; @@ -531,8 +531,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -546,8 +546,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -561,8 +561,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -576,8 +576,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -591,8 +591,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -603,8 +603,8 @@ class scc68070_base_device : public m68000_base_device protected: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 4; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 4; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -624,8 +624,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides virtual void device_start() override; @@ -645,8 +645,8 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u32 execute_min_cycles() const override { return 2; }; - virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; }; + virtual u32 execute_max_cycles() const noexcept override { return 158; }; // device-level overrides diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp index 2aa2ddc54ca..e0933a1af54 100644 --- a/src/devices/cpu/m6805/m6805.cpp +++ b/src/devices/cpu/m6805/m6805.cpp @@ -265,6 +265,13 @@ void m6805_base_device::device_start() m_program = &space(AS_PROGRAM); m_cache = m_program->cache<0, 0, ENDIANNESS_BIG>(); + // get the minimum not including the zero placeholders for illegal instructions + m_min_cycles = *std::min_element( + std::begin(m_params.m_cycles), + std::end(m_params.m_cycles), + [] (u8 x, u8 y) { return u8(x - 1) < u8(y - 1); }); + m_max_cycles = *std::max_element(std::begin(m_params.m_cycles), std::end(m_params.m_cycles)); + // set our instruction counter set_icountptr(m_icount); @@ -424,7 +431,7 @@ std::unique_ptr<util::disasm_interface> m6805_base_device::create_disassembler() // clock into cycles per second //------------------------------------------------- -uint64_t m6805_base_device::execute_clocks_to_cycles(uint64_t clocks) const +uint64_t m6805_base_device::execute_clocks_to_cycles(uint64_t clocks) const noexcept { return (clocks + 3) / 4; } @@ -435,7 +442,7 @@ uint64_t m6805_base_device::execute_clocks_to_cycles(uint64_t clocks) const // count back to raw clocks //------------------------------------------------- -uint64_t m6805_base_device::execute_cycles_to_clocks(uint64_t cycles) const +uint64_t m6805_base_device::execute_cycles_to_clocks(uint64_t cycles) const noexcept { return cycles * 4; } @@ -446,14 +453,9 @@ uint64_t m6805_base_device::execute_cycles_to_clocks(uint64_t cycles) const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t m6805_base_device::execute_min_cycles() const +uint32_t m6805_base_device::execute_min_cycles() const noexcept { - // get the minimum not including the zero placeholders for illegal instructions - u32 const result(*std::min_element( - std::begin(m_params.m_cycles), - std::end(m_params.m_cycles), - [] (u8 x, u8 y) { return u8(x - 1) < u8(y - 1); })); - return result; + return m_min_cycles; } @@ -462,10 +464,9 @@ uint32_t m6805_base_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t m6805_base_device::execute_max_cycles() const +uint32_t m6805_base_device::execute_max_cycles() const noexcept { - u32 const result(*std::max_element(std::begin(m_params.m_cycles), std::end(m_params.m_cycles))); - return result; + return m_max_cycles; } @@ -474,7 +475,7 @@ uint32_t m6805_base_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t m6805_base_device::execute_input_lines() const +uint32_t m6805_base_device::execute_input_lines() const noexcept { return 9; } diff --git a/src/devices/cpu/m6805/m6805.h b/src/devices/cpu/m6805/m6805.h index a4ba6d13450..1d08e0e8eaf 100644 --- a/src/devices/cpu/m6805/m6805.h +++ b/src/devices/cpu/m6805/m6805.h @@ -126,14 +126,14 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - 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 bool execute_input_edge_triggered(int inputnum) const override { return true; } + 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; + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return true; } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; @@ -274,6 +274,8 @@ protected: virtual bool test_il(); configuration_params const m_params; + u32 m_min_cycles; + u32 m_max_cycles; // address spaces address_space_config const m_program_config; @@ -329,7 +331,7 @@ protected: virtual void device_reset() override; virtual void execute_set_input(int inputnum, int state) override; - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void interrupt_vector() override; virtual bool test_il() override { return m_nmi_state != CLEAR_LINE; } diff --git a/src/devices/cpu/m6805/m68hc05.cpp b/src/devices/cpu/m6805/m68hc05.cpp index 5cdbe2d619b..362c297da8e 100644 --- a/src/devices/cpu/m6805/m68hc05.cpp +++ b/src/devices/cpu/m6805/m68hc05.cpp @@ -561,12 +561,12 @@ void m68hc05_device::execute_set_input(int inputnum, int state) } } -u64 m68hc05_device::execute_clocks_to_cycles(u64 clocks) const +u64 m68hc05_device::execute_clocks_to_cycles(u64 clocks) const noexcept { return (clocks + 1) / 2; } -u64 m68hc05_device::execute_cycles_to_clocks(u64 cycles) const +u64 m68hc05_device::execute_cycles_to_clocks(u64 cycles) const noexcept { return cycles * 2; } diff --git a/src/devices/cpu/m6805/m68hc05.h b/src/devices/cpu/m6805/m68hc05.h index a11abd9f3e8..b853c95df95 100644 --- a/src/devices/cpu/m6805/m68hc05.h +++ b/src/devices/cpu/m6805/m68hc05.h @@ -115,8 +115,8 @@ protected: virtual void device_reset() override; virtual void execute_set_input(int inputnum, int state) override; - virtual u64 execute_clocks_to_cycles(u64 clocks) const override; - virtual u64 execute_cycles_to_clocks(u64 cycles) const override; + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override; + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override; virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp index f9ceda47ddc..5143676fa05 100644 --- a/src/devices/cpu/m6809/m6809.cpp +++ b/src/devices/cpu/m6809/m6809.cpp @@ -395,7 +395,7 @@ std::unique_ptr<util::disasm_interface> m6809_base_device::create_disassembler() // clock into cycles per second //------------------------------------------------- -uint64_t m6809_base_device::execute_clocks_to_cycles(uint64_t clocks) const +uint64_t m6809_base_device::execute_clocks_to_cycles(uint64_t clocks) const noexcept { return (clocks + m_clock_divider - 1) / m_clock_divider; } @@ -406,7 +406,7 @@ uint64_t m6809_base_device::execute_clocks_to_cycles(uint64_t clocks) const // count back to raw clocks //------------------------------------------------- -uint64_t m6809_base_device::execute_cycles_to_clocks(uint64_t cycles) const +uint64_t m6809_base_device::execute_cycles_to_clocks(uint64_t cycles) const noexcept { return cycles * m_clock_divider; } @@ -417,7 +417,7 @@ uint64_t m6809_base_device::execute_cycles_to_clocks(uint64_t cycles) const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t m6809_base_device::execute_min_cycles() const +uint32_t m6809_base_device::execute_min_cycles() const noexcept { return 1; } @@ -428,7 +428,7 @@ uint32_t m6809_base_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t m6809_base_device::execute_max_cycles() const +uint32_t m6809_base_device::execute_max_cycles() const noexcept { return 19; } @@ -439,7 +439,7 @@ uint32_t m6809_base_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t m6809_base_device::execute_input_lines() const +uint32_t m6809_base_device::execute_input_lines() const noexcept { return 3; } diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h index bb52b0880dd..daa1b82913a 100644 --- a/src/devices/cpu/m6809/m6809.h +++ b/src/devices/cpu/m6809/m6809.h @@ -60,14 +60,14 @@ protected: virtual void device_post_load() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } - 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 bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } + 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; // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/mb86233/mb86233.h b/src/devices/cpu/mb86233/mb86233.h index 94c189a08ff..2f02a4c0d46 100644 --- a/src/devices/cpu/mb86233/mb86233.h +++ b/src/devices/cpu/mb86233/mb86233.h @@ -72,9 +72,9 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 4; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 4; } virtual void execute_run() override; virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/mb86235/mb86235.h b/src/devices/cpu/mb86235/mb86235.h index b520844be37..9edfd828749 100644 --- a/src/devices/cpu/mb86235/mb86235.h +++ b/src/devices/cpu/mb86235/mb86235.h @@ -59,9 +59,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 7; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 7; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; //virtual void execute_set_input(int inputnum, int state); diff --git a/src/devices/cpu/mb88xx/mb88xx.h b/src/devices/cpu/mb88xx/mb88xx.h index e4cceb45515..2d6d9ed04a1 100644 --- a/src/devices/cpu/mb88xx/mb88xx.h +++ b/src/devices/cpu/mb88xx/mb88xx.h @@ -113,13 +113,13 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 3; } - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 3; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 6 - 1) / 6; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 6); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 6 - 1) / 6; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 6); } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/mc68hc11/mc68hc11.h b/src/devices/cpu/mc68hc11/mc68hc11.h index aa414cb955e..309bdb28c6f 100644 --- a/src/devices/cpu/mc68hc11/mc68hc11.h +++ b/src/devices/cpu/mc68hc11/mc68hc11.h @@ -57,9 +57,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 41; } - virtual uint32_t execute_input_lines() const override { return 2; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 41; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/mcs40/mcs40.cpp b/src/devices/cpu/mcs40/mcs40.cpp index 25d99c89835..5967001b6ea 100644 --- a/src/devices/cpu/mcs40/mcs40.cpp +++ b/src/devices/cpu/mcs40/mcs40.cpp @@ -838,7 +838,7 @@ i4004_cpu_device::i4004_cpu_device(machine_config const &mconfig, char const *ta device_execute_interface implementation ***********************************************************************/ -u32 i4004_cpu_device::execute_input_lines() const +u32 i4004_cpu_device::execute_input_lines() const noexcept { return 1U; } @@ -1148,7 +1148,7 @@ i4040_cpu_device::i4040_cpu_device(machine_config const &mconfig, char const *ta device_execute_interface implementation ***********************************************************************/ -u32 i4040_cpu_device::execute_input_lines() const +u32 i4040_cpu_device::execute_input_lines() const noexcept { return 3U; } diff --git a/src/devices/cpu/mcs40/mcs40.h b/src/devices/cpu/mcs40/mcs40.h index 3dd82db95bc..df2769d3ea1 100644 --- a/src/devices/cpu/mcs40/mcs40.h +++ b/src/devices/cpu/mcs40/mcs40.h @@ -258,7 +258,7 @@ protected: using mcs40_cpu_device_base::mcs40_cpu_device_base; // device_execute_interface implementation - virtual u32 execute_input_lines() const override; + virtual u32 execute_input_lines() const noexcept override; virtual void execute_set_input(int inputnum, int state) override; // device_disasm_interface implementation @@ -288,7 +288,7 @@ protected: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; // device_execute_interface implementation - virtual u32 execute_input_lines() const override; + virtual u32 execute_input_lines() const noexcept override; virtual void execute_set_input(int inputnum, int state) override; // mcs40_cpu_device_base implementation diff --git a/src/devices/cpu/mcs48/mcs48.h b/src/devices/cpu/mcs48/mcs48.h index 3fc45cbfac3..66583c847cd 100644 --- a/src/devices/cpu/mcs48/mcs48.h +++ b/src/devices/cpu/mcs48/mcs48.h @@ -151,11 +151,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 15 - 1) / 15; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 15); } - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 3; } - virtual uint32_t execute_input_lines() const override { return 2; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 15 - 1) / 15; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 15); } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 3; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -517,8 +517,8 @@ public: protected: // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 30 - 1) / 30; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 30); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 30 - 1) / 30; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 30); } }; class i8022_device : public mcs48_cpu_device @@ -529,8 +529,8 @@ public: protected: // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 30 - 1) / 30; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 30); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 30 - 1) / 30; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 30); } }; class i8035_device : public mcs48_cpu_device diff --git a/src/devices/cpu/mcs51/mcs51.h b/src/devices/cpu/mcs51/mcs51.h index a16f302ab16..67d2665d1f6 100644 --- a/src/devices/cpu/mcs51/mcs51.h +++ b/src/devices/cpu/mcs51/mcs51.h @@ -78,11 +78,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 12 - 1) / 12; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 12); } - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 20; } - virtual uint32_t execute_input_lines() const override { return 6; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 12 - 1) / 12; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 12); } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 20; } + virtual uint32_t execute_input_lines() const noexcept override { return 6; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/mcs96/mcs96.cpp b/src/devices/cpu/mcs96/mcs96.cpp index 76dbb2d8609..260a7964661 100644 --- a/src/devices/cpu/mcs96/mcs96.cpp +++ b/src/devices/cpu/mcs96/mcs96.cpp @@ -79,17 +79,17 @@ void mcs96_device::device_reset() inst_state = STATE_FETCH; } -uint32_t mcs96_device::execute_min_cycles() const +uint32_t mcs96_device::execute_min_cycles() const noexcept { return 4; } -uint32_t mcs96_device::execute_max_cycles() const +uint32_t mcs96_device::execute_max_cycles() const noexcept { return 33; } -uint32_t mcs96_device::execute_input_lines() const +uint32_t mcs96_device::execute_input_lines() const noexcept { return 1; } diff --git a/src/devices/cpu/mcs96/mcs96.h b/src/devices/cpu/mcs96/mcs96.h index 6176a90a8e4..80844334aa6 100644 --- a/src/devices/cpu/mcs96/mcs96.h +++ b/src/devices/cpu/mcs96/mcs96.h @@ -55,9 +55,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/melps4/melps4.h b/src/devices/cpu/melps4/melps4.h index b88b6533aa6..d1593581332 100644 --- a/src/devices/cpu/melps4/melps4.h +++ b/src/devices/cpu/melps4/melps4.h @@ -97,11 +97,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 6 - 1) / 6; } // 6 t-states per machine cycle - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 6); } // " - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1+1; } // max opcode cycles + interrupt duration - virtual uint32_t execute_input_lines() const override { return 3; } // up to 3 (some internal) + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 6 - 1) / 6; } // 6 t-states per machine cycle + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 6); } // " + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1+1; } // max opcode cycles + interrupt duration + virtual uint32_t execute_input_lines() const noexcept override { return 3; } // up to 3 (some internal) virtual void execute_set_input(int line, int state) override; virtual void execute_run() override; virtual void execute_one(); diff --git a/src/devices/cpu/minx/minx.h b/src/devices/cpu/minx/minx.h index d7ecdf039a5..991916435ee 100644 --- a/src/devices/cpu/minx/minx.h +++ b/src/devices/cpu/minx/minx.h @@ -26,9 +26,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 4; } - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 4; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/mips/mips1.h b/src/devices/cpu/mips/mips1.h index 306944d358f..3a3444607fc 100644 --- a/src/devices/cpu/mips/mips1.h +++ b/src/devices/cpu/mips/mips1.h @@ -156,9 +156,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 40; } - virtual u32 execute_input_lines() const override { return 6; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 40; } + virtual u32 execute_input_lines() const noexcept override { return 6; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/mips/mips3.h b/src/devices/cpu/mips/mips3.h index 5abda463995..6f4081bcb61 100644 --- a/src/devices/cpu/mips/mips3.h +++ b/src/devices/cpu/mips/mips3.h @@ -319,9 +319,9 @@ protected: virtual void device_stop() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 40; } - virtual uint32_t execute_input_lines() const override { return 6; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 40; } + virtual uint32_t execute_input_lines() const noexcept override { return 6; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; virtual void execute_burn(int32_t cycles) override { m_totalcycles += cycles; } diff --git a/src/devices/cpu/mips/ps2vu.h b/src/devices/cpu/mips/ps2vu.h index c2e99668ffd..8d0fb2e513b 100644 --- a/src/devices/cpu/mips/ps2vu.h +++ b/src/devices/cpu/mips/ps2vu.h @@ -114,9 +114,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override { } diff --git a/src/devices/cpu/mips/r4000.h b/src/devices/cpu/mips/r4000.h index 2430812919c..80aac4ef56b 100644 --- a/src/devices/cpu/mips/r4000.h +++ b/src/devices/cpu/mips/r4000.h @@ -319,9 +319,9 @@ protected: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 40; } - virtual u32 execute_input_lines() const override { return 6; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 40; } + virtual u32 execute_input_lines() const noexcept override { return 6; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/mn10200/mn10200.h b/src/devices/cpu/mn10200/mn10200.h index 46ba6acd8d8..26065b37b6a 100644 --- a/src/devices/cpu/mn10200/mn10200.h +++ b/src/devices/cpu/mn10200/mn10200.h @@ -58,11 +58,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 2 - 1) / 2; } // internal /2 divider - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); } // internal /2 divider - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 13+7; } // max opcode cycles + interrupt duration - virtual uint32_t execute_input_lines() const override { return 4; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 2 - 1) / 2; } // internal /2 divider + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 2); } // internal /2 divider + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 13+7; } // max opcode cycles + interrupt duration + virtual uint32_t execute_input_lines() const noexcept override { return 4; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/nanoprocessor/nanoprocessor.h b/src/devices/cpu/nanoprocessor/nanoprocessor.h index df846b5b1f2..3eb7827f1bd 100644 --- a/src/devices/cpu/nanoprocessor/nanoprocessor.h +++ b/src/devices/cpu/nanoprocessor/nanoprocessor.h @@ -73,11 +73,11 @@ public: auto read_dc() { return m_read_dc_func.bind(); } // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 2; } + virtual uint32_t execute_min_cycles() const noexcept override { return 2; } // 3 cycles is for int. acknowledge + 1 instruction - virtual uint32_t execute_max_cycles() const override { return 3; } - virtual uint32_t execute_input_lines() const override { return 1; } - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return 0xff; } + virtual uint32_t execute_max_cycles() const noexcept override { return 3; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return 0xff; } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/nec/nec.h b/src/devices/cpu/nec/nec.h index 932f9fc583a..adde8ab0839 100644 --- a/src/devices/cpu/nec/nec.h +++ b/src/devices/cpu/nec/nec.h @@ -32,11 +32,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 80; } - virtual uint32_t execute_input_lines() const override { return 1; } - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return 0xff; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 80; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return 0xff; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/nec/v25.h b/src/devices/cpu/nec/v25.h index bc75fd5a3f9..4e1abc14683 100644 --- a/src/devices/cpu/nec/v25.h +++ b/src/devices/cpu/nec/v25.h @@ -48,13 +48,13 @@ protected: virtual void device_post_load() override { notify_clock_changed(); } // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return clocks / m_PCK; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return cycles * m_PCK; } - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 80; } - virtual uint32_t execute_input_lines() const override { return 1; } - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return 0xff; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI || (inputnum >= NEC_INPUT_LINE_INTP0 && inputnum <= NEC_INPUT_LINE_INTP2); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return clocks / m_PCK; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return cycles * m_PCK; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 80; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return 0xff; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI || (inputnum >= NEC_INPUT_LINE_INTP0 && inputnum <= NEC_INPUT_LINE_INTP2); } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/ns32000/ns32000.h b/src/devices/cpu/ns32000/ns32000.h index 7b17cafba99..5a4845aa1ce 100644 --- a/src/devices/cpu/ns32000/ns32000.h +++ b/src/devices/cpu/ns32000/ns32000.h @@ -38,12 +38,12 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 6; } - virtual u32 execute_input_lines() const override { return 2; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 6; } + virtual u32 execute_input_lines() const noexcept override { return 2; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } // device_memory_interface overrides diff --git a/src/devices/cpu/nuon/nuon.h b/src/devices/cpu/nuon/nuon.h index 6add914cb4a..d9b6c9feea1 100644 --- a/src/devices/cpu/nuon/nuon.h +++ b/src/devices/cpu/nuon/nuon.h @@ -28,9 +28,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h index b892b5f954b..ddfec96a884 100644 --- a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h +++ b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h @@ -107,8 +107,8 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 2; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 2; } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/pdp1/pdp1.h b/src/devices/cpu/pdp1/pdp1.h index 37c08d0ca57..1c2d5c7eea3 100644 --- a/src/devices/cpu/pdp1/pdp1.h +++ b/src/devices/cpu/pdp1/pdp1.h @@ -99,9 +99,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 5; } - virtual uint32_t execute_max_cycles() const override { return 31; } - virtual uint32_t execute_input_lines() const override { return 16; } + virtual uint32_t execute_min_cycles() const noexcept override { return 5; } + virtual uint32_t execute_max_cycles() const noexcept override { return 31; } + virtual uint32_t execute_input_lines() const noexcept override { return 16; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/pdp1/tx0.h b/src/devices/cpu/pdp1/tx0.h index 50fe94eb429..e2d2cd86229 100644 --- a/src/devices/cpu/pdp1/tx0.h +++ b/src/devices/cpu/pdp1/tx0.h @@ -48,8 +48,8 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 3; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 3; } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/pdp8/pdp8.cpp b/src/devices/cpu/pdp8/pdp8.cpp index 39f909b03e4..3084c1bb29d 100644 --- a/src/devices/cpu/pdp8/pdp8.cpp +++ b/src/devices/cpu/pdp8/pdp8.cpp @@ -166,7 +166,7 @@ std::unique_ptr<util::disasm_interface> pdp8_cpu_device::create_disassembler() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t pdp8_device::execute_min_cycles() const +uint32_t pdp8_device::execute_min_cycles() const noexcept { return 1; // TODO } @@ -177,7 +177,7 @@ uint32_t pdp8_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t pdp8_device::execute_max_cycles() const +uint32_t pdp8_device::execute_max_cycles() const noexcept { return 3; // TODO } @@ -188,7 +188,7 @@ uint32_t pdp8_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t pdp8_device::execute_input_lines() const +uint32_t pdp8_device::execute_input_lines() const noexcept { return 0; // TODO } diff --git a/src/devices/cpu/pdp8/pdp8.h b/src/devices/cpu/pdp8/pdp8.h index 0c59faa3124..75fe4da45ab 100644 --- a/src/devices/cpu/pdp8/pdp8.h +++ b/src/devices/cpu/pdp8/pdp8.h @@ -30,9 +30,9 @@ public: virtual void device_stop() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/pic16c5x/pic16c5x.h b/src/devices/cpu/pic16c5x/pic16c5x.h index e61448e4807..e9e11b85778 100644 --- a/src/devices/cpu/pic16c5x/pic16c5x.h +++ b/src/devices/cpu/pic16c5x/pic16c5x.h @@ -92,12 +92,12 @@ protected: * times. (Each instruction cycle passes through 4 machine states). This * is handled by the cpu execution engine. */ - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 4 - 1) / 4; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 4); } - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 2; } - virtual uint32_t execute_input_lines() const override { return 1; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == PIC16C5x_RTCC; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 4 - 1) / 4; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 4); } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 2; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == PIC16C5x_RTCC; } virtual void execute_run() override; virtual void execute_set_input(int line, int state) override; diff --git a/src/devices/cpu/pic16c62x/pic16c62x.h b/src/devices/cpu/pic16c62x/pic16c62x.h index 52a38b65696..a3be8637765 100644 --- a/src/devices/cpu/pic16c62x/pic16c62x.h +++ b/src/devices/cpu/pic16c62x/pic16c62x.h @@ -62,11 +62,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 4 - 1) / 4; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 4); } - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 2; } - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 4 - 1) / 4; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 4); } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 2; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/powerpc/ppc.h b/src/devices/cpu/powerpc/ppc.h index 4c11de761d3..3924125b805 100644 --- a/src/devices/cpu/powerpc/ppc.h +++ b/src/devices/cpu/powerpc/ppc.h @@ -250,9 +250,9 @@ protected: virtual void device_stop() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 40; } - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 40; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -683,7 +683,7 @@ protected: // ppc403_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // //protected: -// virtual uint32_t execute_input_lines() const { return 8; } +// virtual uint32_t execute_input_lines() const noexcept { return 8; } //}; // // @@ -693,7 +693,7 @@ protected: // ppc405_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // //protected: -// virtual uint32_t execute_input_lines() const { return 8; } +// virtual uint32_t execute_input_lines() const noexcept { return 8; } //}; @@ -764,7 +764,7 @@ public: protected: ppc4xx_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, powerpc_flavor flavor, uint32_t cap, uint32_t tb_divisor); - virtual uint32_t execute_input_lines() const override { return 5; } + virtual uint32_t execute_input_lines() const noexcept override { return 5; } virtual void execute_set_input(int inputnum, int state) override; }; diff --git a/src/devices/cpu/pps4/pps4.h b/src/devices/cpu/pps4/pps4.h index 9c625b6dafb..e3ca3b012bb 100644 --- a/src/devices/cpu/pps4/pps4.h +++ b/src/devices/cpu/pps4/pps4.h @@ -57,9 +57,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 3; } - virtual u32 execute_input_lines() const override { return 0; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 3; } + virtual u32 execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides @@ -178,8 +178,8 @@ protected: virtual void device_reset() override; // device_execute_interface overrides (NOTE: these assume internal XTAL divider is always used) - virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return (clocks + 18 - 1) / 18; } - virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return (cycles * 18); } + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 18 - 1) / 18; } + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * 18); } virtual void iDIB() override; virtual void iDOA() override; diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h index ff21787eeab..f1fc9315852 100644 --- a/src/devices/cpu/psx/psx.h +++ b/src/devices/cpu/psx/psx.h @@ -177,11 +177,11 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 40; } - virtual uint32_t execute_input_lines() const override { return 6; } - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return ( clocks + 3 ) / 4; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return cycles * 4; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 40; } + virtual uint32_t execute_input_lines() const noexcept override { return 6; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return ( clocks + 3 ) / 4; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return cycles * 4; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/rsp/rsp.h b/src/devices/cpu/rsp/rsp.h index 70e68867d6a..10fa70801ce 100644 --- a/src/devices/cpu/rsp/rsp.h +++ b/src/devices/cpu/rsp/rsp.h @@ -127,9 +127,9 @@ protected: virtual void device_stop() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override { } diff --git a/src/devices/cpu/s2650/s2650.h b/src/devices/cpu/s2650/s2650.h index e1f344d9147..73a6db57082 100644 --- a/src/devices/cpu/s2650/s2650.h +++ b/src/devices/cpu/s2650/s2650.h @@ -42,10 +42,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 5; } - virtual uint32_t execute_max_cycles() const override { return 13; } - virtual uint32_t execute_input_lines() const override { return 2; } - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 5; } + virtual uint32_t execute_max_cycles() const noexcept override { return 13; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return 0; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/saturn/saturn.h b/src/devices/cpu/saturn/saturn.h index bb520181450..a50742f7508 100644 --- a/src/devices/cpu/saturn/saturn.h +++ b/src/devices/cpu/saturn/saturn.h @@ -84,9 +84,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 2; } - virtual uint32_t execute_max_cycles() const override { return 21; } - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_min_cycles() const noexcept override { return 2; } + virtual uint32_t execute_max_cycles() const noexcept override { return 21; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/sc61860/sc61860.h b/src/devices/cpu/sc61860/sc61860.h index 57246e1d672..081f9230be0 100644 --- a/src/devices/cpu/sc61860/sc61860.h +++ b/src/devices/cpu/sc61860/sc61860.h @@ -72,9 +72,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 2; } - virtual uint32_t execute_max_cycles() const override { return 4; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 2; } + virtual uint32_t execute_max_cycles() const noexcept override { return 4; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/scmp/scmp.h b/src/devices/cpu/scmp/scmp.h index 83577285a85..db571d913b3 100644 --- a/src/devices/cpu/scmp/scmp.h +++ b/src/devices/cpu/scmp/scmp.h @@ -33,9 +33,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 5; } - virtual uint32_t execute_max_cycles() const override { return 131593; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 5; } + virtual uint32_t execute_max_cycles() const noexcept override { return 131593; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides @@ -91,8 +91,8 @@ public: ins8060_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 2 - 1) / 2; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 2 - 1) / 2; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 2); } }; diff --git a/src/devices/cpu/score/score.h b/src/devices/cpu/score/score.h index 1cc791d3402..b8f8c1680cd 100644 --- a/src/devices/cpu/score/score.h +++ b/src/devices/cpu/score/score.h @@ -41,9 +41,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 64; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 64; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/scudsp/scudsp.h b/src/devices/cpu/scudsp/scudsp.h index 9b271f8b53e..963a2d63871 100644 --- a/src/devices/cpu/scudsp/scudsp.h +++ b/src/devices/cpu/scudsp/scudsp.h @@ -67,9 +67,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 7; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 7; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/se3208/se3208.h b/src/devices/cpu/se3208/se3208.h index d0528b8208d..e6cd9da9999 100644 --- a/src/devices/cpu/se3208/se3208.h +++ b/src/devices/cpu/se3208/se3208.h @@ -26,10 +26,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 1; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/sh/sh2.h b/src/devices/cpu/sh/sh2.h index a83bea94646..9157912f8f7 100644 --- a/src/devices/cpu/sh/sh2.h +++ b/src/devices/cpu/sh/sh2.h @@ -215,11 +215,11 @@ protected: virtual void device_stop() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 4; } - virtual uint32_t execute_input_lines() const override { return 16; } - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return 0; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 4; } + virtual uint32_t execute_input_lines() const noexcept override { return 16; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return 0; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/sh/sh4.h b/src/devices/cpu/sh/sh4.h index df11767d95d..0cb639c23d9 100644 --- a/src/devices/cpu/sh/sh4.h +++ b/src/devices/cpu/sh/sh4.h @@ -261,12 +261,12 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 4; } - virtual uint32_t execute_input_lines() const override { return 5; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 4; } + virtual uint32_t execute_input_lines() const noexcept override { return 5; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/sharc/sharc.h b/src/devices/cpu/sharc/sharc.h index 93495d5c744..91d9d09497d 100644 --- a/src/devices/cpu/sharc/sharc.h +++ b/src/devices/cpu/sharc/sharc.h @@ -210,9 +210,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 8; } - virtual uint32_t execute_max_cycles() const override { return 8; } - virtual uint32_t execute_input_lines() const override { return 32; } + virtual uint32_t execute_min_cycles() const noexcept override { return 8; } + virtual uint32_t execute_max_cycles() const noexcept override { return 8; } + virtual uint32_t execute_input_lines() const noexcept override { return 32; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h index 6171de9ee6e..713d422e1e2 100644 --- a/src/devices/cpu/sm510/sm510.h +++ b/src/devices/cpu/sm510/sm510.h @@ -113,11 +113,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return (clocks + m_clk_div - 1) / m_clk_div; } // default 2 cycles per machine cycle - virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return (cycles * m_clk_div); } // " - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 2; } - virtual u32 execute_input_lines() const override { return 1; } + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + m_clk_div - 1) / m_clk_div; } // default 2 cycles per machine cycle + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * m_clk_div); } // " + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 2; } + virtual u32 execute_input_lines() const noexcept override { return 1; } virtual void execute_set_input(int line, int state) override; virtual void execute_run() override; virtual void execute_one() { } // -> child class diff --git a/src/devices/cpu/sm510/sm530.h b/src/devices/cpu/sm510/sm530.h index e06e24bf51f..e0c3b4dd769 100644 --- a/src/devices/cpu/sm510/sm530.h +++ b/src/devices/cpu/sm510/sm530.h @@ -29,8 +29,8 @@ protected: virtual void device_reset() override; virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return (clocks + 3 - 1) / 3; } // 3 cycles per machine cycle - virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return (cycles * 3); } // " + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 3 - 1) / 3; } // 3 cycles per machine cycle + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * 3); } // " virtual void execute_one() override; virtual void get_opcode_param() override; diff --git a/src/devices/cpu/sm8500/sm8500.h b/src/devices/cpu/sm8500/sm8500.h index 3661d92290c..5e93029c030 100644 --- a/src/devices/cpu/sm8500/sm8500.h +++ b/src/devices/cpu/sm8500/sm8500.h @@ -55,9 +55,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 16; } - virtual uint32_t execute_input_lines() const override { return 11; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 16; } + virtual uint32_t execute_input_lines() const noexcept override { return 11; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/sparc/mb86901.cpp b/src/devices/cpu/sparc/mb86901.cpp index 809df3db8f3..82575f57f2a 100644 --- a/src/devices/cpu/sparc/mb86901.cpp +++ b/src/devices/cpu/sparc/mb86901.cpp @@ -609,7 +609,7 @@ std::unique_ptr<util::disasm_interface> mb86901_device::create_disassembler() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t mb86901_device::execute_min_cycles() const +uint32_t mb86901_device::execute_min_cycles() const noexcept { return 1; } @@ -620,7 +620,7 @@ uint32_t mb86901_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t mb86901_device::execute_max_cycles() const +uint32_t mb86901_device::execute_max_cycles() const noexcept { return 4; } @@ -631,7 +631,7 @@ uint32_t mb86901_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t mb86901_device::execute_input_lines() const +uint32_t mb86901_device::execute_input_lines() const noexcept { return 16; } diff --git a/src/devices/cpu/sparc/sparc.h b/src/devices/cpu/sparc/sparc.h index 488a9f38dfa..deef7376957 100644 --- a/src/devices/cpu/sparc/sparc.h +++ b/src/devices/cpu/sparc/sparc.h @@ -34,9 +34,9 @@ public: virtual void device_resolve_objects() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/spc700/spc700.h b/src/devices/cpu/spc700/spc700.h index 7e95c09765d..bd1b90c475e 100644 --- a/src/devices/cpu/spc700/spc700.h +++ b/src/devices/cpu/spc700/spc700.h @@ -18,10 +18,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 2; } - virtual uint32_t execute_max_cycles() const override { return 8; } - virtual uint32_t execute_input_lines() const override { return 1; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 2; } + virtual uint32_t execute_max_cycles() const noexcept override { return 8; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/ssem/ssem.cpp b/src/devices/cpu/ssem/ssem.cpp index 88ceab819ed..6f074de3551 100644 --- a/src/devices/cpu/ssem/ssem.cpp +++ b/src/devices/cpu/ssem/ssem.cpp @@ -178,7 +178,7 @@ std::unique_ptr<util::disasm_interface> ssem_device::create_disassembler() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t ssem_device::execute_min_cycles() const +uint32_t ssem_device::execute_min_cycles() const noexcept { return 1; } @@ -189,7 +189,7 @@ uint32_t ssem_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t ssem_device::execute_max_cycles() const +uint32_t ssem_device::execute_max_cycles() const noexcept { return 1; } @@ -200,7 +200,7 @@ uint32_t ssem_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t ssem_device::execute_input_lines() const +uint32_t ssem_device::execute_input_lines() const noexcept { return 0; } diff --git a/src/devices/cpu/ssem/ssem.h b/src/devices/cpu/ssem/ssem.h index f635f1e1971..7cfe5d17435 100644 --- a/src/devices/cpu/ssem/ssem.h +++ b/src/devices/cpu/ssem/ssem.h @@ -31,9 +31,9 @@ protected: virtual void device_stop() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/ssp1601/ssp1601.h b/src/devices/cpu/ssp1601/ssp1601.h index dae9d3408bf..db86dddb875 100644 --- a/src/devices/cpu/ssp1601/ssp1601.h +++ b/src/devices/cpu/ssp1601/ssp1601.h @@ -30,9 +30,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 4; } - virtual uint32_t execute_input_lines() const override { return 3; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 4; } + virtual uint32_t execute_input_lines() const noexcept override { return 3; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/st62xx/st62xx.cpp b/src/devices/cpu/st62xx/st62xx.cpp index 3a84f8931b2..ece4e81174b 100644 --- a/src/devices/cpu/st62xx/st62xx.cpp +++ b/src/devices/cpu/st62xx/st62xx.cpp @@ -438,17 +438,17 @@ READ8_MEMBER(st6228_device::regs_r) return ret; } -uint32_t st6228_device::execute_min_cycles() const +uint32_t st6228_device::execute_min_cycles() const noexcept { return 2; } -uint32_t st6228_device::execute_max_cycles() const +uint32_t st6228_device::execute_max_cycles() const noexcept { return 5; } -uint32_t st6228_device::execute_input_lines() const +uint32_t st6228_device::execute_input_lines() const noexcept { return 0; } diff --git a/src/devices/cpu/st62xx/st62xx.h b/src/devices/cpu/st62xx/st62xx.h index 9b0582afce6..0560276e50e 100644 --- a/src/devices/cpu/st62xx/st62xx.h +++ b/src/devices/cpu/st62xx/st62xx.h @@ -84,9 +84,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/superfx/superfx.h b/src/devices/cpu/superfx/superfx.h index f5ac568e0ec..54f07ec184f 100644 --- a/src/devices/cpu/superfx/superfx.h +++ b/src/devices/cpu/superfx/superfx.h @@ -112,7 +112,7 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides @@ -216,8 +216,8 @@ public: protected: // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 2 - 1) / 2; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 2 - 1) / 2; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 2); } }; class superfx2_device : public superfx_device diff --git a/src/devices/cpu/t11/t11.h b/src/devices/cpu/t11/t11.h index 03b73d99267..5b4c4921dad 100644 --- a/src/devices/cpu/t11/t11.h +++ b/src/devices/cpu/t11/t11.h @@ -46,12 +46,12 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 12; } - virtual uint32_t execute_max_cycles() const override { return 114; } - virtual uint32_t execute_input_lines() const override { return 4; } + virtual uint32_t execute_min_cycles() const noexcept override { return 12; } + virtual uint32_t execute_max_cycles() const noexcept override { return 114; } + virtual uint32_t execute_input_lines() const noexcept override { return 4; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return -1; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return -1; } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/tlcs870/tlcs870.h b/src/devices/cpu/tlcs870/tlcs870.h index 93390d1be0c..9824f1324c4 100644 --- a/src/devices/cpu/tlcs870/tlcs870.h +++ b/src/devices/cpu/tlcs870/tlcs870.h @@ -49,10 +49,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 2; } - virtual uint32_t execute_max_cycles() const override { return 26; } - virtual uint32_t execute_input_lines() const override { return 1; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 2; } + virtual uint32_t execute_max_cycles() const noexcept override { return 26; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/tlcs90/tlcs90.h b/src/devices/cpu/tlcs90/tlcs90.h index d5dc310a2cd..65ecda075de 100644 --- a/src/devices/cpu/tlcs90/tlcs90.h +++ b/src/devices/cpu/tlcs90/tlcs90.h @@ -43,10 +43,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 2; } - virtual uint32_t execute_max_cycles() const override { return 26; } - virtual uint32_t execute_input_lines() const override { return 1; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 2; } + virtual uint32_t execute_max_cycles() const noexcept override { return 26; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; virtual void execute_burn(int32_t cycles) override; diff --git a/src/devices/cpu/tlcs900/tlcs900.h b/src/devices/cpu/tlcs900/tlcs900.h index 2016c00996f..28242c0d6d6 100644 --- a/src/devices/cpu/tlcs900/tlcs900.h +++ b/src/devices/cpu/tlcs900/tlcs900.h @@ -58,10 +58,10 @@ protected: virtual void device_start() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } /* FIXME */ - virtual uint32_t execute_max_cycles() const override { return 1; } /* FIXME */ - virtual uint32_t execute_input_lines() const override { return 6; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } /* FIXME */ + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } /* FIXME */ + virtual uint32_t execute_input_lines() const noexcept override { return 6; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/tms1000/tms1k_base.h b/src/devices/cpu/tms1000/tms1k_base.h index d7681329c93..b01d5380293 100644 --- a/src/devices/cpu/tms1000/tms1k_base.h +++ b/src/devices/cpu/tms1000/tms1k_base.h @@ -97,8 +97,8 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 1; } + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_one(); diff --git a/src/devices/cpu/tms32010/tms32010.h b/src/devices/cpu/tms32010/tms32010.h index 2b290a3945e..247c9546a47 100644 --- a/src/devices/cpu/tms32010/tms32010.h +++ b/src/devices/cpu/tms32010/tms32010.h @@ -50,13 +50,13 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 3; } - virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 3; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 4 - 1) / 4; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 4); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 4 - 1) / 4; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 4); } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/tms32025/tms32025.h b/src/devices/cpu/tms32025/tms32025.h index 924f0a774cc..677da427715 100644 --- a/src/devices/cpu/tms32025/tms32025.h +++ b/src/devices/cpu/tms32025/tms32025.h @@ -99,9 +99,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 4; } - virtual uint32_t execute_max_cycles() const override { return 20; } - virtual uint32_t execute_input_lines() const override { return 6; } + virtual uint32_t execute_min_cycles() const noexcept override { return 4; } + virtual uint32_t execute_max_cycles() const noexcept override { return 20; } + virtual uint32_t execute_input_lines() const noexcept override { return 6; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp index a1c209c541d..17fde313178 100644 --- a/src/devices/cpu/tms32031/tms32031.cpp +++ b/src/devices/cpu/tms32031/tms32031.cpp @@ -702,7 +702,7 @@ void tms3203x_device::check_irqs() // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t tms3203x_device::execute_min_cycles() const +uint32_t tms3203x_device::execute_min_cycles() const noexcept { return 1; } @@ -713,7 +713,7 @@ uint32_t tms3203x_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t tms3203x_device::execute_max_cycles() const +uint32_t tms3203x_device::execute_max_cycles() const noexcept { return 4; } @@ -724,7 +724,7 @@ uint32_t tms3203x_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t tms3203x_device::execute_input_lines() const +uint32_t tms3203x_device::execute_input_lines() const noexcept { return 14; } diff --git a/src/devices/cpu/tms32031/tms32031.h b/src/devices/cpu/tms32031/tms32031.h index b8f8c212a56..396f441618c 100644 --- a/src/devices/cpu/tms32031/tms32031.h +++ b/src/devices/cpu/tms32031/tms32031.h @@ -154,9 +154,9 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/tms32051/tms32051.h b/src/devices/cpu/tms32051/tms32051.h index 49f1f041a55..a4d404fc78d 100644 --- a/src/devices/cpu/tms32051/tms32051.h +++ b/src/devices/cpu/tms32051/tms32051.h @@ -72,9 +72,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 5; } - virtual uint32_t execute_input_lines() const override { return 6; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 5; } + virtual uint32_t execute_input_lines() const noexcept override { return 6; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/tms32082/tms32082.h b/src/devices/cpu/tms32082/tms32082.h index b2f537f1536..e571255192d 100644 --- a/src/devices/cpu/tms32082/tms32082.h +++ b/src/devices/cpu/tms32082/tms32082.h @@ -80,9 +80,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -168,9 +168,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; // device_memory_interface overrides diff --git a/src/devices/cpu/tms34010/tms34010.h b/src/devices/cpu/tms34010/tms34010.h index e4488f3ca72..e79337f36ea 100644 --- a/src/devices/cpu/tms34010/tms34010.h +++ b/src/devices/cpu/tms34010/tms34010.h @@ -260,9 +260,9 @@ protected: virtual void device_post_load() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 10000; } - virtual uint32_t execute_input_lines() const override { return 2; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 10000; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -1016,8 +1016,8 @@ public: virtual u16 io_register_r(offs_t offset) override; protected: - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 8 - 1) / 8; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 8); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 8 - 1) / 8; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 8); } virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; void internal_regs_map(address_map &map); }; @@ -1034,8 +1034,8 @@ public: virtual u16 io_register_r(offs_t offset) override; protected: - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 4 - 1) / 4; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 4); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 4 - 1) / 4; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 4); } virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; void internal_regs_map(address_map &map); }; diff --git a/src/devices/cpu/tms57002/tms57002.cpp b/src/devices/cpu/tms57002/tms57002.cpp index 576450c10aa..8464a10e2f0 100644 --- a/src/devices/cpu/tms57002/tms57002.cpp +++ b/src/devices/cpu/tms57002/tms57002.cpp @@ -1026,17 +1026,17 @@ void tms57002_device::device_start() save_item(NAME(allow_update)); } -u32 tms57002_device::execute_min_cycles() const +u32 tms57002_device::execute_min_cycles() const noexcept { return 1; } -u32 tms57002_device::execute_max_cycles() const +u32 tms57002_device::execute_max_cycles() const noexcept { return 3; } -u32 tms57002_device::execute_input_lines() const +u32 tms57002_device::execute_input_lines() const noexcept { return 0; } diff --git a/src/devices/cpu/tms57002/tms57002.h b/src/devices/cpu/tms57002/tms57002.h index b5decb23998..b1a96823b06 100644 --- a/src/devices/cpu/tms57002/tms57002.h +++ b/src/devices/cpu/tms57002/tms57002.h @@ -38,9 +38,9 @@ protected: virtual void device_reset() override; virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; virtual space_config_vector memory_space_config() const override; - virtual u32 execute_min_cycles() const override; - virtual u32 execute_max_cycles() const override; - virtual u32 execute_input_lines() const override; + virtual u32 execute_min_cycles() const noexcept override; + virtual u32 execute_max_cycles() const noexcept override; + virtual u32 execute_input_lines() const noexcept override; virtual void execute_run() override; virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h index 0d1d3b82490..e2ce46e76b8 100644 --- a/src/devices/cpu/tms7000/tms7000.h +++ b/src/devices/cpu/tms7000/tms7000.h @@ -80,11 +80,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 2 - 1) / 2; } // internal /2 divider - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); } // internal /2 divider - virtual uint32_t execute_min_cycles() const override { return 5; } - virtual uint32_t execute_max_cycles() const override { return 49; } - virtual uint32_t execute_input_lines() const override { return 2; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 2 - 1) / 2; } // internal /2 divider + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 2); } // internal /2 divider + virtual uint32_t execute_min_cycles() const noexcept override { return 5; } + virtual uint32_t execute_max_cycles() const noexcept override { return 49; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } virtual void execute_run() override; virtual void execute_set_input(int extline, int state) override; diff --git a/src/devices/cpu/tms9900/ti990_10.cpp b/src/devices/cpu/tms9900/ti990_10.cpp index 06bab5b1d94..99cf65dfb0b 100644 --- a/src/devices/cpu/tms9900/ti990_10.cpp +++ b/src/devices/cpu/tms9900/ti990_10.cpp @@ -107,18 +107,18 @@ void ti990_10_device::execute_set_input(int irqline, int state) // ========================================================================== -uint32_t ti990_10_device::execute_min_cycles() const +uint32_t ti990_10_device::execute_min_cycles() const noexcept { return 2; } // TODO: Compute this value, just a wild guess for the average -uint32_t ti990_10_device::execute_max_cycles() const +uint32_t ti990_10_device::execute_max_cycles() const noexcept { return 10; } -uint32_t ti990_10_device::execute_input_lines() const +uint32_t ti990_10_device::execute_input_lines() const noexcept { return 2; } diff --git a/src/devices/cpu/tms9900/ti990_10.h b/src/devices/cpu/tms9900/ti990_10.h index abab4f27682..4baf8442422 100644 --- a/src/devices/cpu/tms9900/ti990_10.h +++ b/src/devices/cpu/tms9900/ti990_10.h @@ -27,9 +27,9 @@ protected: void device_reset() override; // device_execute_interface overrides - uint32_t execute_min_cycles() const override; - uint32_t execute_max_cycles() const override; - uint32_t execute_input_lines() const override; + uint32_t execute_min_cycles() const noexcept override; + uint32_t execute_max_cycles() const noexcept override; + uint32_t execute_input_lines() const noexcept override; void execute_set_input(int irqline, int state) override; void execute_run() override; diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp index c2ef748a925..17a0ed02b8e 100644 --- a/src/devices/cpu/tms9900/tms9900.cpp +++ b/src/devices/cpu/tms9900/tms9900.cpp @@ -2765,7 +2765,7 @@ void tms99xx_device::alu_int() /* The minimum number of cycles applies to a command like STWP R0. */ -uint32_t tms99xx_device::execute_min_cycles() const +uint32_t tms99xx_device::execute_min_cycles() const noexcept { return 8; } @@ -2774,12 +2774,12 @@ uint32_t tms99xx_device::execute_min_cycles() const The maximum number of cycles applies to a DIV command, depending on the data to be divided, and the mode of adressing. */ -uint32_t tms99xx_device::execute_max_cycles() const +uint32_t tms99xx_device::execute_max_cycles() const noexcept { return 124; } -uint32_t tms99xx_device::execute_input_lines() const +uint32_t tms99xx_device::execute_input_lines() const noexcept { return 2; } diff --git a/src/devices/cpu/tms9900/tms9900.h b/src/devices/cpu/tms9900/tms9900.h index c6dc14dcb47..de808fa0896 100644 --- a/src/devices/cpu/tms9900/tms9900.h +++ b/src/devices/cpu/tms9900/tms9900.h @@ -75,9 +75,9 @@ protected: virtual void resolve_lines(); // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_set_input(int irqline, int state) override; virtual void execute_run() override; diff --git a/src/devices/cpu/tms9900/tms9980a.cpp b/src/devices/cpu/tms9900/tms9980a.cpp index 67212697f0e..d30dda66ae2 100644 --- a/src/devices/cpu/tms9900/tms9980a.cpp +++ b/src/devices/cpu/tms9900/tms9980a.cpp @@ -280,7 +280,7 @@ void tms9980a_device::acquire_instruction() /* The minimum number of cycles applies to a command like STWP R0. */ -uint32_t tms9980a_device::execute_min_cycles() const +uint32_t tms9980a_device::execute_min_cycles() const noexcept { return 12; } @@ -289,12 +289,12 @@ uint32_t tms9980a_device::execute_min_cycles() const The maximum number of cycles applies to a DIV command, depending on the data to be divided, and the mode of adressing. */ -uint32_t tms9980a_device::execute_max_cycles() const +uint32_t tms9980a_device::execute_max_cycles() const noexcept { return 136; } -uint32_t tms9980a_device::execute_input_lines() const +uint32_t tms9980a_device::execute_input_lines() const noexcept { return 8; } diff --git a/src/devices/cpu/tms9900/tms9980a.h b/src/devices/cpu/tms9900/tms9980a.h index e290cd39ac1..49c8dccfb70 100644 --- a/src/devices/cpu/tms9900/tms9980a.h +++ b/src/devices/cpu/tms9900/tms9980a.h @@ -41,14 +41,14 @@ protected: uint16_t read_workspace_register_debug(int reg) override; void write_workspace_register_debug(int reg, uint16_t data) override; - uint32_t execute_min_cycles() const override; - uint32_t execute_max_cycles() const override; - uint32_t execute_input_lines() const override; + uint32_t execute_min_cycles() const noexcept override; + uint32_t execute_max_cycles() const noexcept override; + uint32_t execute_input_lines() const noexcept override; void execute_set_input(int irqline, int state) override; // The clock is internally divided by 4 - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 4 - 1) / 4; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 4); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 4 - 1) / 4; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 4); } virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp index 2c24f7e7697..c192f2a1b53 100644 --- a/src/devices/cpu/tms9900/tms9995.cpp +++ b/src/devices/cpu/tms9900/tms9995.cpp @@ -3481,7 +3481,7 @@ void tms9995_device::alu_int() The minimum number of cycles applies to a command like SETO R0 with R0 in on-chip RAM. */ -uint32_t tms9995_device::execute_min_cycles() const +uint32_t tms9995_device::execute_min_cycles() const noexcept { return 3; } @@ -3490,12 +3490,12 @@ uint32_t tms9995_device::execute_min_cycles() const The maximum number of cycles applies to a STCR command with the destination operand off-chip and 16 bits of transfer. */ -uint32_t tms9995_device::execute_max_cycles() const +uint32_t tms9995_device::execute_max_cycles() const noexcept { return 47; } -uint32_t tms9995_device::execute_input_lines() const +uint32_t tms9995_device::execute_input_lines() const noexcept { return 2; } diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h index 9fc58630675..277e1a72e7b 100644 --- a/src/devices/cpu/tms9900/tms9995.h +++ b/src/devices/cpu/tms9900/tms9995.h @@ -66,9 +66,9 @@ protected: virtual void device_start() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_set_input(int irqline, int state) override; virtual void execute_run() override; @@ -77,8 +77,8 @@ protected: virtual space_config_vector memory_space_config() const override; - uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return clocks / 4.0; } - uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return cycles * 4.0; } + uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return clocks / 4.0; } + uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return cycles * 4.0; } // Variant of the TMS9995 without internal RAM and decrementer bool m_mp9537; diff --git a/src/devices/cpu/ucom4/ucom4.h b/src/devices/cpu/ucom4/ucom4.h index d22255c0257..c22cee94edb 100644 --- a/src/devices/cpu/ucom4/ucom4.h +++ b/src/devices/cpu/ucom4/ucom4.h @@ -88,11 +88,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle - virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return (cycles * 4); } // " - virtual u32 execute_min_cycles() const override { return 1; } - virtual u32 execute_max_cycles() const override { return 2; } - virtual u32 execute_input_lines() const override { return 1; } + virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle + virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * 4); } // " + virtual u32 execute_min_cycles() const noexcept override { return 1; } + virtual u32 execute_max_cycles() const noexcept override { return 2; } + virtual u32 execute_input_lines() const noexcept override { return 1; } virtual void execute_set_input(int line, int state) override; virtual void execute_run() override; diff --git a/src/devices/cpu/unsp/unsp.h b/src/devices/cpu/unsp/unsp.h index 1a42d68ed02..1512d87392a 100644 --- a/src/devices/cpu/unsp/unsp.h +++ b/src/devices/cpu/unsp/unsp.h @@ -118,9 +118,9 @@ protected: virtual void device_stop() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 5; } - virtual uint32_t execute_max_cycles() const override { return 5; } - virtual uint32_t execute_input_lines() const override { return 0; } + virtual uint32_t execute_min_cycles() const noexcept override { return 5; } + virtual uint32_t execute_max_cycles() const noexcept override { return 5; } + virtual uint32_t execute_input_lines() const noexcept override { return 0; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/upd7725/upd7725.cpp b/src/devices/cpu/upd7725/upd7725.cpp index c0e00ab1341..e1564ccffa1 100644 --- a/src/devices/cpu/upd7725/upd7725.cpp +++ b/src/devices/cpu/upd7725/upd7725.cpp @@ -268,7 +268,7 @@ void necdsp_device::state_string_export(const device_state_entry &entry, std::st // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t necdsp_device::execute_min_cycles() const +uint32_t necdsp_device::execute_min_cycles() const noexcept { return 4; } @@ -279,7 +279,7 @@ uint32_t necdsp_device::execute_min_cycles() const // cycles it takes for one instruction to execute //------------------------------------------------- -uint32_t necdsp_device::execute_max_cycles() const +uint32_t necdsp_device::execute_max_cycles() const noexcept { return 4; } @@ -290,7 +290,7 @@ uint32_t necdsp_device::execute_max_cycles() const // input/interrupt lines //------------------------------------------------- -uint32_t necdsp_device::execute_input_lines() const +uint32_t necdsp_device::execute_input_lines() const noexcept { return 3; // TODO: there should be 11: INT, SCK, /SIEN, /SOEN, SI, and /DACK, plus SO, /SORQ and DRQ; for now, just INT, P0, and P1 are enough. } diff --git a/src/devices/cpu/upd7725/upd7725.h b/src/devices/cpu/upd7725/upd7725.h index 0ebb4338f8d..a4fc0ea1ce8 100644 --- a/src/devices/cpu/upd7725/upd7725.h +++ b/src/devices/cpu/upd7725/upd7725.h @@ -48,9 +48,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override; - virtual uint32_t execute_max_cycles() const override; - virtual uint32_t execute_input_lines() const override; + virtual uint32_t execute_min_cycles() const noexcept override; + virtual uint32_t execute_max_cycles() const noexcept override; + virtual uint32_t execute_input_lines() const noexcept override; virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/upd7810/upd7810.h b/src/devices/cpu/upd7810/upd7810.h index 2387a3333eb..6e7a1464fa0 100644 --- a/src/devices/cpu/upd7810/upd7810.h +++ b/src/devices/cpu/upd7810/upd7810.h @@ -131,10 +131,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 40; } - virtual uint32_t execute_input_lines() const override { return 2; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return true; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 40; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return true; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -1393,8 +1393,8 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 4 - 1) / 4; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 4); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 4 - 1) / 4; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 4); } virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; virtual void handle_timers(int cycles) override; virtual void configure_ops() override; diff --git a/src/devices/cpu/v30mz/v30mz.h b/src/devices/cpu/v30mz/v30mz.h index 8a9ebbb2797..cda0dd8cd91 100644 --- a/src/devices/cpu/v30mz/v30mz.h +++ b/src/devices/cpu/v30mz/v30mz.h @@ -34,10 +34,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 80; } - virtual uint32_t execute_input_lines() const override { return 1; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 80; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/v60/v60.h b/src/devices/cpu/v60/v60.h index 47917aa1c94..805028fb0c7 100644 --- a/src/devices/cpu/v60/v60.h +++ b/src/devices/cpu/v60/v60.h @@ -96,10 +96,10 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 1; } - virtual uint32_t execute_input_lines() const override { return 1; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 1; } + virtual uint32_t execute_input_lines() const noexcept override { return 1; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/v810/v810.h b/src/devices/cpu/v810/v810.h index cf43c6cf4d1..4adb04e071e 100644 --- a/src/devices/cpu/v810/v810.h +++ b/src/devices/cpu/v810/v810.h @@ -91,9 +91,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 3; } - virtual uint32_t execute_max_cycles() const override { return 6; } - virtual uint32_t execute_input_lines() const override { return 16; } + virtual uint32_t execute_min_cycles() const noexcept override { return 3; } + virtual uint32_t execute_max_cycles() const noexcept override { return 6; } + virtual uint32_t execute_input_lines() const noexcept override { return 16; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/z180/z180.h b/src/devices/cpu/z180/z180.h index a5b3e3f2a78..ee75a43ca92 100644 --- a/src/devices/cpu/z180/z180.h +++ b/src/devices/cpu/z180/z180.h @@ -117,13 +117,13 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 1; } - virtual uint32_t execute_max_cycles() const override { return 16; } - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 2 - 1) / 2; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); } - virtual uint32_t execute_input_lines() const override { return 5; } - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return 0xff; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 1; } + virtual uint32_t execute_max_cycles() const noexcept override { return 16; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 2 - 1) / 2; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 2); } + virtual uint32_t execute_input_lines() const noexcept override { return 5; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return 0xff; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_burn(int32_t cycles) override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/z8/z8.h b/src/devices/cpu/z8/z8.h index 0411fb4e2bd..a10de7e1dd0 100644 --- a/src/devices/cpu/z8/z8.h +++ b/src/devices/cpu/z8/z8.h @@ -46,12 +46,12 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 6; } - virtual uint32_t execute_max_cycles() const override { return 27; } - virtual uint32_t execute_input_lines() const override { return 4; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return true; } - virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 2 - 1) / 2; } - virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); } + virtual uint32_t execute_min_cycles() const noexcept override { return 6; } + virtual uint32_t execute_max_cycles() const noexcept override { return 27; } + virtual uint32_t execute_input_lines() const noexcept override { return 4; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return true; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 2 - 1) / 2; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 2); } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/z80/z80.h b/src/devices/cpu/z80/z80.h index 55de3771f7a..bbf278f591d 100644 --- a/src/devices/cpu/z80/z80.h +++ b/src/devices/cpu/z80/z80.h @@ -48,11 +48,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 2; } - virtual uint32_t execute_max_cycles() const override { return 16; } - virtual uint32_t execute_input_lines() const override { return 4; } - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return 0xff; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 2; } + virtual uint32_t execute_max_cycles() const noexcept override { return 16; } + virtual uint32_t execute_input_lines() const noexcept override { return 4; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return 0xff; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -298,7 +298,7 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_input_lines() const override { return 7; } + virtual uint32_t execute_input_lines() const noexcept override { return 7; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; diff --git a/src/devices/cpu/z8000/z8000.h b/src/devices/cpu/z8000/z8000.h index 5dc360fa3fd..3073e246a84 100644 --- a/src/devices/cpu/z8000/z8000.h +++ b/src/devices/cpu/z8000/z8000.h @@ -61,11 +61,11 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 2; } - virtual uint32_t execute_max_cycles() const override { return 744; } - virtual uint32_t execute_input_lines() const override { return 2; } - virtual uint32_t execute_default_irq_vector(int inputnum) const override { return 0xff; } - virtual bool execute_input_edge_triggered(int inputnum) const override { return inputnum == INPUT_LINE_NMI; } + virtual uint32_t execute_min_cycles() const noexcept override { return 2; } + virtual uint32_t execute_max_cycles() const noexcept override { return 744; } + virtual uint32_t execute_input_lines() const noexcept override { return 2; } + virtual uint32_t execute_default_irq_vector(int inputnum) const noexcept override { return 0xff; } + virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; |