Optionally use 31-bits SMI value for 64-bit system

src/x64/macro-assembler-x64.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 357 matching lines @@
   // Store the function for the given builtin in the target register.
   void GetBuiltinFunction(Register target, Builtins::JavaScript id);
 
   // Store the code object for the given builtin in the target register.
   void GetBuiltinEntry(Register target, Builtins::JavaScript id);
 
 
   // ---------------------------------------------------------------------------
   // Smi tagging, untagging and operations on tagged smis.
 
+  class SmiFunctionInvoker {

[danno, 2013/08/07 18:41:26]

I think approach works, but I think you can get away with a single virtual
method on the abstract super class (which should just be called ValidSmiChecker
or something like that)

virtual void DoCheckSmi(Register smi_candidate_reg);

Then you have two subclasses, LithiumValidSmiChecker that takes the LCodeGen and
environment in its constructor and implements it so:

virtual void DoCheckSmi(Register smi_candidate_reg) {
  if (kSmiSize == 31) {
    cmpl(src, Immediate(0xc0000000));
    code_gen()->DeoptimizeIf(zero, environment());
  }
 }

And stub generators/full code gen take a label in their constructor:

virtual void DoCheckSmi(Register smi_candidate_reg) {
  if (kSmiSize == 31) {
    cmpl(src, Immediate(0xc0000000));
    b(zero, fail_label());
  }
 }

}

 

[haitao.feng, 2013/08/12 09:54:24]

Thanks for the recommendation. I used a slightly different version:

  class SmiInstructionWrapper {                                                 
   public:                                                                      
    SmiInstructionWrapper() { }                                                 
    virtual ~SmiInstructionWrapper() { }                                        
    virtual bool NeedsCheckOverflow() const = 0;                                
    virtual bool NeedsCheckMinusZero() const = 0;                               
    virtual bool NeedsKeepSourceOperandsIntact() const = 0;                     
    virtual void BailoutIf(Condition cc) const = 0;                             
  };                                                                            

It seems that BailoutIf(Condition cc) is more generally. I have used it to
handle SmiShiftLeftConstant, SmiAdd and SmiSub. It should be able to handle
SmiMul (a work in progress at https://codereview.chromium.org/22600005/).

+   public:
+    explicit SmiFunctionInvoker(Label* label) : label_(label) { }
+    virtual ~SmiFunctionInvoker() { }
+    virtual void Bailout() { }
+    virtual Label* on_not_smi_result() { return label_; }
+    virtual bool reserve_source_operands() { return true; }
+    virtual bool check_minus_zero() { return true; }
+   private:
+    Label* label_;
+  };
+
   void InitializeSmiConstantRegister() {
     movq(kSmiConstantRegister,
          reinterpret_cast<uint64_t>(Smi::FromInt(kSmiConstantRegisterValue)),
          RelocInfo::NONE64);
   }
 
   // Conversions between tagged smi values and non-tagged integer values.
 
   // Tag an integer value. The result must be known to be a valid smi value.
   // Only uses the low 32 bits of the src register. Sets the N and Z flags
@@ skipping 89 matching lines @@
   // and to one if it isn't.
   void CheckSmiToIndicator(Register dst, Register src);
   void CheckSmiToIndicator(Register dst, const Operand& src);
 
   // Test-and-jump functions. Typically combines a check function
   // above with a conditional jump.
 
   // Jump if the value cannot be represented by a smi.
   void JumpIfNotValidSmiValue(Register src, Label* on_invalid,
                               Label::Distance near_jump = Label::kFar);
+  // Jump if the value can be represented by a smi.
+  void JumpIfValidSmiValue(Register src, Label* on_valid,
+                           Label::Distance near_jump = Label::kFar);
 
   // Jump if the unsigned integer value cannot be represented by a smi.
   void JumpIfUIntNotValidSmiValue(Register src, Label* on_invalid,
                                   Label::Distance near_jump = Label::kFar);
+  // Jump if the unsigned integer value can be represented by a smi.
+  void JumpIfUIntValidSmiValue(Register src, Label* on_valid,
+                               Label::Distance near_jump = Label::kFar);
+
 
   // Jump to label if the value is a tagged smi.
   void JumpIfSmi(Register src,
                  Label* on_smi,
                  Label::Distance near_jump = Label::kFar);
 
   // Jump to label if the value is not a tagged smi.
   void JumpIfNotSmi(Register src,
                     Label* on_not_smi,
                     Label::Distance near_jump = Label::kFar);
@@ skipping 142 matching lines @@
   void SmiNot(Register dst, Register src);
   void SmiAnd(Register dst, Register src1, Register src2);
   void SmiOr(Register dst, Register src1, Register src2);
   void SmiXor(Register dst, Register src1, Register src2);
   void SmiAndConstant(Register dst, Register src1, Smi* constant);
   void SmiOrConstant(Register dst, Register src1, Smi* constant);
   void SmiXorConstant(Register dst, Register src1, Smi* constant);
 
   void SmiShiftLeftConstant(Register dst,
                             Register src,
-                            int shift_value);
+                            int shift_value,
+                            SmiFunctionInvoker& env);
   void SmiShiftLogicalRightConstant(Register dst,
                                   Register src,
                                   int shift_value,
                                   Label* on_not_smi_result,
                                   Label::Distance near_jump = Label::kFar);
   void SmiShiftArithmeticRightConstant(Register dst,
                                        Register src,
                                        int shift_value);
 
   // Shifts a smi value to the left, and returns the result if that is a smi.
   // Uses and clobbers rcx, so dst may not be rcx.
   void SmiShiftLeft(Register dst,
                     Register src1,
-                    Register src2);
+                    Register src2,
+                    Label* on_not_smi_result);
   // Shifts a smi value to the right, shifting in zero bits at the top, and
   // returns the unsigned intepretation of the result if that is a smi.
   // Uses and clobbers rcx, so dst may not be rcx.
   void SmiShiftLogicalRight(Register dst,
                             Register src1,
                             Register src2,
                             Label* on_not_smi_result,
                             Label::Distance near_jump = Label::kFar);
   // Shifts a smi value to the right, sign extending the top, and
   // returns the signed intepretation of the result. That will always
@@ skipping 37 matching lines @@
   }
 
   void Move(const Operand& dst, Smi* source) {
     Register constant = GetSmiConstant(source);
     movq(dst, constant);
   }
 
   void Push(Smi* smi);
   void Test(const Operand& dst, Smi* source);
 
+  void PushInt64AsTwoSmis(Register src, Register scratch = kScratchRegister);
+  void PopInt64AsTwoSmis(Register dst, Register scratch = kScratchRegister);
+  static bool IsUnsafeSmiOperator(Token::Value op);
 
   // ---------------------------------------------------------------------------
   // String macros.
 
   // If object is a string, its map is loaded into object_map.
   void JumpIfNotString(Register object,
                        Register object_map,
                        Label* not_string,
                        Label::Distance near_jump = Label::kFar);
 
@@ skipping 806 matching lines @@
     masm->popfq();                                                           \
   }                                                                          \
   masm->
 #else
 #define ACCESS_MASM(masm) masm->
 #endif
 
 } }  // namespace v8::internal
 
 #endif  // V8_X64_MACRO_ASSEMBLER_X64_H_