Index: src/x87/assembler-x87.h |
diff --git a/src/x87/assembler-x87.h b/src/x87/assembler-x87.h |
index 67af72e0c23d1455c8f42cdb5fc980909b6078e9..ea05ab975f03c02eb37a195606d6c7c8ae46c12b 100644 |
--- a/src/x87/assembler-x87.h |
+++ b/src/x87/assembler-x87.h |
@@ -495,15 +495,12 @@ class Assembler : public AssemblerBase { |
void GetCode(CodeDesc* desc); |
// Read/Modify the code target 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); |
static inline 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); |
} |
static inline void set_target_address_at(Address pc, |
@@ -511,7 +508,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); |
} |
@@ -952,6 +949,8 @@ class Assembler : public AssemblerBase { |
// inline tables, e.g., jump-tables. |
void db(uint8_t data); |
void dd(uint32_t data); |
+ void dq(uint64_t data); |
+ void dp(uintptr_t data) { dd(data); } |
void dd(Label* label); |
// Check if there is less than kGap bytes available in the buffer. |
@@ -978,11 +977,12 @@ class Assembler : public AssemblerBase { |
byte byte_at(int pos) { return buffer_[pos]; } |
void set_byte_at(int pos, byte value) { buffer_[pos] = value; } |
- // Allocate a constant pool of the correct size for the generated code. |
- Handle<ConstantPoolArray> NewConstantPool(Isolate* isolate); |
- |
- // Generate the constant pool for the generated code. |
- void PopulateConstantPool(ConstantPoolArray* constant_pool); |
+ void PatchConstantPoolAccessInstruction(int pc_offset, int offset, |
+ ConstantPoolEntry::Access access, |
+ ConstantPoolEntry::Type type) { |
+ // No embedded constant pool support. |
+ UNREACHABLE(); |
+ } |
protected: |
byte* addr_at(int pos) { return buffer_ + pos; } |
@@ -1008,6 +1008,7 @@ class Assembler : public AssemblerBase { |
TypeFeedbackId id = TypeFeedbackId::None()); |
inline void emit(const Immediate& x); |
inline void emit_w(const Immediate& x); |
+ inline void emit_q(uint64_t x); |
// Emit the code-object-relative offset of the label's position |
inline void emit_code_relative_offset(Label* label); |