Index: src/arm/assembler-arm.h |
diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h |
index 761d5fbef06e930624d796575971052abb5b8a05..3ced5bfee032193b68b6f444ef4ae350f62dbd1b 100644 |
--- a/src/arm/assembler-arm.h |
+++ b/src/arm/assembler-arm.h |
@@ -755,19 +755,16 @@ class Assembler : public AssemblerBase { |
// Return the address in the constant pool of the code target address used by |
// the branch/call instruction at pc, or the object in a mov. |
- INLINE(static Address constant_pool_entry_address( |
- Address pc, ConstantPoolArray* constant_pool)); |
+ INLINE(static Address constant_pool_entry_address(Address pc, |
+ Address constant_pool)); |
// Read/Modify the code target address in the branch/call instruction at pc. |
- INLINE(static Address target_address_at(Address pc, |
- ConstantPoolArray* constant_pool)); |
- INLINE(static void set_target_address_at(Address pc, |
- ConstantPoolArray* constant_pool, |
- Address target, |
- ICacheFlushMode icache_flush_mode = |
- FLUSH_ICACHE_IF_NEEDED)); |
+ INLINE(static Address target_address_at(Address pc, Address constant_pool)); |
+ INLINE(static void set_target_address_at( |
+ Address pc, Address constant_pool, Address target, |
+ ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED)); |
INLINE(static Address target_address_at(Address pc, Code* code)) { |
- ConstantPoolArray* constant_pool = code ? code->constant_pool() : NULL; |
+ Address constant_pool = code ? code->constant_pool() : NULL; |
return target_address_at(pc, constant_pool); |
} |
INLINE(static void set_target_address_at(Address pc, |
@@ -775,7 +772,7 @@ class Assembler : public AssemblerBase { |
Address target, |
ICacheFlushMode icache_flush_mode = |
FLUSH_ICACHE_IF_NEEDED)) { |
- ConstantPoolArray* constant_pool = code ? code->constant_pool() : NULL; |
+ Address constant_pool = code ? code->constant_pool() : NULL; |
set_target_address_at(pc, constant_pool, target, icache_flush_mode); |
} |
@@ -1517,6 +1514,10 @@ class Assembler : public AssemblerBase { |
// Check if is time to emit a constant pool. |
void CheckConstPool(bool force_emit, bool require_jump); |
+ bool is_ool_constant_pool_available() const { |
+ return is_constant_pool_available(); |
+ } |
+ |
// Allocate a constant pool of the correct size for the generated code. |
Handle<ConstantPoolArray> NewConstantPool(Isolate* isolate); |
@@ -1582,6 +1583,10 @@ class Assembler : public AssemblerBase { |
(pc_offset() < no_const_pool_before_); |
} |
+ void set_ool_constant_pool_available(bool available) { |
+ set_constant_pool_available(available); |
+ } |
+ |
private: |
int next_buffer_check_; // pc offset of next buffer check |