Mercurial > hg > truffle

diff src/cpu/x86/vm/runtime_x86_32.cpp @ 1567:110501f54a99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6934104: JSR 292 needs to support SPARC C2 Summary: C2 for SPARC needs to support JSR 292. Reviewed-by: kvn, never
author twisti
date Tue, 25 May 2010 02:38:48 -0700
parents 93767e6a2dfd
children e9ff18c4ace7
line wrap: on
line diff
--- a/src/cpu/x86/vm/runtime_x86_32.cpp	Mon May 24 14:15:14 2010 -0700
+++ b/src/cpu/x86/vm/runtime_x86_32.cpp	Tue May 25 02:38:48 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,7 +117,7 @@
 
   // Restore SP from BP if the exception PC is a MethodHandle call site.
   __ cmpl(Address(rcx, JavaThread::is_method_handle_return_offset()), 0);
-  __ cmovptr(Assembler::notEqual, rsp, rbp);
+  __ cmovptr(Assembler::notEqual, rsp, rbp_mh_SP_save);
 
   // We have a handler in rax, (could be deopt blob)
   // rdx - throwing pc, deopt blob will need it.