Make more use of the NumberInfo data....

src/register-allocator.h

 // Copyright 2008 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 47 matching lines @@
   enum Type {
     INVALID,
     REGISTER,
     CONSTANT
   };
 
   // Construct an invalid result.
   Result() { invalidate(); }
 
   // Construct a register Result.
-  explicit Result(Register reg, NumberInfo::Type info = NumberInfo::kUnknown);
+  explicit Result(Register reg, NumberInfo info = NumberInfo::Unknown());
 
   // Construct a Result whose value is a compile-time constant.
   explicit Result(Handle<Object> value) {
     value_ = TypeField::encode(CONSTANT)
-        | NumberInfoField::encode(NumberInfo::kUninitialized)
+        | NumberInfoField::encode(NumberInfo::Uninitialized().ToInt())
         | DataField::encode(ConstantList()->length());
     ConstantList()->Add(value);
   }
 
   // The copy constructor and assignment operators could each create a new
   // register reference.
   inline Result(const Result& other);
 
   inline Result& operator=(const Result& other);
 
@@ skipping 10 matching lines @@
   static void ClearConstantList() {
     ConstantList()->Clear();
   }
 
   inline void Unuse();
 
   Type type() const { return TypeField::decode(value_); }
 
   void invalidate() { value_ = TypeField::encode(INVALID); }
 
-  NumberInfo::Type number_info();
-  void set_number_info(NumberInfo::Type info);
-  bool is_number() {
-    return (number_info() & NumberInfo::kNumber) != 0;
-  }
-  bool is_smi() { return number_info() == NumberInfo::kSmi; }
-  bool is_heap_number() { return number_info() == NumberInfo::kHeapNumber; }
+  NumberInfo number_info() const;

[fschneider, 2010/03/05 15:01:07]

Maybe make this an inline function?

+  void set_number_info(NumberInfo info);

[fschneider, 2010/03/05 15:01:07]

Maybe make this an inline function?

+  bool is_number() const { return number_info().IsNumber(); }
+  bool is_smi() const { return number_info().IsSmi(); }
+  bool is_integer32() const { return number_info().IsInteger32(); }
+  bool is_heap_number() const { return number_info().IsHeapNumber(); }
 
   bool is_valid() const { return type() != INVALID; }
   bool is_register() const { return type() == REGISTER; }
   bool is_constant() const { return type() == CONSTANT; }
 
   Register reg() const {
     ASSERT(is_register());
     uint32_t reg = DataField::decode(value_);
     Register result;
     result.code_ = reg;
@@ skipping 12 matching lines @@
 
   // Move this result to a specified register.  The register is spilled from
   // the frame, and the register is singly-referenced (by this result)
   // outside the frame.
   void ToRegister(Register reg);
 
  private:
   uint32_t value_;
 
   class TypeField: public BitField<Type, 0, 2> {};
-  class NumberInfoField : public BitField<NumberInfo::Type, 2, 3> {};
-  class DataField: public BitField<uint32_t, 5, 32 - 5> {};
+  class NumberInfoField : public BitField<int, 2, 4> {};
+  class DataField: public BitField<uint32_t, 6, 32 - 6> {};
 
   inline void CopyTo(Result* destination) const;
 
   friend class CodeGeneratorScope;
 };
 
 
 // -------------------------------------------------------------------------
 // Register file
 //
@@ skipping 136 matching lines @@
   }
 
  private:
   CodeGenerator* cgen_;
   RegisterFile registers_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_REGISTER_ALLOCATOR_H_