diff options
Diffstat (limited to 'src/devices/cpu/apexc/apexc.h')
-rw-r--r-- | src/devices/cpu/apexc/apexc.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/cpu/apexc/apexc.h b/src/devices/cpu/apexc/apexc.h index e5634c3dcb1..9f84e6f073e 100644 --- a/src/devices/cpu/apexc/apexc.h +++ b/src/devices/cpu/apexc/apexc.h @@ -25,7 +25,7 @@ class apexc_cpu_device : public cpu_device { public: // construction/destruction - apexc_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apexc_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: // device-level overrides @@ -33,9 +33,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const override { return 2; } - virtual UINT32 execute_max_cycles() const override { return 75; } - virtual UINT32 execute_input_lines() const override { return 0; } + 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 void execute_run() override; // device_memory_interface overrides @@ -47,44 +47,44 @@ protected: virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; // device_disasm_interface overrides - 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; + virtual uint32_t disasm_min_opcode_bytes() const override { return 4; } + virtual uint32_t disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; - inline UINT32 apexc_readmem(UINT32 address) { return m_program->read_dword((address)<<2); } - inline void apexc_writemem(UINT32 address, UINT32 data) { m_program->write_dword((address)<<2, (data)); } - inline void apexc_writemem_masked(UINT32 address, UINT32 data, UINT32 mask) { apexc_writemem((address), (apexc_readmem(address) & ~(mask)) | ((data) & (mask))); } + inline uint32_t apexc_readmem(uint32_t address) { return m_program->read_dword((address)<<2); } + inline void apexc_writemem(uint32_t address, uint32_t data) { m_program->write_dword((address)<<2, (data)); } + inline void apexc_writemem_masked(uint32_t address, uint32_t data, uint32_t mask) { apexc_writemem((address), (apexc_readmem(address) & ~(mask)) | ((data) & (mask))); } - UINT32 effective_address(UINT32 address); - UINT32 word_read(UINT32 address, UINT32 special); - void word_write(UINT32 address, UINT32 data, UINT32 mask); - UINT8 papertape_read(); - void papertape_punch(UINT8 data); + uint32_t effective_address(uint32_t address); + uint32_t word_read(uint32_t address, uint32_t special); + void word_write(uint32_t address, uint32_t data, uint32_t mask); + uint8_t papertape_read(); + void papertape_punch(uint8_t data); - UINT32 load_ml(UINT32 address, UINT32 vector); + uint32_t load_ml(uint32_t address, uint32_t vector); void execute(); address_space_config m_program_config; address_space_config m_io_config; - UINT32 m_a; /* accumulator */ - UINT32 m_r; /* register */ - UINT32 m_cr; /* control register (i.e. instruction register) */ + uint32_t m_a; /* accumulator */ + uint32_t m_r; /* register */ + uint32_t m_cr; /* control register (i.e. instruction register) */ int m_ml; /* memory location (current track in working store, and requested word position within track) (10 bits) */ int m_working_store; /* current working store (group of 16 tracks) (1-15) */ int m_current_word; /* current word position within track (0-31) */ int m_running; /* 1 flag: */ /* running: flag implied by the existence of the stop instruction */ - UINT32 m_pc; /* address of next instruction for the disassembler */ + uint32_t m_pc; /* address of next instruction for the disassembler */ address_space *m_program; address_space *m_io; int m_icount; // For state - UINT32 m_ml_full; - UINT32 m_genpc; + uint32_t m_ml_full; + uint32_t m_genpc; }; |