commit 99f391e48f79421a4d949152aec6bafe1a7b5b82
author Vladimir Marko <vmarko@google.com> Thu Apr 03 12:56:06 2014 +0100
committer Vladimir Marko <vmarko@google.com> Thu Apr 03 12:56:06 2014 +0100
tree 6c7a1fb7e808448e999c548acccefb8c516015ff
parent 5cc2d076cb7854ec2327895e5586f4cbe5e3ee70

Fix Unsafe.getLong()/putLong() for x86, add test.

Change-Id: Id6841ae50e1047543c04dcdae30254dd6ce82082

compiler/dex/quick/gen_invoke.cc

diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc
index 352130d..a90ba04 100644
--- a/compiler/dex/quick/gen_invoke.cc
+++ b/compiler/dex/quick/gen_invoke.cc
@@ -1409,7 +1409,7 @@
   RegLocation rl_result = EvalLoc(rl_dest, kCoreReg, true);
   if (is_long) {
     if (cu_->instruction_set == kX86) {
-      LoadBaseIndexedDisp(rl_object.reg, rl_offset.reg, 1, 0, rl_result.reg.GetLow(),
+      LoadBaseIndexedDisp(rl_object.reg, rl_offset.reg, 0, 0, rl_result.reg.GetLow(),
                           rl_result.reg.GetHigh(), kLong, INVALID_SREG);
     } else {
       RegStorage rl_temp_offset = AllocTemp();
@@ -1457,7 +1457,7 @@
   if (is_long) {
     rl_value = LoadValueWide(rl_src_value, kCoreReg);
     if (cu_->instruction_set == kX86) {
-      StoreBaseIndexedDisp(rl_object.reg, rl_offset.reg, 1, 0, rl_value.reg.GetLow(),
+      StoreBaseIndexedDisp(rl_object.reg, rl_offset.reg, 0, 0, rl_value.reg.GetLow(),
                            rl_value.reg.GetHigh(), kLong, INVALID_SREG);
     } else {
       RegStorage rl_temp_offset = AllocTemp();