diff options
Diffstat (limited to 'deps/v8/src/base/platform')
-rw-r--r-- | deps/v8/src/base/platform/OWNERS | 2 | ||||
-rw-r--r-- | deps/v8/src/base/platform/platform-fuchsia.cc | 12 | ||||
-rw-r--r-- | deps/v8/src/base/platform/platform-linux.cc | 8 | ||||
-rw-r--r-- | deps/v8/src/base/platform/platform-posix-time.h | 2 | ||||
-rw-r--r-- | deps/v8/src/base/platform/platform-posix.cc | 13 | ||||
-rw-r--r-- | deps/v8/src/base/platform/platform-posix.h | 2 | ||||
-rw-r--r-- | deps/v8/src/base/platform/platform-win32.cc | 6 | ||||
-rw-r--r-- | deps/v8/src/base/platform/platform.h | 2 | ||||
-rw-r--r-- | deps/v8/src/base/platform/semaphore.cc | 4 | ||||
-rw-r--r-- | deps/v8/src/base/platform/time.h | 5 |
10 files changed, 26 insertions, 30 deletions
diff --git a/deps/v8/src/base/platform/OWNERS b/deps/v8/src/base/platform/OWNERS index 5deaa67ce7..cbaed6105d 100644 --- a/deps/v8/src/base/platform/OWNERS +++ b/deps/v8/src/base/platform/OWNERS @@ -3,4 +3,6 @@ set noparent hpayer@chromium.org mlippautz@chromium.org +per-file platform-fuchsia.cc=wez@chromium.org + # COMPONENT: Blink>JavaScript diff --git a/deps/v8/src/base/platform/platform-fuchsia.cc b/deps/v8/src/base/platform/platform-fuchsia.cc index d1979fb9d8..713ee404bd 100644 --- a/deps/v8/src/base/platform/platform-fuchsia.cc +++ b/deps/v8/src/base/platform/platform-fuchsia.cc @@ -57,8 +57,8 @@ void* OS::Allocate(void* address, size_t size, size_t alignment, strlen(kVirtualMemoryName)); uintptr_t reservation; uint32_t prot = GetProtectionFromMemoryPermission(access); - zx_status_t status = zx_vmar_map_old(zx_vmar_root_self(), 0, vmo, 0, - request_size, prot, &reservation); + zx_status_t status = zx_vmar_map(zx_vmar_root_self(), prot, 0, vmo, 0, + request_size, &reservation); // Either the vmo is now referenced by the vmar, or we failed and are bailing, // so close the vmo either way. zx_handle_close(vmo); @@ -67,7 +67,8 @@ void* OS::Allocate(void* address, size_t size, size_t alignment, } uint8_t* base = reinterpret_cast<uint8_t*>(reservation); - uint8_t* aligned_base = RoundUp(base, alignment); + uint8_t* aligned_base = reinterpret_cast<uint8_t*>( + RoundUp(reinterpret_cast<uintptr_t>(base), alignment)); // Unmap extra memory reserved before and after the desired block. if (aligned_base != base) { @@ -114,9 +115,8 @@ bool OS::SetPermissions(void* address, size_t size, MemoryPermission access) { DCHECK_EQ(0, reinterpret_cast<uintptr_t>(address) % CommitPageSize()); DCHECK_EQ(0, size % CommitPageSize()); uint32_t prot = GetProtectionFromMemoryPermission(access); - return zx_vmar_protect_old(zx_vmar_root_self(), - reinterpret_cast<uintptr_t>(address), size, - prot) == ZX_OK; + return zx_vmar_protect(zx_vmar_root_self(), prot, + reinterpret_cast<uintptr_t>(address), size) == ZX_OK; } // static diff --git a/deps/v8/src/base/platform/platform-linux.cc b/deps/v8/src/base/platform/platform-linux.cc index 725ad0c6eb..10815f29c5 100644 --- a/deps/v8/src/base/platform/platform-linux.cc +++ b/deps/v8/src/base/platform/platform-linux.cc @@ -27,14 +27,6 @@ #include <sys/types.h> // mmap & munmap #include <unistd.h> // sysconf -// GLibc on ARM defines mcontext_t has a typedef for 'struct sigcontext'. -// Old versions of the C library <signal.h> didn't define the type. -#if defined(__ANDROID__) && !defined(__BIONIC_HAVE_UCONTEXT_T) && \ - (defined(__arm__) || defined(__aarch64__)) && \ - !defined(__BIONIC_HAVE_STRUCT_SIGCONTEXT) -#include <asm/sigcontext.h> // NOLINT -#endif - #include <cmath> #undef MAP_TYPE diff --git a/deps/v8/src/base/platform/platform-posix-time.h b/deps/v8/src/base/platform/platform-posix-time.h index 4d3373715b..7814296b83 100644 --- a/deps/v8/src/base/platform/platform-posix-time.h +++ b/deps/v8/src/base/platform/platform-posix-time.h @@ -15,7 +15,7 @@ class PosixDefaultTimezoneCache : public PosixTimezoneCache { const char* LocalTimezone(double time_ms) override; double LocalTimeOffset(double time_ms, bool is_utc) override; - ~PosixDefaultTimezoneCache() override {} + ~PosixDefaultTimezoneCache() override = default; }; } // namespace base diff --git a/deps/v8/src/base/platform/platform-posix.cc b/deps/v8/src/base/platform/platform-posix.cc index cb25196970..c93974bcfc 100644 --- a/deps/v8/src/base/platform/platform-posix.cc +++ b/deps/v8/src/base/platform/platform-posix.cc @@ -86,7 +86,7 @@ namespace base { namespace { // 0 is never a valid thread id. -const pthread_t kNoThread = (pthread_t) 0; +const pthread_t kNoThread = static_cast<pthread_t>(0); bool g_hard_abort = false; @@ -254,10 +254,6 @@ void* OS::GetRandomMmapAddr() { // Little-endian Linux: 46 bits of virtual addressing. raw_addr &= uint64_t{0x3FFFFFFF0000}; #endif -#elif V8_TARGET_ARCH_MIPS64 - // We allocate code in 256 MB aligned segments because of optimizations using - // J instruction that require that all code is within a single 256 MB segment - raw_addr &= uint64_t{0x3FFFE0000000}; #elif V8_TARGET_ARCH_S390X // Linux on Z uses bits 22-32 for Region Indexing, which translates to 42 bits // of virtual addressing. Truncate to 40 bits to allow kernel chance to @@ -267,6 +263,10 @@ void* OS::GetRandomMmapAddr() { // 31 bits of virtual addressing. Truncate to 29 bits to allow kernel chance // to fulfill request. raw_addr &= 0x1FFFF000; +#elif V8_TARGET_ARCH_MIPS64 + // 42 bits of virtual addressing. Truncate to 40 bits to allow kernel chance + // to fulfill request. + raw_addr &= uint64_t{0xFFFFFF0000}; #else raw_addr &= 0x3FFFF000; @@ -313,7 +313,8 @@ void* OS::Allocate(void* address, size_t size, size_t alignment, // Unmap memory allocated before the aligned base address. uint8_t* base = static_cast<uint8_t*>(result); - uint8_t* aligned_base = RoundUp(base, alignment); + uint8_t* aligned_base = reinterpret_cast<uint8_t*>( + RoundUp(reinterpret_cast<uintptr_t>(base), alignment)); if (aligned_base != base) { DCHECK_LT(base, aligned_base); size_t prefix_size = static_cast<size_t>(aligned_base - base); diff --git a/deps/v8/src/base/platform/platform-posix.h b/deps/v8/src/base/platform/platform-posix.h index 55861bc9ac..8cf5e54604 100644 --- a/deps/v8/src/base/platform/platform-posix.h +++ b/deps/v8/src/base/platform/platform-posix.h @@ -15,7 +15,7 @@ class PosixTimezoneCache : public TimezoneCache { public: double DaylightSavingsOffset(double time_ms) override; void Clear() override {} - ~PosixTimezoneCache() override {} + ~PosixTimezoneCache() override = default; protected: static const int msPerSecond = 1000; diff --git a/deps/v8/src/base/platform/platform-win32.cc b/deps/v8/src/base/platform/platform-win32.cc index 2e56ac5df1..11a008e6c6 100644 --- a/deps/v8/src/base/platform/platform-win32.cc +++ b/deps/v8/src/base/platform/platform-win32.cc @@ -822,7 +822,8 @@ void* OS::Allocate(void* address, size_t size, size_t alignment, if (base == nullptr) return nullptr; // Can't allocate, we're OOM. // If address is suitably aligned, we're done. - uint8_t* aligned_base = RoundUp(base, alignment); + uint8_t* aligned_base = reinterpret_cast<uint8_t*>( + RoundUp(reinterpret_cast<uintptr_t>(base), alignment)); if (base == aligned_base) return reinterpret_cast<void*>(base); // Otherwise, free it and try a larger allocation. @@ -843,7 +844,8 @@ void* OS::Allocate(void* address, size_t size, size_t alignment, // Try to trim the allocation by freeing the padded allocation and then // calling VirtualAlloc at the aligned base. CHECK(Free(base, padded_size)); - aligned_base = RoundUp(base, alignment); + aligned_base = reinterpret_cast<uint8_t*>( + RoundUp(reinterpret_cast<uintptr_t>(base), alignment)); base = reinterpret_cast<uint8_t*>( VirtualAlloc(aligned_base, size, flags, protect)); // We might not get the reduced allocation due to a race. In that case, diff --git a/deps/v8/src/base/platform/platform.h b/deps/v8/src/base/platform/platform.h index 51b6014821..f9d01edf00 100644 --- a/deps/v8/src/base/platform/platform.h +++ b/deps/v8/src/base/platform/platform.h @@ -188,7 +188,7 @@ class V8_BASE_EXPORT OS { class V8_BASE_EXPORT MemoryMappedFile { public: - virtual ~MemoryMappedFile() {} + virtual ~MemoryMappedFile() = default; virtual void* memory() const = 0; virtual size_t size() const = 0; diff --git a/deps/v8/src/base/platform/semaphore.cc b/deps/v8/src/base/platform/semaphore.cc index 5950664523..a7e50f5880 100644 --- a/deps/v8/src/base/platform/semaphore.cc +++ b/deps/v8/src/base/platform/semaphore.cc @@ -91,7 +91,9 @@ void Semaphore::Signal() { // This check may fail with <libc-2.21, which we use on the try bots, if the // semaphore is destroyed while sem_post is still executed. A work around is // to extend the lifetime of the semaphore. - CHECK_EQ(0, result); + if (result != 0) { + FATAL("Error when signaling semaphore, errno: %d", errno); + } } diff --git a/deps/v8/src/base/platform/time.h b/deps/v8/src/base/platform/time.h index 161092ad8b..9e99166487 100644 --- a/deps/v8/src/base/platform/time.h +++ b/deps/v8/src/base/platform/time.h @@ -105,10 +105,7 @@ class V8_BASE_EXPORT TimeDelta final { static TimeDelta FromTimespec(struct timespec ts); struct timespec ToTimespec() const; - TimeDelta& operator=(const TimeDelta& other) { - delta_ = other.delta_; - return *this; - } + TimeDelta& operator=(const TimeDelta& other) = default; // Computations with other deltas. TimeDelta operator+(const TimeDelta& other) const { |