1.1 --- a/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Tue Mar 03 18:25:57 2009 -0800
1.2 +++ b/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Wed Mar 04 09:58:39 2009 -0800
1.3 @@ -650,7 +650,7 @@
1.4 __ cmpl(rdx, stos);
1.5 __ jcc(Assembler::notEqual, notShort);
1.6 // stos
1.7 - __ load_signed_word(rax, field_address);
1.8 + __ load_signed_short(rax, field_address);
1.9 __ jmp(xreturn_path);
1.10
1.11 __ bind(notShort);
1.12 @@ -662,7 +662,7 @@
1.13 __ bind(okay);
1.14 #endif
1.15 // ctos
1.16 - __ load_unsigned_word(rax, field_address);
1.17 + __ load_unsigned_short(rax, field_address);
1.18
1.19 __ bind(xreturn_path);
1.20
1.21 @@ -702,7 +702,7 @@
1.22 const Address access_flags (rbx, methodOopDesc::access_flags_offset());
1.23
1.24 // get parameter size (always needed)
1.25 - __ load_unsigned_word(rcx, size_of_parameters);
1.26 + __ load_unsigned_short(rcx, size_of_parameters);
1.27
1.28 // native calls don't need the stack size check since they have no
1.29 // expression stack and the arguments are already on the stack and
1.30 @@ -819,9 +819,9 @@
1.31 // allocate space for parameters
1.32 __ get_method(method);
1.33 __ verify_oop(method);
1.34 - __ load_unsigned_word(t,
1.35 - Address(method,
1.36 - methodOopDesc::size_of_parameters_offset()));
1.37 + __ load_unsigned_short(t,
1.38 + Address(method,
1.39 + methodOopDesc::size_of_parameters_offset()));
1.40 __ shll(t, Interpreter::logStackElementSize());
1.41
1.42 __ subptr(rsp, t);
1.43 @@ -1165,13 +1165,13 @@
1.44 const Address access_flags(rbx, methodOopDesc::access_flags_offset());
1.45
1.46 // get parameter size (always needed)
1.47 - __ load_unsigned_word(rcx, size_of_parameters);
1.48 + __ load_unsigned_short(rcx, size_of_parameters);
1.49
1.50 // rbx: methodOop
1.51 // rcx: size of parameters
1.52 // r13: sender_sp (could differ from sp+wordSize if we were called via c2i )
1.53
1.54 - __ load_unsigned_word(rdx, size_of_locals); // get size of locals in words
1.55 + __ load_unsigned_short(rdx, size_of_locals); // get size of locals in words
1.56 __ subl(rdx, rcx); // rdx = no. of additional locals
1.57
1.58 // YYY
1.59 @@ -1583,7 +1583,7 @@
1.60 // Compute size of arguments for saving when returning to
1.61 // deoptimized caller
1.62 __ get_method(rax);
1.63 - __ load_unsigned_word(rax, Address(rax, in_bytes(methodOopDesc::
1.64 + __ load_unsigned_short(rax, Address(rax, in_bytes(methodOopDesc::
1.65 size_of_parameters_offset())));
1.66 __ shll(rax, Interpreter::logStackElementSize());
1.67 __ restore_locals(); // XXX do we need this?
