| Index: src/isolate.h
|
| diff --git a/src/isolate.h b/src/isolate.h
|
| index 76a5a41e70ab0b32502d10a5c9ed37ad22789985..e95efbb997760a9642eef5f404b3be06b959b3e7 100644
|
| --- a/src/isolate.h
|
| +++ b/src/isolate.h
|
| @@ -101,7 +101,8 @@ class Debugger;
|
| class DebuggerAgent;
|
| #endif
|
|
|
| -#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
|
| +#if !defined(__arm__) && defined(V8_TARGET_ARCH_A64) || \
|
| + !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
|
| !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS)
|
| class Redirection;
|
| class Simulator;
|
| @@ -263,7 +264,8 @@ class ThreadLocalTop BASE_EMBEDDED {
|
| Address handler_; // try-blocks are chained through the stack
|
|
|
| #ifdef USE_SIMULATOR
|
| -#if defined(V8_TARGET_ARCH_ARM) || defined(V8_TARGET_ARCH_MIPS)
|
| +#if defined(V8_TARGET_ARCH_A64) || defined(V8_TARGET_ARCH_ARM) || \
|
| + defined(V8_TARGET_ARCH_MIPS)
|
| Simulator* simulator_;
|
| #endif
|
| #endif // USE_SIMULATOR
|
| @@ -393,7 +395,8 @@ class Isolate {
|
| thread_id_(thread_id),
|
| stack_limit_(0),
|
| thread_state_(NULL),
|
| -#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
|
| +#if !defined(__arm__) && defined(V8_TARGET_ARCH_A64) || \
|
| + !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
|
| !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS)
|
| simulator_(NULL),
|
| #endif
|
| @@ -406,7 +409,8 @@ class Isolate {
|
| ThreadState* thread_state() const { return thread_state_; }
|
| void set_thread_state(ThreadState* value) { thread_state_ = value; }
|
|
|
| -#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
|
| +#if !defined(__arm__) && defined(V8_TARGET_ARCH_A64) || \
|
| + !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
|
| !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS)
|
| Simulator* simulator() const { return simulator_; }
|
| void set_simulator(Simulator* simulator) {
|
| @@ -424,7 +428,8 @@ class Isolate {
|
| uintptr_t stack_limit_;
|
| ThreadState* thread_state_;
|
|
|
| -#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
|
| +#if !defined(__arm__) && defined(V8_TARGET_ARCH_A64) || \
|
| + !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
|
| !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS)
|
| Simulator* simulator_;
|
| #endif
|
| @@ -997,7 +1002,8 @@ class Isolate {
|
| int* code_kind_statistics() { return code_kind_statistics_; }
|
| #endif
|
|
|
| -#if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \
|
| +#if defined(V8_TARGET_ARCH_A64) && !defined(__arm__) || \
|
| + defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \
|
| defined(V8_TARGET_ARCH_MIPS) && !defined(__mips__)
|
| bool simulator_initialized() { return simulator_initialized_; }
|
| void set_simulator_initialized(bool initialized) {
|
| @@ -1295,7 +1301,8 @@ class Isolate {
|
| // Time stamp at initialization.
|
| double time_millis_at_init_;
|
|
|
| -#if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \
|
| +#if defined(V8_TARGET_ARCH_A64) && !defined(__arm__) || \
|
| + defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \
|
| defined(V8_TARGET_ARCH_MIPS) && !defined(__mips__)
|
| bool simulator_initialized_;
|
| HashMap* simulator_i_cache_;
|
|
|