| Index: src/ppc/simulator-ppc.cc
|
| diff --git a/src/ppc/simulator-ppc.cc b/src/ppc/simulator-ppc.cc
|
| index 2062bd26af8071bad6d1a3f22b3b37f1b7e5adcc..5e4998610da52af826317fa290106794aee9ef6d 100644
|
| --- a/src/ppc/simulator-ppc.cc
|
| +++ b/src/ppc/simulator-ppc.cc
|
| @@ -445,7 +445,7 @@ void PPCDebugger::Debug() {
|
| reinterpret_cast<intptr_t>(cur), *cur, *cur);
|
| HeapObject* obj = reinterpret_cast<HeapObject*>(*cur);
|
| intptr_t value = *cur;
|
| - Heap* current_heap = v8::internal::Isolate::Current()->heap();
|
| + Heap* current_heap = sim_->isolate_->heap();
|
| if (((value & 1) == 0) || current_heap->Contains(obj)) {
|
| PrintF(" (");
|
| if ((value & 1) == 0) {
|
| @@ -844,12 +844,12 @@ Simulator::~Simulator() { free(stack_); }
|
| // offset from the svc instruction so the simulator knows what to call.
|
| class Redirection {
|
| public:
|
| - Redirection(void* external_function, ExternalReference::Type type)
|
| + Redirection(Isolate* isolate, void* external_function,
|
| + ExternalReference::Type type)
|
| : external_function_(external_function),
|
| swi_instruction_(rtCallRedirInstr | kCallRtRedirected),
|
| type_(type),
|
| next_(NULL) {
|
| - Isolate* isolate = Isolate::Current();
|
| next_ = isolate->simulator_redirection();
|
| Simulator::current(isolate)->FlushICache(
|
| isolate->simulator_i_cache(),
|
| @@ -864,9 +864,8 @@ class Redirection {
|
| void* external_function() { return external_function_; }
|
| ExternalReference::Type type() { return type_; }
|
|
|
| - static Redirection* Get(void* external_function,
|
| + static Redirection* Get(Isolate* isolate, void* external_function,
|
| ExternalReference::Type type) {
|
| - Isolate* isolate = Isolate::Current();
|
| Redirection* current = isolate->simulator_redirection();
|
| for (; current != NULL; current = current->next_) {
|
| if (current->external_function_ == external_function) {
|
| @@ -874,7 +873,7 @@ class Redirection {
|
| return current;
|
| }
|
| }
|
| - return new Redirection(external_function, type);
|
| + return new Redirection(isolate, external_function, type);
|
| }
|
|
|
| static Redirection* FromSwiInstruction(Instruction* swi_instruction) {
|
| @@ -919,9 +918,10 @@ void Simulator::TearDown(HashMap* i_cache, Redirection* first) {
|
| }
|
|
|
|
|
| -void* Simulator::RedirectExternalReference(void* external_function,
|
| +void* Simulator::RedirectExternalReference(Isolate* isolate,
|
| + void* external_function,
|
| ExternalReference::Type type) {
|
| - Redirection* redirection = Redirection::Get(external_function, type);
|
| + Redirection* redirection = Redirection::Get(isolate, external_function, type);
|
| return redirection->address_of_swi_instruction();
|
| }
|
|
|
|
|