diff options
| author | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-04-23 12:44:13 +0300 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-04-23 12:44:14 +0300 |
| commit | 7d16c2f40a2995c6bdff3a1999a7cb6100fdf301 (patch) | |
| tree | fda2e8a1b363caae655ba1369e54ec0257c7d067 /src/qml/jit/qv4assembler_p.h | |
| parent | aedcd57c84ac9d6b74816c13bdf3fde31e1132b5 (diff) | |
| parent | 937fdde5d3b26291d417f856ee05ba479a6ba730 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I1214586499ab2876c8bc55a99367a0c938c8b919
Diffstat (limited to 'src/qml/jit/qv4assembler_p.h')
| -rw-r--r-- | src/qml/jit/qv4assembler_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jit/qv4assembler_p.h b/src/qml/jit/qv4assembler_p.h index 19804e7293..6fde517e1f 100644 --- a/src/qml/jit/qv4assembler_p.h +++ b/src/qml/jit/qv4assembler_p.h @@ -219,12 +219,12 @@ public: #define ARGUMENTS_IN_REGISTERS #undef HAVE_ALU_OPS_WITH_MEM_OPERAND - static const RegisterID StackFrameRegister = JSC::ARMRegisters::r4; - static const RegisterID StackPointerRegister = JSC::ARMRegisters::sp; + static const RegisterID StackPointerRegister = JSC::ARMRegisters::sp; // r13 + static const RegisterID StackFrameRegister = JSC::ARMRegisters::fp; // r11 static const RegisterID LocalsRegister = JSC::ARMRegisters::r7; + static const RegisterID ScratchRegister = JSC::ARMRegisters::r6; static const RegisterID ContextRegister = JSC::ARMRegisters::r5; static const RegisterID ReturnValueRegister = JSC::ARMRegisters::r0; - static const RegisterID ScratchRegister = JSC::ARMRegisters::r6; static const FPRegisterID FPGpr0 = JSC::ARMRegisters::d0; static const FPRegisterID FPGpr1 = JSC::ARMRegisters::d1; |