[aarch64-port-dev ] RFR: AArch64: 8134322: Fix several errors in C2 biased locking implementation

[Andrew Dinn]

On 28/08/15 16:21, Andrew Haley wrote:
> On 08/26/2015 05:32 PM, Andrew Dinn wrote:
>> n.b. I built this on hs-comp on top of my (almost but not yet committed)
>> patch for 8080293 so that patch also gets shown in the webrev. The two
>> patches are independent and should both commit cleanly with or without
>> the other.
> 
> Sure, but I have no way to get the changesets.  All that is
> in the webrev is one patch.
> 
> Please send me the changesets from "hg export"

change set below



regards,


Andrew Dinn
-----------
Senior Principal Software Engineer
Red Hat UK Ltd
Registered in UK and Wales under Company Registration No. 3798903
Directors: Michael Cunningham (USA), Matt Parson (USA), Charlie Peters
(USA), Michael O'Neill (Ireland)

----- 8< -------- 8< -------- 8< -------- 8< -------- 8< -------- 8< ---
# HG changeset patch
# User adinn
# Date 1440605639 -3600
#      Wed Aug 26 17:13:59 2015 +0100
# Node ID e699c7a83f8e9630f79ef83066a64d1e38c72ce2
# Parent  d7185fbee7e5e0f40ae4286f29055bed5da6bd58
8134322: AArch64: Fix several errors in C2 biased locking implementation
Summary: Several errors in C2 biased locking require fixing
Reviewed-by: adinn
Contributed-by: Hui Shi (hui.shi at linaro.org)

diff -r d7185fbee7e5 -r e699c7a83f8e src/cpu/aarch64/vm/aarch64.ad
--- a/src/cpu/aarch64/vm/aarch64.ad	Tue Aug 25 08:25:38 2015 -0400
+++ b/src/cpu/aarch64/vm/aarch64.ad	Wed Aug 26 17:13:59 2015 +0100
@@ -4896,12 +4896,12 @@
       return;
     }

-    if (UseBiasedLocking) {
-      __ biased_locking_enter(disp_hdr, oop, box, tmp, true, cont);
+    if (UseBiasedLocking && !UseOptoBiasInlining) {
+      __ biased_locking_enter(box, oop, disp_hdr, tmp, true, cont);
     }

     // Handle existing monitor
-    if (EmitSync & 0x02) {
+    if ((EmitSync & 0x02) == 0) {
       // we can use AArch64's bit test and branch here but
       // markoopDesc does not define a bit index just the bit value
       // so assert in case the bit pos changes
@@ -5041,7 +5041,7 @@
       return;
     }

-    if (UseBiasedLocking) {
+    if (UseBiasedLocking && !UseOptoBiasInlining) {
       __ biased_locking_exit(oop, tmp, cont);
     }
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fastlock.patch
Type: text/x-patch
Size: 1330 bytes
Desc: not available
URL: <http://mail.openjdk.java.net/pipermail/aarch64-port-dev/attachments/20150829/dffcf114/fastlock.patch>