diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-03-06 12:40:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-08 09:26:31 +0100 |
| commit | 6957e7702476dc300466f6f693782cf8661a5ba1 (patch) | |
| tree | 7429f2c6f5eb5f8d98a19010df19ee32e6f4e486 /src/qml | |
| parent | af7ca3607cc6e530af8ed0d1fa5e6d132bc16ac1 (diff) | |
V4 JIT: enable JIT on win64.
Change-Id: I640d507c33fd4c4df6d6284b473df5cea9e5c4b4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/jit/qv4assembler.cpp | 10 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/qml/jit/qv4assembler.cpp b/src/qml/jit/qv4assembler.cpp index 334d7e7b1a..4e644c434d 100644 --- a/src/qml/jit/qv4assembler.cpp +++ b/src/qml/jit/qv4assembler.cpp @@ -105,6 +105,16 @@ static const Assembler::RegisterID calleeSavedRegisters[] = { JSC::X86Registers::r14, // ContextRegister JSC::X86Registers::r15 }; +# elif OS(WINDOWS) +static const Assembler::RegisterID calleeSavedRegisters[] = { + JSC::X86Registers::ebx, + JSC::X86Registers::esi, + JSC::X86Registers::edi, + JSC::X86Registers::r12, // LocalsRegister + JSC::X86Registers::r13, + JSC::X86Registers::r14, // ContextRegister + JSC::X86Registers::r15 +}; # endif #endif diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 746513cc2f..4e05bb81ab 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -84,7 +84,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } // Black list some platforms #if defined(V4_ENABLE_JIT) -#if defined(Q_OS_IOS) || defined(Q_OS_WIN64) || defined(Q_OS_WINRT) +#if defined(Q_OS_IOS) || defined(Q_OS_WINRT) # undef V4_ENABLE_JIT #endif #endif |