commit 6a58cb16d803c9a7b3a75ccac8be19dd9d4e520d
author Dmitry Petrochenko <dmitry.petrochenko@intel.com> Wed Apr 02 17:27:59 2014 +0700
committer Dmitry Petrochenko <dmitry.petrochenko@intel.com> Thu Apr 03 13:06:55 2014 +0700
tree c142777f40178fd9b9090cd7316be694befb3f21
parent 8549cf9d83688f7decbbea2a8de761ce29e95f3c

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>

compiler/dex/quick/mir_to_lir.cc

diff --git a/compiler/dex/quick/mir_to_lir.cc b/compiler/dex/quick/mir_to_lir.cc
index cd3dadb..73fdc82 100644
--- a/compiler/dex/quick/mir_to_lir.cc
+++ b/compiler/dex/quick/mir_to_lir.cc
@@ -43,7 +43,7 @@
       RegStorage::InvalidReg();
 
   int offset = StackVisitor::GetOutVROffset(in_position);
-  if (cu_->instruction_set == kX86) {
+  if (cu_->instruction_set == kX86 || cu_->instruction_set == kX86_64) {
     /*
      * When doing a call for x86, it moves the stack pointer in order to push return.
      * Thus, we add another 4 bytes to figure out the out of caller (in of callee).
@@ -82,7 +82,7 @@
 
 void Mir2Lir::LoadArgDirect(int in_position, RegLocation rl_dest) {
   int offset = StackVisitor::GetOutVROffset(in_position);
-  if (cu_->instruction_set == kX86) {
+  if (cu_->instruction_set == kX86 || cu_->instruction_set == kX86_64) {
     /*
      * When doing a call for x86, it moves the stack pointer in order to push return.
      * Thus, we add another 4 bytes to figure out the out of caller (in of callee).