Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-03-01 10:35:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove allocLock until we need it

Browse Source
This commit is contained in:
Henrik Rydgard 2013-01-09 22:46:27 +01:00
parent dafe2c389c
commit 2f4e6eaf01
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/MIPS/ARM/ArmCompALU.cpp
View File

@ -63,6 +63,7 @@ namespace MIPSComp
switch (op >> 26)
{
#if 0
case 8: // same as addiu?
case 9: //R(rt) = R(rs) + simm; break; //addiu
{
@ -87,7 +88,7 @@ namespace MIPSComp
} */
break;
}
#endif
//case 12: CompImmLogic(op, &XEmitter::AND, EvalAnd); break;
//case 13: CompImmLogic(op, &XEmitter::OR, EvalOr); break;
//case 14: CompImmLogic(op, &XEmitter::XOR, EvalXor); break;

7
Core/MIPS/ARM/ArmRegCache.cpp
View File

@ -34,7 +34,6 @@ void ArmRegCache::Start(MIPSAnalyst::AnalysisResults &stats) {
for (int i = 0; i < 16; i++) {
ar[i].mipsReg = -1;
ar[i].spillLock = false;
ar[i].allocLock = false;
ar[i].isDirty = false;
}
for (int i = 0; i < NUM_MIPSREG; i++) {
@ -79,7 +78,7 @@ allocate:
for (int i = 0; i < allocCount; i++) {
int reg = allocOrder[i];
if (ar[reg].mipsReg == -1 && !ar[reg].allocLock) {
if (ar[reg].mipsReg == -1) {
// That means it's free. Grab it, and load the value into it (if requested).
ar[reg].mipsReg = mipsReg;
ar[reg].isDirty = (mapFlags & MAP_DIRTY) ? true : false;
@ -100,7 +99,7 @@ allocate:
int bestToSpill = -1;
for (int i = 0; i < allocCount; i++) {
int reg = allocOrder[i];
if (ar[reg].spillLock || ar[reg].allocLock)
if (ar[reg].spillLock)
continue;
bestToSpill = reg;
break;
@ -112,7 +111,7 @@ allocate:
goto allocate;
}
// Uh oh, we have all them alloclocked and spilllocked....
// Uh oh, we have all them spilllocked....
ERROR_LOG(JIT, "Out of spillable registers at PC %08x!!!", mips_->pc);
return INVALID_REG;
}

4
Core/MIPS/ARM/ArmRegCache.h
View File

@ -41,7 +41,6 @@ typedef int MIPSReg;
struct RegARM {
int mipsReg; // if -1, no mipsreg attached.
bool isDirty; // Should the register be written back?
bool allocLock; // if true, this ARM register cannot be used for allocation.
bool spillLock; // if true, this register cannot be spilled.
};
@ -75,9 +74,6 @@ public:
void Init(ARMXEmitter *emitter);
void Start(MIPSAnalyst::AnalysisResults &stats);
// void AllocLock(ARMReg reg, ARMReg reg2 = INVALID_REG, ARMReg reg3 = INVALID_REG);
// void ReleaseAllocLock(ARMReg reg);
// Protect the arm register containing a MIPS register from spilling, to ensure that
// it's being kept allocated.
void SpillLock(MIPSReg reg, MIPSReg reg2 = -1, MIPSReg reg3 = -1);