changeset in /hg/icedtea6: 2009-02-26 Andrew Haley <aph at redhat...
Andrew Haley
aph at redhat.com
Thu Feb 26 10:49:33 PST 2009
changeset 5bb8386e5bc2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5bb8386e5bc2
description:
2009-02-26 Andrew Haley <aph at redhat.com>
* patches/openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp: New file.
* Makefile.am (ICEDTEA_PATCHES): Add icedtea-jvmtiEnv.patch.
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
(SharkFunction::initialize): Use real name, not "func".
Pass "none" to "-debug-only=".
Register generated code for profiling, etc.
* ports/hotspot/src/share/vm/shark/sharkEntry.hpp (class SharkEntry):
Remove #ifndef PRODUCT.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
(SharkBuilder::CreateFunction): Use real name, not "func".
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
(SharkBuilder::CreateFunction): Use real name, not "func".
(MyJITMemoryManager::endFunctionBody): Remove #ifndef PRODUCT.
diffstat:
6 files changed, 28 insertions(+), 13 deletions(-)
Makefile.am | 3 ++-
patches/icedtea-jvmtiEnv.patch | 12 ++++++++++++
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 9 ++++-----
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 2 +-
ports/hotspot/src/share/vm/shark/sharkEntry.hpp | 4 ----
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 11 +++++++++--
diffs (129 lines):
diff -r 39e3afb50b61 -r 5bb8386e5bc2 Makefile.am
--- a/Makefile.am Thu Feb 26 18:48:53 2009 +0000
+++ b/Makefile.am Thu Feb 26 18:49:20 2009 +0000
@@ -541,7 +541,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
- patches/icedtea-core-build.patch
+ patches/icedtea-core-build.patch \
+ patches/icedtea-jvmtiEnv.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 39e3afb50b61 -r 5bb8386e5bc2 patches/icedtea-jvmtiEnv.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-jvmtiEnv.patch Thu Feb 26 18:49:20 2009 +0000
@@ -0,0 +1,12 @@
+--- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp.old 2009-02-26 17:18:35.000000000 +0000
++++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2009-02-26 17:16:59.000000000 +0000
+@@ -2702,6 +2702,9 @@
+ (*entry_count_ptr) = num_entries;
+ (*table_ptr) = jvmti_table;
+
++ if (num_entries == 0)
++ return JVMTI_ERROR_ABSENT_INFORMATION;
++
+ return JVMTI_ERROR_NONE;
+ } /* end GetLineNumberTable */
+
diff -r 39e3afb50b61 -r 5bb8386e5bc2 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Feb 26 18:48:53 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Feb 26 18:49:20 2009 +0000
@@ -97,12 +97,12 @@ void SharkBuilder::init_external_functio
module()->getOrInsertFunction("llvm.memory.barrier", type));
}
-Function *SharkBuilder::CreateFunction()
+Function *SharkBuilder::CreateFunction(const char *name)
{
Function *function = Function::Create(
SharkType::entry_point_type(),
GlobalVariable::InternalLinkage,
- "func");
+ name);
module()->getFunctionList().push_back(function);
return function;
}
@@ -180,13 +180,12 @@ CallInst *SharkBuilder::CreateMemoryBarr
void SharkBuilder::MyJITMemoryManager::endFunctionBody
(const llvm::Function *F, unsigned char *FunctionStart,
- unsigned char *FunctionEnd)
+ unsigned char *FunctionEnd)
{
mm->endFunctionBody(F, FunctionStart, FunctionEnd);
-#ifndef PRODUCT
+
SharkEntry *e = sharkEntry[F];
if (e)
e->setBounds(FunctionStart, FunctionEnd);
-#endif // !PRODUCT
}
diff -r 39e3afb50b61 -r 5bb8386e5bc2 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Thu Feb 26 18:48:53 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Thu Feb 26 18:49:20 2009 +0000
@@ -109,7 +109,7 @@ class SharkBuilder : public llvm::IRBuil
// Function creation
public:
- llvm::Function *CreateFunction();
+ llvm::Function *CreateFunction(const char *name = "func");
// Helpers for accessing structures and arrays
public:
diff -r 39e3afb50b61 -r 5bb8386e5bc2 ports/hotspot/src/share/vm/shark/sharkEntry.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkEntry.hpp Thu Feb 26 18:48:53 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkEntry.hpp Thu Feb 26 18:49:20 2009 +0000
@@ -46,8 +46,6 @@ class SharkEntry : public ZeroEntry {
public:
void print_statistics(const char* name) const PRODUCT_RETURN;
-#ifndef PRODUCT
- private:
address code_start() const
{
return start;
@@ -66,6 +64,4 @@ public:
start = (address)FunctionStart;
limit = (address)FunctionEnd;
}
-
-#endif // !PRODUCT
};
diff -r 39e3afb50b61 -r 5bb8386e5bc2 ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Thu Feb 26 18:48:53 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Thu Feb 26 18:49:20 2009 +0000
@@ -37,7 +37,7 @@ void SharkFunction::initialize()
masm()->advance(sizeof(SharkEntry));
// Create the function
- _function = builder()->CreateFunction();
+ _function = builder()->CreateFunction(name());
entry->set_llvm_function(function());
#ifndef PRODUCT
// FIXME: there should be a mutex when updating sharkEntry in case
@@ -142,7 +142,7 @@ void SharkFunction::initialize()
// target-specific.
Args.push_back("-debug-only=" "x86-emitter");
else
- Args.push_back("-debug-only=");
+ Args.push_back("-debug-only=" "none");
Args.push_back(0); // Null terminator.
cl::ParseCommandLineOptions(Args.size()-1, (char**)&Args[0]);
#endif
@@ -150,6 +150,13 @@ void SharkFunction::initialize()
// Compile to native code
void *code = builder()->execution_engine()->getPointerToFunction(function());
+
+ // Register generated code for profiling, etc
+ if (JvmtiExport::should_post_dynamic_code_generated()) {
+ JvmtiExport::post_dynamic_code_generated
+ (name(), entry->code_start(), entry->code_limit());
+ }
+
entry->set_entry_point((ZeroEntry::method_entry_t) code);
if (SharkTraceInstalls)
entry->print_statistics(name());
More information about the distro-pkg-dev
mailing list