Bug 1214508: SharedStubs - Fix bustage in arm64, r=bustage on CLOSED TREE
authorHannes Verschore <hv1989@gmail.com>
Tue, 17 Nov 2015 19:32:13 +0100
changeset 273030 bb2ece1c131b9faf7d560ac10c4d8daa6f6a09b0
parent 273029 29001cebc62c4366d36ef36ab79c75c3800a7984
child 273031 43ca206bb8127d4de6ae1fa5e4af4b0f8ef9d14c
push id29693
push usercbook@mozilla.com
push dateWed, 18 Nov 2015 13:50:33 +0000
treeherdermozilla-central@1d6155d7e6c9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1214508
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1214508: SharedStubs - Fix bustage in arm64, r=bustage on CLOSED TREE
js/src/jit/MacroAssembler.h
js/src/jit/arm64/MacroAssembler-arm64.cpp
--- a/js/src/jit/MacroAssembler.h
+++ b/js/src/jit/MacroAssembler.h
@@ -434,17 +434,17 @@ class MacroAssembler : public MacroAssem
 
     void PopRegsInMask(LiveRegisterSet set);
     void PopRegsInMask(LiveGeneralRegisterSet set);
     void PopRegsInMaskIgnore(LiveRegisterSet set, LiveRegisterSet ignore)
                                  DEFINED_ON(arm, arm64, mips32, mips64, x86_shared);
 
     void Push(const Operand op) DEFINED_ON(x86_shared);
     void Push(Register reg) PER_SHARED_ARCH;
-    void Push(Register reg1, Register reg2, Register reg3) DEFINED_ON(arm64);
+    void Push(Register reg1, Register reg2, Register reg3, Register reg4) DEFINED_ON(arm64);
     void Push(const Imm32 imm) PER_SHARED_ARCH;
     void Push(const ImmWord imm) PER_SHARED_ARCH;
     void Push(const ImmPtr imm) PER_SHARED_ARCH;
     void Push(const ImmGCPtr ptr) PER_SHARED_ARCH;
     void Push(FloatRegister reg) PER_SHARED_ARCH;
     void Push(jsid id, Register scratchReg);
     void Push(TypedOrValueRegister v);
     void Push(ConstantOrRegister v);
--- a/js/src/jit/arm64/MacroAssembler-arm64.cpp
+++ b/js/src/jit/arm64/MacroAssembler-arm64.cpp
@@ -437,20 +437,20 @@ MacroAssembler::PopRegsInMaskIgnore(Live
 void
 MacroAssembler::Push(Register reg)
 {
     push(reg);
     adjustFrame(sizeof(intptr_t));
 }
 
 void
-MacroAssembler::Push(Register reg1, Register reg2, Register reg3)
+MacroAssembler::Push(Register reg1, Register reg2, Register reg3, Register reg4)
 {
-    push(reg1, reg2, reg3);
-    adjustFrame(3 * sizeof(intptr_t));
+    push(reg1, reg2, reg3, reg4);
+    adjustFrame(4 * sizeof(intptr_t));
 }
 
 void
 MacroAssembler::Push(const Imm32 imm)
 {
     push(imm);
     adjustFrame(sizeof(intptr_t));
 }