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

[Gary Benson]

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

		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
		(set_last_Java_frame, reset_last_Java_frame):
		Moved from assembler_ppc.hpp and assembler_ppc.cpp.
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
		(set_last_Java_frame, reset_last_Java_frame):
		Moved to interp_masm_ppc.hpp and interp_masm_ppc.cpp.

diffstat:

5 files changed, 36 insertions(+), 20 deletions(-)
ChangeLog                                        |   11 +++++++++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp   |   17 -----------------
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp   |    3 ---
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp |   21 +++++++++++++++++++++
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp |    4 ++++

diffs (103 lines):

diff -r 3e77d6bcbb20 -r 23ffcc32dd5a ChangeLog
--- a/ChangeLog	Thu Nov 15 08:16:11 2007 -0500
+++ b/ChangeLog	Thu Nov 15 09:43:38 2007 -0500
@@ -1,3 +1,14 @@ 2007-11-15  Gary Benson  <gbenson at redhat
+2007-11-15  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
+	(set_last_Java_frame, reset_last_Java_frame):
+	Moved from assembler_ppc.hpp and assembler_ppc.cpp.
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	(set_last_Java_frame, reset_last_Java_frame):
+	Moved to interp_masm_ppc.hpp and interp_masm_ppc.cpp.
+
 2007-11-15  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
diff -r 3e77d6bcbb20 -r 23ffcc32dd5a ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 15 08:16:11 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 15 09:43:38 2007 -0500
@@ -1196,23 +1196,6 @@ void MacroAssembler::cmpxchg_(Register e
   bind(done);
 }
 
-void MacroAssembler::set_last_Java_frame()
-{
-  Label label;
-
-  bl(label);
-  bind(label);
-  mflr(r0);
-  store(r0, Address(Rthread, JavaThread::last_Java_pc_offset()));
-  store(r1, Address(Rthread, JavaThread::last_Java_sp_offset()));
-}
-
-void MacroAssembler::reset_last_Java_frame()
-{
-  load(r0, 0);
-  store(r0, Address(Rthread, JavaThread::last_Java_sp_offset()));
-}
-
 // Write serialization page so VM thread can do a pseudo remote membar.
 void MacroAssembler::serialize_memory(Register tmp1, Register tmp2)
 {
diff -r 3e77d6bcbb20 -r 23ffcc32dd5a ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 15 08:16:11 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 15 09:43:38 2007 -0500
@@ -352,9 +352,6 @@ class MacroAssembler : public Assembler 
 
   void cmpxchg_(Register exchange, Register dst, Register compare);
 
-  void set_last_Java_frame();
-  void reset_last_Java_frame();
-
   void serialize_memory(Register tmp1, Register tmp2);
 
   void calc_padding_for_alignment(Register dst, Register src, int align);
diff -r 3e77d6bcbb20 -r 23ffcc32dd5a ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Thu Nov 15 08:16:11 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Thu Nov 15 09:43:38 2007 -0500
@@ -29,6 +29,27 @@
 #ifdef CC_INTERP
 REGISTER_DEFINITION(Register, Rstate);
 #endif
+
+// Set the last Java frame pointer
+
+void InterpreterMacroAssembler::set_last_Java_frame()
+{
+  Label label;
+
+  bl(label);
+  bind(label);
+  mflr(r0);
+  store(r0, Address(Rthread, JavaThread::last_Java_pc_offset()));
+  store(r1, Address(Rthread, JavaThread::last_Java_sp_offset()));
+}
+
+// Clear the last Java frame pointer
+
+void InterpreterMacroAssembler::reset_last_Java_frame()
+{
+  load(r0, 0);
+  store(r0, Address(Rthread, JavaThread::last_Java_sp_offset()));
+}
 
 // Lock an object
 //
diff -r 3e77d6bcbb20 -r 23ffcc32dd5a ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp	Thu Nov 15 08:16:11 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp	Thu Nov 15 09:43:38 2007 -0500
@@ -36,6 +36,10 @@ class InterpreterMacroAssembler : public
  public:
   InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {}
 
+  // Frame anchor tracking
+  void set_last_Java_frame();
+  void reset_last_Java_frame();
+
   // Object locking
   void lock_object(Register entry);
   void unlock_object(Register entry);