/hg/icedtea: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 897aa6e8c9b3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=897aa6e8c9b3
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Nov 09 12:55:30 2009 +0100

	Adjust SharkMemoryManager to support LLVM 2.7svn rev 84651.

	2009-11-09 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
	ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: New
	methods deallocateExceptionTable and deallocateFunctionBody
	dependent on the llvm version. Made deallocateMemForFunction
	method dependent on the llvm version.


changeset 9ccd1c960e63 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9ccd1c960e63
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Nov 09 13:07:15 2009 +0100

	Implement -XX:SharkPrintAsmOf using LLVM 2.7svn r85395 debug API.

	2009-11-09 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
	Include llvm/Support/Debug.h dependent on llvm version. Made
	Include llvm/Support/CommandLine.h dependent on llvm version.
	        * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp:
	Implement -XX:SharkPrintAsmOf using LLVM 2.7svn r85395 debug API.


diffstat:

5 files changed, 53 insertions(+)
ChangeLog                                               |   16 +++++++++++++++
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp        |    4 +++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp      |   16 +++++++++++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |   12 +++++++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |    5 ++++

diffs (113 lines):

diff -r 1529c5d1b41f -r 9ccd1c960e63 ChangeLog
--- a/ChangeLog	Thu May 06 15:22:07 2010 +0100
+++ b/ChangeLog	Mon Nov 09 13:07:15 2009 +0100
@@ -1,3 +1,19 @@ 2010-05-06  Andrew John Hughes  <ahughes
+2009-11-09  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
+	Include llvm/Support/Debug.h dependent on llvm version.
+	Made Include llvm/Support/CommandLine.h dependent on llvm version.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp:
+	Implement -XX:SharkPrintAsmOf using LLVM 2.7svn r85395 debug API.
+
+2009-11-09  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+	ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp:
+	New methods deallocateExceptionTable and deallocateFunctionBody
+	dependent on the llvm version.
+	Made deallocateMemForFunction method dependent on the llvm version.
+
 2010-05-06  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Remove euctw patch.
diff -r 1529c5d1b41f -r 9ccd1c960e63 ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Thu May 06 15:22:07 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Mon Nov 09 13:07:15 2009 +0100
@@ -44,7 +44,11 @@
 #endif
 #include <llvm/Type.h>
 #include <llvm/ExecutionEngine/JITMemoryManager.h>
+#if SHARK_LLVM_VERSION < 27
 #include <llvm/Support/CommandLine.h>
+#else
+#include <llvm/Support/Debug.h>
+#endif
 
 #include <map>
 
diff -r 1529c5d1b41f -r 9ccd1c960e63 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Thu May 06 15:22:07 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Nov 09 13:07:15 2009 +0100
@@ -132,6 +132,7 @@ void SharkCompiler::compile_method(ciEnv
 
   // Compile to native code
 #ifndef PRODUCT
+#if SHARK_LLVM_VERSION < 27
 #ifdef X86
   if (SharkPrintAsmOf != NULL) {
     std::vector<const char*> args;
@@ -144,6 +145,21 @@ void SharkCompiler::compile_method(ciEnv
     cl::ParseCommandLineOptions(args.size() - 1, (char **) &args[0]);
   }
 #endif // X86
+#else
+  if (SharkPrintAsmOf != NULL) {
+    if (!fnmatch(SharkPrintAsmOf, name, 0)) {
+#ifdef X86
+      llvm::SetCurrentDebugType("x86-emitter");
+#else
+      llvm::SetCurrentDebugType("jit");
+#endif // X86
+      llvm::DebugFlag=true;
+    } else {
+      llvm::SetCurrentDebugType(""); 
+      llvm::DebugFlag=false;
+    }
+  }
+#endif
 #endif // !PRODUCT
   memory_manager()->set_entry_for_function(function, entry);
   module()->getFunctionList().push_back(function);
diff -r 1529c5d1b41f -r 9ccd1c960e63 ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Thu May 06 15:22:07 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Mon Nov 09 13:07:15 2009 +0100
@@ -86,10 +86,22 @@ void SharkMemoryManager::setMemoryExecut
   mm()->setMemoryExecutable();
 }
 
+#if SHARK_LLVM_VERSION >= 27
+void SharkMemoryManager::deallocateExceptionTable(void *ptr)
+{
+  mm()->deallocateExceptionTable(ptr);
+}
+
+void SharkMemoryManager::deallocateFunctionBody(void *ptr)
+{
+  mm()->deallocateFunctionBody(ptr);
+}
+#else
 void SharkMemoryManager::deallocateMemForFunction(const Function* F)
 {
   return mm()->deallocateMemForFunction(F);
 }
+#endif
 
 #if SHARK_LLVM_VERSION >= 26
 uint8_t* SharkMemoryManager::allocateGlobal(uintptr_t Size, unsigned int Alignment)
diff -r 1529c5d1b41f -r 9ccd1c960e63 ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Thu May 06 15:22:07 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Mon Nov 09 13:07:15 2009 +0100
@@ -79,7 +79,12 @@ class SharkMemoryManager : public llvm::
 #endif
   void setMemoryWritable();
   void setMemoryExecutable();
+#if SHARK_LLVM_VERSION >= 27
+  void deallocateExceptionTable(void *ptr);
+  void deallocateFunctionBody(void *ptr);
+#else
   void deallocateMemForFunction(const llvm::Function* F);
+#endif
 
 #if SHARK_LLVM_VERSION >= 25
   unsigned char *allocateSpace(intptr_t Size,