Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-01-31 10:32:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

More disassembly improvements

Browse Source
This commit is contained in:
Henrik Rydgard 2013-01-08 16:47:44 +01:00
parent 779272e7f5
commit 5d6ff0bc20
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/disarm.cpp
View File

@ -343,6 +343,15 @@ instr_disassemble(word instr, address addr, pDisOptions opts) {
if (instr&Sbit) *flagp++='S';
break;
case 1:
if ((instr & 0x0FFFFFF0) == ((18 << 20) | (0xFFF << 8) | (1 << 4))) {
mnemonic = "B";
format = "0";
break;
} else if ((instr & 0x0FFFFFF0) == 0x12FFF30) {
mnemonic = "BL";
format = "0";
break;
}
case 3:
/* SWP or MRS/MSR or data processing */
// hrydgard addition: MOVW/MOVT
@ -671,7 +680,7 @@ lUndefined:
result.is_SWI = 1;
result.swinum = instr&0x00FFFFFF;
result.addrstart = op;
op += sprintf(op, "&%lX", result.swinum);
op += sprintf(op, "&%X", result.swinum);
break;
case '%':
*op++='{';
@ -933,13 +942,17 @@ static sDisOptions options = {
reg_names
};
const char *ArmRegName(int r) {
return reg_names[r];
}
void ArmDis(unsigned int addr, unsigned int w, char *output) {
pInstruction instr = instr_disassemble(w, addr, &options);
sprintf(output, "%.6lX %.8lX\t%s", addr, w, instr->text);
sprintf(output, "%08x\t%s", w, instr->text);
if (instr->undefined || instr->badbits || instr->oddbits) {
if (instr->undefined) sprintf(output, " [undefined instr %08x]", w);
if (instr->badbits) sprintf(output, " [illegal bits %08x]", w);
if (instr->oddbits) sprintf(output, " [unexpected bits %08x]", w);
strcat(output, " ? (extra bits)");
//if (instr->oddbits) sprintf(output, " [unexpected bits %08x]", w);
}
// zap tabs
while (*output) {

1
ext/disarm.h
View File

@ -30,4 +30,5 @@
// The only changes I've done is C++ compat and replaced the main
// program with this function.
const char *ArmRegName(int r);
void ArmDis(unsigned int addr, unsigned int w, char *output);