From a72ac7714185b772dbee57fc0726e377d3e4c8c0 Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 28 Nov 2017 00:05:29 +0100 Subject: [PATCH] tms1000 dasm: put simple getters in h file. only tms1100 and derivatives have chapter(paged2) bits (nw) --- src/devices/cpu/tms1000/tms1k_dasm.cpp | 20 -------------------- src/devices/cpu/tms1000/tms1k_dasm.h | 10 ++++++---- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/devices/cpu/tms1000/tms1k_dasm.cpp b/src/devices/cpu/tms1000/tms1k_dasm.cpp index 65ea2b671ce..1cd05a57ab3 100644 --- a/src/devices/cpu/tms1000/tms1k_dasm.cpp +++ b/src/devices/cpu/tms1000/tms1k_dasm.cpp @@ -248,26 +248,6 @@ tms1000_base_disassembler::tms1000_base_disassembler(const u8 *lut_mnemonic, boo { } -u32 tms1000_base_disassembler::opcode_alignment() const -{ - return 1; -} - -u32 tms1000_base_disassembler::interface_flags() const -{ - return NONLINEAR_PC | PAGED2LEVEL; -} - -u32 tms1000_base_disassembler::page_address_bits() const -{ - return m_pc_bits; -} - -u32 tms1000_base_disassembler::page2_address_bits() const -{ - return 4; -} - offs_t tms1000_base_disassembler::pc_linear_to_real(offs_t pc) const { switch(m_pc_bits) { diff --git a/src/devices/cpu/tms1000/tms1k_dasm.h b/src/devices/cpu/tms1000/tms1k_dasm.h index 8ffad64272a..64e9e6f5082 100644 --- a/src/devices/cpu/tms1000/tms1k_dasm.h +++ b/src/devices/cpu/tms1000/tms1k_dasm.h @@ -17,10 +17,9 @@ public: tms1000_base_disassembler(const u8 *lut_mnemonic, bool opcode_9bits, int pc_bits); virtual ~tms1000_base_disassembler() = default; - virtual u32 opcode_alignment() const override; - virtual u32 interface_flags() const override; - virtual u32 page_address_bits() const override; - virtual u32 page2_address_bits() const override; + virtual u32 opcode_alignment() const override { return 1; } + virtual u32 interface_flags() const override { return NONLINEAR_PC | PAGED; } + virtual u32 page_address_bits() const override { return m_pc_bits; } virtual offs_t pc_linear_to_real(offs_t pc) const override; virtual offs_t pc_real_to_linear(offs_t pc) const override; virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) override; @@ -71,6 +70,9 @@ public: tms1100_disassembler(); virtual ~tms1100_disassembler() = default; + virtual u32 interface_flags() const override { return NONLINEAR_PC | PAGED2LEVEL; } + virtual u32 page2_address_bits() const override { return 4; } + protected: static const u8 tms1100_mnemonic[256]; };