1.1 --- a/src/cpu/x86/vm/templateTable_x86_64.cpp Tue Mar 03 18:25:57 2009 -0800
1.2 +++ b/src/cpu/x86/vm/templateTable_x86_64.cpp Wed Mar 04 09:58:39 2009 -0800
1.3 @@ -307,7 +307,7 @@
1.4
1.5 void TemplateTable::sipush() {
1.6 transition(vtos, itos);
1.7 - __ load_unsigned_word(rax, at_bcp(1));
1.8 + __ load_unsigned_short(rax, at_bcp(1));
1.9 __ bswapl(rax);
1.10 __ sarl(rax, 16);
1.11 }
1.12 @@ -645,10 +645,10 @@
1.13 // eax: index
1.14 // rdx: array
1.15 index_check(rdx, rax); // kills rbx
1.16 - __ load_unsigned_word(rax,
1.17 - Address(rdx, rax,
1.18 - Address::times_2,
1.19 - arrayOopDesc::base_offset_in_bytes(T_CHAR)));
1.20 + __ load_unsigned_short(rax,
1.21 + Address(rdx, rax,
1.22 + Address::times_2,
1.23 + arrayOopDesc::base_offset_in_bytes(T_CHAR)));
1.24 }
1.25
1.26 // iload followed by caload frequent pair
1.27 @@ -663,10 +663,10 @@
1.28 // rdx: array
1.29 __ pop_ptr(rdx);
1.30 index_check(rdx, rax); // kills rbx
1.31 - __ load_unsigned_word(rax,
1.32 - Address(rdx, rax,
1.33 - Address::times_2,
1.34 - arrayOopDesc::base_offset_in_bytes(T_CHAR)));
1.35 + __ load_unsigned_short(rax,
1.36 + Address(rdx, rax,
1.37 + Address::times_2,
1.38 + arrayOopDesc::base_offset_in_bytes(T_CHAR)));
1.39 }
1.40
1.41 void TemplateTable::saload() {
1.42 @@ -675,10 +675,10 @@
1.43 // eax: index
1.44 // rdx: array
1.45 index_check(rdx, rax); // kills rbx
1.46 - __ load_signed_word(rax,
1.47 - Address(rdx, rax,
1.48 - Address::times_2,
1.49 - arrayOopDesc::base_offset_in_bytes(T_SHORT)));
1.50 + __ load_signed_short(rax,
1.51 + Address(rdx, rax,
1.52 + Address::times_2,
1.53 + arrayOopDesc::base_offset_in_bytes(T_SHORT)));
1.54 }
1.55
1.56 void TemplateTable::iload(int n) {
1.57 @@ -2276,7 +2276,7 @@
1.58 __ cmpl(flags, ctos);
1.59 __ jcc(Assembler::notEqual, notChar);
1.60 // ctos
1.61 - __ load_unsigned_word(rax, field);
1.62 + __ load_unsigned_short(rax, field);
1.63 __ push(ctos);
1.64 // Rewrite bytecode to be faster
1.65 if (!is_static) {
1.66 @@ -2288,7 +2288,7 @@
1.67 __ cmpl(flags, stos);
1.68 __ jcc(Assembler::notEqual, notShort);
1.69 // stos
1.70 - __ load_signed_word(rax, field);
1.71 + __ load_signed_short(rax, field);
1.72 __ push(stos);
1.73 // Rewrite bytecode to be faster
1.74 if (!is_static) {
1.75 @@ -2751,10 +2751,10 @@
1.76 __ movsbl(rax, field);
1.77 break;
1.78 case Bytecodes::_fast_sgetfield:
1.79 - __ load_signed_word(rax, field);
1.80 + __ load_signed_short(rax, field);
1.81 break;
1.82 case Bytecodes::_fast_cgetfield:
1.83 - __ load_unsigned_word(rax, field);
1.84 + __ load_unsigned_short(rax, field);
1.85 break;
1.86 case Bytecodes::_fast_fgetfield:
1.87 __ movflt(xmm0, field);
