diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-04 14:48:40 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-04 14:48:40 (GMT) |
| commit | b4ef8b906c88e5d60e687d9018af93de0e735e0c (patch) | |
| tree | fe4167319039047ba3ac0c97651dddc0a526349b /src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp | |
| parent | f4f6012d181cf60fd04fc5bf69b21786977f0de0 (diff) | |
| parent | 9cda9fb4bb496a7c589767bdcead131dbcdeeb79 (diff) | |
| download | Qt-b4ef8b906c88e5d60e687d9018af93de0e735e0c.zip Qt-b4ef8b906c88e5d60e687d9018af93de0e735e0c.tar.gz Qt-b4ef8b906c88e5d60e687d9018af93de0e735e0c.tar.bz2 | |
Merge commit 's60/4.6' into mmfphonon
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp b/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp index e10d105..14736cf 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp @@ -1792,7 +1792,6 @@ void JIT::privateCompileCTIMachineTrampolines(RefPtr<ExecutablePool>* executable // Setup arg4: This is a plain hack move(stackPointerRegister, ARMRegisters::S0); - move(ctiReturnRegister, ARMRegisters::lr); call(Address(regT1, OBJECT_OFFSETOF(JSFunction, m_data))); addPtr(Imm32(sizeof(ArgList)), stackPointerRegister); @@ -2500,7 +2499,13 @@ void JIT::emit_op_next_pname(Instruction* currentInstruction) // Grab key @ i loadPtr(addressFor(it), regT1); loadPtr(Address(regT1, OBJECT_OFFSETOF(JSPropertyNameIterator, m_jsStrings)), regT2); + +#if USE(JSVALUE64) loadPtr(BaseIndex(regT2, regT0, TimesEight), regT2); +#else + loadPtr(BaseIndex(regT2, regT0, TimesFour), regT2); +#endif + emitPutVirtualRegister(dst, regT2); // Increment i |