changeset in /hg/icedtea: 2007-11-13 Gary Benson <gbenson at redh...

[Gary Benson]

changeset 55e5e7e59cb7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=55e5e7e59cb7
description:
	2007-11-13  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(generate_normal_entry, generate_native_entry):
		Reload the method pointer after potential safepoints.

diffstat:

2 files changed, 12 insertions(+)
ChangeLog                                           |    6 ++++++
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp |    6 ++++++

diffs (36 lines):

diff -r be4f18fe7da6 -r 55e5e7e59cb7 ChangeLog
--- a/ChangeLog	Tue Nov 13 06:48:38 2007 -0500
+++ b/ChangeLog	Tue Nov 13 06:50:47 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-13  Gary Benson  <gbenson at redhat
+2007-11-13  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(generate_normal_entry, generate_native_entry):
+	Reload the method pointer after potential safepoints.
+
 2007-11-13  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
diff -r be4f18fe7da6 -r 55e5e7e59cb7 ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Tue Nov 13 06:48:38 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Tue Nov 13 06:50:47 2007 -0500
@@ -635,6 +635,9 @@ address InterpreterGenerator::generate_n
        JavaThread::check_special_condition_for_native_trans));
   __ bind (no_block);
 
+  // The method pointer may have changed if there was a safepoint
+  __ load (Rmethod, STATE(_method));
+
   // Change the thread state
   __ load (r0, _thread_in_Java);
   __ stw (r0, thread_state_addr);
@@ -803,6 +806,9 @@ address InterpreterGenerator::generate_n
   __ mr (r3, Rstate);
   __ call (interpreter);
 
+  // The method pointer may have changed if there was a safepoint
+  __ load (Rmethod, STATE(_method));
+
   // Clear the frame anchor
   __ reset_last_Java_frame ();