diff -r 000000000000 -r 6474c204b198 js/src/jit/shared/MoveEmitter-x86-shared.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jit/shared/MoveEmitter-x86-shared.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,65 @@
+/* -*- 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_MoveEmitter_x86_shared_h
+#define jit_MoveEmitter_x86_shared_h
+
+#if defined(JS_CODEGEN_X86)
+# include "jit/x86/MacroAssembler-x86.h"
+#elif defined(JS_CODEGEN_X64)
+# include "jit/x64/MacroAssembler-x64.h"
+#else
+# error "Wrong architecture. Only x86 and x64 should build this file!"
+#endif
+#include "jit/MoveResolver.h"
+
+namespace js {
+namespace jit {
+
+class CodeGenerator;
+
+class MoveEmitterX86
+{
+    bool inCycle_;
+    MacroAssemblerSpecific &masm;
+
+    // Original stack push value.
+    uint32_t pushedAtStart_;
+
+    // This is a store stack offset for the cycle-break spill slot, snapshotting
+    // codegen->framePushed_ at the time it is allocated. -1 if not allocated.
+    int32_t pushedAtCycle_;
+
+    void assertDone();
+    Address cycleSlot();
+    Address toAddress(const MoveOperand &operand) const;
+    Operand toOperand(const MoveOperand &operand) const;
+    Operand toPopOperand(const MoveOperand &operand) const;
+
+    size_t characterizeCycle(const MoveResolver &moves, size_t i,
+                             bool *allGeneralRegs, bool *allFloatRegs);
+    bool maybeEmitOptimizedCycle(const MoveResolver &moves, size_t i,
+                                 bool allGeneralRegs, bool allFloatRegs, size_t swapCount);
+    void emitInt32Move(const MoveOperand &from, const MoveOperand &to);
+    void emitGeneralMove(const MoveOperand &from, const MoveOperand &to);
+    void emitFloat32Move(const MoveOperand &from, const MoveOperand &to);
+    void emitDoubleMove(const MoveOperand &from, const MoveOperand &to);
+    void breakCycle(const MoveOperand &to, MoveOp::Type type);
+    void completeCycle(const MoveOperand &to, MoveOp::Type type);
+
+  public:
+    MoveEmitterX86(MacroAssemblerSpecific &masm);
+    ~MoveEmitterX86();
+    void emit(const MoveResolver &moves);
+    void finish();
+};
+
+typedef MoveEmitterX86 MoveEmitter;
+
+} // ion
+} // js
+
+#endif /* jit_MoveEmitter_x86_shared_h */