S390: [generators] Store the resume mode in the generator object.

src/s390/builtins-s390.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_S390
 
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 690 matching lines @@
   //  -- r4 : the resume mode (tagged)
   //  -- lr : return address
   // -----------------------------------
   __ AssertGeneratorObject(r3);
 
   // Store input value into generator object.
   __ StoreP(r2, FieldMemOperand(r3, JSGeneratorObject::kInputOffset), r0);
   __ RecordWriteField(r3, JSGeneratorObject::kInputOffset, r2, r5,
                       kLRHasNotBeenSaved, kDontSaveFPRegs);
 
+  // Store resume mode into generator object.
+  __ StoreP(r4, FieldMemOperand(r3, JSGeneratorObject::kResumeModeOffset));
+
   // Load suspended function and context.
   __ LoadP(cp, FieldMemOperand(r3, JSGeneratorObject::kContextOffset));
   __ LoadP(r6, FieldMemOperand(r3, JSGeneratorObject::kFunctionOffset));
 
   // Flood function if we are stepping.
   Label skip_flooding;
   ExternalReference step_in_enabled =
       ExternalReference::debug_step_in_enabled_address(masm->isolate());
   __ mov(ip, Operand(step_in_enabled));
   __ LoadlB(ip, MemOperand(ip));
@@ skipping 63 matching lines @@
     __ beq(&done_loop);
     __ LoadRR(r1, r5);
     __ bind(&loop);
     __ LoadP(ip, MemOperand(r2, kPointerSize));
     __ la(r2, MemOperand(r2, kPointerSize));
     __ Push(ip);
     __ BranchOnCount(r1, &loop);
     __ bind(&done_loop);
   }
 
-  // Push resume mode (consumed in continuation).
-  __ Push(r4);
-
   // Reset operand stack so we don't leak.
   __ LoadRoot(ip, Heap::kEmptyFixedArrayRootIndex);
   __ StoreP(ip, FieldMemOperand(r3, JSGeneratorObject::kOperandStackOffset),
             r0);
 
-  // Restore value.
-  __ LoadP(r2, FieldMemOperand(r3, JSGeneratorObject::kInputOffset));
-
   // Resume the generator function at the continuation.
   __ LoadP(r5, FieldMemOperand(r6, JSFunction::kSharedFunctionInfoOffset));
   __ LoadP(r5, FieldMemOperand(r5, SharedFunctionInfo::kCodeOffset));
   __ AddP(r5, r5, Operand(Code::kHeaderSize - kHeapObjectTag));
   {
     ConstantPoolUnavailableScope constant_pool_unavailable(masm);
     __ LoadP(r4, FieldMemOperand(r3, JSGeneratorObject::kContinuationOffset));
     __ SmiUntag(r4);
     __ AddP(r5, r5, r4);
     __ LoadSmiLiteral(r4, Smi::FromInt(JSGeneratorObject::kGeneratorExecuting));
     __ StoreP(r4, FieldMemOperand(r3, JSGeneratorObject::kContinuationOffset),
               r0);
+    __ LoadRR(r2, r3);  // Continuation expects generator object in r2.
     __ Jump(r5);
   }
 }
 
 void Builtins::Generate_ConstructedNonConstructable(MacroAssembler* masm) {
   FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
   __ push(r3);
   __ CallRuntime(Runtime::kThrowConstructedNonConstructable);
 }
 
@@ skipping 1844 matching lines @@
     __ bkpt(0);
   }
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390