fixed the mask chekcing

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2838 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-04-02 18:40:09 +00:00
parent 6d9b2754e5
commit 52c261e68e
1 changed files with 12 additions and 11 deletions

View File

@ -208,9 +208,9 @@ DSPOPCTemplate opcodes[] =
{"TSTA?", 0xa100, 0xe7ff, DSPInterpreter::tsta, nop, 1 | P_EXT, 3, {{P_REG18, 1, 0, 11, 0x1000}, {P_REG19, 1, 0, 10, 0x0800}, {P_ACCM, 1, 0, 8, 0x0100}}, NULL, NULL,}, {"TSTA?", 0xa100, 0xe7ff, DSPInterpreter::tsta, nop, 1 | P_EXT, 3, {{P_REG18, 1, 0, 11, 0x1000}, {P_REG19, 1, 0, 10, 0x0800}, {P_ACCM, 1, 0, 8, 0x0100}}, NULL, NULL,},
// assemble CW // assemble CW
{"CW", 0x0000, 0xffff, nop, nop, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, NULL, NULL,}, //{"CW", 0x0000, 0xffff, nop, nop, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, NULL, NULL,},
// unknown opcode for disassemble // unknown opcode for disassemble
{"CW", 0x0000, 0x0000, nop, nop, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, NULL, NULL,}, // {"CW", 0x0000, 0x0000, nop, nop, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, NULL, NULL,},
}; };
DSPOPCTemplate opcodes_ext[] = DSPOPCTemplate opcodes_ext[] =
@ -259,13 +259,14 @@ void InitInstructionTable()
for(u32 i = 0; i < OPTABLE_SIZE; i++) { for(u32 i = 0; i < OPTABLE_SIZE; i++) {
for(u32 j = 0; j < opcodes_size; j++) for(u32 j = 0; j < opcodes_size; j++)
if((opcodes[j].opcode_mask & i) == opcodes[j].opcode_mask) { if((opcodes[j].opcode_mask & i) == opcodes[j].opcode) {
if (opTable[i] == DSPInterpreter::unknown) { if (opTable[i] == DSPInterpreter::unknown) {
opTable[i] = opcodes[j].interpFunc; opTable[i] = opcodes[j].interpFunc;
prologueTable[i] = opcodes[j].prologue; prologueTable[i] = opcodes[j].prologue;
epilogueTable[i] = opcodes[j].epilogue; epilogueTable[i] = opcodes[j].epilogue;
} else } else {
ERROR_LOG(DSPHLE, "opcode table place %d already in use for %d", i, j); ERROR_LOG(DSPHLE, "opcode table place %d already in use for %s", i, opcodes[j].name);
}
} }
} }
} }