[liuqi at icedtea.classpath.org: /hg/openjdk6-mips: Fix the bug related to SP adjusting in genera...]

[LIU Qi]

----- Forwarded message from liuqi at icedtea.classpath.org -----

Date: Fri, 12 Nov 2010 08:30:36 +0000
From: liuqi at icedtea.classpath.org
To: distro-pkg-dev at openjdk.java.net
Subject: /hg/openjdk6-mips: Fix the bug related to SP adjusting in genera...

changeset 87db8957684e in /hg/openjdk6-mips
details: http://icedtea.classpath.org/hg/openjdk6-mips?cmd=changeset;node=87db8957684e
author: LIN Chuanwen <linchuanwen at loongson.cn>
date: Fri Nov 12 15:27:30 2010 +0800

	Fix the bug related to SP adjusting in generate_deopt_blob.

	Before jump to interpreter, the SP must be adjusted to the end of
	the interpreter frame.


diffstat:

1 file changed, 1 insertion(+), 4 deletions(-)
hotspot/src/cpu/mips/vm/sharedRuntime_mips.cpp |    5 +----

diffs (15 lines):

diff -r f4c60f770c45 -r 87db8957684e hotspot/src/cpu/mips/vm/sharedRuntime_mips.cpp
--- a/hotspot/src/cpu/mips/vm/sharedRuntime_mips.cpp	Thu Nov 11 19:35:44 2010 +0800
+++ b/hotspot/src/cpu/mips/vm/sharedRuntime_mips.cpp	Fri Nov 12 15:27:30 2010 +0800
@@ -3497,10 +3497,7 @@ void SharedRuntime::generate_deopt_blob(
   __ empty_FPU_stack();
   //FIXME, we should consider about float and double
   // Push a float or double return value if necessary.
-  //__ leave();
-  __ move(SP, FP);
-  __ lw(RA, SP, 1 * wordSize);
-  __ lw(FP, SP, 0 * wordSize);
+  __ leave();
 
   // Jump to interpreter
   __ jr(RA);

----- End forwarded message -----

-- 
 LIU Qi

 liuqi at loongson.cn
 liuqi82 at gmail.com

 Loongson Technology Co. Ltd.

 PGP Key fingerprint:
  3D29 FDFD AFB3 225D B744
  7FAB 51C7 4820 63BA 272F