piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

DSP: Unbreak disassembler (broken since 2866), commenting, logging changes, minor cleanup

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2878 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-04-05 15:46:47 +00:00
parent 405480342a
commit a583950f82
20 changed files with 94 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Plugins/Plugin_DSP_LLE-testing/Src/disassemble.cpp
View File

@ -150,13 +150,14 @@ const char* pdname(u16 val)
return tmpstr;
}
char* gd_dis_params(gd_globals_t* gdg, DSPOPCTemplate* opc, u16 op1, u16 op2, char* strbuf)
extern void nop(const UDSPInstruction& opc);
char* gd_dis_params(gd_globals_t* gdg, const DSPOPCTemplate* opc, u16 op1, u16 op2, char* strbuf)
{
char* buf = strbuf;
u32 val;
int j;
for (j = 0; j < opc->param_count; j++)
for (int j = 0; j < opc->param_count; j++)
{
if (j > 0)
{
@ -219,7 +220,7 @@ char* gd_dis_params(gd_globals_t* gdg, DSPOPCTemplate* opc, u16 op1, u16 op2, ch
if (opc->params[j].size != 2)
{
if (opc->params[j].mask == 0x007f) // LSL, LSR, ASL, ASR
sprintf(buf, "#%d", val < 64 ? val : -(0x80-(s32)val));
sprintf(buf, "#%d", val < 64 ? val : -(0x80 - (s32)val));
else
sprintf(buf, "#0x%02x", val);
}
@ -239,7 +240,7 @@ char* gd_dis_params(gd_globals_t* gdg, DSPOPCTemplate* opc, u16 op1, u16 op2, ch
default:
ERROR_LOG(DSPHLE, "Unknown parameter type: %x", opc->params[j].type);
exit(-1);
// exit(-1);
break;
}
@ -320,13 +321,12 @@ u16 gd_dis_get_opcode_size(gd_globals_t* gdg)
return(opc->size & ~P_EXT);
}
char* gd_dis_opcode(gd_globals_t* gdg)
{
u32 j;
u32 op1, op2;
DSPOPCTemplate *opc = NULL;
DSPOPCTemplate *opc_ext = NULL;
const DSPOPCTemplate *opc = NULL;
const DSPOPCTemplate *opc_ext = NULL;
u16 pc;
char* buf = gdg->buffer;
bool extended;
@ -337,7 +337,7 @@ char* gd_dis_opcode(gd_globals_t* gdg)
if ((pc & 0x7fff) >= 0x1000)
{
gdg->pc++;
return(gdg->buffer);
return gdg->buffer;
}
pc &= 0x0fff;
@ -360,6 +360,11 @@ char* gd_dis_opcode(gd_globals_t* gdg)
}
}
const DSPOPCTemplate fake_op = {"CW", 0x0000, 0x0000, nop, nop, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, NULL, NULL,};
if (!opc)
opc = &fake_op;
if (opc->size & P_EXT && op1 & 0x00ff)
extended = true;
else