1.1 --- a/src/cpu/x86/vm/jniFastGetField_x86_64.cpp Tue Aug 26 15:49:40 2008 -0700
1.2 +++ b/src/cpu/x86/vm/jniFastGetField_x86_64.cpp Wed Aug 27 00:21:55 2008 -0700
1.3 @@ -67,18 +67,18 @@
1.4
1.5 ExternalAddress counter(SafepointSynchronize::safepoint_counter_addr());
1.6 __ mov32 (rcounter, counter);
1.7 - __ movq (robj, c_rarg1);
1.8 + __ mov (robj, c_rarg1);
1.9 __ testb (rcounter, 1);
1.10 __ jcc (Assembler::notZero, slow);
1.11 if (os::is_MP()) {
1.12 - __ xorq (robj, rcounter);
1.13 - __ xorq (robj, rcounter); // obj, since
1.14 + __ xorptr(robj, rcounter);
1.15 + __ xorptr(robj, rcounter); // obj, since
1.16 // robj ^ rcounter ^ rcounter == robj
1.17 // robj is data dependent on rcounter.
1.18 }
1.19 - __ movq (robj, Address(robj, 0)); // *obj
1.20 - __ movq (roffset, c_rarg2);
1.21 - __ shrq (roffset, 2); // offset
1.22 + __ movptr(robj, Address(robj, 0)); // *obj
1.23 + __ mov (roffset, c_rarg2);
1.24 + __ shrptr(roffset, 2); // offset
1.25
1.26 assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
1.27 speculative_load_pclist[count] = __ pc();
1.28 @@ -95,8 +95,8 @@
1.29 if (os::is_MP()) {
1.30 __ lea(rcounter_addr, counter);
1.31 // ca is data dependent on rax.
1.32 - __ xorq (rcounter_addr, rax);
1.33 - __ xorq (rcounter_addr, rax);
1.34 + __ xorptr(rcounter_addr, rax);
1.35 + __ xorptr(rcounter_addr, rax);
1.36 __ cmpl (rcounter, Address(rcounter_addr, 0));
1.37 } else {
1.38 __ cmp32 (rcounter, counter);
1.39 @@ -165,18 +165,18 @@
1.40
1.41 ExternalAddress counter(SafepointSynchronize::safepoint_counter_addr());
1.42 __ mov32 (rcounter, counter);
1.43 - __ movq (robj, c_rarg1);
1.44 + __ mov (robj, c_rarg1);
1.45 __ testb (rcounter, 1);
1.46 __ jcc (Assembler::notZero, slow);
1.47 if (os::is_MP()) {
1.48 - __ xorq (robj, rcounter);
1.49 - __ xorq (robj, rcounter); // obj, since
1.50 + __ xorptr(robj, rcounter);
1.51 + __ xorptr(robj, rcounter); // obj, since
1.52 // robj ^ rcounter ^ rcounter == robj
1.53 // robj is data dependent on rcounter.
1.54 }
1.55 - __ movq (robj, Address(robj, 0)); // *obj
1.56 - __ movq (roffset, c_rarg2);
1.57 - __ shrq (roffset, 2); // offset
1.58 + __ movptr(robj, Address(robj, 0)); // *obj
1.59 + __ mov (roffset, c_rarg2);
1.60 + __ shrptr(roffset, 2); // offset
1.61
1.62 assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
1.63 speculative_load_pclist[count] = __ pc();
1.64 @@ -190,8 +190,8 @@
1.65 __ lea(rcounter_addr, counter);
1.66 __ movdq (rax, xmm0);
1.67 // counter address is data dependent on xmm0.
1.68 - __ xorq (rcounter_addr, rax);
1.69 - __ xorq (rcounter_addr, rax);
1.70 + __ xorptr(rcounter_addr, rax);
1.71 + __ xorptr(rcounter_addr, rax);
1.72 __ cmpl (rcounter, Address(rcounter_addr, 0));
1.73 } else {
1.74 __ cmp32 (rcounter, counter);
