src/cpu/x86/vm/templateInterpreter_x86_32.cpp

changeset 1063
7bb995fbd3c0
parent 1014
0fbdb4381b99
parent 1057
56aae7be60d4
child 1145
e5b0439ef4ae
     1.1 --- a/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Mon Mar 09 13:34:00 2009 -0700
     1.2 +++ b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Thu Mar 12 18:16:36 2009 -0700
     1.3 @@ -662,13 +662,13 @@
     1.4      __ bind(notByte);
     1.5      __ cmpl(rdx, stos);
     1.6      __ jcc(Assembler::notEqual, notShort);
     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      __ cmpl(rdx, ctos);
    1.13      __ jcc(Assembler::notEqual, notChar);
    1.14 -    __ load_unsigned_word(rax, field_address);
    1.15 +    __ load_unsigned_short(rax, field_address);
    1.16      __ jmp(xreturn_path);
    1.17  
    1.18      __ bind(notChar);
    1.19 @@ -723,7 +723,7 @@
    1.20    const Address access_flags      (rbx, methodOopDesc::access_flags_offset());
    1.21  
    1.22    // get parameter size (always needed)
    1.23 -  __ load_unsigned_word(rcx, size_of_parameters);
    1.24 +  __ load_unsigned_short(rcx, size_of_parameters);
    1.25  
    1.26    // native calls don't need the stack size check since they have no expression stack
    1.27    // and the arguments are already on the stack and we only add a handful of words
    1.28 @@ -838,7 +838,7 @@
    1.29    // allocate space for parameters
    1.30    __ get_method(method);
    1.31    __ verify_oop(method);
    1.32 -  __ load_unsigned_word(t, Address(method, methodOopDesc::size_of_parameters_offset()));
    1.33 +  __ load_unsigned_short(t, Address(method, methodOopDesc::size_of_parameters_offset()));
    1.34    __ shlptr(t, Interpreter::logStackElementSize());
    1.35    __ addptr(t, 2*wordSize);     // allocate two more slots for JNIEnv and possible mirror
    1.36    __ subptr(rsp, t);
    1.37 @@ -1155,14 +1155,14 @@
    1.38    const Address access_flags      (rbx, methodOopDesc::access_flags_offset());
    1.39  
    1.40    // get parameter size (always needed)
    1.41 -  __ load_unsigned_word(rcx, size_of_parameters);
    1.42 +  __ load_unsigned_short(rcx, size_of_parameters);
    1.43  
    1.44    // rbx,: methodOop
    1.45    // rcx: size of parameters
    1.46  
    1.47    // rsi: sender_sp (could differ from sp+wordSize if we were called via c2i )
    1.48  
    1.49 -  __ load_unsigned_word(rdx, size_of_locals);       // get size of locals in words
    1.50 +  __ load_unsigned_short(rdx, size_of_locals);       // get size of locals in words
    1.51    __ subl(rdx, rcx);                                // rdx = no. of additional locals
    1.52  
    1.53    // see if we've got enough room on the stack for locals plus overhead.
    1.54 @@ -1558,7 +1558,7 @@
    1.55      // Compute size of arguments for saving when returning to deoptimized caller
    1.56      __ get_method(rax);
    1.57      __ verify_oop(rax);
    1.58 -    __ load_unsigned_word(rax, Address(rax, in_bytes(methodOopDesc::size_of_parameters_offset())));
    1.59 +    __ load_unsigned_short(rax, Address(rax, in_bytes(methodOopDesc::size_of_parameters_offset())));
    1.60      __ shlptr(rax, Interpreter::logStackElementSize());
    1.61      __ restore_locals();
    1.62      __ subptr(rdi, rax);

mercurial