*** old/src/cpu/x86/vm/methodHandles_x86.cpp	Tue Jun 14 10:10:11 2011
--- new/src/cpu/x86/vm/methodHandles_x86.cpp	Tue Jun 14 10:10:10 2011

*** 1631,1648 ****
--- 1631,1650 ----
            // work argslot up to destslot, copying contiguous data downwards
            // pseudo-code:
            //   rax = src_addr + swap_bytes
            //   rbx = dest_addr
            //   while (rax <= rbx) *(rax - swap_bytes) = *(rax + 0), rax++;
            __ addptr(rbx_destslot, wordSize);
+           // dest_slot denotes an exclusive upper limit
+           int limit_bias = OP_ROT_ARGS_DOWN_LIMIT_BIAS;
+           if (limit_bias != 0)
+             __ addptr(rbx_destslot, - limit_bias * wordSize);
            move_arg_slots_down(_masm,
                                Address(rax_argslot, swap_slots * wordSize),
                                rbx_destslot,
                                -swap_slots,
                                rax_argslot, rdx_temp);
  
            __ subptr(rbx_destslot, wordSize);
+           __ subptr(rbx_destslot, swap_slots * wordSize);
          }
          // pop the original first chunk into the destination slot, now free
          for (int i = 0; i < swap_slots; i++) {
            if (i == 0)  __ movptr(Address(rbx_destslot, i * wordSize), rdi_temp);
            else         __ popptr(Address(rbx_destslot, i * wordSize));