PPC: First version of the new generators implementation.

src/ppc/builtins-ppc.cc

Index: src/ppc/builtins-ppc.cc
diff --git a/src/ppc/builtins-ppc.cc b/src/ppc/builtins-ppc.cc
index 5722f3be28d0bf1abdc5c44dee9833df93ff4d3b..18d9332c37369c028086563a014b41eb6e258769 100644
--- a/src/ppc/builtins-ppc.cc
+++ b/src/ppc/builtins-ppc.cc
@@ -763,68 +763,90 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) {
   // will never be used.
   __ LoadP(r6, FieldMemOperand(r7, JSFunction::kSharedFunctionInfoOffset));
   __ LoadWordArith(
-      r6, FieldMemOperand(r6, SharedFunctionInfo::kFormalParameterCountOffset));
+      r3, FieldMemOperand(r6, SharedFunctionInfo::kFormalParameterCountOffset));
   {
     Label loop, done_loop;
     __ LoadRoot(ip, Heap::kTheHoleValueRootIndex);
 #if V8_TARGET_ARCH_PPC64
-    __ cmpi(r6, Operand::Zero());
+    __ cmpi(r3, Operand::Zero());
     __ beq(&done_loop);
 #else
-    __ SmiUntag(r6, SetRC);
+    __ SmiUntag(r3, SetRC);
     __ beq(&done_loop, cr0);
 #endif
-    __ mtctr(r6);
+    __ mtctr(r3);
     __ bind(&loop);
     __ push(ip);
     __ bdnz(&loop);
     __ bind(&done_loop);
   }
 
-  // Enter a new JavaScript frame, and initialize its slots as they were when
-  // the generator was suspended.
-  FrameScope scope(masm, StackFrame::MANUAL);
-  __ PushStandardFrame(r7);
+  // Dispatch on the kind of generator object.
+  Label old_generator;
+  __ LoadP(r6, FieldMemOperand(r6, SharedFunctionInfo::kFunctionDataOffset));
+  __ CompareObjectType(r6, r6, r6, BYTECODE_ARRAY_TYPE);
+  __ bne(&old_generator);
 
-  // Restore the operand stack.
-  __ LoadP(r3, FieldMemOperand(r4, JSGeneratorObject::kOperandStackOffset));
-  __ LoadP(r6, FieldMemOperand(r3, FixedArray::kLengthOffset));
-  __ addi(r3, r3,
-          Operand(FixedArray::kHeaderSize - kHeapObjectTag - kPointerSize));
+  // New-style (ignition/turbofan) generator object
   {
-    Label loop, done_loop;
-    __ SmiUntag(r6, SetRC);
-    __ beq(&done_loop, cr0);
-    __ mtctr(r6);
-    __ bind(&loop);
-    __ LoadPU(ip, MemOperand(r3, kPointerSize));
-    __ Push(ip);
-    __ bdnz(&loop);
-    __ bind(&done_loop);
+    // We abuse new.target both to indicate that this is a resume call and to
+    // pass in the generator object.  In ordinary calls, new.target is always
+    // undefined because generator functions are non-constructable.
+    __ mr(r6, r4);
+    __ mr(r4, r7);
+    __ LoadP(ip, FieldMemOperand(r4, JSFunction::kCodeEntryOffset));
+    __ JumpToJSEntry(ip);
   }
 
-  // Reset operand stack so we don't leak.
-  __ LoadRoot(ip, Heap::kEmptyFixedArrayRootIndex);
-  __ StoreP(ip, FieldMemOperand(r4, JSGeneratorObject::kOperandStackOffset),
-            r0);
-
-  // Resume the generator function at the continuation.
-  __ LoadP(r6, FieldMemOperand(r7, JSFunction::kSharedFunctionInfoOffset));
-  __ LoadP(r6, FieldMemOperand(r6, SharedFunctionInfo::kCodeOffset));
-  __ addi(r6, r6, Operand(Code::kHeaderSize - kHeapObjectTag));
+  // Old-style (full-codegen) generator object
+  __ bind(&old_generator);
   {
-    ConstantPoolUnavailableScope constant_pool_unavailable(masm);
-    if (FLAG_enable_embedded_constant_pool) {
-      __ LoadConstantPoolPointerRegisterFromCodeTargetAddress(r6);
+    // Enter a new JavaScript frame, and initialize its slots as they were when
+    // the generator was suspended.
+    FrameScope scope(masm, StackFrame::MANUAL);
+    __ PushStandardFrame(r7);
+
+    // Restore the operand stack.
+    __ LoadP(r3, FieldMemOperand(r4, JSGeneratorObject::kOperandStackOffset));
+    __ LoadP(r6, FieldMemOperand(r3, FixedArray::kLengthOffset));
+    __ addi(r3, r3,
+            Operand(FixedArray::kHeaderSize - kHeapObjectTag - kPointerSize));
+    {
+      Label loop, done_loop;
+      __ SmiUntag(r6, SetRC);
+      __ beq(&done_loop, cr0);
+      __ mtctr(r6);
+      __ bind(&loop);
+      __ LoadPU(ip, MemOperand(r3, kPointerSize));
+      __ Push(ip);
+      __ bdnz(&loop);
+      __ bind(&done_loop);
     }
-    __ LoadP(r5, FieldMemOperand(r4, JSGeneratorObject::kContinuationOffset));
-    __ SmiUntag(r5);
-    __ add(r6, r6, r5);
-    __ LoadSmiLiteral(r5, Smi::FromInt(JSGeneratorObject::kGeneratorExecuting));
-    __ StoreP(r5, FieldMemOperand(r4, JSGeneratorObject::kContinuationOffset),
+
+    // Reset operand stack so we don't leak.
+    __ LoadRoot(ip, Heap::kEmptyFixedArrayRootIndex);
+    __ StoreP(ip, FieldMemOperand(r4, JSGeneratorObject::kOperandStackOffset),
               r0);
-    __ mr(r3, r4);  // Continuation expects generator object in r3.
-    __ Jump(r6);
+
+    // Resume the generator function at the continuation.
+    __ LoadP(r6, FieldMemOperand(r7, JSFunction::kSharedFunctionInfoOffset));
+    __ LoadP(r6, FieldMemOperand(r6, SharedFunctionInfo::kCodeOffset));
+    __ addi(r6, r6, Operand(Code::kHeaderSize - kHeapObjectTag));
+    {
+      ConstantPoolUnavailableScope constant_pool_unavailable(masm);
+      if (FLAG_enable_embedded_constant_pool) {
+        __ LoadConstantPoolPointerRegisterFromCodeTargetAddress(r6);
+      }
+      __ LoadP(r5, FieldMemOperand(r4, JSGeneratorObject::kContinuationOffset));
+      __ SmiUntag(r5);
+      __ add(r6, r6, r5);
+      __ LoadSmiLiteral(r5,
+                        Smi::FromInt(JSGeneratorObject::kGeneratorExecuting));
+      __ StoreP(r5, FieldMemOperand(r4, JSGeneratorObject::kContinuationOffset),
+                r0);
+      __ mr(r3, r4);  // Continuation expects generator object in r3.
+      __ Jump(r6);
+    }
   }
 }