diff options
author | 2015-12-03 18:17:25 +0100 | |
---|---|---|
committer | 2015-12-03 18:17:25 +0100 | |
commit | 91605d3f4df9b9fb1490c276053ff274fb728816 (patch) | |
tree | ec89d290d9bfba3b27d4aa28336a5ac9a9d45a7a /src/devices/cpu | |
parent | 5232ca932afe0acc8c3ef2bd3599e04a8c7def69 (diff) |
clang-modernize part 1 (nw)
Diffstat (limited to 'src/devices/cpu')
-rw-r--r-- | src/devices/cpu/drccache.h | 4 | ||||
-rw-r--r-- | src/devices/cpu/drcuml.h | 6 | ||||
-rw-r--r-- | src/devices/cpu/mcs48/mcs48.h | 46 | ||||
-rw-r--r-- | src/devices/cpu/powerpc/ppc.h | 36 | ||||
-rw-r--r-- | src/devices/cpu/uml.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/z80/z80.h | 40 | ||||
-rw-r--r-- | src/devices/cpu/z80/z80daisy.h | 2 |
7 files changed, 68 insertions, 68 deletions
diff --git a/src/devices/cpu/drccache.h b/src/devices/cpu/drccache.h index cf5a41e41dd..129a54e6936 100644 --- a/src/devices/cpu/drccache.h +++ b/src/devices/cpu/drccache.h @@ -53,7 +53,7 @@ public: // pointer checking bool contains_pointer(const void *ptr) const { return ((const drccodeptr)ptr >= m_near && (const drccodeptr)ptr < m_near + m_size); } bool contains_near_pointer(const void *ptr) const { return ((const drccodeptr)ptr >= m_near && (const drccodeptr)ptr < m_neartop); } - bool generating_code() const { return (m_codegen != NULL); } + bool generating_code() const { return (m_codegen != nullptr); } // memory management void flush(); @@ -65,7 +65,7 @@ public: // codegen helpers drccodeptr *begin_codegen(UINT32 reserve_bytes); drccodeptr end_codegen(); - void request_oob_codegen(drc_oob_delegate callback, void *param1 = NULL, void *param2 = NULL); + void request_oob_codegen(drc_oob_delegate callback, void *param1 = nullptr, void *param2 = nullptr); private: // largest block of code that can be generated at once diff --git a/src/devices/cpu/drcuml.h b/src/devices/cpu/drcuml.h index 10652a224cc..cb24396c655 100644 --- a/src/devices/cpu/drcuml.h +++ b/src/devices/cpu/drcuml.h @@ -189,10 +189,10 @@ public: // symbol management void symbol_add(void *base, UINT32 length, const char *name); - const char *symbol_find(void *base, UINT32 *offset = NULL); + const char *symbol_find(void *base, UINT32 *offset = nullptr); // logging - bool logging() const { return (m_umllog != NULL); } + bool logging() const { return (m_umllog != nullptr); } void log_printf(const char *format, ...) ATTR_PRINTF(2,3); void log_flush() { if (logging()) fflush(m_umllog); } bool logging_native() const { return m_beintf.logging(); } @@ -206,7 +206,7 @@ private: // construction/destruction symbol(void *base, UINT32 length, const char *name) - : m_next(NULL), + : m_next(nullptr), m_base(drccodeptr(base)), m_length(length), m_name(name) { } diff --git a/src/devices/cpu/mcs48/mcs48.h b/src/devices/cpu/mcs48/mcs48.h index a8184bcbd34..ed994d1030e 100644 --- a/src/devices/cpu/mcs48/mcs48.h +++ b/src/devices/cpu/mcs48/mcs48.h @@ -130,34 +130,34 @@ public: protected: // 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 UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 15 - 1) / 15; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 15); } - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 3; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual UINT32 execute_default_irq_vector() const { return MCS48_INPUT_IRQ; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 15 - 1) / 15; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 15); } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 3; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual UINT32 execute_default_irq_vector() const override { return MCS48_INPUT_IRQ; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + 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 : ( (spacenum == AS_DATA) ? &m_data_config : NULL ) ); + return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ) ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + 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 1; } - 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 1; } + 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; protected: address_space_config m_program_config; @@ -487,8 +487,8 @@ public: protected: // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 30 - 1) / 30; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 30); } + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 30 - 1) / 30; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 30); } }; class i8022_device : public mcs48_cpu_device @@ -499,8 +499,8 @@ public: protected: // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 30 - 1) / 30; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 30); } + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 30 - 1) / 30; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 30); } }; class i8035_device : public mcs48_cpu_device @@ -599,7 +599,7 @@ public: DECLARE_WRITE8_MEMBER(upi41_master_w); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; TIMER_CALLBACK_MEMBER( master_callback ); }; diff --git a/src/devices/cpu/powerpc/ppc.h b/src/devices/cpu/powerpc/ppc.h index 73bcb0b470b..a683f1f5fd4 100644 --- a/src/devices/cpu/powerpc/ppc.h +++ b/src/devices/cpu/powerpc/ppc.h @@ -249,30 +249,30 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 40; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - 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 40; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // 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 : NULL; } - virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address) override; // device_state_interface overrides - virtual void state_export(const device_state_entry &entry); - virtual void state_import(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_export(const device_state_entry &entry) override; + virtual void state_import(const device_state_entry &entry) override; + virtual 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 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - 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 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; /* exception types */ enum @@ -770,8 +770,8 @@ public: DECLARE_WRITE8_MEMBER( ppc4xx_spu_w ); protected: - virtual UINT32 execute_input_lines() const { return 5; } - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_input_lines() const override { return 5; } + virtual void execute_set_input(int inputnum, int state) override; }; diff --git a/src/devices/cpu/uml.h b/src/devices/cpu/uml.h index 96960bd910e..6086320cf99 100644 --- a/src/devices/cpu/uml.h +++ b/src/devices/cpu/uml.h @@ -409,7 +409,7 @@ namespace uml void set_mapvar(int paramnum, UINT32 value) { assert(paramnum < m_numparams); assert(m_param[paramnum].is_mapvar()); m_param[paramnum] = value; } // misc - const char *disasm(std::string &str, drcuml_state *drcuml = NULL) const; + const char *disasm(std::string &str, drcuml_state *drcuml = nullptr) const; UINT8 input_flags() const; UINT8 output_flags() const; UINT8 modified_flags() const; diff --git a/src/devices/cpu/z80/z80.h b/src/devices/cpu/z80/z80.h index 40cc67222dd..679e7444435 100644 --- a/src/devices/cpu/z80/z80.h +++ b/src/devices/cpu/z80/z80.h @@ -51,29 +51,29 @@ protected: z80_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); // 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 2; } - virtual UINT32 execute_max_cycles() const { return 16; } - virtual UINT32 execute_input_lines() const { return 4; } - virtual UINT32 execute_default_irq_vector() const { return 0xff; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 2; } + virtual UINT32 execute_max_cycles() const override { return 16; } + virtual UINT32 execute_input_lines() const override { return 4; } + virtual UINT32 execute_default_irq_vector() const override { return 0xff; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual 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 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - 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 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; #undef PROTOTYPES #define PROTOTYPES(prefix) \ @@ -302,13 +302,13 @@ public: protected: // 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_input_lines() const { return 7; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_input_lines() const override { return 7; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; void take_interrupt_nsc800(); UINT8 m_nsc800_irq_state[4]; /* state of NSC800 restart interrupts A, B, C */ diff --git a/src/devices/cpu/z80/z80daisy.h b/src/devices/cpu/z80/z80daisy.h index b4651649a20..258df6cd017 100644 --- a/src/devices/cpu/z80/z80daisy.h +++ b/src/devices/cpu/z80/z80daisy.h @@ -64,7 +64,7 @@ public: z80_daisy_chain(); void init(device_t *cpudevice, const z80_daisy_config *daisy); - bool present() const { return (m_daisy_list != NULL); } + bool present() const { return (m_daisy_list != nullptr); } void reset(); int update_irq_state(); |