OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 // function and the original code. | 151 // function and the original code. |
152 JSFunction* function = JSFunction::cast(frame->function()); | 152 JSFunction* function = JSFunction::cast(frame->function()); |
153 Handle<SharedFunctionInfo> shared(function->shared()); | 153 Handle<SharedFunctionInfo> shared(function->shared()); |
154 Code* code = shared->code(); | 154 Code* code = shared->code(); |
155 ASSERT(Debug::HasDebugInfo(shared)); | 155 ASSERT(Debug::HasDebugInfo(shared)); |
156 Code* original_code = Debug::GetDebugInfo(shared)->original_code(); | 156 Code* original_code = Debug::GetDebugInfo(shared)->original_code(); |
157 ASSERT(original_code->IsCode()); | 157 ASSERT(original_code->IsCode()); |
158 // Get the address of the call site in the active code. This is the | 158 // Get the address of the call site in the active code. This is the |
159 // place where the call to DebugBreakXXX is and where the IC | 159 // place where the call to DebugBreakXXX is and where the IC |
160 // normally would be. | 160 // normally would be. |
161 Address addr = pc() - Assembler::kCallTargetAddressOffset; | 161 Address addr = Assembler::target_address_from_return_address(pc()); |
162 // Return the address in the original code. This is the place where | 162 // Return the address in the original code. This is the place where |
163 // the call which has been overwritten by the DebugBreakXXX resides | 163 // the call which has been overwritten by the DebugBreakXXX resides |
164 // and the place where the inline cache system should look. | 164 // and the place where the inline cache system should look. |
165 intptr_t delta = | 165 intptr_t delta = |
166 original_code->instruction_start() - code->instruction_start(); | 166 original_code->instruction_start() - code->instruction_start(); |
167 return addr + delta; | 167 return addr + delta; |
168 } | 168 } |
169 #endif | 169 #endif |
170 | 170 |
171 | 171 |
(...skipping 2522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2694 #undef ADDR | 2694 #undef ADDR |
2695 }; | 2695 }; |
2696 | 2696 |
2697 | 2697 |
2698 Address IC::AddressFromUtilityId(IC::UtilityId id) { | 2698 Address IC::AddressFromUtilityId(IC::UtilityId id) { |
2699 return IC_utilities[id]; | 2699 return IC_utilities[id]; |
2700 } | 2700 } |
2701 | 2701 |
2702 | 2702 |
2703 } } // namespace v8::internal | 2703 } } // namespace v8::internal |
OLD | NEW |