wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 918023 - IonMonkey: Rename RegisterSet's maybeTake to takeUnchecked for consistency with TypedRegisterSet. r=h4writer

Browse Source
This commit is contained in:
Dan Gohman 2013-09-20 06:07:26 -07:00
parent 99b4f306fe
commit b074de76a3
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jit/CodeGenerator.cpp
View File

@ -2513,7 +2513,7 @@ CodeGenerator::visitCheckOverRecursedFailurePar(CheckOverRecursedFailurePar *ool
LCheckOverRecursedPar *lir = ool->lir(); LCheckOverRecursedPar *lir = ool->lir();
Register tempReg = ToRegister(lir->getTempReg()); Register tempReg = ToRegister(lir->getTempReg());
RegisterSet saveSet(lir->safepoint()->liveRegs()); RegisterSet saveSet(lir->safepoint()->liveRegs());
saveSet.maybeTake(tempReg); saveSet.takeUnchecked(tempReg);
masm.PushRegsInMask(saveSet); masm.PushRegsInMask(saveSet);
masm.movePtr(ToRegister(lir->forkJoinSlice()), CallTempReg0); masm.movePtr(ToRegister(lir->forkJoinSlice()), CallTempReg0);
@ -2575,7 +2575,7 @@ CodeGenerator::visitOutOfLineCheckInterruptPar(OutOfLineCheckInterruptPar *ool)
LCheckInterruptPar *lir = ool->lir; LCheckInterruptPar *lir = ool->lir;
Register tempReg = ToRegister(lir->getTempReg()); Register tempReg = ToRegister(lir->getTempReg());
RegisterSet saveSet(lir->safepoint()->liveRegs()); RegisterSet saveSet(lir->safepoint()->liveRegs());
saveSet.maybeTake(tempReg); saveSet.takeUnchecked(tempReg);
masm.PushRegsInMask(saveSet); masm.PushRegsInMask(saveSet);
masm.movePtr(ToRegister(ool->lir->forkJoinSlice()), CallTempReg0); masm.movePtr(ToRegister(ool->lir->forkJoinSlice()), CallTempReg0);
@ -3294,7 +3294,7 @@ CodeGenerator::visitOutOfLineNewGCThingPar(OutOfLineNewGCThingPar *ool)
// but don't bother to save the objReg. // but don't bother to save the objReg.
saveSet.addUnchecked(CallTempReg0); saveSet.addUnchecked(CallTempReg0);
saveSet.addUnchecked(CallTempReg1); saveSet.addUnchecked(CallTempReg1);
saveSet.maybeTake(AnyRegister(ool->objReg)); saveSet.takeUnchecked(AnyRegister(ool->objReg));
masm.PushRegsInMask(saveSet); masm.PushRegsInMask(saveSet);
masm.move32(Imm32(ool->allocKind), CallTempReg0); masm.move32(Imm32(ool->allocKind), CallTempReg0);
@ -4929,7 +4929,7 @@ CodeGenerator::visitOutOfLineStoreElementHole(OutOfLineStoreElementHole *ool)
// registers, we can examine `object` to know whether an error // registers, we can examine `object` to know whether an error
// occurred. // occurred.
RegisterSet saveSet(ins->safepoint()->liveRegs()); RegisterSet saveSet(ins->safepoint()->liveRegs());
saveSet.maybeTake(object); saveSet.takeUnchecked(object);
masm.PushRegsInMask(saveSet); masm.PushRegsInMask(saveSet);
masm.reserveStack(sizeof(PushParArgs)); masm.reserveStack(sizeof(PushParArgs));

6
js/src/jit/IonCaches.cpp
View File

@ -2151,7 +2151,7 @@ SetPropertyIC::attachGenericProxy(JSContext *cx, IonScript *ion, void *returnAdd
RegisterSet regSet(RegisterSet::All()); RegisterSet regSet(RegisterSet::All());
regSet.take(AnyRegister(object())); regSet.take(AnyRegister(object()));
if (!value().constant()) if (!value().constant())
regSet.maybeTake(value().reg()); regSet.takeUnchecked(value().reg());
Register scratch = regSet.takeGeneral(); Register scratch = regSet.takeGeneral();
masm.push(scratch); masm.push(scratch);
@ -2241,7 +2241,7 @@ GenerateCallSetter(JSContext *cx, IonScript *ion, MacroAssembler &masm,
RegisterSet regSet(RegisterSet::All()); RegisterSet regSet(RegisterSet::All());
regSet.take(AnyRegister(object)); regSet.take(AnyRegister(object));
if (!value.constant()) if (!value.constant())
regSet.maybeTake(value.reg()); regSet.takeUnchecked(value.reg());
Register scratchReg = regSet.takeGeneral(); Register scratchReg = regSet.takeGeneral();
masm.push(scratchReg); masm.push(scratchReg);
@ -2980,7 +2980,7 @@ GenerateGetTypedArrayElement(JSContext *cx, MacroAssembler &masm, IonCache::Stub
// Part 2: Call to translate the str into index // Part 2: Call to translate the str into index
RegisterSet regs = RegisterSet::Volatile(); RegisterSet regs = RegisterSet::Volatile();
masm.PushRegsInMask(regs); masm.PushRegsInMask(regs);
regs.maybeTake(str); regs.takeUnchecked(str);
Register temp = regs.takeGeneral(); Register temp = regs.takeGeneral();

2
js/src/jit/IonMacroAssembler.cpp
View File

@ -1350,7 +1350,7 @@ MacroAssembler::printf(const char *output, Register value)
RegisterSet regs = RegisterSet::Volatile(); RegisterSet regs = RegisterSet::Volatile();
PushRegsInMask(regs); PushRegsInMask(regs);
regs.maybeTake(value); regs.takeUnchecked(value);
Register temp = regs.takeGeneral(); Register temp = regs.takeGeneral();

14
js/src/jit/RegisterSets.h
View File

@ -601,26 +601,26 @@ class RegisterSet {
return other.gpr_ == gpr_ && other.fpu_ == fpu_; return other.gpr_ == gpr_ && other.fpu_ == fpu_;
} }
void maybeTake(Register reg) { void takeUnchecked(Register reg) {
gpr_.takeUnchecked(reg); gpr_.takeUnchecked(reg);
} }
void maybeTake(FloatRegister reg) { void takeUnchecked(FloatRegister reg) {
fpu_.takeUnchecked(reg); fpu_.takeUnchecked(reg);
} }
void maybeTake(AnyRegister reg) { void takeUnchecked(AnyRegister reg) {
if (reg.isFloat()) if (reg.isFloat())
fpu_.takeUnchecked(reg.fpu()); fpu_.takeUnchecked(reg.fpu());
else else
gpr_.takeUnchecked(reg.gpr()); gpr_.takeUnchecked(reg.gpr());
} }
void maybeTake(ValueOperand value) { void takeUnchecked(ValueOperand value) {
gpr_.takeUnchecked(value); gpr_.takeUnchecked(value);
} }
void maybeTake(TypedOrValueRegister reg) { void takeUnchecked(TypedOrValueRegister reg) {
if (reg.hasValue()) if (reg.hasValue())
maybeTake(reg.valueReg()); takeUnchecked(reg.valueReg());
else if (reg.hasTyped()) else if (reg.hasTyped())
maybeTake(reg.typedReg()); takeUnchecked(reg.typedReg());
} }
}; };

8
js/src/jit/shared/CodeGenerator-shared.h
View File

@ -305,22 +305,22 @@ class CodeGeneratorShared : public LInstructionVisitor
// be saved and restored in case future LIR instructions need those values.) // be saved and restored in case future LIR instructions need those values.)
void saveVolatile(Register output) { void saveVolatile(Register output) {
RegisterSet regs = RegisterSet::Volatile(); RegisterSet regs = RegisterSet::Volatile();
regs.maybeTake(output); regs.takeUnchecked(output);
masm.PushRegsInMask(regs); masm.PushRegsInMask(regs);
} }
void restoreVolatile(Register output) { void restoreVolatile(Register output) {
RegisterSet regs = RegisterSet::Volatile(); RegisterSet regs = RegisterSet::Volatile();
regs.maybeTake(output); regs.takeUnchecked(output);
masm.PopRegsInMask(regs); masm.PopRegsInMask(regs);
} }
void saveVolatile(FloatRegister output) { void saveVolatile(FloatRegister output) {
RegisterSet regs = RegisterSet::Volatile(); RegisterSet regs = RegisterSet::Volatile();
regs.maybeTake(output); regs.takeUnchecked(output);
masm.PushRegsInMask(regs); masm.PushRegsInMask(regs);
} }
void restoreVolatile(FloatRegister output) { void restoreVolatile(FloatRegister output) {
RegisterSet regs = RegisterSet::Volatile(); RegisterSet regs = RegisterSet::Volatile();
regs.maybeTake(output); regs.takeUnchecked(output);
masm.PopRegsInMask(regs); masm.PopRegsInMask(regs);
} }
void saveVolatile(RegisterSet temps) { void saveVolatile(RegisterSet temps) {