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

Side by Side Diff: runtime/vm/disassembler_ia32.cc

Issue 10272017: Fix disassembler crash. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 } 390 }
391 391
392 392
393 void X86Decoder::PrintAddress(uword addr) { 393 void X86Decoder::PrintAddress(uword addr) {
394 NoGCScope no_gc; 394 NoGCScope no_gc;
395 char addr_buffer[32]; 395 char addr_buffer[32];
396 OS::SNPrint(addr_buffer, sizeof(addr_buffer), "%p", addr); 396 OS::SNPrint(addr_buffer, sizeof(addr_buffer), "%p", addr);
397 Print(addr_buffer); 397 Print(addr_buffer);
398 // Try to print as heap object or stub name 398 // Try to print as heap object or stub name
399 if (!Isolate::Current()->heap()->CodeContains(addr) && 399 if (!Isolate::Current()->heap()->CodeContains(addr) &&
400 !Isolate::Current()->heap()->StubCodeContains(addr) &&
400 Isolate::Current()->heap()->Contains(addr - kHeapObjectTag)) { 401 Isolate::Current()->heap()->Contains(addr - kHeapObjectTag)) {
401 Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr)); 402 Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr));
402 if (obj.IsArray()) { 403 if (obj.IsArray()) {
403 const Array& arr = Array::CheckedHandle(obj.raw()); 404 const Array& arr = Array::CheckedHandle(obj.raw());
404 intptr_t len = arr.Length(); 405 intptr_t len = arr.Length();
405 if (len > 5) len = 5; // Print a max of 5 elements. 406 if (len > 5) len = 5; // Print a max of 5 elements.
406 Print(" Array["); 407 Print(" Array[");
407 int i = 0; 408 int i = 0;
408 while (i < len) { 409 while (i < len) {
409 obj = arr.At(i); 410 obj = arr.At(i);
(...skipping 1183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1593 human_buffer, 1594 human_buffer,
1594 sizeof(human_buffer), 1595 sizeof(human_buffer),
1595 pc); 1596 pc);
1596 pc += instruction_length; 1597 pc += instruction_length;
1597 } 1598 }
1598 } 1599 }
1599 1600
1600 } // namespace dart 1601 } // namespace dart
1601 1602
1602 #endif // defined TARGET_ARCH_IA32 1603 #endif // defined TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698