Revision: 17467
Author: [email protected]
Date: Tue Nov 5 09:22:35 2013 UTC
Log: Refactored EXTERNAL_REFERENCE handling.
Previously, the result of target_reference_address() could only be
read, writing to it would have had an architecture-dependent effect,
e.g. writing into the code on ia32, a no-op on arm, etc.
This refactoring-only CL turns this into a simple getter, making it
impossible to use incorrectly.
More to come...
[email protected]
Review URL: https://codereview.chromium.org/46583006
http://code.google.com/p/v8/source/detail?r=17467
Modified:
/branches/bleeding_edge/src/arm/assembler-arm-inl.h
/branches/bleeding_edge/src/assembler.cc
/branches/bleeding_edge/src/assembler.h
/branches/bleeding_edge/src/disassembler.cc
/branches/bleeding_edge/src/ia32/assembler-ia32-inl.h
/branches/bleeding_edge/src/mips/assembler-mips-inl.h
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/serialize.cc
/branches/bleeding_edge/src/x64/assembler-x64-inl.h
=======================================
--- /branches/bleeding_edge/src/arm/assembler-arm-inl.h Wed Oct 23 13:48:04
2013 UTC
+++ /branches/bleeding_edge/src/arm/assembler-arm-inl.h Tue Nov 5 09:22:35
2013 UTC
@@ -160,10 +160,9 @@
}
-Address* RelocInfo::target_reference_address() {
+Address RelocInfo::target_reference() {
ASSERT(rmode_ == EXTERNAL_REFERENCE);
- reconstructed_adr_ptr_ = Assembler::target_address_at(pc_);
- return &reconstructed_adr_ptr_;
+ return Assembler::target_address_at(pc_);
}
=======================================
--- /branches/bleeding_edge/src/assembler.cc Wed Oct 23 13:48:04 2013 UTC
+++ /branches/bleeding_edge/src/assembler.cc Tue Nov 5 09:22:35 2013 UTC
@@ -819,8 +819,8 @@
} else if (rmode_ == EXTERNAL_REFERENCE) {
ExternalReferenceEncoder ref_encoder(isolate);
PrintF(out, " (%s) (%p)",
- ref_encoder.NameOfAddress(*target_reference_address()),
- *target_reference_address());
+ ref_encoder.NameOfAddress(target_reference()),
+ target_reference());
} else if (IsCodeTarget(rmode_)) {
Code* code = Code::GetCodeFromTargetAddress(target_address());
PrintF(out, " (%s) (%p)", Code::Kind2String(code->kind()),
=======================================
--- /branches/bleeding_edge/src/assembler.h Wed Oct 23 13:48:04 2013 UTC
+++ /branches/bleeding_edge/src/assembler.h Tue Nov 5 09:22:35 2013 UTC
@@ -425,7 +425,7 @@
// Read/modify the reference in the instruction this relocation
// applies to; can only be called if rmode_ is external_reference
- INLINE(Address* target_reference_address());
+ INLINE(Address target_reference());
// Read/modify the address of a call instruction. This is used to
relocate
// the break points where straight-line code is patched with a call
=======================================
--- /branches/bleeding_edge/src/disassembler.cc Mon Sep 30 13:53:21 2013 UTC
+++ /branches/bleeding_edge/src/disassembler.cc Tue Nov 5 09:22:35 2013 UTC
@@ -227,7 +227,7 @@
out.AddFormatted(" ;; object: %s", *obj_name);
} else if (rmode == RelocInfo::EXTERNAL_REFERENCE) {
const char* reference_name =
-
ref_encoder.NameOfAddress(*relocinfo.target_reference_address());
+ ref_encoder.NameOfAddress(relocinfo.target_reference());
out.AddFormatted(" ;; external reference (%s)", reference_name);
} else if (RelocInfo::IsCodeTarget(rmode)) {
out.AddFormatted(" ;; code:");
=======================================
--- /branches/bleeding_edge/src/ia32/assembler-ia32-inl.h Wed Oct 23
13:48:04 2013 UTC
+++ /branches/bleeding_edge/src/ia32/assembler-ia32-inl.h Tue Nov 5
09:22:35 2013 UTC
@@ -145,9 +145,9 @@
}
-Address* RelocInfo::target_reference_address() {
+Address RelocInfo::target_reference() {
ASSERT(rmode_ == RelocInfo::EXTERNAL_REFERENCE);
- return reinterpret_cast<Address*>(pc_);
+ return Memory::Address_at(pc_);
}
=======================================
--- /branches/bleeding_edge/src/mips/assembler-mips-inl.h Wed Oct 23
13:48:04 2013 UTC
+++ /branches/bleeding_edge/src/mips/assembler-mips-inl.h Tue Nov 5
09:22:35 2013 UTC
@@ -213,10 +213,9 @@
}
-Address* RelocInfo::target_reference_address() {
+Address RelocInfo::target_reference() {
ASSERT(rmode_ == EXTERNAL_REFERENCE);
- reconstructed_adr_ptr_ = Assembler::target_address_at(pc_);
- return &reconstructed_adr_ptr_;
+ return Assembler::target_address_at(pc_);
}
=======================================
--- /branches/bleeding_edge/src/objects.cc Mon Nov 4 12:00:39 2013 UTC
+++ /branches/bleeding_edge/src/objects.cc Tue Nov 5 09:22:35 2013 UTC
@@ -10322,8 +10322,8 @@
void ObjectVisitor::VisitExternalReference(RelocInfo* rinfo) {
- Address* p = rinfo->target_reference_address();
- VisitExternalReference(p);
+ Address p = rinfo->target_reference();
+ VisitExternalReference(&p);
}
=======================================
--- /branches/bleeding_edge/src/serialize.cc Wed Oct 23 18:05:27 2013 UTC
+++ /branches/bleeding_edge/src/serialize.cc Tue Nov 5 09:22:35 2013 UTC
@@ -1694,12 +1694,12 @@
Address references_start = rinfo->target_address_address();
int skip = OutputRawData(references_start,
kCanReturnSkipInsteadOfSkipping);
- Address* current = rinfo->target_reference_address();
+ Address current = rinfo->target_reference();
int representation = rinfo->IsCodedSpecially() ?
kFromCode + kStartOfObject : kPlain +
kStartOfObject;
sink_->Put(kExternalReference + representation, "ExternalRef");
sink_->PutInt(skip, "SkipB4ExternalRef");
- int reference_id = serializer_->EncodeExternalReference(*current);
+ int reference_id = serializer_->EncodeExternalReference(current);
sink_->PutInt(reference_id, "reference id");
bytes_processed_so_far_ += rinfo->target_address_size();
}
=======================================
--- /branches/bleeding_edge/src/x64/assembler-x64-inl.h Thu Oct 24 01:27:47
2013 UTC
+++ /branches/bleeding_edge/src/x64/assembler-x64-inl.h Tue Nov 5 09:22:35
2013 UTC
@@ -309,9 +309,9 @@
}
-Address* RelocInfo::target_reference_address() {
+Address RelocInfo::target_reference() {
ASSERT(rmode_ == RelocInfo::EXTERNAL_REFERENCE);
- return reinterpret_cast<Address*>(pc_);
+ return Memory::Address_at(pc_);
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
