Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 994716 - IonMonkey MIPS: Add changes to MIPS code during upload process, part 2. r=jandem

Browse Source
This commit is contained in:
Branislav Rankov 2014-04-24 17:39:20 +02:00
parent 885f9258ff
commit 8c2c641e80
4 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jit/mips/Bailouts-mips.cpp
View File

@ -14,7 +14,7 @@ using namespace js::jit;
IonBailoutIterator::IonBailoutIterator(const JitActivationIterator &activations,
BailoutStack *bailout)
: IonFrameIterator(activations),
: JitFrameIterator(activations),
machine_(bailout->machine())
{
uint8_t *sp = bailout->parentStackPointer();
@ -49,7 +49,7 @@ IonBailoutIterator::IonBailoutIterator(const JitActivationIterator &activations,
IonBailoutIterator::IonBailoutIterator(const JitActivationIterator &activations,
InvalidationBailoutStack *bailout)
: IonFrameIterator(activations),
: JitFrameIterator(activations),
machine_(bailout->machine())
{
returnAddressToFp_ = bailout->osiPointReturnAddress();

2
js/src/jit/mips/Lowering-mips.h
View File

@ -35,6 +35,8 @@ class LIRGeneratorMIPS : public LIRGeneratorShared
return LDefinition::BogusTemp();
}
bool needTempForPostBarrier() { return false; }
// MIPS has a scratch register, so no need for another temp for dispatch
// ICs.
LDefinition tempForDispatchCache(MIRType outputType = MIRType_None) {

33
js/src/jit/mips/MacroAssembler-mips.cpp
View File

@ -3328,20 +3328,29 @@ MacroAssemblerMIPSCompat::toggledCall(JitCode *target, bool enabled)
return offset;
}
#ifdef JSGC_GENERATIONAL
void
MacroAssemblerMIPSCompat::branchPtrInNurseryRange(Register ptr, Register temp, Label *label)
{
JS_ASSERT(temp != InvalidReg);
const Nursery &nursery = GetIonContext()->runtime->gcNursery();
JS_ASSERT(ptr != temp);
JS_ASSERT(ptr != SecondScratchReg);
// ptr and temp may be the same register, in which case we mustn't trash it
// before we use its contents.
if (ptr == temp) {
addPtr(ImmWord(-ptrdiff_t(nursery.start())), ptr);
branchPtr(Assembler::Below, ptr, Imm32(Nursery::NurserySize), label);
} else {
movePtr(ImmWord(-ptrdiff_t(nursery.start())), temp);
addPtr(ptr, temp);
branchPtr(Assembler::Below, temp, Imm32(Nursery::NurserySize), label);
}
const Nursery &nursery = GetIonContext()->runtime->gcNursery();
movePtr(ImmWord(-ptrdiff_t(nursery.start())), SecondScratchReg);
addPtr(ptr, SecondScratchReg);
branchPtr(Assembler::Below, SecondScratchReg, Imm32(Nursery::NurserySize), label);
}
void
MacroAssemblerMIPSCompat::branchValueIsNurseryObject(ValueOperand value, Register temp, Label *label)
{
Label done;
branchTestObject(Assembler::NotEqual, value, &done);
branchPtrInNurseryRange(value.payloadReg(), temp, label);
bind(&done);
}
#endif

33
js/src/jit/mips/MacroAssembler-mips.h
View File

@ -817,12 +817,30 @@ public:
void moveValue(const Value &val, const ValueOperand &dest);
void moveValue(const ValueOperand &src, const ValueOperand &dest) {
MOZ_ASSERT(src.typeReg() != dest.payloadReg());
MOZ_ASSERT(src.payloadReg() != dest.typeReg());
if (src.typeReg() != dest.typeReg())
ma_move(dest.typeReg(), src.typeReg());
if (src.payloadReg() != dest.payloadReg())
ma_move(dest.payloadReg(), src.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);
move32(d1, ScratchRegister);
move32(d0, d1);
move32(ScratchRegister, d0);
return;
}
// If only one is, copy that source first.
mozilla::Swap(s0, s1);
mozilla::Swap(d0, d1);
}
if (s0 != d0)
move32(s0, d0);
if (s1 != d1)
move32(s1, d1);
}
void storeValue(ValueOperand val, Operand dst);
@ -1221,7 +1239,10 @@ public:
as_movs(dest, src);
}
#ifdef JSGC_GENERATIONAL
void branchPtrInNurseryRange(Register ptr, Register temp, Label *label);
void branchValueIsNurseryObject(ValueOperand value, Register temp, Label *label);
#endif
};
typedef MacroAssemblerMIPSCompat MacroAssemblerSpecific;