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

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

Issue 827453003: Fix builds on Mac: icount_ is intptr_t. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 12 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 | « runtime/vm/simulator_arm.cc ('k') | runtime/vm/simulator_mips.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) 2014, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2014, 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 <setjmp.h> 5 #include <setjmp.h>
6 #include <stdlib.h> 6 #include <stdlib.h>
7 7
8 #include "vm/globals.h" 8 #include "vm/globals.h"
9 #if defined(TARGET_ARCH_ARM64) 9 #if defined(TARGET_ARCH_ARM64)
10 10
(...skipping 3269 matching lines...) Expand 10 before | Expand all | Expand 10 after
3280 } else { 3280 } else {
3281 UnimplementedInstruction(instr); 3281 UnimplementedInstruction(instr);
3282 } 3282 }
3283 } 3283 }
3284 3284
3285 3285
3286 // Executes the current instruction. 3286 // Executes the current instruction.
3287 void Simulator::InstructionDecode(Instr* instr) { 3287 void Simulator::InstructionDecode(Instr* instr) {
3288 pc_modified_ = false; 3288 pc_modified_ = false;
3289 if (IsTracingExecution()) { 3289 if (IsTracingExecution()) {
3290 OS::Print("%"Pu64" ", icount_); 3290 OS::Print("%" Pd " ", icount_);
3291 const uword start = reinterpret_cast<uword>(instr); 3291 const uword start = reinterpret_cast<uword>(instr);
3292 const uword end = start + Instr::kInstrSize; 3292 const uword end = start + Instr::kInstrSize;
3293 Disassembler::Disassemble(start, end); 3293 Disassembler::Disassemble(start, end);
3294 } 3294 }
3295 3295
3296 if (instr->IsDPImmediateOp()) { 3296 if (instr->IsDPImmediateOp()) {
3297 DecodeDPImmediate(instr); 3297 DecodeDPImmediate(instr);
3298 } else if (instr->IsCompareBranchOp()) { 3298 } else if (instr->IsCompareBranchOp()) {
3299 DecodeCompareBranch(instr); 3299 DecodeCompareBranch(instr);
3300 } else if (instr->IsLoadStoreOp()) { 3300 } else if (instr->IsLoadStoreOp()) {
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
3485 set_register(NULL, kExceptionObjectReg, bit_cast<int64_t>(raw_exception)); 3485 set_register(NULL, kExceptionObjectReg, bit_cast<int64_t>(raw_exception));
3486 set_register(NULL, kStackTraceObjectReg, bit_cast<int64_t>(raw_stacktrace)); 3486 set_register(NULL, kStackTraceObjectReg, bit_cast<int64_t>(raw_stacktrace));
3487 buf->Longjmp(); 3487 buf->Longjmp();
3488 } 3488 }
3489 3489
3490 } // namespace dart 3490 } // namespace dart
3491 3491
3492 #endif // !defined(HOST_ARCH_ARM64) 3492 #endif // !defined(HOST_ARCH_ARM64)
3493 3493
3494 #endif // defined TARGET_ARCH_ARM64 3494 #endif // defined TARGET_ARCH_ARM64
OLDNEW
« no previous file with comments | « runtime/vm/simulator_arm.cc ('k') | runtime/vm/simulator_mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698