Files
haikuports/dev-lang/v8/patches/v8-r13067.patch

1382 lines
44 KiB
Diff

diff -Naur v8-r13067/build/common.gypi v8-r13067-haiku/build/common.gypi
--- v8-r13067/build/common.gypi 2012-12-24 04:17:35.255590400 +0000
+++ v8-r13067-haiku/build/common.gypi 2012-12-24 04:10:09.000000000 +0000
@@ -277,7 +277,7 @@
},
}],
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
- or OS=="netbsd"', {
+ or OS=="netbsd" or OS=="haiku"', {
'conditions': [
[ 'v8_no_strict_aliasing==1', {
'cflags': [ '-fno-strict-aliasing' ],
@@ -288,7 +288,7 @@
'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
}],
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
- or OS=="netbsd" or OS=="mac" or OS=="android") and \
+ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="haiku") and \
(v8_target_arch=="arm" or v8_target_arch=="ia32" or \
v8_target_arch=="mipsel")', {
# Check whether the host compiler and target compiler support the
@@ -360,7 +360,8 @@
['v8_enable_extra_checks==1', {
'defines': ['ENABLE_EXTRA_CHECKS',],
}],
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
+ or OS=="haiku"', {
'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
'-Wnon-virtual-dtor', '-Woverloaded-virtual' ],
}],
@@ -389,7 +390,7 @@
'defines': ['ENABLE_EXTRA_CHECKS',],
}],
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
- or OS=="android"', {
+ or OS=="android" or OS=="haiku"', {
'cflags!': [
'-O2',
'-Os',
diff -Naur v8-r13067/build/standalone.gypi v8-r13067-haiku/build/standalone.gypi
--- v8-r13067/build/standalone.gypi 2012-12-24 04:17:35.258473984 +0000
+++ v8-r13067-haiku/build/standalone.gypi 2012-12-24 04:10:09.000000000 +0000
@@ -90,7 +90,7 @@
},
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
- or OS=="netbsd"', {
+ or OS=="netbsd" or OS=="haiku"', {
'target_defaults': {
'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
'-Wnon-virtual-dtor', '-pthread', '-fno-rtti',
@@ -100,6 +100,10 @@
[ 'OS=="linux"', {
'cflags': [ '-ansi' ],
}],
+ [ 'OS=="haiku"', {
+ 'cflags!': [ '-pthread' ],
+ 'ldflags!': [ '-pthread' ],
+ }],
[ 'visibility=="hidden"', {
'cflags': [ '-fvisibility=hidden' ],
}],
diff -Naur v8-r13067/src/atomicops.h v8-r13067-haiku/src/atomicops.h
--- v8-r13067/src/atomicops.h 2012-12-24 04:17:34.352583680 +0000
+++ v8-r13067-haiku/src/atomicops.h 2012-12-24 04:10:09.000000000 +0000
@@ -69,7 +69,7 @@
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
// Atomic64 routines below, depending on your architecture.
-#if defined(__OpenBSD__) && defined(__i386__)
+#if (defined(__OpenBSD__) || defined(__HAIKU__)) && defined(__i386__)
typedef Atomic32 AtomicWord;
#else
typedef intptr_t AtomicWord;
diff -Naur v8-r13067/src/d8.gyp v8-r13067-haiku/src/d8.gyp
--- v8-r13067/src/d8.gyp 2012-12-24 04:17:34.042467328 +0000
+++ v8-r13067-haiku/src/d8.gyp 2012-12-24 04:10:09.000000000 +0000
@@ -62,7 +62,8 @@
'sources': [ 'd8-readline.cc' ],
}],
['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
- or OS=="openbsd" or OS=="solaris" or OS=="android")', {
+ or OS=="openbsd" or OS=="solaris" or OS=="android" \
+ or OS=="haiku")', {
'sources': [ 'd8-posix.cc', ]
}],
[ 'OS=="win"', {
diff -Naur v8-r13067/src/globals.h v8-r13067-haiku/src/globals.h
--- v8-r13067/src/globals.h 2012-12-24 04:17:34.246153216 +0000
+++ v8-r13067-haiku/src/globals.h 2012-12-24 04:10:09.000000000 +0000
@@ -178,7 +178,12 @@
#endif
#else // V8_HOST_ARCH_64_BIT
#define V8_INTPTR_C(x) (x)
+#if defined(__HAIKU__)
+// (u)intptr_t is long on Haiku
+#define V8_PTR_PREFIX "l"
+#else
#define V8_PTR_PREFIX ""
+#endif
#endif // V8_HOST_ARCH_64_BIT
// The following macro works on both 32 and 64-bit platforms.
diff -Naur v8-r13067/src/ia32/deoptimizer-ia32.cc v8-r13067-haiku/src/ia32/deoptimizer-ia32.cc
--- v8-r13067/src/ia32/deoptimizer-ia32.cc 2012-12-24 04:17:29.666632192 +0000
+++ v8-r13067-haiku/src/ia32/deoptimizer-ia32.cc 2012-12-24 04:10:09.000000000 +0000
@@ -354,7 +354,7 @@
PrintF("[on-stack replacement: begin 0x%08" V8PRIxPTR " ",
reinterpret_cast<intptr_t>(function_));
function_->PrintName();
- PrintF(" => node=%u, frame=%d->%d, ebp:esp=0x%08x:0x%08x]\n",
+ PrintF(" => node=%u, frame=%d->%d, ebp:esp=0x%08" V8PRIxPTR ":0x%08" V8PRIxPTR "]\n",
ast_id,
input_frame_size,
output_frame_size,
@@ -468,7 +468,7 @@
ok ? "finished" : "aborted",
reinterpret_cast<intptr_t>(function_));
function_->PrintName();
- PrintF(" => pc=0x%0x]\n", output_[0]->GetPc());
+ PrintF(" => pc=0x%0" V8PRIxPTR "]\n", output_[0]->GetPc());
}
}
@@ -514,7 +514,7 @@
intptr_t callers_pc = output_[frame_index - 1]->GetPc();
output_frame->SetFrameSlot(output_offset, callers_pc);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's pc\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; caller's pc\n",
top_address + output_offset, output_offset, callers_pc);
}
@@ -525,7 +525,7 @@
intptr_t fp_value = top_address + output_offset;
output_frame->SetFp(fp_value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's fp\n",
+ PrintF(" 0x%08" V8PRIxPTR ": [top + %d] <- 0x%08" V8PRIxPTR " ; caller's fp\n",
fp_value, output_offset, value);
}
@@ -535,7 +535,7 @@
Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
output_frame->SetFrameSlot(output_offset, context);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; context (adaptor sentinel)\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; context (adaptor sentinel)\n",
top_address + output_offset, output_offset, context);
}
@@ -544,7 +544,7 @@
value = reinterpret_cast<intptr_t>(function);
output_frame->SetFrameSlot(output_offset, value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; function\n",
top_address + output_offset, output_offset, value);
}
@@ -553,7 +553,7 @@
value = reinterpret_cast<uint32_t>(Smi::FromInt(height - 1));
output_frame->SetFrameSlot(output_offset, value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; argc (%d)\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; argc (%d)\n",
top_address + output_offset, output_offset, value, height - 1);
}
@@ -612,7 +612,7 @@
intptr_t callers_pc = output_[frame_index - 1]->GetPc();
output_frame->SetFrameSlot(output_offset, callers_pc);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's pc\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; caller's pc\n",
top_address + output_offset, output_offset, callers_pc);
}
@@ -623,7 +623,7 @@
intptr_t fp_value = top_address + output_offset;
output_frame->SetFp(fp_value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's fp\n",
+ PrintF(" 0x%08" V8PRIxPTR ": [top + %d] <- 0x%08" V8PRIxPTR " ; caller's fp\n",
fp_value, output_offset, value);
}
@@ -632,7 +632,7 @@
value = output_[frame_index - 1]->GetContext();
output_frame->SetFrameSlot(output_offset, value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; context\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; context\n",
top_address + output_offset, output_offset, value);
}
@@ -641,7 +641,7 @@
value = reinterpret_cast<intptr_t>(Smi::FromInt(StackFrame::CONSTRUCT));
output_frame->SetFrameSlot(output_offset, value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function (construct sentinel)\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; function (construct sentinel)\n",
top_address + output_offset, output_offset, value);
}
@@ -650,7 +650,7 @@
value = reinterpret_cast<intptr_t>(construct_stub);
output_frame->SetFrameSlot(output_offset, value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; code object\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; code object\n",
top_address + output_offset, output_offset, value);
}
@@ -659,7 +659,7 @@
value = reinterpret_cast<uint32_t>(Smi::FromInt(height - 1));
output_frame->SetFrameSlot(output_offset, value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; argc (%d)\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; argc (%d)\n",
top_address + output_offset, output_offset, value, height - 1);
}
@@ -669,7 +669,7 @@
value = output_frame->GetFrameSlot(output_frame_size - kPointerSize);
output_frame->SetFrameSlot(output_offset, value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; allocated receiver\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; allocated receiver\n",
top_address + output_offset, output_offset, value);
}
@@ -894,7 +894,7 @@
}
output_frame->SetFrameSlot(output_offset, value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's pc\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; caller's pc\n",
top_address + output_offset, output_offset, value);
}
@@ -917,7 +917,7 @@
output_frame->SetFp(fp_value);
if (is_topmost) output_frame->SetRegister(ebp.code(), fp_value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's fp\n",
+ PrintF(" 0x%08" V8PRIxPTR ": [top + %d] <- 0x%08" V8PRIxPTR " ; caller's fp\n",
fp_value, output_offset, value);
}
ASSERT(!is_bottommost || !has_alignment_padding_ ||
@@ -937,7 +937,7 @@
output_frame->SetContext(value);
if (is_topmost) output_frame->SetRegister(esi.code(), value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; context\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; context\n",
top_address + output_offset, output_offset, value);
}
@@ -950,7 +950,7 @@
ASSERT(!is_bottommost || input_->GetFrameSlot(input_offset) == value);
output_frame->SetFrameSlot(output_offset, value);
if (FLAG_trace_deopt) {
- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function\n",
+ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; function\n",
top_address + output_offset, output_offset, value);
}
diff -Naur v8-r13067/src/platform-haiku.cc v8-r13067-haiku/src/platform-haiku.cc
--- v8-r13067/src/platform-haiku.cc 1970-01-01 00:00:00.000000000 +0000
+++ v8-r13067-haiku/src/platform-haiku.cc 2012-12-24 04:10:09.000000000 +0000
@@ -0,0 +1,898 @@
+// 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
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Platform specific code for Haiku goes here. For the POSIX comaptible parts
+// the implementation is in platform-posix.cc.
+
+#include <pthread.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <stdlib.h>
+#include <sys/types.h> // mmap & munmap
+#include <sys/mman.h> // mmap & munmap
+#include <sys/stat.h> // open
+#include <fcntl.h> // open
+#include <unistd.h> // sysconf
+#include <strings.h> // index
+#include <errno.h>
+#include <stdarg.h>
+#include <kernel/OS.h>
+
+#undef MAP_TYPE
+
+#include "v8.h"
+
+#include "platform-posix.h"
+#include "platform.h"
+#include "v8threads.h"
+#include "vm-state-inl.h"
+
+
+namespace v8 {
+namespace internal {
+
+// pthread_t's are pointers to structs on Haiku
+static const pthread_t kNoThread = NULL;
+
+
+double ceiling(double x) {
+ return ceil(x);
+}
+
+
+static Mutex* limit_mutex = NULL;
+
+
+void OS::PostSetUp() {
+ POSIXPostSetUp();
+}
+
+
+uint64_t OS::CpuFeaturesImpliedByPlatform() {
+ return 0; // Haiku runs on anything.
+}
+
+
+int OS::ActivationFrameAlignment() {
+ // With gcc 4.4 the tree vectorization optimizer can generate code
+ // that requires 16 byte alignment such as movdqa on x86.
+ return 16;
+}
+
+
+void OS::ReleaseStore(volatile AtomicWord* ptr, AtomicWord value) {
+#if (defined(V8_TARGET_ARCH_ARM) && defined(__arm__)) || \
+ (defined(V8_TARGET_ARCH_MIPS) && defined(__mips__))
+ // Only use on ARM or MIPS hardware.
+ MemoryBarrier();
+#else
+ __asm__ __volatile__("" : : : "memory");
+ // An x86 store acts as a release barrier.
+#endif
+ *ptr = value;
+}
+
+
+const char* OS::LocalTimezone(double time) {
+ if (isnan(time)) return "";
+ time_t tv = static_cast<time_t>(floor(time/msPerSecond));
+ struct tm* t = localtime(&tv);
+ if (NULL == t) return "";
+ return t->tm_zone;
+}
+
+
+double OS::LocalTimeOffset() {
+ time_t tv = time(NULL);
+ struct tm* t = localtime(&tv);
+ // tm_gmtoff includes any daylight savings offset, so subtract it.
+ return static_cast<double>(t->tm_gmtoff * msPerSecond -
+ (t->tm_isdst > 0 ? 3600 * msPerSecond : 0));
+}
+
+
+// We keep the lowest and highest addresses mapped as a quick way of
+// determining that pointers are outside the heap (used mostly in assertions
+// and verification). The estimate is conservative, i.e., not all addresses in
+// 'allocated' space are actually allocated to our heap. The range is
+// [lowest, highest), inclusive on the low and and exclusive on the high end.
+static void* lowest_ever_allocated = reinterpret_cast<void*>(-1);
+static void* highest_ever_allocated = reinterpret_cast<void*>(0);
+
+
+static void UpdateAllocatedSpaceLimits(void* address, int size) {
+ ASSERT(limit_mutex != NULL);
+ ScopedLock lock(limit_mutex);
+
+ lowest_ever_allocated = Min(lowest_ever_allocated, address);
+ highest_ever_allocated =
+ Max(highest_ever_allocated,
+ reinterpret_cast<void*>(reinterpret_cast<char*>(address) + size));
+}
+
+
+bool OS::IsOutsideAllocatedSpace(void* address) {
+ return address < lowest_ever_allocated || address >= highest_ever_allocated;
+}
+
+
+size_t OS::AllocateAlignment() {
+ return sysconf(_SC_PAGESIZE);
+}
+
+
+void* OS::Allocate(const size_t requested,
+ size_t* allocated,
+ bool is_executable) {
+ const size_t msize = RoundUp(requested, AllocateAlignment());
+ int prot = PROT_READ | PROT_WRITE | (is_executable ? PROT_EXEC : 0);
+ void* addr = OS::GetRandomMmapAddr();
+ void* mbase = mmap(addr, msize, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ if (mbase == MAP_FAILED) {
+ LOG(i::Isolate::Current(),
+ StringEvent("OS::Allocate", "mmap failed"));
+ return NULL;
+ }
+ *allocated = msize;
+ UpdateAllocatedSpaceLimits(mbase, msize);
+ return mbase;
+}
+
+
+void OS::Free(void* address, const size_t size) {
+ // TODO(1240712): munmap has a return value which is ignored here.
+ int result = munmap(address, size);
+ USE(result);
+ ASSERT(result == 0);
+}
+
+
+void OS::Sleep(int milliseconds) {
+ unsigned int ms = static_cast<unsigned int>(milliseconds);
+ usleep(1000 * ms);
+}
+
+
+void OS::Abort() {
+ // Redirect to std abort to signal abnormal program termination.
+ if (FLAG_break_on_abort) {
+ DebugBreak();
+ }
+ abort();
+}
+
+
+void OS::DebugBreak() {
+// TODO(lrn): Introduce processor define for runtime system (!= V8_ARCH_x,
+// which is the architecture of generated code).
+#if (defined(__arm__) || defined(__thumb__))
+# if defined(CAN_USE_ARMV5_INSTRUCTIONS)
+ asm("bkpt 0");
+# endif
+#elif defined(__mips__)
+ asm("break");
+#else
+ asm("int $3");
+#endif
+}
+
+
+class PosixMemoryMappedFile : public OS::MemoryMappedFile {
+ public:
+ PosixMemoryMappedFile(FILE* file, void* memory, int size)
+ : file_(file), memory_(memory), size_(size) { }
+ virtual ~PosixMemoryMappedFile();
+ virtual void* memory() { return memory_; }
+ virtual int size() { return size_; }
+ private:
+ FILE* file_;
+ void* memory_;
+ int size_;
+};
+
+
+OS::MemoryMappedFile* OS::MemoryMappedFile::open(const char* name) {
+ FILE* file = fopen(name, "r+");
+ if (file == NULL) return NULL;
+
+ fseek(file, 0, SEEK_END);
+ int size = ftell(file);
+
+ void* memory =
+ mmap(OS::GetRandomMmapAddr(),
+ size,
+ PROT_READ | PROT_WRITE,
+ MAP_SHARED,
+ fileno(file),
+ 0);
+ return new PosixMemoryMappedFile(file, memory, size);
+}
+
+
+OS::MemoryMappedFile* OS::MemoryMappedFile::create(const char* name, int size,
+ void* initial) {
+ FILE* file = fopen(name, "w+");
+ if (file == NULL) return NULL;
+ int result = fwrite(initial, size, 1, file);
+ if (result < 1) {
+ fclose(file);
+ return NULL;
+ }
+ void* memory =
+ mmap(OS::GetRandomMmapAddr(),
+ size,
+ PROT_READ | PROT_WRITE,
+ MAP_SHARED,
+ fileno(file),
+ 0);
+ return new PosixMemoryMappedFile(file, memory, size);
+}
+
+
+PosixMemoryMappedFile::~PosixMemoryMappedFile() {
+ if (memory_) OS::Free(memory_, size_);
+ fclose(file_);
+}
+
+
+void OS::LogSharedLibraryAddresses() {
+ // TODO
+ // Loop through images (get_next_image_info()) and print data/text
+ // addresses.
+}
+
+
+void OS::SignalCodeMovingGC() {
+}
+
+
+int OS::StackWalk(Vector<OS::StackFrame> frames) {
+ // dladdr
+ return 0;
+}
+
+// No MAP_NORESERVE on Haiku means we can't reserve without
+// committing or decommit at all.
+#define MAP_NORESERVE 0
+
+// Constants used for mmap.
+static const int kMmapFd = -1;
+static const int kMmapFdOffset = 0;
+
+VirtualMemory::VirtualMemory() : address_(NULL), size_(0) { }
+
+VirtualMemory::VirtualMemory(size_t size) {
+ address_ = ReserveRegion(size);
+ size_ = size;
+}
+
+
+VirtualMemory::VirtualMemory(size_t size, size_t alignment)
+ : address_(NULL), size_(0) {
+ ASSERT(IsAligned(alignment, static_cast<intptr_t>(OS::AllocateAlignment())));
+ size_t request_size = RoundUp(size + alignment,
+ static_cast<intptr_t>(OS::AllocateAlignment()));
+ void* reservation = mmap(OS::GetRandomMmapAddr(),
+ request_size,
+ PROT_NONE,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE,
+ kMmapFd,
+ kMmapFdOffset);
+ if (reservation == MAP_FAILED) return;
+
+ Address base = static_cast<Address>(reservation);
+ Address aligned_base = RoundUp(base, alignment);
+ ASSERT_LE(base, aligned_base);
+
+ // Unmap extra memory reserved before and after the desired block.
+ if (aligned_base != base) {
+ size_t prefix_size = static_cast<size_t>(aligned_base - base);
+ OS::Free(base, prefix_size);
+ request_size -= prefix_size;
+ }
+
+ size_t aligned_size = RoundUp(size, OS::AllocateAlignment());
+ ASSERT_LE(aligned_size, request_size);
+
+ if (aligned_size != request_size) {
+ size_t suffix_size = request_size - aligned_size;
+ OS::Free(aligned_base + aligned_size, suffix_size);
+ request_size -= suffix_size;
+ }
+
+ ASSERT(aligned_size == request_size);
+
+ address_ = static_cast<void*>(aligned_base);
+ size_ = aligned_size;
+}
+
+
+VirtualMemory::~VirtualMemory() {
+ if (IsReserved()) {
+ bool result = ReleaseRegion(address(), size());
+ ASSERT(result);
+ USE(result);
+ }
+}
+
+
+bool VirtualMemory::IsReserved() {
+ return address_ != NULL;
+}
+
+
+void VirtualMemory::Reset() {
+ address_ = NULL;
+ size_ = 0;
+}
+
+
+bool VirtualMemory::Commit(void* address, size_t size, bool is_executable) {
+ return CommitRegion(address, size, is_executable);
+}
+
+
+bool VirtualMemory::Uncommit(void* address, size_t size) {
+ return UncommitRegion(address, size);
+}
+
+
+bool VirtualMemory::Guard(void* address) {
+ OS::Guard(address, OS::CommitPageSize());
+ return true;
+}
+
+
+void* VirtualMemory::ReserveRegion(size_t size) {
+ void* result = mmap(OS::GetRandomMmapAddr(),
+ size,
+ PROT_NONE,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE,
+ kMmapFd,
+ kMmapFdOffset);
+
+ if (result == MAP_FAILED) return NULL;
+
+ return result;
+}
+
+
+bool VirtualMemory::CommitRegion(void* base, size_t size, bool is_executable) {
+ int prot = PROT_READ | PROT_WRITE | (is_executable ? PROT_EXEC : 0);
+ if (MAP_FAILED == mmap(base,
+ size,
+ prot,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
+ kMmapFd,
+ kMmapFdOffset)) {
+ return false;
+ }
+
+ UpdateAllocatedSpaceLimits(base, size);
+ return true;
+}
+
+
+bool VirtualMemory::UncommitRegion(void* base, size_t size) {
+ return mmap(base,
+ size,
+ PROT_NONE,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_FIXED,
+ kMmapFd,
+ kMmapFdOffset) != MAP_FAILED;
+}
+
+
+bool VirtualMemory::ReleaseRegion(void* base, size_t size) {
+ return munmap(base, size) == 0;
+}
+
+
+bool VirtualMemory::HasLazyCommits() {
+ return true;
+}
+
+
+class Thread::PlatformData : public Malloced {
+ public:
+ PlatformData() : thread_(kNoThread) {}
+
+ pthread_t thread_; // Thread handle for pthread.
+};
+
+Thread::Thread(const Options& options)
+ : data_(new PlatformData()),
+ stack_size_(options.stack_size()) {
+ set_name(options.name());
+}
+
+
+Thread::~Thread() {
+ delete data_;
+}
+
+
+static void* ThreadEntry(void* arg) {
+ Thread* thread = reinterpret_cast<Thread*>(arg);
+ thread->data()->thread_ = pthread_self();
+ ASSERT(thread->data()->thread_ != kNoThread);
+ thread->Run();
+ return NULL;
+}
+
+
+void Thread::set_name(const char* name) {
+ strncpy(name_, name, sizeof(name_));
+ name_[sizeof(name_) - 1] = '\0';
+}
+
+
+void Thread::Start() {
+ pthread_attr_t* attr_ptr = NULL;
+ pthread_attr_t attr;
+ if (stack_size_ > 0) {
+ pthread_attr_init(&attr);
+ pthread_attr_setstacksize(&attr, static_cast<size_t>(stack_size_));
+ attr_ptr = &attr;
+ }
+ int result = pthread_create(&data_->thread_, attr_ptr, ThreadEntry, this);
+ CHECK_EQ(0, result);
+ ASSERT(data_->thread_ != kNoThread);
+}
+
+
+void Thread::Join() {
+ pthread_join(data_->thread_, NULL);
+}
+
+
+Thread::LocalStorageKey Thread::CreateThreadLocalKey() {
+ pthread_key_t key;
+ int result = pthread_key_create(&key, NULL);
+ USE(result);
+ ASSERT(result == 0);
+ return static_cast<LocalStorageKey>(key);
+}
+
+
+void Thread::DeleteThreadLocalKey(LocalStorageKey key) {
+ pthread_key_t pthread_key = static_cast<pthread_key_t>(key);
+ int result = pthread_key_delete(pthread_key);
+ USE(result);
+ ASSERT(result == 0);
+}
+
+
+void* Thread::GetThreadLocal(LocalStorageKey key) {
+ pthread_key_t pthread_key = static_cast<pthread_key_t>(key);
+ return pthread_getspecific(pthread_key);
+}
+
+
+void Thread::SetThreadLocal(LocalStorageKey key, void* value) {
+ pthread_key_t pthread_key = static_cast<pthread_key_t>(key);
+ pthread_setspecific(pthread_key, value);
+}
+
+
+void Thread::YieldCPU() {
+ sched_yield();
+}
+
+
+class HaikuMutex : public Mutex {
+ public:
+ HaikuMutex() {
+ pthread_mutexattr_t attrs;
+ int result = pthread_mutexattr_init(&attrs);
+ ASSERT(result == 0);
+ result = pthread_mutexattr_settype(&attrs, PTHREAD_MUTEX_RECURSIVE);
+ ASSERT(result == 0);
+ result = pthread_mutex_init(&mutex_, &attrs);
+ ASSERT(result == 0);
+ USE(result);
+ }
+
+ virtual ~HaikuMutex() { pthread_mutex_destroy(&mutex_); }
+
+ virtual int Lock() {
+ int result = pthread_mutex_lock(&mutex_);
+ return result;
+ }
+
+ virtual int Unlock() {
+ int result = pthread_mutex_unlock(&mutex_);
+ return result;
+ }
+
+ virtual bool TryLock() {
+ int result = pthread_mutex_trylock(&mutex_);
+ // Return false if the lock is busy and locking failed.
+ if (result == EBUSY) {
+ return false;
+ }
+ ASSERT(result == 0); // Verify no other errors.
+ return true;
+ }
+
+ private:
+ pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms.
+};
+
+
+Mutex* OS::CreateMutex() {
+ return new HaikuMutex();
+}
+
+
+class HaikuSemaphore : public Semaphore {
+ public:
+ explicit HaikuSemaphore(int count) { sem_ = create_sem(count, ""); }
+ virtual ~HaikuSemaphore() { delete_sem(sem_); }
+
+ virtual void Wait();
+ virtual bool Wait(int timeout);
+ virtual void Signal() { release_sem(sem_); }
+ private:
+ sem_id sem_;
+};
+
+
+void HaikuSemaphore::Wait() {
+ while (true) {
+ int result = acquire_sem(sem_);
+ if (result == B_NO_ERROR) return; // Successfully got semaphore.
+ CHECK(result == B_INTERRUPTED); // Signal caused spurious wakeup.
+ }
+}
+
+
+#ifndef TIMEVAL_TO_TIMESPEC
+#define TIMEVAL_TO_TIMESPEC(tv, ts) do { \
+ (ts)->tv_sec = (tv)->tv_sec; \
+ (ts)->tv_nsec = (tv)->tv_usec * 1000; \
+} while (false)
+#endif
+
+
+bool HaikuSemaphore::Wait(int timeout) {
+ // Wait for semaphore signalled or timeout.
+ while (true) {
+ int result = acquire_sem_etc(sem_, 1, B_RELATIVE_TIMEOUT, timeout);
+ if (result == B_NO_ERROR) return true; // Successfully got semaphore.
+ if (result == B_TIMED_OUT || result == B_WOULD_BLOCK) return false; // Timeout.
+ CHECK(result == B_INTERRUPTED); // Signal caused spurious wakeup.
+ }
+}
+
+
+Semaphore* OS::CreateSemaphore(int count) {
+ return new HaikuSemaphore(count);
+}
+
+
+static pthread_t GetThreadID() {
+ return pthread_self();
+}
+
+
+static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
+ USE(info);
+ if (signal != SIGPROF) return;
+
+ Isolate* isolate = Isolate::UncheckedCurrent();
+ if (isolate == NULL || !isolate->IsInitialized() || !isolate->IsInUse()) {
+ // We require a fully initialized and entered isolate.
+ return;
+ }
+ if (v8::Locker::IsActive() &&
+ !isolate->thread_manager()->IsLockedByCurrentThread()) {
+ return;
+ }
+
+ Sampler* sampler = isolate->logger()->sampler();
+ if (sampler == NULL || !sampler->IsActive()) return;
+
+ TickSample sample_obj;
+ TickSample* sample = CpuProfiler::StartTickSampleEvent(isolate);
+ if (sample == NULL) sample = &sample_obj;
+
+ // Extracting the sample from the context is extremely machine dependent.
+ ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
+ mcontext_t& mcontext = ucontext->uc_mcontext;
+ sample->state = isolate->current_vm_state();
+#if V8_HOST_ARCH_IA32
+ sample->pc = reinterpret_cast<Address>(mcontext.eip);
+ sample->sp = reinterpret_cast<Address>(mcontext.esp);
+ sample->fp = reinterpret_cast<Address>(mcontext.ebp);
+#elif V8_HOST_ARCH_X64
+ sample->pc = reinterpret_cast<Address>(mcontext.rip);
+ sample->sp = reinterpret_cast<Address>(mcontext.rsp);
+ sample->fp = reinterpret_cast<Address>(mcontext.rbp);
+#elif V8_HOST_ARCH_ARM
+ sample->pc = reinterpret_cast<Address>(mcontext.r15);
+ sample->sp = reinterpret_cast<Address>(mcontext.r13);
+ sample->fp = reinterpret_cast<Address>(mcontext.r11);
+#elif V8_HOST_ARCH_MIPS
+ #error TODO
+#endif // V8_HOST_ARCH_*
+ sampler->SampleStack(sample);
+ sampler->Tick(sample);
+ CpuProfiler::FinishTickSampleEvent(isolate);
+}
+
+
+class CpuProfilerSignalHandler {
+ public:
+ static void SetUp() { if (!mutex_) mutex_ = OS::CreateMutex(); }
+ static void TearDown() { delete mutex_; }
+
+ static void InstallSignalHandler() {
+ struct sigaction sa;
+ ScopedLock lock(mutex_);
+ if (signal_handler_installed_counter_ > 0) {
+ signal_handler_installed_counter_++;
+ return;
+ }
+ sa.sa_sigaction = ProfilerSignalHandler;
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = SA_RESTART | SA_SIGINFO;
+ if (sigaction(SIGPROF, &sa, &old_signal_handler_) == 0) {
+ signal_handler_installed_counter_++;
+ }
+ }
+
+ static void RestoreSignalHandler() {
+ ScopedLock lock(mutex_);
+ if (signal_handler_installed_counter_ == 0)
+ return;
+ if (signal_handler_installed_counter_ == 1) {
+ sigaction(SIGPROF, &old_signal_handler_, 0);
+ }
+ signal_handler_installed_counter_--;
+ }
+
+ static bool signal_handler_installed() {
+ return signal_handler_installed_counter_ > 0;
+ }
+
+ private:
+ static int signal_handler_installed_counter_;
+ static struct sigaction old_signal_handler_;
+ static Mutex* mutex_;
+};
+
+
+int CpuProfilerSignalHandler::signal_handler_installed_counter_ = 0;
+struct sigaction CpuProfilerSignalHandler::old_signal_handler_;
+Mutex* CpuProfilerSignalHandler::mutex_ = NULL;
+
+
+class Sampler::PlatformData : public Malloced {
+ public:
+ PlatformData() : vm_tid_(GetThreadID()) {}
+
+ void SendProfilingSignal() {
+ if (!CpuProfilerSignalHandler::signal_handler_installed()) return;
+ pthread_kill(vm_tid_, SIGPROF);
+ }
+
+ private:
+ const pthread_t vm_tid_;
+};
+
+
+class SignalSender : public Thread {
+ public:
+ enum SleepInterval {
+ HALF_INTERVAL,
+ FULL_INTERVAL
+ };
+
+ static const int kSignalSenderStackSize = 64 * KB;
+
+ explicit SignalSender(int interval)
+ : Thread(Thread::Options("SignalSender", kSignalSenderStackSize)),
+ interval_(interval) {}
+
+ static void SetUp() { if (!mutex_) mutex_ = OS::CreateMutex(); }
+ static void TearDown() { delete mutex_; }
+
+ static void AddActiveSampler(Sampler* sampler) {
+ ScopedLock lock(mutex_);
+ SamplerRegistry::AddActiveSampler(sampler);
+ if (instance_ == NULL) {
+ // Start a thread that will send SIGPROF signal to VM threads,
+ // when CPU profiling will be enabled.
+ instance_ = new SignalSender(sampler->interval());
+ instance_->Start();
+ } else {
+ ASSERT(instance_->interval_ == sampler->interval());
+ }
+ }
+
+ static void RemoveActiveSampler(Sampler* sampler) {
+ ScopedLock lock(mutex_);
+ SamplerRegistry::RemoveActiveSampler(sampler);
+ if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) {
+ RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(instance_);
+ delete instance_;
+ instance_ = NULL;
+ }
+ }
+
+ // Implement Thread::Run().
+ virtual void Run() {
+ SamplerRegistry::State state;
+ while ((state = SamplerRegistry::GetState()) !=
+ SamplerRegistry::HAS_NO_SAMPLERS) {
+ bool cpu_profiling_enabled =
+ (state == SamplerRegistry::HAS_CPU_PROFILING_SAMPLERS);
+ bool runtime_profiler_enabled = RuntimeProfiler::IsEnabled();
+ // When CPU profiling is enabled both JavaScript and C++ code is
+ // profiled. We must not suspend.
+ if (!cpu_profiling_enabled) {
+ if (rate_limiter_.SuspendIfNecessary()) continue;
+ }
+ if (cpu_profiling_enabled && runtime_profiler_enabled) {
+ if (!SamplerRegistry::IterateActiveSamplers(&DoCpuProfile, NULL)) {
+ return;
+ }
+ Sleep(HALF_INTERVAL);
+ if (!SamplerRegistry::IterateActiveSamplers(&DoRuntimeProfile, NULL)) {
+ return;
+ }
+ Sleep(HALF_INTERVAL);
+ } else {
+ if (cpu_profiling_enabled) {
+ if (!SamplerRegistry::IterateActiveSamplers(&DoCpuProfile, NULL)) {
+ return;
+ }
+ }
+ if (runtime_profiler_enabled) {
+ if (!SamplerRegistry::IterateActiveSamplers(&DoRuntimeProfile,
+ NULL)) {
+ return;
+ }
+ }
+ Sleep(FULL_INTERVAL);
+ }
+ }
+ }
+
+ static void DoCpuProfile(Sampler* sampler, void*) {
+ if (!sampler->IsProfiling()) return;
+ sampler->platform_data()->SendProfilingSignal();
+ }
+
+ static void DoRuntimeProfile(Sampler* sampler, void* ignored) {
+ if (!sampler->isolate()->IsInitialized()) return;
+ sampler->isolate()->runtime_profiler()->NotifyTick();
+ }
+
+ void Sleep(SleepInterval full_or_half) {
+ // Convert ms to us and subtract 100 us to compensate delays
+ // occuring during signal delivery.
+ useconds_t interval = interval_ * 1000 - 100;
+ if (full_or_half == HALF_INTERVAL) interval /= 2;
+ int result = usleep(interval);
+#ifdef DEBUG
+ if (result != 0 && errno != EINTR) {
+ fprintf(stderr,
+ "SignalSender usleep error; interval = %lu, errno = %d\n",
+ interval,
+ errno);
+ ASSERT(result == 0 || errno == EINTR);
+ }
+#endif
+ USE(result);
+ }
+
+ const int interval_;
+ RuntimeProfilerRateLimiter rate_limiter_;
+
+ // Protects the process wide state below.
+ static Mutex* mutex_;
+ static SignalSender* instance_;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(SignalSender);
+};
+
+
+Mutex* SignalSender::mutex_ = NULL;
+SignalSender* SignalSender::instance_ = NULL;
+
+
+void OS::SetUp() {
+ // Seed the random number generator. We preserve microsecond resolution.
+ uint64_t seed = Ticks() ^ (getpid() << 16);
+ srandom(static_cast<unsigned int>(seed));
+ limit_mutex = CreateMutex();
+
+ SignalSender::SetUp();
+ CpuProfilerSignalHandler::SetUp();
+}
+
+
+void OS::TearDown() {
+ SignalSender::TearDown();
+ CpuProfilerSignalHandler::TearDown();
+ delete limit_mutex;
+}
+
+
+Sampler::Sampler(Isolate* isolate, int interval)
+ : isolate_(isolate),
+ interval_(interval),
+ profiling_(false),
+ active_(false),
+ has_processing_thread_(false),
+ samples_taken_(0) {
+ data_ = new PlatformData;
+}
+
+
+Sampler::~Sampler() {
+ ASSERT(!IsActive());
+ delete data_;
+}
+
+
+void Sampler::DoSample() {
+ platform_data()->SendProfilingSignal();
+}
+
+
+void Sampler::Start() {
+ ASSERT(!IsActive());
+ SetActive(true);
+ SignalSender::AddActiveSampler(this);
+}
+
+
+void Sampler::Stop() {
+ ASSERT(IsActive());
+ SignalSender::RemoveActiveSampler(this);
+ SetActive(false);
+}
+
+
+void Sampler::StartSampling() {
+ CpuProfilerSignalHandler::InstallSignalHandler();
+}
+
+
+void Sampler::StopSampling() {
+ CpuProfilerSignalHandler::RestoreSignalHandler();
+}
+
+
+} } // namespace v8::internal
diff -Naur v8-r13067/src/platform.h v8-r13067-haiku/src/platform.h
--- v8-r13067/src/platform.h 2012-12-24 04:17:34.145227776 +0000
+++ v8-r13067-haiku/src/platform.h 2012-12-24 04:10:09.000000000 +0000
@@ -96,6 +96,10 @@
#endif // WIN32
+#ifdef __HAIKU__
+#define isless(x, y) __builtin_isless(x, y)
+#endif // __HAIKU__
+
#include "atomicops.h"
#include "lazy-instance.h"
#include "platform-tls.h"
@@ -107,7 +111,7 @@
// Use AtomicWord for a machine-sized pointer. It is assumed that
// reads and writes of naturally aligned values of this type are atomic.
-#if defined(__OpenBSD__) && defined(__i386__)
+#if (defined(__OpenBSD__) || defined(__HAIKU__)) && defined(__i386__)
typedef Atomic32 AtomicWord;
#else
typedef intptr_t AtomicWord;
diff -Naur v8-r13067/tools/android-run.py v8-r13067-haiku/tools/android-run.py
--- v8-r13067/tools/android-run.py 2012-12-24 04:17:38.883425280 +0000
+++ v8-r13067-haiku/tools/android-run.py 2012-12-24 04:12:45.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/disasm.py v8-r13067-haiku/tools/disasm.py
--- v8-r13067/tools/disasm.py 2012-12-24 04:17:38.872939520 +0000
+++ v8-r13067-haiku/tools/disasm.py 2012-12-24 04:12:53.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2011 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/gc-nvp-trace-processor.py v8-r13067-haiku/tools/gc-nvp-trace-processor.py
--- v8-r13067/tools/gc-nvp-trace-processor.py 2012-12-24 04:17:38.844103680 +0000
+++ v8-r13067-haiku/tools/gc-nvp-trace-processor.py 2012-12-24 04:13:09.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2010 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/gen-postmortem-metadata.py v8-r13067-haiku/tools/gen-postmortem-metadata.py
--- v8-r13067/tools/gen-postmortem-metadata.py 2012-12-24 04:17:38.834142208 +0000
+++ v8-r13067-haiku/tools/gen-postmortem-metadata.py 2012-12-24 04:13:24.000000000 +0000
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/grokdump.py v8-r13067-haiku/tools/grokdump.py
--- v8-r13067/tools/grokdump.py 2012-12-24 04:17:38.750780416 +0000
+++ v8-r13067-haiku/tools/grokdump.py 2012-12-24 04:13:35.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/gyp/v8.gyp v8-r13067-haiku/tools/gyp/v8.gyp
--- v8-r13067/tools/gyp/v8.gyp 2012-12-24 04:17:38.516161536 +0000
+++ v8-r13067-haiku/tools/gyp/v8.gyp 2012-12-24 04:10:09.000000000 +0000
@@ -743,6 +743,17 @@
'libraries': [ '-lwinmm.lib', '-lws2_32.lib' ],
},
}],
+ ['OS=="haiku"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lnetwork',
+ ]},
+ 'sources': [
+ '../../src/platform-haiku.cc',
+ '../../src/platform-posix.cc',
+ ],
+ }
+ ],
['component=="shared_library"', {
'defines': [
'BUILDING_V8_SHARED',
diff -Naur v8-r13067/tools/js2c.py v8-r13067-haiku/tools/js2c.py
--- v8-r13067/tools/js2c.py 2012-12-24 04:17:38.776470528 +0000
+++ v8-r13067-haiku/tools/js2c.py 2012-12-24 04:13:42.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/ll_prof.py v8-r13067-haiku/tools/ll_prof.py
--- v8-r13067/tools/ll_prof.py 2012-12-24 04:17:38.824442880 +0000
+++ v8-r13067-haiku/tools/ll_prof.py 2012-12-24 04:15:04.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/presubmit.py v8-r13067-haiku/tools/presubmit.py
--- v8-r13067/tools/presubmit.py 2012-12-24 04:17:38.800063488 +0000
+++ v8-r13067-haiku/tools/presubmit.py 2012-12-24 04:15:09.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/process-heap-prof.py v8-r13067-haiku/tools/process-heap-prof.py
--- v8-r13067/tools/process-heap-prof.py 2012-12-24 04:17:38.827588608 +0000
+++ v8-r13067-haiku/tools/process-heap-prof.py 2012-12-24 04:15:13.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2009 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/run-tests.py v8-r13067-haiku/tools/run-tests.py
--- v8-r13067/tools/run-tests.py 2012-12-24 04:17:38.779878400 +0000
+++ v8-r13067-haiku/tools/run-tests.py 2012-12-24 04:15:19.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/stats-viewer.py v8-r13067-haiku/tools/stats-viewer.py
--- v8-r13067/tools/stats-viewer.py 2012-12-24 04:17:38.831258624 +0000
+++ v8-r13067-haiku/tools/stats-viewer.py 2012-12-24 04:15:24.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2008 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/status-file-converter.py v8-r13067-haiku/tools/status-file-converter.py
--- v8-r13067/tools/status-file-converter.py 2012-12-24 04:17:38.783024128 +0000
+++ v8-r13067-haiku/tools/status-file-converter.py 2012-12-24 04:15:29.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/test-server.py v8-r13067-haiku/tools/test-server.py
--- v8-r13067/tools/test-server.py 2012-12-24 04:17:38.890503168 +0000
+++ v8-r13067-haiku/tools/test-server.py 2012-12-24 04:15:37.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/test-wrapper-gypbuild.py v8-r13067-haiku/tools/test-wrapper-gypbuild.py
--- v8-r13067/tools/test-wrapper-gypbuild.py 2012-12-24 04:17:38.796393472 +0000
+++ v8-r13067-haiku/tools/test-wrapper-gypbuild.py 2012-12-24 04:15:43.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/test.py v8-r13067-haiku/tools/test.py
--- v8-r13067/tools/test.py 2012-12-24 04:17:38.870318080 +0000
+++ v8-r13067-haiku/tools/test.py 2012-12-24 04:15:49.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
#
# Copyright 2012 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without
diff -Naur v8-r13067/tools/testrunner/server/daemon.py v8-r13067-haiku/tools/testrunner/server/daemon.py
--- v8-r13067/tools/testrunner/server/daemon.py 2012-12-24 04:17:37.866910208 +0000
+++ v8-r13067-haiku/tools/testrunner/server/daemon.py 2012-12-24 04:15:57.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/boot/common/bin/python
# This code has been written by Sander Marechal and published at:
# http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/
diff -Naur v8-r13067/tools/utils.py v8-r13067-haiku/tools/utils.py
--- v8-r13067/tools/utils.py 2012-12-24 04:17:38.839647232 +0000
+++ v8-r13067-haiku/tools/utils.py 2012-12-24 04:10:09.000000000 +0000
@@ -63,6 +63,8 @@
return 'solaris'
elif id == 'NetBSD':
return 'netbsd'
+ elif id == 'Haiku':
+ return 'haiku'
else:
return None
@@ -83,6 +85,8 @@
return 'ia32'
elif id == 'amd64':
return 'ia32'
+ elif id == 'BePC':
+ return 'ia32'
else:
return None