From: Erik Verbruggen <erik.verbruggen@me.com>
Date: Wed, 25 Sep 2013 13:16:39 +0000 (+0200)
Subject: V4 JIT: enable register allocator for linux/x86.
X-Git-Tag: upstream/5.2.1~279
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=772c03def11e3e60a53f272746277b70c53635c0;p=platform%2Fupstream%2Fqtdeclarative.git

V4 JIT: enable register allocator for linux/x86.

Change-Id: I9424838139a419beb2e207f168fc25c0c47c64e3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---

diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp
index dd75428..1146c08 100644
--- a/src/qml/compiler/qv4isel_masm.cpp
+++ b/src/qml/compiler/qv4isel_masm.cpp
@@ -632,9 +632,14 @@ void InstructionSelection::run(int functionIndex)
     V4IR::Optimizer opt(_function);
     opt.run();
 
-#if CPU(X86_64) && (OS(MAC_OS_X) || OS(LINUX))
+#if (CPU(X86_64) && (OS(MAC_OS_X) || OS(LINUX))) || (CPU(X86) && OS(LINUX))
     static const bool withRegisterAllocator = qgetenv("QV4_NO_REGALLOC").isEmpty();
     if (opt.isInSSA() && withRegisterAllocator) {
+#if CPU(X86) && OS(LINUX) // x86 with linux
+        static const QVector<int> intRegisters = QVector<int>()
+                << JSC::X86Registers::edx
+                << JSC::X86Registers::ebx;
+#else // x86_64 with linux or with macos
         static const QVector<int> intRegisters = QVector<int>()
                 << JSC::X86Registers::edi
                 << JSC::X86Registers::esi
@@ -643,6 +648,7 @@ void InstructionSelection::run(int functionIndex)
                 << JSC::X86Registers::r8
                 << JSC::X86Registers::r13
                 << JSC::X86Registers::r15;
+#endif
         static const QVector<int> fpRegisters = QVector<int>()
                 << JSC::X86Registers::xmm1
                 << JSC::X86Registers::xmm2