From e239e82ea366ffd0bf88689c702195ae03dea243 Mon Sep 17 00:00:00 2001 From: magumagu Date: Sun, 25 May 2014 18:00:34 -0700 Subject: [PATCH] Jit: Remove unused members from JitState. --- Source/Core/Core/PowerPC/Jit64/Jit.cpp | 7 ------- Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp | 1 - Source/Core/Core/PowerPC/JitArm32/Jit.cpp | 4 ---- Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp | 4 ---- Source/Core/Core/PowerPC/JitCommon/JitBase.h | 5 ----- Source/Core/Core/PowerPC/JitCommon/JitCache.h | 1 - 6 files changed, 22 deletions(-) diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 2ad723d1f55f..67b4b5a4cf45 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -422,8 +422,6 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc js.blockStart = em_address; js.fifoBytesThisBlock = 0; js.curBlock = b; - js.block_flags = 0; - js.cancel = false; jit->js.numLoadStoreInst = 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.skipnext = false; - js.blockSize = code_block.m_num_instructions; js.compilerPC = nextPC; // Translate instructions 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; i++; // Skip next instruction } - - if (js.cancel) - break; } u32 function = HLE::GetFunctionIndex(js.blockStart); @@ -683,7 +677,6 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc WriteExit(nextPC); } - b->flags = js.block_flags; b->codeSize = (u32)(GetCodePtr() - normalEntry); b->originalSize = code_block.m_num_instructions; diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index 97d6d162b246..99ca9f7f94cc 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -521,7 +521,6 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc js.blockStart = em_address; js.fifoBytesThisBlock = 0; js.curBlock = b; - js.cancel = false; jit->js.numLoadStoreInst = 0; jit->js.numFloatingPointInst = 0; diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp index 581d79f72204..ca9def624d81 100644 --- a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp @@ -333,8 +333,6 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo js.blockStart = em_address; js.fifoBytesThisBlock = 0; js.curBlock = b; - js.block_flags = 0; - js.cancel = false; u32 nextPC = em_address; // 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.skipnext = false; - js.blockSize = code_block.m_num_instructions; js.compilerPC = nextPC; const int DEBUG_OUTPUT = 0; @@ -499,7 +496,6 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo WriteExit(nextPC); } - b->flags = js.block_flags; b->codeSize = (u32)(GetCodePtr() - normalEntry); b->originalSize = code_block.m_num_instructions; FlushIcache(); diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp b/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp index 23507c1d9b6e..65f6f44d2787 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp @@ -233,8 +233,6 @@ const u8* JitArmIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB js.blockStart = em_address; js.fifoBytesThisBlock = 0; js.curBlock = b; - js.block_flags = 0; - js.cancel = false; u32 nextPC = em_address; // 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.skipnext = false; - js.blockSize = code_block.m_num_instructions; js.compilerPC = nextPC; // Translate instructions 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 WriteCode(nextPC); - b->flags = js.block_flags; b->codeSize = (u32)(GetCodePtr() - normalEntry); b->originalSize = code_block.m_num_instructions;; diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h index e2cb99514fcb..7806bd5c818c 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h @@ -54,9 +54,7 @@ class JitBase : public CPUCoreBase u32 compilerPC; u32 next_compilerPC; u32 blockStart; - bool cancel; UGeckoInstruction next_inst; // for easy peephole opt. - int blockSize; int instructionNumber; int downcountAmount; u32 numLoadStoreInst; @@ -64,11 +62,8 @@ class JitBase : public CPUCoreBase bool firstFPInstructionFound; bool isLastInstruction; - bool forceUnsafeLoad; bool memcheck; bool skipnext; - bool broken_block; - int block_flags; int fifoBytesThisBlock; diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/PowerPC/JitCommon/JitCache.h index 0837dd371a3b..4bf31c352bf8 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.h @@ -38,7 +38,6 @@ struct JitBlock u32 codeSize; u32 originalSize; int runCount; // for profiling. - int flags; bool invalid;