/hg/icedtea6: Implement -XX:SharkPrintAsmOf using LLVM 2.7svn r8...

[xranby at icedtea.classpath.org]

changeset ff96e96a485b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ff96e96a485b
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:

3 files changed, 28 insertions(+)
ChangeLog                                          |    8 ++++++++
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp   |    4 ++++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |   16 ++++++++++++++++

diffs (63 lines):

diff -r 00375f1c8222 -r ff96e96a485b ChangeLog
--- a/ChangeLog	Mon Nov 09 12:55:30 2009 +0100
+++ b/ChangeLog	Mon Nov 09 13:07:15 2009 +0100
@@ -1,3 +1,11 @@ 2009-11-09  Xerxes RÃ¥nby  <xerxes at zafen
+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,
diff -r 00375f1c8222 -r ff96e96a485b ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Mon Nov 09 12:55:30 2009 +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 00375f1c8222 -r ff96e96a485b ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Nov 09 12:55:30 2009 +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);