Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

riscv: Cleanup some pointerification flags.

Browse source
This commit is contained in:
Unknown W. Brackets 2023-07-23 21:17:39 -07:00
parent 18c48681a8
commit b6f83ca969
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Core/MIPS/RiscV/RiscVRegCache.cpp
View file

@ -55,6 +55,7 @@ void RiscVRegCache::Start() {
for (int i = 0; i < numStatics; i++) {
ar[statics[i].ar].mipsReg = statics[i].mr;
ar[statics[i].ar].pointerified = statics[i].pointerified && jo_->enablePointerify;
ar[statics[i].ar].normalized32 = false;
mr[statics[i].mr].loc = MIPSLoc::RVREG;
mr[statics[i].mr].reg = statics[i].ar;
mr[statics[i].mr].isStatic = true;
@ -112,9 +113,11 @@ void RiscVRegCache::EmitLoadStaticRegisters() {
const StaticAllocation *allocs = GetStaticAllocations(count);
for (int i = 0; i < count; i++) {
int offset = GetMipsRegOffset(allocs[i].mr);
emit_->LW(allocs[i].ar, CTXREG, offset);
if (allocs[i].pointerified && jo_->enablePointerify) {
emit_->LWU(allocs[i].ar, CTXREG, offset);
emit_->ADD(allocs[i].ar, allocs[i].ar, MEMBASEREG);
} else {
emit_->LW(allocs[i].ar, CTXREG, offset);
}
}
}
@ -230,35 +233,33 @@ RiscVGen::RiscVReg RiscVRegCache::Normalize32(IRRegIndex mipsReg, RiscVGen::Risc
case MIPSLoc::RVREG_IMM:
if (!ar[mr[mipsReg].reg].normalized32) {
if (destReg == INVALID_REG) {
emit_->ADDIW(mr[mipsReg].reg, mr[mipsReg].reg, 0);
emit_->SEXT_W(mr[mipsReg].reg, mr[mipsReg].reg);
ar[mr[mipsReg].reg].normalized32 = true;
ar[mr[mipsReg].reg].pointerified = false;
} else {
emit_->ADDIW(destReg, mr[mipsReg].reg, 0);
emit_->SEXT_W(destReg, mr[mipsReg].reg);
}
} else if (destReg != INVALID_REG) {
emit_->ADDIW(destReg, mr[mipsReg].reg, 0);
emit_->SEXT_W(destReg, mr[mipsReg].reg);
}
ar[mr[mipsReg].reg].pointerified = false;
break;
case MIPSLoc::RVREG_AS_PTR:
_dbg_assert_(ar[mr[mipsReg].reg].normalized32 == false);
if (destReg == INVALID_REG) {
// If we can pointerify, ADDIW will be enough.
// If we can pointerify, SEXT_W will be enough.
if (!jo_->enablePointerify)
emit_->SUB(mr[mipsReg].reg, mr[mipsReg].reg, MEMBASEREG);
emit_->ADDIW(mr[mipsReg].reg, mr[mipsReg].reg, 0);
emit_->SEXT_W(mr[mipsReg].reg, mr[mipsReg].reg);
mr[mipsReg].loc = MIPSLoc::RVREG;
ar[mr[mipsReg].reg].normalized32 = true;
ar[mr[mipsReg].reg].pointerified = false;
} else if (!jo_->enablePointerify) {
emit_->SUB(destReg, mr[mipsReg].reg, MEMBASEREG);
emit_->ADDIW(destReg, destReg, 0);
emit_->SEXT_W(destReg, destReg);
} else {
emit_->ADDIW(destReg, mr[mipsReg].reg, 0);
emit_->SEXT_W(destReg, mr[mipsReg].reg);
}
ar[mr[mipsReg].reg].pointerified = false;
break;
}
@ -471,7 +472,6 @@ RiscVReg RiscVRegCache::MapReg(IRRegIndex mipsReg, MIPSMap mapFlags) {
_dbg_assert_(!ar[riscvReg].isDirty && (mapFlags & MIPSMap::DIRTY) != MIPSMap::DIRTY);
#endif
emit_->SUB(riscvReg, riscvReg, MEMBASEREG);
ar[riscvReg].normalized32 = false;
}
mr[mipsReg].loc = MIPSLoc::RVREG;
ar[riscvReg].normalized32 = false;