Bug 965880 - OdinMonkey: add back masm.storePtr that somehow got lost in rebasing on CLOSED TREE (r=me)
authorLuke Wagner <luke@mozilla.com>
Tue, 07 Oct 2014 16:03:08 -0500
changeset 209244 e91da451577285cc36cf6cc2082a6563d6f7ac09
parent 209243 dd1ab67d5b3c39e1a12bff198ac9bf453238eb68
child 209245 97068dca449ef5b8afa16bc54975d6aab02ec168
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersme
bugs965880
milestone35.0a1
Bug 965880 - OdinMonkey: add back masm.storePtr that somehow got lost in rebasing on CLOSED TREE (r=me)
js/src/asmjs/AsmJSValidate.cpp
--- a/js/src/asmjs/AsmJSValidate.cpp
+++ b/js/src/asmjs/AsmJSValidate.cpp
@@ -7768,16 +7768,17 @@ GenerateFFIIonExit(ModuleCompiler &m, co
     //    HeapReg are removed from the general register set for asm.js code, so
     //    these will not have been saved by the caller like all other registers,
     //    so they must be explicitly preserved. Only save GlobalReg since
     //    HeapReg must be reloaded (from global data) after the call since the
     //    heap may change during the FFI call.
 #if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_MIPS)
     JS_STATIC_ASSERT(MaybeSavedGlobalReg > 0);
     unsigned savedGlobalOffset = framePushed - MaybeSavedGlobalReg;
+    masm.storePtr(GlobalReg, Address(StackPointer, savedGlobalOffset));
 #else
     JS_STATIC_ASSERT(MaybeSavedGlobalReg == 0);
 #endif
 
     {
         // Enable Activation.
         //
         // This sequence requires four registers, and needs to preserve the 'callee'