mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 918023 - IonMonkey: Rename RegisterSet's maybeTake to takeUnchecked for consistency with TypedRegisterSet. r=h4writer
This commit is contained in:
parent
99b4f306fe
commit
b074de76a3
@ -2513,7 +2513,7 @@ CodeGenerator::visitCheckOverRecursedFailurePar(CheckOverRecursedFailurePar *ool
|
||||
LCheckOverRecursedPar *lir = ool->lir();
|
||||
Register tempReg = ToRegister(lir->getTempReg());
|
||||
RegisterSet saveSet(lir->safepoint()->liveRegs());
|
||||
saveSet.maybeTake(tempReg);
|
||||
saveSet.takeUnchecked(tempReg);
|
||||
|
||||
masm.PushRegsInMask(saveSet);
|
||||
masm.movePtr(ToRegister(lir->forkJoinSlice()), CallTempReg0);
|
||||
@ -2575,7 +2575,7 @@ CodeGenerator::visitOutOfLineCheckInterruptPar(OutOfLineCheckInterruptPar *ool)
|
||||
LCheckInterruptPar *lir = ool->lir;
|
||||
Register tempReg = ToRegister(lir->getTempReg());
|
||||
RegisterSet saveSet(lir->safepoint()->liveRegs());
|
||||
saveSet.maybeTake(tempReg);
|
||||
saveSet.takeUnchecked(tempReg);
|
||||
|
||||
masm.PushRegsInMask(saveSet);
|
||||
masm.movePtr(ToRegister(ool->lir->forkJoinSlice()), CallTempReg0);
|
||||
@ -3294,7 +3294,7 @@ CodeGenerator::visitOutOfLineNewGCThingPar(OutOfLineNewGCThingPar *ool)
|
||||
// but don't bother to save the objReg.
|
||||
saveSet.addUnchecked(CallTempReg0);
|
||||
saveSet.addUnchecked(CallTempReg1);
|
||||
saveSet.maybeTake(AnyRegister(ool->objReg));
|
||||
saveSet.takeUnchecked(AnyRegister(ool->objReg));
|
||||
|
||||
masm.PushRegsInMask(saveSet);
|
||||
masm.move32(Imm32(ool->allocKind), CallTempReg0);
|
||||
@ -4929,7 +4929,7 @@ CodeGenerator::visitOutOfLineStoreElementHole(OutOfLineStoreElementHole *ool)
|
||||
// registers, we can examine `object` to know whether an error
|
||||
// occurred.
|
||||
RegisterSet saveSet(ins->safepoint()->liveRegs());
|
||||
saveSet.maybeTake(object);
|
||||
saveSet.takeUnchecked(object);
|
||||
|
||||
masm.PushRegsInMask(saveSet);
|
||||
masm.reserveStack(sizeof(PushParArgs));
|
||||
|
@ -2151,7 +2151,7 @@ SetPropertyIC::attachGenericProxy(JSContext *cx, IonScript *ion, void *returnAdd
|
||||
RegisterSet regSet(RegisterSet::All());
|
||||
regSet.take(AnyRegister(object()));
|
||||
if (!value().constant())
|
||||
regSet.maybeTake(value().reg());
|
||||
regSet.takeUnchecked(value().reg());
|
||||
|
||||
Register scratch = regSet.takeGeneral();
|
||||
masm.push(scratch);
|
||||
@ -2241,7 +2241,7 @@ GenerateCallSetter(JSContext *cx, IonScript *ion, MacroAssembler &masm,
|
||||
RegisterSet regSet(RegisterSet::All());
|
||||
regSet.take(AnyRegister(object));
|
||||
if (!value.constant())
|
||||
regSet.maybeTake(value.reg());
|
||||
regSet.takeUnchecked(value.reg());
|
||||
Register scratchReg = regSet.takeGeneral();
|
||||
masm.push(scratchReg);
|
||||
|
||||
@ -2980,7 +2980,7 @@ GenerateGetTypedArrayElement(JSContext *cx, MacroAssembler &masm, IonCache::Stub
|
||||
// Part 2: Call to translate the str into index
|
||||
RegisterSet regs = RegisterSet::Volatile();
|
||||
masm.PushRegsInMask(regs);
|
||||
regs.maybeTake(str);
|
||||
regs.takeUnchecked(str);
|
||||
|
||||
Register temp = regs.takeGeneral();
|
||||
|
||||
|
@ -1350,7 +1350,7 @@ MacroAssembler::printf(const char *output, Register value)
|
||||
RegisterSet regs = RegisterSet::Volatile();
|
||||
PushRegsInMask(regs);
|
||||
|
||||
regs.maybeTake(value);
|
||||
regs.takeUnchecked(value);
|
||||
|
||||
Register temp = regs.takeGeneral();
|
||||
|
||||
|
@ -601,26 +601,26 @@ class RegisterSet {
|
||||
return other.gpr_ == gpr_ && other.fpu_ == fpu_;
|
||||
}
|
||||
|
||||
void maybeTake(Register reg) {
|
||||
void takeUnchecked(Register reg) {
|
||||
gpr_.takeUnchecked(reg);
|
||||
}
|
||||
void maybeTake(FloatRegister reg) {
|
||||
void takeUnchecked(FloatRegister reg) {
|
||||
fpu_.takeUnchecked(reg);
|
||||
}
|
||||
void maybeTake(AnyRegister reg) {
|
||||
void takeUnchecked(AnyRegister reg) {
|
||||
if (reg.isFloat())
|
||||
fpu_.takeUnchecked(reg.fpu());
|
||||
else
|
||||
gpr_.takeUnchecked(reg.gpr());
|
||||
}
|
||||
void maybeTake(ValueOperand value) {
|
||||
void takeUnchecked(ValueOperand value) {
|
||||
gpr_.takeUnchecked(value);
|
||||
}
|
||||
void maybeTake(TypedOrValueRegister reg) {
|
||||
void takeUnchecked(TypedOrValueRegister reg) {
|
||||
if (reg.hasValue())
|
||||
maybeTake(reg.valueReg());
|
||||
takeUnchecked(reg.valueReg());
|
||||
else if (reg.hasTyped())
|
||||
maybeTake(reg.typedReg());
|
||||
takeUnchecked(reg.typedReg());
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -305,22 +305,22 @@ class CodeGeneratorShared : public LInstructionVisitor
|
||||
// be saved and restored in case future LIR instructions need those values.)
|
||||
void saveVolatile(Register output) {
|
||||
RegisterSet regs = RegisterSet::Volatile();
|
||||
regs.maybeTake(output);
|
||||
regs.takeUnchecked(output);
|
||||
masm.PushRegsInMask(regs);
|
||||
}
|
||||
void restoreVolatile(Register output) {
|
||||
RegisterSet regs = RegisterSet::Volatile();
|
||||
regs.maybeTake(output);
|
||||
regs.takeUnchecked(output);
|
||||
masm.PopRegsInMask(regs);
|
||||
}
|
||||
void saveVolatile(FloatRegister output) {
|
||||
RegisterSet regs = RegisterSet::Volatile();
|
||||
regs.maybeTake(output);
|
||||
regs.takeUnchecked(output);
|
||||
masm.PushRegsInMask(regs);
|
||||
}
|
||||
void restoreVolatile(FloatRegister output) {
|
||||
RegisterSet regs = RegisterSet::Volatile();
|
||||
regs.maybeTake(output);
|
||||
regs.takeUnchecked(output);
|
||||
masm.PopRegsInMask(regs);
|
||||
}
|
||||
void saveVolatile(RegisterSet temps) {
|
||||
|
Loading…
Reference in New Issue
Block a user