Reviewers: mtbrandyberry,

Message:
next ppc port

Description:
PPC: Fix 'PPC: Serializer: serialize internal references via object visitor.'

Port 56d2ee0310972119ec47810ee03a4f7077f7117e

Original commit message:

[email protected]

BUG=

Please review this at https://codereview.chromium.org/1036453002/

Base URL: https://chromium.googlesource.com/v8/v8.git@master

Affected files (+4, -3 lines):
  M src/ppc/assembler-ppc.h
  M src/ppc/assembler-ppc-inl.h


Index: src/ppc/assembler-ppc-inl.h
diff --git a/src/ppc/assembler-ppc-inl.h b/src/ppc/assembler-ppc-inl.h
index 6877c985f06c82f8caf0345a77c57c2861df1b09..d95c7ec5968a5e8fec471bdabed8f6dcf84d01d4 100644
--- a/src/ppc/assembler-ppc-inl.h
+++ b/src/ppc/assembler-ppc-inl.h
@@ -486,8 +486,8 @@ void Assembler::deserialization_set_special_target_at(


 void Assembler::deserialization_set_target_internal_reference_at(
-    Address pc, Address target) {
-  if (IsLis(instr_at(pc)) && IsOri(instr_at(pc + kInstrSize))) {
+    Address pc, Address target, RelocInfo::Mode mode) {
+  if (RelocInfo::IsInternalReferenceEncoded(mode)) {
     Code* code = NULL;
     set_target_address_at(pc, code, target, SKIP_ICACHE_FLUSH);
   } else {
Index: src/ppc/assembler-ppc.h
diff --git a/src/ppc/assembler-ppc.h b/src/ppc/assembler-ppc.h
index 72349976b6bb7b2912c58d7166e42cb701c17330..e13dff094f0731ce361c7485c2731dd4ca3d452f 100644
--- a/src/ppc/assembler-ppc.h
+++ b/src/ppc/assembler-ppc.h
@@ -631,7 +631,8 @@ class Assembler : public AssemblerBase {

   // This sets the internal reference at the pc.
   inline static void deserialization_set_target_internal_reference_at(
-      Address pc, Address target);
+      Address pc, Address target,
+      RelocInfo::Mode mode = RelocInfo::INTERNAL_REFERENCE);

   // Size of an instruction.
   static const int kInstrSize = sizeof(Instr);


--
--
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/d/optout.

Reply via email to