diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:25:14 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:56:31 +0100 |
| commit | 6313e1fe4c27755adde87e62db1c2f9fac534ae4 (patch) | |
| tree | c57bb29f65e02fbfcc07895a8cc2903fff9300ba /src/3rdparty/v8/src/mips/assembler-mips-inl.h | |
| parent | b5a49a260d03249c386f1b63c249089383dd81fa (diff) | |
| parent | cac65e7a222b848a735a974b0aeb43209b0cfa18 (diff) | |
| download | qtjsbackend-6313e1fe4c27755adde87e62db1c2f9fac534ae4.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I892bbc73c276842894a720f761ce31ad1b015672
Diffstat (limited to 'src/3rdparty/v8/src/mips/assembler-mips-inl.h')
| -rw-r--r-- | src/3rdparty/v8/src/mips/assembler-mips-inl.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/3rdparty/v8/src/mips/assembler-mips-inl.h b/src/3rdparty/v8/src/mips/assembler-mips-inl.h index 2ff4710..3e726a7 100644 --- a/src/3rdparty/v8/src/mips/assembler-mips-inl.h +++ b/src/3rdparty/v8/src/mips/assembler-mips-inl.h @@ -156,6 +156,11 @@ void RelocInfo::set_target_address(Address target, WriteBarrierMode mode) { } +Address Assembler::target_address_from_return_address(Address pc) { + return pc - kCallTargetAddressOffset; +} + + Object* RelocInfo::target_object() { ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); return reinterpret_cast<Object*>(Assembler::target_address_at(pc_)); @@ -208,10 +213,7 @@ Handle<JSGlobalPropertyCell> RelocInfo::target_cell_handle() { JSGlobalPropertyCell* RelocInfo::target_cell() { ASSERT(rmode_ == RelocInfo::GLOBAL_PROPERTY_CELL); - Address address = Memory::Address_at(pc_); - Object* object = HeapObject::FromAddress( - address - JSGlobalPropertyCell::kValueOffset); - return reinterpret_cast<JSGlobalPropertyCell*>(object); + return JSGlobalPropertyCell::FromValueAddress(Memory::Address_at(pc_)); } |