Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "jit: change our linking module to be able to handle arbitrary… 
… exit addresses"

This shouldn't cause issues, but does in Windows. Revert for now.
This reverts commit 1aa06b8.
  • Loading branch information
@Sonicadvance1
Sonicadvance1 committed Nov 25, 2013
1 parent 230e12a commit db9c586
Show file tree
Hide file tree
Showing 19 changed files with 83 additions and 92 deletions.
15 changes: 6 additions & 9 deletions Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
View file
Expand Up @@ -276,17 +276,16 @@ void Jit64::Cleanup()
ABI_CallFunctionCCC((void *)&PowerPC::UpdatePerformanceMonitor, js.downcountAmount, jit->js.numLoadStoreInst, jit->js.numFloatingPointInst);
}

void Jit64::WriteExit(u32 destination)
void Jit64::WriteExit(u32 destination, int exit_num)
{
Cleanup();

SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));

//If nobody has taken care of this yet (this can be removed when all branches are done)
JitBlock *b = js.curBlock;
JitBlock::LinkData linkData;
linkData.exitAddress = destination;
linkData.exitPtrs = GetWritableCodePtr();
b->exitAddress[exit_num] = destination;
b->exitPtrs[exit_num] = GetWritableCodePtr();

// Link opportunity!
if (jo.enableBlocklink)
Expand All @@ -296,14 +295,12 @@ void Jit64::WriteExit(u32 destination)
{
// It exists! Joy of joy!
JMP(blocks.GetBlock(block)->checkedEntry, true);
linkData.linkStatus = true;
b->linkStatus[exit_num] = true;
return;
}
}
MOV(32, M(&PC), Imm32(destination));
JMP(asm_routines.dispatcher, true);

b->linkData.push_back(linkData);
}

void Jit64::WriteExitDestInEAX()
Expand Down Expand Up @@ -628,7 +625,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
FixupBranch noBreakpoint = J_CC(CC_Z);

WriteExit(ops[i].address);
WriteExit(ops[i].address, 0);
SetJumpTarget(noBreakpoint);
}

Expand Down Expand Up @@ -710,7 +707,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
{
gpr.Flush(FLUSH_ALL);
fpr.Flush(FLUSH_ALL);
WriteExit(nextPC);
WriteExit(nextPC, 0);
}

b->flags = js.block_flags;
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/PowerPC/Jit64/Jit.h
View file
Expand Up @@ -99,7 +99,7 @@ class Jit64 : public Jitx86Base

// Utilities for use by opcodes

void WriteExit(u32 destination);
void WriteExit(u32 destination, int exit_num);
void WriteExitDestInEAX();
void WriteExceptionExit();
void WriteExternalExceptionExit();
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp
View file
Expand Up @@ -91,7 +91,7 @@ void Jit64::bx(UGeckoInstruction inst)
// make idle loops go faster
js.downcountAmount += 8;
}
WriteExit(destination);
WriteExit(destination, 0);
}

// TODO - optimize to hell and beyond
Expand Down Expand Up @@ -136,13 +136,13 @@ void Jit64::bcx(UGeckoInstruction inst)
destination = SignExt16(inst.BD << 2);
else
destination = js.compilerPC + SignExt16(inst.BD << 2);
WriteExit(destination);
WriteExit(destination, 0);

if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
SetJumpTarget( pConditionDontBranch );
if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
SetJumpTarget( pCTRDontBranch );
WriteExit(js.compilerPC + 4);
WriteExit(js.compilerPC + 4, 1);
}

void Jit64::bcctrx(UGeckoInstruction inst)
Expand Down Expand Up @@ -190,7 +190,7 @@ void Jit64::bcctrx(UGeckoInstruction inst)
WriteExitDestInEAX();
// Would really like to continue the block here, but it ends. TODO.
SetJumpTarget(b);
WriteExit(js.compilerPC + 4);
WriteExit(js.compilerPC + 4, 1);
}
}

Expand Down Expand Up @@ -245,5 +245,5 @@ void Jit64::bclrx(UGeckoInstruction inst)
SetJumpTarget( pConditionDontBranch );
if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
SetJumpTarget( pCTRDontBranch );
WriteExit(js.compilerPC + 4);
WriteExit(js.compilerPC + 4, 1);
}
10 changes: 5 additions & 5 deletions Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
View file
Expand Up @@ -400,7 +400,7 @@ void Jit64::cmpXX(UGeckoInstruction inst)
destination = SignExt16(js.next_inst.BD << 2);
else
destination = js.next_compilerPC + SignExt16(js.next_inst.BD << 2);
WriteExit(destination);
WriteExit(destination, 0);
}
else if ((js.next_inst.OPCD == 19) && (js.next_inst.SUBOP10 == 528)) // bcctrx
{
Expand All @@ -424,7 +424,7 @@ void Jit64::cmpXX(UGeckoInstruction inst)
}
else
{
WriteExit(js.next_compilerPC + 4);
WriteExit(js.next_compilerPC + 4, 0);
}

js.cancel = true;
Expand Down Expand Up @@ -507,7 +507,7 @@ void Jit64::cmpXX(UGeckoInstruction inst)
destination = SignExt16(js.next_inst.BD << 2);
else
destination = js.next_compilerPC + SignExt16(js.next_inst.BD << 2);
WriteExit(destination);
WriteExit(destination, 0);
}
else if ((js.next_inst.OPCD == 19) && (js.next_inst.SUBOP10 == 528)) // bcctrx
{
Expand All @@ -534,7 +534,7 @@ void Jit64::cmpXX(UGeckoInstruction inst)
if (!!(4 & test_bit) == condition) SetJumpTarget(continue2);
if (!!(2 & test_bit) == condition) SetJumpTarget(continue1);

WriteExit(js.next_compilerPC + 4);
WriteExit(js.next_compilerPC + 4, 1);

js.cancel = true;
}
Expand Down Expand Up @@ -2221,5 +2221,5 @@ void Jit64::twx(UGeckoInstruction inst)
SetJumpTarget(exit3);
SetJumpTarget(exit4);
SetJumpTarget(exit5);
WriteExit(js.compilerPC + 4);
WriteExit(js.compilerPC + 4, 1);
}
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
View file
Expand Up @@ -480,5 +480,5 @@ void Jit64::stmw(UGeckoInstruction inst)
void Jit64::icbi(UGeckoInstruction inst)
{
Default(inst);
WriteExit(js.compilerPC + 4);
WriteExit(js.compilerPC + 4, 0);
}
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp
View file
Expand Up @@ -137,7 +137,7 @@ void Jit64::mtmsr(UGeckoInstruction inst)
SetJumpTarget(noExceptionsPending);
SetJumpTarget(eeDisabled);

WriteExit(js.compilerPC + 4);
WriteExit(js.compilerPC + 4, 0);

js.firstFPInstructionFound = false;
}
Expand Down
13 changes: 6 additions & 7 deletions Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
View file
Expand Up @@ -552,8 +552,7 @@ static void regEmitICmpInst(RegInfo& RI, InstLoc I, CCFlags flag) {

static void regWriteExit(RegInfo& RI, InstLoc dest) {
if (isImm(*dest)) {
RI.exitNumber++;
RI.Jit->WriteExit(RI.Build->GetImmValue(dest));
RI.Jit->WriteExit(RI.Build->GetImmValue(dest), RI.exitNumber++);
} else {
RI.Jit->WriteExitDestInOpArg(regLocForInst(RI, dest));
}
Expand All @@ -565,7 +564,7 @@ static bool checkIsSNAN() {
return MathUtil::IsSNAN(isSNANTemp[0][0]) || MathUtil::IsSNAN(isSNANTemp[1][0]);
}

static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress) {
static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit) {
//printf("Writing block: %x\n", js.blockStart);
RegInfo RI(Jit, ibuild->getFirstInst(), ibuild->getNumInsts());
RI.Build = ibuild;
Expand Down Expand Up @@ -1792,7 +1791,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress) {
Jit->ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckBreakPoints));
Jit->TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
FixupBranch noBreakpoint = Jit->J_CC(CC_Z);
Jit->WriteExit(InstLoc);
Jit->WriteExit(InstLoc, 0);
Jit->SetJumpTarget(noBreakpoint);
break;
}
Expand Down Expand Up @@ -1820,10 +1819,10 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress) {
}
}

Jit->WriteExit(exitAddress);
Jit->WriteExit(jit->js.curBlock->exitAddress[0], 0);
Jit->UD2();
}

void JitIL::WriteCode(u32 exitAddress) {
DoWriteCode(&ibuild, this, exitAddress);
void JitIL::WriteCode() {
DoWriteCode(&ibuild, this);
}
18 changes: 7 additions & 11 deletions Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
View file
Expand Up @@ -381,7 +381,7 @@ void JitIL::Cleanup()
ABI_CallFunctionCCC((void *)&PowerPC::UpdatePerformanceMonitor, js.downcountAmount, jit->js.numLoadStoreInst, jit->js.numFloatingPointInst);
}

void JitIL::WriteExit(u32 destination)
void JitIL::WriteExit(u32 destination, int exit_num)
{
Cleanup();
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling) {
Expand All @@ -391,24 +391,22 @@ void JitIL::WriteExit(u32 destination)

//If nobody has taken care of this yet (this can be removed when all branches are done)
JitBlock *b = js.curBlock;
JitBlock::LinkData linkData;
linkData.exitAddress = destination;
linkData.exitPtrs = GetWritableCodePtr();
b->exitAddress[exit_num] = destination;
b->exitPtrs[exit_num] = GetWritableCodePtr();

// Link opportunity!
int block = blocks.GetBlockNumberFromStartAddress(destination);
if (block >= 0 && jo.enableBlocklink)
{
// It exists! Joy of joy!
JMP(blocks.GetBlock(block)->checkedEntry, true);
linkData.linkStatus = true;
b->linkStatus[exit_num] = true;
}
else
{
MOV(32, M(&PC), Imm32(destination));
JMP(asm_routines.dispatcher, true);
}
b->linkData.push_back(linkData);
}

void JitIL::WriteExitDestInOpArg(const Gen::OpArg& arg)
Expand Down Expand Up @@ -543,16 +541,14 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc

// Analyze the block, collect all instructions it is made of (including inlining,
// if that is enabled), reorder instructions for optimal performance, and join joinable instructions.
u32 exitAddress = em_address;

b->exitAddress[0] = em_address;
u32 merged_addresses[32];
const int capacity_of_merged_addresses = sizeof(merged_addresses) / sizeof(merged_addresses[0]);
int size_of_merged_addresses = 0;
if (!memory_exception)
{
// If there is a memory exception inside a block (broken_block==true), compile up to that instruction.
// TODO
exitAddress = PPCAnalyst::Flatten(em_address, &size, &js.st, &js.gpa, &js.fpa, broken_block, code_buf, blockSize, merged_addresses, capacity_of_merged_addresses, size_of_merged_addresses);
b->exitAddress[0] = PPCAnalyst::Flatten(em_address, &size, &js.st, &js.gpa, &js.fpa, broken_block, code_buf, blockSize, merged_addresses, capacity_of_merged_addresses, size_of_merged_addresses);
}
PPCAnalyst::CodeOp *ops = code_buf->codebuffer;

Expand Down Expand Up @@ -711,7 +707,7 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
}

// Perform actual code generation
WriteCode(exitAddress);
WriteCode();

b->codeSize = (u32)(GetCodePtr() - normalEntry);
b->originalSize = size;
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h
View file
Expand Up @@ -105,7 +105,7 @@ class JitIL : public JitILBase, public EmuCodeBlock

// Utilities for use by opcodes

void WriteExit(u32 destination);
void WriteExit(u32 destination, int exit_num);
void WriteExitDestInOpArg(const Gen::OpArg& arg);
void WriteExceptionExit();
void WriteRfiExitDestInOpArg(const Gen::OpArg& arg);
Expand All @@ -121,7 +121,7 @@ class JitIL : public JitILBase, public EmuCodeBlock
void regimmop(int d, int a, bool binary, u32 value, Operation doop, void (Gen::XEmitter::*op)(int, const Gen::OpArg&, const Gen::OpArg&), bool Rc = false, bool carry = false);
void fp_tri_op(int d, int a, int b, bool reversible, bool dupe, void (Gen::XEmitter::*op)(Gen::X64Reg, Gen::OpArg));

void WriteCode(u32 exitAddress);
void WriteCode();

// OPCODES
void unknown_instruction(UGeckoInstruction _inst) override;
Expand Down
13 changes: 5 additions & 8 deletions Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp
View file
Expand Up @@ -186,24 +186,23 @@ void JitArm::WriteExceptionExit()
MOVI2R(A, (u32)asm_routines.testExceptions);
B(A);
}
void JitArm::WriteExit(u32 destination)
void JitArm::WriteExit(u32 destination, int exit_num)
{
Cleanup();

DoDownCount();
//If nobody has taken care of this yet (this can be removed when all branches are done)
JitBlock *b = js.curBlock;
JitBlock::LinkData linkData;
linkData.exitAddress = destination;
linkData.exitPtrs = GetWritableCodePtr();
b->exitAddress[exit_num] = destination;
b->exitPtrs[exit_num] = GetWritableCodePtr();

// Link opportunity!
int block = blocks.GetBlockNumberFromStartAddress(destination);
if (block >= 0 && jo.enableBlocklink)
{
// It exists! Joy of joy!
B(blocks.GetBlock(block)->checkedEntry);
linkData.linkStatus = true;
b->linkStatus[exit_num] = true;
}
else
{
Expand All @@ -213,8 +212,6 @@ void JitArm::WriteExit(u32 destination)
MOVI2R(A, (u32)asm_routines.dispatcher);
B(A);
}

b->linkData.push_back(linkData);
}

void STACKALIGN JitArm::Run()
Expand Down Expand Up @@ -499,7 +496,7 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo
if (broken_block)
{
printf("Broken Block going to 0x%08x\n", nextPC);
WriteExit(nextPC);
WriteExit(nextPC, 0);
}

b->flags = js.block_flags;
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
View file
Expand Up @@ -109,7 +109,7 @@ class JitArm : public JitBase, public ArmGen::ARMXCodeBlock

// Utilities for use by opcodes

void WriteExit(u32 destination);
void WriteExit(u32 destination, int exit_num);
void WriteExitDestInR(ARMReg Reg);
void WriteRfiExitDestInR(ARMReg Reg);
void WriteExceptionExit();
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp
View file
Expand Up @@ -154,7 +154,7 @@ void JitArm::bx(UGeckoInstruction inst)
MOVI2R(R14, (u32)asm_routines.testExceptions);
B(R14);
}
WriteExit(destination);
WriteExit(destination, 0);
}

void JitArm::bcx(UGeckoInstruction inst)
Expand Down Expand Up @@ -209,14 +209,14 @@ void JitArm::bcx(UGeckoInstruction inst)
destination = SignExt16(inst.BD << 2);
else
destination = js.compilerPC + SignExt16(inst.BD << 2);
WriteExit(destination);
WriteExit(destination, 0);

if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
SetJumpTarget( pConditionDontBranch );
if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
SetJumpTarget( pCTRDontBranch );

WriteExit(js.compilerPC + 4);
WriteExit(js.compilerPC + 4, 1);
}
void JitArm::bcctrx(UGeckoInstruction inst)
{
Expand Down Expand Up @@ -278,7 +278,7 @@ void JitArm::bcctrx(UGeckoInstruction inst)
WriteExitDestInR(rA);

SetJumpTarget(b);
WriteExit(js.compilerPC + 4);
WriteExit(js.compilerPC + 4, 1);
}
}
void JitArm::bclrx(UGeckoInstruction inst)
Expand Down Expand Up @@ -355,5 +355,5 @@ void JitArm::bclrx(UGeckoInstruction inst)
SetJumpTarget( pConditionDontBranch );
if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
SetJumpTarget( pCTRDontBranch );
WriteExit(js.compilerPC + 4);
WriteExit(js.compilerPC + 4, 1);
}
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
View file
Expand Up @@ -531,6 +531,6 @@ void JitArm::dcbst(UGeckoInstruction inst)
void JitArm::icbi(UGeckoInstruction inst)
{
Default(inst);
WriteExit(js.compilerPC + 4);
WriteExit(js.compilerPC + 4, 0);
}

0 comments on commit db9c586

Please sign in to comment.