OLD | NEW |
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. | 1 // Copyright 2006-2008 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 // Patch the code to invoke the builtin debug break function matching the | 424 // Patch the code to invoke the builtin debug break function matching the |
425 // calling convention used by the call site. | 425 // calling convention used by the call site. |
426 Handle<Code> dbgbrk_code(Debug::FindDebugBreak(code, mode)); | 426 Handle<Code> dbgbrk_code(Debug::FindDebugBreak(code, mode)); |
427 rinfo()->set_target_address(dbgbrk_code->entry()); | 427 rinfo()->set_target_address(dbgbrk_code->entry()); |
428 | 428 |
429 // For stubs that refer back to an inlined version clear the cached map for | 429 // For stubs that refer back to an inlined version clear the cached map for |
430 // the inlined case to always go through the IC. As long as the break point | 430 // the inlined case to always go through the IC. As long as the break point |
431 // is set the patching performed by the runtime system will take place in | 431 // is set the patching performed by the runtime system will take place in |
432 // the code copy and will therefore have no effect on the running code | 432 // the code copy and will therefore have no effect on the running code |
433 // keeping it from using the inlined code. | 433 // keeping it from using the inlined code. |
434 if (code->is_keyed_load_stub()) KeyedLoadIC::ClearInlinedVersion(pc()); | 434 if (code->is_keyed_load_stub()) { |
435 if (code->is_keyed_store_stub()) KeyedStoreIC::ClearInlinedVersion(pc()); | 435 KeyedLoadIC::ClearInlinedVersion(pc()); |
| 436 } else if (code->is_keyed_store_stub()) { |
| 437 KeyedStoreIC::ClearInlinedVersion(pc()); |
| 438 } else if (code->is_load_stub()) { |
| 439 LoadIC::ClearInlinedVersion(pc()); |
| 440 } |
436 } | 441 } |
437 } | 442 } |
438 | 443 |
439 | 444 |
440 void BreakLocationIterator::ClearDebugBreakAtIC() { | 445 void BreakLocationIterator::ClearDebugBreakAtIC() { |
441 // Patch the code to the original invoke. | 446 // Patch the code to the original invoke. |
442 rinfo()->set_target_address(original_rinfo()->target_address()); | 447 rinfo()->set_target_address(original_rinfo()->target_address()); |
443 | 448 |
444 RelocInfo::Mode mode = rmode(); | 449 RelocInfo::Mode mode = rmode(); |
445 if (RelocInfo::IsCodeTarget(mode)) { | 450 if (RelocInfo::IsCodeTarget(mode)) { |
(...skipping 2356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2802 { | 2807 { |
2803 Locker locker; | 2808 Locker locker; |
2804 Debugger::CallMessageDispatchHandler(); | 2809 Debugger::CallMessageDispatchHandler(); |
2805 } | 2810 } |
2806 } | 2811 } |
2807 } | 2812 } |
2808 | 2813 |
2809 #endif // ENABLE_DEBUGGER_SUPPORT | 2814 #endif // ENABLE_DEBUGGER_SUPPORT |
2810 | 2815 |
2811 } } // namespace v8::internal | 2816 } } // namespace v8::internal |
OLD | NEW |