From f02fab789d3e1c26e8747d07bc30e7e85a71eb39 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 26 Nov 2017 22:30:09 +0100 Subject: [PATCH] Some fixes (nw) --- src/devices/cpu/pic16c5x/16c5xdsm.cpp | 2 +- src/devices/cpu/pic16c62x/16c62xdsm.cpp | 2 +- src/devices/cpu/tms1000/tms0270.cpp | 2 +- src/devices/cpu/tms32010/32010dsm.cpp | 5 ++++- src/devices/cpu/tms32025/32025dsm.cpp | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/devices/cpu/pic16c5x/16c5xdsm.cpp b/src/devices/cpu/pic16c5x/16c5xdsm.cpp index 06ee6eb01ba..4768cbb12e8 100644 --- a/src/devices/cpu/pic16c5x/16c5xdsm.cpp +++ b/src/devices/cpu/pic16c5x/16c5xdsm.cpp @@ -110,7 +110,7 @@ pic16c5x_disassembler::pic16c5x_disassembler() ops[0],ops[1],bit); } while (isspace((uint8_t)*p)) p++; - Op.emplace_back(bits, mask, *p, ops[0], ops[1]); + Op.emplace_back(mask, bits, *p, ops[0], ops[1]); ops += 2; i++; diff --git a/src/devices/cpu/pic16c62x/16c62xdsm.cpp b/src/devices/cpu/pic16c62x/16c62xdsm.cpp index 8206a362869..69072a4ada9 100644 --- a/src/devices/cpu/pic16c62x/16c62xdsm.cpp +++ b/src/devices/cpu/pic16c62x/16c62xdsm.cpp @@ -122,7 +122,7 @@ pic16c62x_disassembler::pic16c62x_disassembler() ops[0],ops[1],bit); } while (isspace((uint8_t)*p)) p++; - Op.emplace_back(bits, mask, *p, ops[0], ops[1]); + Op.emplace_back(mask, bits, *p, ops[0], ops[1]); ops += 2; i++; diff --git a/src/devices/cpu/tms1000/tms0270.cpp b/src/devices/cpu/tms1000/tms0270.cpp index 3e66a4cf9bd..429e9affdf9 100644 --- a/src/devices/cpu/tms1000/tms0270.cpp +++ b/src/devices/cpu/tms1000/tms0270.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(TMS0270, tms0270_cpu_device, "tms0270", "TMS0270") // 40-pin // internal memory maps static ADDRESS_MAP_START(program_11bit_9, AS_PROGRAM, 16, tms1k_base_device) - AM_RANGE(0x000, 0xfff) AM_ROM + AM_RANGE(0x000, 0x7ff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START(data_144x4, AS_DATA, 8, tms1k_base_device) diff --git a/src/devices/cpu/tms32010/32010dsm.cpp b/src/devices/cpu/tms32010/32010dsm.cpp index 9dcbb1df485..20b2fea17d3 100644 --- a/src/devices/cpu/tms32010/32010dsm.cpp +++ b/src/devices/cpu/tms32010/32010dsm.cpp @@ -186,7 +186,7 @@ tms32010_disassembler::tms32010_disassembler() ops[0],ops[1],bit); } while (isspace((uint8_t)*p)) p++; - Op.emplace_back(bits, mask, *p, ops[0], ops[1]); + Op.emplace_back(mask, bits, *p, ops[0], ops[1]); ops += 2; i++; @@ -209,6 +209,9 @@ offs_t tms32010_disassembler::disassemble(std::ostream &stream, offs_t pc, const code = opcodes.r16(pc); for ( i = 0; i < int(Op.size()); i++) { + if(pc == 0) + fprintf(stderr, "op=%04x mask=%04x bits=%04x %s\n", code, Op[i].mask, Op[i].bits, Op[i].fmt); + if ((code & Op[i].mask) == Op[i].bits) { if (op != -1) diff --git a/src/devices/cpu/tms32025/32025dsm.cpp b/src/devices/cpu/tms32025/32025dsm.cpp index 9bc8f90812f..b8ad14415c3 100644 --- a/src/devices/cpu/tms32025/32025dsm.cpp +++ b/src/devices/cpu/tms32025/32025dsm.cpp @@ -351,7 +351,7 @@ tms32025_disassembler::tms32025_disassembler() ops[0],ops[1],bit); } while (isspace((uint8_t)*p)) p++; - Op.emplace_back(bits, mask, *p, ops[0], ops[1]); + Op.emplace_back(mask, bits, *p, ops[0], ops[1]); ops += 2; i++;