diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:17:27 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:17:28 +0200 |
| commit | d2d7e41f4d8717c8072e252aa9ac3b9ee5ae7e00 (patch) | |
| tree | e8874dd86ac27022faa3cb3fe87b2605c09cb0fd /Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h | |
| parent | 3bdac631e84c3fd0011d76e7c40a05aea6ac5f0b (diff) | |
| parent | 0546c8656a3728bf4375da39027e096beba4f111 (diff) | |
| download | qtwebkit-d2d7e41f4d8717c8072e252aa9ac3b9ee5ae7e00.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I42fb7e064fa7cfedf97d0436d406cb379c846ea5
Diffstat (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h b/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h index 298a25c29..e13ae7b34 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h @@ -396,8 +396,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); |