Skip to content

V
V8
Commit e3901e91 authored by bmeurer@chromium.org's avatar bmeurer@chromium.org
Browse files
Options

Revert new OS and CC detection and related changes since r15923. 

Revert "Attempt to fix leftover test breakage on Mac."
Revert "Fix d8 build error when V8_SHARED is unset on Linux."
Revert "Fix V8_GNUC_PREREQ macro."
Revert "Fix typo."
Revert "Implement correct OS and CC detection."

TBR=svenpanne@chromium.org,danno@chromium.org

Review URL: https://codereview.chromium.org/21022003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15932 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 83727682
Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 250 deletions
src/compiler-intrinsics.h
View file @ e3901e91
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
#ifndef V8_COMPILER_INTRINSICS_H_ #ifndef V8_COMPILER_INTRINSICS_H_
#define V8_COMPILER_INTRINSICS_H_ #define V8_COMPILER_INTRINSICS_H_
#include "globals.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -47,8 +45,7 @@ class CompilerIntrinsics { ...@@ -47,8 +45,7 @@ class CompilerIntrinsics {
INLINE(static int CountSetBits(uint32_t value)); INLINE(static int CountSetBits(uint32_t value));
}; };
#if V8_CC_GNU #ifdef __GNUC__
int CompilerIntrinsics::CountTrailingZeros(uint32_t value) { int CompilerIntrinsics::CountTrailingZeros(uint32_t value) {
return __builtin_ctz(value); return __builtin_ctz(value);
} }
...@@ -61,7 +58,7 @@ int CompilerIntrinsics::CountSetBits(uint32_t value) { ...@@ -61,7 +58,7 @@ int CompilerIntrinsics::CountSetBits(uint32_t value) {
return __builtin_popcount(value); return __builtin_popcount(value);
} }
#elif V8_CC_MSVC #elif defined(_MSC_VER)
#pragma intrinsic(_BitScanForward) #pragma intrinsic(_BitScanForward)
#pragma intrinsic(_BitScanReverse) #pragma intrinsic(_BitScanReverse)
......
src/d8-posix.cc
View file @ e3901e91
...@@ -366,10 +366,12 @@ static Handle<Value> GetStdout(int child_fd, ...@@ -366,10 +366,12 @@ static Handle<Value> GetStdout(int child_fd,
// We're disabling usage of waitid in Mac OS X because it doens't work for us: // We're disabling usage of waitid in Mac OS X because it doens't work for us:
// a parent process hangs on waiting while a child process is already a zombie. // a parent process hangs on waiting while a child process is already a zombie.
// See http://code.google.com/p/v8/issues/detail?id=401. // See http://code.google.com/p/v8/issues/detail?id=401.
#if defined(WNOWAIT) && !V8_OS_ANDROID && !V8_OS_DARWN && \ #if defined(WNOWAIT) && !defined(ANDROID) && !defined(__APPLE__) \
!V8_OS_NETBSD && !V8_OS_FREEBSD && !defined(__NetBSD__)
#if !defined(__FreeBSD__)
#define HAS_WAITID 1 #define HAS_WAITID 1
#endif #endif
#endif
// Get exit status of child. // Get exit status of child.
......
src/gdb-jit.cc
View file @ e3901e91
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
namespace v8 { namespace v8 {
namespace internal { namespace internal {
#if V8_OS_DARWIN #ifdef __APPLE__
#define __MACH_O #define __MACH_O
class MachO; class MachO;
class MachOSection; class MachOSection;
......
src/globals.h
View file @ e3901e91
...@@ -28,120 +28,46 @@ ...@@ -28,120 +28,46 @@
#ifndef V8_GLOBALS_H_ #ifndef V8_GLOBALS_H_
#define V8_GLOBALS_H_ #define V8_GLOBALS_H_
// ---------------------------------------------------------------------------- // Define V8_INFINITY
// Operating system detection (V8_OS_x) #define V8_INFINITY INFINITY
//
// ANDROID - Android
// BSD4 - Any BSD 4.4 system
// CYGWIN - Cygwin
// DARWIN - Darwin / Mac OS X
// FREEBSD - FreeBSD
// LINUX - Linux
// NACL - Native Client
// NETBSD - NetBSD
// OPENBSD - OpenBSD
// SOLARIS - Solaris
// UNIX - Any UNIX BSD/SYSV system
// WIN32 - Win32 (Windows 2000/XP/Vista/7 and Windows Server 2003/2008)
#if defined(ANDROID) || defined(__ANDROID__)
# define V8_OS_ANDROID 1
# define V8_OS_LINUX 1
# define V8_OS_UNIX 1
#elif defined(__APPLE__) && defined(__MACH__)
# define V8_OS_DARWIN 1
# define V8_OS_BSD4 1
# define V8_OS_UNIX 1
#elif defined(__CYGWIN__)
# define V8_OS_CYGWIN 1
# define V8_OS_UNIX 1
#elif defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
# define V8_OS_WIN32 1
# define V8_OS_WIN64 1
#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || \
(defined(__MWERKS__) && defined(__INTEL__))
# define V8_OS_WIN32 1
#elif defined(__sun) || defined(sun)
# define V8_OS_SOLARIS 1
# define V8_OS_UNIX 1
#elif defined(__native_client__)
# define V8_OS_NACL 1
#elif defined(__linux__) || defined(__linux)
# define V8_OS_LINUX 1
# define V8_OS_UNIX 1
#elif defined(__FreeBSD__) || defined(__DragonFly__)
# define V8_OS_FREEBSD 1
# define V8_OS_BSD4 1
# define V8_OS_UNIX 1
#elif defined(__NetBSD__)
# define V8_OS_NETBSD 1
# define V8_OS_BSD4 1
# define V8_OS_UNIX 1
#elif defined(__OpenBSD__)
# define V8_OS_OPENBSD 1
# define V8_OS_BSD4 1
# define V8_OS_UNIX 1
#else
# error Operating system was not detected as supported by v8
#endif
// GCC specific stuff
#ifdef __GNUC__
// ---------------------------------------------------------------------------- #define __GNUC_VERSION_FOR_INFTY__ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100)
// Compiler detection (V8_CC_x)
//
// CLANG - C++ front-end for the LLVM compiler
// GNU - GNU C++ or compatible
// INTEL - Intel C++ for Linux or Windows
// MINGW - Minimalistic GNU for Windows Compiler
// MIPS - MIPSpro C++
// MSVC - Microsoft Visual C/C++ or compatible
// RVCT - ARM Realview Compiler Suite
#if defined(_MSC_VER) // Unfortunately, the INFINITY macro cannot be used with the '-pedantic'
# define V8_CC_MSVC 1 // warning flag and certain versions of GCC due to a bug:
# if defined(__INTEL_COMPILER) // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11931
# define V8_CC_INTEL 1 // For now, we use the more involved template-based version from <limits>, but
# endif // only when compiling with GCC versions affected by the bug (2.96.x - 4.0.x)
#elif defined(__GNUC__) // __GNUC_PREREQ is not defined in GCC for Mac OS X, so we define our own macro
# define V8_CC_GNU 1 #if __GNUC_VERSION_FOR_INFTY__ >= 29600 && __GNUC_VERSION_FOR_INFTY__ < 40100
# define V8_GNUC_PREREQ(major, minor) \ #include <limits>
(__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) #undef V8_INFINITY
# if defined(__MINGW64__) #define V8_INFINITY std::numeric_limits<double>::infinity()
# define V8_CC_MINGW 1
# define V8_CC_MINGW64 1
# elif defined(__MINGW32__)
# define V8_CC_MINGW 1
# define V8_CC_MINGW32 1
# elif defined(__ARMCC__) || defined(__CC_ARM)
# define V8_CC_RVCT 1 // ARM Realview Compiler Suite also masquerades as GCC
# elif defined(__INTEL_COMPILER)
# define V8_CC_INTEL 1 // Intel C++ also masquerades as GCC 3.2.0
# elif defined(__clang__)
# define V8_CC_CLANG 1 // Clang also masquerades as GCC 4.2.1
# endif
#elif defined(__ARMCC__) || defined(__CC_ARM)
# define V8_CC_RVCT 1
#elif defined(__INTEL_COMPILER)
# define V8_CC_INTEL 1
#elif defined(__SUNPRO_CC) || defined(__SUNPRO_C)
# define V8_CC_SUN 1
#else
# error Compiler was not detected as supported by v8
#endif #endif
#undef __GNUC_VERSION_FOR_INFTY__
#ifndef V8_GNUC_PREREQ #endif // __GNUC__
#define V8_GNUC_PREREQ(major, minor) 0
#ifdef _MSC_VER
#undef V8_INFINITY
#define V8_INFINITY HUGE_VAL
#endif #endif
// ---------------------------------------------------------------------------- #include "../include/v8stdint.h"
namespace v8 {
namespace internal {
// Processor architecture detection. For more info on what's defined, see: // Processor architecture detection. For more info on what's defined, see:
// http://msdn.microsoft.com/en-us/library/b0084kay.aspx // http://msdn.microsoft.com/en-us/library/b0084kay.aspx
// http://www.agner.org/optimize/calling_conventions.pdf // http://www.agner.org/optimize/calling_conventions.pdf
// or with gcc, run: "echo | gcc -E -dM -" // or with gcc, run: "echo | gcc -E -dM -"
#if defined(_M_X64) || defined(__x86_64__) #if defined(_M_X64) || defined(__x86_64__)
#if V8_OS_NACL #if defined(__native_client__)
// For Native Client builds of V8, use V8_TARGET_ARCH_ARM, so that V8 // For Native Client builds of V8, use V8_TARGET_ARCH_ARM, so that V8
// generates ARM machine code, together with a portable ARM simulator // generates ARM machine code, together with a portable ARM simulator
// compiled for the host architecture in question. // compiled for the host architecture in question.
...@@ -155,7 +81,7 @@ ...@@ -155,7 +81,7 @@
#define V8_HOST_ARCH_X64 1 #define V8_HOST_ARCH_X64 1
#define V8_HOST_ARCH_64_BIT 1 #define V8_HOST_ARCH_64_BIT 1
#define V8_HOST_CAN_READ_UNALIGNED 1 #define V8_HOST_CAN_READ_UNALIGNED 1
#endif // V8_OS_NACL #endif // __native_client__
#elif defined(_M_IX86) || defined(__i386__) #elif defined(_M_IX86) || defined(__i386__)
#define V8_HOST_ARCH_IA32 1 #define V8_HOST_ARCH_IA32 1
#define V8_HOST_ARCH_32_BIT 1 #define V8_HOST_ARCH_32_BIT 1
...@@ -175,7 +101,7 @@ ...@@ -175,7 +101,7 @@
defined(__ARM_ARCH_7__) defined(__ARM_ARCH_7__)
# define CAN_USE_ARMV7_INSTRUCTIONS 1 # define CAN_USE_ARMV7_INSTRUCTIONS 1
# ifndef CAN_USE_VFP3_INSTRUCTIONS # ifndef CAN_USE_VFP3_INSTRUCTIONS
# define CAN_USE_VFP3_INSTRUCTIONS 1 # define CAN_USE_VFP3_INSTRUCTIONS
# endif # endif
#endif #endif
...@@ -185,13 +111,13 @@ ...@@ -185,13 +111,13 @@
// environment as presented by the compiler. // environment as presented by the compiler.
#if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && \ #if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && \
!V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_MIPS !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_MIPS
#if V8_HOST_ARCH_X64 #if defined(_M_X64) || defined(__x86_64__)
#define V8_TARGET_ARCH_X64 1 #define V8_TARGET_ARCH_X64 1
#elif V8_HOST_ARCH_IA32 #elif defined(_M_IX86) || defined(__i386__)
#define V8_TARGET_ARCH_IA32 1 #define V8_TARGET_ARCH_IA32 1
#elif V8_HOST_ARCH_ARM #elif defined(__ARMEL__)
#define V8_TARGET_ARCH_ARM 1 #define V8_TARGET_ARCH_ARM 1
#elif V8_HOST_ARCH_MIPS #elif defined(__MIPSEL__)
#define V8_TARGET_ARCH_MIPS 1 #define V8_TARGET_ARCH_MIPS 1
#else #else
#error Target architecture was not detected as supported by v8 #error Target architecture was not detected as supported by v8
...@@ -237,27 +163,6 @@ ...@@ -237,27 +163,6 @@
#error Unknown target architecture endiannes #error Unknown target architecture endiannes
#endif #endif
// Define V8_INFINITY
#if V8_CC_GNU && V8_GNUC_PREREQ(2, 96) && !V8_GNUC_PREREQ(4, 1)
// Unfortunately, the INFINITY macro cannot be used with the '-pedantic'
// warning flag and certain versions of GCC due to a bug:
// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11931
// For now, we use the more involved template-based version from <limits>, but
// only when compiling with GCC versions affected by the bug (2.96.x - 4.0.x)
#include <limits>
#define V8_INFINITY std::numeric_limits<double>::infinity()
#elif V8_CC_MSVC
#define V8_INFINITY HUGE_VAL
#else
#define V8_INFINITY INFINITY
#endif
#include "../include/v8stdint.h"
namespace v8 {
namespace internal {
// Support for alternative bool type. This is only enabled if the code is // Support for alternative bool type. This is only enabled if the code is
// compiled with USE_MYBOOL defined. This catches some nasty type bugs. // compiled with USE_MYBOOL defined. This catches some nasty type bugs.
// For instance, 'bool b = "false";' results in b == true! This is a hidden // For instance, 'bool b = "false";' results in b == true! This is a hidden
...@@ -282,12 +187,12 @@ typedef byte* Address; ...@@ -282,12 +187,12 @@ typedef byte* Address;
// than defining __STDC_CONSTANT_MACROS before including <stdint.h>, and it // than defining __STDC_CONSTANT_MACROS before including <stdint.h>, and it
// works on compilers that don't have it (like MSVC). // works on compilers that don't have it (like MSVC).
#if V8_HOST_ARCH_64_BIT #if V8_HOST_ARCH_64_BIT
#if V8_CC_MSVC #if defined(_MSC_VER)
#define V8_UINT64_C(x) (x ## UI64) #define V8_UINT64_C(x) (x ## UI64)
#define V8_INT64_C(x) (x ## I64) #define V8_INT64_C(x) (x ## I64)
#define V8_INTPTR_C(x) (x ## I64) #define V8_INTPTR_C(x) (x ## I64)
#define V8_PTR_PREFIX "ll" #define V8_PTR_PREFIX "ll"
#elif V8_CC_MINGW64 #elif defined(__MINGW64__)
#define V8_UINT64_C(x) (x ## ULL) #define V8_UINT64_C(x) (x ## ULL)
#define V8_INT64_C(x) (x ## LL) #define V8_INT64_C(x) (x ## LL)
#define V8_INTPTR_C(x) (x ## LL) #define V8_INTPTR_C(x) (x ## LL)
...@@ -313,11 +218,16 @@ typedef byte* Address; ...@@ -313,11 +218,16 @@ typedef byte* Address;
#define V8PRIuPTR V8_PTR_PREFIX "u" #define V8PRIuPTR V8_PTR_PREFIX "u"
// Fix for Mac OS X defining uintptr_t as "unsigned long": // Fix for Mac OS X defining uintptr_t as "unsigned long":
#if V8_OS_DARWIN #if defined(__APPLE__) && defined(__MACH__)
#undef V8PRIxPTR #undef V8PRIxPTR
#define V8PRIxPTR "lx" #define V8PRIxPTR "lx"
#endif #endif
#if (defined(__APPLE__) && defined(__MACH__)) || \
defined(__FreeBSD__) || defined(__OpenBSD__)
#define USING_BSD_ABI
#endif
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Constants // Constants
...@@ -448,15 +358,15 @@ F FUNCTION_CAST(Address addr) { ...@@ -448,15 +358,15 @@ F FUNCTION_CAST(Address addr) {
// Define used for helping GCC to make better inlining. Don't bother for debug // Define used for helping GCC to make better inlining. Don't bother for debug
// builds. On GCC 3.4.5 using __attribute__((always_inline)) causes compilation // builds. On GCC 3.4.5 using __attribute__((always_inline)) causes compilation
// errors in debug build. // errors in debug build.
#if V8_CC_GNU && !defined(DEBUG) #if defined(__GNUC__) && !defined(DEBUG)
#if V8_GNUC_PREREQ(4, 0) #if (__GNUC__ >= 4)
#define INLINE(header) inline header __attribute__((always_inline)) #define INLINE(header) inline header __attribute__((always_inline))
#define NO_INLINE(header) header __attribute__((noinline)) #define NO_INLINE(header) header __attribute__((noinline))
#else #else
#define INLINE(header) inline __attribute__((always_inline)) header #define INLINE(header) inline __attribute__((always_inline)) header
#define NO_INLINE(header) __attribute__((noinline)) header #define NO_INLINE(header) __attribute__((noinline)) header
#endif #endif
#elif V8_CC_MSVC && !defined(DEBUG) #elif defined(_MSC_VER) && !defined(DEBUG)
#define INLINE(header) __forceinline header #define INLINE(header) __forceinline header
#define NO_INLINE(header) header #define NO_INLINE(header) header
#else #else
...@@ -465,7 +375,7 @@ F FUNCTION_CAST(Address addr) { ...@@ -465,7 +375,7 @@ F FUNCTION_CAST(Address addr) {
#endif #endif
#if V8_GNUC_PREREQ(4, 0) #if defined(__GNUC__) && __GNUC__ >= 4
#define MUST_USE_RESULT __attribute__ ((warn_unused_result)) #define MUST_USE_RESULT __attribute__ ((warn_unused_result))
#else #else
#define MUST_USE_RESULT #define MUST_USE_RESULT
......
src/ia32/macro-assembler-ia32.cc
View file @ e3901e91
...@@ -1933,7 +1933,7 @@ void MacroAssembler::TailCallRuntime(Runtime::FunctionId fid, ...@@ -1933,7 +1933,7 @@ void MacroAssembler::TailCallRuntime(Runtime::FunctionId fid,
// If false, it is returned as a pointer to a preallocated by caller memory // If false, it is returned as a pointer to a preallocated by caller memory
// region. Pointer to this region should be passed to a function as an // region. Pointer to this region should be passed to a function as an
// implicit first argument. // implicit first argument.
#if V8_OS_BSD4 || V8_OS_CYGWIN || V8_CC_MINGW32 #if defined(USING_BSD_ABI) || defined(__MINGW32__) || defined(__CYGWIN__)
static const bool kReturnHandlesDirectly = true; static const bool kReturnHandlesDirectly = true;
#else #else
static const bool kReturnHandlesDirectly = false; static const bool kReturnHandlesDirectly = false;
......
src/isolate-inl.h
View file @ e3901e91
...@@ -39,7 +39,7 @@ namespace internal { ...@@ -39,7 +39,7 @@ namespace internal {
SaveContext::SaveContext(Isolate* isolate) : prev_(isolate->save_context()) { SaveContext::SaveContext(Isolate* isolate) : prev_(isolate->save_context()) {
if (isolate->context() != NULL) { if (isolate->context() != NULL) {
context_ = Handle<Context>(isolate->context()); context_ = Handle<Context>(isolate->context());
#if V8_GNUC_PREREQ(4, 1) && !V8_GNUC_PREREQ(4, 3) #if __GNUC_VERSION__ >= 40100 && __GNUC_VERSION__ < 40300
dummy_ = Handle<Context>(isolate->context()); dummy_ = Handle<Context>(isolate->context());
#endif #endif
} }
......
src/isolate.h
View file @ e3901e91
...@@ -1414,7 +1414,7 @@ class SaveContext BASE_EMBEDDED { ...@@ -1414,7 +1414,7 @@ class SaveContext BASE_EMBEDDED {
private: private:
Handle<Context> context_; Handle<Context> context_;
#if V8_GNUC_PREREQ(4, 1) && !V8_GNUC_PREREQ(4, 3) #if __GNUC_VERSION__ >= 40100 && __GNUC_VERSION__ < 40300
Handle<Context> dummy_; Handle<Context> dummy_;
#endif #endif
SaveContext* prev_; SaveContext* prev_;
......
src/lazy-instance.h
View file @ e3901e91
...@@ -111,9 +111,9 @@ struct LeakyInstanceTrait { ...@@ -111,9 +111,9 @@ struct LeakyInstanceTrait {
// Traits that define how an instance is allocated and accessed. // Traits that define how an instance is allocated and accessed.
// TODO(kalmard): __alignof__ is only defined for GCC >= 4.3. // TODO(kalmard): __alignof__ is only defined for GCC > 4.2. Fix alignment issue
// Fix alignment issue on MIPS with other compilers. // on MIPS with other compilers.
#if V8_GNUC_PREREQ(4, 3) #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2))
#define LAZY_ALIGN(x) __attribute__((aligned(__alignof__(x)))) #define LAZY_ALIGN(x) __attribute__((aligned(__alignof__(x))))
#else #else
#define LAZY_ALIGN(x) #define LAZY_ALIGN(x)
......
src/misc-intrinsics.h
View file @ e3901e91
...@@ -39,13 +39,13 @@ namespace internal { ...@@ -39,13 +39,13 @@ namespace internal {
// Result is undefined if input is zero. // Result is undefined if input is zero.
int IntegerLog2(uint32_t value); int IntegerLog2(uint32_t value);
#if V8_CC_GNU #if defined(__GNUC__)
inline int IntegerLog2(uint32_t value) { inline int IntegerLog2(uint32_t value) {
return 31 - __builtin_clz(value); return 31 - __builtin_clz(value);
} }
#elif V8_CC_MSVC #elif defined(_MSC_VER)
#pragma intrinsic(_BitScanReverse) #pragma intrinsic(_BitScanReverse)
......
src/platform-linux.cc
View file @ e3901e91
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
// Platform specific code for Linux goes here. For the POSIX comaptible parts // Platform specific code for Linux goes here. For the POSIX comaptible parts
// the implementation is in platform-posix.cc. // the implementation is in platform-posix.cc.
#include "platform.h"
#include <pthread.h> #include <pthread.h>
#include <semaphore.h> #include <semaphore.h>
#include <signal.h> #include <signal.h>
...@@ -59,8 +57,8 @@ ...@@ -59,8 +57,8 @@
// GLibc on ARM defines mcontext_t has a typedef for 'struct sigcontext'. // 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. // Old versions of the C library <signal.h> didn't define the type.
#if V8_OS_ANDROID && !defined(__BIONIC_HAVE_UCONTEXT_T) && \ #if defined(__ANDROID__) && !defined(__BIONIC_HAVE_UCONTEXT_T) && \
V8_HOST_ARCH_ARM && !defined(__BIONIC_HAVE_STRUCT_SIGCONTEXT) defined(__arm__) && !defined(__BIONIC_HAVE_STRUCT_SIGCONTEXT)
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#endif #endif
...@@ -69,6 +67,7 @@ ...@@ -69,6 +67,7 @@
#include "v8.h" #include "v8.h"
#include "platform-posix.h" #include "platform-posix.h"
#include "platform.h"
#include "v8threads.h" #include "v8threads.h"
#include "vm-state-inl.h" #include "vm-state-inl.h"
...@@ -80,7 +79,7 @@ namespace internal { ...@@ -80,7 +79,7 @@ namespace internal {
static Mutex* limit_mutex = NULL; static Mutex* limit_mutex = NULL;
#if V8_HOST_ARCH_ARM #ifdef __arm__
static bool CPUInfoContainsString(const char * search_string) { static bool CPUInfoContainsString(const char * search_string) {
const char* file_name = "/proc/cpuinfo"; const char* file_name = "/proc/cpuinfo";
// This is written as a straight shot one pass parser // This is written as a straight shot one pass parser
...@@ -223,23 +222,39 @@ bool OS::ArmUsingHardFloat() { ...@@ -223,23 +222,39 @@ bool OS::ArmUsingHardFloat() {
// GCC versions 4.4 and below don't support hard-fp. // GCC versions 4.4 and below don't support hard-fp.
// GCC versions 4.5 may support hard-fp without defining __ARM_PCS or // GCC versions 4.5 may support hard-fp without defining __ARM_PCS or
// __ARM_PCS_VFP. // __ARM_PCS_VFP.
#define GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
#if GCC_VERSION >= 40600
#if defined(__ARM_PCS_VFP) #if defined(__ARM_PCS_VFP)
return true; return true;
#elif V8_CC_GNU && (V8_GNUC_PREREQ(4, 6) || !V8_GNUC_PREREQ(4, 5)) #else
return false;
#endif
#elif GCC_VERSION < 40500
return false; return false;
#else
#if defined(__ARM_PCS_VFP)
return true;
#elif defined(__ARM_PCS) || defined(__SOFTFP) || !defined(__VFP_FP__) #elif defined(__ARM_PCS) || defined(__SOFTFP) || !defined(__VFP_FP__)
return false; return false;
#else #else
#error "Your version of GCC does not report the FP ABI compiled for." \ #error "Your version of GCC does not report the FP ABI compiled for." \
"Please report it on this issue" \ "Please report it on this issue" \
"http://code.google.com/p/v8/issues/detail?id=2140" "http://code.google.com/p/v8/issues/detail?id=2140"
#endif
#endif #endif
#undef GCC_VERSION
} }
#endif // V8_HOST_ARCH_ARM #endif // def __arm__
#if V8_HOST_ARCH_MIPS #ifdef __mips__
bool OS::MipsCpuHasFeature(CpuFeature feature) { bool OS::MipsCpuHasFeature(CpuFeature feature) {
const char* search_string = NULL; const char* search_string = NULL;
const char* file_name = "/proc/cpuinfo"; const char* file_name = "/proc/cpuinfo";
...@@ -290,7 +305,7 @@ bool OS::MipsCpuHasFeature(CpuFeature feature) { ...@@ -290,7 +305,7 @@ bool OS::MipsCpuHasFeature(CpuFeature feature) {
// Did not find string in the proc file. // Did not find string in the proc file.
return false; return false;
} }
#endif // V8_HOST_ARCH_MIPS #endif // def __mips__
const char* OS::LocalTimezone(double time) { const char* OS::LocalTimezone(double time) {
......
src/platform-posix.cc
View file @ e3901e91
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <pthread.h> #include <pthread.h>
#if V8_OS_FREEBSD || V8_OS_OPENBSD #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <pthread_np.h> // for pthread_set_name_np #include <pthread_np.h> // for pthread_set_name_np
#endif #endif
#include <sched.h> // for sched_yield #include <sched.h> // for sched_yield
...@@ -47,9 +47,11 @@ ...@@ -47,9 +47,11 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#if V8_OS_LINUX #if defined(__linux__)
#include <sys/prctl.h> // for prctl #include <sys/prctl.h> // for prctl
#elif V8_OS_BSD4 #endif
#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
defined(__NetBSD__) || defined(__OpenBSD__)
#include <sys/sysctl.h> // for sysctl #include <sys/sysctl.h> // for sysctl
#endif #endif
...@@ -59,7 +61,7 @@ ...@@ -59,7 +61,7 @@
#undef MAP_TYPE #undef MAP_TYPE
#if V8_OS_ANDROID && !defined(V8_ANDROID_LOG_STDOUT) #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
#define LOG_TAG "v8" #define LOG_TAG "v8"
#include <android/log.h> #include <android/log.h>
#endif #endif
...@@ -77,7 +79,7 @@ static const pthread_t kNoThread = (pthread_t) 0; ...@@ -77,7 +79,7 @@ static const pthread_t kNoThread = (pthread_t) 0;
uint64_t OS::CpuFeaturesImpliedByPlatform() { uint64_t OS::CpuFeaturesImpliedByPlatform() {
#if V8_OS_DARWIN #if defined(__APPLE__)
// Mac OS X requires all these to install so we can assume they are present. // Mac OS X requires all these to install so we can assume they are present.
// These constants are defined by the CPUid instructions. // These constants are defined by the CPUid instructions.
const uint64_t one = 1; const uint64_t one = 1;
...@@ -133,10 +135,10 @@ void OS::Free(void* address, const size_t size) { ...@@ -133,10 +135,10 @@ void OS::Free(void* address, const size_t size) {
// Get rid of writable permission on code allocations. // Get rid of writable permission on code allocations.
void OS::ProtectCode(void* address, const size_t size) { void OS::ProtectCode(void* address, const size_t size) {
#if V8_OS_CYGWIN #if defined(__CYGWIN__)
DWORD old_protect; DWORD old_protect;
VirtualProtect(address, size, PAGE_EXECUTE_READ, &old_protect); VirtualProtect(address, size, PAGE_EXECUTE_READ, &old_protect);
#elif V8_OS_NACL #elif defined(__native_client__)
// The Native Client port of V8 uses an interpreter, so // The Native Client port of V8 uses an interpreter, so
// code pages don't need PROT_EXEC. // code pages don't need PROT_EXEC.
mprotect(address, size, PROT_READ); mprotect(address, size, PROT_READ);
...@@ -148,7 +150,7 @@ void OS::ProtectCode(void* address, const size_t size) { ...@@ -148,7 +150,7 @@ void OS::ProtectCode(void* address, const size_t size) {
// Create guard pages. // Create guard pages.
void OS::Guard(void* address, const size_t size) { void OS::Guard(void* address, const size_t size) {
#if V8_OS_CYGWIN #if defined(__CYGWIN__)
DWORD oldprotect; DWORD oldprotect;
VirtualProtect(address, size, PAGE_READONLY | PAGE_GUARD, &oldprotect); VirtualProtect(address, size, PAGE_READONLY | PAGE_GUARD, &oldprotect);
#else #else
...@@ -158,7 +160,7 @@ void OS::Guard(void* address, const size_t size) { ...@@ -158,7 +160,7 @@ void OS::Guard(void* address, const size_t size) {
void* OS::GetRandomMmapAddr() { void* OS::GetRandomMmapAddr() {
#if V8_OS_NACL #if defined(__native_client__)
// TODO(bradchen): restore randomization once Native Client gets // TODO(bradchen): restore randomization once Native Client gets
// smarter about using mmap address hints. // smarter about using mmap address hints.
// See http://code.google.com/p/nativeclient/issues/3341 // See http://code.google.com/p/nativeclient/issues/3341
...@@ -169,7 +171,7 @@ void* OS::GetRandomMmapAddr() { ...@@ -169,7 +171,7 @@ void* OS::GetRandomMmapAddr() {
// CpuFeatures::Probe. We don't care about randomization in this case because // CpuFeatures::Probe. We don't care about randomization in this case because
// the code page is immediately freed. // the code page is immediately freed.
if (isolate != NULL) { if (isolate != NULL) {
#if V8_HOST_ARCH_64_BIT #if V8_TARGET_ARCH_X64
uint64_t rnd1 = V8::RandomPrivate(isolate); uint64_t rnd1 = V8::RandomPrivate(isolate);
uint64_t rnd2 = V8::RandomPrivate(isolate); uint64_t rnd2 = V8::RandomPrivate(isolate);
uint64_t raw_addr = (rnd1 << 32) ^ rnd2; uint64_t raw_addr = (rnd1 << 32) ^ rnd2;
...@@ -182,7 +184,7 @@ void* OS::GetRandomMmapAddr() { ...@@ -182,7 +184,7 @@ void* OS::GetRandomMmapAddr() {
raw_addr &= 0x3ffff000; raw_addr &= 0x3ffff000;
#if V8_OS_SOLARIS # ifdef __sun
// For our Solaris/illumos mmap hint, we pick a random address in the bottom // For our Solaris/illumos mmap hint, we pick a random address in the bottom
// half of the top half of the address space (that is, the third quarter). // half of the top half of the address space (that is, the third quarter).
// Because we do not MAP_FIXED, this will be treated only as a hint -- the // Because we do not MAP_FIXED, this will be treated only as a hint -- the
...@@ -193,13 +195,13 @@ void* OS::GetRandomMmapAddr() { ...@@ -193,13 +195,13 @@ void* OS::GetRandomMmapAddr() {
// no hint at all. The high hint prevents the break from getting hemmed in // no hint at all. The high hint prevents the break from getting hemmed in
// at low values, ceding half of the address space to the system heap. // at low values, ceding half of the address space to the system heap.
raw_addr += 0x80000000; raw_addr += 0x80000000;
#else # else
// The range 0x20000000 - 0x60000000 is relatively unpopulated across a // The range 0x20000000 - 0x60000000 is relatively unpopulated across a
// variety of ASLR modes (PAE kernel, NX compat mode, etc) and on macos // variety of ASLR modes (PAE kernel, NX compat mode, etc) and on macos
// 10.6 and 10.7. // 10.6 and 10.7.
raw_addr += 0x20000000; raw_addr += 0x20000000;
#endif // V8_OS_SOLARIS # endif
#endif // V8_HOST_ARCH_64_BIT #endif
return reinterpret_cast<void*>(raw_addr); return reinterpret_cast<void*>(raw_addr);
} }
return NULL; return NULL;
...@@ -237,11 +239,11 @@ void OS::DebugBreak() { ...@@ -237,11 +239,11 @@ void OS::DebugBreak() {
#elif V8_HOST_ARCH_MIPS #elif V8_HOST_ARCH_MIPS
asm("break"); asm("break");
#elif V8_HOST_ARCH_IA32 #elif V8_HOST_ARCH_IA32
#if V8_OS_NACL #if defined(__native_client__)
asm("hlt"); asm("hlt");
#else #else
asm("int $3"); asm("int $3");
#endif // V8_OS_NACL #endif // __native_client__
#elif V8_HOST_ARCH_X64 #elif V8_HOST_ARCH_X64
asm("int $3"); asm("int $3");
#else #else
...@@ -384,7 +386,7 @@ void OS::Print(const char* format, ...) { ...@@ -384,7 +386,7 @@ void OS::Print(const char* format, ...) {
void OS::VPrint(const char* format, va_list args) { void OS::VPrint(const char* format, va_list args) {
#if V8_OS_ANDROID && !defined(V8_ANDROID_LOG_STDOUT) #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
__android_log_vprint(ANDROID_LOG_INFO, LOG_TAG, format, args); __android_log_vprint(ANDROID_LOG_INFO, LOG_TAG, format, args);
#else #else
vprintf(format, args); vprintf(format, args);
...@@ -401,7 +403,7 @@ void OS::FPrint(FILE* out, const char* format, ...) { ...@@ -401,7 +403,7 @@ void OS::FPrint(FILE* out, const char* format, ...) {
void OS::VFPrint(FILE* out, const char* format, va_list args) { void OS::VFPrint(FILE* out, const char* format, va_list args) {
#if V8_OS_ANDROID && !defined(V8_ANDROID_LOG_STDOUT) #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
__android_log_vprint(ANDROID_LOG_INFO, LOG_TAG, format, args); __android_log_vprint(ANDROID_LOG_INFO, LOG_TAG, format, args);
#else #else
vfprintf(out, format, args); vfprintf(out, format, args);
...@@ -418,7 +420,7 @@ void OS::PrintError(const char* format, ...) { ...@@ -418,7 +420,7 @@ void OS::PrintError(const char* format, ...) {
void OS::VPrintError(const char* format, va_list args) { void OS::VPrintError(const char* format, va_list args) {
#if V8_OS_ANDROID && !defined(V8_ANDROID_LOG_STDOUT) #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
__android_log_vprint(ANDROID_LOG_ERROR, LOG_TAG, format, args); __android_log_vprint(ANDROID_LOG_ERROR, LOG_TAG, format, args);
#else #else
vfprintf(stderr, format, args); vfprintf(stderr, format, args);
...@@ -470,7 +472,7 @@ void OS::MemMove(void* dest, const void* src, size_t size) { ...@@ -470,7 +472,7 @@ void OS::MemMove(void* dest, const void* src, size_t size) {
(*memmove_function)(dest, src, size); (*memmove_function)(dest, src, size);
} }
#elif V8_HOST_ARCH_ARM #elif defined(V8_HOST_ARCH_ARM)
void OS::MemCopyUint16Uint8Wrapper(uint16_t* dest, void OS::MemCopyUint16Uint8Wrapper(uint16_t* dest,
const uint8_t* src, const uint8_t* src,
size_t chars) { size_t chars) {
...@@ -498,7 +500,7 @@ void OS::PostSetUp() { ...@@ -498,7 +500,7 @@ void OS::PostSetUp() {
if (generated_memmove != NULL) { if (generated_memmove != NULL) {
memmove_function = generated_memmove; memmove_function = generated_memmove;
} }
#elif V8_HOST_ARCH_ARM #elif defined(V8_HOST_ARCH_ARM)
OS::memcopy_uint8_function = OS::memcopy_uint8_function =
CreateMemCopyUint8Function(&OS::MemCopyUint8Wrapper); CreateMemCopyUint8Function(&OS::MemCopyUint8Wrapper);
OS::memcopy_uint16_uint8_function = OS::memcopy_uint16_uint8_function =
...@@ -551,12 +553,12 @@ Thread::~Thread() { ...@@ -551,12 +553,12 @@ Thread::~Thread() {
static void SetThreadName(const char* name) { static void SetThreadName(const char* name) {
#if V8_OS_FREEBSD || V8_OS_OPENBSD #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
pthread_set_name_np(pthread_self(), name); pthread_set_name_np(pthread_self(), name);
#elif V8_OS_NETBSD #elif defined(__NetBSD__)
STATIC_ASSERT(Thread::kMaxThreadNameLength <= PTHREAD_MAX_NAMELEN_NP); STATIC_ASSERT(Thread::kMaxThreadNameLength <= PTHREAD_MAX_NAMELEN_NP);
pthread_setname_np(pthread_self(), "%s", name); pthread_setname_np(pthread_self(), "%s", name);
#elif V8_OS_DARWIN #elif defined(__APPLE__)
// pthread_setname_np is only available in 10.6 or later, so test // pthread_setname_np is only available in 10.6 or later, so test
// for it at runtime. // for it at runtime.
int (*dynamic_pthread_setname_np)(const char*); int (*dynamic_pthread_setname_np)(const char*);
...@@ -603,7 +605,7 @@ void Thread::Start() { ...@@ -603,7 +605,7 @@ void Thread::Start() {
result = pthread_attr_init(&attr); result = pthread_attr_init(&attr);
ASSERT_EQ(0, result); ASSERT_EQ(0, result);
// Native client uses default stack size. // Native client uses default stack size.
#if !V8_OS_NACL #if !defined(__native_client__)
if (stack_size_ > 0) { if (stack_size_ > 0) {
result = pthread_attr_setstacksize(&attr, static_cast<size_t>(stack_size_)); result = pthread_attr_setstacksize(&attr, static_cast<size_t>(stack_size_));
ASSERT_EQ(0, result); ASSERT_EQ(0, result);
...@@ -631,7 +633,7 @@ void Thread::YieldCPU() { ...@@ -631,7 +633,7 @@ void Thread::YieldCPU() {
static Thread::LocalStorageKey PthreadKeyToLocalKey(pthread_key_t pthread_key) { static Thread::LocalStorageKey PthreadKeyToLocalKey(pthread_key_t pthread_key) {
#if V8_OS_CYGWIN #if defined(__CYGWIN__)
// We need to cast pthread_key_t to Thread::LocalStorageKey in two steps // We need to cast pthread_key_t to Thread::LocalStorageKey in two steps
// because pthread_key_t is a pointer type on Cygwin. This will probably not // because pthread_key_t is a pointer type on Cygwin. This will probably not
// work on 64-bit platforms, but Cygwin doesn't support 64-bit anyway. // work on 64-bit platforms, but Cygwin doesn't support 64-bit anyway.
...@@ -645,7 +647,7 @@ static Thread::LocalStorageKey PthreadKeyToLocalKey(pthread_key_t pthread_key) { ...@@ -645,7 +647,7 @@ static Thread::LocalStorageKey PthreadKeyToLocalKey(pthread_key_t pthread_key) {
static pthread_key_t LocalKeyToPthreadKey(Thread::LocalStorageKey local_key) { static pthread_key_t LocalKeyToPthreadKey(Thread::LocalStorageKey local_key) {
#if V8_OS_CYGWIN #if defined(__CYGWIN__)
STATIC_ASSERT(sizeof(Thread::LocalStorageKey) == sizeof(pthread_key_t)); STATIC_ASSERT(sizeof(Thread::LocalStorageKey) == sizeof(pthread_key_t));
intptr_t ptr_key = static_cast<intptr_t>(local_key); intptr_t ptr_key = static_cast<intptr_t>(local_key);
return reinterpret_cast<pthread_key_t>(ptr_key); return reinterpret_cast<pthread_key_t>(ptr_key);
......
src/platform-posix.h
View file @ e3901e91
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
#ifndef V8_PLATFORM_POSIX_H_ #ifndef V8_PLATFORM_POSIX_H_
#define V8_PLATFORM_POSIX_H_ #define V8_PLATFORM_POSIX_H_
#include "platform.h" #if !defined(ANDROID)
#if !V8_OS_ANDROID
#include <cxxabi.h> #include <cxxabi.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include "platform.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -58,7 +58,7 @@ struct POSIXBacktraceHelper { ...@@ -58,7 +58,7 @@ struct POSIXBacktraceHelper {
char mangled[201]; char mangled[201];
if (sscanf(symbols[i], "%*[^(]%*[(]%200[^)+]", mangled) == 1) {// NOLINT if (sscanf(symbols[i], "%*[^(]%*[(]%200[^)+]", mangled) == 1) {// NOLINT
char* demangled = NULL; char* demangled = NULL;
#if !V8_OS_ANDROID #if !defined(ANDROID)
int status; int status;
size_t length; size_t length;
demangled = abi::__cxa_demangle(mangled, NULL, &length, &status); demangled = abi::__cxa_demangle(mangled, NULL, &length, &status);
......
src/platform-win32.cc
View file @ e3901e91
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include "simulator.h" #include "simulator.h"
#include "vm-state-inl.h" #include "vm-state-inl.h"
#if V8_CC_MSVC #ifdef _MSC_VER
// Case-insensitive bounded string comparisons. Use stricmp() on Win32. Usually // Case-insensitive bounded string comparisons. Use stricmp() on Win32. Usually
// defined in strings.h. // defined in strings.h.
...@@ -56,7 +56,7 @@ int strncasecmp(const char* s1, const char* s2, int n) { ...@@ -56,7 +56,7 @@ int strncasecmp(const char* s1, const char* s2, int n) {
return _strnicmp(s1, s2, n); return _strnicmp(s1, s2, n);
} }
#endif // V8_CC_MSVC #endif // _MSC_VER
// Extra functions for MinGW. Most of these are the _s functions which are in // Extra functions for MinGW. Most of these are the _s functions which are in
...@@ -169,7 +169,7 @@ void OS::MemMove(void* dest, const void* src, size_t size) { ...@@ -169,7 +169,7 @@ void OS::MemMove(void* dest, const void* src, size_t size) {
#endif // V8_TARGET_ARCH_IA32 #endif // V8_TARGET_ARCH_IA32
#if V8_OS_WIN64 #ifdef _WIN64
typedef double (*ModuloFunction)(double, double); typedef double (*ModuloFunction)(double, double);
static ModuloFunction modulo_function = NULL; static ModuloFunction modulo_function = NULL;
// Defined in codegen-x64.cc. // Defined in codegen-x64.cc.
...@@ -185,7 +185,8 @@ double modulo(double x, double y) { ...@@ -185,7 +185,8 @@ double modulo(double x, double y) {
// on all architectures we currently support. // on all architectures we currently support.
return (*modulo_function)(x, y); return (*modulo_function)(x, y);
} }
#else #else // Win32
double modulo(double x, double y) { double modulo(double x, double y) {
// Workaround MS fmod bugs. ECMA-262 says: // Workaround MS fmod bugs. ECMA-262 says:
// dividend is finite and divisor is an infinity => result equals dividend // dividend is finite and divisor is an infinity => result equals dividend
...@@ -196,7 +197,8 @@ double modulo(double x, double y) { ...@@ -196,7 +197,8 @@ double modulo(double x, double y) {
} }
return x; return x;
} }
#endif // V8_OS_WIN64
#endif // _WIN64
#define UNARY_MATH_FUNCTION(name, generator) \ #define UNARY_MATH_FUNCTION(name, generator) \
...@@ -226,7 +228,7 @@ void lazily_initialize_fast_exp() { ...@@ -226,7 +228,7 @@ void lazily_initialize_fast_exp() {
void MathSetup() { void MathSetup() {
#if V8_OS_WIN64 #ifdef _WIN64
init_modulo_function(); init_modulo_function();
#endif #endif
init_fast_sin_function(); init_fast_sin_function();
...@@ -1007,11 +1009,11 @@ void OS::Abort() { ...@@ -1007,11 +1009,11 @@ void OS::Abort() {
void OS::DebugBreak() { void OS::DebugBreak() {
#if V8_CC_MSVC #ifdef _MSC_VER
__debugbreak(); __debugbreak();
#else #else
::DebugBreak(); ::DebugBreak();
#endif // V8_CC_MSVC #endif
} }
...@@ -1359,7 +1361,7 @@ int OS::StackWalk(Vector<OS::StackFrame> frames) { ...@@ -1359,7 +1361,7 @@ int OS::StackWalk(Vector<OS::StackFrame> frames) {
// Initialize the stack walking // Initialize the stack walking
STACKFRAME64 stack_frame; STACKFRAME64 stack_frame;
memset(&stack_frame, 0, sizeof(stack_frame)); memset(&stack_frame, 0, sizeof(stack_frame));
#if V8_OS_WIN64 #ifdef _WIN64
stack_frame.AddrPC.Offset = context.Rip; stack_frame.AddrPC.Offset = context.Rip;
stack_frame.AddrFrame.Offset = context.Rbp; stack_frame.AddrFrame.Offset = context.Rbp;
stack_frame.AddrStack.Offset = context.Rsp; stack_frame.AddrStack.Offset = context.Rsp;
...@@ -1468,21 +1470,21 @@ uint64_t OS::CpuFeaturesImpliedByPlatform() { ...@@ -1468,21 +1470,21 @@ uint64_t OS::CpuFeaturesImpliedByPlatform() {
double OS::nan_value() { double OS::nan_value() {
#if V8_CC_MSVC #ifdef _MSC_VER
// Positive Quiet NaN with no payload (aka. Indeterminate) has all bits // Positive Quiet NaN with no payload (aka. Indeterminate) has all bits
// in mask set, so value equals mask. // in mask set, so value equals mask.
static const __int64 nanval = kQuietNaNMask; static const __int64 nanval = kQuietNaNMask;
return *reinterpret_cast<const double*>(&nanval); return *reinterpret_cast<const double*>(&nanval);
#else // V8_CC_MSVC #else // _MSC_VER
return NAN; return NAN;
#endif // V8_CC_MSVC #endif // _MSC_VER
} }
int OS::ActivationFrameAlignment() { int OS::ActivationFrameAlignment() {
#if V8_OS__WIN64 #ifdef _WIN64
return 16; // Windows 64-bit ABI requires the stack to be 16-byte aligned. return 16; // Windows 64-bit ABI requires the stack to be 16-byte aligned.
#elif V8_CC_MINGW #elif defined(__MINGW32__)
// With gcc 4.4 the tree vectorization optimizer can generate code // With gcc 4.4 the tree vectorization optimizer can generate code
// that requires 16 byte alignment such as movdqa on x86. // that requires 16 byte alignment such as movdqa on x86.
return 16; return 16;
......
src/platform.h
View file @ e3901e91
...@@ -44,8 +44,6 @@ ...@@ -44,8 +44,6 @@
#ifndef V8_PLATFORM_H_ #ifndef V8_PLATFORM_H_
#define V8_PLATFORM_H_ #define V8_PLATFORM_H_
#include <stdarg.h>
#ifdef __sun #ifdef __sun
# ifndef signbit # ifndef signbit
namespace std { namespace std {
...@@ -54,6 +52,16 @@ int signbit(double x); ...@@ -54,6 +52,16 @@ int signbit(double x);
# endif # endif
#endif #endif
// GCC specific stuff
#ifdef __GNUC__
// Needed for va_list on at least MinGW and Android.
#include <stdarg.h>
#define __GNUC_VERSION__ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100)
#endif // __GNUC__
// Windows specific stuff. // Windows specific stuff.
#ifdef WIN32 #ifdef WIN32
...@@ -124,7 +132,7 @@ class Socket; ...@@ -124,7 +132,7 @@ class Socket;
#ifndef V8_NO_FAST_TLS #ifndef V8_NO_FAST_TLS
#if V8_CC_MSVC && V8_HOST_ARCH_IA32 #if defined(_MSC_VER) && V8_HOST_ARCH_IA32
#define V8_FAST_TLS_SUPPORTED 1 #define V8_FAST_TLS_SUPPORTED 1
...@@ -146,7 +154,7 @@ inline intptr_t InternalGetExistingThreadLocal(intptr_t index) { ...@@ -146,7 +154,7 @@ inline intptr_t InternalGetExistingThreadLocal(intptr_t index) {
kPointerSize * (index - kMaxInlineSlots)); kPointerSize * (index - kMaxInlineSlots));
} }
#elif V8_OS_DARWIN && (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64) #elif defined(__APPLE__) && (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64)
#define V8_FAST_TLS_SUPPORTED 1 #define V8_FAST_TLS_SUPPORTED 1
...@@ -377,7 +385,7 @@ class OS { ...@@ -377,7 +385,7 @@ class OS {
// the platform doesn't care. Guaranteed to be a power of two. // the platform doesn't care. Guaranteed to be a power of two.
static int ActivationFrameAlignment(); static int ActivationFrameAlignment();
#if V8_TARGET_ARCH_IA32 #if defined(V8_TARGET_ARCH_IA32)
// Limit below which the extra overhead of the MemCopy function is likely // Limit below which the extra overhead of the MemCopy function is likely
// to outweigh the benefits of faster copying. // to outweigh the benefits of faster copying.
static const int kMinComplexMemCopy = 64; static const int kMinComplexMemCopy = 64;
...@@ -391,7 +399,7 @@ class OS { ...@@ -391,7 +399,7 @@ class OS {
static void MemCopy(void* dest, const void* src, size_t size) { static void MemCopy(void* dest, const void* src, size_t size) {
MemMove(dest, src, size); MemMove(dest, src, size);
} }
#elif V8_HOST_ARCH_ARM #elif defined(V8_HOST_ARCH_ARM)
typedef void (*MemCopyUint8Function)(uint8_t* dest, typedef void (*MemCopyUint8Function)(uint8_t* dest,
const uint8_t* src, const uint8_t* src,
size_t size); size_t size);
......
src/preparser.cc
View file @ e3901e91
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "unicode.h" #include "unicode.h"
#include "utils.h" #include "utils.h"
#if V8_CC_MSVC #ifdef _MSC_VER
namespace std { namespace std {
// Usually defined in math.h, but not in MSVC. // Usually defined in math.h, but not in MSVC.
......
src/sampler.cc
View file @ e3901e91
...@@ -27,11 +27,9 @@ ...@@ -27,11 +27,9 @@
#include "sampler.h" #include "sampler.h"
#if V8_OS_DARWIN #if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) \
|| defined(__NetBSD__) || defined(__sun) || defined(__ANDROID__) \
#include <mach/mach.h> || defined(__native_client__)
#elif V8_OS_UNIX && !V8_OS_CYGWIN
#define USE_SIGNALS #define USE_SIGNALS
...@@ -40,19 +38,23 @@ ...@@ -40,19 +38,23 @@
#include <signal.h> #include <signal.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#if !V8_OS_ANDROID || defined(__BIONIC_HAVE_UCONTEXT_T) #if !defined(__ANDROID__) || defined(__BIONIC_HAVE_UCONTEXT_T)
#include <ucontext.h> #include <ucontext.h>
#endif #endif
#include <unistd.h> #include <unistd.h>
// GLibc on ARM defines mcontext_t has a typedef for 'struct sigcontext'. // 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. // Old versions of the C library <signal.h> didn't define the type.
#if V8_OS_ANDROID && !defined(__BIONIC_HAVE_UCONTEXT_T) && \ #if defined(__ANDROID__) && !defined(__BIONIC_HAVE_UCONTEXT_T) && \
V8_HOST_ARCH_ARM && !defined(__BIONIC_HAVE_STRUCT_SIGCONTEXT) defined(__arm__) && !defined(__BIONIC_HAVE_STRUCT_SIGCONTEXT)
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#endif #endif
#elif V8_OS_CYGWIN || V8_OS_WIN32 #elif defined(__MACH__)
#include <mach/mach.h>
#elif defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
#include "win32-headers.h" #include "win32-headers.h"
...@@ -70,7 +72,7 @@ ...@@ -70,7 +72,7 @@
#include "vm-state-inl.h" #include "vm-state-inl.h"
#if V8_OS_ANDROID && !defined(__BIONIC_HAVE_UCONTEXT_T) #if defined(__ANDROID__) && !defined(__BIONIC_HAVE_UCONTEXT_T)
// Not all versions of Android's C library provide ucontext_t. // Not all versions of Android's C library provide ucontext_t.
// Detect this and provide custom but compatible definitions. Note that these // Detect this and provide custom but compatible definitions. Note that these
...@@ -79,7 +81,7 @@ ...@@ -79,7 +81,7 @@
// //
// See http://code.google.com/p/android/issues/detail?id=34784 // See http://code.google.com/p/android/issues/detail?id=34784
#if V8_HOST_ARCH_ARM #if defined(__arm__)
typedef struct sigcontext mcontext_t; typedef struct sigcontext mcontext_t;
...@@ -91,7 +93,7 @@ typedef struct ucontext { ...@@ -91,7 +93,7 @@ typedef struct ucontext {
// Other fields are not used by V8, don't define them here. // Other fields are not used by V8, don't define them here.
} ucontext_t; } ucontext_t;
#elif V8_HOST_ARCH_MIPS #elif defined(__mips__)
// MIPS version of sigcontext, for Android bionic. // MIPS version of sigcontext, for Android bionic.
typedef struct { typedef struct {
uint32_t regmask; uint32_t regmask;
...@@ -122,7 +124,7 @@ typedef struct ucontext { ...@@ -122,7 +124,7 @@ typedef struct ucontext {
// Other fields are not used by V8, don't define them here. // Other fields are not used by V8, don't define them here.
} ucontext_t; } ucontext_t;
#elif V8_HOST_ARCH_IA32 #elif defined(__i386__)
// x86 version for Android. // x86 version for Android.
typedef struct { typedef struct {
uint32_t gregs[19]; uint32_t gregs[19];
...@@ -142,7 +144,7 @@ typedef struct ucontext { ...@@ -142,7 +144,7 @@ typedef struct ucontext {
enum { REG_EBP = 6, REG_ESP = 7, REG_EIP = 14 }; enum { REG_EBP = 6, REG_ESP = 7, REG_EIP = 14 };
#endif #endif
#endif // V8_OS_ANDROID && !defined(__BIONIC_HAVE_UCONTEXT_T) #endif // __ANDROID__ && !defined(__BIONIC_HAVE_UCONTEXT_T)
namespace v8 { namespace v8 {
...@@ -175,7 +177,7 @@ class Sampler::PlatformData : public PlatformDataCommon { ...@@ -175,7 +177,7 @@ class Sampler::PlatformData : public PlatformDataCommon {
pthread_t vm_tid_; pthread_t vm_tid_;
}; };
#elif V8_OS_DARWIN #elif defined(__MACH__)
class Sampler::PlatformData : public PlatformDataCommon { class Sampler::PlatformData : public PlatformDataCommon {
public: public:
...@@ -195,7 +197,7 @@ class Sampler::PlatformData : public PlatformDataCommon { ...@@ -195,7 +197,7 @@ class Sampler::PlatformData : public PlatformDataCommon {
thread_act_t profiled_thread_; thread_act_t profiled_thread_;
}; };
#elif V8_OS_CYGWIN || V8_OS_WIN32 #elif defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Win32 profiler support. On Cygwin we use the same sampler implementation as // Win32 profiler support. On Cygwin we use the same sampler implementation as
...@@ -299,7 +301,7 @@ bool SignalHandler::signal_handler_installed_ = false; ...@@ -299,7 +301,7 @@ bool SignalHandler::signal_handler_installed_ = false;
void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info, void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info,
void* context) { void* context) {
#if V8_OS_NACL #if defined(__native_client__)
// As Native Client does not support signal handling, profiling // As Native Client does not support signal handling, profiling
// is disabled. // is disabled.
return; return;
...@@ -329,7 +331,7 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info, ...@@ -329,7 +331,7 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info,
// Extracting the sample from the context is extremely machine dependent. // Extracting the sample from the context is extremely machine dependent.
ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context); ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
mcontext_t& mcontext = ucontext->uc_mcontext; mcontext_t& mcontext = ucontext->uc_mcontext;
#if V8_OS_LINUX #if defined(__linux__) || defined(__ANDROID__)
#if V8_HOST_ARCH_IA32 #if V8_HOST_ARCH_IA32
state.pc = reinterpret_cast<Address>(mcontext.gregs[REG_EIP]); state.pc = reinterpret_cast<Address>(mcontext.gregs[REG_EIP]);
state.sp = reinterpret_cast<Address>(mcontext.gregs[REG_ESP]); state.sp = reinterpret_cast<Address>(mcontext.gregs[REG_ESP]);
...@@ -357,7 +359,7 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info, ...@@ -357,7 +359,7 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info,
state.sp = reinterpret_cast<Address>(mcontext.gregs[29]); state.sp = reinterpret_cast<Address>(mcontext.gregs[29]);
state.fp = reinterpret_cast<Address>(mcontext.gregs[30]); state.fp = reinterpret_cast<Address>(mcontext.gregs[30]);
#endif // V8_HOST_ARCH_* #endif // V8_HOST_ARCH_*
#elif V8_OS_FREEBSD #elif defined(__FreeBSD__)
#if V8_HOST_ARCH_IA32 #if V8_HOST_ARCH_IA32
state.pc = reinterpret_cast<Address>(mcontext.mc_eip); state.pc = reinterpret_cast<Address>(mcontext.mc_eip);
state.sp = reinterpret_cast<Address>(mcontext.mc_esp); state.sp = reinterpret_cast<Address>(mcontext.mc_esp);
...@@ -371,7 +373,7 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info, ...@@ -371,7 +373,7 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info,
state.sp = reinterpret_cast<Address>(mcontext.mc_r13); state.sp = reinterpret_cast<Address>(mcontext.mc_r13);
state.fp = reinterpret_cast<Address>(mcontext.mc_r11); state.fp = reinterpret_cast<Address>(mcontext.mc_r11);
#endif // V8_HOST_ARCH_* #endif // V8_HOST_ARCH_*
#elif V8_OS_NETBSD #elif defined(__NetBSD__)
#if V8_HOST_ARCH_IA32 #if V8_HOST_ARCH_IA32
state.pc = reinterpret_cast<Address>(mcontext.__gregs[_REG_EIP]); state.pc = reinterpret_cast<Address>(mcontext.__gregs[_REG_EIP]);
state.sp = reinterpret_cast<Address>(mcontext.__gregs[_REG_ESP]); state.sp = reinterpret_cast<Address>(mcontext.__gregs[_REG_ESP]);
...@@ -381,7 +383,7 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info, ...@@ -381,7 +383,7 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info,
state.sp = reinterpret_cast<Address>(mcontext.__gregs[_REG_RSP]); state.sp = reinterpret_cast<Address>(mcontext.__gregs[_REG_RSP]);
state.fp = reinterpret_cast<Address>(mcontext.__gregs[_REG_RBP]); state.fp = reinterpret_cast<Address>(mcontext.__gregs[_REG_RBP]);
#endif // V8_HOST_ARCH_* #endif // V8_HOST_ARCH_*
#elif V8_OS_OPENBSD #elif defined(__OpenBSD__)
USE(mcontext); USE(mcontext);
#if V8_HOST_ARCH_IA32 #if V8_HOST_ARCH_IA32
state.pc = reinterpret_cast<Address>(ucontext->sc_eip); state.pc = reinterpret_cast<Address>(ucontext->sc_eip);
...@@ -392,11 +394,11 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info, ...@@ -392,11 +394,11 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info,
state.sp = reinterpret_cast<Address>(ucontext->sc_rsp); state.sp = reinterpret_cast<Address>(ucontext->sc_rsp);
state.fp = reinterpret_cast<Address>(ucontext->sc_rbp); state.fp = reinterpret_cast<Address>(ucontext->sc_rbp);
#endif // V8_HOST_ARCH_* #endif // V8_HOST_ARCH_*
#elif V8_OS_SOLARIS #elif defined(__sun)
state.pc = reinterpret_cast<Address>(mcontext.gregs[REG_PC]); state.pc = reinterpret_cast<Address>(mcontext.gregs[REG_PC]);
state.sp = reinterpret_cast<Address>(mcontext.gregs[REG_SP]); state.sp = reinterpret_cast<Address>(mcontext.gregs[REG_SP]);
state.fp = reinterpret_cast<Address>(mcontext.gregs[REG_FP]); state.fp = reinterpret_cast<Address>(mcontext.gregs[REG_FP]);
#endif // V8_OS_SOLARIS #endif // __sun
#endif // USE_SIMULATOR #endif // USE_SIMULATOR
sampler->SampleStack(state); sampler->SampleStack(state);
#endif // __native_client__ #endif // __native_client__
...@@ -491,7 +493,7 @@ class SamplerThread : public Thread { ...@@ -491,7 +493,7 @@ class SamplerThread : public Thread {
pthread_kill(tid, SIGPROF); pthread_kill(tid, SIGPROF);
} }
#elif V8_OS_DARWIN #elif defined(__MACH__)
void SampleContext(Sampler* sampler) { void SampleContext(Sampler* sampler) {
thread_act_t profiled_thread = sampler->platform_data()->profiled_thread(); thread_act_t profiled_thread = sampler->platform_data()->profiled_thread();
...@@ -544,7 +546,7 @@ class SamplerThread : public Thread { ...@@ -544,7 +546,7 @@ class SamplerThread : public Thread {
thread_resume(profiled_thread); thread_resume(profiled_thread);
} }
#elif V8_OS_CYGWIN || V8_OS_WIN32 #elif defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
void SampleContext(Sampler* sampler) { void SampleContext(Sampler* sampler) {
HANDLE profiled_thread = sampler->platform_data()->profiled_thread(); HANDLE profiled_thread = sampler->platform_data()->profiled_thread();
......
src/snapshot-common.cc
View file @ e3901e91
...@@ -47,7 +47,7 @@ static void ReserveSpaceForSnapshot(Deserializer* deserializer, ...@@ -47,7 +47,7 @@ static void ReserveSpaceForSnapshot(Deserializer* deserializer,
CHECK_NE(NULL, fp); CHECK_NE(NULL, fp);
int new_size, pointer_size, data_size, code_size, map_size, cell_size, int new_size, pointer_size, data_size, code_size, map_size, cell_size,
property_cell_size; property_cell_size;
#if V8_CC_MSVC #ifdef _MSC_VER
// Avoid warning about unsafe fscanf from MSVC. // Avoid warning about unsafe fscanf from MSVC.
// Please note that this is only fine if %c and %s are not being used. // Please note that this is only fine if %c and %s are not being used.
#define fscanf fscanf_s #define fscanf fscanf_s
...@@ -59,7 +59,7 @@ static void ReserveSpaceForSnapshot(Deserializer* deserializer, ...@@ -59,7 +59,7 @@ static void ReserveSpaceForSnapshot(Deserializer* deserializer,
CHECK_EQ(1, fscanf(fp, "map %d\n", &map_size)); CHECK_EQ(1, fscanf(fp, "map %d\n", &map_size));
CHECK_EQ(1, fscanf(fp, "cell %d\n", &cell_size)); CHECK_EQ(1, fscanf(fp, "cell %d\n", &cell_size));
CHECK_EQ(1, fscanf(fp, "property cell %d\n", &property_cell_size)); CHECK_EQ(1, fscanf(fp, "property cell %d\n", &property_cell_size));
#if V8_CC_MSVC #ifdef _MSC_VER
#undef fscanf #undef fscanf
#endif #endif
fclose(fp); fclose(fp);
......
src/strtod.cc
View file @ e3901e91
...@@ -176,7 +176,7 @@ static void ReadDiyFp(Vector<const char> buffer, ...@@ -176,7 +176,7 @@ static void ReadDiyFp(Vector<const char> buffer,
static bool DoubleStrtod(Vector<const char> trimmed, static bool DoubleStrtod(Vector<const char> trimmed,
int exponent, int exponent,
double* result) { double* result) {
#if (V8_TARGET_ARCH_IA32 || defined(USE_SIMULATOR)) && !V8_CC_MSVC #if (V8_TARGET_ARCH_IA32 || defined(USE_SIMULATOR)) && !defined(_MSC_VER)
// On x86 the floating-point stack can be 64 or 80 bits wide. If it is // On x86 the floating-point stack can be 64 or 80 bits wide. If it is
// 80 bits wide (as is the case on Linux) then double-rounding occurs and the // 80 bits wide (as is the case on Linux) then double-rounding occurs and the
// result is not accurate. // result is not accurate.
......
src/v8utils.h
View file @ e3901e91
...@@ -37,11 +37,11 @@ namespace internal { ...@@ -37,11 +37,11 @@ namespace internal {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// I/O support. // I/O support.
#if V8_GNUC_PREREQ(4, 0) #if __GNUC__ >= 4
// On gcc we can ask the compiler to check the types of %d-style format // On gcc we can ask the compiler to check the types of %d-style format
// specifiers and their associated arguments. TODO(erikcorry) fix this // specifiers and their associated arguments. TODO(erikcorry) fix this
// so it works on MacOSX. // so it works on MacOSX.
#if V8_OS_DARWIN #if defined(__MACH__) && defined(__APPLE__)
#define PRINTF_CHECKING #define PRINTF_CHECKING
#define FPRINTF_CHECKING #define FPRINTF_CHECKING
#else // MacOsX. #else // MacOsX.
...@@ -262,7 +262,7 @@ inline void MemsetPointer(T** dest, U* value, int counter) { ...@@ -262,7 +262,7 @@ inline void MemsetPointer(T** dest, U* value, int counter) {
#elif V8_HOST_ARCH_X64 #elif V8_HOST_ARCH_X64
#define STOS "stosq" #define STOS "stosq"
#endif #endif
#if V8_OS_NACL #if defined(__native_client__)
// This STOS sequence does not validate for x86_64 Native Client. // This STOS sequence does not validate for x86_64 Native Client.
// Here we #undef STOS to force use of the slower C version. // Here we #undef STOS to force use of the slower C version.
// TODO(bradchen): Profile V8 and implement a faster REP STOS // TODO(bradchen): Profile V8 and implement a faster REP STOS
...@@ -270,7 +270,7 @@ inline void MemsetPointer(T** dest, U* value, int counter) { ...@@ -270,7 +270,7 @@ inline void MemsetPointer(T** dest, U* value, int counter) {
#undef STOS #undef STOS
#endif #endif
#if V8_CC_GNU && defined(STOS) #if defined(__GNUC__) && defined(STOS)
asm volatile( asm volatile(
"cld;" "cld;"
"rep ; " STOS "rep ; " STOS
...@@ -317,7 +317,7 @@ template <typename sourcechar, typename sinkchar> ...@@ -317,7 +317,7 @@ template <typename sourcechar, typename sinkchar>
INLINE(static void CopyCharsUnsigned(sinkchar* dest, INLINE(static void CopyCharsUnsigned(sinkchar* dest,
const sourcechar* src, const sourcechar* src,
int chars)); int chars));
#if V8_HOST_ARCH_ARM #if defined(V8_HOST_ARCH_ARM)
INLINE(void CopyCharsUnsigned(uint8_t* dest, const uint8_t* src, int chars)); INLINE(void CopyCharsUnsigned(uint8_t* dest, const uint8_t* src, int chars));
INLINE(void CopyCharsUnsigned(uint16_t* dest, const uint8_t* src, int chars)); INLINE(void CopyCharsUnsigned(uint16_t* dest, const uint8_t* src, int chars));
INLINE(void CopyCharsUnsigned(uint16_t* dest, const uint16_t* src, int chars)); INLINE(void CopyCharsUnsigned(uint16_t* dest, const uint16_t* src, int chars));
...@@ -380,7 +380,7 @@ void CopyCharsUnsigned(sinkchar* dest, const sourcechar* src, int chars) { ...@@ -380,7 +380,7 @@ void CopyCharsUnsigned(sinkchar* dest, const sourcechar* src, int chars) {
} }
#if V8_HOST_ARCH_ARM #if defined(V8_HOST_ARCH_ARM)
void CopyCharsUnsigned(uint8_t* dest, const uint8_t* src, int chars) { void CopyCharsUnsigned(uint8_t* dest, const uint8_t* src, int chars) {
switch (static_cast<unsigned>(chars)) { switch (static_cast<unsigned>(chars)) {
case 0: case 0:
......
test/cctest/test-assembler-ia32.cc
View file @ e3901e91
...@@ -473,7 +473,7 @@ TEST(AssemblerMultiByteNop) { ...@@ -473,7 +473,7 @@ TEST(AssemblerMultiByteNop) {
} }
#if V8_CC_GNU #ifdef __GNUC__
#define ELEMENT_COUNT 4 #define ELEMENT_COUNT 4
void DoSSE2(const v8::FunctionCallbackInfo<v8::Value>& args) { void DoSSE2(const v8::FunctionCallbackInfo<v8::Value>& args) {
...@@ -561,7 +561,7 @@ TEST(StackAlignmentForSSE2) { ...@@ -561,7 +561,7 @@ TEST(StackAlignmentForSSE2) {
} }
#undef ELEMENT_COUNT #undef ELEMENT_COUNT
#endif // V8_CC_GNU #endif // __GNUC__
#undef __ #undef __
test/cctest/test-assembler-x64.cc
View file @ e3901e91
...@@ -436,7 +436,7 @@ TEST(AssemblerMultiByteNop) { ...@@ -436,7 +436,7 @@ TEST(AssemblerMultiByteNop) {
} }
#if V8_CC_GNU #ifdef __GNUC__
#define ELEMENT_COUNT 4 #define ELEMENT_COUNT 4
void DoSSE2(const v8::FunctionCallbackInfo<v8::Value>& args) { void DoSSE2(const v8::FunctionCallbackInfo<v8::Value>& args) {
...@@ -521,7 +521,7 @@ TEST(StackAlignmentForSSE2) { ...@@ -521,7 +521,7 @@ TEST(StackAlignmentForSSE2) {
} }
#undef ELEMENT_COUNT #undef ELEMENT_COUNT
#endif // V8_CC_GNU #endif // __GNUC__
#undef __ #undef __
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment