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

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

Issue 1331623002: Uses SNPRINT macro where possible. Otherwise uses #define for format. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 3 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
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_X64) 8 #if defined(TARGET_ARCH_X64)
9 #include "platform/utils.h" 9 #include "platform/utils.h"
10 #include "vm/allocation.h" 10 #include "vm/allocation.h"
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 obj.IsBool() || 789 obj.IsBool() ||
790 obj.IsClass() || 790 obj.IsClass() ||
791 obj.IsFunction() || 791 obj.IsFunction() ||
792 obj.IsICData() || 792 obj.IsICData() ||
793 obj.IsField()) { 793 obj.IsField()) {
794 return obj.ToCString(); 794 return obj.ToCString();
795 } 795 }
796 796
797 const Class& clazz = Class::Handle(obj.clazz()); 797 const Class& clazz = Class::Handle(obj.clazz());
798 const char* full_class_name = clazz.ToCString(); 798 const char* full_class_name = clazz.ToCString();
799 const char* format = "instance of %s"; 799 char* chars = NULL;
800 intptr_t len = OS::SNPrint(NULL, 0, format, full_class_name) + 1; 800 SNPRINT(chars, Thread::Current()->zone()->Alloc<char>, "instance of %s",
801 char* chars = Thread::Current()->zone()->Alloc<char>(len); 801 full_class_name);
802 OS::SNPrint(chars, len, format, full_class_name);
803 return chars; 802 return chars;
804 } 803 }
805 804
806 805
807 void DisassemblerX64::AppendAddressToBuffer(uint8_t* addr_byte_ptr) { 806 void DisassemblerX64::AppendAddressToBuffer(uint8_t* addr_byte_ptr) {
808 uword addr = reinterpret_cast<uword>(addr_byte_ptr); 807 uword addr = reinterpret_cast<uword>(addr_byte_ptr);
809 AppendToBuffer("%#" Px "", addr); 808 AppendToBuffer("%#" Px "", addr);
810 // Try to print as heap object or stub name 809 // Try to print as heap object or stub name
811 if (((addr & kSmiTagMask) == kHeapObjectTag) && 810 if (((addr & kSmiTagMask) == kHeapObjectTag) &&
812 reinterpret_cast<RawObject*>(addr)->IsWellFormed() && 811 reinterpret_cast<RawObject*>(addr)->IsWellFormed() &&
(...skipping 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after
1952 } 1951 }
1953 hex_buffer[hex_index] = '\0'; 1952 hex_buffer[hex_index] = '\0';
1954 if (out_instr_len) { 1953 if (out_instr_len) {
1955 *out_instr_len = instruction_length; 1954 *out_instr_len = instruction_length;
1956 } 1955 }
1957 } 1956 }
1958 1957
1959 } // namespace dart 1958 } // namespace dart
1960 1959
1961 #endif // defined TARGET_ARCH_X64 1960 #endif // defined TARGET_ARCH_X64
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698