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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 return !Assembler::IsNop(current_instr, Assembler::DEBUG_BREAK_NOP); | 191 return !Assembler::IsNop(current_instr, Assembler::DEBUG_BREAK_NOP); |
192 } | 192 } |
193 | 193 |
194 | 194 |
195 void RelocInfo::Visit(ObjectVisitor* visitor) { | 195 void RelocInfo::Visit(ObjectVisitor* visitor) { |
196 RelocInfo::Mode mode = rmode(); | 196 RelocInfo::Mode mode = rmode(); |
197 if (mode == RelocInfo::EMBEDDED_OBJECT) { | 197 if (mode == RelocInfo::EMBEDDED_OBJECT) { |
198 visitor->VisitPointer(target_object_address()); | 198 visitor->VisitPointer(target_object_address()); |
199 } else if (RelocInfo::IsCodeTarget(mode)) { | 199 } else if (RelocInfo::IsCodeTarget(mode)) { |
200 visitor->VisitCodeTarget(this); | 200 visitor->VisitCodeTarget(this); |
| 201 } else if (mode == RelocInfo::GLOBAL_PROPERTY_CELL) { |
| 202 visitor->VisitGlobalPropertyCell(this); |
201 } else if (mode == RelocInfo::EXTERNAL_REFERENCE) { | 203 } else if (mode == RelocInfo::EXTERNAL_REFERENCE) { |
202 visitor->VisitExternalReference(target_reference_address()); | 204 visitor->VisitExternalReference(target_reference_address()); |
203 #ifdef ENABLE_DEBUGGER_SUPPORT | 205 #ifdef ENABLE_DEBUGGER_SUPPORT |
204 } else if (Debug::has_break_points() && | 206 } else if (Debug::has_break_points() && |
205 ((RelocInfo::IsJSReturn(mode) && | 207 ((RelocInfo::IsJSReturn(mode) && |
206 IsPatchedReturnSequence()) || | 208 IsPatchedReturnSequence()) || |
207 (RelocInfo::IsDebugBreakSlot(mode) && | 209 (RelocInfo::IsDebugBreakSlot(mode) && |
208 IsPatchedDebugBreakSlotSequence()))) { | 210 IsPatchedDebugBreakSlotSequence()))) { |
209 visitor->VisitDebugTarget(this); | 211 visitor->VisitDebugTarget(this); |
210 #endif | 212 #endif |
211 } else if (mode == RelocInfo::RUNTIME_ENTRY) { | 213 } else if (mode == RelocInfo::RUNTIME_ENTRY) { |
212 visitor->VisitRuntimeEntry(this); | 214 visitor->VisitRuntimeEntry(this); |
213 } | 215 } |
214 } | 216 } |
215 | 217 |
216 | 218 |
217 template<typename StaticVisitor> | 219 template<typename StaticVisitor> |
218 void RelocInfo::Visit() { | 220 void RelocInfo::Visit() { |
219 RelocInfo::Mode mode = rmode(); | 221 RelocInfo::Mode mode = rmode(); |
220 if (mode == RelocInfo::EMBEDDED_OBJECT) { | 222 if (mode == RelocInfo::EMBEDDED_OBJECT) { |
221 StaticVisitor::VisitPointer(target_object_address()); | 223 StaticVisitor::VisitPointer(target_object_address()); |
222 } else if (RelocInfo::IsCodeTarget(mode)) { | 224 } else if (RelocInfo::IsCodeTarget(mode)) { |
223 StaticVisitor::VisitCodeTarget(this); | 225 StaticVisitor::VisitCodeTarget(this); |
| 226 } else if (mode == RelocInfo::GLOBAL_PROPERTY_CELL) { |
| 227 StaticVisitor::VisitGlobalPropertyCell(this); |
224 } else if (mode == RelocInfo::EXTERNAL_REFERENCE) { | 228 } else if (mode == RelocInfo::EXTERNAL_REFERENCE) { |
225 StaticVisitor::VisitExternalReference(target_reference_address()); | 229 StaticVisitor::VisitExternalReference(target_reference_address()); |
226 #ifdef ENABLE_DEBUGGER_SUPPORT | 230 #ifdef ENABLE_DEBUGGER_SUPPORT |
227 } else if (Debug::has_break_points() && | 231 } else if (Debug::has_break_points() && |
228 ((RelocInfo::IsJSReturn(mode) && | 232 ((RelocInfo::IsJSReturn(mode) && |
229 IsPatchedReturnSequence()) || | 233 IsPatchedReturnSequence()) || |
230 (RelocInfo::IsDebugBreakSlot(mode) && | 234 (RelocInfo::IsDebugBreakSlot(mode) && |
231 IsPatchedDebugBreakSlotSequence()))) { | 235 IsPatchedDebugBreakSlotSequence()))) { |
232 StaticVisitor::VisitDebugTarget(this); | 236 StaticVisitor::VisitDebugTarget(this); |
233 #endif | 237 #endif |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 // CPU::FlushICache(pc, sizeof(target)); | 343 // CPU::FlushICache(pc, sizeof(target)); |
340 // However, on ARM, no instruction was actually patched by the assignment | 344 // However, on ARM, no instruction was actually patched by the assignment |
341 // above; the target address is not part of an instruction, it is patched in | 345 // above; the target address is not part of an instruction, it is patched in |
342 // the constant pool and is read via a data access; the instruction accessing | 346 // the constant pool and is read via a data access; the instruction accessing |
343 // this address in the constant pool remains unchanged. | 347 // this address in the constant pool remains unchanged. |
344 } | 348 } |
345 | 349 |
346 } } // namespace v8::internal | 350 } } // namespace v8::internal |
347 | 351 |
348 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ | 352 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ |
OLD | NEW |