diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-16 12:29:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-16 12:33:27 +0200 |
| commit | 9c8edb91f2c6c7de8228e018dbd1ae7a656b3097 (patch) | |
| tree | 717b1df74793af50bd6daaa6775b923a74b05063 /src/3rdparty | |
| parent | 5870667929ac5f45805b1e1e656fec81b9b22337 (diff) | |
| parent | 2b3c2339616680537145a9cc2e7567575add1abb (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro
tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro
Change-Id: I76d87e3df97ebdba902ca3d7488c1582eca2a83c
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerMIPS.h | 6 | ||||
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h b/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h index 55a3c7bf9b..03f8e2d71a 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h @@ -395,8 +395,10 @@ public: void or32(TrustedImm32 imm, RegisterID src, RegisterID dest) { - if (!imm.m_value && !m_fixedWidth) + if (!imm.m_value && !m_fixedWidth) { + move(src, dest); return; + } if (imm.m_value > 0 && imm.m_value < 65535 && !m_fixedWidth) { m_assembler.ori(dest, src, imm.m_value); @@ -2647,7 +2649,7 @@ public: { m_assembler.truncwd(fpTempRegister, src); m_assembler.mfc1(dest, fpTempRegister); - return branch32(branchType == BranchIfTruncateFailed ? Equal : NotEqual, dest, TrustedImm32(0)); + return branch32(branchType == BranchIfTruncateFailed ? Equal : NotEqual, dest, TrustedImm32(0x7fffffff)); } // Result is undefined if the value is outside of the integer range. diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index 3655af36b6..3497650f0c 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -63,7 +63,20 @@ HEADERS += $$PWD/disassembler/ARMv7/ARMv7DOpcode.h SOURCES += $$PWD/yarr/*.cpp HEADERS += $$PWD/yarr/*.h -retgen.output = RegExpJitTables.h +# +# Generate RegExpJitTables.h +# +GENERATEDDIR = .generated +debug_and_release { + CONFIG(debug, debug|release) { + GENERATEDDIR = $$GENERATEDDIR/debug + } else { + GENERATEDDIR = $$GENERATEDDIR/release + } +} +INCLUDEPATH += $$GENERATEDDIR + +retgen.output = $$GENERATEDDIR/RegExpJitTables.h retgen.script = $$PWD/create_regex_tables retgen.input = retgen.script retgen.CONFIG += no_link |