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 885169 - Spidermonkey: Alleviate register allocation constraints in ICGetElem_Arguments::Compiler::generateStubCode. r=nbp

Browse Source
This commit is contained in:
Dan Gohman 2013-09-04 21:16:07 -07:00
parent b6921fe685
commit 6620296d07
3 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/jit/BaselineIC.cpp
View File

@ -3970,7 +3970,7 @@ ICGetElem_Arguments::Compiler::generateStubCode(MacroAssembler &masm)
regs = availableGeneralRegs(0);
regs.takeUnchecked(objReg);
regs.takeUnchecked(idxReg);
regs.takeUnchecked(scratchReg);
regs.take(scratchReg);
Register argData = regs.takeAny();
Register tempReg = regs.takeAny();
@ -3992,6 +3992,7 @@ ICGetElem_Arguments::Compiler::generateStubCode(MacroAssembler &masm)
masm.addPtr(Imm32(ArgumentsData::offsetOfArgs()), argData);
regs.add(scratchReg);
regs.add(tempReg);
regs.add(argData);
ValueOperand tempVal = regs.takeAnyValue();
masm.loadValue(BaseIndex(argData, idxReg, ScaleFromElemWidth(sizeof(Value))), tempVal);

30
js/src/jit/arm/MacroAssembler-arm.h
View File

@ -954,12 +954,30 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
void moveValue(const Value &val, const ValueOperand &dest);
void moveValue(const ValueOperand &src, const ValueOperand &dest) {
JS_ASSERT(src.typeReg() != dest.payloadReg());
JS_ASSERT(src.payloadReg() != dest.typeReg());
if (src.typeReg() != dest.typeReg())
ma_mov(src.typeReg(), dest.typeReg());
if (src.payloadReg() != dest.payloadReg())
ma_mov(src.payloadReg(), dest.payloadReg());
Register s0 = src.typeReg(), d0 = dest.typeReg(),
s1 = src.payloadReg(), d1 = dest.payloadReg();
// Either one or both of the source registers could be the same as a
// destination register.
if (s1 == d0) {
if (s0 == d1) {
// If both are, this is just a swap of two registers.
JS_ASSERT(d1 != ScratchRegister);
JS_ASSERT(d0 != ScratchRegister);
ma_mov(d1, ScratchRegister);
ma_mov(d0, d1);
ma_mov(ScratchRegister, d0);
return;
}
// If only one is, copy that source first.
mozilla::Swap(s0, s1);
mozilla::Swap(d0, d1);
}
if (s0 != d0)
ma_mov(s0, d0);
if (s1 != d1)
ma_mov(s1, d1);
}
void storeValue(ValueOperand val, Operand dst);

26
js/src/jit/x86/MacroAssembler-x86.h
View File

@ -113,12 +113,26 @@ class MacroAssemblerX86 : public MacroAssemblerX86Shared
moveValue(val, dest.typeReg(), dest.payloadReg());
}
void moveValue(const ValueOperand &src, const ValueOperand &dest) {
JS_ASSERT(src.typeReg() != dest.payloadReg());
JS_ASSERT(src.payloadReg() != dest.typeReg());
if (src.typeReg() != dest.typeReg())
movl(src.typeReg(), dest.typeReg());
if (src.payloadReg() != dest.payloadReg())
movl(src.payloadReg(), dest.payloadReg());
Register s0 = src.typeReg(), d0 = dest.typeReg(),
s1 = src.payloadReg(), d1 = dest.payloadReg();
// Either one or both of the source registers could be the same as a
// destination register.
if (s1 == d0) {
if (s0 == d1) {
// If both are, this is just a swap of two registers.
xchgl(d0, d1);
return;
}
// If only one is, copy that source first.
mozilla::Swap(s0, s1);
mozilla::Swap(d0, d1);
}
if (s0 != d0)
movl(s0, d0);
if (s1 != d1)
movl(s1, d1);
}
/////////////////////////////////////////////////////////////////