summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2019-04-23 22:59:19 +0200
committer hap <happppp@users.noreply.github.com>2019-04-23 22:59:35 +0200
commitf22547f4357aec4e2bfc06748a2c54015eb21952 (patch)
tree6c6053e12eaa26a06a48d4282e7efbbdf4f6f2ec
parenta2f81534112ee672fb32b854b5708b115bebcf59 (diff)
disasm: init lfsr pc tables in constructor (nw)
-rw-r--r--src/devices/cpu/hmcs40/hmcs40d.cpp66
-rw-r--r--src/devices/cpu/hmcs40/hmcs40d.h15
-rw-r--r--src/devices/cpu/sm510/sm510d.cpp103
-rw-r--r--src/devices/cpu/sm510/sm510d.h16
-rw-r--r--src/devices/cpu/tms1000/tms1k_dasm.cpp143
-rw-r--r--src/devices/cpu/tms1000/tms1k_dasm.h3
6 files changed, 145 insertions, 201 deletions
diff --git a/src/devices/cpu/hmcs40/hmcs40d.cpp b/src/devices/cpu/hmcs40/hmcs40d.cpp
index 96e4b6399ea..d845b7545ae 100644
--- a/src/devices/cpu/hmcs40/hmcs40d.cpp
+++ b/src/devices/cpu/hmcs40/hmcs40d.cpp
@@ -11,6 +11,33 @@
#include "emu.h"
#include "hmcs40d.h"
+// constructor
+
+hmcs40_disassembler::hmcs40_disassembler()
+{
+ // init lfsr pc lut
+ for (u32 i = 0, pc = 0; i < 0x40; i++)
+ {
+ m_l2r[i] = pc;
+ m_r2l[pc] = i;
+
+ // see hmcs40_cpu_device::increment_pc()
+ u32 mask = 0x3f;
+ u32 low = pc & mask;
+ u32 fb = (low << 1 & 0x20) == (low & 0x20);
+
+ if (low == (mask >> 1))
+ fb = 1;
+ else if (low == mask)
+ fb = 0;
+
+ pc = (pc & ~mask) | ((pc << 1 | fb) & mask);
+ }
+}
+
+
+// common lookup tables
+
const char *const hmcs40_disassembler::s_mnemonics[] =
{
"?",
@@ -152,6 +179,7 @@ const u8 hmcs40_disassembler::hmcs40_mnemonic[0x400] =
};
+// disasm
offs_t hmcs40_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params)
{
@@ -197,41 +225,3 @@ offs_t hmcs40_disassembler::disassemble(std::ostream &stream, offs_t pc, const d
return 1 | s_flags[instr] | SUPPORTED;
}
-
-u32 hmcs40_disassembler::opcode_alignment() const
-{
- return 1;
-}
-
-u32 hmcs40_disassembler::interface_flags() const
-{
- return NONLINEAR_PC | PAGED;
-}
-
-u32 hmcs40_disassembler::page_address_bits() const
-{
- return 6;
-}
-
-offs_t hmcs40_disassembler::pc_linear_to_real(offs_t pc) const
-{
- static const u8 l2r[64] = {
- 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x3e, 0x3d, 0x3b, 0x37, 0x2f, 0x1e, 0x3c, 0x39, 0x33,
- 0x27, 0x0e, 0x1d, 0x3a, 0x35, 0x2b, 0x16, 0x2c, 0x18, 0x30, 0x21, 0x02, 0x05, 0x0b, 0x17, 0x2e,
- 0x1c, 0x38, 0x31, 0x23, 0x06, 0x0d, 0x1b, 0x36, 0x2d, 0x1a, 0x34, 0x29, 0x12, 0x24, 0x08, 0x11,
- 0x22, 0x04, 0x09, 0x13, 0x26, 0x0c, 0x19, 0x32, 0x25, 0x0a, 0x15, 0x2a, 0x14, 0x28, 0x10, 0x20,
- };
- return (pc & ~0x3f) | l2r[pc & 0x3f];
-}
-
-offs_t hmcs40_disassembler::pc_real_to_linear(offs_t pc) const
-{
- static const u8 r2l[64] = {
- 0x00, 0x01, 0x1b, 0x02, 0x31, 0x1c, 0x24, 0x03, 0x2e, 0x32, 0x39, 0x1d, 0x35, 0x25, 0x11, 0x04,
- 0x3e, 0x2f, 0x2c, 0x33, 0x3c, 0x3a, 0x16, 0x1e, 0x18, 0x36, 0x29, 0x26, 0x20, 0x12, 0x0c, 0x05,
- 0x3f, 0x1a, 0x30, 0x23, 0x2d, 0x38, 0x34, 0x10, 0x3d, 0x2b, 0x3b, 0x15, 0x17, 0x28, 0x1f, 0x0b,
- 0x19, 0x22, 0x37, 0x0f, 0x2a, 0x14, 0x27, 0x0a, 0x21, 0x0e, 0x13, 0x09, 0x0d, 0x08, 0x07, 0x06,
- };
- return (pc & ~0x3f) | r2l[pc & 0x3f];
-}
-
diff --git a/src/devices/cpu/hmcs40/hmcs40d.h b/src/devices/cpu/hmcs40/hmcs40d.h
index 04f534bdc4c..0da5f51d3d9 100644
--- a/src/devices/cpu/hmcs40/hmcs40d.h
+++ b/src/devices/cpu/hmcs40/hmcs40d.h
@@ -14,14 +14,14 @@
class hmcs40_disassembler : public util::disasm_interface
{
public:
- hmcs40_disassembler() = default;
+ hmcs40_disassembler();
virtual ~hmcs40_disassembler() = default;
- virtual u32 opcode_alignment() const override;
- virtual u32 interface_flags() const override;
- virtual u32 page_address_bits() const override;
- 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 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 6; }
+ virtual offs_t pc_linear_to_real(offs_t pc) const override { return (pc & ~0x3f) | m_l2r[pc & 0x3f]; }
+ virtual offs_t pc_real_to_linear(offs_t pc) const override { return (pc & ~0x3f) | m_r2l[pc & 0x3f]; }
virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;
private:
@@ -45,6 +45,9 @@ private:
static const s8 s_bits[];
static const u32 s_flags[];
static const u8 hmcs40_mnemonic[0x400];
+
+ u8 m_l2r[0x40];
+ u8 m_r2l[0x40];
};
#endif
diff --git a/src/devices/cpu/sm510/sm510d.cpp b/src/devices/cpu/sm510/sm510d.cpp
index 5f107babd4c..2525d5a3670 100644
--- a/src/devices/cpu/sm510/sm510d.cpp
+++ b/src/devices/cpu/sm510/sm510d.cpp
@@ -9,6 +9,40 @@
#include "emu.h"
#include "sm510d.h"
+// constructor
+
+sm510_common_disassembler::sm510_common_disassembler()
+{
+ // init 6-bit lfsr pc lut
+ for (u32 i = 0, pc = 0; i < 0x3f; i++)
+ {
+ m_l2r6[i] = pc;
+ m_r2l6[pc] = i;
+ pc = increment_pc(pc, 6);
+ }
+
+ m_l2r6[0x3f] = 0x3f;
+ m_r2l6[0x3f] = 0x3f;
+
+ // init 7-bit lfsr pc lut
+ for (u32 i = 0, pc = 0; i < 0x7f; i++)
+ {
+ m_l2r7[i] = pc;
+ m_r2l7[pc] = i;
+ pc = increment_pc(pc, 7);
+ }
+
+ m_l2r7[0x7f] = 0x7f;
+ m_r2l7[0x7f] = 0x7f;
+}
+
+offs_t sm510_common_disassembler::increment_pc(offs_t pc, u8 pclen)
+{
+ u32 feed = ((pc >> 1 ^ pc) & 1) ? 0 : (1 << (pclen - 1));
+ u32 mask = (1 << pclen) - 1;
+ return feed | (pc >> 1 & (mask >> 1)) | (pc & ~mask);
+}
+
// common lookup tables
@@ -127,18 +161,7 @@ offs_t sm510_common_disassembler::common_disasm(const u8 *lut_mnemonic, const u8
u16 param = mask;
if (bits >= 8)
{
- if (pclen == 6)
- {
- int feed = ((pc >> 1 ^ pc) & 1) ? 0 : 0x20;
- pc = feed | (pc >> 1 & 0x1f) | (pc & ~0x3f);
- }
- else if (pclen == 7)
- {
- int feed = ((pc >> 1 ^ pc) & 1) ? 0 : 0x40;
- pc = feed | (pc >> 1 & 0x3f) | (pc & ~0x7f);
- }
- else
- abort();
+ pc = increment_pc(pc, pclen);
param = params.r8(pc);
len++;
}
@@ -391,63 +414,7 @@ const u8 sm590_disassembler::sm590_mnemonic[0x100] =
mTR7, mTR7, mTR7, mTR7, mTR7, mTR7, mTR7, mTR7, mTR7, mTR7, mTR7, mTR7, mTR7, mTR7, mTR7, mTR7 // F
};
-
offs_t sm590_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params)
{
return common_disasm(sm590_mnemonic, nullptr, stream, pc, opcodes, params, 7);
}
-
-
-// Sarayan's little helpers
-
-offs_t sm510_common_disassembler::pc_linear_to_real(offs_t pc) const
-{
- static const u8 l2r[64] = {
- 0x00, 0x20, 0x30, 0x38, 0x3c, 0x3e, 0x1f, 0x2f, 0x37, 0x3b, 0x3d, 0x1e, 0x0f, 0x27, 0x33, 0x39,
- 0x1c, 0x2e, 0x17, 0x2b, 0x35, 0x1a, 0x0d, 0x06, 0x03, 0x21, 0x10, 0x28, 0x34, 0x3a, 0x1d, 0x0e,
- 0x07, 0x23, 0x31, 0x18, 0x2c, 0x36, 0x1b, 0x2d, 0x16, 0x0b, 0x25, 0x12, 0x09, 0x04, 0x22, 0x11,
- 0x08, 0x24, 0x32, 0x19, 0x0c, 0x26, 0x13, 0x29, 0x14, 0x2a, 0x15, 0x0a, 0x05, 0x02, 0x01, 0x3f,
- };
- return (pc & ~0x3f) | l2r[pc & 0x3f];
-}
-
-offs_t sm510_common_disassembler::pc_real_to_linear(offs_t pc) const
-{
- static const u8 r2l[64] = {
- 0x00, 0x3e, 0x3d, 0x18, 0x2d, 0x3c, 0x17, 0x20, 0x30, 0x2c, 0x3b, 0x29, 0x34, 0x16, 0x1f, 0x0c,
- 0x1a, 0x2f, 0x2b, 0x36, 0x38, 0x3a, 0x28, 0x12, 0x23, 0x33, 0x15, 0x26, 0x10, 0x1e, 0x0b, 0x06,
- 0x01, 0x19, 0x2e, 0x21, 0x31, 0x2a, 0x35, 0x0d, 0x1b, 0x37, 0x39, 0x13, 0x24, 0x27, 0x11, 0x07,
- 0x02, 0x22, 0x32, 0x0e, 0x1c, 0x14, 0x25, 0x08, 0x03, 0x0f, 0x1d, 0x09, 0x04, 0x0a, 0x05, 0x3f,
- };
- return (pc & ~0x3f) | r2l[pc & 0x3f];
-}
-
-offs_t sm590_disassembler::pc_linear_to_real(offs_t pc) const
-{
- static const u8 l2r[128] = {
- 0x00, 0x40, 0x60, 0x70, 0x78, 0x7c, 0x7e, 0x3f, 0x5f, 0x6f, 0x77, 0x7b, 0x7d, 0x3e, 0x1f, 0x4f,
- 0x67, 0x73, 0x79, 0x3c, 0x5e, 0x2f, 0x57, 0x6b, 0x75, 0x3a, 0x1d, 0x0e, 0x07, 0x43, 0x61, 0x30,
- 0x58, 0x6c, 0x76, 0x3b, 0x5d, 0x2e, 0x17, 0x4b, 0x65, 0x32, 0x19, 0x0c, 0x46, 0x23, 0x51, 0x28,
- 0x54, 0x6a, 0x35, 0x1a, 0x0d, 0x06, 0x03, 0x41, 0x20, 0x50, 0x68, 0x74, 0x7a, 0x3d, 0x1e, 0x0f,
- 0x47, 0x63, 0x71, 0x38, 0x5c, 0x6e, 0x37, 0x5b, 0x6d, 0x36, 0x1b, 0x4d, 0x26, 0x13, 0x49, 0x24,
- 0x52, 0x29, 0x14, 0x4a, 0x25, 0x12, 0x09, 0x04, 0x42, 0x21, 0x10, 0x48, 0x64, 0x72, 0x39, 0x1c,
- 0x4e, 0x27, 0x53, 0x69, 0x34, 0x5a, 0x2d, 0x16, 0x0b, 0x45, 0x22, 0x11, 0x08, 0x44, 0x62, 0x31,
- 0x18, 0x4c, 0x66, 0x33, 0x59, 0x2c, 0x56, 0x2b, 0x55, 0x2a, 0x15, 0x0a, 0x05, 0x02, 0x01, 0x7f,
- };
- return (pc & ~0x7f) | l2r[pc & 0x7f];
-}
-
-offs_t sm590_disassembler::pc_real_to_linear(offs_t pc) const
-{
- static const u8 r2l[128] = {
- 0x00, 0x7e, 0x7d, 0x36, 0x57, 0x7c, 0x35, 0x1c, 0x6c, 0x56, 0x7b, 0x68, 0x2b, 0x34, 0x1b, 0x3f,
- 0x5a, 0x6b, 0x55, 0x4d, 0x52, 0x7a, 0x67, 0x26, 0x70, 0x2a, 0x33, 0x4a, 0x5f, 0x1a, 0x3e, 0x0e,
- 0x38, 0x59, 0x6a, 0x2d, 0x4f, 0x54, 0x4c, 0x61, 0x2f, 0x51, 0x79, 0x77, 0x75, 0x66, 0x25, 0x15,
- 0x1f, 0x6f, 0x29, 0x73, 0x64, 0x32, 0x49, 0x46, 0x43, 0x5e, 0x19, 0x23, 0x13, 0x3d, 0x0d, 0x07,
- 0x01, 0x37, 0x58, 0x1d, 0x6d, 0x69, 0x2c, 0x40, 0x5b, 0x4e, 0x53, 0x27, 0x71, 0x4b, 0x60, 0x0f,
- 0x39, 0x2e, 0x50, 0x62, 0x30, 0x78, 0x76, 0x16, 0x20, 0x74, 0x65, 0x47, 0x44, 0x24, 0x14, 0x08,
- 0x02, 0x1e, 0x6e, 0x41, 0x5c, 0x28, 0x72, 0x10, 0x3a, 0x63, 0x31, 0x17, 0x21, 0x48, 0x45, 0x09,
- 0x03, 0x42, 0x5d, 0x11, 0x3b, 0x18, 0x22, 0x0a, 0x04, 0x12, 0x3c, 0x0b, 0x05, 0x0c, 0x06, 0x7f,
- };
- return (pc & ~0x7f) | r2l[pc & 0x7f];
-}
diff --git a/src/devices/cpu/sm510/sm510d.h b/src/devices/cpu/sm510/sm510d.h
index 660471ad640..258d8205617 100644
--- a/src/devices/cpu/sm510/sm510d.h
+++ b/src/devices/cpu/sm510/sm510d.h
@@ -14,15 +14,15 @@
class sm510_common_disassembler : public util::disasm_interface
{
public:
- sm510_common_disassembler() = default;
+ sm510_common_disassembler();
virtual ~sm510_common_disassembler() = default;
virtual u32 opcode_alignment() const override { return 1; }
virtual u32 interface_flags() const override { return NONLINEAR_PC | PAGED2LEVEL; }
virtual u32 page_address_bits() const override { return 6; }
virtual u32 page2_address_bits() const override { return 4; }
- 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 pc_linear_to_real(offs_t pc) const override { return (pc & ~0x3f) | m_l2r6[pc & 0x3f]; }
+ virtual offs_t pc_real_to_linear(offs_t pc) const override { return (pc & ~0x3f) | m_r2l6[pc & 0x3f]; }
protected:
enum e_mnemonics
@@ -62,6 +62,12 @@ protected:
static const u8 s_bits[];
static const u32 s_flags[];
+ u8 m_l2r6[0x40];
+ u8 m_r2l6[0x40];
+ u8 m_l2r7[0x80];
+ u8 m_r2l7[0x80];
+
+ offs_t increment_pc(offs_t pc, u8 pclen);
offs_t common_disasm(const u8 *lut_mnemonic, const u8 *lut_extended, std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params, const u8 pclen);
};
@@ -141,8 +147,8 @@ public:
virtual u32 page_address_bits() const override { return 7; }
virtual u32 page2_address_bits() const override { return 2; }
- 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 pc_linear_to_real(offs_t pc) const override { return (pc & ~0x7f) | m_l2r7[pc & 0x7f]; }
+ virtual offs_t pc_real_to_linear(offs_t pc) const override { return (pc & ~0x7f) | m_r2l7[pc & 0x7f]; }
private:
static const u8 sm590_mnemonic[0x100];
diff --git a/src/devices/cpu/tms1000/tms1k_dasm.cpp b/src/devices/cpu/tms1000/tms1k_dasm.cpp
index 1cd05a57ab3..af1af973697 100644
--- a/src/devices/cpu/tms1000/tms1k_dasm.cpp
+++ b/src/devices/cpu/tms1000/tms1k_dasm.cpp
@@ -9,6 +9,65 @@
#include "emu.h"
#include "tms1k_dasm.h"
+// constructor
+
+tms1000_base_disassembler::tms1000_base_disassembler(const u8 *lut_mnemonic, bool opcode_9bits, int pc_bits) :
+ m_lut_mnemonic(lut_mnemonic),
+ m_opcode_9bits(opcode_9bits),
+ m_pc_bits(pc_bits)
+{
+ // init lfsr pc lut
+ const u32 len = 1 << pc_bits;
+ m_l2r = std::make_unique<u8[]>(len);
+ m_r2l = std::make_unique<u8[]>(len);
+
+ for (u32 i = 0, pc = 0; i < len; i++)
+ {
+ m_l2r[i] = pc;
+ m_r2l[pc] = i;
+
+ // see tms1k_base_device::next_pc()
+ u32 mask = (1 << pc_bits) - 1;
+ u32 high = 1 << (pc_bits - 1);
+ u32 fb = (pc << 1 & high) == (pc & high);
+
+ if (pc == (mask >> 1))
+ fb = 1;
+ else if (pc == mask)
+ fb = 0;
+
+ pc = (pc << 1 | fb) & mask;
+ }
+}
+
+tms1000_disassembler::tms1000_disassembler() : tms1000_base_disassembler(tms1000_mnemonic, false, 6)
+{ }
+
+tms1100_disassembler::tms1100_disassembler() : tms1000_base_disassembler(tms1100_mnemonic, false, 6)
+{ }
+
+tms0980_disassembler::tms0980_disassembler() : tms1000_base_disassembler(tms0980_mnemonic, true, 7)
+{ }
+
+tp0320_disassembler::tp0320_disassembler() : tms1000_base_disassembler(tp0320_mnemonic, true, 7)
+{ }
+
+
+offs_t tms1000_base_disassembler::pc_linear_to_real(offs_t pc) const
+{
+ const u32 mask = (1 << m_pc_bits) - 1;
+ return (pc & ~mask) | m_l2r[pc & mask];
+}
+
+offs_t tms1000_base_disassembler::pc_real_to_linear(offs_t pc) const
+{
+ const u32 mask = (1 << m_pc_bits) - 1;
+ return (pc & ~mask) | m_r2l[pc & mask];
+}
+
+
+// common lookup tables
+
const char *const tms1000_base_disassembler::s_mnemonic[] =
{
"?",
@@ -46,7 +105,6 @@ const u8 tms1000_base_disassembler::s_addressing[] =
};
-
// opcode luts
const u8 tms1000_disassembler::tms1000_mnemonic[256] =
@@ -72,7 +130,6 @@ const u8 tms1000_disassembler::tms1000_mnemonic[256] =
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
};
-
const u8 tms1100_disassembler::tms1100_mnemonic[256] =
{
/* 0x00 */
@@ -96,7 +153,6 @@ const u8 tms1100_disassembler::tms1100_mnemonic[256] =
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
};
-
const u8 tms0980_disassembler::tms0980_mnemonic[512] =
{
/* 0x000 */
@@ -138,7 +194,6 @@ const u8 tms0980_disassembler::tms0980_mnemonic[512] =
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
};
-
const u8 tp0320_disassembler::tp0320_mnemonic[512] =
{
/* 0x000 */
@@ -181,7 +236,6 @@ const u8 tp0320_disassembler::tp0320_mnemonic[512] =
};
-
// disasm
const u8 tms1000_base_disassembler::i2_value[4] =
@@ -227,82 +281,3 @@ offs_t tms1000_base_disassembler::disassemble(std::ostream &stream, offs_t pc, c
return 1 | s_flags[instr] | SUPPORTED;
}
-
-tms1000_disassembler::tms1000_disassembler() : tms1000_base_disassembler(tms1000_mnemonic, false, 6)
-{
-}
-
-tms1100_disassembler::tms1100_disassembler() : tms1000_base_disassembler(tms1100_mnemonic, false, 6)
-{
-}
-
-tms0980_disassembler::tms0980_disassembler() : tms1000_base_disassembler(tms0980_mnemonic, true, 7)
-{
-}
-
-tp0320_disassembler::tp0320_disassembler() : tms1000_base_disassembler(tp0320_mnemonic, true, 7)
-{
-}
-
-tms1000_base_disassembler::tms1000_base_disassembler(const u8 *lut_mnemonic, bool opcode_9bits, int pc_bits) : m_lut_mnemonic(lut_mnemonic), m_opcode_9bits(opcode_9bits), m_pc_bits(pc_bits)
-{
-}
-
-offs_t tms1000_base_disassembler::pc_linear_to_real(offs_t pc) const
-{
- switch(m_pc_bits) {
- case 6: {
- static const u8 l2r6[64] = {
- 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x3e, 0x3d, 0x3b, 0x37, 0x2f, 0x1e, 0x3c, 0x39, 0x33,
- 0x27, 0x0e, 0x1d, 0x3a, 0x35, 0x2b, 0x16, 0x2c, 0x18, 0x30, 0x21, 0x02, 0x05, 0x0b, 0x17, 0x2e,
- 0x1c, 0x38, 0x31, 0x23, 0x06, 0x0d, 0x1b, 0x36, 0x2d, 0x1a, 0x34, 0x29, 0x12, 0x24, 0x08, 0x11,
- 0x22, 0x04, 0x09, 0x13, 0x26, 0x0c, 0x19, 0x32, 0x25, 0x0a, 0x15, 0x2a, 0x14, 0x28, 0x10, 0x20,
- };
- return (pc & ~0x3f) | l2r6[pc & 0x3f];
- }
- case 7: {
- static const u8 l2r7[128] = {
- 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0x7e, 0x7d, 0x7b, 0x77, 0x6f, 0x5f, 0x3e, 0x7c,
- 0x79, 0x73, 0x67, 0x4f, 0x1e, 0x3d, 0x7a, 0x75, 0x6b, 0x57, 0x2e, 0x5c, 0x38, 0x70, 0x61, 0x43,
- 0x06, 0x0d, 0x1b, 0x37, 0x6e, 0x5d, 0x3a, 0x74, 0x69, 0x53, 0x26, 0x4c, 0x18, 0x31, 0x62, 0x45,
- 0x0a, 0x15, 0x2b, 0x56, 0x2c, 0x58, 0x30, 0x60, 0x41, 0x02, 0x05, 0x0b, 0x17, 0x2f, 0x5e, 0x3c,
- 0x78, 0x71, 0x63, 0x47, 0x0e, 0x1d, 0x3b, 0x76, 0x6d, 0x5b, 0x36, 0x6c, 0x59, 0x32, 0x64, 0x49,
- 0x12, 0x25, 0x4a, 0x14, 0x29, 0x52, 0x24, 0x48, 0x10, 0x21, 0x42, 0x04, 0x09, 0x13, 0x27, 0x4e,
- 0x1c, 0x39, 0x72, 0x65, 0x4b, 0x16, 0x2d, 0x5a, 0x34, 0x68, 0x51, 0x22, 0x44, 0x08, 0x11, 0x23,
- 0x46, 0x0c, 0x19, 0x33, 0x66, 0x4d, 0x1a, 0x35, 0x6a, 0x55, 0x2a, 0x54, 0x28, 0x50, 0x20, 0x40,
- };
- return (pc & ~0x7f) | l2r7[pc & 0x7f];
- }
- }
- return 0;
-}
-
-offs_t tms1000_base_disassembler::pc_real_to_linear(offs_t pc) const
-{
- switch(m_pc_bits) {
- case 6: {
- static const u8 r2l6[64] = {
- 0x00, 0x01, 0x1b, 0x02, 0x31, 0x1c, 0x24, 0x03, 0x2e, 0x32, 0x39, 0x1d, 0x35, 0x25, 0x11, 0x04,
- 0x3e, 0x2f, 0x2c, 0x33, 0x3c, 0x3a, 0x16, 0x1e, 0x18, 0x36, 0x29, 0x26, 0x20, 0x12, 0x0c, 0x05,
- 0x3f, 0x1a, 0x30, 0x23, 0x2d, 0x38, 0x34, 0x10, 0x3d, 0x2b, 0x3b, 0x15, 0x17, 0x28, 0x1f, 0x0b,
- 0x19, 0x22, 0x37, 0x0f, 0x2a, 0x14, 0x27, 0x0a, 0x21, 0x0e, 0x13, 0x09, 0x0d, 0x08, 0x07, 0x06,
- };
- return (pc & ~0x3f) | r2l6[pc & 0x3f];
- }
- case 7: {
- static const u8 r2l7[128] = {
- 0x00, 0x01, 0x39, 0x02, 0x5b, 0x3a, 0x20, 0x03, 0x6d, 0x5c, 0x30, 0x3b, 0x71, 0x21, 0x44, 0x04,
- 0x58, 0x6e, 0x50, 0x5d, 0x53, 0x31, 0x65, 0x3c, 0x2c, 0x72, 0x76, 0x22, 0x60, 0x45, 0x14, 0x05,
- 0x7e, 0x59, 0x6b, 0x6f, 0x56, 0x51, 0x2a, 0x5e, 0x7c, 0x54, 0x7a, 0x32, 0x34, 0x66, 0x1a, 0x3d,
- 0x36, 0x2d, 0x4d, 0x73, 0x68, 0x77, 0x4a, 0x23, 0x1c, 0x61, 0x26, 0x46, 0x3f, 0x15, 0x0e, 0x06,
- 0x7f, 0x38, 0x5a, 0x1f, 0x6c, 0x2f, 0x70, 0x43, 0x57, 0x4f, 0x52, 0x64, 0x2b, 0x75, 0x5f, 0x13,
- 0x7d, 0x6a, 0x55, 0x29, 0x7b, 0x79, 0x33, 0x19, 0x35, 0x4c, 0x67, 0x49, 0x1b, 0x25, 0x3e, 0x0d,
- 0x37, 0x1e, 0x2e, 0x42, 0x4e, 0x63, 0x74, 0x12, 0x69, 0x28, 0x78, 0x18, 0x4b, 0x48, 0x24, 0x0c,
- 0x1d, 0x41, 0x62, 0x11, 0x27, 0x17, 0x47, 0x0b, 0x40, 0x10, 0x16, 0x0a, 0x0f, 0x09, 0x08, 0x07,
- };
- return (pc & ~0x7f) | r2l7[pc & 0x7f];
- }
- }
- return 0;
-}
-
diff --git a/src/devices/cpu/tms1000/tms1k_dasm.h b/src/devices/cpu/tms1000/tms1k_dasm.h
index 64e9e6f5082..18aad27fe1a 100644
--- a/src/devices/cpu/tms1000/tms1k_dasm.h
+++ b/src/devices/cpu/tms1000/tms1k_dasm.h
@@ -52,6 +52,9 @@ protected:
const u8 *m_lut_mnemonic;
bool m_opcode_9bits;
int m_pc_bits;
+
+ std::unique_ptr<u8[]> m_l2r;
+ std::unique_ptr<u8[]> m_r2l;
};
class tms1000_disassembler : public tms1000_base_disassembler