| Index: src/top.cc
|
| diff --git a/src/top.cc b/src/top.cc
|
| index 78db26a50973975caeed7d114c5e48d5c5b130a6..e784b58e9002bb3a70aea172ea41e02fbe4b3ad4 100644
|
| --- a/src/top.cc
|
| +++ b/src/top.cc
|
| @@ -70,12 +70,9 @@ v8::TryCatch* ThreadLocalTop::TryCatchHandler() {
|
| void ThreadLocalTop::Initialize() {
|
| c_entry_fp_ = 0;
|
| handler_ = 0;
|
| -#ifdef USE_SIMULATOR
|
| -#ifdef V8_TARGET_ARCH_ARM
|
| +#if defined(USE_SIMULATOR) && \
|
| + (defined(V8_TARGET_ARCH_ARM) || defined(V8_TARGET_ARCH_MIPS))
|
| simulator_ = Simulator::current();
|
| -#elif V8_TARGET_ARCH_MIPS
|
| - simulator_ = assembler::mips::Simulator::current();
|
| -#endif
|
| #endif
|
| #ifdef ENABLE_LOGGING_AND_PROFILING
|
| js_entry_sp_ = NULL;
|
| @@ -1139,12 +1136,9 @@ char* Top::RestoreThread(char* from) {
|
| memcpy(reinterpret_cast<char*>(&thread_local_), from, sizeof(thread_local_));
|
| // This might be just paranoia, but it seems to be needed in case a
|
| // thread_local_ is restored on a separate OS thread.
|
| -#ifdef USE_SIMULATOR
|
| -#ifdef V8_TARGET_ARCH_ARM
|
| +#if defined(USE_SIMULATOR) && \
|
| + (defined(V8_TARGET_ARCH_ARM) || defined(V8_TARGET_ARCH_MIPS))
|
| thread_local_.simulator_ = Simulator::current();
|
| -#elif V8_TARGET_ARCH_MIPS
|
| - thread_local_.simulator_ = assembler::mips::Simulator::current();
|
| -#endif
|
| #endif
|
| return from + sizeof(thread_local_);
|
| }
|
|
|