OLD | NEW |
---|---|
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "vm/debugger.h" | 5 #include "vm/debugger.h" |
6 | 6 |
7 #include "include/dart_api.h" | 7 #include "include/dart_api.h" |
8 | 8 |
9 #include "vm/code_generator.h" | 9 #include "vm/code_generator.h" |
10 #include "vm/code_patcher.h" | 10 #include "vm/code_patcher.h" |
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
898 VariableAt(v, &var_name, &unused, &unused, &var_value); | 898 VariableAt(v, &var_name, &unused, &unused, &var_value); |
899 jsvar.AddProperty("name", var_name.ToCString()); | 899 jsvar.AddProperty("name", var_name.ToCString()); |
900 jsvar.AddProperty("value", var_value); | 900 jsvar.AddProperty("value", var_value); |
901 } | 901 } |
902 } | 902 } |
903 } | 903 } |
904 | 904 |
905 | 905 |
906 | 906 |
907 void DebuggerStackTrace::AddActivation(ActivationFrame* frame) { | 907 void DebuggerStackTrace::AddActivation(ActivationFrame* frame) { |
908 if (FLAG_show_invisible_frames || frame->function().is_visible()) { | 908 if (FLAG_show_invisible_frames || frame->function().is_stacktrace_visible()) { |
Ivan Posva
2015/01/23 19:37:07
Shouldn't we just use is_debuggable() here instead
rmacnak
2015/01/23 21:16:17
Yeah, flattened these out.
| |
909 trace_.Add(frame); | 909 trace_.Add(frame); |
910 } | 910 } |
911 } | 911 } |
912 | 912 |
913 | 913 |
914 const uint8_t kSafepointKind = | 914 const uint8_t kSafepointKind = |
915 RawPcDescriptors::kIcCall | RawPcDescriptors::kOptStaticCall | | 915 RawPcDescriptors::kIcCall | RawPcDescriptors::kOptStaticCall | |
916 RawPcDescriptors::kUnoptStaticCall | RawPcDescriptors::kClosureCall | | 916 RawPcDescriptors::kUnoptStaticCall | RawPcDescriptors::kClosureCall | |
917 RawPcDescriptors::kRuntimeCall; | 917 RawPcDescriptors::kRuntimeCall; |
918 | 918 |
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1316 const Array& deopt_frame = Array::Handle(); | 1316 const Array& deopt_frame = Array::Handle(); |
1317 const intptr_t deopt_frame_offset = -1; | 1317 const intptr_t deopt_frame_offset = -1; |
1318 | 1318 |
1319 for (intptr_t i = 0; i < ex_trace.Length(); i++) { | 1319 for (intptr_t i = 0; i < ex_trace.Length(); i++) { |
1320 function = ex_trace.FunctionAtFrame(i); | 1320 function = ex_trace.FunctionAtFrame(i); |
1321 // Pre-allocated Stacktraces may include empty slots, either (a) to indicate | 1321 // Pre-allocated Stacktraces may include empty slots, either (a) to indicate |
1322 // where frames were omitted in the case a stack has more frames than the | 1322 // where frames were omitted in the case a stack has more frames than the |
1323 // pre-allocated trace (such as a stack overflow) or (b) because a stack has | 1323 // pre-allocated trace (such as a stack overflow) or (b) because a stack has |
1324 // fewer frames that the pre-allocated trace (such as memory exhaustion with | 1324 // fewer frames that the pre-allocated trace (such as memory exhaustion with |
1325 // a shallow stack). | 1325 // a shallow stack). |
1326 if (!function.IsNull() && function.is_visible()) { | 1326 if (!function.IsNull() && function.is_stacktrace_visible()) { |
1327 code = ex_trace.CodeAtFrame(i); | 1327 code = ex_trace.CodeAtFrame(i); |
1328 ASSERT(function.raw() == code.function()); | 1328 ASSERT(function.raw() == code.function()); |
1329 uword pc = code.EntryPoint() + Smi::Value(ex_trace.PcOffsetAtFrame(i)); | 1329 uword pc = code.EntryPoint() + Smi::Value(ex_trace.PcOffsetAtFrame(i)); |
1330 if (code.is_optimized() && ex_trace.expand_inlined()) { | 1330 if (code.is_optimized() && ex_trace.expand_inlined()) { |
1331 // Traverse inlined frames. | 1331 // Traverse inlined frames. |
1332 for (InlinedFunctionsIterator it(code, pc); !it.Done(); it.Advance()) { | 1332 for (InlinedFunctionsIterator it(code, pc); !it.Done(); it.Advance()) { |
1333 function = it.function(); | 1333 function = it.function(); |
1334 code = it.code(); | 1334 code = it.code(); |
1335 ASSERT(function.raw() == code.function()); | 1335 ASSERT(function.raw() == code.function()); |
1336 uword pc = it.pc(); | 1336 uword pc = it.pc(); |
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2622 } | 2622 } |
2623 | 2623 |
2624 | 2624 |
2625 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) { | 2625 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) { |
2626 ASSERT(bpt->next() == NULL); | 2626 ASSERT(bpt->next() == NULL); |
2627 bpt->set_next(code_breakpoints_); | 2627 bpt->set_next(code_breakpoints_); |
2628 code_breakpoints_ = bpt; | 2628 code_breakpoints_ = bpt; |
2629 } | 2629 } |
2630 | 2630 |
2631 } // namespace dart | 2631 } // namespace dart |
OLD | NEW |