diff -r 000000000000 -r 6474c204b198 js/src/jit/x64/Architecture-x64.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jit/x64/Architecture-x64.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,167 @@
+/* -*- 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_x64_Architecture_x64_h
+#define jit_x64_Architecture_x64_h
+
+#include "assembler/assembler/MacroAssembler.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
+static const uint32_t ION_FRAME_SLACK_SIZE     = 24;
+
+#ifdef _WIN64
+static const uint32_t ShadowStackSpace = 32;
+#else
+static const uint32_t ShadowStackSpace = 0;
+#endif
+
+class Registers {
+  public:
+    typedef JSC::X86Registers::RegisterID Code;
+
+    static const char *GetName(Code code) {
+        static const char * const Names[] = { "rax", "rcx", "rdx", "rbx",
+                                              "rsp", "rbp", "rsi", "rdi",
+                                              "r8",  "r9",  "r10", "r11",
+                                              "r12", "r13", "r14", "r15" };
+        return Names[code];
+    }
+
+    static Code FromName(const char *name) {
+        for (size_t i = 0; i < Total; i++) {
+            if (strcmp(GetName(Code(i)), name) == 0)
+                return Code(i);
+        }
+        return Invalid;
+    }
+
+    static const Code StackPointer = JSC::X86Registers::esp;
+    static const Code Invalid = JSC::X86Registers::invalid_reg;
+
+    static const uint32_t Total = 16;
+    static const uint32_t Allocatable = 14;
+
+    static const uint32_t AllMask = (1 << Total) - 1;
+
+    static const uint32_t ArgRegMask =
+# if !defined(_WIN64)
+        (1 << JSC::X86Registers::edi) |
+        (1 << JSC::X86Registers::esi) |
+# endif
+        (1 << JSC::X86Registers::edx) |
+        (1 << JSC::X86Registers::ecx) |
+        (1 << JSC::X86Registers::r8) |
+        (1 << JSC::X86Registers::r9);
+
+    static const uint32_t VolatileMask =
+        (1 << JSC::X86Registers::eax) |
+        (1 << JSC::X86Registers::ecx) |
+        (1 << JSC::X86Registers::edx) |
+# if !defined(_WIN64)
+        (1 << JSC::X86Registers::esi) |
+        (1 << JSC::X86Registers::edi) |
+# endif
+        (1 << JSC::X86Registers::r8) |
+        (1 << JSC::X86Registers::r9) |
+        (1 << JSC::X86Registers::r10) |
+        (1 << JSC::X86Registers::r11);
+
+    static const uint32_t NonVolatileMask =
+        (1 << JSC::X86Registers::ebx) |
+#if defined(_WIN64)
+        (1 << JSC::X86Registers::esi) |
+        (1 << JSC::X86Registers::edi) |
+#endif
+        (1 << JSC::X86Registers::ebp) |
+        (1 << JSC::X86Registers::r12) |
+        (1 << JSC::X86Registers::r13) |
+        (1 << JSC::X86Registers::r14) |
+        (1 << JSC::X86Registers::r15);
+
+    static const uint32_t WrapperMask = VolatileMask;
+
+    static const uint32_t SingleByteRegs = VolatileMask | NonVolatileMask;
+
+    static const uint32_t NonAllocatableMask =
+        (1 << JSC::X86Registers::esp) |
+        (1 << JSC::X86Registers::r11);      // This is ScratchReg.
+
+    // Registers that can be allocated without being saved, generally.
+    static const uint32_t TempMask = VolatileMask & ~NonAllocatableMask;
+
+    static const uint32_t AllocatableMask = AllMask & ~NonAllocatableMask;
+
+    // Registers returned from a JS -> JS call.
+    static const uint32_t JSCallMask =
+        (1 << JSC::X86Registers::ecx);
+
+    // Registers returned from a JS -> C call.
+    static const uint32_t CallMask =
+        (1 << JSC::X86Registers::eax);
+};
+
+// Smallest integer type that can hold a register bitmask.
+typedef uint16_t PackedRegisterMask;
+
+class FloatRegisters {
+  public:
+    typedef JSC::X86Registers::XMMRegisterID Code;
+
+    static const char *GetName(Code code) {
+        static const char * const Names[] = { "xmm0",  "xmm1",  "xmm2",  "xmm3",
+                                              "xmm4",  "xmm5",  "xmm6",  "xmm7",
+                                              "xmm8",  "xmm9",  "xmm10", "xmm11",
+                                              "xmm12", "xmm13", "xmm14", "xmm15" };
+        return Names[code];
+    }
+
+    static Code FromName(const char *name) {
+        for (size_t i = 0; i < Total; i++) {
+            if (strcmp(GetName(Code(i)), name) == 0)
+                return Code(i);
+        }
+        return Invalid;
+    }
+
+    static const Code Invalid = JSC::X86Registers::invalid_xmm;
+
+    static const uint32_t Total = 16;
+    static const uint32_t Allocatable = 15;
+
+    static const uint32_t AllMask = (1 << Total) - 1;
+
+    static const uint32_t VolatileMask =
+#if defined(_WIN64)
+        (1 << JSC::X86Registers::xmm0) |
+        (1 << JSC::X86Registers::xmm1) |
+        (1 << JSC::X86Registers::xmm2) |
+        (1 << JSC::X86Registers::xmm3) |
+        (1 << JSC::X86Registers::xmm4) |
+        (1 << JSC::X86Registers::xmm5);
+#else
+        AllMask;
+#endif
+
+    static const uint32_t NonVolatileMask = AllMask & ~VolatileMask;
+
+    static const uint32_t WrapperMask = VolatileMask;
+
+    static const uint32_t NonAllocatableMask =
+        (1 << JSC::X86Registers::xmm15);    // This is ScratchFloatReg.
+
+    static const uint32_t AllocatableMask = AllMask & ~NonAllocatableMask;
+};
+
+} // namespace jit
+} // namespace js
+
+#endif /* jit_x64_Architecture_x64_h */