changeset in /hg/icedtea6: 2009-02-23 Gary Benson <gbenson at red...

[Gary Benson]

changeset c90d22c7678d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c90d22c7678d
description:
	2009-02-23  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
		(CppInterpreter::deopt_entry): Remove Shark conditional.
		* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
		(frame::patch_pc): Likewise.
		* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
		(Deoptimization::unwind_callee_save_values): Likewise.
		* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
		(NativeJump::check_verified_entry_alignment): Likewise.
		* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
		(NativeJump::patch_verified_entry): Likewise.
		* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
		(Deoptimization::last_frame_adjust): Likewise.

diffstat:

7 files changed, 17 insertions(+), 23 deletions(-)
ChangeLog                                             |   15 +++++++++++++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |    4 ----
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp          |    4 ----
ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp    |    3 ---
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp     |    4 ----
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp     |    6 ++----
ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp  |    4 ----

diffs (116 lines):

diff -r c017a717f617 -r c90d22c7678d ChangeLog
--- a/ChangeLog	Fri Feb 20 12:21:56 2009 -0500
+++ b/ChangeLog	Mon Feb 23 10:33:28 2009 +0000
@@ -1,3 +1,18 @@ 2009-02-20  Gary Benson  <gbenson at redhat
+2009-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::deopt_entry): Remove Shark conditional.
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
+	(frame::patch_pc): Likewise.
+	* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
+	(Deoptimization::unwind_callee_save_values): Likewise.
+	* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
+	(NativeJump::check_verified_entry_alignment): Likewise.
+	* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
+	(NativeJump::patch_verified_entry): Likewise.
+	* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
+	(Deoptimization::last_frame_adjust): Likewise.
+	
 2009-02-20  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-cc-interp-backedge.patch: New file.
diff -r c017a717f617 -r c90d22c7678d ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Feb 20 12:21:56 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Mon Feb 23 10:33:28 2009 +0000
@@ -902,11 +902,7 @@ address CppInterpreter::return_entry(Tos
 
 address CppInterpreter::deopt_entry(TosState state, int length)
 {
-#ifdef SHARK
   return NULL;
-#else
-  Unimplemented();
-#endif // SHARK
 }
 
 // Helper for (runtime) stack overflow checks
diff -r c017a717f617 -r c90d22c7678d ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Fri Feb 20 12:21:56 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Mon Feb 23 10:33:28 2009 +0000
@@ -106,14 +106,10 @@ BasicObjectLock* frame::interpreter_fram
 
 void frame::patch_pc(Thread* thread, address pc)
 {
-#ifdef SHARK
   // We borrow this call to set the thread pointer in the interpreter
   // state; the hook to set up deoptimized frames isn't supplied it.
   assert(pc == NULL, "should be");
   get_interpreterState()->set_thread((JavaThread *) thread);
-#else
-  Unimplemented();
-#endif // SHARK
 }
 
 bool frame::safe_for_sender(JavaThread *thread)
diff -r c017a717f617 -r c90d22c7678d ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp	Fri Feb 20 12:21:56 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp	Mon Feb 23 10:33:28 2009 +0000
@@ -68,7 +68,4 @@ void Deoptimization::unwind_callee_save_
 void Deoptimization::unwind_callee_save_values(frame* f,
                                                vframeArray* vframe_array)
 {
-#ifndef SHARK
-  Unimplemented();
-#endif // !SHARK
 }
diff -r c017a717f617 -r c90d22c7678d ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp	Fri Feb 20 12:21:56 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp	Mon Feb 23 10:33:28 2009 +0000
@@ -40,7 +40,6 @@ void NativeJump::patch_verified_entry(ad
                                       address verified_entry,
                                       address dest)
 {
-#ifdef SHARK
   assert(dest == SharedRuntime::get_handle_wrong_method_stub(), "should be");
 
 #ifdef CC_INTERP
@@ -48,7 +47,4 @@ void NativeJump::patch_verified_entry(ad
 #else
   Unimplemented();
 #endif // CC_INTERP  
-#else
-  Unimplemented();
-#endif // SHARK
 }
diff -r c017a717f617 -r c90d22c7678d ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp	Fri Feb 20 12:21:56 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp	Mon Feb 23 10:33:28 2009 +0000
@@ -181,10 +181,8 @@ class NativeJump : public NativeInstruct
   }
 
   static void check_verified_entry_alignment(address entry,
-                                             address verified_entry) {
-#ifndef SHARK
-    Unimplemented();
-#endif // !SHARK
+                                             address verified_entry) 
+  {
   }
 
   static void patch_verified_entry(address entry,
diff -r c017a717f617 -r c90d22c7678d ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Fri Feb 20 12:21:56 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Mon Feb 23 10:33:28 2009 +0000
@@ -69,11 +69,7 @@ nmethod *SharedRuntime::generate_native_
 
 int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals)
 {
-#ifdef SHARK
   return 0;
-#else
-  Unimplemented();
-#endif // SHARK
 }
 
 uint SharedRuntime::out_preserve_stack_slots()