| 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/disassembler.h" | 5 #include "vm/disassembler.h" |
| 6 | 6 |
| 7 #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. | 7 #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. |
| 8 #if defined(TARGET_ARCH_IA32) | 8 #if defined(TARGET_ARCH_IA32) |
| 9 #include "platform/utils.h" | 9 #include "platform/utils.h" |
| 10 #include "vm/allocation.h" | 10 #include "vm/allocation.h" |
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 // 'addr' is not an object, but probably a code address. | 422 // 'addr' is not an object, but probably a code address. |
| 423 const char* name_of_stub = StubCode::NameOfStub(addr); | 423 const char* name_of_stub = StubCode::NameOfStub(addr); |
| 424 if (name_of_stub != NULL) { | 424 if (name_of_stub != NULL) { |
| 425 Print(" [stub: "); | 425 Print(" [stub: "); |
| 426 Print(name_of_stub); | 426 Print(name_of_stub); |
| 427 Print("]"); | 427 Print("]"); |
| 428 } else { | 428 } else { |
| 429 CodeIndexTable* code_index_table = Isolate::Current()->code_index_table(); | 429 CodeIndexTable* code_index_table = Isolate::Current()->code_index_table(); |
| 430 if (code_index_table != NULL) { | 430 if (code_index_table != NULL) { |
| 431 // Print only if jumping to entry point. | 431 // Print only if jumping to entry point. |
| 432 const Function& function = Function::Handle( | 432 const Code& code = Code::Handle( |
| 433 code_index_table->LookupFunction(addr)); | 433 code_index_table->LookupCode(addr)); |
| 434 if (!function.IsNull() && | 434 if (!code.IsNull() && (code.EntryPoint() == addr)) { |
| 435 (Code::Handle(function.code()).EntryPoint() == addr)) { | 435 const Function& function = Function::Handle(code.function()); |
| 436 const char* name_of_function = function.ToFullyQualifiedCString(); | 436 const char* name_of_function = function.ToFullyQualifiedCString(); |
| 437 Print(" ["); | 437 Print(" ["); |
| 438 Print(name_of_function); | 438 Print(name_of_function); |
| 439 Print("]"); | 439 Print("]"); |
| 440 } | 440 } |
| 441 } | 441 } |
| 442 } | 442 } |
| 443 } | 443 } |
| 444 } | 444 } |
| 445 | 445 |
| (...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1596 human_buffer, | 1596 human_buffer, |
| 1597 sizeof(human_buffer), | 1597 sizeof(human_buffer), |
| 1598 pc); | 1598 pc); |
| 1599 pc += instruction_length; | 1599 pc += instruction_length; |
| 1600 } | 1600 } |
| 1601 } | 1601 } |
| 1602 | 1602 |
| 1603 } // namespace dart | 1603 } // namespace dart |
| 1604 | 1604 |
| 1605 #endif // defined TARGET_ARCH_IA32 | 1605 #endif // defined TARGET_ARCH_IA32 |
| OLD | NEW |