diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2010-04-07 16:33:14 (GMT) |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2010-04-07 16:55:20 (GMT) |
| commit | 931360299e8838821cc91305a350fcbe5b72bdb3 (patch) | |
| tree | 168147bc132424f4e0da06ffc6d07183d29f1724 /src/3rdparty/javascriptcore/JavaScriptCore/assembler | |
| parent | 15afc83b1e786deda8c43aad50a62d33e49bed5b (diff) | |
| download | Qt-931360299e8838821cc91305a350fcbe5b72bdb3.zip Qt-931360299e8838821cc91305a350fcbe5b72bdb3.tar.gz Qt-931360299e8838821cc91305a350fcbe5b72bdb3.tar.bz2 | |
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-07042010 ( 499bdb98708eba4bd40532c70179bf45b43ad068 )
Fixed <rdar://problem/7728196> REGRESSION (r46701): -(-2147483648)
evaluates to -2147483648 on 32 bit (35842)
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/assembler')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.h | 7 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerX86Common.h | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.h b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.h index 21b8de8..e5ba261 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.h @@ -530,6 +530,13 @@ public: return Jump(m_assembler.jmp(ARMCondition(cond))); } + Jump branchNeg32(Condition cond, RegisterID srcDest) + { + ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); + neg32(srcDest); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + Jump branchOr32(Condition cond, RegisterID src, RegisterID dest) { ASSERT((cond == Signed) || (cond == Zero) || (cond == NonZero)); diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerX86Common.h b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerX86Common.h index 449df86..ab29cb0 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerX86Common.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerX86Common.h @@ -836,6 +836,13 @@ public: return Jump(m_assembler.jCC(x86Condition(cond))); } + Jump branchNeg32(Condition cond, RegisterID srcDest) + { + ASSERT((cond == Overflow) || (cond == Zero) || (cond == NonZero)); + neg32(srcDest); + return Jump(m_assembler.jCC(x86Condition(cond))); + } + Jump branchOr32(Condition cond, RegisterID src, RegisterID dest) { ASSERT((cond == Signed) || (cond == Zero) || (cond == NonZero)); |