cemu-project_Mirror/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-04-29 14:59:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

PPCRec: Some fixes

Browse source
This commit is contained in:
Exzap 2024-10-19 02:11:26 +02:00
parent aa946ae42d
commit 4517c209d5
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Cafe/HW/Espresso/Recompiler/BackendX64/BackendX64.cpp
View file

@ -1000,7 +1000,8 @@ bool PPCRecompilerX64Gen_imlInstruction_r_r_r_carry(PPCRecFunction_t* PPCRecFunc
auto regA = _reg32(imlInstruction->op_r_r_r_carry.regA); auto regA = _reg32(imlInstruction->op_r_r_r_carry.regA);
auto regB = _reg32(imlInstruction->op_r_r_r_carry.regB); auto regB = _reg32(imlInstruction->op_r_r_r_carry.regB);
auto regCarry = _reg32(imlInstruction->op_r_r_r_carry.regCarry); auto regCarry = _reg32(imlInstruction->op_r_r_r_carry.regCarry);
cemu_assert_debug(regCarry != regR && regCarry != regA); bool carryRegIsShared = regCarry == regA || regCarry == regB;
cemu_assert_debug(regCarry != regR); // two outputs sharing the same register is undefined behavior
switch (imlInstruction->operation) switch (imlInstruction->operation)
{ {
@ -1009,9 +1010,12 @@ bool PPCRecompilerX64Gen_imlInstruction_r_r_r_carry(PPCRecFunction_t* PPCRecFunc
std::swap(regB, regA); std::swap(regB, regA);
if (regR != regA) if (regR != regA)
x64GenContext->emitter->MOV_dd(regR, regA); x64GenContext->emitter->MOV_dd(regR, regA);
x64GenContext->emitter->XOR_dd(regCarry, regCarry); if(!carryRegIsShared)
x64GenContext->emitter->XOR_dd(regCarry, regCarry);
x64GenContext->emitter->ADD_dd(regR, regB); x64GenContext->emitter->ADD_dd(regR, regB);
x64GenContext->emitter->SETcc_b(X86_CONDITION_B, _reg8_from_reg32(regCarry)); // below condition checks carry flag x64GenContext->emitter->SETcc_b(X86_CONDITION_B, _reg8_from_reg32(regCarry)); // below condition checks carry flag
if(carryRegIsShared)
x64GenContext->emitter->AND_di8(regCarry, 1); // clear upper bits
break; break;
case PPCREC_IML_OP_ADD_WITH_CARRY: case PPCREC_IML_OP_ADD_WITH_CARRY:
// assumes that carry is already correctly initialized as 0 or 1 // assumes that carry is already correctly initialized as 0 or 1

6
src/Cafe/HW/Espresso/Recompiler/IML/IMLRegisterAllocatorRanges.cpp
View file

@ -133,9 +133,11 @@ void PPCRecRARange_addLink_perVirtualGPR(std::unordered_map<IMLRegID, raLiveness
else else
{ {
// insert in first position // insert in first position
subrange->link_sameVirtualRegister.next = it->second; raLivenessRange* priorFirst = it->second;
subrange->link_sameVirtualRegister.next = priorFirst;
it->second = subrange; it->second = subrange;
subrange->link_sameVirtualRegister.prev = subrange; subrange->link_sameVirtualRegister.prev = nullptr;
priorFirst->link_sameVirtualRegister.prev = subrange;
} }
} }