X64: General fixes - added inline definitions and changed tome places to intptr_t.

src/runtime.cc

 // Copyright 2006-2009 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 4424 matching lines @@
 }
 
 
 // A mechanism to return pairs of Object*'s. This is somewhat
 // compiler-dependent as it assumes that a 64-bit value (a long long)
 // is returned via two registers (edx:eax on ia32). Both the ia32 and
 // arm platform support this; it is mostly an issue of "coaxing" the
 // compiler to do the right thing.
 //
 // TODO(1236026): This is a non-portable hack that should be removed.
+// TODO(x64): Definitly!

[Erik Corry, 2009/05/12 09:24:50]

spolling!

 typedef uint64_t ObjectPair;
 static inline ObjectPair MakePair(Object* x, Object* y) {
+#ifdef V8_HOST_ARCH_64_BIT

[Dean McNamee, 2009/05/12 08:22:40]

I have just been doing #if, we should be consistent and go with one.  I thin #if
is easier.

[Lasse Reichstein, 2009/05/12 10:32:51]

Done

+  UNIMPLEMENTED();
+  return 0;
+#else
   return reinterpret_cast<uint32_t>(x) |
       (reinterpret_cast<ObjectPair>(y) << 32);
+#endif
 }
 
 
 static inline Object* Unhole(Object* x, PropertyAttributes attributes) {
   ASSERT(!x->IsTheHole() || (attributes & READ_ONLY) != 0);
   USE(attributes);
   return x->IsTheHole() ? Heap::undefined_value() : x;
 }
 
 
@@ skipping 1565 matching lines @@
   return *Factory::NewJSArrayWithElements(details);
 }
 
 
 static Object* Runtime_GetCFrames(Arguments args) {
   HandleScope scope;
   ASSERT(args.length() == 1);
   Object* result = Runtime_CheckExecutionState(args);
   if (result->IsFailure()) return result;
 
+#ifdef V8_HOST_ARCH_64_BIT

[Dean McNamee, 2009/05/12 08:22:40]

#if

+  UNIMPLEMENTED();
+  return Heap::undefined_value();
+#else
+
   static const int kMaxCFramesSize = 200;
   ScopedVector<OS::StackFrame> frames(kMaxCFramesSize);
   int frames_count = OS::StackWalk(frames);
   if (frames_count == OS::kStackWalkError) {
     return Heap::undefined_value();
   }
 
   Handle<String> address_str = Factory::LookupAsciiSymbol("address");
   Handle<String> text_str = Factory::LookupAsciiSymbol("text");
   Handle<FixedArray> frames_array = Factory::NewFixedArray(frames_count);
@@ skipping 11 matching lines @@
       frame_text = Factory::NewStringFromAscii(str);
     }
 
     if (!frame_text.is_null()) {
       frame_value->SetProperty(*text_str, *frame_text, NONE);
     }
 
     frames_array->set(i, *frame_value);
   }
   return *Factory::NewJSArrayWithElements(frames_array);
+#endif  // V8_HOST_ARCH_64_BIT
 }
 
 
 static Object* Runtime_GetThreadCount(Arguments args) {
   HandleScope scope;
   ASSERT(args.length() == 1);
 
   // Check arguments.
   Object* result = Runtime_CheckExecutionState(args);
   if (result->IsFailure()) return result;
@@ skipping 996 matching lines @@
   } else {
     // Handle last resort GC and make sure to allow future allocations
     // to grow the heap without causing GCs (if possible).
     Counters::gc_last_resort_from_js.Increment();
     Heap::CollectAllGarbage();
   }
 }
 
 
 } }  // namespace v8::internal