Bug 1144005 - IonMonkey: MIPS: Fix encode break instruction. r=rankov
authorHeiher <r@hev.cc>
Wed, 18 Mar 2015 18:21:00 +0100
changeset 234436 c95b819aba41918c41be2afc8465c369c6faa20b
parent 234435 7a3da13b481426cc34d36d3978cd5afd189baffe
child 234437 535571bc01644d2a79947b2756c9ce157d3d24a7
push id28446
push userkwierso@gmail.com
push dateFri, 20 Mar 2015 02:15:45 +0000
treeherdermozilla-central@3257d9c4b257 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrankov
bugs1144005
milestone39.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 1144005 - IonMonkey: MIPS: Fix encode break instruction. r=rankov
js/src/jit/mips/Assembler-mips.cpp
js/src/jit/mips/Simulator-mips.cpp
--- a/js/src/jit/mips/Assembler-mips.cpp
+++ b/js/src/jit/mips/Assembler-mips.cpp
@@ -1457,17 +1457,17 @@ Assembler::retarget(Label *label, Label 
     label->reset();
 }
 
 void dbg_break() {}
 void
 Assembler::as_break(uint32_t code)
 {
     MOZ_ASSERT(code <= MAX_BREAK_CODE);
-    writeInst(op_special | code << RTShift | ff_break);
+    writeInst(op_special | code << FunctionBits | ff_break);
 }
 
 uint32_t
 Assembler::PatchWrite_NearCallSize()
 {
     return 4 * sizeof(uint32_t);
 }
 
--- a/js/src/jit/mips/Simulator-mips.cpp
+++ b/js/src/jit/mips/Simulator-mips.cpp
@@ -37,17 +37,17 @@
 
 #include "asmjs/AsmJSValidate.h"
 #include "jit/mips/Assembler-mips.h"
 #include "vm/Runtime.h"
 
 namespace js {
 namespace jit {
 
-static const Instr kCallRedirInstr = op_special | MAX_BREAK_CODE << RTShift | ff_break;
+static const Instr kCallRedirInstr = op_special | MAX_BREAK_CODE << FunctionBits | ff_break;
 
 // Utils functions.
 static bool
 HaveSameSign(int32_t a, int32_t b)
 {
     return ((a ^ b) >= 0);
 }