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

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

Issue 23072026: fix cpp11 compile errors (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 4 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/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 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 intptr_t len = OS::SNPrint(NULL, 0, format, full_class_name) + 1; 460 intptr_t len = OS::SNPrint(NULL, 0, format, full_class_name) + 1;
461 char* chars = Isolate::Current()->current_zone()->Alloc<char>(len); 461 char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
462 OS::SNPrint(chars, len, format, full_class_name); 462 OS::SNPrint(chars, len, format, full_class_name);
463 return chars; 463 return chars;
464 } 464 }
465 465
466 466
467 void X86Decoder::PrintAddress(uword addr) { 467 void X86Decoder::PrintAddress(uword addr) {
468 NoGCScope no_gc; 468 NoGCScope no_gc;
469 char addr_buffer[32]; 469 char addr_buffer[32];
470 OS::SNPrint(addr_buffer, sizeof(addr_buffer), "%#"Px"", addr); 470 OS::SNPrint(addr_buffer, sizeof(addr_buffer), "%#" Px "", addr);
471 Print(addr_buffer); 471 Print(addr_buffer);
472 // Try to print as heap object or stub name 472 // Try to print as heap object or stub name
473 if (((addr & kSmiTagMask) == kHeapObjectTag) && 473 if (((addr & kSmiTagMask) == kHeapObjectTag) &&
474 !Isolate::Current()->heap()->CodeContains(addr) && 474 !Isolate::Current()->heap()->CodeContains(addr) &&
475 Isolate::Current()->heap()->Contains(addr - kHeapObjectTag)) { 475 Isolate::Current()->heap()->Contains(addr - kHeapObjectTag)) {
476 const Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr)); 476 const Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr));
477 if (obj.IsArray()) { 477 if (obj.IsArray()) {
478 const Array& arr = Array::Cast(obj); 478 const Array& arr = Array::Cast(obj);
479 intptr_t len = arr.Length(); 479 intptr_t len = arr.Length();
480 if (len > 5) len = 5; // Print a max of 5 elements. 480 if (len > 5) len = 5; // Print a max of 5 elements.
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1821 pc); 1821 pc);
1822 pc += instruction_length; 1822 pc += instruction_length;
1823 } 1823 }
1824 1824
1825 return; 1825 return;
1826 } 1826 }
1827 1827
1828 } // namespace dart 1828 } // namespace dart
1829 1829
1830 #endif // defined TARGET_ARCH_IA32 1830 #endif // defined TARGET_ARCH_IA32
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698