Chromium Code Reviews| 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 1294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1305 } | 1305 } |
| 1306 | 1306 |
| 1307 | 1307 |
| 1308 Address StubFailureTrampolineFrame::GetCallerStackPointer() const { | 1308 Address StubFailureTrampolineFrame::GetCallerStackPointer() const { |
| 1309 return fp() + StandardFrameConstants::kCallerSPOffset; | 1309 return fp() + StandardFrameConstants::kCallerSPOffset; |
| 1310 } | 1310 } |
| 1311 | 1311 |
| 1312 | 1312 |
| 1313 Code* StubFailureTrampolineFrame::unchecked_code() const { | 1313 Code* StubFailureTrampolineFrame::unchecked_code() const { |
| 1314 int i = 0; | 1314 int i = 0; |
| 1315 for (; i <= StubFailureTrampolineStub::kMaxExtraExpressionStackCount; ++i) { | 1315 for (; i <= 1; ++i) { |
| 1316 Code* trampoline; | 1316 Code* trampoline; |
| 1317 StubFailureTrampolineStub(i).FindCodeInCache(&trampoline, isolate()); | 1317 bool acting_as_js_function = (i == 0) ? false : true; |
|
danno
2013/03/20 21:07:33
Since there is only true/false, I think removing t
mvstanton
2013/03/21 11:47:35
Thanks, I thought this was awkward too, whew.
| |
| 1318 StubFailureTrampolineStub(acting_as_js_function).FindCodeInCache( | |
| 1319 &trampoline, isolate()); | |
| 1318 ASSERT(trampoline != NULL); | 1320 ASSERT(trampoline != NULL); |
| 1319 Address current_pc = pc(); | 1321 Address current_pc = pc(); |
| 1320 Address code_start = trampoline->instruction_start(); | 1322 Address code_start = trampoline->instruction_start(); |
| 1321 Address code_end = code_start + trampoline->instruction_size(); | 1323 Address code_end = code_start + trampoline->instruction_size(); |
| 1322 if (code_start <= current_pc && current_pc < code_end) { | 1324 if (code_start <= current_pc && current_pc < code_end) { |
| 1323 return trampoline; | 1325 return trampoline; |
| 1324 } | 1326 } |
| 1325 } | 1327 } |
| 1326 UNREACHABLE(); | 1328 UNREACHABLE(); |
| 1327 return NULL; | 1329 return NULL; |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1493 ZoneList<StackFrame*> list(10, zone); | 1495 ZoneList<StackFrame*> list(10, zone); |
| 1494 for (StackFrameIterator it(isolate); !it.done(); it.Advance()) { | 1496 for (StackFrameIterator it(isolate); !it.done(); it.Advance()) { |
| 1495 StackFrame* frame = AllocateFrameCopy(it.frame(), zone); | 1497 StackFrame* frame = AllocateFrameCopy(it.frame(), zone); |
| 1496 list.Add(frame, zone); | 1498 list.Add(frame, zone); |
| 1497 } | 1499 } |
| 1498 return list.ToVector(); | 1500 return list.ToVector(); |
| 1499 } | 1501 } |
| 1500 | 1502 |
| 1501 | 1503 |
| 1502 } } // namespace v8::internal | 1504 } } // namespace v8::internal |
| OLD | NEW |