Encode CEntryStub properties in the minor key.

src/arm/code-stubs-arm.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.
 
 #include "src/v8.h"
 
 #if V8_TARGET_ARCH_ARM
 
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
@@ skipping 407 matching lines @@
   Register result1_;
   Register result2_;
   Register source_;
   Register zeros_;
 
   // Minor key encoding in 16 bits.
   class ModeBits: public BitField<OverwriteMode, 0, 2> {};
   class OpBits: public BitField<Token::Value, 2, 14> {};
 
   Major MajorKey() const { return ConvertToDouble; }
-  int MinorKey() const {
+  uint32_t MinorKey() const {
     // Encode the parameters in a unique 16 bit value.
     return  result1_.code() +
            (result2_.code() << 4) +
            (source_.code() << 8) +
            (zeros_.code() << 12);
   }
 
   void Generate(MacroAssembler* masm);
 };
 
@@ skipping 946 matching lines @@
   ProfileEntryHookStub::MaybeCallEntryHook(masm);
 
   __ mov(r5, Operand(r1));
 
   // Compute the argv pointer in a callee-saved register.
   __ add(r1, sp, Operand(r0, LSL, kPointerSizeLog2));
   __ sub(r1, r1, Operand(kPointerSize));
 
   // Enter the exit frame that transitions from JavaScript to C++.
   FrameScope scope(masm, StackFrame::MANUAL);
-  __ EnterExitFrame(save_doubles_);
+  __ EnterExitFrame(save_doubles());
 
   // Store a copy of argc in callee-saved registers for later.
   __ mov(r4, Operand(r0));
 
   // r0, r4: number of arguments including receiver  (C callee-saved)
   // r1: pointer to the first argument (C callee-saved)
   // r5: pointer to builtin function  (C callee-saved)
 
   // Result returned in r0 or r0+r1 by default.
 
@@ skipping 63 matching lines @@
     __ b(eq, &okay);
     __ stop("Unexpected pending exception");
     __ bind(&okay);
   }
 
   // Exit C frame and return.
   // r0:r1: result
   // sp: stack pointer
   // fp: frame pointer
   // Callee-saved register r4 still holds argc.
-  __ LeaveExitFrame(save_doubles_, r4, true);
+  __ LeaveExitFrame(save_doubles(), r4, true);
   __ mov(pc, lr);
 
   // Handling of exception.
   __ bind(&exception_returned);
 
   // Retrieve the pending exception.
   __ mov(r2, Operand(pending_exception_address));
   __ ldr(r0, MemOperand(r2));
 
   // Clear the pending exception.
@@ skipping 3606 matching lines @@
                               MemOperand(fp, 6 * kPointerSize),
                               NULL);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM