1.1 --- a/src/cpu/x86/vm/x86_32.ad Sat Apr 09 22:55:25 2011 -0700
1.2 +++ b/src/cpu/x86/vm/x86_32.ad Mon Apr 11 15:30:31 2011 -0700
1.3 @@ -3423,7 +3423,7 @@
1.4 masm.movptr(boxReg, tmpReg); // consider: LEA box, [tmp-2]
1.5
1.6 // Using a prefetchw helps avoid later RTS->RTO upgrades and cache probes
1.7 - if ((EmitSync & 2048) && VM_Version::supports_3dnow() && os::is_MP()) {
1.8 + if ((EmitSync & 2048) && VM_Version::supports_3dnow_prefetch() && os::is_MP()) {
1.9 // prefetchw [eax + Offset(_owner)-2]
1.10 masm.prefetchw(Address(rax, ObjectMonitor::owner_offset_in_bytes()-2));
1.11 }
1.12 @@ -3467,7 +3467,7 @@
1.13 masm.movptr(boxReg, tmpReg) ;
1.14
1.15 // Using a prefetchw helps avoid later RTS->RTO upgrades and cache probes
1.16 - if ((EmitSync & 2048) && VM_Version::supports_3dnow() && os::is_MP()) {
1.17 + if ((EmitSync & 2048) && VM_Version::supports_3dnow_prefetch() && os::is_MP()) {
1.18 // prefetchw [eax + Offset(_owner)-2]
1.19 masm.prefetchw(Address(rax, ObjectMonitor::owner_offset_in_bytes()-2));
1.20 }
1.21 @@ -3614,7 +3614,7 @@
1.22 // See also http://gee.cs.oswego.edu/dl/jmm/cookbook.html.
1.23
1.24 masm.get_thread (boxReg) ;
1.25 - if ((EmitSync & 4096) && VM_Version::supports_3dnow() && os::is_MP()) {
1.26 + if ((EmitSync & 4096) && VM_Version::supports_3dnow_prefetch() && os::is_MP()) {
1.27 // prefetchw [ebx + Offset(_owner)-2]
1.28 masm.prefetchw(Address(rbx, ObjectMonitor::owner_offset_in_bytes()-2));
1.29 }
1.30 @@ -7333,7 +7333,7 @@
1.31 // Must be safe to execute with invalid address (cannot fault).
1.32
1.33 instruct prefetchr0( memory mem ) %{
1.34 - predicate(UseSSE==0 && !VM_Version::supports_3dnow());
1.35 + predicate(UseSSE==0 && !VM_Version::supports_3dnow_prefetch());
1.36 match(PrefetchRead mem);
1.37 ins_cost(0);
1.38 size(0);
1.39 @@ -7343,7 +7343,7 @@
1.40 %}
1.41
1.42 instruct prefetchr( memory mem ) %{
1.43 - predicate(UseSSE==0 && VM_Version::supports_3dnow() || ReadPrefetchInstr==3);
1.44 + predicate(UseSSE==0 && VM_Version::supports_3dnow_prefetch() || ReadPrefetchInstr==3);
1.45 match(PrefetchRead mem);
1.46 ins_cost(100);
1.47
1.48 @@ -7387,7 +7387,7 @@
1.49 %}
1.50
1.51 instruct prefetchw0( memory mem ) %{
1.52 - predicate(UseSSE==0 && !VM_Version::supports_3dnow());
1.53 + predicate(UseSSE==0 && !VM_Version::supports_3dnow_prefetch());
1.54 match(PrefetchWrite mem);
1.55 ins_cost(0);
1.56 size(0);
1.57 @@ -7397,7 +7397,7 @@
1.58 %}
1.59
1.60 instruct prefetchw( memory mem ) %{
1.61 - predicate(UseSSE==0 && VM_Version::supports_3dnow() || AllocatePrefetchInstr==3);
1.62 + predicate(UseSSE==0 && VM_Version::supports_3dnow_prefetch() || AllocatePrefetchInstr==3);
1.63 match( PrefetchWrite mem );
1.64 ins_cost(100);
1.65
