Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: vm/debugger.cc

Issue 10030001: Resubmit change 6302 after fixing the compiler warning on older GCC compiler versions: (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "vm/code_index_table.h"
8 #include "vm/code_generator.h" 7 #include "vm/code_generator.h"
9 #include "vm/code_patcher.h" 8 #include "vm/code_patcher.h"
10 #include "vm/compiler.h" 9 #include "vm/compiler.h"
11 #include "vm/dart_entry.h" 10 #include "vm/dart_entry.h"
12 #include "vm/flags.h" 11 #include "vm/flags.h"
13 #include "vm/globals.h" 12 #include "vm/globals.h"
14 #include "vm/longjump.h" 13 #include "vm/longjump.h"
15 #include "vm/object.h" 14 #include "vm/object.h"
16 #include "vm/object_store.h" 15 #include "vm/object_store.h"
17 #include "vm/os.h" 16 #include "vm/os.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 function_(Function::ZoneHandle()), 93 function_(Function::ZoneHandle()),
95 token_index_(-1), 94 token_index_(-1),
96 line_number_(-1), 95 line_number_(-1),
97 var_descriptors_(NULL), 96 var_descriptors_(NULL),
98 desc_indices_(8) { 97 desc_indices_(8) {
99 } 98 }
100 99
101 100
102 const Function& ActivationFrame::DartFunction() { 101 const Function& ActivationFrame::DartFunction() {
103 if (function_.IsNull()) { 102 if (function_.IsNull()) {
104 ASSERT(Isolate::Current() != NULL); 103 Isolate* isolate = Isolate::Current();
105 CodeIndexTable* code_index_table = Isolate::Current()->code_index_table(); 104 ASSERT(isolate != NULL);
106 ASSERT(code_index_table != NULL); 105 const Code& code = Code::Handle(StackFrame::LookupCode(isolate, pc_));
107 const Code& code = Code::Handle(code_index_table->LookupCode(pc_));
108 function_ = code.function(); 106 function_ = code.function();
109 } 107 }
110 return function_; 108 return function_;
111 } 109 }
112 110
113 111
114 const char* Debugger::QualifiedFunctionName(const Function& func) { 112 const char* Debugger::QualifiedFunctionName(const Function& func) {
115 const String& func_name = String::Handle(func.name()); 113 const String& func_name = String::Handle(func.name());
116 Class& func_class = Class::Handle(func.owner()); 114 Class& func_class = Class::Handle(func.owner());
117 String& class_name = String::Handle(func_class.Name()); 115 String& class_name = String::Handle(func_class.Name());
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
1098 } 1096 }
1099 1097
1100 1098
1101 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) { 1099 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
1102 ASSERT(bpt->next() == NULL); 1100 ASSERT(bpt->next() == NULL);
1103 bpt->set_next(code_breakpoints_); 1101 bpt->set_next(code_breakpoints_);
1104 code_breakpoints_ = bpt; 1102 code_breakpoints_ = bpt;
1105 } 1103 }
1106 1104
1107 } // namespace dart 1105 } // namespace dart
OLDNEW
« no previous file with comments | « vm/compiler.cc ('k') | vm/disassembler_ia32.cc » ('j') | vm/stack_frame.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698