/hg/openjdk6-mips: Fix the deoptimization bug.

[liuqi at icedtea.classpath.org]

changeset 9fdc8715b0a2 in /hg/openjdk6-mips
details: http://icedtea.classpath.org/hg/openjdk6-mips?cmd=changeset;node=9fdc8715b0a2
author: Ao Qi <aoqi at loongson.cn>
date: Fri Nov 26 12:00:58 2010 +0800

	Fix the deoptimization bug.

	Original PC of the deopt_frame may not be always in (fp - 1).
	Therefore, set RA to the deop_pc, which is the entry address of
	deopt_handler, and the frame::frame will handle it.


diffstat:

2 files changed, 2 insertions(+), 2 deletions(-)
hotspot/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp |    2 +-
hotspot/src/cpu/mips/vm/sharedRuntime_mips.cpp   |    2 +-

diffs (24 lines):

diff -r ab0d284dc313 -r 9fdc8715b0a2 hotspot/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp
--- a/hotspot/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp	Thu Nov 18 16:19:42 2010 +0800
+++ b/hotspot/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp	Fri Nov 26 12:00:58 2010 +0800
@@ -433,7 +433,7 @@ void LIR_Assembler::emit_deopt_handler()
  
 	compilation()->offsets()->set_value(CodeOffsets::Deopt, code_offset());
  
-	__ jmp(SharedRuntime::deopt_blob()->unpack());
+	__ call(SharedRuntime::deopt_blob()->unpack());
 	__ delayed()->nop(); 
  
 	assert(code_offset() - offset <= deopt_handler_size, "overflow");
diff -r ab0d284dc313 -r 9fdc8715b0a2 hotspot/src/cpu/mips/vm/sharedRuntime_mips.cpp
--- a/hotspot/src/cpu/mips/vm/sharedRuntime_mips.cpp	Thu Nov 18 16:19:42 2010 +0800
+++ b/hotspot/src/cpu/mips/vm/sharedRuntime_mips.cpp	Fri Nov 26 12:00:58 2010 +0800
@@ -3233,7 +3233,7 @@ void SharedRuntime::generate_deopt_blob(
   // Prolog for non exception case!
   // Correct the return address we were given.
   //FIXME, return address is on the tos or Ra? 
-  __ lw(RA, FP, (-1) * wordSize);
+  __ addi(RA, RA, - (NativeCall::return_address_offset));
   // Save everything in sight.
   map = RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words);
   // Normal deoptimization