diff options
Diffstat (limited to 'src/devices/cpu/pic16c5x/16c5xdsm.cpp')
-rw-r--r-- | src/devices/cpu/pic16c5x/16c5xdsm.cpp | 147 |
1 files changed, 57 insertions, 90 deletions
diff --git a/src/devices/cpu/pic16c5x/16c5xdsm.cpp b/src/devices/cpu/pic16c5x/16c5xdsm.cpp index 03cd0539c8c..4768cbb12e8 100644 --- a/src/devices/cpu/pic16c5x/16c5xdsm.cpp +++ b/src/devices/cpu/pic16c5x/16c5xdsm.cpp @@ -24,86 +24,60 @@ \**************************************************************************/ #include "emu.h" +#include "16c5xdsm.h" #include <ctype.h> -static const uint8_t *rombase; -static const uint8_t *rambase; -static offs_t pcbase; -#define READOP16(A) (rombase[(A) - pcbase] | (rombase[(A) + 1 - pcbase] << 8)) -#define READARG16(A) (rambase[(A) - pcbase] | (rambase[(A) + 1 - pcbase] << 8)) - - - -typedef unsigned char byte; -typedef unsigned short int word; - -#define FMT(a,b) a, b -#define PTRS_PER_FORMAT 2 - -static const char *const regfile[32] = { "Reg$00 (IND)", "Reg$01 (TMR)", "Reg$02 (PCL)", "Reg$03 (ST)", "Reg$04 (FSR)", "Reg$05 (PTA)", "Reg$06 (PTB)", "Reg$07 (PTC)", +const char *const pic16c5x_disassembler::regfile[32] = { "Reg$00 (IND)", "Reg$01 (TMR)", "Reg$02 (PCL)", "Reg$03 (ST)", "Reg$04 (FSR)", "Reg$05 (PTA)", "Reg$06 (PTB)", "Reg$07 (PTC)", "Reg$08", "Reg$09", "Reg$0A", "Reg$0B", "Reg$0C", "Reg$0D", "Reg$0E", "Reg$0F", "Reg$10", "Reg$11", "Reg$12", "Reg$13", "Reg$14", "Reg$15", "Reg$16", "Reg$17", "Reg$18", "Reg$19", "Reg$1A", "Reg$1B", "Reg$1C", "Reg$1D", "Reg$1E", "Reg$1F" }; -static const char *const dest[2] = { "W", "Reg" }; - -static const char *const PIC16C5xFormats[] = { - FMT("000000000000", "nop"), - FMT("000000000010", "option"), - FMT("000000000011", "sleep"), - FMT("000000000100", "clrwdt"), - FMT("000000000101", "tris Port A"), - FMT("000000000110", "tris Port B"), - FMT("000000000111", "tris Port C"), - FMT("0000001fffff", "movwf %F"), - FMT("000001000000", "clrw"), - FMT("0000011fffff", "clrf %F"), - FMT("000010dfffff", "subwf %F,%D"), - FMT("000011dfffff", "decf %F,%D"), - FMT("000100dfffff", "iorwf %F,%D"), - FMT("000101dfffff", "andwf %F,%D"), - FMT("000110dfffff", "xorwf %F,%D"), - FMT("000111dfffff", "addwf %F,%D"), - FMT("001000dfffff", "movf %F,%D"), - FMT("001001dfffff", "comf %F,%D"), - FMT("001010dfffff", "incf %F,%D"), - FMT("001011dfffff", "decfsz %F,%D"), - FMT("001100dfffff", "rrf %F,%D"), - FMT("001101dfffff", "rlf %F,%D"), - FMT("001110dfffff", "swapf %F,%D"), - FMT("001111dfffff", "incfsz %F,%D"), - FMT("0100bbbfffff", "bcf %F,%B"), - FMT("0101bbbfffff", "bsf %F,%B"), - FMT("0110bbbfffff", "btfsc %F,%B"), - FMT("0111bbbfffff", "btfss %F,%B"), - FMT("1000kkkkkkkk", "retlw %K"), - FMT("1001aaaaaaaa", "call %A"), - FMT("101aaaaaaaaa", "goto %A"), - FMT("1100kkkkkkkk", "movlw %K"), - FMT("1101kkkkkkkk", "iorlw %K"), - FMT("1110kkkkkkkk", "andlw %K"), - FMT("1111kkkkkkkk", "xorlw %K"), +const char *const pic16c5x_disassembler::dest[2] = { "W", "Reg" }; + +const char *const pic16c5x_disassembler::PIC16C5xFormats[] = { + "000000000000", "nop", + "000000000010", "option", + "000000000011", "sleep", + "000000000100", "clrwdt", + "000000000101", "tris Port A", + "000000000110", "tris Port B", + "000000000111", "tris Port C", + "0000001fffff", "movwf %F", + "000001000000", "clrw", + "0000011fffff", "clrf %F", + "000010dfffff", "subwf %F,%D", + "000011dfffff", "decf %F,%D", + "000100dfffff", "iorwf %F,%D", + "000101dfffff", "andwf %F,%D", + "000110dfffff", "xorwf %F,%D", + "000111dfffff", "addwf %F,%D", + "001000dfffff", "movf %F,%D", + "001001dfffff", "comf %F,%D", + "001010dfffff", "incf %F,%D", + "001011dfffff", "decfsz %F,%D", + "001100dfffff", "rrf %F,%D", + "001101dfffff", "rlf %F,%D", + "001110dfffff", "swapf %F,%D", + "001111dfffff", "incfsz %F,%D", + "0100bbbfffff", "bcf %F,%B", + "0101bbbfffff", "bsf %F,%B", + "0110bbbfffff", "btfsc %F,%B", + "0111bbbfffff", "btfss %F,%B", + "1000kkkkkkkk", "retlw %K", + "1001aaaaaaaa", "call %A", + "101aaaaaaaaa", "goto %A", + "1100kkkkkkkk", "movlw %K", + "1101kkkkkkkk", "iorlw %K", + "1110kkkkkkkk", "andlw %K", + "1111kkkkkkkk", "xorlw %K", nullptr }; -#define MAX_OPS ((ARRAY_LENGTH(PIC16C5xFormats) - 1) / PTRS_PER_FORMAT) - -struct PIC16C5xOpcode { - word mask; /* instruction mask */ - word bits; /* constant bits */ - word extcode; /* value that gets extension code */ - const char *parse; /* how to parse bits */ - const char *fmt; /* instruction format */ -}; - -static PIC16C5xOpcode Op[MAX_OPS+1]; -static int OpInizialized = 0; - -static void InitDasm16C5x(void) +pic16c5x_disassembler::pic16c5x_disassembler() { const char *p; const char *const *ops; - word mask, bits; + u16 mask, bits; int bit; int i; @@ -136,20 +110,14 @@ static void InitDasm16C5x(void) ops[0],ops[1],bit); } while (isspace((uint8_t)*p)) p++; - if (*p) Op[i].extcode = *p; - Op[i].bits = bits; - Op[i].mask = mask; - Op[i].fmt = ops[1]; - Op[i].parse = ops[0]; + Op.emplace_back(mask, bits, *p, ops[0], ops[1]); - ops += PTRS_PER_FORMAT; + ops += 2; i++; } - - OpInizialized = 1; } -CPU_DISASSEMBLE(pic16c5x) +offs_t pic16c5x_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) { int a, b, d, f, k; /* these can all be filled in by parsing an instruction */ int i; @@ -161,15 +129,9 @@ CPU_DISASSEMBLE(pic16c5x) const char *cp; /* character pointer in OpFormats */ uint32_t flags = 0; - rombase = oprom; - rambase = opram; - pcbase = 2*pc; - - if (!OpInizialized) InitDasm16C5x(); - op = -1; /* no matching opcode */ - code = READOP16(2*pc); - for ( i = 0; i < MAX_OPS; i++) + code = opcodes.r16(pc); + for ( i = 0; i < int(Op.size()); i++) { if ((code & Op[i].mask) == Op[i].bits) { @@ -184,14 +146,14 @@ CPU_DISASSEMBLE(pic16c5x) if (op == -1) { util::stream_format(stream, "???? dw %04Xh",code); - return cnt; + return cnt | SUPPORTED; } //buffertmp = buffer; if (Op[op].extcode) /* Actually, theres no double length opcodes */ { bit = 27; code <<= 16; - code |= READARG16(2*(pc+cnt)); + code |= params.r16(pc+cnt); cnt++; } else @@ -223,9 +185,9 @@ CPU_DISASSEMBLE(pic16c5x) /* now traverse format string */ cp = Op[op].fmt; if (!strncmp(cp, "call", 4)) - flags = DASMFLAG_STEP_OVER; + flags = STEP_OVER; else if (!strncmp(cp, "ret", 3)) - flags = DASMFLAG_STEP_OUT; + flags = STEP_OUT; while (*cp) { @@ -248,5 +210,10 @@ CPU_DISASSEMBLE(pic16c5x) stream << *cp++; } } - return cnt | flags | DASMFLAG_SUPPORTED; + return cnt | flags | SUPPORTED; +} + +uint32_t pic16c5x_disassembler::opcode_alignment() const +{ + return 1; } |