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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 return Memory::Address_at(ComputePCAddress(fp())); | 121 return Memory::Address_at(ComputePCAddress(fp())); |
122 } | 122 } |
123 | 123 |
124 | 124 |
125 inline Address StandardFrame::ComputePCAddress(Address fp) { | 125 inline Address StandardFrame::ComputePCAddress(Address fp) { |
126 return fp + StandardFrameConstants::kCallerPCOffset; | 126 return fp + StandardFrameConstants::kCallerPCOffset; |
127 } | 127 } |
128 | 128 |
129 | 129 |
130 inline bool StandardFrame::IsArgumentsAdaptorFrame(Address fp) { | 130 inline bool StandardFrame::IsArgumentsAdaptorFrame(Address fp) { |
131 int context = Memory::int_at(fp + StandardFrameConstants::kContextOffset); | 131 Object* marker = |
132 return context == ArgumentsAdaptorFrame::SENTINEL; | 132 Memory::Object_at(fp + StandardFrameConstants::kContextOffset); |
| 133 return marker == Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR); |
133 } | 134 } |
134 | 135 |
135 | 136 |
136 inline bool StandardFrame::IsConstructFrame(Address fp) { | 137 inline bool StandardFrame::IsConstructFrame(Address fp) { |
137 Object* marker = | 138 Object* marker = |
138 Memory::Object_at(fp + StandardFrameConstants::kMarkerOffset); | 139 Memory::Object_at(fp + StandardFrameConstants::kMarkerOffset); |
139 return marker == Smi::FromInt(CONSTRUCT); | 140 return marker == Smi::FromInt(CONSTRUCT); |
140 } | 141 } |
141 | 142 |
142 | 143 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 template<typename Iterator> | 206 template<typename Iterator> |
206 void JavaScriptFrameIteratorTemp<Iterator>::Reset() { | 207 void JavaScriptFrameIteratorTemp<Iterator>::Reset() { |
207 iterator_.Reset(); | 208 iterator_.Reset(); |
208 if (!done()) Advance(); | 209 if (!done()) Advance(); |
209 } | 210 } |
210 | 211 |
211 | 212 |
212 } } // namespace v8::internal | 213 } } // namespace v8::internal |
213 | 214 |
214 #endif // V8_FRAMES_INL_H_ | 215 #endif // V8_FRAMES_INL_H_ |
OLD | NEW |