1.1 --- a/src/cpu/x86/vm/x86_32.ad Tue Dec 23 06:16:53 2008 -0800
1.2 +++ b/src/cpu/x86/vm/x86_32.ad Wed Dec 24 13:06:09 2008 -0800
1.3 @@ -3371,7 +3371,7 @@
1.4 masm.movptr(Address(boxReg, 0), 3) ; // results in ST-before-CAS penalty
1.5 masm.get_thread (scrReg) ;
1.6 masm.movptr(boxReg, tmpReg); // consider: LEA box, [tmp-2]
1.7 - masm.movptr(tmpReg, 0); // consider: xor vs mov
1.8 + masm.movptr(tmpReg, NULL_WORD); // consider: xor vs mov
1.9 if (os::is_MP()) { masm.lock(); }
1.10 masm.cmpxchgptr(scrReg, Address(boxReg, ObjectMonitor::owner_offset_in_bytes()-2)) ;
1.11 } else
1.12 @@ -3387,7 +3387,7 @@
1.13
1.14 if ((EmitSync & 64) == 0) {
1.15 // Optimistic form: consider XORL tmpReg,tmpReg
1.16 - masm.movptr(tmpReg, 0 ) ;
1.17 + masm.movptr(tmpReg, NULL_WORD) ;
1.18 } else {
1.19 // Can suffer RTS->RTO upgrades on shared or cold $ lines
1.20 // Test-And-CAS instead of CAS
1.21 @@ -3587,7 +3587,7 @@
1.22 masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::EntryList_offset_in_bytes()-2)) ;
1.23 masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::cxq_offset_in_bytes()-2)) ;
1.24 masm.jccb (Assembler::notZero, DONE_LABEL) ;
1.25 - masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ;
1.26 + masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ;
1.27 masm.jmpb (DONE_LABEL) ;
1.28 } else {
1.29 masm.xorptr(boxReg, Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2)) ;
1.30 @@ -3596,7 +3596,7 @@
1.31 masm.movptr(boxReg, Address (tmpReg, ObjectMonitor::EntryList_offset_in_bytes()-2)) ;
1.32 masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::cxq_offset_in_bytes()-2)) ;
1.33 masm.jccb (Assembler::notZero, CheckSucc) ;
1.34 - masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ;
1.35 + masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ;
1.36 masm.jmpb (DONE_LABEL) ;
1.37 }
1.38
1.39 @@ -3644,7 +3644,7 @@
1.40 // We currently use (3), although it's likely that switching to (2)
1.41 // is correct for the future.
1.42
1.43 - masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ;
1.44 + masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ;
1.45 if (os::is_MP()) {
1.46 if (VM_Version::supports_sse2() && 1 == FenceInstruction) {
1.47 masm.mfence();
