From 6b5dcf200206a2e670bc5d9ddbb5aad379a5258c Mon Sep 17 00:00:00 2001 From: Nathan Woods Date: Tue, 25 Oct 2016 23:01:14 -0400 Subject: [PATCH] Changed the jaguar disassembler to use 'std::ostream &' internally --- src/devices/cpu/jaguar/jagdasm.cpp | 151 +++++++++++++++-------------- 1 file changed, 80 insertions(+), 71 deletions(-) diff --git a/src/devices/cpu/jaguar/jagdasm.cpp b/src/devices/cpu/jaguar/jagdasm.cpp index 2b65353c0f3..60e70aade59 100644 --- a/src/devices/cpu/jaguar/jagdasm.cpp +++ b/src/devices/cpu/jaguar/jagdasm.cpp @@ -79,7 +79,7 @@ static inline char *signed_16bit(int16_t val) return temp; } -static unsigned dasmjag(int variant, char *buffer, unsigned pc, const uint8_t *oprom) +static unsigned dasmjag(int variant, std::ostream &stream, unsigned pc, const uint8_t *oprom) { uint32_t flags = 0; int op = ROPCODE(0); @@ -90,100 +90,109 @@ static unsigned dasmjag(int variant, char *buffer, unsigned pc, const uint8_t *o pc += 2; switch (op >> 10) { - case 0: sprintf(buffer, "add r%d,r%d", reg1, reg2); break; - case 1: sprintf(buffer, "addc r%d,r%d", reg1, reg2); break; - case 2: sprintf(buffer, "addq $%x,r%d", convert_zero[reg1], reg2); break; - case 3: sprintf(buffer, "addqt $%x,r%d", convert_zero[reg1], reg2); break; - case 4: sprintf(buffer, "sub r%d,r%d", reg1, reg2); break; - case 5: sprintf(buffer, "subc r%d,r%d", reg1, reg2); break; - case 6: sprintf(buffer, "subq $%x,r%d", convert_zero[reg1], reg2); break; - case 7: sprintf(buffer, "subqt $%x,r%d", convert_zero[reg1], reg2); break; - case 8: sprintf(buffer, "neg r%d", reg2); break; - case 9: sprintf(buffer, "and r%d,r%d", reg1, reg2); break; - case 10: sprintf(buffer, "or r%d,r%d", reg1, reg2); break; - case 11: sprintf(buffer, "xor r%d,r%d", reg1, reg2); break; - case 12: sprintf(buffer, "not r%d", reg2); break; - case 13: sprintf(buffer, "btst $%x,r%d", reg1, reg2); break; - case 14: sprintf(buffer, "bset $%x,r%d", reg1, reg2); break; - case 15: sprintf(buffer, "bclr $%x,r%d", reg1, reg2); break; - case 16: sprintf(buffer, "mult r%d,r%d", reg1, reg2); break; - case 17: sprintf(buffer, "imult r%d,r%d", reg1, reg2); break; - case 18: sprintf(buffer, "imultn r%d,r%d", reg1, reg2); break; - case 19: sprintf(buffer, "resmac r%d", reg2); break; - case 20: sprintf(buffer, "imacn r%d,r%d", reg1, reg2); break; - case 21: sprintf(buffer, "div r%d,r%d", reg1, reg2); break; - case 22: sprintf(buffer, "abs r%d", reg2); break; - case 23: sprintf(buffer, "sh r%d,r%d", reg1, reg2); break; - case 24: sprintf(buffer, "shlq $%x,r%d", 32 - convert_zero[reg1], reg2); break; - case 25: sprintf(buffer, "shrq $%x,r%d", convert_zero[reg1], reg2); break; - case 26: sprintf(buffer, "sha r%d,r%d", reg1, reg2); break; - case 27: sprintf(buffer, "sharq $%x,r%d", convert_zero[reg1], reg2); break; - case 28: sprintf(buffer, "ror r%d,r%d", reg1, reg2); break; - case 29: sprintf(buffer, "rorq $%x,r%d", convert_zero[reg1], reg2); break; - case 30: sprintf(buffer, "cmp r%d,r%d", reg1, reg2); break; - case 31: sprintf(buffer, "cmpq %s,r%d", signed_16bit((int16_t)(reg1 << 11) >> 11), reg2);break; + case 0: util::stream_format(stream, "add r%d,r%d", reg1, reg2); break; + case 1: util::stream_format(stream, "addc r%d,r%d", reg1, reg2); break; + case 2: util::stream_format(stream, "addq $%x,r%d", convert_zero[reg1], reg2); break; + case 3: util::stream_format(stream, "addqt $%x,r%d", convert_zero[reg1], reg2); break; + case 4: util::stream_format(stream, "sub r%d,r%d", reg1, reg2); break; + case 5: util::stream_format(stream, "subc r%d,r%d", reg1, reg2); break; + case 6: util::stream_format(stream, "subq $%x,r%d", convert_zero[reg1], reg2); break; + case 7: util::stream_format(stream, "subqt $%x,r%d", convert_zero[reg1], reg2); break; + case 8: util::stream_format(stream, "neg r%d", reg2); break; + case 9: util::stream_format(stream, "and r%d,r%d", reg1, reg2); break; + case 10: util::stream_format(stream, "or r%d,r%d", reg1, reg2); break; + case 11: util::stream_format(stream, "xor r%d,r%d", reg1, reg2); break; + case 12: util::stream_format(stream, "not r%d", reg2); break; + case 13: util::stream_format(stream, "btst $%x,r%d", reg1, reg2); break; + case 14: util::stream_format(stream, "bset $%x,r%d", reg1, reg2); break; + case 15: util::stream_format(stream, "bclr $%x,r%d", reg1, reg2); break; + case 16: util::stream_format(stream, "mult r%d,r%d", reg1, reg2); break; + case 17: util::stream_format(stream, "imult r%d,r%d", reg1, reg2); break; + case 18: util::stream_format(stream, "imultn r%d,r%d", reg1, reg2); break; + case 19: util::stream_format(stream, "resmac r%d", reg2); break; + case 20: util::stream_format(stream, "imacn r%d,r%d", reg1, reg2); break; + case 21: util::stream_format(stream, "div r%d,r%d", reg1, reg2); break; + case 22: util::stream_format(stream, "abs r%d", reg2); break; + case 23: util::stream_format(stream, "sh r%d,r%d", reg1, reg2); break; + case 24: util::stream_format(stream, "shlq $%x,r%d", 32 - convert_zero[reg1], reg2); break; + case 25: util::stream_format(stream, "shrq $%x,r%d", convert_zero[reg1], reg2); break; + case 26: util::stream_format(stream, "sha r%d,r%d", reg1, reg2); break; + case 27: util::stream_format(stream, "sharq $%x,r%d", convert_zero[reg1], reg2); break; + case 28: util::stream_format(stream, "ror r%d,r%d", reg1, reg2); break; + case 29: util::stream_format(stream, "rorq $%x,r%d", convert_zero[reg1], reg2); break; + case 30: util::stream_format(stream, "cmp r%d,r%d", reg1, reg2); break; + case 31: util::stream_format(stream, "cmpq %s,r%d", signed_16bit((int16_t)(reg1 << 11) >> 11), reg2);break; + case 32: if (variant == JAGUAR_VARIANT_GPU) - sprintf(buffer, "sat8 r%d", reg2); + util::stream_format(stream, "sat8 r%d", reg2); else - sprintf(buffer, "subqmod $%x,r%d", convert_zero[reg1], reg2); + util::stream_format(stream, "subqmod $%x,r%d", convert_zero[reg1], reg2); break; case 33: if (variant == JAGUAR_VARIANT_GPU) - sprintf(buffer, "sat16 r%d", reg2); + util::stream_format(stream, "sat16 r%d", reg2); else - sprintf(buffer, "sat16s r%d", reg2); + util::stream_format(stream, "sat16s r%d", reg2); break; - case 34: sprintf(buffer, "move r%d,r%d", reg1, reg2); break; - case 35: sprintf(buffer, "moveq %d,r%d", reg1, reg2); break; - case 36: sprintf(buffer, "moveta r%d,r%d", reg1, reg2); break; - case 37: sprintf(buffer, "movefa r%d,r%d", reg1, reg2); break; - case 38: sprintf(buffer, "movei $%x,r%d", ROPCODE(2) | (ROPCODE(4)<<16), reg2); size = 6; break; - case 39: sprintf(buffer, "loadb (r%d),r%d", reg1, reg2); break; - case 40: sprintf(buffer, "loadw (r%d),r%d", reg1, reg2); break; - case 41: sprintf(buffer, "load (r%d),r%d", reg1, reg2); break; + case 34: util::stream_format(stream, "move r%d,r%d", reg1, reg2); break; + case 35: util::stream_format(stream, "moveq %d,r%d", reg1, reg2); break; + case 36: util::stream_format(stream, "moveta r%d,r%d", reg1, reg2); break; + case 37: util::stream_format(stream, "movefa r%d,r%d", reg1, reg2); break; + case 38: util::stream_format(stream, "movei $%x,r%d", ROPCODE(2) | (ROPCODE(4)<<16), reg2); size = 6; break; + case 39: util::stream_format(stream, "loadb (r%d),r%d", reg1, reg2); break; + case 40: util::stream_format(stream, "loadw (r%d),r%d", reg1, reg2); break; + case 41: util::stream_format(stream, "load (r%d),r%d", reg1, reg2); break; case 42: if (variant == JAGUAR_VARIANT_GPU) - sprintf(buffer, "loadp (r%d),r%d", reg1, reg2); + util::stream_format(stream, "loadp (r%d),r%d", reg1, reg2); else - sprintf(buffer, "sat32s r%d", reg2); + util::stream_format(stream, "sat32s r%d", reg2); break; - case 43: sprintf(buffer, "load (r14+$%x),r%d", convert_zero[reg1]*4, reg2);break; - case 44: sprintf(buffer, "load (r15+$%x),r%d", convert_zero[reg1]*4, reg2);break; - case 45: sprintf(buffer, "storeb r%d,(r%d)", reg2, reg1); break; - case 46: sprintf(buffer, "storew r%d,(r%d)", reg2, reg1); break; - case 47: sprintf(buffer, "store r%d,(r%d)", reg2, reg1); break; + case 43: util::stream_format(stream, "load (r14+$%x),r%d", convert_zero[reg1]*4, reg2);break; + case 44: util::stream_format(stream, "load (r15+$%x),r%d", convert_zero[reg1]*4, reg2);break; + case 45: util::stream_format(stream, "storeb r%d,(r%d)", reg2, reg1); break; + case 46: util::stream_format(stream, "storew r%d,(r%d)", reg2, reg1); break; + case 47: util::stream_format(stream, "store r%d,(r%d)", reg2, reg1); break; case 48: if (variant == JAGUAR_VARIANT_GPU) - sprintf(buffer, "storep r%d,(r%d)", reg2, reg1); + util::stream_format(stream, "storep r%d,(r%d)", reg2, reg1); else - sprintf(buffer, "mirror r%d", reg2); + util::stream_format(stream, "mirror r%d", reg2); break; - case 49: sprintf(buffer, "store r%d,(r14+$%x)", reg2, convert_zero[reg1]*4);break; - case 50: sprintf(buffer, "store r%d,(r15+$%x)", reg2, convert_zero[reg1]*4);break; - case 51: sprintf(buffer, "move pc,r%d", reg2); break; - case 52: sprintf(buffer, "jump %s(r%d)", condition[reg2], reg1); break; - case 53: sprintf(buffer, "jr %s%08X", condition[reg2], pc + ((int8_t)(reg1 << 3) >> 2)); break; - case 54: sprintf(buffer, "mmult r%d,r%d", reg1, reg2); break; - case 55: sprintf(buffer, "mtoi r%d,r%d", reg1, reg2); break; - case 56: sprintf(buffer, "normi r%d,r%d", reg1, reg2); break; - case 57: sprintf(buffer, "nop"); break; - case 58: sprintf(buffer, "load (r14+r%d),r%d", reg1, reg2); break; - case 59: sprintf(buffer, "load (r15+r%d),r%d", reg1, reg2); break; - case 60: sprintf(buffer, "store r%d,(r14+r%d)", reg2, reg1); break; - case 61: sprintf(buffer, "store r%d,(r15+r%d)", reg2, reg1); break; + case 49: util::stream_format(stream, "store r%d,(r14+$%x)", reg2, convert_zero[reg1]*4);break; + case 50: util::stream_format(stream, "store r%d,(r15+$%x)", reg2, convert_zero[reg1]*4);break; + case 51: util::stream_format(stream, "move pc,r%d", reg2); break; + case 52: util::stream_format(stream, "jump %s(r%d)", condition[reg2], reg1); break; + case 53: util::stream_format(stream, "jr %s%08X", condition[reg2], pc + ((int8_t)(reg1 << 3) >> 2)); break; + case 54: util::stream_format(stream, "mmult r%d,r%d", reg1, reg2); break; + case 55: util::stream_format(stream, "mtoi r%d,r%d", reg1, reg2); break; + case 56: util::stream_format(stream, "normi r%d,r%d", reg1, reg2); break; + case 57: util::stream_format(stream, "nop"); break; + case 58: util::stream_format(stream, "load (r14+r%d),r%d", reg1, reg2); break; + case 59: util::stream_format(stream, "load (r15+r%d),r%d", reg1, reg2); break; + case 60: util::stream_format(stream, "store r%d,(r14+r%d)", reg2, reg1); break; + case 61: util::stream_format(stream, "store r%d,(r15+r%d)", reg2, reg1); break; case 62: if (variant == JAGUAR_VARIANT_GPU) - sprintf(buffer, "sat24 r%d", reg2); + util::stream_format(stream, "sat24 r%d", reg2); else - sprintf(buffer, "illegal"); + util::stream_format(stream, "illegal"); break; case 63: if (variant == JAGUAR_VARIANT_GPU) - sprintf(buffer, reg1 ? + util::stream_format(stream, reg1 ? "unpack r%d" : "pack r%d", reg2); else - sprintf(buffer, "addqmod $%x,r%d", convert_zero[reg1], reg2); + util::stream_format(stream, "addqmod $%x,r%d", convert_zero[reg1], reg2); break; } return size | flags | DASMFLAG_SUPPORTED; } +static unsigned dasmjag(int variant, char *buffer, unsigned pc, const uint8_t *oprom) +{ + std::ostringstream stream; + unsigned result = dasmjag(variant, stream, pc, oprom); + std::string stream_str = stream.str(); + strcpy(buffer, stream_str.c_str()); + return result; +} CPU_DISASSEMBLE( jaguargpu ) {