Bug 1434270 - Pull BaselineStubFrame back to SharedICHelpers-mips-shared.h. r=nbp
authorDragan Mladjenovic <dragan.mladjenovic@rt-rk.com>
Tue, 30 Jan 2018 10:25:31 -0500
changeset 401523 3e9b8ebad6a70b2e933be2092ee3919c4e7cbc05
parent 401522 b1ad4de3ed91e242d8bfd9c94155ec30e76671e9
child 401524 3c33556a7467fdcc7605ce9c16a5d96da081db25
push id33347
push userarchaeopteryx@coole-files.de
push dateTue, 30 Jan 2018 22:28:09 +0000
treeherdermozilla-central@217fc14405e7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnbp
bugs1434270
milestone60.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 1434270 - Pull BaselineStubFrame back to SharedICHelpers-mips-shared.h. r=nbp
js/src/jit/mips-shared/SharedICHelpers-mips-shared-inl.h
js/src/jit/mips-shared/SharedICHelpers-mips-shared.h
--- a/js/src/jit/mips-shared/SharedICHelpers-mips-shared-inl.h
+++ b/js/src/jit/mips-shared/SharedICHelpers-mips-shared-inl.h
@@ -75,27 +75,16 @@ inline void
 EmitBaselineCallVM(TrampolinePtr target, MacroAssembler& masm)
 {
     Register scratch = R2.scratchReg();
     EmitBaselineCreateStubFrameDescriptor(masm, scratch, ExitFrameLayout::Size());
     masm.push(scratch);
     masm.call(target);
 }
 
-struct BaselineStubFrame {
-    uintptr_t savedFrame;
-    uintptr_t savedStub;
-    uintptr_t returnAddress;
-    uintptr_t descriptor;
-};
-
-// Size of values pushed by EmitBaselineEnterStubFrame.
-static const uint32_t STUB_FRAME_SIZE = sizeof(BaselineStubFrame);
-static const uint32_t STUB_FRAME_SAVED_STUB_OFFSET = offsetof(BaselineStubFrame, savedStub);
-
 inline void
 EmitBaselineEnterStubFrame(MacroAssembler& masm, Register scratch)
 {
     MOZ_ASSERT(scratch != ICTailCallReg);
 
     // Compute frame size.
     masm.movePtr(BaselineFrameReg, scratch);
     masm.addPtr(Imm32(BaselineFrame::FramePointerOffset), scratch);
--- a/js/src/jit/mips-shared/SharedICHelpers-mips-shared.h
+++ b/js/src/jit/mips-shared/SharedICHelpers-mips-shared.h
@@ -14,16 +14,27 @@
 
 namespace js {
 namespace jit {
 
 // Distance from sp to the top Value inside an IC stub (no return address on
 // the stack on MIPS).
 static const size_t ICStackValueOffset = 0;
 
+struct BaselineStubFrame {
+    uintptr_t savedFrame;
+    uintptr_t savedStub;
+    uintptr_t returnAddress;
+    uintptr_t descriptor;
+};
+
+// Size of values pushed by EmitBaselineEnterStubFrame.
+static const uint32_t STUB_FRAME_SIZE = sizeof(BaselineStubFrame);
+static const uint32_t STUB_FRAME_SAVED_STUB_OFFSET = offsetof(BaselineStubFrame, savedStub);
+
 inline void
 EmitRestoreTailCallReg(MacroAssembler& masm)
 {
     // No-op on MIPS because ra register is always holding the return address.
 }
 
 inline void
 EmitRepushTailCallReg(MacroAssembler& masm)