diff options
| author | Dmitry Petrochenko <dmitry.petrochenko@intel.com> | 2014-04-02 17:27:59 +0700 |
|---|---|---|
| committer | Dmitry Petrochenko <dmitry.petrochenko@intel.com> | 2014-04-03 13:06:55 +0700 |
| commit | 6a58cb16d803c9a7b3a75ccac8be19dd9d4e520d (patch) | |
| tree | c142777f40178fd9b9090cd7316be694befb3f21 /compiler/dex/mir_optimization.cc | |
| parent | 8549cf9d83688f7decbbea2a8de761ce29e95f3c (diff) | |
| download | android_art-6a58cb16d803c9a7b3a75ccac8be19dd9d4e520d.tar.gz android_art-6a58cb16d803c9a7b3a75ccac8be19dd9d4e520d.tar.bz2 android_art-6a58cb16d803c9a7b3a75ccac8be19dd9d4e520d.zip | |
art: Handle x86_64 architecture equal to x86
This patch forces FE/ME to treat x86_64 as x86 exactly.
The x86_64 logic will be revised later when assembly will be ready.
Change-Id: I4a92477a6eeaa9a11fd710d35c602d8d6f88cbb6
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Diffstat (limited to 'compiler/dex/mir_optimization.cc')
| -rw-r--r-- | compiler/dex/mir_optimization.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc index 45c8d875dc..51419f4586 100644 --- a/compiler/dex/mir_optimization.cc +++ b/compiler/dex/mir_optimization.cc @@ -408,7 +408,7 @@ bool MIRGraph::BasicBlockOpt(BasicBlock* bb) { // TODO: flesh out support for Mips. NOTE: llvm's select op doesn't quite work here. // TUNING: expand to support IF_xx compare & branches if (!cu_->compiler->IsPortable() && - (cu_->instruction_set == kThumb2 || cu_->instruction_set == kX86) && + (cu_->instruction_set == kThumb2 || cu_->instruction_set == kX86 || cu_->instruction_set == kX86_64) && IsInstructionIfCcZ(mir->dalvikInsn.opcode)) { BasicBlock* ft = GetBasicBlock(bb->fall_through); DCHECK(ft != NULL); |