Merge pull request #324 from booto/eliminate-cyles-minus-one

numCyclesMinusOne to numCycles in GekkoOPInfo
This commit is contained in:
Ryan Houdek
2014-04-30 10:45:39 -05:00
8 changed files with 243 additions and 243 deletions
@@ -193,7 +193,7 @@ int Interpreter::SingleStepInner(void)
patches();
GekkoOPInfo *opinfo = GetOpInfo(instCode);
return opinfo->numCyclesMinusOne + 1;
return opinfo->numCycles;
}
void Interpreter::SingleStep()
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -517,7 +517,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
js.op = &ops[i];
js.instructionNumber = i;
const GekkoOPInfo *opinfo = ops[i].opinfo;
js.downcountAmount += (opinfo->numCyclesMinusOne + 1);
js.downcountAmount += opinfo->numCycles;
if (i == (int)size - 1)
{
+1 -1
View File
@@ -621,7 +621,7 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
js.op = &ops[i];
js.instructionNumber = i;
const GekkoOPInfo *opinfo = GetOpInfo(ops[i].inst);
js.downcountAmount += (opinfo->numCyclesMinusOne + 1);
js.downcountAmount += opinfo->numCycles;
if (i == (int)size - 1)
{
+1 -1
View File
@@ -417,7 +417,7 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo
js.op = &ops[i];
js.instructionNumber = i;
const GekkoOPInfo *opinfo = ops[i].opinfo;
js.downcountAmount += (opinfo->numCyclesMinusOne + 1);
js.downcountAmount += opinfo->numCycles;
if (i == (int)size - 1)
{
+1 -1
View File
@@ -307,7 +307,7 @@ const u8* JitArmIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB
js.op = &ops[i];
js.instructionNumber = i;
const GekkoOPInfo *opinfo = ops[i].opinfo;
js.downcountAmount += (opinfo->numCyclesMinusOne + 1);
js.downcountAmount += opinfo->numCycles;
if (i == (int)size - 1)
{
+1 -1
View File
@@ -331,7 +331,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa,
code[i].branchTo = -1;
code[i].branchToIndex = -1;
code[i].skip = false;
numCycles += opinfo->numCyclesMinusOne + 1;
numCycles += opinfo->numCycles;
code[i].wantsCR0 = false;
code[i].wantsCR1 = false;
+1 -1
View File
@@ -78,7 +78,7 @@ struct GekkoOPInfo
const char *opname;
int type;
int flags;
int numCyclesMinusOne;
int numCycles;
u64 runCount;
int compileCount;
u32 lastUse;