diff options
| author | 2015-03-06 21:06:59 +0000 | |
|---|---|---|
| committer | 2015-03-06 21:07:44 +0000 | |
| commit | 41b15f9f06c7e2e5aac13f709c66412e6c299b67 (patch) | |
| tree | 612885348ebff77bd74b2bef63112f864563b6e7 /compiler/dex/quick/codegen_util.cc | |
| parent | 3b5408b565509341301e6da82f3d07c75aad5f51 (diff) | |
| parent | 6ea651f0f4c7de4580beb2e887d86802c1ae0738 (diff) | |
Merge "Initial support for quick compiler on MIPS64r6."
Diffstat (limited to 'compiler/dex/quick/codegen_util.cc')
| -rw-r--r-- | compiler/dex/quick/codegen_util.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 0bac511dd1..029c0ca8c0 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -541,6 +541,7 @@ void Mir2Lir::InstallSwitchTables() { break; case kArm64: case kMips: + case kMips64: bx_offset = tab_rec->anchor->offset; break; default: LOG(FATAL) << "Unexpected instruction set: " << cu_->instruction_set; @@ -1203,6 +1204,7 @@ void Mir2Lir::LoadCodeAddress(const MethodReference& target_method, InvokeType t LIR* load_pc_rel = OpPcRelLoad(TargetPtrReg(symbolic_reg), data_target); AppendLIR(load_pc_rel); DCHECK_NE(cu_->instruction_set, kMips) << reinterpret_cast<void*>(data_target); + DCHECK_NE(cu_->instruction_set, kMips64) << reinterpret_cast<void*>(data_target); } void Mir2Lir::LoadMethodAddress(const MethodReference& target_method, InvokeType type, @@ -1220,6 +1222,7 @@ void Mir2Lir::LoadMethodAddress(const MethodReference& target_method, InvokeType LIR* load_pc_rel = OpPcRelLoad(TargetReg(symbolic_reg, kRef), data_target); AppendLIR(load_pc_rel); DCHECK_NE(cu_->instruction_set, kMips) << reinterpret_cast<void*>(data_target); + DCHECK_NE(cu_->instruction_set, kMips64) << reinterpret_cast<void*>(data_target); } void Mir2Lir::LoadClassType(const DexFile& dex_file, uint32_t type_idx, |