1.1 --- a/src/cpu/x86/vm/methodHandles_x86.cpp Fri Apr 30 04:27:25 2010 -0700
1.2 +++ b/src/cpu/x86/vm/methodHandles_x86.cpp Fri Apr 30 08:37:24 2010 -0700
1.3 @@ -500,7 +500,7 @@
1.4 #ifndef _LP64
1.5 if (arg_slots == 2) {
1.6 __ movl(rdx_temp, prim_value_addr.plus_disp(wordSize));
1.7 - __ movl(Address(rax_argslot, Interpreter::stackElementSize()), rdx_temp);
1.8 + __ movl(Address(rax_argslot, Interpreter::stackElementSize), rdx_temp);
1.9 }
1.10 #endif //_LP64
1.11 }
1.12 @@ -596,7 +596,7 @@
1.13 __ lea(rax_argslot, __ argument_address(rax_argslot, 1));
1.14 remove_arg_slots(_masm, -stack_move_unit(),
1.15 rax_argslot, rbx_temp, rdx_temp);
1.16 - vmarg = Address(rax_argslot, -Interpreter::stackElementSize());
1.17 + vmarg = Address(rax_argslot, -Interpreter::stackElementSize);
1.18 __ movl(rdx_temp, vmarg);
1.19 }
1.20 break;
1.21 @@ -665,8 +665,8 @@
1.22 __ lea(rax_argslot, __ argument_address(rax_argslot, 1));
1.23 insert_arg_slots(_masm, stack_move_unit(), _INSERT_INT_MASK,
1.24 rax_argslot, rbx_temp, rdx_temp);
1.25 - Address vmarg1(rax_argslot, -Interpreter::stackElementSize());
1.26 - Address vmarg2 = vmarg1.plus_disp(Interpreter::stackElementSize());
1.27 + Address vmarg1(rax_argslot, -Interpreter::stackElementSize);
1.28 + Address vmarg2 = vmarg1.plus_disp(Interpreter::stackElementSize);
1.29
1.30 switch (ek) {
1.31 case _adapter_opt_i2l:
1.32 @@ -718,7 +718,7 @@
1.33 insert_arg_slots(_masm, stack_move_unit(), _INSERT_INT_MASK,
1.34 rax_argslot, rbx_temp, rdx_temp);
1.35 }
1.36 - Address vmarg(rax_argslot, -Interpreter::stackElementSize());
1.37 + Address vmarg(rax_argslot, -Interpreter::stackElementSize);
1.38
1.39 #ifdef _LP64
1.40 if (ek == _adapter_opt_f2d) {
1.41 @@ -1016,7 +1016,7 @@
1.42 // Array length checks out. Now insert any required stack slots.
1.43 if (length_constant == -1) {
1.44 // Form a pointer to the end of the affected region.
1.45 - __ lea(rdx_argslot_limit, Address(rax_argslot, Interpreter::stackElementSize()));
1.46 + __ lea(rdx_argslot_limit, Address(rax_argslot, Interpreter::stackElementSize));
1.47 // 'stack_move' is negative number of words to insert
1.48 Register rdi_stack_move = rdi;
1.49 __ movl2ptr(rdi_stack_move, rcx_amh_conversion);
1.50 @@ -1054,7 +1054,7 @@
1.51 __ movptr(rbx_temp, Address(rsi_source, 0));
1.52 __ movptr(Address(rax_argslot, 0), rbx_temp);
1.53 __ addptr(rsi_source, type2aelembytes(elem_type));
1.54 - __ addptr(rax_argslot, Interpreter::stackElementSize());
1.55 + __ addptr(rax_argslot, Interpreter::stackElementSize);
1.56 __ cmpptr(rax_argslot, rdx_argslot_limit);
1.57 __ jccb(Assembler::less, loop);
1.58 } else if (length_constant == 0) {
1.59 @@ -1067,7 +1067,7 @@
1.60 __ movptr(rbx_temp, Address(rsi_array, elem_offset));
1.61 __ movptr(Address(rax_argslot, slot_offset), rbx_temp);
1.62 elem_offset += type2aelembytes(elem_type);
1.63 - slot_offset += Interpreter::stackElementSize();
1.64 + slot_offset += Interpreter::stackElementSize;
1.65 }
1.66 }
1.67
