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

src/full-codegen/ppc/full-codegen-ppc.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_PPC
 
 #include "src/ast/scopes.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
@@ skipping 1816 matching lines @@
 void FullCodeGenerator::PopOperands(Register reg1, Register reg2) {
   OperandStackDepthDecrement(2);
   __ Pop(reg1, reg2);
 }
 
 void FullCodeGenerator::EmitOperandStackDepthCheck() {
   if (FLAG_debug_code) {
     int expected_diff = StandardFrameConstants::kFixedFrameSizeFromFp +
                         operand_stack_depth_ * kPointerSize;
     __ sub(r3, fp, sp);
-    __ cmpi(r3, Operand(expected_diff));
+    __ mov(ip, Operand(expected_diff));
+    __ cmp(r3, ip);
     __ Assert(eq, kUnexpectedStackDepth);
   }
 }
 
 void FullCodeGenerator::EmitCreateIteratorResult(bool done) {
   Label allocate, done_allocate;
 
   __ Allocate(JSIteratorResult::kSize, r3, r5, r6, &allocate,
               NO_ALLOCATION_FLAGS);
   __ b(&done_allocate);
@@ skipping 1889 matching lines @@
 
   DCHECK(Assembler::IsCrSet(Assembler::instr_at(cmp_address)));
 
   DCHECK(interrupt_address ==
          isolate->builtins()->OnStackReplacement()->entry());
   return ON_STACK_REPLACEMENT;
 }
 }  // namespace internal
 }  // namespace v8
 #endif  // V8_TARGET_ARCH_PPC