| Index: src/ppc/simulator-ppc.cc
|
| diff --git a/src/ppc/simulator-ppc.cc b/src/ppc/simulator-ppc.cc
|
| index 1b01c1223da7a58acd7993cb82deaca3e14c37f5..641e8674eb26e9c981529daebfd7431424383417 100644
|
| --- a/src/ppc/simulator-ppc.cc
|
| +++ b/src/ppc/simulator-ppc.cc
|
| @@ -707,7 +707,7 @@ void Simulator::set_last_debugger_input(char* input) {
|
| }
|
|
|
|
|
| -void Simulator::FlushICache(v8::internal::HashMap* i_cache, void* start_addr,
|
| +void Simulator::FlushICache(base::HashMap* i_cache, void* start_addr,
|
| size_t size) {
|
| intptr_t start = reinterpret_cast<intptr_t>(start_addr);
|
| int intra_line = (start & CachePage::kLineMask);
|
| @@ -729,9 +729,8 @@ void Simulator::FlushICache(v8::internal::HashMap* i_cache, void* start_addr,
|
| }
|
|
|
|
|
| -CachePage* Simulator::GetCachePage(v8::internal::HashMap* i_cache, void* page) {
|
| - v8::internal::HashMap::Entry* entry =
|
| - i_cache->LookupOrInsert(page, ICacheHash(page));
|
| +CachePage* Simulator::GetCachePage(base::HashMap* i_cache, void* page) {
|
| + base::HashMap::Entry* entry = i_cache->LookupOrInsert(page, ICacheHash(page));
|
| if (entry->value == NULL) {
|
| CachePage* new_page = new CachePage();
|
| entry->value = new_page;
|
| @@ -741,8 +740,7 @@ CachePage* Simulator::GetCachePage(v8::internal::HashMap* i_cache, void* page) {
|
|
|
|
|
| // Flush from start up to and not including start + size.
|
| -void Simulator::FlushOnePage(v8::internal::HashMap* i_cache, intptr_t start,
|
| - int size) {
|
| +void Simulator::FlushOnePage(base::HashMap* i_cache, intptr_t start, int size) {
|
| DCHECK(size <= CachePage::kPageSize);
|
| DCHECK(AllOnOnePage(start, size - 1));
|
| DCHECK((start & CachePage::kLineMask) == 0);
|
| @@ -754,9 +752,7 @@ void Simulator::FlushOnePage(v8::internal::HashMap* i_cache, intptr_t start,
|
| memset(valid_bytemap, CachePage::LINE_INVALID, size >> CachePage::kLineShift);
|
| }
|
|
|
| -
|
| -void Simulator::CheckICache(v8::internal::HashMap* i_cache,
|
| - Instruction* instr) {
|
| +void Simulator::CheckICache(base::HashMap* i_cache, Instruction* instr) {
|
| intptr_t address = reinterpret_cast<intptr_t>(instr);
|
| void* page = reinterpret_cast<void*>(address & (~CachePage::kPageMask));
|
| void* line = reinterpret_cast<void*>(address & (~CachePage::kLineMask));
|
| @@ -789,7 +785,7 @@ void Simulator::Initialize(Isolate* isolate) {
|
| Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
|
| i_cache_ = isolate_->simulator_i_cache();
|
| if (i_cache_ == NULL) {
|
| - i_cache_ = new v8::internal::HashMap(&ICacheMatch);
|
| + i_cache_ = new base::HashMap(&ICacheMatch);
|
| isolate_->set_simulator_i_cache(i_cache_);
|
| }
|
| Initialize(isolate);
|
| @@ -925,10 +921,10 @@ class Redirection {
|
|
|
|
|
| // static
|
| -void Simulator::TearDown(HashMap* i_cache, Redirection* first) {
|
| +void Simulator::TearDown(base::HashMap* i_cache, Redirection* first) {
|
| Redirection::DeleteChain(first);
|
| if (i_cache != nullptr) {
|
| - for (HashMap::Entry* entry = i_cache->Start(); entry != nullptr;
|
| + for (base::HashMap::Entry* entry = i_cache->Start(); entry != nullptr;
|
| entry = i_cache->Next(entry)) {
|
| delete static_cast<CachePage*>(entry->value);
|
| }
|
|
|