Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/mips64/simulator-mips64.h b/src/mips64/simulator-mips64.h
index 7f60a74..cd606e2 100644
--- a/src/mips64/simulator-mips64.h
+++ b/src/mips64/simulator-mips64.h
@@ -84,7 +84,7 @@
// Running with a simulator.
#include "src/assembler.h"
-#include "src/hashmap.h"
+#include "src/base/hashmap.h"
namespace v8 {
namespace internal {
@@ -226,7 +226,7 @@
// Call on program start.
static void Initialize(Isolate* isolate);
- static void TearDown(HashMap* i_cache, Redirection* first);
+ static void TearDown(base::HashMap* i_cache, Redirection* first);
// V8 generally calls into generated JS code with 5 parameters and into
// generated RegExp code with 7 parameters. This is a convenience function,
@@ -246,8 +246,7 @@
char* last_debugger_input() { return last_debugger_input_; }
// ICache checking.
- static void FlushICache(v8::internal::HashMap* i_cache, void* start,
- size_t size);
+ static void FlushICache(base::HashMap* i_cache, void* start, size_t size);
// Returns true if pc register contains one of the 'special_values' defined
// below (bad_ra, end_sim_pc).
@@ -415,10 +414,9 @@
}
// ICache.
- static void CheckICache(v8::internal::HashMap* i_cache, Instruction* instr);
- static void FlushOnePage(v8::internal::HashMap* i_cache, intptr_t start,
- size_t size);
- static CachePage* GetCachePage(v8::internal::HashMap* i_cache, void* page);
+ static void CheckICache(base::HashMap* i_cache, Instruction* instr);
+ static void FlushOnePage(base::HashMap* i_cache, intptr_t start, size_t size);
+ static CachePage* GetCachePage(base::HashMap* i_cache, void* page);
enum Exception {
none,
@@ -463,7 +461,7 @@
char* last_debugger_input_;
// Icache simulation.
- v8::internal::HashMap* i_cache_;
+ base::HashMap* i_cache_;
v8::internal::Isolate* isolate_;