src/cpu/x86/vm/methodHandles_x86.cpp

rev 1079 : 6829192: JSR 292 needs to support 64-bit x86
Summary: changes for method handles and invokedynamic
Reviewed-by: ?, ?
rev 1080 : [mq]: meth.walker.patch
rev 1081 : imported patch indy-cleanup-6893081.patch

*** 63,75 ****
  static void verify_argslot(MacroAssembler* _masm, Register rax_argslot,
                             const char* error_message) {
    // Verify that argslot lies within (rsp, rbp].
    Label L_ok, L_bad;
    __ cmpptr(rax_argslot, rbp);
!   __ jcc(Assembler::above, L_bad);
    __ cmpptr(rsp, rax_argslot);
!   __ jcc(Assembler::below, L_ok);
    __ bind(L_bad);
    __ stop(error_message);
    __ bind(L_ok);
  }
  #endif
--- 63,75 ----
  static void verify_argslot(MacroAssembler* _masm, Register rax_argslot,
                             const char* error_message) {
    // Verify that argslot lies within (rsp, rbp].
    Label L_ok, L_bad;
    __ cmpptr(rax_argslot, rbp);
!   __ jccb(Assembler::above, L_bad);
    __ cmpptr(rsp, rax_argslot);
!   __ jccb(Assembler::below, L_ok);
    __ bind(L_bad);
    __ stop(error_message);
    __ bind(L_ok);
  }
  #endif
*** 134,146 ****
  #ifdef ASSERT
    verify_argslot(_masm, rax_argslot, "insertion point must fall within current frame");
    if (arg_slots.is_register()) {
      Label L_ok, L_bad;
      __ cmpptr(arg_slots.as_register(), (int32_t) NULL_WORD);
!     __ jcc(Assembler::greater, L_bad);
      __ testl(arg_slots.as_register(), -stack_move_unit() - 1);
!     __ jcc(Assembler::zero, L_ok);
      __ bind(L_bad);
      __ stop("assert arg_slots <= 0 and clear low bits");
      __ bind(L_ok);
    } else {
      assert(arg_slots.as_constant() <= 0, "");
--- 134,146 ----
  #ifdef ASSERT
    verify_argslot(_masm, rax_argslot, "insertion point must fall within current frame");
    if (arg_slots.is_register()) {
      Label L_ok, L_bad;
      __ cmpptr(arg_slots.as_register(), (int32_t) NULL_WORD);
!     __ jccb(Assembler::greater, L_bad);
      __ testl(arg_slots.as_register(), -stack_move_unit() - 1);
!     __ jccb(Assembler::zero, L_ok);
      __ bind(L_bad);
      __ stop("assert arg_slots <= 0 and clear low bits");
      __ bind(L_ok);
    } else {
      assert(arg_slots.as_constant() <= 0, "");
*** 171,181 ****
      // pull one word down each time through the loop
      __ movptr(rbx_temp, Address(rdx_temp, 0));
      __ movptr(Address(rdx_temp, arg_slots, Address::times_ptr), rbx_temp);
      __ addptr(rdx_temp, wordSize);
      __ cmpptr(rdx_temp, rax_argslot);
!     __ jcc(Assembler::less, loop);
    }
  
    // Now move the argslot down, to point to the opened-up space.
    __ lea(rax_argslot, Address(rax_argslot, arg_slots, Address::times_ptr));
  
--- 171,181 ----
      // pull one word down each time through the loop
      __ movptr(rbx_temp, Address(rdx_temp, 0));
      __ movptr(Address(rdx_temp, arg_slots, Address::times_ptr), rbx_temp);
      __ addptr(rdx_temp, wordSize);
      __ cmpptr(rdx_temp, rax_argslot);
!     __ jccb(Assembler::less, loop);
    }
  
    // Now move the argslot down, to point to the opened-up space.
    __ lea(rax_argslot, Address(rax_argslot, arg_slots, Address::times_ptr));
  
*** 209,231 ****
    {
      // Verify that [argslot..argslot+size) lies within (rsp, rbp).
      Label L_ok, L_bad;
      __ lea(rbx_temp, Address(rax_argslot, arg_slots, Address::times_ptr));
      __ cmpptr(rbx_temp, rbp);
!     __ jcc(Assembler::above, L_bad);
      __ cmpptr(rsp, rax_argslot);
!     __ jcc(Assembler::below, L_ok);
      __ bind(L_bad);
      __ stop("deleted argument(s) must fall within current frame");
      __ bind(L_ok);
    }
    if (arg_slots.is_register()) {
      Label L_ok, L_bad;
      __ cmpptr(arg_slots.as_register(), (int32_t) NULL_WORD);
!     __ jcc(Assembler::less, L_bad);
      __ testl(arg_slots.as_register(), -stack_move_unit() - 1);
!     __ jcc(Assembler::zero, L_ok);
      __ bind(L_bad);
      __ stop("assert arg_slots >= 0 and clear low bits");
      __ bind(L_ok);
    } else {
      assert(arg_slots.as_constant() >= 0, "");
--- 209,231 ----
    {
      // Verify that [argslot..argslot+size) lies within (rsp, rbp).
      Label L_ok, L_bad;
      __ lea(rbx_temp, Address(rax_argslot, arg_slots, Address::times_ptr));
      __ cmpptr(rbx_temp, rbp);
!     __ jccb(Assembler::above, L_bad);
      __ cmpptr(rsp, rax_argslot);
!     __ jccb(Assembler::below, L_ok);
      __ bind(L_bad);
      __ stop("deleted argument(s) must fall within current frame");
      __ bind(L_ok);
    }
    if (arg_slots.is_register()) {
      Label L_ok, L_bad;
      __ cmpptr(arg_slots.as_register(), (int32_t) NULL_WORD);
!     __ jccb(Assembler::less, L_bad);
      __ testl(arg_slots.as_register(), -stack_move_unit() - 1);
!     __ jccb(Assembler::zero, L_ok);
      __ bind(L_bad);
      __ stop("assert arg_slots >= 0 and clear low bits");
      __ bind(L_ok);
    } else {
      assert(arg_slots.as_constant() >= 0, "");
*** 256,266 ****
      // pull one word up each time through the loop
      __ movptr(rbx_temp, Address(rdx_temp, 0));
      __ movptr(Address(rdx_temp, arg_slots, Address::times_ptr), rbx_temp);
      __ addptr(rdx_temp, -wordSize);
      __ cmpptr(rdx_temp, rsp);
!     __ jcc(Assembler::greaterEqual, loop);
    }
  
    // Now move the argslot up, to point to the just-copied block.
    __ lea(rsp, Address(rsp, arg_slots, Address::times_ptr));
    // And adjust the argslot address to point at the deletion point.
--- 256,266 ----
      // pull one word up each time through the loop
      __ movptr(rbx_temp, Address(rdx_temp, 0));
      __ movptr(Address(rdx_temp, arg_slots, Address::times_ptr), rbx_temp);
      __ addptr(rdx_temp, -wordSize);
      __ cmpptr(rdx_temp, rsp);
!     __ jccb(Assembler::greaterEqual, loop);
    }
  
    // Now move the argslot up, to point to the just-copied block.
    __ lea(rsp, Address(rsp, arg_slots, Address::times_ptr));
    // And adjust the argslot address to point at the deletion point.
*** 382,396 ****
        Register rbx_method = rbx_temp;
        Label no_method;
        // FIXME: fill in _raise_exception_method with a suitable sun.dyn method
        __ movptr(rbx_method, ExternalAddress((address) &_raise_exception_method));
        __ testptr(rbx_method, rbx_method);
!       __ jcc(Assembler::zero, no_method);
        int jobject_oop_offset = 0;
        __ movptr(rbx_method, Address(rbx_method, jobject_oop_offset));  // dereference the jobject
        __ testptr(rbx_method, rbx_method);
!       __ jcc(Assembler::zero, no_method);
        __ verify_oop(rbx_method);
        __ push(rdi_pc);          // and restore caller PC
        __ jmp(rbx_method_fie);
  
        // If we get here, the Java runtime did not do its job of creating the exception.
--- 382,396 ----
        Register rbx_method = rbx_temp;
        Label no_method;
        // FIXME: fill in _raise_exception_method with a suitable sun.dyn method
        __ movptr(rbx_method, ExternalAddress((address) &_raise_exception_method));
        __ testptr(rbx_method, rbx_method);
!       __ jccb(Assembler::zero, no_method);
        int jobject_oop_offset = 0;
        __ movptr(rbx_method, Address(rbx_method, jobject_oop_offset));  // dereference the jobject
        __ testptr(rbx_method, rbx_method);
!       __ jccb(Assembler::zero, no_method);
        __ verify_oop(rbx_method);
        __ push(rdi_pc);          // and restore caller PC
        __ jmp(rbx_method_fie);
  
        // If we get here, the Java runtime did not do its job of creating the exception.
*** 533,552 ****
        __ movptr(rbx_temp, rcx_bmh_argument);
        Address prim_value_addr(rbx_temp, java_lang_boxing_object::value_offset_in_bytes(arg_type));
        if (arg_type == T_OBJECT) {
          __ movptr(Address(rax_argslot, 0), rbx_temp);
        } else {
!         __ load_sized_value(rbx_temp, prim_value_addr,
                              type2aelembytes(arg_type), is_signed_subword_type(arg_type));
!         __ movptr(Address(rax_argslot, 0), rbx_temp);
  #ifndef _LP64
          if (arg_slots == 2) {
!           __ movl(rbx_temp, prim_value_addr.plus_disp(wordSize));
!           __ movl(Address(rax_argslot, Interpreter::stackElementSize()), rbx_temp);
          }
  #endif //_LP64
-         break;
        }
  
        if (direct_to_method) {
          Register rbx_method = rbx_temp;
          __ movptr(rbx_method, rcx_mh_vmtarget);
--- 533,551 ----
        __ movptr(rbx_temp, rcx_bmh_argument);
        Address prim_value_addr(rbx_temp, java_lang_boxing_object::value_offset_in_bytes(arg_type));
        if (arg_type == T_OBJECT) {
          __ movptr(Address(rax_argslot, 0), rbx_temp);
        } else {
!         __ load_sized_value(rdx_temp, prim_value_addr,
                              type2aelembytes(arg_type), is_signed_subword_type(arg_type));
!         __ movptr(Address(rax_argslot, 0), rdx_temp);
  #ifndef _LP64
          if (arg_slots == 2) {
!           __ movl(rdx_temp, prim_value_addr.plus_disp(wordSize));
!           __ movl(Address(rax_argslot, Interpreter::stackElementSize()), rdx_temp);
          }
  #endif //_LP64
        }
  
        if (direct_to_method) {
          Register rbx_method = rbx_temp;
          __ movptr(rbx_method, rcx_mh_vmtarget);
*** 584,594 ****
        __ movptr(rbx_klass, Address(rbx_klass, java_lang_Class::klass_offset_in_bytes()));
  
        Label done;
        __ movptr(rdx_temp, vmarg);
        __ testl(rdx_temp, rdx_temp);
!       __ jcc(Assembler::zero, done);          // no cast if null
        __ load_klass(rdx_temp, rdx_temp);
  
        // live at this point:
        // - rbx_klass:  klass required by the target method
        // - rdx_temp:   argument klass to test
--- 583,593 ----
        __ movptr(rbx_klass, Address(rbx_klass, java_lang_Class::klass_offset_in_bytes()));
  
        Label done;
        __ movptr(rdx_temp, vmarg);
        __ testl(rdx_temp, rdx_temp);
!       __ jccb(Assembler::zero, done);         // no cast if null
        __ load_klass(rdx_temp, rdx_temp);
  
        // live at this point:
        // - rbx_klass:  klass required by the target method
        // - rdx_temp:   argument klass to test
*** 675,702 ****
        // get the new MH:
        __ movptr(rcx_recv, rcx_mh_vmtarget);
        // (now we are done with the old MH)
  
        // original 32-bit vmdata word must be of this form:
!       //    | MBZ:16 | signBitCount:8 | srcDstTypes:8 | conversionOp:8 |
!       __ xchgl(rcx, rbx_vminfo);                // free rcx for shifts
        __ shll(rdx_temp /*, rcx*/);
        Label zero_extend, done;
        __ testl(rcx, CONV_VMINFO_SIGN_FLAG);
!       __ jcc(Assembler::zero, zero_extend);
  
        // this path is taken for int->byte, int->short
        __ sarl(rdx_temp /*, rcx*/);
!       __ jmp(done);
  
        __ bind(zero_extend);
        // this is taken for int->char
        __ shrl(rdx_temp /*, rcx*/);
  
        __ bind(done);
!       __ movptr(vmarg, rdx_temp);
!       __ xchgl(rcx, rbx_vminfo);                // restore rcx_recv
  
        __ jump_to_method_handle_entry(rcx_recv, rdx_temp);
      }
      break;
  
--- 674,701 ----
        // get the new MH:
        __ movptr(rcx_recv, rcx_mh_vmtarget);
        // (now we are done with the old MH)
  
        // original 32-bit vmdata word must be of this form:
!       //    | MBZ:6 | signBitCount:8 | srcDstTypes:8 | conversionOp:8 |
!       __ xchgptr(rcx, rbx_vminfo);                // free rcx for shifts
        __ shll(rdx_temp /*, rcx*/);
        Label zero_extend, done;
        __ testl(rcx, CONV_VMINFO_SIGN_FLAG);
!       __ jccb(Assembler::zero, zero_extend);
  
        // this path is taken for int->byte, int->short
        __ sarl(rdx_temp /*, rcx*/);
!       __ jmpb(done);
  
        __ bind(zero_extend);
        // this is taken for int->char
        __ shrl(rdx_temp /*, rcx*/);
  
        __ bind(done);
!       __ movl(vmarg, rdx_temp);
!       __ xchgptr(rcx, rbx_vminfo);                // restore rcx_recv
  
        __ jump_to_method_handle_entry(rcx_recv, rdx_temp);
      }
      break;
  
*** 861,871 ****
  #ifdef ASSERT
            {
              // Verify that argslot > destslot, by at least swap_bytes.
              Label L_ok;
              __ cmpptr(rax_argslot, rbx_destslot);
!             __ jcc(Assembler::aboveEqual, L_ok);
              __ stop("source must be above destination (upward rotation)");
              __ bind(L_ok);
            }
  #endif
            // work argslot down to destslot, copying contiguous data upwards
--- 860,870 ----
  #ifdef ASSERT
            {
              // Verify that argslot > destslot, by at least swap_bytes.
              Label L_ok;
              __ cmpptr(rax_argslot, rbx_destslot);
!             __ jccb(Assembler::aboveEqual, L_ok);
              __ stop("source must be above destination (upward rotation)");
              __ bind(L_ok);
            }
  #endif
            // work argslot down to destslot, copying contiguous data upwards
*** 877,895 ****
            __ bind(loop);
            __ movptr(rdx_temp, Address(rax_argslot, 0));
            __ movptr(Address(rax_argslot, swap_bytes), rdx_temp);
            __ addptr(rax_argslot, -wordSize);
            __ cmpptr(rax_argslot, rbx_destslot);
!           __ jcc(Assembler::aboveEqual, loop);
          } else {
            __ addptr(rax_argslot, swap_bytes);
  #ifdef ASSERT
            {
              // Verify that argslot < destslot, by at least swap_bytes.
              Label L_ok;
              __ cmpptr(rax_argslot, rbx_destslot);
!             __ jcc(Assembler::belowEqual, L_ok);
              __ stop("source must be below destination (downward rotation)");
              __ bind(L_ok);
            }
  #endif
            // work argslot up to destslot, copying contiguous data downwards
--- 876,894 ----
            __ bind(loop);
            __ movptr(rdx_temp, Address(rax_argslot, 0));
            __ movptr(Address(rax_argslot, swap_bytes), rdx_temp);
            __ addptr(rax_argslot, -wordSize);
            __ cmpptr(rax_argslot, rbx_destslot);
!           __ jccb(Assembler::aboveEqual, loop);
          } else {
            __ addptr(rax_argslot, swap_bytes);
  #ifdef ASSERT
            {
              // Verify that argslot < destslot, by at least swap_bytes.
              Label L_ok;
              __ cmpptr(rax_argslot, rbx_destslot);
!             __ jccb(Assembler::belowEqual, L_ok);
              __ stop("source must be below destination (downward rotation)");
              __ bind(L_ok);
            }
  #endif
            // work argslot up to destslot, copying contiguous data downwards
*** 901,911 ****
            __ bind(loop);
            __ movptr(rdx_temp, Address(rax_argslot, 0));
            __ movptr(Address(rax_argslot, -swap_bytes), rdx_temp);
            __ addptr(rax_argslot, wordSize);
            __ cmpptr(rax_argslot, rbx_destslot);
!           __ jcc(Assembler::belowEqual, loop);
          }
  
          // pop the original first chunk into the destination slot, now free
          for (int i = 0; i < swap_bytes; i += wordSize) {
            __ pop(rdx_temp);
--- 900,910 ----
            __ bind(loop);
            __ movptr(rdx_temp, Address(rax_argslot, 0));
            __ movptr(Address(rax_argslot, -swap_bytes), rdx_temp);
            __ addptr(rax_argslot, wordSize);
            __ cmpptr(rax_argslot, rbx_destslot);
!           __ jccb(Assembler::belowEqual, loop);
          }
  
          // pop the original first chunk into the destination slot, now free
          for (int i = 0; i < swap_bytes; i += wordSize) {
            __ pop(rdx_temp);
*** 967,977 ****
        __ movptr(rdi, Address(rax_argslot, 0));
        __ movptr(Address(rdx_newarg, 0), rdi);
        __ addptr(rax_argslot, wordSize);
        __ addptr(rdx_newarg, wordSize);
        __ cmpptr(rdx_newarg, rbx_oldarg);
!       __ jcc(Assembler::less, loop);
  
        __ pop(rdi);              // restore temp
  
        __ movptr(rcx_recv, rcx_mh_vmtarget);
        __ jump_to_method_handle_entry(rcx_recv, rdx_temp);
--- 966,976 ----
        __ movptr(rdi, Address(rax_argslot, 0));
        __ movptr(Address(rdx_newarg, 0), rdi);
        __ addptr(rax_argslot, wordSize);
        __ addptr(rdx_newarg, wordSize);
        __ cmpptr(rdx_newarg, rbx_oldarg);
!       __ jccb(Assembler::less, loop);
  
        __ pop(rdi);              // restore temp
  
        __ movptr(rcx_recv, rcx_mh_vmtarget);
        __ jump_to_method_handle_entry(rcx_recv, rdx_temp);
*** 1119,1129 ****
            __ movptr(Address(rax_argslot, tag_offset),
                      frame::tag_for_basic_type(elem_type));
          }
          __ addptr(rax_argslot, Interpreter::stackElementSize());
          __ cmpptr(rax_argslot, rdx_argslot_limit);
!         __ jcc(Assembler::less, loop);
        } else if (length_constant == 0) {
          __ bind(skip_array_check);
          // nothing to copy
        } else {
          int elem_offset = elem0_offset;
--- 1118,1128 ----
            __ movptr(Address(rax_argslot, tag_offset),
                      frame::tag_for_basic_type(elem_type));
          }
          __ addptr(rax_argslot, Interpreter::stackElementSize());
          __ cmpptr(rax_argslot, rdx_argslot_limit);
!         __ jccb(Assembler::less, loop);
        } else if (length_constant == 0) {
          __ bind(skip_array_check);
          // nothing to copy
        } else {
          int elem_offset = elem0_offset;