Bug 1134626 part 1 - Move all x86-shared files into their own directory. r=jandem
authorNicolas B. Pierron <nicolas.b.pierron@mozilla.com>
Tue, 31 Mar 2015 14:30:41 +0200
changeset 268156 87a4a036587ce1e8f0bf98fa2449d251ecd902fa
parent 268155 79a60e8922174e674305fbf1ed1fe2811f01b727
child 268157 1a68731ea592e11ef2c7078cb86b8c006a049048
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem
bugs1134626
milestone40.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 1134626 part 1 - Move all x86-shared files into their own directory. r=jandem
js/src/jit/LIR.h
js/src/jit/MoveEmitter.h
js/src/jit/shared/Assembler-x86-shared.cpp
js/src/jit/shared/Assembler-x86-shared.h
js/src/jit/shared/AssemblerBuffer-x86-shared.cpp
js/src/jit/shared/AssemblerBuffer-x86-shared.h
js/src/jit/shared/BaseAssembler-x86-shared.h
js/src/jit/shared/BaselineCompiler-x86-shared.cpp
js/src/jit/shared/BaselineCompiler-x86-shared.h
js/src/jit/shared/BaselineIC-x86-shared.cpp
js/src/jit/shared/CodeGenerator-x86-shared.cpp
js/src/jit/shared/CodeGenerator-x86-shared.h
js/src/jit/shared/Constants-x86-shared.h
js/src/jit/shared/Disassembler-x86-shared.cpp
js/src/jit/shared/Encoding-x86-shared.h
js/src/jit/shared/LIR-x86-shared.h
js/src/jit/shared/Lowering-x86-shared.cpp
js/src/jit/shared/Lowering-x86-shared.h
js/src/jit/shared/MacroAssembler-x86-shared.cpp
js/src/jit/shared/MacroAssembler-x86-shared.h
js/src/jit/shared/MoveEmitter-x86-shared.cpp
js/src/jit/shared/MoveEmitter-x86-shared.h
js/src/jit/shared/Patching-x86-shared.h
js/src/jit/x64/Architecture-x64.h
js/src/jit/x64/Assembler-x64.h
js/src/jit/x64/BaselineCompiler-x64.h
js/src/jit/x64/CodeGenerator-x64.h
js/src/jit/x64/Lowering-x64.h
js/src/jit/x64/MacroAssembler-x64.h
js/src/jit/x86-shared/Assembler-x86-shared.cpp
js/src/jit/x86-shared/Assembler-x86-shared.h
js/src/jit/x86-shared/AssemblerBuffer-x86-shared.cpp
js/src/jit/x86-shared/AssemblerBuffer-x86-shared.h
js/src/jit/x86-shared/BaseAssembler-x86-shared.h
js/src/jit/x86-shared/BaselineCompiler-x86-shared.cpp
js/src/jit/x86-shared/BaselineCompiler-x86-shared.h
js/src/jit/x86-shared/BaselineIC-x86-shared.cpp
js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp
js/src/jit/x86-shared/CodeGenerator-x86-shared.h
js/src/jit/x86-shared/Constants-x86-shared.h
js/src/jit/x86-shared/Disassembler-x86-shared.cpp
js/src/jit/x86-shared/Encoding-x86-shared.h
js/src/jit/x86-shared/LIR-x86-shared.h
js/src/jit/x86-shared/Lowering-x86-shared.cpp
js/src/jit/x86-shared/Lowering-x86-shared.h
js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp
js/src/jit/x86-shared/MacroAssembler-x86-shared.h
js/src/jit/x86-shared/MoveEmitter-x86-shared.cpp
js/src/jit/x86-shared/MoveEmitter-x86-shared.h
js/src/jit/x86-shared/Patching-x86-shared.h
js/src/jit/x86/Architecture-x86.h
js/src/jit/x86/Assembler-x86.h
js/src/jit/x86/BaselineCompiler-x86.h
js/src/jit/x86/CodeGenerator-x86.h
js/src/jit/x86/Lowering-x86.h
js/src/jit/x86/MacroAssembler-x86.h
js/src/moz.build
--- a/js/src/jit/LIR.h
+++ b/js/src/jit/LIR.h
@@ -1839,17 +1839,17 @@ LAllocation::toRegister() const
 
 #include "jit/LIR-Common.h"
 #if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
 # if defined(JS_CODEGEN_X86)
 #  include "jit/x86/LIR-x86.h"
 # elif defined(JS_CODEGEN_X64)
 #  include "jit/x64/LIR-x64.h"
 # endif
-# include "jit/shared/LIR-x86-shared.h"
+# include "jit/x86-shared/LIR-x86-shared.h"
 #elif defined(JS_CODEGEN_ARM)
 # include "jit/arm/LIR-arm.h"
 #elif defined(JS_CODEGEN_MIPS)
 # include "jit/mips/LIR-mips.h"
 #elif defined(JS_CODEGEN_NONE)
 # include "jit/none/LIR-none.h"
 #else
 # error "Unknown architecture!"
--- a/js/src/jit/MoveEmitter.h
+++ b/js/src/jit/MoveEmitter.h
@@ -3,17 +3,17 @@
  * 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_MoveEmitter_h
 #define jit_MoveEmitter_h
 
 #if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
-# include "jit/shared/MoveEmitter-x86-shared.h"
+# include "jit/x86-shared/MoveEmitter-x86-shared.h"
 #elif defined(JS_CODEGEN_ARM)
 # include "jit/arm/MoveEmitter-arm.h"
 #elif defined(JS_CODEGEN_MIPS)
 # include "jit/mips/MoveEmitter-mips.h"
 #elif defined(JS_CODEGEN_NONE)
 # include "jit/none/MoveEmitter-none.h"
 #else
 # error "Unknown architecture!"
--- a/js/src/jit/x64/Architecture-x64.h
+++ b/js/src/jit/x64/Architecture-x64.h
@@ -2,17 +2,17 @@
  * 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_x64_Architecture_x64_h
 #define jit_x64_Architecture_x64_h
 
-#include "jit/shared/Constants-x86-shared.h"
+#include "jit/x86-shared/Constants-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 // In bytes: slots needed for potential memory->memory move spills.
 //   +8 for cycles
 //   +8 for gpr spills
 //   +8 for double spills
--- a/js/src/jit/x64/Assembler-x64.h
+++ b/js/src/jit/x64/Assembler-x64.h
@@ -204,17 +204,17 @@ static_assert(JitStackAlignment % SimdMe
 
 static const uint32_t AsmJSStackAlignment = SimdMemoryAlignment;
 
 static const Scale ScalePointer = TimesEight;
 
 } // namespace jit
 } // namespace js
 
-#include "jit/shared/Assembler-x86-shared.h"
+#include "jit/x86-shared/Assembler-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 // Return operand from a JS -> JS call.
 static MOZ_CONSTEXPR_VAR ValueOperand JSReturnOperand = ValueOperand(JSReturnReg);
 
 class Assembler : public AssemblerX86Shared
--- a/js/src/jit/x64/BaselineCompiler-x64.h
+++ b/js/src/jit/x64/BaselineCompiler-x64.h
@@ -2,17 +2,17 @@
  * 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_x64_BaselineCompiler_x64_h
 #define jit_x64_BaselineCompiler_x64_h
 
-#include "jit/shared/BaselineCompiler-x86-shared.h"
+#include "jit/x86-shared/BaselineCompiler-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 class BaselineCompilerX64 : public BaselineCompilerX86Shared
 {
   protected:
     BaselineCompilerX64(JSContext* cx, TempAllocator& alloc, JSScript* script);
--- a/js/src/jit/x64/CodeGenerator-x64.h
+++ b/js/src/jit/x64/CodeGenerator-x64.h
@@ -2,17 +2,17 @@
  * 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_x64_CodeGenerator_x64_h
 #define jit_x64_CodeGenerator_x64_h
 
-#include "jit/shared/CodeGenerator-x86-shared.h"
+#include "jit/x86-shared/CodeGenerator-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 class CodeGeneratorX64 : public CodeGeneratorX86Shared
 {
     CodeGeneratorX64* thisFromCtor() {
         return this;
--- a/js/src/jit/x64/Lowering-x64.h
+++ b/js/src/jit/x64/Lowering-x64.h
@@ -2,17 +2,17 @@
  * 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_x64_Lowering_x64_h
 #define jit_x64_Lowering_x64_h
 
-#include "jit/shared/Lowering-x86-shared.h"
+#include "jit/x86-shared/Lowering-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 class LIRGeneratorX64 : public LIRGeneratorX86Shared
 {
   public:
     LIRGeneratorX64(MIRGenerator* gen, MIRGraph& graph, LIRGraph& lirGraph)
--- a/js/src/jit/x64/MacroAssembler-x64.h
+++ b/js/src/jit/x64/MacroAssembler-x64.h
@@ -4,17 +4,17 @@
  * 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_x64_MacroAssembler_x64_h
 #define jit_x64_MacroAssembler_x64_h
 
 #include "jit/JitFrames.h"
 #include "jit/MoveResolver.h"
-#include "jit/shared/MacroAssembler-x86-shared.h"
+#include "jit/x86-shared/MacroAssembler-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 struct ImmShiftedTag : public ImmWord
 {
     explicit ImmShiftedTag(JSValueShiftedTag shtag)
       : ImmWord((uintptr_t)shtag)
rename from js/src/jit/shared/Assembler-x86-shared.cpp
rename to js/src/jit/x86-shared/Assembler-x86-shared.cpp
rename from js/src/jit/shared/Assembler-x86-shared.h
rename to js/src/jit/x86-shared/Assembler-x86-shared.h
--- a/js/src/jit/shared/Assembler-x86-shared.h
+++ b/js/src/jit/x86-shared/Assembler-x86-shared.h
@@ -1,21 +1,21 @@
 /* -*- 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_shared_Assembler_x86_shared_h
-#define jit_shared_Assembler_x86_shared_h
+#ifndef jit_x86_shared_Assembler_x86_shared_h
+#define jit_x86_shared_Assembler_x86_shared_h
 
 #include <cstddef>
 
 #include "jit/shared/Assembler-shared.h"
-#include "jit/shared/BaseAssembler-x86-shared.h"
+#include "jit/x86-shared/BaseAssembler-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 class Operand
 {
   public:
     enum Kind {
@@ -2957,9 +2957,9 @@ class AssemblerX86Shared : public Assemb
 
     MOZ_COLD void verifyHeapAccessDisassembly(uint32_t begin, uint32_t end,
                                               const Disassembler::HeapAccess& heapAccess);
 };
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_shared_Assembler_x86_shared_h */
+#endif /* jit_x86_shared_Assembler_x86_shared_h */
rename from js/src/jit/shared/AssemblerBuffer-x86-shared.cpp
rename to js/src/jit/x86-shared/AssemblerBuffer-x86-shared.cpp
--- a/js/src/jit/shared/AssemblerBuffer-x86-shared.cpp
+++ b/js/src/jit/x86-shared/AssemblerBuffer-x86-shared.cpp
@@ -1,15 +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/shared/AssemblerBuffer-x86-shared.h"
+#include "jit/x86-shared/AssemblerBuffer-x86-shared.h"
 
 #include "jsopcode.h"
 
 void js::jit::GenericAssembler::spew(const char* fmt, va_list va)
 {
     // Buffer to hold the formatted string. Note that this may contain
     // '%' characters, so do not pass it directly to printf functions.
     char buf[200];
rename from js/src/jit/shared/AssemblerBuffer-x86-shared.h
rename to js/src/jit/x86-shared/AssemblerBuffer-x86-shared.h
--- a/js/src/jit/shared/AssemblerBuffer-x86-shared.h
+++ b/js/src/jit/x86-shared/AssemblerBuffer-x86-shared.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef jit_shared_AssemblerBuffer_x86_shared_h
-#define jit_shared_AssemblerBuffer_x86_shared_h
+#ifndef jit_x86_shared_AssemblerBuffer_x86_shared_h
+#define jit_x86_shared_AssemblerBuffer_x86_shared_h
 
 #include <stdarg.h>
 #include <string.h>
 
 #include "jit/ExecutableAllocator.h"
 #include "jit/JitSpewer.h"
 
 // Spew formatting helpers.
@@ -204,9 +204,9 @@ namespace jit {
         }
 
         MOZ_COLD void spew(const char* fmt, va_list va);
     };
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_shared_AssemblerBuffer_x86_shared_h */
+#endif /* jit_x86_shared_AssemblerBuffer_x86_shared_h */
rename from js/src/jit/shared/BaseAssembler-x86-shared.h
rename to js/src/jit/x86-shared/BaseAssembler-x86-shared.h
--- a/js/src/jit/shared/BaseAssembler-x86-shared.h
+++ b/js/src/jit/x86-shared/BaseAssembler-x86-shared.h
@@ -22,24 +22,24 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef jit_shared_BaseAssembler_x86_shared_h
-#define jit_shared_BaseAssembler_x86_shared_h
+#ifndef jit_x86_shared_BaseAssembler_x86_shared_h
+#define jit_x86_shared_BaseAssembler_x86_shared_h
 
 #include "mozilla/IntegerPrintfMacros.h"
 
-#include "jit/shared/AssemblerBuffer-x86-shared.h"
-#include "jit/shared/Encoding-x86-shared.h"
-#include "jit/shared/Patching-x86-shared.h"
+#include "jit/x86-shared/AssemblerBuffer-x86-shared.h"
+#include "jit/x86-shared/Encoding-x86-shared.h"
+#include "jit/x86-shared/Patching-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 namespace X86Encoding {
 
 class BaseAssembler : public GenericAssembler {
 public:
@@ -5312,9 +5312,9 @@ threeByteOpImmSimd("vblendps", VEX_PD, O
     bool useVEX_;
 };
 
 } // namespace X86Encoding
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_shared_BaseAssembler_x86_shared_h */
+#endif /* jit_x86_shared_BaseAssembler_x86_shared_h */
rename from js/src/jit/shared/BaselineCompiler-x86-shared.cpp
rename to js/src/jit/x86-shared/BaselineCompiler-x86-shared.cpp
--- a/js/src/jit/shared/BaselineCompiler-x86-shared.cpp
+++ b/js/src/jit/x86-shared/BaselineCompiler-x86-shared.cpp
@@ -1,15 +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/shared/BaselineCompiler-x86-shared.h"
+#include "jit/x86-shared/BaselineCompiler-x86-shared.h"
 
 using namespace js;
 using namespace js::jit;
 
 BaselineCompilerX86Shared::BaselineCompilerX86Shared(JSContext* cx, TempAllocator& alloc, JSScript* script)
   : BaselineCompilerShared(cx, alloc, script)
 {
 }
rename from js/src/jit/shared/BaselineCompiler-x86-shared.h
rename to js/src/jit/x86-shared/BaselineCompiler-x86-shared.h
--- a/js/src/jit/shared/BaselineCompiler-x86-shared.h
+++ b/js/src/jit/x86-shared/BaselineCompiler-x86-shared.h
@@ -1,24 +1,24 @@
 /* -*- 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_shared_BaselineCompiler_x86_shared_h
-#define jit_shared_BaselineCompiler_x86_shared_h
+#ifndef jit_x86_shared_BaselineCompiler_x86_shared_h
+#define jit_x86_shared_BaselineCompiler_x86_shared_h
 
 #include "jit/shared/BaselineCompiler-shared.h"
 
 namespace js {
 namespace jit {
 
 class BaselineCompilerX86Shared : public BaselineCompilerShared
 {
   protected:
     BaselineCompilerX86Shared(JSContext* cx, TempAllocator& alloc, JSScript* script);
 };
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_shared_BaselineCompiler_x86_shared_h */
+#endif /* jit_x86_shared_BaselineCompiler_x86_shared_h */
rename from js/src/jit/shared/BaselineIC-x86-shared.cpp
rename to js/src/jit/x86-shared/BaselineIC-x86-shared.cpp
rename from js/src/jit/shared/CodeGenerator-x86-shared.cpp
rename to js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp
--- a/js/src/jit/shared/CodeGenerator-x86-shared.cpp
+++ b/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp
@@ -1,15 +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/shared/CodeGenerator-x86-shared.h"
+#include "jit/x86-shared/CodeGenerator-x86-shared.h"
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MathAlgorithms.h"
 
 #include "jsmath.h"
 
 #include "jit/JitCompartment.h"
 #include "jit/JitFrames.h"
rename from js/src/jit/shared/CodeGenerator-x86-shared.h
rename to js/src/jit/x86-shared/CodeGenerator-x86-shared.h
--- a/js/src/jit/shared/CodeGenerator-x86-shared.h
+++ b/js/src/jit/x86-shared/CodeGenerator-x86-shared.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_shared_CodeGenerator_x86_shared_h
-#define jit_shared_CodeGenerator_x86_shared_h
+#ifndef jit_x86_shared_CodeGenerator_x86_shared_h
+#define jit_x86_shared_CodeGenerator_x86_shared_h
 
 #include "jit/shared/CodeGenerator-shared.h"
 
 namespace js {
 namespace jit {
 
 class OutOfLineBailout;
 class OutOfLineUndoALUOperation;
@@ -300,9 +300,9 @@ class OutOfLineBailout : public OutOfLin
     LSnapshot* snapshot() const {
         return snapshot_;
     }
 };
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_shared_CodeGenerator_x86_shared_h */
+#endif /* jit_x86_shared_CodeGenerator_x86_shared_h */
rename from js/src/jit/shared/Constants-x86-shared.h
rename to js/src/jit/x86-shared/Constants-x86-shared.h
--- a/js/src/jit/shared/Constants-x86-shared.h
+++ b/js/src/jit/x86-shared/Constants-x86-shared.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_shared_Constants_x86_shared_h
-#define jit_shared_Constants_x86_shared_h
+#ifndef jit_x86_shared_Constants_x86_shared_h
+#define jit_x86_shared_Constants_x86_shared_h
 
 namespace js {
 namespace jit {
 
 namespace X86Encoding {
 
 enum RegisterID {
     rax, rcx, rdx, rbx, rsp, rbp, rsi, rdi
@@ -214,9 +214,9 @@ inline int32_t AddressImmediate(const vo
     return static_cast<int32_t>(reinterpret_cast<intptr_t>(address));
 }
 
 } // namespace X86Encoding
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_shared_Constants_x86_shared_h */
+#endif /* jit_x86_shared_Constants_x86_shared_h */
rename from js/src/jit/shared/Disassembler-x86-shared.cpp
rename to js/src/jit/x86-shared/Disassembler-x86-shared.cpp
--- a/js/src/jit/shared/Disassembler-x86-shared.cpp
+++ b/js/src/jit/x86-shared/Disassembler-x86-shared.cpp
@@ -1,17 +1,17 @@
 /* -*- 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/Disassembler.h"
 
-#include "jit/shared/Encoding-x86-shared.h"
+#include "jit/x86-shared/Encoding-x86-shared.h"
 
 using namespace js;
 using namespace js::jit;
 using namespace js::jit::X86Encoding;
 using namespace js::jit::Disassembler;
 
 MOZ_COLD static bool REX_W(uint8_t rex) { return (rex >> 3) & 0x1; }
 MOZ_COLD static bool REX_R(uint8_t rex) { return (rex >> 2) & 0x1; }
rename from js/src/jit/shared/Encoding-x86-shared.h
rename to js/src/jit/x86-shared/Encoding-x86-shared.h
--- a/js/src/jit/shared/Encoding-x86-shared.h
+++ b/js/src/jit/x86-shared/Encoding-x86-shared.h
@@ -1,18 +1,18 @@
 /* -*- 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_shared_Encoding_x86_shared_h
-#define jit_shared_Encoding_x86_shared_h
+#ifndef jit_x86_shared_Encoding_x86_shared_h
+#define jit_x86_shared_Encoding_x86_shared_h
 
-#include "jit/shared/Constants-x86-shared.h"
+#include "jit/x86-shared/Constants-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 namespace X86Encoding {
 
 static const size_t MaxInstructionSize = 16;
 
@@ -321,9 +321,9 @@ enum ModRmMode {
     ModRmRegister
 };
 
 } // namespace X86Encoding
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_shared_Encoding_x86_shared_h */
+#endif /* jit_x86_shared_Encoding_x86_shared_h */
rename from js/src/jit/shared/LIR-x86-shared.h
rename to js/src/jit/x86-shared/LIR-x86-shared.h
--- a/js/src/jit/shared/LIR-x86-shared.h
+++ b/js/src/jit/x86-shared/LIR-x86-shared.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_shared_LIR_x86_shared_h
-#define jit_shared_LIR_x86_shared_h
+#ifndef jit_x86_shared_LIR_x86_shared_h
+#define jit_x86_shared_LIR_x86_shared_h
 
 namespace js {
 namespace jit {
 
 class LDivI : public LBinaryMath<1>
 {
   public:
     LIR_HEADER(DivI)
@@ -359,9 +359,9 @@ class LSimdValueFloat32x4 : public LInst
     MSimdValueX4* mir() const {
         return mir_->toSimdValueX4();
     }
 };
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_shared_LIR_x86_shared_h */
+#endif /* jit_x86_shared_LIR_x86_shared_h */
rename from js/src/jit/shared/Lowering-x86-shared.cpp
rename to js/src/jit/x86-shared/Lowering-x86-shared.cpp
--- a/js/src/jit/shared/Lowering-x86-shared.cpp
+++ b/js/src/jit/x86-shared/Lowering-x86-shared.cpp
@@ -1,15 +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/shared/Lowering-x86-shared.h"
+#include "jit/x86-shared/Lowering-x86-shared.h"
 
 #include "mozilla/MathAlgorithms.h"
 
 #include "jit/MIR.h"
 
 #include "jit/shared/Lowering-shared-inl.h"
 
 using namespace js;
rename from js/src/jit/shared/Lowering-x86-shared.h
rename to js/src/jit/x86-shared/Lowering-x86-shared.h
--- a/js/src/jit/shared/Lowering-x86-shared.h
+++ b/js/src/jit/x86-shared/Lowering-x86-shared.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_shared_Lowering_x86_shared_h
-#define jit_shared_Lowering_x86_shared_h
+#ifndef jit_x86_shared_Lowering_x86_shared_h
+#define jit_x86_shared_Lowering_x86_shared_h
 
 #include "jit/shared/Lowering-shared.h"
 
 namespace js {
 namespace jit {
 
 class LIRGeneratorX86Shared : public LIRGeneratorShared
 {
@@ -60,9 +60,9 @@ class LIRGeneratorX86Shared : public LIR
                                                bool useI386ByteRegisters);
     void lowerAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop* ins,
                                            bool useI386ByteRegisters);
 };
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_shared_Lowering_x86_shared_h */
+#endif /* jit_x86_shared_Lowering_x86_shared_h */
rename from js/src/jit/shared/MacroAssembler-x86-shared.cpp
rename to js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp
--- a/js/src/jit/shared/MacroAssembler-x86-shared.cpp
+++ b/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp
@@ -1,15 +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/shared/MacroAssembler-x86-shared.h"
+#include "jit/x86-shared/MacroAssembler-x86-shared.h"
 
 #include "jit/JitFrames.h"
 #include "jit/MacroAssembler.h"
 
 using namespace js;
 using namespace js::jit;
 
 // Note: this function clobbers the input register.
rename from js/src/jit/shared/MacroAssembler-x86-shared.h
rename to js/src/jit/x86-shared/MacroAssembler-x86-shared.h
--- a/js/src/jit/shared/MacroAssembler-x86-shared.h
+++ b/js/src/jit/x86-shared/MacroAssembler-x86-shared.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_shared_MacroAssembler_x86_shared_h
-#define jit_shared_MacroAssembler_x86_shared_h
+#ifndef jit_x86_shared_MacroAssembler_x86_shared_h
+#define jit_x86_shared_MacroAssembler_x86_shared_h
 
 #include "mozilla/Casting.h"
 #include "mozilla/DebugOnly.h"
 
 #if defined(JS_CODEGEN_X86)
 # include "jit/x86/Assembler-x86.h"
 #elif defined(JS_CODEGEN_X64)
 # include "jit/x64/Assembler-x64.h"
@@ -1530,9 +1530,9 @@ MacroAssemblerX86Shared::storeScalar<flo
 }
 
 } // namespace jit
 } // namespace js
 
 #undef CHECK_BYTEREG
 #undef CHECK_BYTEREGS
 
-#endif /* jit_shared_MacroAssembler_x86_shared_h */
+#endif /* jit_x86_shared_MacroAssembler_x86_shared_h */
rename from js/src/jit/shared/MoveEmitter-x86-shared.cpp
rename to js/src/jit/x86-shared/MoveEmitter-x86-shared.cpp
--- a/js/src/jit/shared/MoveEmitter-x86-shared.cpp
+++ b/js/src/jit/x86-shared/MoveEmitter-x86-shared.cpp
@@ -1,15 +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/shared/MoveEmitter-x86-shared.h"
+#include "jit/x86-shared/MoveEmitter-x86-shared.h"
 
 using namespace js;
 using namespace js::jit;
 
 MoveEmitterX86::MoveEmitterX86(MacroAssembler& masm)
   : inCycle_(false),
     masm(masm),
     pushedAtCycle_(-1)
rename from js/src/jit/shared/MoveEmitter-x86-shared.h
rename to js/src/jit/x86-shared/MoveEmitter-x86-shared.h
rename from js/src/jit/shared/Patching-x86-shared.h
rename to js/src/jit/x86-shared/Patching-x86-shared.h
--- a/js/src/jit/shared/Patching-x86-shared.h
+++ b/js/src/jit/x86-shared/Patching-x86-shared.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_shared_Patching_x86_shared_h
-#define jit_shared_Patching_x86_shared_h
+#ifndef jit_x86_shared_Patching_x86_shared_h
+#define jit_x86_shared_Patching_x86_shared_h
 
 namespace js {
 namespace jit {
 
 namespace X86Encoding {
 
 inline void*
 GetPointer(const void* where)
@@ -129,9 +129,9 @@ CanRelinkJump(void* from, void* to)
     return (offset == static_cast<int32_t>(offset));
 }
 
 } // namespace X86Encoding
 
 } // namespace jit
 } // namespace js
 
-#endif /* jit_shared_Patching_x86_shared_h */
+#endif /* jit_x86_shared_Patching_x86_shared_h */
--- a/js/src/jit/x86/Architecture-x86.h
+++ b/js/src/jit/x86/Architecture-x86.h
@@ -2,17 +2,17 @@
  * 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_x86_Architecture_x86_h
 #define jit_x86_Architecture_x86_h
 
-#include "jit/shared/Constants-x86-shared.h"
+#include "jit/x86-shared/Constants-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 // In bytes: slots needed for potential memory->memory move spills.
 //   +8 for cycles
 //   +4 for gpr spills
 //   +8 for double spills
--- a/js/src/jit/x86/Assembler-x86.h
+++ b/js/src/jit/x86/Assembler-x86.h
@@ -8,17 +8,17 @@
 #define jit_x86_Assembler_x86_h
 
 #include "mozilla/ArrayUtils.h"
 
 #include "jit/CompactBuffer.h"
 #include "jit/IonCode.h"
 #include "jit/JitCompartment.h"
 #include "jit/shared/Assembler-shared.h"
-#include "jit/shared/Constants-x86-shared.h"
+#include "jit/x86-shared/Constants-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 static MOZ_CONSTEXPR_VAR Register eax = { X86Encoding::rax };
 static MOZ_CONSTEXPR_VAR Register ecx = { X86Encoding::rcx };
 static MOZ_CONSTEXPR_VAR Register edx = { X86Encoding::rdx };
 static MOZ_CONSTEXPR_VAR Register ebx = { X86Encoding::rbx };
@@ -148,17 +148,17 @@ struct ImmType : public ImmTag
     { }
 };
 
 static const Scale ScalePointer = TimesFour;
 
 } // namespace jit
 } // namespace js
 
-#include "jit/shared/Assembler-x86-shared.h"
+#include "jit/x86-shared/Assembler-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 static inline void
 PatchJump(CodeLocationJump jump, CodeLocationLabel label)
 {
 #ifdef DEBUG
--- a/js/src/jit/x86/BaselineCompiler-x86.h
+++ b/js/src/jit/x86/BaselineCompiler-x86.h
@@ -2,17 +2,17 @@
  * 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_x86_BaselineCompiler_x86_h
 #define jit_x86_BaselineCompiler_x86_h
 
-#include "jit/shared/BaselineCompiler-x86-shared.h"
+#include "jit/x86-shared/BaselineCompiler-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 class BaselineCompilerX86 : public BaselineCompilerX86Shared
 {
   protected:
     BaselineCompilerX86(JSContext* cx, TempAllocator& alloc, JSScript* script);
--- a/js/src/jit/x86/CodeGenerator-x86.h
+++ b/js/src/jit/x86/CodeGenerator-x86.h
@@ -2,17 +2,17 @@
  * 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_x86_CodeGenerator_x86_h
 #define jit_x86_CodeGenerator_x86_h
 
-#include "jit/shared/CodeGenerator-x86-shared.h"
+#include "jit/x86-shared/CodeGenerator-x86-shared.h"
 #include "jit/x86/Assembler-x86.h"
 
 namespace js {
 namespace jit {
 
 class OutOfLineTruncate;
 class OutOfLineTruncateFloat32;
 
--- a/js/src/jit/x86/Lowering-x86.h
+++ b/js/src/jit/x86/Lowering-x86.h
@@ -2,17 +2,17 @@
  * 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_x86_Lowering_x86_h
 #define jit_x86_Lowering_x86_h
 
-#include "jit/shared/Lowering-x86-shared.h"
+#include "jit/x86-shared/Lowering-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 class LIRGeneratorX86 : public LIRGeneratorX86Shared
 {
   public:
     LIRGeneratorX86(MIRGenerator* gen, MIRGraph& graph, LIRGraph& lirGraph)
--- a/js/src/jit/x86/MacroAssembler-x86.h
+++ b/js/src/jit/x86/MacroAssembler-x86.h
@@ -6,17 +6,17 @@
 
 #ifndef jit_x86_MacroAssembler_x86_h
 #define jit_x86_MacroAssembler_x86_h
 
 #include "jscompartment.h"
 
 #include "jit/JitFrames.h"
 #include "jit/MoveResolver.h"
-#include "jit/shared/MacroAssembler-x86-shared.h"
+#include "jit/x86-shared/MacroAssembler-x86-shared.h"
 
 namespace js {
 namespace jit {
 
 class MacroAssemblerX86 : public MacroAssemblerX86Shared
 {
   private:
     // Perform a downcast. Should be removed by Bug 996602.
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -360,25 +360,25 @@ if CONFIG['ENABLE_TRACE_LOGGING']:
     ]
 
 if not CONFIG['ENABLE_ION']:
     UNIFIED_SOURCES += [
         'jit/none/Trampoline-none.cpp'
     ]
 elif CONFIG['JS_CODEGEN_X86'] or CONFIG['JS_CODEGEN_X64']:
     UNIFIED_SOURCES += [
-        'jit/shared/Assembler-x86-shared.cpp',
-        'jit/shared/AssemblerBuffer-x86-shared.cpp',
-        'jit/shared/BaselineCompiler-x86-shared.cpp',
-        'jit/shared/BaselineIC-x86-shared.cpp',
-        'jit/shared/CodeGenerator-x86-shared.cpp',
-        'jit/shared/Disassembler-x86-shared.cpp',
-        'jit/shared/Lowering-x86-shared.cpp',
-        'jit/shared/MacroAssembler-x86-shared.cpp',
-        'jit/shared/MoveEmitter-x86-shared.cpp',
+        'jit/x86-shared/Assembler-x86-shared.cpp',
+        'jit/x86-shared/AssemblerBuffer-x86-shared.cpp',
+        'jit/x86-shared/BaselineCompiler-x86-shared.cpp',
+        'jit/x86-shared/BaselineIC-x86-shared.cpp',
+        'jit/x86-shared/CodeGenerator-x86-shared.cpp',
+        'jit/x86-shared/Disassembler-x86-shared.cpp',
+        'jit/x86-shared/Lowering-x86-shared.cpp',
+        'jit/x86-shared/MacroAssembler-x86-shared.cpp',
+        'jit/x86-shared/MoveEmitter-x86-shared.cpp',
     ]
     if CONFIG['JS_CODEGEN_X64']:
         UNIFIED_SOURCES += [
             'jit/x64/Assembler-x64.cpp',
             'jit/x64/Bailouts-x64.cpp',
             'jit/x64/BaselineCompiler-x64.cpp',
             'jit/x64/BaselineIC-x64.cpp',
             'jit/x64/CodeGenerator-x64.cpp',