Bug 1218640 - IonMonkey: MIPS64: Add support into irregexp. r=arai
authorHeiher <r@hev.cc>
Thu, 29 Oct 2015 17:03:36 +0800
changeset 305314 f6d251d7b4f7e58299effdbea37e555843bb3ca8
parent 305313 b3a42d2881e5c12d98a96f2f0bfe8a32fb093c9c
child 305315 94cbb92ba72d6818f387b416047cd91edd468038
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarai
bugs1218640
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1218640 - IonMonkey: MIPS64: Add support into irregexp. r=arai --- js/src/irregexp/NativeRegExpMacroAssembler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
js/src/irregexp/NativeRegExpMacroAssembler.cpp
--- a/js/src/irregexp/NativeRegExpMacroAssembler.cpp
+++ b/js/src/irregexp/NativeRegExpMacroAssembler.cpp
@@ -405,17 +405,17 @@ NativeRegExpMacroAssembler::GenerateCode
         Label grow_failed;
 
         masm.movePtr(ImmPtr(runtime), temp1);
 
         // Save registers before calling C function
         LiveGeneralRegisterSet volatileRegs(GeneralRegisterSet::Volatile());
 #if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)
         volatileRegs.add(Register::FromCode(Registers::lr));
-#elif defined(JS_CODEGEN_MIPS32)
+#elif defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
         volatileRegs.add(Register::FromCode(Registers::ra));
 #endif
         volatileRegs.takeUnchecked(temp0);
         volatileRegs.takeUnchecked(temp1);
         masm.PushRegsInMask(volatileRegs);
 
         masm.setupUnalignedABICall(temp0);
         masm.passABIArg(temp1);
@@ -1338,17 +1338,17 @@ NativeRegExpMacroAssembler::CheckSpecial
     }
 }
 
 bool
 NativeRegExpMacroAssembler::CanReadUnaligned()
 {
 #if defined(JS_CODEGEN_ARM)
     return !jit::HasAlignmentFault();
-#elif defined(JS_CODEGEN_MIPS32)
+#elif defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
     return false;
 #else
     return true;
 #endif
 }
 
 const uint8_t
 NativeRegExpMacroAssembler::word_character_map[] =