Mercurial > hg > graal-jvmci-8

diff c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java @ 1942:00bc9eaf0e24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Wed, 29 Dec 2010 20:06:41 +0100
parents 8d88c9ac9247
children 99ad52189524
line wrap: on
line diff
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java	Tue Dec 28 18:33:26 2010 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java	Wed Dec 29 20:06:41 2010 +0100
@@ -314,9 +314,20 @@
                 asm.pload(CiKind.Word, asm.createTemp("temp", CiKind.Word), object, true);
             }
 
-            useRegisters(asm, AMD64.rbx, AMD64.rsi, AMD64.rdx);
-            useRegisters(asm, AMD64.rax);
-            asm.callRuntime(config.monitorEnterStub, null, object, lock);
+
+            // (tw) It is important to use for this runtime call the debug info AFTER the monitor enter. Otherwise the monitor object
+            // is not correctly garbage collected.
+            final boolean useInfoAfter = true;
+
+            if (config.useFastLocking) {
+                useRegisters(asm, AMD64.rbx, AMD64.rsi, AMD64.rdx, AMD64.rax);
+                asm.callRuntime(config.fastMonitorEnterStub, null, useInfoAfter, object, lock);
+            } else {
+                asm.reserveOutgoingStack(target.wordSize * 2);
+                asm.pstore(CiKind.Object, asm.createRegister("rsp", CiKind.Word, AMD64.RSP.asRegister()), asm.i(target.wordSize), object, false);
+                asm.pstore(CiKind.Word, asm.createRegister("rsp", CiKind.Word, AMD64.RSP.asRegister()), asm.i(0), lock, false);
+                asm.callRuntime(config.monitorEnterStub, null, useInfoAfter);
+            }
 
             return asm.finishTemplate("monitorEnter");
         }
@@ -330,9 +341,14 @@
             XirParameter object = asm.createInputParameter("object", CiKind.Object);
             XirParameter lock = asm.createInputParameter("lock", CiKind.Word);
 
-            useRegisters(asm, AMD64.rbx, AMD64.rsi, AMD64.rdx);
-            useRegisters(asm, AMD64.rax);
-            asm.callRuntime(config.monitorExitStub, null, object, lock);
+            if (config.useFastLocking) {
+                useRegisters(asm, AMD64.rbx, AMD64.rsi, AMD64.rdx, AMD64.rax);
+                asm.callRuntime(config.fastMonitorExitStub, null, object, lock);
+            } else {
+                asm.reserveOutgoingStack(target.wordSize);
+                asm.pstore(CiKind.Word, asm.createRegister("rsp", CiKind.Word, AMD64.RSP.asRegister()), asm.i(0), lock, false);
+                asm.callRuntime(config.monitorExitStub, null);
+            }
 
             return asm.finishTemplate("monitorExit");
         }