diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:19:56 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 20:29:12 +0200 |
| commit | 7a7433bfa61e80b91d1e9e7cf4b44ee8fdc431a0 (patch) | |
| tree | 2ca7eb63ddb38472305f41e8e5b81c89cd20b9f0 /Source/JavaScriptCore/assembler/MacroAssemblerARM.h | |
| parent | ee21e513f3ed68af68e529b43c8fda94dfcc49ff (diff) | |
| parent | 7778f881ff7dc92fca44dd414b02e7345f8db930 (diff) | |
| download | qtwebkit-7a7433bfa61e80b91d1e9e7cf4b44ee8fdc431a0.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
Tools/qmake/mkspecs/features/configure.prf
Change-Id: I3a704585aaa8bbf4ba4e249248195b9271890981
Diffstat (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerARM.h')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerARM.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h index 494fe640d..9058514dc 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h @@ -725,6 +725,11 @@ public: return Jump(m_assembler.jmp(ARMCondition(cond))); } + Jump branchAdd32(ResultCondition cond, Address src, RegisterID dest) + { + load32(src, ARMRegisters::S0); + return branchAdd32(cond, dest, ARMRegisters::S0, dest); + } void mull32(RegisterID op1, RegisterID op2, RegisterID dest) { if (op2 == dest) { |