commit c0a61fc79e5070f2a16e7dbb7ecf451d13405b45
author Ian Rogers <irogers@google.com> Tue Nov 20 16:23:32 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 20 16:23:32 2012 -0800
tree 83ea16f96e728e09a0d6e1e52f62796683c2c620
parent f1d39fd9951d84c391de28009d2958c0f07d1e57
parent 373c52fd70336531010268a2de4f7d3b0f236924

Merge "Added CheckSuspend and UpdateDebugger to interpreter loop." into dalvik-dev

src/invoke_arg_array_builder.h

diff --git a/src/invoke_arg_array_builder.h b/src/invoke_arg_array_builder.h
index 0664ef8..5d4fa5a 100644
--- a/src/invoke_arg_array_builder.h
+++ b/src/invoke_arg_array_builder.h
@@ -130,32 +130,32 @@
     for (size_t i = 1, offset = 0; i < shorty_len_; ++i, ++offset) {
       switch (shorty_[i]) {
         case 'Z':
-          arg_array_[offset].SetZ(shadow_frame.GetVReg(range_start + offset));
+          arg_array_[i - 1].SetZ(shadow_frame.GetVReg(range_start + offset));
           break;
         case 'B':
-          arg_array_[offset].SetB(shadow_frame.GetVReg(range_start + offset));
+          arg_array_[i - 1].SetB(shadow_frame.GetVReg(range_start + offset));
           break;
         case 'C':
-          arg_array_[offset].SetC(shadow_frame.GetVReg(range_start + offset));
+          arg_array_[i - 1].SetC(shadow_frame.GetVReg(range_start + offset));
           break;
         case 'S':
-          arg_array_[offset].SetS(shadow_frame.GetVReg(range_start + offset));
+          arg_array_[i - 1].SetS(shadow_frame.GetVReg(range_start + offset));
           break;
         case 'I':
-          arg_array_[offset].SetI(shadow_frame.GetVReg(range_start + offset));
+          arg_array_[i - 1].SetI(shadow_frame.GetVReg(range_start + offset));
           break;
         case 'F':
-          arg_array_[offset].SetF(shadow_frame.GetVRegFloat(range_start + offset));
+          arg_array_[i - 1].SetF(shadow_frame.GetVRegFloat(range_start + offset));
           break;
         case 'L':
-          arg_array_[offset].SetL(shadow_frame.GetReference(range_start + offset));
+          arg_array_[i - 1].SetL(shadow_frame.GetReference(range_start + offset));
           break;
         case 'D':
-          arg_array_[offset].SetD(shadow_frame.GetVRegDouble(range_start + offset));
+          arg_array_[i - 1].SetD(shadow_frame.GetVRegDouble(range_start + offset));
           offset++;
           break;
         case 'J':
-          arg_array_[offset].SetJ(shadow_frame.GetVRegLong(range_start + offset));
+          arg_array_[i - 1].SetJ(shadow_frame.GetVRegLong(range_start + offset));
           offset++;
           break;
       }
@@ -167,32 +167,32 @@
     for (size_t i = 1, offset = 0; i < shorty_len_; ++i, ++offset) {
       switch (shorty_[i]) {
         case 'Z':
-          arg_array_[offset].SetZ(shadow_frame.GetVReg(arg_regs[offset]));
+          arg_array_[i - 1].SetZ(shadow_frame.GetVReg(arg_regs[offset]));
           break;
         case 'B':
-          arg_array_[offset].SetB(shadow_frame.GetVReg(arg_regs[offset]));
+          arg_array_[i - 1].SetB(shadow_frame.GetVReg(arg_regs[offset]));
           break;
         case 'C':
-          arg_array_[offset].SetC(shadow_frame.GetVReg(arg_regs[offset]));
+          arg_array_[i - 1].SetC(shadow_frame.GetVReg(arg_regs[offset]));
           break;
         case 'S':
-          arg_array_[offset].SetS(shadow_frame.GetVReg(arg_regs[offset]));
+          arg_array_[i - 1].SetS(shadow_frame.GetVReg(arg_regs[offset]));
           break;
         case 'I':
-          arg_array_[offset].SetI(shadow_frame.GetVReg(arg_regs[offset]));
+          arg_array_[i - 1].SetI(shadow_frame.GetVReg(arg_regs[offset]));
           break;
         case 'F':
-          arg_array_[offset].SetF(shadow_frame.GetVRegFloat(arg_regs[offset]));
+          arg_array_[i - 1].SetF(shadow_frame.GetVRegFloat(arg_regs[offset]));
           break;
         case 'L':
-          arg_array_[offset].SetL(shadow_frame.GetReference(arg_regs[offset]));
+          arg_array_[i - 1].SetL(shadow_frame.GetReference(arg_regs[offset]));
           break;
         case 'D':
-          arg_array_[offset].SetD(shadow_frame.GetVRegDouble(arg_regs[offset]));
+          arg_array_[i - 1].SetD(shadow_frame.GetVRegDouble(arg_regs[offset]));
           offset++;
           break;
         case 'J':
-          arg_array_[offset].SetJ(shadow_frame.GetVRegLong(arg_regs[offset]));
+          arg_array_[i - 1].SetJ(shadow_frame.GetVRegLong(arg_regs[offset]));
           offset++;
           break;
       }