From fd39d0938c3454f7a01a98fd90966d0c95c42e1a Mon Sep 17 00:00:00 2001 From: fulivi Date: Wed, 16 Dec 2015 16:03:06 +0100 Subject: [PATCH] hp9845b & hphybrid: added missing "override"s --- src/devices/cpu/hphybrid/hphybrid.h | 50 ++++++++++++++--------------- src/mame/drivers/hp9845.cpp | 4 +-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/devices/cpu/hphybrid/hphybrid.h b/src/devices/cpu/hphybrid/hphybrid.h index 2b59a44120b..6526b87020d 100644 --- a/src/devices/cpu/hphybrid/hphybrid.h +++ b/src/devices/cpu/hphybrid/hphybrid.h @@ -93,15 +93,15 @@ protected: hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname , UINT8 addrwidth); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 6; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual UINT32 execute_default_irq_vector() const { return 0xffff; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 6; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual UINT32 execute_default_irq_vector() const override { return 0xffff; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; UINT16 execute_one(UINT16 opcode); UINT16 execute_one_sub(UINT16 opcode); @@ -109,15 +109,15 @@ protected: virtual UINT16 execute_no_bpc_ioc(UINT16 opcode) = 0; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // Different cases of memory access // See patent @ pg 361 @@ -194,9 +194,9 @@ public: static void set_boot_mode_static(device_t &device, bool mode) { downcast(device).m_boot_mode = mode; } protected: - virtual void device_start(); - virtual void device_reset(); - virtual UINT32 execute_max_cycles() const { return 237; } // FMP 15 + virtual void device_start() override; + virtual void device_reset() override; + virtual UINT32 execute_max_cycles() const override { return 237; } // FMP 15 static UINT8 do_dec_shift_r(UINT8 d1 , UINT64& mantissa); static UINT8 do_dec_shift_l(UINT8 d12 , UINT64& mantissa); @@ -208,11 +208,11 @@ protected: bool do_dec_add(bool carry_in , UINT64& a , UINT64 b); void do_mpy(void); - virtual UINT16 execute_no_bpc_ioc(UINT16 opcode); - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual UINT32 add_mae(aec_cases_t aec_case , UINT16 addr); - virtual UINT16 read_non_common_reg(UINT16 addr); - virtual void write_non_common_reg(UINT16 addr , UINT16 v); + virtual UINT16 execute_no_bpc_ioc(UINT16 opcode) override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual UINT32 add_mae(aec_cases_t aec_case , UINT16 addr) override; + virtual UINT16 read_non_common_reg(UINT16 addr) override; + virtual void write_non_common_reg(UINT16 addr , UINT16 v) override; private: bool m_boot_mode; @@ -232,11 +232,11 @@ public: hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual UINT32 execute_max_cycles() const { return 25; } - virtual UINT16 execute_no_bpc_ioc(UINT16 opcode); - virtual UINT32 add_mae(aec_cases_t aec_case , UINT16 addr); - virtual UINT16 read_non_common_reg(UINT16 addr); - virtual void write_non_common_reg(UINT16 addr , UINT16 v); + virtual UINT32 execute_max_cycles() const override { return 25; } + virtual UINT16 execute_no_bpc_ioc(UINT16 opcode) override; + virtual UINT32 add_mae(aec_cases_t aec_case , UINT16 addr) override; + virtual UINT16 read_non_common_reg(UINT16 addr) override; + virtual void write_non_common_reg(UINT16 addr , UINT16 v) override; }; diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index e1e7bc579e0..5e2d72fb77e 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -82,8 +82,8 @@ public: UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - virtual void machine_start(); - virtual void machine_reset(); + virtual void machine_start() override; + virtual void machine_reset() override; TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer);