diff options
| author | Julien Brianceau <jbriance@cisco.com> | 2015-04-03 09:09:28 +0200 |
|---|---|---|
| committer | Julien Brianceau <jbriance@cisco.com> | 2015-04-07 20:39:39 +0000 |
| commit | 7f0e3887c79353e4612efc5f8bab861683678e24 (patch) | |
| tree | e58273e21f1f74d23b1d716d616d50fc99ba888f | |
| parent | 15fc7e066552afee24a2637c1763bf2c9daed727 (diff) | |
[mips] Fix or32 implementation in macro assembler.
Cherry-picked from qtwebkit (0546c8656a3728bf4375da39027e096beba4f111)
Change-Id: I924661dc51bee334c6f26557e765a3a1e8ec0bce
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerMIPS.h | 4 |
1 files changed, 3 insertions, 1 deletions
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); |