Mercurial > hg > truffle

diff src/cpu/x86/vm/c1_Runtime1_x86.cpp @ 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 2d26b0046e0d
children 06f017f7daa7
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_Runtime1_x86.cpp	Tue Dec 28 18:33:26 2010 +0100
+++ b/src/cpu/x86/vm/c1_Runtime1_x86.cpp	Wed Dec 29 20:06:41 2010 +0100
@@ -2010,6 +2010,7 @@
 
       Register scratch1 = rax;
       Register scratch2 = rbx;
+      assert_different_registers(obj, lock, scratch1, scratch2);
 
       // copied from LIR_Assembler::emit_lock
       if (UseFastLocking) {
@@ -2043,6 +2044,7 @@
       Register lock2 = rax;
       __ mov(lock2, lock);
       Register scratch1 = rbx;
+      assert_different_registers(obj, lock, scratch1, lock2);
 
       // copied from LIR_Assembler::emit_lock
       if (UseFastLocking) {