| OLD | NEW |
| 1 // Copyright (c) 1994-2006 Sun Microsystems Inc. | 1 // Copyright (c) 1994-2006 Sun Microsystems Inc. |
| 2 // All Rights Reserved. | 2 // All Rights Reserved. |
| 3 // | 3 // |
| 4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
| 5 // modification, are permitted provided that the following conditions | 5 // modification, are permitted provided that the following conditions |
| 6 // are met: | 6 // are met: |
| 7 // | 7 // |
| 8 // - Redistributions of source code must retain the above copyright notice, | 8 // - Redistributions of source code must retain the above copyright notice, |
| 9 // this list of conditions and the following disclaimer. | 9 // this list of conditions and the following disclaimer. |
| 10 // | 10 // |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 Isolate::Current()->debug()->has_break_points()) { | 185 Isolate::Current()->debug()->has_break_points()) { |
| 186 visitor->VisitDebugTarget(this); | 186 visitor->VisitDebugTarget(this); |
| 187 #endif | 187 #endif |
| 188 } else if (mode == RelocInfo::RUNTIME_ENTRY) { | 188 } else if (mode == RelocInfo::RUNTIME_ENTRY) { |
| 189 visitor->VisitRuntimeEntry(this); | 189 visitor->VisitRuntimeEntry(this); |
| 190 } | 190 } |
| 191 } | 191 } |
| 192 | 192 |
| 193 | 193 |
| 194 template<typename StaticVisitor> | 194 template<typename StaticVisitor> |
| 195 void RelocInfo::Visit() { | 195 void RelocInfo::Visit(Heap* heap) { |
| 196 RelocInfo::Mode mode = rmode(); | 196 RelocInfo::Mode mode = rmode(); |
| 197 if (mode == RelocInfo::EMBEDDED_OBJECT) { | 197 if (mode == RelocInfo::EMBEDDED_OBJECT) { |
| 198 StaticVisitor::VisitPointer(target_object_address()); | 198 StaticVisitor::VisitPointer(heap, target_object_address()); |
| 199 } else if (RelocInfo::IsCodeTarget(mode)) { | 199 } else if (RelocInfo::IsCodeTarget(mode)) { |
| 200 StaticVisitor::VisitCodeTarget(this); | 200 StaticVisitor::VisitCodeTarget(this); |
| 201 } else if (mode == RelocInfo::EXTERNAL_REFERENCE) { | 201 } else if (mode == RelocInfo::EXTERNAL_REFERENCE) { |
| 202 StaticVisitor::VisitExternalReference(target_reference_address()); | 202 StaticVisitor::VisitExternalReference(target_reference_address()); |
| 203 #ifdef ENABLE_DEBUGGER_SUPPORT | 203 #ifdef ENABLE_DEBUGGER_SUPPORT |
| 204 } else if (Isolate::Current()->debug()->has_break_points() && | 204 } else if (heap->isolate()->debug()->has_break_points() && |
| 205 ((RelocInfo::IsJSReturn(mode) && | 205 ((RelocInfo::IsJSReturn(mode) && |
| 206 IsPatchedReturnSequence()) || | 206 IsPatchedReturnSequence()) || |
| 207 (RelocInfo::IsDebugBreakSlot(mode) && | 207 (RelocInfo::IsDebugBreakSlot(mode) && |
| 208 IsPatchedDebugBreakSlotSequence()))) { | 208 IsPatchedDebugBreakSlotSequence()))) { |
| 209 StaticVisitor::VisitDebugTarget(this); | 209 StaticVisitor::VisitDebugTarget(this); |
| 210 #endif | 210 #endif |
| 211 } else if (mode == RelocInfo::RUNTIME_ENTRY) { | 211 } else if (mode == RelocInfo::RUNTIME_ENTRY) { |
| 212 StaticVisitor::VisitRuntimeEntry(this); | 212 StaticVisitor::VisitRuntimeEntry(this); |
| 213 } | 213 } |
| 214 } | 214 } |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 // CPU::FlushICache(pc, sizeof(target)); | 318 // CPU::FlushICache(pc, sizeof(target)); |
| 319 // However, on ARM, no instruction was actually patched by the assignment | 319 // However, on ARM, no instruction was actually patched by the assignment |
| 320 // above; the target address is not part of an instruction, it is patched in | 320 // above; the target address is not part of an instruction, it is patched in |
| 321 // the constant pool and is read via a data access; the instruction accessing | 321 // the constant pool and is read via a data access; the instruction accessing |
| 322 // this address in the constant pool remains unchanged. | 322 // this address in the constant pool remains unchanged. |
| 323 } | 323 } |
| 324 | 324 |
| 325 } } // namespace v8::internal | 325 } } // namespace v8::internal |
| 326 | 326 |
| 327 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ | 327 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ |
| OLD | NEW |