diff options
author | 2015-12-05 20:32:27 +0100 | |
---|---|---|
committer | 2015-12-05 21:20:53 +0100 | |
commit | 1c4865d66ff88a6891ebdde4580c3d61ee46ffa2 (patch) | |
tree | 268936fc8389b1a2adb8bfc3fa3006f12a4ccc95 /src/devices/cpu/i86 | |
parent | e8516832e941e39fa1db11211249afa9f015e7bb (diff) |
override part 1 (nw)
Diffstat (limited to 'src/devices/cpu/i86')
-rw-r--r-- | src/devices/cpu/i86/i186.h | 28 | ||||
-rw-r--r-- | src/devices/cpu/i86/i86.h | 30 |
2 files changed, 29 insertions, 29 deletions
diff --git a/src/devices/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h index 91eb7cda668..cff4c9f8606 100644 --- a/src/devices/cpu/i86/i186.h +++ b/src/devices/cpu/i86/i186.h @@ -32,25 +32,25 @@ public: DECLARE_WRITE_LINE_MEMBER(int3_w) { external_int(3, state); } // 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 : nullptr ); } + 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 : nullptr ); } protected: // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks / 2); } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 2); } - virtual void execute_run(); - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT8 fetch_op(); - virtual UINT8 fetch(); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks / 2); } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const 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 execute_input_lines() const override { return 1; } + virtual UINT8 fetch_op() override; + virtual UINT8 fetch() override; UINT32 pc() { return m_pc = (m_sregs[CS] << 4) + m_ip; } - virtual UINT8 read_port_byte(UINT16 port); - virtual UINT16 read_port_word(UINT16 port); - virtual void write_port_byte(UINT16 port, UINT8 data); - virtual void write_port_word(UINT16 port, UINT16 data); + virtual UINT8 read_port_byte(UINT16 port) override; + virtual UINT16 read_port_word(UINT16 port) override; + virtual void write_port_byte(UINT16 port, UINT8 data) override; + virtual void write_port_word(UINT16 port, UINT16 data) override; static const UINT8 m_i80186_timing[200]; diff --git a/src/devices/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h index fbf475b97b7..a142d6672f2 100644 --- a/src/devices/cpu/i86/i86.h +++ b/src/devices/cpu/i86/i86.h @@ -113,21 +113,21 @@ protected: enum WREGS { AX=0, CX, DX, BX, SP, BP, SI, DI }; // 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 1; } - virtual UINT32 execute_max_cycles() const { return 50; } - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 50; } + virtual void execute_set_input(int inputnum, int state) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - 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 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; virtual void interrupt(int int_num, int trap = 1); bool common_op(UINT8 op); @@ -345,14 +345,14 @@ public: i8086_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int data_bus_size); // 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 : nullptr ); } + 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 : nullptr ); } protected: - virtual void execute_run(); - virtual void device_start(); - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT8 fetch_op(); - virtual UINT8 fetch(); + virtual void execute_run() override; + virtual void device_start() override; + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT8 fetch_op() override; + virtual UINT8 fetch() override; UINT32 pc() { return m_pc = (m_sregs[CS] << 4) + m_ip; } address_space_config m_program_config; |