diff options
Diffstat (limited to 'src/qml/jit/qv4assemblercommon_p.h')
| -rw-r--r-- | src/qml/jit/qv4assemblercommon_p.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/qml/jit/qv4assemblercommon_p.h b/src/qml/jit/qv4assemblercommon_p.h index cccd90fab8..e83608ae23 100644 --- a/src/qml/jit/qv4assemblercommon_p.h +++ b/src/qml/jit/qv4assemblercommon_p.h @@ -16,12 +16,15 @@ // #include <private/qv4engine_p.h> -#include <private/qv4global_p.h> #include <private/qv4function_p.h> -#include <QHash> +#include <private/qv4global_p.h> +#include <private/qv4stackframe_p.h> + #include <wtf/Vector.h> #include <assembler/MacroAssembler.h> +#include <QtCore/qhash.h> + #if QT_CONFIG(qml_jit) QT_BEGIN_NAMESPACE @@ -30,7 +33,7 @@ namespace QV4 { namespace JIT { #if defined(Q_PROCESSOR_X86_64) || defined(ENABLE_ALL_ASSEMBLERS_FOR_REFACTORING_PURPOSES) -#if defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_SOLARIS) +#if defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_VXWORKS) class PlatformAssembler_X86_64_SysV : public JSC::MacroAssembler<JSC::MacroAssemblerX86_64> { @@ -559,7 +562,7 @@ public: Address loadConstAddress(int constIndex, RegisterID baseReg = ScratchRegister) { Address addr = loadCompilationUnitPtr(baseReg); - addr.offset = offsetof(QV4::CompiledData::CompilationUnitBase, constants); + addr.offset = offsetof(QV4::CompilationUnitRuntimeData, constants); loadPtr(addr, baseReg); addr.offset = constIndex * int(sizeof(QV4::Value)); return addr; @@ -568,7 +571,7 @@ public: Address loadStringAddress(int stringId) { Address addr = loadCompilationUnitPtr(ScratchRegister); - addr.offset = offsetof(QV4::CompiledData::CompilationUnitBase, runtimeStrings); + addr.offset = offsetof(QV4::CompilationUnitRuntimeData, runtimeStrings); loadPtr(addr, ScratchRegister); return Address(ScratchRegister, stringId * PointerSize); } |