Bug 1217873 - IonMonkey: MIPS: Move BailoutStack to architecture dependent. r=arai f=nbp
authorHeiher <r@hev.cc>
Tue, 27 Oct 2015 18:21:38 +0800
changeset 304826 0dd4a8dd56181365169aee7c6928cca302f9baf2
parent 304825 11969330ba7e37bdf58a86fd15600cc3041f4c4b
child 304827 59f041348904d8466b51de6e4f77e2974fa7974f
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarai
bugs1217873
milestone44.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 1217873 - IonMonkey: MIPS: Move BailoutStack to architecture dependent. r=arai f=nbp --- js/src/jit/mips-shared/Bailouts-mips-shared.cpp | 5 +---- js/src/jit/mips32/Bailouts-mips32.cpp | 4 ++-- .../Bailouts-mips-shared.h => mips32/Bailouts-mips32.h} | 6 +++--- js/src/jit/mips32/Trampoline-mips32.cpp | 2 +- js/src/jit/mips64/Bailouts-mips64.cpp | 4 ++-- .../Bailouts-mips-shared.h => mips64/Bailouts-mips64.h} | 6 +++--- js/src/jit/mips64/Trampoline-mips64.cpp | 2 +- 7 files changed, 13 insertions(+), 16 deletions(-) copy js/src/jit/{mips-shared/Bailouts-mips-shared.h => mips32/Bailouts-mips32.h} (93%) rename js/src/jit/{mips-shared/Bailouts-mips-shared.h => mips64/Bailouts-mips64.h} (93%)
js/src/jit/mips-shared/Bailouts-mips-shared.cpp
js/src/jit/mips-shared/Bailouts-mips-shared.h
js/src/jit/mips32/Bailouts-mips32.cpp
js/src/jit/mips32/Bailouts-mips32.h
js/src/jit/mips32/Trampoline-mips32.cpp
js/src/jit/mips64/Bailouts-mips64.cpp
js/src/jit/mips64/Bailouts-mips64.h
js/src/jit/mips64/Trampoline-mips64.cpp
--- a/js/src/jit/mips-shared/Bailouts-mips-shared.cpp
+++ b/js/src/jit/mips-shared/Bailouts-mips-shared.cpp
@@ -1,18 +1,15 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jit/mips-shared/Bailouts-mips-shared.h"
-
-#include "jscntxt.h"
-#include "jscompartment.h"
+#include "jit/Bailouts.h"
 
 using namespace js;
 using namespace js::jit;
 
 BailoutFrameInfo::BailoutFrameInfo(const JitActivationIterator& activations,
                                    InvalidationBailoutStack* bailout)
   : machine_(bailout->machine())
 {
--- a/js/src/jit/mips32/Bailouts-mips32.cpp
+++ b/js/src/jit/mips32/Bailouts-mips32.cpp
@@ -1,19 +1,19 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jit/mips32/Bailouts-mips32.h"
+
 #include "jscntxt.h"
 #include "jscompartment.h"
 
-#include "jit/mips-shared/Bailouts-mips-shared.h"
-
 using namespace js;
 using namespace js::jit;
 
 BailoutFrameInfo::BailoutFrameInfo(const JitActivationIterator& activations,
                                    BailoutStack* bailout)
   : machine_(bailout->machine())
 {
     uint8_t* sp = bailout->parentStackPointer();
rename from js/src/jit/mips-shared/Bailouts-mips-shared.h
rename to js/src/jit/mips32/Bailouts-mips32.h
--- a/js/src/jit/mips-shared/Bailouts-mips-shared.h
+++ b/js/src/jit/mips32/Bailouts-mips32.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_mips_shared_Bailouts_mips_shared_h
-#define jit_mips_shared_Bailouts_mips_shared_h
+#ifndef jit_mips32_Bailouts_mips32_h
+#define jit_mips32_Bailouts_mips32_h
 
 #include "jit/Bailouts.h"
 #include "jit/JitCompartment.h"
 
 namespace js {
 namespace jit {
 
 class BailoutStack
@@ -69,9 +69,9 @@ class BailoutStack
     static size_t offsetOfRegs() {
         return offsetof(BailoutStack, regs_);
     }
 };
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_mips_shared_Bailouts_mips_shared_h */
+#endif /* jit_mips32_Bailouts_mips32_h */
--- a/js/src/jit/mips32/Trampoline-mips32.cpp
+++ b/js/src/jit/mips32/Trampoline-mips32.cpp
@@ -8,17 +8,17 @@
 
 #include "jscompartment.h"
 
 #include "jit/Bailouts.h"
 #include "jit/JitCompartment.h"
 #include "jit/JitFrames.h"
 #include "jit/JitSpewer.h"
 #include "jit/Linker.h"
-#include "jit/mips-shared/Bailouts-mips-shared.h"
+#include "jit/mips32/Bailouts-mips32.h"
 #include "jit/mips32/SharedICHelpers-mips32.h"
 #ifdef JS_ION_PERF
 # include "jit/PerfSpewer.h"
 #endif
 #include "jit/VMFunctions.h"
 
 #include "jit/MacroAssembler-inl.h"
 
--- a/js/src/jit/mips64/Bailouts-mips64.cpp
+++ b/js/src/jit/mips64/Bailouts-mips64.cpp
@@ -1,19 +1,19 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jit/mips64/Bailouts-mips64.h"
+
 #include "jscntxt.h"
 #include "jscompartment.h"
 
-#include "jit/mips-shared/Bailouts-mips-shared.h"
-
 using namespace js;
 using namespace js::jit;
 
 BailoutFrameInfo::BailoutFrameInfo(const JitActivationIterator& activations,
                                    BailoutStack* bailout)
   : machine_(bailout->machine())
 {
     uint8_t* sp = bailout->parentStackPointer();
copy from js/src/jit/mips-shared/Bailouts-mips-shared.h
copy to js/src/jit/mips64/Bailouts-mips64.h
--- a/js/src/jit/mips-shared/Bailouts-mips-shared.h
+++ b/js/src/jit/mips64/Bailouts-mips64.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_mips_shared_Bailouts_mips_shared_h
-#define jit_mips_shared_Bailouts_mips_shared_h
+#ifndef jit_mips64_Bailouts_mips64_h
+#define jit_mips64_Bailouts_mips64_h
 
 #include "jit/Bailouts.h"
 #include "jit/JitCompartment.h"
 
 namespace js {
 namespace jit {
 
 class BailoutStack
@@ -69,9 +69,9 @@ class BailoutStack
     static size_t offsetOfRegs() {
         return offsetof(BailoutStack, regs_);
     }
 };
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_mips_shared_Bailouts_mips_shared_h */
+#endif /* jit_mips64_Bailouts_mips64_h */
--- a/js/src/jit/mips64/Trampoline-mips64.cpp
+++ b/js/src/jit/mips64/Trampoline-mips64.cpp
@@ -8,17 +8,17 @@
 
 #include "jscompartment.h"
 
 #include "jit/Bailouts.h"
 #include "jit/JitCompartment.h"
 #include "jit/JitFrames.h"
 #include "jit/JitSpewer.h"
 #include "jit/Linker.h"
-#include "jit/mips-shared/Bailouts-mips-shared.h"
+#include "jit/mips64/Bailouts-mips64.h"
 #include "jit/mips64/SharedICHelpers-mips64.h"
 #ifdef JS_ION_PERF
 # include "jit/PerfSpewer.h"
 #endif
 #include "jit/VMFunctions.h"
 
 #include "jit/MacroAssembler-inl.h"