diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-06 21:06:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-06 21:07:44 +0000 |
| commit | 41b15f9f06c7e2e5aac13f709c66412e6c299b67 (patch) | |
| tree | 612885348ebff77bd74b2bef63112f864563b6e7 /compiler/dex/quick/gen_common.cc | |
| parent | 3b5408b565509341301e6da82f3d07c75aad5f51 (diff) | |
| parent | 6ea651f0f4c7de4580beb2e887d86802c1ae0738 (diff) | |
| download | art-41b15f9f06c7e2e5aac13f709c66412e6c299b67.zip art-41b15f9f06c7e2e5aac13f709c66412e6c299b67.tar.gz art-41b15f9f06c7e2e5aac13f709c66412e6c299b67.tar.bz2 | |
Merge "Initial support for quick compiler on MIPS64r6."
Diffstat (limited to 'compiler/dex/quick/gen_common.cc')
| -rw-r--r-- | compiler/dex/quick/gen_common.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/dex/quick/gen_common.cc b/compiler/dex/quick/gen_common.cc index afae89d..e57889a 100644 --- a/compiler/dex/quick/gen_common.cc +++ b/compiler/dex/quick/gen_common.cc @@ -482,6 +482,7 @@ void Mir2Lir::GenFilledNewArray(CallInfo* info) { r_val = AllocTemp(); break; case kMips: + case kMips64: r_val = AllocTemp(); break; default: LOG(FATAL) << "Unexpected instruction set: " << cu_->instruction_set; @@ -1695,7 +1696,8 @@ void Mir2Lir::GenArithOpInt(Instruction::Code opcode, RegLocation rl_dest, StoreValue(rl_dest, rl_result); } else { bool done = false; // Set to true if we happen to find a way to use a real instruction. - if (cu_->instruction_set == kMips || cu_->instruction_set == kArm64) { + if (cu_->instruction_set == kMips || cu_->instruction_set == kMips64 || + cu_->instruction_set == kArm64) { rl_src1 = LoadValue(rl_src1, kCoreReg); rl_src2 = LoadValue(rl_src2, kCoreReg); if (check_zero && (flags & MIR_IGNORE_DIV_ZERO_CHECK) == 0) { @@ -1990,7 +1992,8 @@ void Mir2Lir::GenArithOpIntLit(Instruction::Code opcode, RegLocation rl_dest, Re } bool done = false; - if (cu_->instruction_set == kMips || cu_->instruction_set == kArm64) { + if (cu_->instruction_set == kMips || cu_->instruction_set == kMips64 || + cu_->instruction_set == kArm64) { rl_src = LoadValue(rl_src, kCoreReg); rl_result = GenDivRemLit(rl_dest, rl_src.reg, lit, is_div); done = true; |