changeset in /hg/icedtea6: 2009-08-13 Gary Benson <gbenson at red...

[Gary Benson]

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

		* ports/hotspot/src/share/vm/shark/sharkEntry.hpp
		(SharkEntry::_function): New field.
		(SharkEntry::function): New method.
		(SharkEntry::set_function): Likewise.

		* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
		(SharkCompiler::free_compiled_method): New method.
		* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
		(SharkCompiler::free_compiled_method): New method.
		(SharkCompiler::compile_method): Store a pointer to
		the LLVM function in the method's SharkEntry.

		* patches/hotspot/default/icedtea-shark.patch
		(nmethod::flush): Add code to free Shark methods.

		* ports/hotspot/src/share/vm/includeDB_shark: Updated.

diffstat:

6 files changed, 57 insertions(+), 5 deletions(-)
ChangeLog                                          |   19 +++++++++++++++++++
patches/hotspot/default/icedtea-shark.patch        |   14 ++++++++++++++
ports/hotspot/src/share/vm/includeDB_shark         |    2 +-
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |    8 ++++++++
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp |    3 +++
ports/hotspot/src/share/vm/shark/sharkEntry.hpp    |   16 ++++++++++++----

diffs (133 lines):

diff -r 9420faca6468 -r 84a63387e544 ChangeLog
--- a/ChangeLog	Fri Aug 07 11:58:27 2009 +0200
+++ b/ChangeLog	Thu Aug 13 08:01:04 2009 -0400
@@ -1,3 +1,22 @@ 2009-08-07  Matthias Klose  <doko at ubuntu
+2009-08-13  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkEntry.hpp
+	(SharkEntry::_function): New field.
+	(SharkEntry::function): New method.
+	(SharkEntry::set_function): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
+	(SharkCompiler::free_compiled_method): New method.	
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::free_compiled_method): New method.
+	(SharkCompiler::compile_method): Store a pointer to
+	the LLVM function in the method's SharkEntry.
+
+	* patches/hotspot/default/icedtea-shark.patch
+	(nmethod::flush): Add code to free Shark methods.
+
+	* ports/hotspot/src/share/vm/includeDB_shark: Updated.
+
 2009-08-07  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Add configure options
diff -r 9420faca6468 -r 84a63387e544 patches/hotspot/default/icedtea-shark.patch
--- a/patches/hotspot/default/icedtea-shark.patch	Fri Aug 07 11:58:27 2009 +0200
+++ b/patches/hotspot/default/icedtea-shark.patch	Thu Aug 13 08:01:04 2009 -0400
@@ -374,3 +374,17 @@ diff -r 12c97e7e55eb -r e6fef2ef2fea ope
    address       native_entry();
    address       interpreter_entry();
  
+diff -r 0d80af392e67 openjdk/hotspot/src/share/vm/code/nmethod.cpp
+--- openjdk/hotspot/src/share/vm/code/nmethod.cpp	Thu Jul 30 10:00:04 2009 +0100
++++ openjdk/hotspot/src/share/vm/code/nmethod.cpp	Fri Jul 31 15:39:43 2009 +0100
+@@ -1296,6 +1296,10 @@
+     ec = next;
+   }
+ 
++#ifdef SHARK
++  ((SharkCompiler *) compiler())->free_compiled_method(instructions_begin());
++#endif // SHARK
++  
+   ((CodeBlob*)(this))->flush();
+ 
+   CodeCache::free(this);
diff -r 9420faca6468 -r 84a63387e544 ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark	Fri Aug 07 11:58:27 2009 +0200
+++ b/ports/hotspot/src/share/vm/includeDB_shark	Thu Aug 13 08:01:04 2009 -0400
@@ -57,7 +57,7 @@ llvmValue.hpp                           
 llvmValue.hpp                           llvmHeaders.hpp
 llvmValue.hpp                           sharkType.hpp
 
-methodOop.cpp                           sharkEntry.hpp
+nmethod.cpp                             sharkCompiler.hpp
 
 shark_globals.cpp                       shark_globals.hpp
 
diff -r 9420faca6468 -r 84a63387e544 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Fri Aug 07 11:58:27 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Thu Aug 13 08:01:04 2009 -0400
@@ -146,6 +146,7 @@ void SharkCompiler::compile_method(ciEnv
     if (!fnmatch(SharkPrintBitcodeOf, name, 0))
       function->dump();
   }
+  entry->set_function(function);
 
   // Compile to native code
 #ifndef PRODUCT
@@ -206,6 +207,13 @@ void SharkCompiler::compile_method(ciEnv
   }
 }
 
+void SharkCompiler::free_compiled_method(address code)
+{
+  Function *function = ((SharkEntry *) code)->function();
+  execution_engine()->freeMachineCodeForFunction(function);
+  function->eraseFromParent();
+}
+
 const char* SharkCompiler::methodname(const ciMethod* target)
 {
   const char *klassname = target->holder()->name()->as_utf8();
diff -r 9420faca6468 -r 84a63387e544 ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.hpp	Fri Aug 07 11:58:27 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.hpp	Thu Aug 13 08:01:04 2009 -0400
@@ -45,6 +45,9 @@ class SharkCompiler : public AbstractCom
   // Compilation entry point for methods
   void compile_method(ciEnv* env, ciMethod* target, int entry_bci);
 
+  // Free compiled methods
+  void free_compiled_method(address code);
+
   // LLVM interface
  private:
   llvm::Module*          _module;
diff -r 9420faca6468 -r 84a63387e544 ports/hotspot/src/share/vm/shark/sharkEntry.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkEntry.hpp	Fri Aug 07 11:58:27 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkEntry.hpp	Thu Aug 13 08:01:04 2009 -0400
@@ -24,10 +24,9 @@
  */
 
 class SharkEntry : public ZeroEntry {
-  friend class SharkMemoryManager;
-
  private:
-  address _code_limit;
+  address         _code_limit;
+  llvm::Function* _function;
 
  public:
   address code_start() const
@@ -38,9 +37,18 @@ class SharkEntry : public ZeroEntry {
   {
     return _code_limit;
   }
- protected:
+  llvm::Function* function() const
+  {
+    return _function;
+  }
+
+ public:
   void set_code_limit(address code_limit)
   {
     _code_limit = code_limit;
   }
+  void set_function(llvm::Function* function)
+  {
+    _function = function;
+  }
 };