X64: Made hash computation in serializer accept 64-bit pointers.

src/objects-inl.h

 // Copyright 2006-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 671 matching lines @@
 }
 
 
 int Smi::value() {
   return static_cast<int>(reinterpret_cast<intptr_t>(this) >> kSmiTagSize);
 }
 
 
 Smi* Smi::FromInt(int value) {
   ASSERT(Smi::IsValid(value));
+  intptr_t tagged_value =
+      (static_cast<intptr_t>(value) << kSmiTagSize) | kSmiTag;
+  return reinterpret_cast<Smi*>(tagged_value);
+}
+
+
+Smi* Smi::FromIntptr(intptr_t value) {
+  ASSERT(Smi::IsValid(value));
   return reinterpret_cast<Smi*>((value << kSmiTagSize) | kSmiTag);
 }
 
 
 Failure::Type Failure::type() const {
   return static_cast<Type>(value() & kFailureTypeTagMask);
 }
 
 
 bool Failure::IsInternalError() const {
@@ skipping 75 matching lines @@
   // in fact doesn't work correctly with gcc4.1.1 in some cases: The
   // compiler may produce undefined results in case of signed integer
   // overflow. The computation must be done w/ unsigned ints.
   bool result =
       ((static_cast<unsigned int>(value) + 0x40000000U) & 0x80000000U) == 0;
   ASSERT(result == in_range);
   return result;
 }
 
 
+bool Smi::IsPtrValid(intptr_t value) {
+#ifdef DEBUG
+  bool in_range = (value >= kMinValue) && (value <= kMaxValue);
+#endif
+  // See Smi::IsValid(int) for description.
+  bool result =
+      ((static_cast<uintptr_t>(value) + 0x40000000U) < 0x80000000U);

[William Hesse, 2009/05/06 07:42:37]

If this is safe, why not change the test in IsValid to agree with it.

[Lasse Reichstein, 2009/05/12 08:16:38]

Only the assumption that the and is slightly faster than the compare, but using
less-than allows me to use a intptr_t size independent constant (as long as Smis
are 31 bit).

+  ASSERT(result == in_range);
+  return result;
+}
+
+
 MapWord MapWord::FromMap(Map* map) {
   return MapWord(reinterpret_cast<uintptr_t>(map));
 }
 
 
 Map* MapWord::ToMap() {
   return reinterpret_cast<Map*>(value_);
 }
 
 
@@ skipping 1810 matching lines @@
 #undef WRITE_INT_FIELD
 #undef READ_SHORT_FIELD
 #undef WRITE_SHORT_FIELD
 #undef READ_BYTE_FIELD
 #undef WRITE_BYTE_FIELD
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_INL_H_