Bug 1204193 - IonMonkey: MIPS: Split shareable code to mips-shared in Bailouts-mips32. r=nbp

---
 .../Bailouts-mips-shared.cpp}                      | 37 +---------------------
 .../Bailouts-mips-shared.h}                        |  6 ++--
 js/src/jit/mips32/Bailouts-mips32.cpp              | 18 ++---------
 js/src/jit/mips32/Trampoline-mips32.cpp            |  2 +-
 js/src/moz.build                                   |  1 +
 5 files changed, 8 insertions(+), 56 deletions(-)
 copy js/src/jit/{mips32/Bailouts-mips32.cpp => mips-shared/Bailouts-mips-shared.cpp} (40%)
 rename js/src/jit/{mips32/Bailouts-mips32.h => mips-shared/Bailouts-mips-shared.h} (93%)

js/src/jit/mips-shared/Bailouts-mips-shared.cpp

@@ -0,0 +1,27 @@
+/* -*- 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"
+
+using namespace js;
+using namespace js::jit;
+
+BailoutFrameInfo::BailoutFrameInfo(const JitActivationIterator& activations,
+                                   InvalidationBailoutStack* bailout)
+  : machine_(bailout->machine())
+{
+    framePointer_ = (uint8_t*) bailout->fp();
+    topFrameSize_ = framePointer_ - bailout->sp();
+    topIonScript_ = bailout->ionScript();
+    attachOnJitActivation(activations);
+
+    uint8_t* returnAddressToFp_ = bailout->osiPointReturnAddress();
+    const OsiIndex* osiIndex = topIonScript_->getOsiIndex(returnAddressToFp_);
+    snapshotOffset_ = osiIndex->snapshotOffset();
+}

js/src/jit/mips-shared/Bailouts-mips-shared.h

@@ -4,8 +4,8 @@
  * 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_mips32_Bailouts_mips32_h
-#define jit_mips32_Bailouts_mips32_h
+#ifndef jit_mips_shared_Bailouts_mips_shared_h
+#define jit_mips_shared_Bailouts_mips_shared_h
 
 #include "jit/Bailouts.h"
 #include "jit/JitCompartment.h"
@@ -74,4 +74,4 @@ class BailoutStack
 } // namespace jit
 } // namespace js
 
-#endif /* jit_mips32_Bailouts_mips32_h */
+#endif /* jit_mips_shared_Bailouts_mips_shared_h */

js/src/jit/mips32/Bailouts-mips32.cpp

@@ -4,11 +4,11 @@
  * 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;
 
@@ -46,17 +46,3 @@ BailoutFrameInfo::BailoutFrameInfo(const JitActivationIterator& activations,
 
     snapshotOffset_ = topIonScript_->bailoutToSnapshot(bailoutId);
 }
-
-BailoutFrameInfo::BailoutFrameInfo(const JitActivationIterator& activations,
-                                   InvalidationBailoutStack* bailout)
-  : machine_(bailout->machine())
-{
-    framePointer_ = (uint8_t*) bailout->fp();
-    topFrameSize_ = framePointer_ - bailout->sp();
-    topIonScript_ = bailout->ionScript();
-    attachOnJitActivation(activations);
-
-    uint8_t* returnAddressToFp_ = bailout->osiPointReturnAddress();
-    const OsiIndex* osiIndex = topIonScript_->getOsiIndex(returnAddressToFp_);
-    snapshotOffset_ = osiIndex->snapshotOffset();
-}

js/src/jit/mips32/Trampoline-mips32.cpp

@@ -13,7 +13,7 @@
 #include "jit/JitFrames.h"
 #include "jit/JitSpewer.h"
 #include "jit/Linker.h"
-#include "jit/mips32/Bailouts-mips32.h"
+#include "jit/mips-shared/Bailouts-mips-shared.h"
 #include "jit/mips32/SharedICHelpers-mips32.h"
 #ifdef JS_ION_PERF
 # include "jit/PerfSpewer.h"

js/src/moz.build

@@ -468,6 +468,7 @@ elif CONFIG['JS_CODEGEN_MIPS32']:
     UNIFIED_SOURCES += [
         'jit/mips-shared/Architecture-mips-shared.cpp',
         'jit/mips-shared/Assembler-mips-shared.cpp',
+        'jit/mips-shared/Bailouts-mips-shared.cpp',
         'jit/mips-shared/BaselineIC-mips-shared.cpp',
         'jit/mips-shared/Lowering-mips-shared.cpp',
     ]