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 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 return chars; | 486 return chars; |
487 } | 487 } |
488 | 488 |
489 | 489 |
490 void X86Decoder::PrintAddress(uword addr) { | 490 void X86Decoder::PrintAddress(uword addr) { |
491 char addr_buffer[32]; | 491 char addr_buffer[32]; |
492 OS::SNPrint(addr_buffer, sizeof(addr_buffer), "%#" Px "", addr); | 492 OS::SNPrint(addr_buffer, sizeof(addr_buffer), "%#" Px "", addr); |
493 Print(addr_buffer); | 493 Print(addr_buffer); |
494 // Try to print as heap object or stub name | 494 // Try to print as heap object or stub name |
495 if (((addr & kSmiTagMask) == kHeapObjectTag) && | 495 if (((addr & kSmiTagMask) == kHeapObjectTag) && |
| 496 reinterpret_cast<RawObject*>(addr)->IsWellFormed() && |
496 reinterpret_cast<RawObject*>(addr)->IsOldObject() && | 497 reinterpret_cast<RawObject*>(addr)->IsOldObject() && |
497 !Isolate::Current()->heap()->CodeContains(addr) && | 498 !Isolate::Current()->heap()->CodeContains(addr) && |
498 Disassembler::CanFindOldObject(addr)) { | 499 Disassembler::CanFindOldObject(addr)) { |
499 NoGCScope no_gc; | 500 NoGCScope no_gc; |
500 const Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr)); | 501 const Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr)); |
501 if (obj.IsArray()) { | 502 if (obj.IsArray()) { |
502 const Array& arr = Array::Cast(obj); | 503 const Array& arr = Array::Cast(obj); |
503 intptr_t len = arr.Length(); | 504 intptr_t len = arr.Length(); |
504 if (len > 5) len = 5; // Print a max of 5 elements. | 505 if (len > 5) len = 5; // Print a max of 5 elements. |
505 Print(" Array["); | 506 Print(" Array["); |
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1848 } | 1849 } |
1849 hex_buffer[hex_index] = '\0'; | 1850 hex_buffer[hex_index] = '\0'; |
1850 if (out_instr_len) { | 1851 if (out_instr_len) { |
1851 *out_instr_len = instruction_length; | 1852 *out_instr_len = instruction_length; |
1852 } | 1853 } |
1853 } | 1854 } |
1854 | 1855 |
1855 } // namespace dart | 1856 } // namespace dart |
1856 | 1857 |
1857 #endif // defined TARGET_ARCH_IA32 | 1858 #endif // defined TARGET_ARCH_IA32 |
OLD | NEW |