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

src/x87/builtins-x87.cc

 // Copyright 2012 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_X87
 
 #include "src/code-factory.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 389 matching lines @@
   //  -- edx    : the resume mode (tagged)
   //  -- esp[0] : return address
   // -----------------------------------
   __ AssertGeneratorObject(ebx);
 
   // Store input value into generator object.
   __ mov(FieldOperand(ebx, JSGeneratorObject::kInputOffset), eax);
   __ RecordWriteField(ebx, JSGeneratorObject::kInputOffset, eax, ecx,
                       kDontSaveFPRegs);
 
+  // Store resume mode into generator object.
+  __ mov(FieldOperand(ebx, JSGeneratorObject::kResumeModeOffset), edx);
+
   // Load suspended function and context.
   __ mov(esi, FieldOperand(ebx, JSGeneratorObject::kContextOffset));
   __ mov(edi, FieldOperand(ebx, JSGeneratorObject::kFunctionOffset));
 
   // Flood function if we are stepping.
   Label skip_flooding;
   ExternalReference step_in_enabled =
       ExternalReference::debug_step_in_enabled_address(masm->isolate());
   __ cmpb(Operand::StaticVariable(step_in_enabled), Immediate(0));
   __ j(equal, &skip_flooding);
@@ skipping 58 matching lines @@
     __ bind(&loop);
     __ cmp(ecx, FieldOperand(eax, FixedArray::kLengthOffset));
     __ j(equal, &done_loop, Label::kNear);
     __ Push(FieldOperand(eax, ecx, times_half_pointer_size,
                          FixedArray::kHeaderSize));
     __ add(ecx, Immediate(Smi::FromInt(1)));
     __ jmp(&loop);
     __ bind(&done_loop);
   }
 
-  // Push resume mode (consumed in continuation).
-  __ Push(edx);
-
   // Reset operand stack so we don't leak.
   __ mov(FieldOperand(ebx, JSGeneratorObject::kOperandStackOffset),
          Immediate(masm->isolate()->factory()->empty_fixed_array()));
 
-  // Restore value.
-  __ mov(eax, FieldOperand(ebx, JSGeneratorObject::kInputOffset));
-
   // Resume the generator function at the continuation.
   __ mov(edx, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset));
   __ mov(edx, FieldOperand(edx, SharedFunctionInfo::kCodeOffset));
   __ mov(ecx, FieldOperand(ebx, JSGeneratorObject::kContinuationOffset));
   __ SmiUntag(ecx);
   __ lea(edx, FieldOperand(edx, ecx, times_1, Code::kHeaderSize));
   __ mov(FieldOperand(ebx, JSGeneratorObject::kContinuationOffset),
          Immediate(Smi::FromInt(JSGeneratorObject::kGeneratorExecuting)));
+  __ mov(eax, ebx);  // Continuation expects generator object in eax.
   __ jmp(edx);
 }
 
 // Generate code for entering a JS function with the interpreter.
 // On entry to the function the receiver and arguments have been pushed on the
 // stack left to right.  The actual argument count matches the formal parameter
 // count expected by the function.
 //
 // The live registers are:
 //   o edi: the JS function object being called
@@ skipping 2220 matching lines @@
   // And "return" to the OSR entry point of the function.
   __ ret(0);
 }
 
 
 #undef __
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87