Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1012694 - IonMonkey (ARM): Use the second scratch register to avoid clobbering the scratch register. r=dougc

Browse Source
This commit is contained in:
Jan de Mooij 2014-06-24 14:46:03 -04:00
parent 592956bbf2
commit c86e695908
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -895,8 +895,9 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
if (lhs.getTag() == Operand::OP2) {
branch32(cond, lhs.toReg(), rhs, label);
} else {
ma_ldr(lhs, ScratchRegister);
branch32(cond, ScratchRegister, rhs, label);
// branch32 will use ScratchRegister.
ma_ldr(lhs, secondScratchReg_);
branch32(cond, secondScratchReg_, rhs, label);
}
}
void branch32(Condition cond, const Address &lhs, Register rhs, Label *label) {
@ -904,8 +905,9 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
branch32(cond, ScratchRegister, rhs, label);
}
void branch32(Condition cond, const Address &lhs, Imm32 rhs, Label *label) {
load32(lhs, ScratchRegister);
branch32(cond, ScratchRegister, rhs, label);
// branch32 will use ScratchRegister.
load32(lhs, secondScratchReg_);
branch32(cond, secondScratchReg_, rhs, label);
}
void branchPtr(Condition cond, const Address &lhs, Register rhs, Label *label) {
branch32(cond, lhs, rhs, label);
@ -1000,12 +1002,14 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
ma_b(label, cond);
}
void branchTest32(Condition cond, const Address &address, Imm32 imm, Label *label) {
ma_ldr(Operand(address.base, address.offset), ScratchRegister);
branchTest32(cond, ScratchRegister, imm, label);
// branchTest32 will use ScratchRegister.
load32(address, secondScratchReg_);
branchTest32(cond, secondScratchReg_, imm, label);
}
void branchTest32(Condition cond, AbsoluteAddress address, Imm32 imm, Label *label) {
loadPtr(address, ScratchRegister);
branchTest32(cond, ScratchRegister, imm, label);
// branchTest32 will use ScratchRegister.
load32(address, secondScratchReg_);
branchTest32(cond, secondScratchReg_, imm, label);
}
void branchTestPtr(Condition cond, Register lhs, Register rhs, Label *label) {
branchTest32(cond, lhs, rhs, label);