diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-14 17:18:28 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-14 20:26:43 +0200 |
commit | 520572a67c4e747583792b256702c488b74bff3d (patch) | |
tree | 2144cf369c2f49754c6e9242e5ea901616735de5 /Source/JavaScriptCore/assembler/MacroAssemblerARM.h | |
parent | c3b2b9d23396e4853d152bef5479d8f05d651e27 (diff) | |
parent | 5a45e3b78724563f05d62569d8ed31adc4ffd342 (diff) | |
download | qtwebkit-520572a67c4e747583792b256702c488b74bff3d.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
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) { |