Index: src/mips64/simulator-mips64.cc |
diff --git a/src/mips64/simulator-mips64.cc b/src/mips64/simulator-mips64.cc |
index 45a819a0b9b09d2f72c4bc7b2e0f8cd89208347a..ebccc7dc7fcee2c3e2966de28a706a0fd3c8754c 100644 |
--- a/src/mips64/simulator-mips64.cc |
+++ b/src/mips64/simulator-mips64.cc |
@@ -801,9 +801,7 @@ void Simulator::set_last_debugger_input(char* input) { |
last_debugger_input_ = 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) { |
int64_t start = reinterpret_cast<int64_t>(start_addr); |
int64_t intra_line = (start & CachePage::kLineMask); |
@@ -824,10 +822,8 @@ void Simulator::FlushICache(v8::internal::HashMap* i_cache, |
} |
} |
- |
-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; |
@@ -837,7 +833,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, |
+void Simulator::FlushOnePage(base::HashMap* i_cache, intptr_t start, |
size_t size) { |
DCHECK(size <= CachePage::kPageSize); |
DCHECK(AllOnOnePage(start, size - 1)); |
@@ -850,9 +846,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) { |
int64_t address = reinterpret_cast<int64_t>(instr); |
void* page = reinterpret_cast<void*>(address & (~CachePage::kPageMask)); |
void* line = reinterpret_cast<void*>(address & (~CachePage::kLineMask)); |
@@ -885,7 +879,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); |
@@ -1000,10 +994,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); |
} |