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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 pc_address = reinterpret_cast<Address*>(fp + kCallerPCOffset); | 137 pc_address = reinterpret_cast<Address*>(fp + kCallerPCOffset); |
138 fp = Memory::Address_at(fp + StandardFrameConstants::kCallerFPOffset); | 138 fp = Memory::Address_at(fp + StandardFrameConstants::kCallerFPOffset); |
139 } | 139 } |
140 #ifdef DEBUG | 140 #ifdef DEBUG |
141 StackFrameIterator it(isolate); | 141 StackFrameIterator it(isolate); |
142 for (int i = 0; i < depth + 1; i++) it.Advance(); | 142 for (int i = 0; i < depth + 1; i++) it.Advance(); |
143 StackFrame* frame = it.frame(); | 143 StackFrame* frame = it.frame(); |
144 ASSERT(fp == frame->fp() && pc_address == frame->pc_address()); | 144 ASSERT(fp == frame->fp() && pc_address == frame->pc_address()); |
145 #endif | 145 #endif |
146 fp_ = fp; | 146 fp_ = fp; |
147 pc_address_ = pc_address; | 147 pc_address_ = StackFrame::ResolveReturnAddressLocation(pc_address); |
148 } | 148 } |
149 | 149 |
150 | 150 |
151 #ifdef ENABLE_DEBUGGER_SUPPORT | 151 #ifdef ENABLE_DEBUGGER_SUPPORT |
152 Address IC::OriginalCodeAddress() const { | 152 Address IC::OriginalCodeAddress() const { |
153 HandleScope scope(isolate()); | 153 HandleScope scope(isolate()); |
154 // Compute the JavaScript frame for the frame pointer of this IC | 154 // Compute the JavaScript frame for the frame pointer of this IC |
155 // structure. We need this to be able to find the function | 155 // structure. We need this to be able to find the function |
156 // corresponding to the frame. | 156 // corresponding to the frame. |
157 StackFrameIterator it(isolate()); | 157 StackFrameIterator it(isolate()); |
(...skipping 2974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3132 #undef ADDR | 3132 #undef ADDR |
3133 }; | 3133 }; |
3134 | 3134 |
3135 | 3135 |
3136 Address IC::AddressFromUtilityId(IC::UtilityId id) { | 3136 Address IC::AddressFromUtilityId(IC::UtilityId id) { |
3137 return IC_utilities[id]; | 3137 return IC_utilities[id]; |
3138 } | 3138 } |
3139 | 3139 |
3140 | 3140 |
3141 } } // namespace v8::internal | 3141 } } // namespace v8::internal |
OLD | NEW |