diff options
Diffstat (limited to 'src/devices/cpu/cosmac')
-rw-r--r-- | src/devices/cpu/cosmac/cosdasm.cpp | 124 | ||||
-rw-r--r-- | src/devices/cpu/cosmac/cosdasm.h | 43 | ||||
-rw-r--r-- | src/devices/cpu/cosmac/cosmac.cpp | 57 | ||||
-rw-r--r-- | src/devices/cpu/cosmac/cosmac.h | 18 |
4 files changed, 133 insertions, 109 deletions
diff --git a/src/devices/cpu/cosmac/cosdasm.cpp b/src/devices/cpu/cosmac/cosdasm.cpp index 72f039037b5..c818fd2c9a9 100644 --- a/src/devices/cpu/cosmac/cosdasm.cpp +++ b/src/devices/cpu/cosmac/cosdasm.cpp @@ -10,56 +10,62 @@ ***************************************************************************/ #include "emu.h" - -enum -{ - TYPE_1801, - TYPE_1802 -}; +#include "cosdasm.h" #define CDP1801_OPCODE(...) \ util::stream_format(stream, __VA_ARGS__) #define CDP1802_OPCODE(...) \ - if (variant < TYPE_1802) stream << "illegal"; else util::stream_format(stream, __VA_ARGS__) + if (m_variant < TYPE_1802) stream << "illegal"; else util::stream_format(stream, __VA_ARGS__) -static offs_t implied(const uint8_t opcode) +offs_t cosmac_disassembler::implied(const uint8_t opcode) { return opcode & 0x0f; } -static offs_t immediate(const uint8_t **opram) +offs_t cosmac_disassembler::immediate(offs_t &pc, const data_buffer ¶ms) { - return *(*opram)++; + return params.r8(pc++); } -static offs_t short_branch(offs_t pc, const uint8_t **opram) +offs_t cosmac_disassembler::short_branch(offs_t base_pc, offs_t &pc, const data_buffer ¶ms) { - return (pc & 0xff00) | immediate(opram); + return (base_pc & 0xff00) | immediate(pc, params); } -static offs_t long_branch(const uint8_t **opram) +offs_t cosmac_disassembler::long_branch(offs_t &pc, const data_buffer ¶ms) { - return (immediate(opram) << 8) | immediate(opram); + u16 res = params.r16(pc); + pc += 2; + return res; } -static offs_t short_skip(offs_t pc) +offs_t cosmac_disassembler::short_skip(offs_t pc) { return pc + 2; } -static offs_t long_skip(offs_t pc) +offs_t cosmac_disassembler::long_skip(offs_t pc) { return pc + 3; } -static uint32_t disassemble(device_t *device, std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t variant) + +u32 cosmac_disassembler::opcode_alignment() const +{ + return 1; +} + +cosmac_disassembler::cosmac_disassembler(int variant) : m_variant(variant) +{ +} + +offs_t cosmac_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) { - const uint8_t *startram = opram; + offs_t base_pc = pc; uint32_t flags = 0; - opram++; - uint8_t opcode = *oprom++; + uint8_t opcode = opcodes.r8(pc++); switch (opcode) { @@ -73,20 +79,20 @@ static uint32_t disassemble(device_t *device, std::ostream &stream, offs_t pc, c case 0x20: case 0x21: case 0x22: case 0x23: case 0x24: case 0x25: case 0x26: case 0x27: case 0x28: case 0x29: case 0x2a: case 0x2b: case 0x2c: case 0x2d: case 0x2e: case 0x2f: CDP1801_OPCODE("DEC R%01X", implied(opcode)); break; - case 0x30: CDP1801_OPCODE("BR %04X", short_branch(pc, &opram)); break; - case 0x32: CDP1801_OPCODE("BZ %04X", short_branch(pc, &opram)); break; - case 0x33: CDP1801_OPCODE("BDF %04X", short_branch(pc, &opram)); break; - case 0x34: CDP1801_OPCODE("B1 %04X", short_branch(pc, &opram)); break; - case 0x35: CDP1801_OPCODE("B2 %04X", short_branch(pc, &opram)); break; - case 0x36: CDP1801_OPCODE("B3 %04X", short_branch(pc, &opram)); break; - case 0x37: CDP1801_OPCODE("B4 %04X", short_branch(pc, &opram)); break; + case 0x30: CDP1801_OPCODE("BR %04X", short_branch(base_pc, pc, params)); break; + case 0x32: CDP1801_OPCODE("BZ %04X", short_branch(base_pc, pc, params)); break; + case 0x33: CDP1801_OPCODE("BDF %04X", short_branch(base_pc, pc, params)); break; + case 0x34: CDP1801_OPCODE("B1 %04X", short_branch(base_pc, pc, params)); break; + case 0x35: CDP1801_OPCODE("B2 %04X", short_branch(base_pc, pc, params)); break; + case 0x36: CDP1801_OPCODE("B3 %04X", short_branch(base_pc, pc, params)); break; + case 0x37: CDP1801_OPCODE("B4 %04X", short_branch(base_pc, pc, params)); break; case 0x38: CDP1801_OPCODE("SKP %04X", short_skip(pc)); break; - case 0x3a: CDP1801_OPCODE("BNZ %04X", short_branch(pc, &opram)); break; - case 0x3b: CDP1801_OPCODE("BNF %04X", short_branch(pc, &opram)); break; - case 0x3c: CDP1801_OPCODE("BN1 %04X", short_branch(pc, &opram)); break; - case 0x3d: CDP1801_OPCODE("BN2 %04X", short_branch(pc, &opram)); break; - case 0x3e: CDP1801_OPCODE("BN3 %04X", short_branch(pc, &opram)); break; - case 0x3f: CDP1801_OPCODE("BN4 %04X", short_branch(pc, &opram)); break; + case 0x3a: CDP1801_OPCODE("BNZ %04X", short_branch(base_pc, pc, params)); break; + case 0x3b: CDP1801_OPCODE("BNF %04X", short_branch(base_pc, pc, params)); break; + case 0x3c: CDP1801_OPCODE("BN1 %04X", short_branch(base_pc, pc, params)); break; + case 0x3d: CDP1801_OPCODE("BN2 %04X", short_branch(base_pc, pc, params)); break; + case 0x3e: CDP1801_OPCODE("BN3 %04X", short_branch(base_pc, pc, params)); break; + case 0x3f: CDP1801_OPCODE("BN4 %04X", short_branch(base_pc, pc, params)); break; case 0x40: case 0x41: case 0x42: case 0x43: case 0x44: case 0x45: case 0x46: case 0x47: case 0x48: case 0x49: case 0x4a: case 0x4b: case 0x4c: case 0x4d: case 0x4e: case 0x4f: CDP1801_OPCODE("LDA R%01X", implied(opcode)); break; @@ -107,8 +113,8 @@ static uint32_t disassemble(device_t *device, std::ostream &stream, offs_t pc, c case 0x6d: CDP1801_OPCODE("INP 5"); break; case 0x6e: CDP1801_OPCODE("INP 6"); break; case 0x6f: CDP1801_OPCODE("INP 7"); break; - case 0x70: CDP1801_OPCODE("RET"); flags = DASMFLAG_STEP_OUT; break; - case 0x71: CDP1801_OPCODE("DIS"); flags = DASMFLAG_STEP_OUT; break; + case 0x70: CDP1801_OPCODE("RET"); flags = STEP_OUT; break; + case 0x71: CDP1801_OPCODE("DIS"); flags = STEP_OUT; break; case 0x78: CDP1801_OPCODE("SAV"); break; case 0x80: case 0x81: case 0x82: case 0x83: case 0x84: case 0x85: case 0x86: case 0x87: case 0x88: case 0x89: case 0x8a: case 0x8b: case 0x8c: case 0x8d: case 0x8e: case 0x8f: @@ -124,7 +130,7 @@ static uint32_t disassemble(device_t *device, std::ostream &stream, offs_t pc, c CDP1801_OPCODE("PHI R%01X", implied(opcode)); break; case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: case 0xd8: case 0xd9: case 0xda: case 0xdb: case 0xdc: case 0xdd: case 0xde: case 0xdf: - CDP1801_OPCODE("SEP R%01X", implied(opcode)); flags = DASMFLAG_STEP_OVER; break; + CDP1801_OPCODE("SEP R%01X", implied(opcode)); flags = STEP_OVER; break; case 0xe0: case 0xe1: case 0xe2: case 0xe3: case 0xe4: case 0xe5: case 0xe6: case 0xe7: case 0xe8: case 0xe9: case 0xea: case 0xeb: case 0xec: case 0xed: case 0xee: case 0xef: CDP1801_OPCODE("SEX R%01X", implied(opcode)); break; @@ -136,16 +142,16 @@ static uint32_t disassemble(device_t *device, std::ostream &stream, offs_t pc, c case 0xf5: CDP1801_OPCODE("SD"); break; case 0xf6: CDP1801_OPCODE("SHR"); break; case 0xf7: CDP1801_OPCODE("SM"); break; - case 0xf8: CDP1801_OPCODE("LDI #%02X", immediate(&opram)); break; - case 0xf9: CDP1801_OPCODE("ORI #%02X", immediate(&opram)); break; - case 0xfa: CDP1801_OPCODE("ANI #%02X", immediate(&opram)); break; - case 0xfb: CDP1801_OPCODE("XRI #%02X", immediate(&opram)); break; - case 0xfc: CDP1801_OPCODE("ADI #%02X", immediate(&opram)); break; - case 0xfd: CDP1801_OPCODE("SDI #%02X", immediate(&opram)); break; - case 0xff: CDP1801_OPCODE("SMI #%02X", immediate(&opram)); break; + case 0xf8: CDP1801_OPCODE("LDI #%02X", immediate(pc, params)); break; + case 0xf9: CDP1801_OPCODE("ORI #%02X", immediate(pc, params)); break; + case 0xfa: CDP1801_OPCODE("ANI #%02X", immediate(pc, params)); break; + case 0xfb: CDP1801_OPCODE("XRI #%02X", immediate(pc, params)); break; + case 0xfc: CDP1801_OPCODE("ADI #%02X", immediate(pc, params)); break; + case 0xfd: CDP1801_OPCODE("SDI #%02X", immediate(pc, params)); break; + case 0xff: CDP1801_OPCODE("SMI #%02X", immediate(pc, params)); break; // CDP1802 - case 0x31: CDP1802_OPCODE("BQ %04X", short_branch(pc, &opram)); break; - case 0x39: CDP1802_OPCODE("BNQ %04X", short_branch(pc, &opram)); break; + case 0x31: CDP1802_OPCODE("BQ %04X", short_branch(base_pc, pc, params)); break; + case 0x39: CDP1802_OPCODE("BNQ %04X", short_branch(base_pc, pc, params)); break; case 0x60: CDP1802_OPCODE("IRX"); break; case 0x72: CDP1802_OPCODE("LDXA"); break; case 0x73: CDP1802_OPCODE("STXD"); break; @@ -156,14 +162,14 @@ static uint32_t disassemble(device_t *device, std::ostream &stream, offs_t pc, c case 0x79: CDP1802_OPCODE("MARK"); break; case 0x7a: CDP1802_OPCODE("REQ"); break; case 0x7b: CDP1802_OPCODE("SEQ"); break; - case 0x7c: CDP1802_OPCODE("ADCI #%02X", immediate(&opram)); break; - case 0x7d: CDP1802_OPCODE("SDBI #%02X", immediate(&opram)); break; + case 0x7c: CDP1802_OPCODE("ADCI #%02X", immediate(pc, params)); break; + case 0x7d: CDP1802_OPCODE("SDBI #%02X", immediate(pc, params)); break; case 0x7e: CDP1802_OPCODE("SHLC"); break; - case 0x7f: CDP1802_OPCODE("SMBI #%02X", immediate(&opram)); break; - case 0xc0: CDP1802_OPCODE("LBR %04X", long_branch(&opram)); break; - case 0xc1: CDP1802_OPCODE("LBQ %04X", long_branch(&opram)); break; - case 0xc2: CDP1802_OPCODE("LBZ %04X", long_branch(&opram)); break; - case 0xc3: CDP1802_OPCODE("LBDF %04X", long_branch(&opram)); break; + case 0x7f: CDP1802_OPCODE("SMBI #%02X", immediate(pc, params)); break; + case 0xc0: CDP1802_OPCODE("LBR %04X", long_branch(pc, params)); break; + case 0xc1: CDP1802_OPCODE("LBQ %04X", long_branch(pc, params)); break; + case 0xc2: CDP1802_OPCODE("LBZ %04X", long_branch(pc, params)); break; + case 0xc3: CDP1802_OPCODE("LBDF %04X", long_branch(pc, params)); break; case 0xc4: CDP1802_OPCODE("NOP"); break; case 0xc5: CDP1802_OPCODE("LSNQ %04X", long_skip(pc)); break; case 0xc6: CDP1802_OPCODE("LSNZ %04X", long_skip(pc)); break; @@ -181,17 +187,5 @@ static uint32_t disassemble(device_t *device, std::ostream &stream, offs_t pc, c default: CDP1801_OPCODE("illegal"); break; } - return (opram - startram) | flags | DASMFLAG_SUPPORTED; -} - - -CPU_DISASSEMBLE( cdp1801 ) -{ - return disassemble(device, stream, pc, oprom, opram, TYPE_1801); -} - - -CPU_DISASSEMBLE( cdp1802 ) -{ - return disassemble(device, stream, pc, oprom, opram, TYPE_1802); + return (pc - base_pc) | flags | SUPPORTED; } diff --git a/src/devices/cpu/cosmac/cosdasm.h b/src/devices/cpu/cosmac/cosdasm.h new file mode 100644 index 00000000000..38011b792c6 --- /dev/null +++ b/src/devices/cpu/cosmac/cosdasm.h @@ -0,0 +1,43 @@ +// license:BSD-3-Clause +// copyright-holders:Curt Coder +/*************************************************************************** + + cosdasm.c + + Simple RCA COSMAC disassembler. + Written by Curt Coder + +***************************************************************************/ + +#ifndef MAME_CPU_COSMAC_COSDASM_H +#define MAME_CPU_COSMAC_COSDASM_H + +#pragma once + +class cosmac_disassembler : public util::disasm_interface +{ +public: + enum + { + TYPE_1801, + TYPE_1802 + }; + + cosmac_disassembler(int variant); + virtual ~cosmac_disassembler() = default; + + virtual u32 opcode_alignment() const override; + virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) override; + +private: + int m_variant; + + offs_t implied(const uint8_t opcode); + offs_t immediate(offs_t &pc, const data_buffer ¶ms); + offs_t short_branch(offs_t base_pc, offs_t &pc, const data_buffer ¶ms); + offs_t long_branch(offs_t &pc, const data_buffer ¶ms); + offs_t short_skip(offs_t pc); + offs_t long_skip(offs_t pc); +}; + +#endif diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp index feff0141494..60b28dee897 100644 --- a/src/devices/cpu/cosmac/cosmac.cpp +++ b/src/devices/cpu/cosmac/cosmac.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "debugger.h" #include "cosmac.h" +#include "cosdasm.h" #include "coreutil.h" // permit our enums to be saved @@ -324,8 +325,8 @@ cdp1802_device::cdp1802_device(const machine_config &mconfig, const char *tag, d void cosmac_device::device_start() { // resolve callbacks - m_read_wait.resolve_safe(0); - m_read_clear.resolve_safe(0); + m_read_wait.resolve(); + m_read_clear.resolve(); m_read_ef1.resolve(); m_read_ef2.resolve(); m_read_ef3.resolve(); @@ -337,7 +338,7 @@ void cosmac_device::device_start() // get our address spaces m_program = &space(AS_PROGRAM); - m_direct = &m_program->direct(); + m_direct = m_program->direct<0>(); m_io = &space(AS_IO); // register our state for the debugger @@ -479,45 +480,21 @@ void cosmac_device::state_string_export(const device_state_entry &entry, std::st //------------------------------------------------- -// disasm_min_opcode_bytes - return the length -// of the shortest instruction, in bytes -//------------------------------------------------- - -uint32_t cosmac_device::disasm_min_opcode_bytes() const -{ - return 1; -} - - -//------------------------------------------------- -// disasm_max_opcode_bytes - return the length -// of the longest instruction, in bytes -//------------------------------------------------- - -uint32_t cosmac_device::disasm_max_opcode_bytes() const -{ - return 3; -} - - -//------------------------------------------------- -// disasm_disassemble - call the disassembly +// disassemble - call the disassembly // helper function //------------------------------------------------- -offs_t cdp1801_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +util::disasm_interface *cdp1801_device::create_disassembler() { - extern CPU_DISASSEMBLE( cdp1801 ); - return CPU_DISASSEMBLE_NAME( cdp1801 )(this, stream, pc, oprom, opram, options); + return new cosmac_disassembler(cosmac_disassembler::TYPE_1801); } -offs_t cdp1802_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) + +util::disasm_interface *cdp1802_device::create_disassembler() { - extern CPU_DISASSEMBLE( cdp1802 ); - return CPU_DISASSEMBLE_NAME( cdp1802 )(this, stream, pc, oprom, opram, options); + return new cosmac_disassembler(cosmac_disassembler::TYPE_1802); } - //************************************************************************** // INLINE HELPERS //************************************************************************** @@ -648,6 +625,14 @@ void cosmac_device::execute_set_input(int inputnum, int state) case COSMAC_INPUT_LINE_EF4: EF[inputnum - COSMAC_INPUT_LINE_EF1] = state; break; + + case COSMAC_INPUT_LINE_CLEAR: + m_clear = state; + break; + + case COSMAC_INPUT_LINE_WAIT: + m_wait = state; + break; } } @@ -792,11 +777,11 @@ inline void cosmac_device::debug() inline void cosmac_device::sample_wait_clear() { - int wait = m_read_wait(); - int clear = m_read_clear(); + if (!m_read_wait.isnull()) m_wait = m_read_wait(); + if (!m_read_clear.isnull()) m_clear = m_read_clear(); m_pmode = m_mode; - m_mode = (cosmac_mode) ((clear << 1) | wait); + m_mode = (cosmac_mode) ((m_clear << 1) | m_wait); } diff --git a/src/devices/cpu/cosmac/cosmac.h b/src/devices/cpu/cosmac/cosmac.h index 649a3ca6a2b..515dde74d45 100644 --- a/src/devices/cpu/cosmac/cosmac.h +++ b/src/devices/cpu/cosmac/cosmac.h @@ -126,7 +126,9 @@ // input lines enum { - COSMAC_INPUT_LINE_INT = 0, + COSMAC_INPUT_LINE_WAIT = 0, + COSMAC_INPUT_LINE_CLEAR, + COSMAC_INPUT_LINE_INT, COSMAC_INPUT_LINE_DMAIN, COSMAC_INPUT_LINE_DMAOUT, COSMAC_INPUT_LINE_EF1, @@ -205,6 +207,8 @@ public: // public interfaces offs_t get_memory_address(); + DECLARE_WRITE_LINE_MEMBER( wait_w ) { set_input_line(COSMAC_INPUT_LINE_WAIT, state); } + DECLARE_WRITE_LINE_MEMBER( clear_w ) { set_input_line(COSMAC_INPUT_LINE_CLEAR, state); } DECLARE_WRITE_LINE_MEMBER( int_w ) { set_input_line(COSMAC_INPUT_LINE_INT, state); } DECLARE_WRITE_LINE_MEMBER( dma_in_w ) { set_input_line(COSMAC_INPUT_LINE_DMAIN, state); } DECLARE_WRITE_LINE_MEMBER( dma_out_w ) { set_input_line(COSMAC_INPUT_LINE_DMAOUT, state); } @@ -236,10 +240,6 @@ protected: virtual void state_export(const device_state_entry &entry) override; virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; - // device_disasm_interface overrides - virtual uint32_t disasm_min_opcode_bytes() const override; - virtual uint32_t disasm_max_opcode_bytes() const override; - // helpers inline uint8_t read_opcode(offs_t pc); inline uint8_t read_byte(offs_t address); @@ -411,6 +411,8 @@ protected: cosmac_state m_state; // state cosmac_mode m_mode; // control mode cosmac_mode m_pmode; // previous control mode + bool m_wait; + bool m_clear; int m_irq; // interrupt request int m_dmain; // DMA input request int m_dmaout; // DMA output request @@ -435,7 +437,7 @@ protected: int m_icount; address_space * m_program; address_space * m_io; - direct_read_data * m_direct; + direct_read_data<0> *m_direct; // opcode/condition tables typedef void (cosmac_device::*ophandler)(); @@ -453,7 +455,7 @@ public: protected: // device_disasm_interface overrides - virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; + virtual util::disasm_interface *create_disassembler() override; virtual cosmac_device::ophandler get_ophandler(uint8_t opcode) override; @@ -471,7 +473,7 @@ public: protected: // device_disasm_interface overrides - virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; + virtual util::disasm_interface *create_disassembler() override; virtual cosmac_device::ophandler get_ophandler(uint8_t opcode) override; |