X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjagdasm.cpp;h=e2730495534e289c483e32f9d1a34a436bf5febf;hb=dffa89ebdee4d328a8e166b30fcdf38a3fc54b28;hp=31a67ef7d8852489a598b19a00c5a65de527a61e;hpb=ab4f660439ff855171f801e3fdfa3e9de69d991b;p=virtualjaguar diff --git a/src/jagdasm.cpp b/src/jagdasm.cpp index 31a67ef..e273049 100644 --- a/src/jagdasm.cpp +++ b/src/jagdasm.cpp @@ -11,6 +11,8 @@ // Who When What // --- ---------- ------------------------------------------------------------- // JLH 06/01/2012 Created this log (long overdue! ;-) +// JLH 01/23/2013 Beautifying of disassembly, including hex digits of opcodes +// and operands // #include "jagdasm.h" @@ -61,7 +63,7 @@ const char * condition[32] = "???,", "never," }; - + char * signed_16bit(int16 val) @@ -76,6 +78,7 @@ char * signed_16bit(int16 val) return temp; } + unsigned dasmjag(int dsp_type, char * bufferOut, unsigned pc) { char buffer[64]; @@ -83,41 +86,41 @@ unsigned dasmjag(int dsp_type, char * bufferOut, unsigned pc) int reg1 = (op >> 5) & 31; int reg2 = op & 31; int size = 2; - pc += 2; + switch (op >> 10) { - case 0: sprintf(buffer, "ADD R%02d,R%02d", reg1, reg2); break; - case 1: sprintf(buffer, "ADDC R%02d,R%02d", reg1, reg2); break; + case 0: sprintf(buffer, "ADD R%02d,R%02d", reg1, reg2); break; + case 1: sprintf(buffer, "ADDC R%02d,R%02d", reg1, reg2); break; case 2: sprintf(buffer, "ADDQ $%X,R%02d", convert_zero[reg1], reg2); break; case 3: sprintf(buffer, "ADDQT $%X,R%02d", convert_zero[reg1], reg2); break; - case 4: sprintf(buffer, "SUB R%02d,R%02d", reg1, reg2); break; - case 5: sprintf(buffer, "SUBC R%02d,R%02d", reg1, reg2); break; + case 4: sprintf(buffer, "SUB R%02d,R%02d", reg1, reg2); break; + case 5: sprintf(buffer, "SUBC R%02d,R%02d", reg1, reg2); break; case 6: sprintf(buffer, "SUBQ $%X,R%02d", convert_zero[reg1], reg2); break; case 7: sprintf(buffer, "SUBQT $%X,R%02d", convert_zero[reg1], reg2); break; case 8: sprintf(buffer, "NEG R%02d", reg2); break; - case 9: sprintf(buffer, "AND R%02d,R%02d", reg1, reg2); break; - case 10: sprintf(buffer, "OR R%02d,R%02d", reg1, reg2); break; - case 11: sprintf(buffer, "XOR R%02d,R%02d", reg1, reg2); break; + case 9: sprintf(buffer, "AND R%02d,R%02d", reg1, reg2); break; + case 10: sprintf(buffer, "OR R%02d,R%02d", reg1, reg2); break; + case 11: sprintf(buffer, "XOR R%02d,R%02d", reg1, reg2); break; case 12: sprintf(buffer, "NOT R%02d", reg2); break; - case 13: sprintf(buffer, "BTST $%X,R%02d", reg1, reg2); break; - case 14: sprintf(buffer, "BSET $%X,R%02d", reg1, reg2); break; - case 15: sprintf(buffer, "BCLR $%X,R%02d", reg1, reg2); break; - case 16: sprintf(buffer, "MULT R%02d,R%02d", reg1, reg2); break; - case 17: sprintf(buffer, "IMULT R%02d,R%02d", reg1, reg2); break; - case 18: sprintf(buffer, "IMULTN R%02d,R%02d", reg1, reg2); break; + case 13: sprintf(buffer, "BTST $%X,R%02d", reg1, reg2); break; + case 14: sprintf(buffer, "BSET $%X,R%02d", reg1, reg2); break; + case 15: sprintf(buffer, "BCLR $%X,R%02d", reg1, reg2); break; + case 16: sprintf(buffer, "MULT R%02d,R%02d", reg1, reg2); break; + case 17: sprintf(buffer, "IMULT R%02d,R%02d", reg1, reg2); break; + case 18: sprintf(buffer, "IMULTN R%02d,R%02d", reg1, reg2); break; case 19: sprintf(buffer, "RESMAC R%02d", reg2); break; - case 20: sprintf(buffer, "IMACN R%02d,R%02d", reg1, reg2); break; - case 21: sprintf(buffer, "DIV R%02d,R%02d", reg1, reg2); break; + case 20: sprintf(buffer, "IMACN R%02d,R%02d", reg1, reg2); break; + case 21: sprintf(buffer, "DIV R%02d,R%02d", reg1, reg2); break; case 22: sprintf(buffer, "ABS R%02d", reg2); break; - case 23: sprintf(buffer, "SH R%02d,R%02d", reg1, reg2); break; + case 23: sprintf(buffer, "SH R%02d,R%02d", reg1, reg2); break; case 24: sprintf(buffer, "SHLQ $%X,R%02d", 32 - convert_zero[reg1], reg2); break; case 25: sprintf(buffer, "SHRQ $%X,R%02d", convert_zero[reg1], reg2); break; - case 26: sprintf(buffer, "SHA R%02d,R%02d", reg1, reg2); break; + case 26: sprintf(buffer, "SHA R%02d,R%02d", reg1, reg2); break; case 27: sprintf(buffer, "SHARQ $%X,R%02d", convert_zero[reg1], reg2); break; - case 28: sprintf(buffer, "ROR R%02d,R%02d", reg1, reg2); break; + case 28: sprintf(buffer, "ROR R%02d,R%02d", reg1, reg2); break; case 29: sprintf(buffer, "RORQ $%X,R%02d", convert_zero[reg1], reg2); break; - case 30: sprintf(buffer, "CMP R%02d,R%02d", reg1, reg2); break; + case 30: sprintf(buffer, "CMP R%02d,R%02d", reg1, reg2); break; case 31: sprintf(buffer, "CMPQ %s,R%02d", signed_16bit((int16)(reg1 << 11) >> 11), reg2);break; case 32: if (dsp_type == JAGUAR_GPU) sprintf(buffer, "SAT8 R%02d", reg2); @@ -129,14 +132,14 @@ unsigned dasmjag(int dsp_type, char * bufferOut, unsigned pc) else sprintf(buffer, "SAT16S R%02d", reg2); break; - case 34: sprintf(buffer, "MOVE R%02d,R%02d", reg1, reg2); break; - case 35: sprintf(buffer, "MOVEQ %d,R%02d", reg1, reg2); break; - case 36: sprintf(buffer, "MOVETA R%02d,R%02d", reg1, reg2); break; - case 37: sprintf(buffer, "MOVEFA R%02d,R%02d", reg1, reg2); break; - case 38: sprintf(buffer, "MOVEI $%08X,R%02d", ROPCODE(pc) | (ROPCODE(pc+2)<<16), reg2); size = 6; break; - case 39: sprintf(buffer, "LOADB (R%02d),R%02d", reg1, reg2); break; - case 40: sprintf(buffer, "LOADW (R%02d),R%02d", reg1, reg2); break; - case 41: sprintf(buffer, "LOAD (R%02d),R%02d", reg1, reg2); break; + case 34: sprintf(buffer, "MOVE R%02d,R%02d", reg1, reg2); break; + case 35: sprintf(buffer, "MOVEQ %d,R%02d", reg1, reg2); break; + case 36: sprintf(buffer, "MOVETA R%02d,R%02d", reg1, reg2); break; + case 37: sprintf(buffer, "MOVEFA R%02d,R%02d", reg1, reg2); break; + case 38: sprintf(buffer, "MOVEI #$%X,R%02d", ROPCODE(pc) | (ROPCODE(pc+2)<<16), reg2); size = 6; break; + case 39: sprintf(buffer, "LOADB (R%02d),R%02d", reg1, reg2); break; + case 40: sprintf(buffer, "LOADW (R%02d),R%02d", reg1, reg2); break; + case 41: sprintf(buffer, "LOAD (R%02d),R%02d", reg1, reg2); break; case 42: if (dsp_type == JAGUAR_GPU) sprintf(buffer, "LOADP (R%02d),R%02d", reg1, reg2); else @@ -144,9 +147,9 @@ unsigned dasmjag(int dsp_type, char * bufferOut, unsigned pc) break; case 43: sprintf(buffer, "LOAD (R14+$%X),R%02d", convert_zero[reg1]*4, reg2);break; case 44: sprintf(buffer, "LOAD (R15+$%X),R%02d", convert_zero[reg1]*4, reg2);break; - case 45: sprintf(buffer, "STOREB R%02d,(R%02d)", reg2, reg1); break; - case 46: sprintf(buffer, "STOREW R%02d,(R%02d)", reg2, reg1); break; - case 47: sprintf(buffer, "STORE R%02d,(R%02d)", reg2, reg1); break; + case 45: sprintf(buffer, "STOREB R%02d,(R%02d)", reg2, reg1); break; + case 46: sprintf(buffer, "STOREW R%02d,(R%02d)", reg2, reg1); break; + case 47: sprintf(buffer, "STORE R%02d,(R%02d)", reg2, reg1); break; case 48: if (dsp_type == JAGUAR_GPU) sprintf(buffer, "STOREP R%02d,(R%02d)", reg2, reg1); else @@ -154,17 +157,17 @@ unsigned dasmjag(int dsp_type, char * bufferOut, unsigned pc) break; case 49: sprintf(buffer, "STORE R%02d,(R14+$%X)", reg2, convert_zero[reg1]*4);break; case 50: sprintf(buffer, "STORE R%02d,(R15+$%X)", reg2, convert_zero[reg1]*4);break; - case 51: sprintf(buffer, "MOVE PC,R%02d", reg2); break; - case 52: sprintf(buffer, "JUMP %s(R%02d)", condition[reg2], reg1); break; - case 53: sprintf(buffer, "JR %s%08X", condition[reg2], pc + ((int8)(reg1 << 3) >> 2)); break; - case 54: sprintf(buffer, "MMULT R%02d,R%02d", reg1, reg2); break; - case 55: sprintf(buffer, "MTOI R%02d,R%02d", reg1, reg2); break; - case 56: sprintf(buffer, "NORMI R%02d,R%02d", reg1, reg2); break; + case 51: sprintf(buffer, "MOVE PC,R%02d", reg2); break; + case 52: sprintf(buffer, "JUMP %s(R%02d)", condition[reg2], reg1); break; + case 53: sprintf(buffer, "JR %s$%X", condition[reg2], pc + ((int8)(reg1 << 3) >> 2)); break; + case 54: sprintf(buffer, "MMULT R%02d,R%02d", reg1, reg2); break; + case 55: sprintf(buffer, "MTOI R%02d,R%02d", reg1, reg2); break; + case 56: sprintf(buffer, "NORMI R%02d,R%02d", reg1, reg2); break; case 57: sprintf(buffer, "NOP"); break; - case 58: sprintf(buffer, "LOAD (R14+R%02d),R%02d", reg1, reg2); break; - case 59: sprintf(buffer, "LOAD (R15+R%02d),R%02d", reg1, reg2); break; - case 60: sprintf(buffer, "STORE R%02d,(R14+R%02d)", reg2, reg1); break; - case 61: sprintf(buffer, "STORE R%02d,(R15+R%02d)", reg2, reg1); break; + case 58: sprintf(buffer, "LOAD (R14+R%02d),R%02d", reg1, reg2); break; + case 59: sprintf(buffer, "LOAD (R15+R%02d),R%02d", reg1, reg2); break; + case 60: sprintf(buffer, "STORE R%02d,(R14+R%02d)", reg2, reg1); break; + case 61: sprintf(buffer, "STORE R%02d,(R15+R%02d)", reg2, reg1); break; case 62: if (dsp_type == JAGUAR_GPU) sprintf(buffer, "SAT24 R%02d", reg2); else @@ -176,7 +179,18 @@ unsigned dasmjag(int dsp_type, char * bufferOut, unsigned pc) sprintf(buffer, "ADDQMOD $%X,R%02d", convert_zero[reg1], reg2); break; } + +#if 0 sprintf(bufferOut,"%-24s (%04X)", buffer, op); +#else + if (size == 2) + sprintf(bufferOut, "%04X %-24s", op, buffer); + else + { + uint16 word1 = ROPCODE(pc), word2 = ROPCODE(pc + 2); + sprintf(bufferOut, "%04X %04X %04X %-24s", op, word1, word2, buffer); + } +#endif return size; }