Chromium Code Reviews| Index: src/assembler.h |
| diff --git a/src/assembler.h b/src/assembler.h |
| index 31d87c84f6fb01832dab8cd3b5359f59abe894f7..9e1e2ed12d7e22284957fd9e7c3ad49cdcd4823f 100644 |
| --- a/src/assembler.h |
| +++ b/src/assembler.h |
| @@ -384,9 +384,10 @@ class RelocInfo { |
| CODE_TARGET_WITH_ID, |
| DEBUGGER_STATEMENT, // Code target for the debugger statement. |
| EMBEDDED_OBJECT, |
| - CELL, |
| // To relocate pointers into the wasm memory embedded in wasm code |
| WASM_MEMORY_REFERENCE, |
| + WASM_MEMORY_SIZE_REFERENCE, |
|
gdeepti
2016/04/26 08:09:36
Removing wasm RelocInfo modes from the shareable r
|
| + CELL, |
| // Everything after runtime_entry (inclusive) is not GC'ed. |
| RUNTIME_ENTRY, |
| @@ -430,7 +431,7 @@ class RelocInfo { |
| FIRST_REAL_RELOC_MODE = CODE_TARGET, |
| LAST_REAL_RELOC_MODE = VENEER_POOL, |
| LAST_CODE_ENUM = DEBUGGER_STATEMENT, |
| - LAST_GCED_ENUM = WASM_MEMORY_REFERENCE, |
| + LAST_GCED_ENUM = WASM_MEMORY_SIZE_REFERENCE, |
| FIRST_SHAREABLE_RELOC_MODE = CELL, |
| }; |
| @@ -521,6 +522,9 @@ class RelocInfo { |
| static inline bool IsWasmMemoryReference(Mode mode) { |
| return mode == WASM_MEMORY_REFERENCE; |
| } |
| + static inline bool IsWasmMemorySizeReference(Mode mode) { |
| + return mode == WASM_MEMORY_SIZE_REFERENCE; |
| + } |
| static inline int ModeMask(Mode mode) { return 1 << mode; } |
| // Accessors |
| @@ -582,8 +586,9 @@ class RelocInfo { |
| FLUSH_ICACHE_IF_NEEDED)); |
| INLINE(Address wasm_memory_reference()); |
| + INLINE(int32_t wasm_memory_size_reference()); |
| INLINE(void update_wasm_memory_reference( |
| - Address old_base, Address new_base, size_t old_size, size_t new_size, |
| + Address old_base, Address new_base, int32_t old_size, int32_t new_size, |
| ICacheFlushMode icache_flush_mode = SKIP_ICACHE_FLUSH)); |
| // Returns the address of the constant pool entry where the target address |
| // is held. This should only be called if IsInConstantPool returns true. |