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

Merge pull request #417 from magumagu/jit-unused-flags

Browse Source 
Jit: Remove unused members from JitState.
This commit is contained in:
Pierre Bourdon
2014-05-28 12:00:46 +02:00
parent 5abd518eb9 e239e82ea3
commit 3c722b6be7
6 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/PowerPC/Jit64/Jit.cpp
View File

@ -422,8 +422,6 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
js.blockStart = em_address; js.blockStart = em_address;
js.fifoBytesThisBlock = 0; js.fifoBytesThisBlock = 0;
js.curBlock = b; js.curBlock = b;
js.block_flags = 0;
js.cancel = false;
jit->js.numLoadStoreInst = 0; jit->js.numLoadStoreInst = 0;
jit->js.numFloatingPointInst = 0; jit->js.numFloatingPointInst = 0;
@ -478,7 +476,6 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
js.downcountAmount += PatchEngine::GetSpeedhackCycles(code_block.m_address); js.downcountAmount += PatchEngine::GetSpeedhackCycles(code_block.m_address);
js.skipnext = false; js.skipnext = false;
js.blockSize = code_block.m_num_instructions;
js.compilerPC = nextPC; js.compilerPC = nextPC;
// Translate instructions // Translate instructions
for (u32 i = 0; i < code_block.m_num_instructions; i++) for (u32 i = 0; i < code_block.m_num_instructions; i++)
@ -639,9 +636,6 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
js.skipnext = false; js.skipnext = false;
i++; // Skip next instruction i++; // Skip next instruction
} }
if (js.cancel)
break;
} }
u32 function = HLE::GetFunctionIndex(js.blockStart); u32 function = HLE::GetFunctionIndex(js.blockStart);
@ -683,7 +677,6 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
WriteExit(nextPC); WriteExit(nextPC);
} }
b->flags = js.block_flags;
b->codeSize = (u32)(GetCodePtr() - normalEntry); b->codeSize = (u32)(GetCodePtr() - normalEntry);
b->originalSize = code_block.m_num_instructions; b->originalSize = code_block.m_num_instructions;

1
Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
View File

@ -521,7 +521,6 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
js.blockStart = em_address; js.blockStart = em_address;
js.fifoBytesThisBlock = 0; js.fifoBytesThisBlock = 0;
js.curBlock = b; js.curBlock = b;
js.cancel = false;
jit->js.numLoadStoreInst = 0; jit->js.numLoadStoreInst = 0;
jit->js.numFloatingPointInst = 0; jit->js.numFloatingPointInst = 0;

4
Source/Core/Core/PowerPC/JitArm32/Jit.cpp
View File

@ -333,8 +333,6 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo
js.blockStart = em_address; js.blockStart = em_address;
js.fifoBytesThisBlock = 0; js.fifoBytesThisBlock = 0;
js.curBlock = b; js.curBlock = b;
js.block_flags = 0;
js.cancel = false;
u32 nextPC = em_address; u32 nextPC = em_address;
// Analyze the block, collect all instructions it is made of (including inlining, // Analyze the block, collect all instructions it is made of (including inlining,
@ -409,7 +407,6 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo
js.downcountAmount += PatchEngine::GetSpeedhackCycles(em_address); js.downcountAmount += PatchEngine::GetSpeedhackCycles(em_address);
js.skipnext = false; js.skipnext = false;
js.blockSize = code_block.m_num_instructions;
js.compilerPC = nextPC; js.compilerPC = nextPC;
const int DEBUG_OUTPUT = 0; const int DEBUG_OUTPUT = 0;
@ -499,7 +496,6 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo
WriteExit(nextPC); WriteExit(nextPC);
} }
b->flags = js.block_flags;
b->codeSize = (u32)(GetCodePtr() - normalEntry); b->codeSize = (u32)(GetCodePtr() - normalEntry);
b->originalSize = code_block.m_num_instructions; b->originalSize = code_block.m_num_instructions;
FlushIcache(); FlushIcache();

4
Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp
View File

@ -233,8 +233,6 @@ const u8* JitArmIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB
js.blockStart = em_address; js.blockStart = em_address;
js.fifoBytesThisBlock = 0; js.fifoBytesThisBlock = 0;
js.curBlock = b; js.curBlock = b;
js.block_flags = 0;
js.cancel = false;
u32 nextPC = em_address; u32 nextPC = em_address;
// Analyze the block, collect all instructions it is made of (including inlining, // Analyze the block, collect all instructions it is made of (including inlining,
@ -286,7 +284,6 @@ const u8* JitArmIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB
js.downcountAmount += PatchEngine::GetSpeedhackCycles(em_address); js.downcountAmount += PatchEngine::GetSpeedhackCycles(em_address);
js.skipnext = false; js.skipnext = false;
js.blockSize = code_block.m_num_instructions;
js.compilerPC = nextPC; js.compilerPC = nextPC;
// Translate instructions // Translate instructions
for (u32 i = 0; i < code_block.m_num_instructions; i++) for (u32 i = 0; i < code_block.m_num_instructions; i++)
@ -345,7 +342,6 @@ const u8* JitArmIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB
// Perform actual code generation // Perform actual code generation
WriteCode(nextPC); WriteCode(nextPC);
b->flags = js.block_flags;
b->codeSize = (u32)(GetCodePtr() - normalEntry); b->codeSize = (u32)(GetCodePtr() - normalEntry);
b->originalSize = code_block.m_num_instructions;; b->originalSize = code_block.m_num_instructions;;

5
Source/Core/Core/PowerPC/JitCommon/JitBase.h
View File

@ -54,9 +54,7 @@ protected:
u32 compilerPC; u32 compilerPC;
u32 next_compilerPC; u32 next_compilerPC;
u32 blockStart; u32 blockStart;
bool cancel;
UGeckoInstruction next_inst; // for easy peephole opt. UGeckoInstruction next_inst; // for easy peephole opt.
int blockSize;
int instructionNumber; int instructionNumber;
int downcountAmount; int downcountAmount;
u32 numLoadStoreInst; u32 numLoadStoreInst;
@ -64,11 +62,8 @@ protected:
bool firstFPInstructionFound; bool firstFPInstructionFound;
bool isLastInstruction; bool isLastInstruction;
bool forceUnsafeLoad;
bool memcheck; bool memcheck;
bool skipnext; bool skipnext;
bool broken_block;
int block_flags;
int fifoBytesThisBlock; int fifoBytesThisBlock;

1
Source/Core/Core/PowerPC/JitCommon/JitCache.h
View File

@ -38,7 +38,6 @@ struct JitBlock
u32 codeSize; u32 codeSize;
u32 originalSize; u32 originalSize;
int runCount; // for profiling. int runCount; // for profiling.
int flags;
bool invalid; bool invalid;