ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some boundary issues in PPCAnalyst. This fixes Rogue Leader and other MMU games. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6009 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
skidau 2010-07-31 02:29:11 +00:00
parent 12be9952ab
commit 432335cda5
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
View File

@ -319,23 +319,19 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, Bloc
int numSystemInstructions = 0; int numSystemInstructions = 0;
for (int i = 0; i < maxsize; i++) for (int i = 0; i < maxsize; i++)
{ {
num_inst++; UGeckoInstruction inst = Memory::Read_Opcode_JIT(address);
memset(&code[i], 0, sizeof(CodeOp));
code[i].address = address;
UGeckoInstruction inst = Memory::Read_Opcode_JIT(code[i].address);
if (inst.hex != 0) if (inst.hex != 0)
{ {
num_inst++;
memset(&code[i], 0, sizeof(CodeOp));
GekkoOPInfo *opinfo = GetOpInfo(inst);
code[i].opinfo = opinfo;
code[i].address = address;
code[i].inst = inst; code[i].inst = inst;
code[i].branchTo = -1; code[i].branchTo = -1;
code[i].branchToIndex = -1; code[i].branchToIndex = -1;
code[i].skip = false; code[i].skip = false;
GekkoOPInfo *opinfo = GetOpInfo(inst); numCycles += opinfo->numCyclesMinusOne + 1;
code[i].opinfo = opinfo;
if (opinfo)
numCycles += opinfo->numCyclesMinusOne + 1;
_assert_msg_(POWERPC, opinfo != 0, "Invalid Op - Error flattening %08x op %08x", address + i*4, inst.hex);
code[i].wantsCR0 = false; code[i].wantsCR0 = false;
code[i].wantsCR1 = false; code[i].wantsCR1 = false;
@ -477,7 +473,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, Bloc
st->numCycles = numCycles; st->numCycles = numCycles;
// Instruction Reordering Pass // Instruction Reordering Pass
if (num_inst > 2) if (num_inst > 1)
{ {
// Bubble down compares towards branches, so that they can be merged. // Bubble down compares towards branches, so that they can be merged.
// -2: -1 for the pair, -1 for not swapping with the final instruction which is probably the branch. // -2: -1 for the pair, -1 for not swapping with the final instruction which is probably the branch.
@ -500,7 +496,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, Bloc
} }
} }
if (!foundExit && num_inst > 1) if (!foundExit && num_inst > 0)
{ {
// A broken block is a block that does not end in a branch // A broken block is a block that does not end in a branch
broken_block = true; broken_block = true;