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

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

Issue 10915256: FIx crash in disassembler: check that an addrs is tagged before testing it to be part of the heap. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | runtime/vm/assembler_x64.cc » ('j') | 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/globals.h" 5 #include "vm/globals.h"
6 #if defined(TARGET_ARCH_IA32) 6 #if defined(TARGET_ARCH_IA32)
7 7
8 #include "vm/assembler.h" 8 #include "vm/assembler.h"
9 #include "vm/heap.h" 9 #include "vm/heap.h"
10 #include "vm/memory_region.h" 10 #include "vm/memory_region.h"
(...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1354 addl(ESP, Immediate(stack_elements * kWordSize)); 1354 addl(ESP, Immediate(stack_elements * kWordSize));
1355 } 1355 }
1356 } 1356 }
1357 1357
1358 1358
1359 void Assembler::LoadObject(Register dst, const Object& object) { 1359 void Assembler::LoadObject(Register dst, const Object& object) {
1360 if (object.IsSmi() || object.IsNull()) { 1360 if (object.IsSmi() || object.IsNull()) {
1361 movl(dst, Immediate(reinterpret_cast<int32_t>(object.raw()))); 1361 movl(dst, Immediate(reinterpret_cast<int32_t>(object.raw())));
1362 } else { 1362 } else {
1363 ASSERT(object.IsZoneHandle()); 1363 ASSERT(object.IsZoneHandle());
1364 ASSERT(object.IsOld());
1364 AssemblerBuffer::EnsureCapacity ensured(&buffer_); 1365 AssemblerBuffer::EnsureCapacity ensured(&buffer_);
1365 EmitUint8(0xB8 + dst); 1366 EmitUint8(0xB8 + dst);
1366 buffer_.EmitObject(object); 1367 buffer_.EmitObject(object);
1367 } 1368 }
1368 } 1369 }
1369 1370
1370 1371
1371 void Assembler::PushObject(const Object& object) { 1372 void Assembler::PushObject(const Object& object) {
1372 if (object.IsSmi() || object.IsNull()) { 1373 if (object.IsSmi() || object.IsNull()) {
1373 pushl(Immediate(reinterpret_cast<int32_t>(object.raw()))); 1374 pushl(Immediate(reinterpret_cast<int32_t>(object.raw())));
1374 } else { 1375 } else {
1375 ASSERT(object.IsZoneHandle()); 1376 ASSERT(object.IsZoneHandle());
1377 ASSERT(object.IsOld());
1376 AssemblerBuffer::EnsureCapacity ensured(&buffer_); 1378 AssemblerBuffer::EnsureCapacity ensured(&buffer_);
1377 EmitUint8(0x68); 1379 EmitUint8(0x68);
1378 buffer_.EmitObject(object); 1380 buffer_.EmitObject(object);
1379 } 1381 }
1380 } 1382 }
1381 1383
1382 1384
1383 void Assembler::CompareObject(Register reg, const Object& object) { 1385 void Assembler::CompareObject(Register reg, const Object& object) {
1384 if (object.IsSmi() || object.IsNull()) { 1386 if (object.IsSmi() || object.IsNull()) {
1385 cmpl(reg, Immediate(reinterpret_cast<int32_t>(object.raw()))); 1387 cmpl(reg, Immediate(reinterpret_cast<int32_t>(object.raw())));
1386 } else { 1388 } else {
1387 ASSERT(object.IsZoneHandle()); 1389 ASSERT(object.IsZoneHandle());
1390 ASSERT(object.IsOld());
1388 AssemblerBuffer::EnsureCapacity ensured(&buffer_); 1391 AssemblerBuffer::EnsureCapacity ensured(&buffer_);
1389 if (reg == EAX) { 1392 if (reg == EAX) {
1390 EmitUint8(0x05 + (7 << 3)); 1393 EmitUint8(0x05 + (7 << 3));
1391 buffer_.EmitObject(object); 1394 buffer_.EmitObject(object);
1392 } else { 1395 } else {
1393 EmitUint8(0x81); 1396 EmitUint8(0x81);
1394 EmitOperand(7, Operand(reg)); 1397 EmitOperand(7, Operand(reg));
1395 buffer_.EmitObject(object); 1398 buffer_.EmitObject(object);
1396 } 1399 }
1397 } 1400 }
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
1838 1841
1839 const char* Assembler::XmmRegisterName(XmmRegister reg) { 1842 const char* Assembler::XmmRegisterName(XmmRegister reg) {
1840 ASSERT((0 <= reg) && (reg < kNumberOfXmmRegisters)); 1843 ASSERT((0 <= reg) && (reg < kNumberOfXmmRegisters));
1841 return xmm_reg_names[reg]; 1844 return xmm_reg_names[reg];
1842 } 1845 }
1843 1846
1844 1847
1845 } // namespace dart 1848 } // namespace dart
1846 1849
1847 #endif // defined TARGET_ARCH_IA32 1850 #endif // defined TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/assembler_x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698