Merged: PPC/s390: Fix register mapping and imm16 issue

src/builtins/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 1449 matching lines @@
 void Builtins::Generate_InstantiateAsmJs(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r2 : argument count (preserved for callee)
   //  -- r3 : new target (preserved for callee)
   //  -- r5 : target function (preserved for callee)
   // -----------------------------------
   Label failed;
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
     // Preserve argument count for later compare.
-    __ Move(r4, r2);
+    __ Move(r6, r2);
     // Push a copy of the target function and the new target.
     __ SmiTag(r2);
     // Push another copy as a parameter to the runtime call.
     __ Push(r2, r3, r5, r3);
 
     // Copy arguments from caller (stdlib, foreign, heap).
     Label args_done;
     for (int j = 0; j < 4; ++j) {
       Label over;
       if (j < 3) {
-        __ CmpP(r4, Operand(j));
+        __ CmpP(r6, Operand(j));
         __ b(ne, &over);
       }
       for (int i = j - 1; i >= 0; --i) {
-        __ LoadP(r9, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+        __ LoadP(r6, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
                                         i * kPointerSize));
-        __ push(r9);
+        __ push(r6);
       }
       for (int i = 0; i < 3 - j; ++i) {
         __ PushRoot(Heap::kUndefinedValueRootIndex);
       }
       if (j < 3) {
         __ jmp(&args_done);
         __ bind(&over);
       }
     }
     __ bind(&args_done);
 
     // Call runtime, on success unwind frame, and parent frame.
     __ CallRuntime(Runtime::kInstantiateAsmJs, 4);
     // A smi 0 is returned on failure, an object on success.
     __ JumpIfSmi(r2, &failed);
 
     __ Drop(2);
-    __ pop(r4);
-    __ SmiUntag(r4);
+    __ pop(r6);
+    __ SmiUntag(r6);
     scope.GenerateLeaveFrame();
 
-    __ AddP(r4, r4, Operand(1));
-    __ Drop(r4, r7);
+    __ AddP(r6, r6, Operand(1));
+    __ Drop(r6);
     __ Ret();
 
     __ bind(&failed);
     // Restore target function and new target.
     __ Pop(r2, r3, r5);
     __ SmiUntag(r2);
   }
   // On failure, tail call back to regular js.
   GenerateTailCallToReturnedCode(masm, Runtime::kCompileLazy);
 }
@@ skipping 1500 matching lines @@
     __ bkpt(0);
   }
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390