From 7f0e3887c79353e4612efc5f8bab861683678e24 Mon Sep 17 00:00:00 2001 From: Julien Brianceau Date: Fri, 3 Apr 2015 09:09:28 +0200 Subject: [mips] Fix or32 implementation in macro assembler. Cherry-picked from qtwebkit (0546c8656a3728bf4375da39027e096beba4f111) Change-Id: I924661dc51bee334c6f26557e765a3a1e8ec0bce Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty/masm/assembler/MacroAssemblerMIPS.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h b/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h index 167f3c1729..c2e61ae404 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); -- cgit v1.2.3