changeset in /hg/icedtea: 2009-03-06 Gary Benson <gbenson at redh...
Gary Benson
gbenson at redhat.com
Fri Mar 20 01:52:21 PDT 2009
changeset 8228a1d1008b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8228a1d1008b
description:
2009-03-06 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
(SharkBuilder::SharkBuilder): New argument.
(SharkBuilder::_compiler): New field.
(SharkBuilder::_module): Removed field.
(SharkBuilder::_module_provider): Likewise.
(SharkBuilder::_execution_engine): Likewise.
(SharkBuilder::module): Rewritten.
(SharkBuilder::execution_engine): Likewise.
(SharkBuilder::MyJITMemoryManager): Moved to sharkMemoryManager.hpp.
(SharkBuilder::sharkEntry): Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
(SharkBuilder::SharkBuilder): New argument.
(SharkBuilder::MyJITMemoryManager::endFunctionBody) Moved to
sharkMemoryManager.cpp.
(SharkBuilder::sharkEntry): Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
(SharkCompiler::_module): New field.
(SharkCompiler::_execution_engine): Likewise.
(SharkCompiler::module): New method.
(SharkCompiler::execution_engine): Likewise.
(SharkCompiler::compile): Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
(SharkCompiler::SharkCompiler): Initialize new fields.
(SharkCompiler::compile): New method.
* ports/hotspot/src/share/vm/shark/sharkEntry.hpp
(SharkEntry::_code_start): Removed field.
(SharkEntry::code_start): Rewritten.
(SharkEntry::set_bounds): Replaced with...
(SharkEntry::set_code_limit): New method.
(SharkEntry::llvm_function_offset): Removed method.
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp
(SharkFunction::SharkFunction): Changed arguments.
(SharkFunction::_builder): Removed field.
(SharkFunction::_compiler): New field.
(SharkFunction::compiler): New method.
(SharkFunction::builder): Rewritten.
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp
(SharkFunction::initialize): Updated for new interfaces.
* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: New file.
* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
* ports/hotspot/src/share/vm/includeDB_shark: Updated.
diffstat:
12 files changed, 560 insertions(+), 375 deletions(-)
ChangeLog | 49 +
ports/hotspot/src/share/vm/includeDB_shark | 380 +++++++--------
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 23
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 93 ---
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 45 +
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp | 36 +
ports/hotspot/src/share/vm/shark/sharkEntry.hpp | 15
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 33 -
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 90 +--
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp | 92 +++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp | 77 +++
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 2
diffs (truncated from 1151 to 500 lines):
diff -r 52cac9f018fd -r 8228a1d1008b ChangeLog
--- a/ChangeLog Fri Mar 06 11:33:48 2009 +0100
+++ b/ChangeLog Fri Mar 06 09:47:04 2009 -0500
@@ -1,3 +1,52 @@ 2009-03-06 Matthias Klose <doko at ubuntu
+2009-03-06 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+ (SharkBuilder::SharkBuilder): New argument.
+ (SharkBuilder::_compiler): New field.
+ (SharkBuilder::_module): Removed field.
+ (SharkBuilder::_module_provider): Likewise.
+ (SharkBuilder::_execution_engine): Likewise.
+ (SharkBuilder::module): Rewritten.
+ (SharkBuilder::execution_engine): Likewise.
+ (SharkBuilder::MyJITMemoryManager): Moved to sharkMemoryManager.hpp.
+ (SharkBuilder::sharkEntry): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+ (SharkBuilder::SharkBuilder): New argument.
+ (SharkBuilder::MyJITMemoryManager::endFunctionBody) Moved to
+ sharkMemoryManager.cpp.
+ (SharkBuilder::sharkEntry): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
+ (SharkCompiler::_module): New field.
+ (SharkCompiler::_execution_engine): Likewise.
+ (SharkCompiler::module): New method.
+ (SharkCompiler::execution_engine): Likewise.
+ (SharkCompiler::compile): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
+ (SharkCompiler::SharkCompiler): Initialize new fields.
+ (SharkCompiler::compile): New method.
+
+ * ports/hotspot/src/share/vm/shark/sharkEntry.hpp
+ (SharkEntry::_code_start): Removed field.
+ (SharkEntry::code_start): Rewritten.
+ (SharkEntry::set_bounds): Replaced with...
+ (SharkEntry::set_code_limit): New method.
+ (SharkEntry::llvm_function_offset): Removed method.
+
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp
+ (SharkFunction::SharkFunction): Changed arguments.
+ (SharkFunction::_builder): Removed field.
+ (SharkFunction::_compiler): New field.
+ (SharkFunction::compiler): New method.
+ (SharkFunction::builder): Rewritten.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp
+ (SharkFunction::initialize): Updated for new interfaces.
+
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: New file.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
+
+ * ports/hotspot/src/share/vm/includeDB_shark: Updated.
+
2009-03-06 Matthias Klose <doko at ubuntu.com>
* Makefile.am (check-*): Pass $(ICEDTEA_JTREG_OPTIONS), unset
diff -r 52cac9f018fd -r 8228a1d1008b ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark Fri Mar 06 11:33:48 2009 +0100
+++ b/ports/hotspot/src/share/vm/includeDB_shark Fri Mar 06 09:47:04 2009 -0500
@@ -24,25 +24,6 @@
//
// NOTE: DO NOT CHANGE THIS COPYRIGHT TO NEW STYLE - IT WILL BREAK makeDeps!
-
-sharkBlock.cpp debug.hpp
-sharkBlock.cpp bytecodes.hpp
-sharkBlock.cpp llvmHeaders.hpp
-sharkBlock.cpp shark_globals.hpp
-sharkBlock.cpp sharkBlock.hpp
-sharkBlock.cpp sharkBuilder.hpp
-sharkBlock.cpp sharkRuntime.hpp
-sharkBlock.cpp sharkState.inline.hpp
-sharkBlock.cpp sharkValue.inline.hpp
-
-sharkBlock.hpp allocation.hpp
-sharkBlock.hpp ciMethod.hpp
-sharkBlock.hpp ciStreams.hpp
-sharkBlock.hpp debug.hpp
-sharkBlock.hpp llvmHeaders.hpp
-sharkBlock.hpp sharkBuilder.hpp
-sharkBlock.hpp sharkState.hpp
-sharkBlock.hpp sharkValue.hpp
ciMethod.cpp ciTypeFlow.hpp
ciMethod.cpp methodOop.hpp
@@ -81,6 +62,202 @@ shark_globals.cpp
shark_globals.hpp shark_globals_<arch>.hpp
shark_globals.hpp globals.hpp
+
+sharkBlock.cpp debug.hpp
+sharkBlock.cpp bytecodes.hpp
+sharkBlock.cpp llvmHeaders.hpp
+sharkBlock.cpp shark_globals.hpp
+sharkBlock.cpp sharkBlock.hpp
+sharkBlock.cpp sharkBuilder.hpp
+sharkBlock.cpp sharkRuntime.hpp
+sharkBlock.cpp sharkState.inline.hpp
+sharkBlock.cpp sharkValue.inline.hpp
+
+sharkBlock.hpp allocation.hpp
+sharkBlock.hpp ciMethod.hpp
+sharkBlock.hpp ciStreams.hpp
+sharkBlock.hpp debug.hpp
+sharkBlock.hpp llvmHeaders.hpp
+sharkBlock.hpp sharkBuilder.hpp
+sharkBlock.hpp sharkState.hpp
+sharkBlock.hpp sharkValue.hpp
+
+sharkBuilder.cpp ciMethod.hpp
+sharkBuilder.cpp debug.hpp
+sharkBuilder.cpp llvmHeaders.hpp
+sharkBuilder.cpp methodOop.hpp
+sharkBuilder.cpp os.hpp
+sharkBuilder.cpp resourceArea.hpp
+sharkBuilder.cpp llvmHeaders.hpp
+sharkBuilder.cpp sharkBuilder.hpp
+sharkBuilder.cpp sharkCompiler.hpp
+sharkBuilder.cpp sharkRuntime.hpp
+sharkBuilder.cpp synchronizer.hpp
+sharkBuilder.cpp thread.hpp
+
+sharkBuilder.hpp barrierSet.hpp
+sharkBuilder.hpp cardTableModRefBS.hpp
+sharkBuilder.hpp ciType.hpp
+sharkBuilder.hpp debug.hpp
+sharkBuilder.hpp llvmHeaders.hpp
+sharkBuilder.hpp sizes.hpp
+sharkBuilder.hpp sharkCompiler.hpp
+sharkBuilder.hpp sharkType.hpp
+sharkBuilder.hpp sharkValue.inline.hpp
+sharkBuilder.hpp sharkEntry.hpp
+
+sharkCacheDecache.cpp ciMethod.hpp
+sharkCacheDecache.cpp debugInfoRec.hpp
+sharkCacheDecache.cpp sharkBuilder.hpp
+sharkCacheDecache.cpp sharkCacheDecache.hpp
+sharkCacheDecache.cpp sharkFunction.hpp
+sharkCacheDecache.cpp sharkState.inline.hpp
+
+sharkCacheDecache.hpp ciMethod.hpp
+sharkCacheDecache.hpp debugInfoRec.hpp
+sharkCacheDecache.hpp sharkBuilder.hpp
+sharkCacheDecache.hpp sharkFunction.hpp
+sharkCacheDecache.hpp sharkStateScanner.hpp
+
+sharkCompiler.cpp abstractCompiler.hpp
+sharkCompiler.cpp ciEnv.hpp
+sharkCompiler.cpp ciMethod.hpp
+sharkCompiler.cpp codeBuffer.hpp
+sharkCompiler.cpp debug.hpp
+sharkCompiler.cpp debugInfoRec.hpp
+sharkCompiler.cpp dependencies.hpp
+sharkCompiler.cpp exceptionHandlerTable.hpp
+sharkCompiler.cpp llvmHeaders.hpp
+sharkCompiler.cpp oopMap.hpp
+sharkCompiler.cpp oopRecorder.hpp
+sharkCompiler.cpp shark_globals.hpp
+sharkCompiler.cpp sharkBuilder.hpp
+sharkCompiler.cpp sharkCompiler.hpp
+sharkCompiler.cpp sharkEntry.hpp
+sharkCompiler.cpp sharkFunction.hpp
+sharkCompiler.cpp sharkMemoryManager.hpp
+sharkCompiler.cpp sharkRuntime.hpp
+
+sharkCompiler.hpp abstractCompiler.hpp
+sharkCompiler.hpp ciEnv.hpp
+sharkCompiler.hpp ciMethod.hpp
+sharkCompiler.hpp llvmHeaders.hpp
+sharkCompiler.hpp sharkMemoryManager.hpp
+
+sharkConstantPool.cpp allocation.hpp
+sharkConstantPool.cpp constantPoolOop.hpp
+sharkConstantPool.cpp cpCacheOop.hpp
+sharkConstantPool.cpp debug.hpp
+sharkConstantPool.cpp llvmHeaders.hpp
+sharkConstantPool.cpp methodOop.hpp
+sharkConstantPool.cpp sharkBuilder.hpp
+sharkConstantPool.cpp sharkConstantPool.hpp
+sharkConstantPool.cpp sharkRuntime.hpp
+sharkConstantPool.cpp sharkState.inline.hpp
+sharkConstantPool.cpp sharkType.hpp
+sharkConstantPool.cpp sharkValue.inline.hpp
+
+sharkConstantPool.hpp allocation.hpp
+sharkConstantPool.hpp llvmHeaders.hpp
+sharkConstantPool.hpp sharkBuilder.hpp
+sharkConstantPool.hpp sharkTopLevelBlock.hpp
+
+sharkEntry.cpp sharkEntry.hpp
+
+sharkEntry.hpp llvmHeaders.hpp
+
+sharkFunction.cpp allocation.hpp
+sharkFunction.cpp ciTypeFlow.hpp
+sharkFunction.cpp debug.hpp
+sharkFunction.cpp llvmHeaders.hpp
+sharkFunction.cpp shark_globals.hpp
+sharkFunction.cpp sharkBuilder.hpp
+sharkFunction.cpp sharkEntry.hpp
+sharkFunction.cpp sharkFunction.hpp
+sharkFunction.cpp sharkMonitor.hpp
+sharkFunction.cpp sharkState.inline.hpp
+sharkFunction.cpp sharkTopLevelBlock.hpp
+
+sharkFunction.hpp allocation.hpp
+sharkFunction.hpp ciEnv.hpp
+sharkFunction.hpp ciStreams.hpp
+sharkFunction.hpp ciTypeFlow.hpp
+sharkFunction.hpp llvmHeaders.hpp
+sharkFunction.hpp sharkBuilder.hpp
+
+sharkInliner.cpp allocation.hpp
+sharkInliner.cpp bytecodes.hpp
+sharkInliner.cpp ciField.hpp
+sharkInliner.cpp ciMethod.hpp
+sharkInliner.cpp ciStreams.hpp
+sharkInliner.cpp shark_globals.hpp
+sharkInliner.cpp sharkInliner.hpp
+sharkInliner.cpp sharkState.inline.hpp
+sharkInliner.cpp sharkValue.inline.hpp
+
+sharkInliner.hpp allocation.hpp
+sharkInliner.hpp ciMethod.hpp
+sharkInliner.hpp sharkState.inline.hpp
+
+sharkMemoryManager.hpp llvmHeaders.hpp
+sharkMemoryManager.hpp sharkEntry.hpp
+
+sharkMemoryManager.cpp llvmHeaders.hpp
+sharkMemoryManager.cpp sharkEntry.hpp
+sharkMemoryManager.cpp sharkMemoryManager.hpp
+
+sharkMonitor.cpp llvmHeaders.hpp
+sharkMonitor.cpp sharkMonitor.hpp
+sharkMonitor.cpp sharkRuntime.hpp
+sharkMonitor.cpp sharkState.inline.hpp
+sharkMonitor.cpp sharkTopLevelBlock.hpp
+
+sharkMonitor.hpp allocation.hpp
+sharkMonitor.hpp llvmHeaders.hpp
+sharkMonitor.hpp sharkBuilder.hpp
+sharkMonitor.hpp sharkFunction.hpp
+
+sharkRuntime.cpp biasedLocking.hpp
+sharkRuntime.cpp deoptimization.hpp
+sharkRuntime.cpp llvmHeaders.hpp
+sharkRuntime.cpp klassOop.hpp
+sharkRuntime.cpp sharkBuilder.hpp
+sharkRuntime.cpp sharkRuntime.hpp
+sharkRuntime.cpp sharkType.hpp
+sharkRuntime.cpp thread.hpp
+
+sharkRuntime.hpp allocation.hpp
+sharkRuntime.hpp llvmHeaders.hpp
+sharkRuntime.hpp klassOop.hpp
+sharkRuntime.hpp sharkBuilder.hpp
+sharkRuntime.hpp thread.hpp
+
+sharkState.cpp allocation.hpp
+sharkState.cpp ciType.hpp
+sharkState.cpp ciTypeFlow.hpp
+sharkState.cpp sharkBuilder.hpp
+sharkState.cpp sharkCacheDecache.hpp
+sharkState.cpp sharkState.inline.hpp
+sharkState.cpp sharkTopLevelBlock.hpp
+sharkState.cpp sharkType.hpp
+sharkState.cpp sharkValue.inline.hpp
+
+sharkState.hpp allocation.hpp
+sharkState.hpp ciMethod.hpp
+sharkState.hpp llvmHeaders.hpp
+sharkState.hpp sharkBuilder.hpp
+sharkState.hpp sharkValue.hpp
+
+sharkState.inline.hpp sharkBlock.hpp
+sharkState.inline.hpp sharkBuilder.hpp
+sharkState.inline.hpp sharkState.hpp
+
+sharkStateScanner.cpp sharkState.inline.hpp
+sharkStateScanner.cpp sharkStateScanner.hpp
+
+sharkStateScanner.hpp allocation.hpp
+sharkStateScanner.hpp llvmHeaders.hpp
+sharkStateScanner.hpp sharkFunction.hpp
sharkTopLevelBlock.cpp allocation.hpp
sharkTopLevelBlock.cpp bytecodes.hpp
@@ -112,171 +289,6 @@ sharkTopLevelBlock.hpp
sharkTopLevelBlock.hpp sharkState.inline.hpp
sharkTopLevelBlock.hpp sharkValue.inline.hpp
-sharkBuilder.cpp ciMethod.hpp
-sharkBuilder.cpp debug.hpp
-sharkBuilder.cpp llvmHeaders.hpp
-sharkBuilder.cpp methodOop.hpp
-sharkBuilder.cpp os.hpp
-sharkBuilder.cpp resourceArea.hpp
-sharkBuilder.cpp llvmHeaders.hpp
-sharkBuilder.cpp sharkBuilder.hpp
-sharkBuilder.cpp sharkRuntime.hpp
-sharkBuilder.cpp synchronizer.hpp
-sharkBuilder.cpp thread.hpp
-
-sharkBuilder.hpp barrierSet.hpp
-sharkBuilder.hpp cardTableModRefBS.hpp
-sharkBuilder.hpp ciType.hpp
-sharkBuilder.hpp debug.hpp
-sharkBuilder.hpp llvmHeaders.hpp
-sharkBuilder.hpp sizes.hpp
-sharkBuilder.hpp sharkType.hpp
-sharkBuilder.hpp sharkValue.inline.hpp
-sharkBuilder.hpp sharkEntry.hpp
-
-sharkCacheDecache.cpp ciMethod.hpp
-sharkCacheDecache.cpp debugInfoRec.hpp
-sharkCacheDecache.cpp sharkBuilder.hpp
-sharkCacheDecache.cpp sharkCacheDecache.hpp
-sharkCacheDecache.cpp sharkFunction.hpp
-sharkCacheDecache.cpp sharkState.inline.hpp
-
-sharkCacheDecache.hpp ciMethod.hpp
-sharkCacheDecache.hpp debugInfoRec.hpp
-sharkCacheDecache.hpp sharkBuilder.hpp
-sharkCacheDecache.hpp sharkFunction.hpp
-sharkCacheDecache.hpp sharkStateScanner.hpp
-
-sharkCompiler.cpp ciEnv.hpp
-sharkCompiler.cpp ciMethod.hpp
-sharkCompiler.cpp codeBuffer.hpp
-sharkCompiler.cpp debug.hpp
-sharkCompiler.cpp debugInfoRec.hpp
-sharkCompiler.cpp dependencies.hpp
-sharkCompiler.cpp exceptionHandlerTable.hpp
-sharkCompiler.cpp llvmHeaders.hpp
-sharkCompiler.cpp oopMap.hpp
-sharkCompiler.cpp oopRecorder.hpp
-sharkCompiler.cpp shark_globals.hpp
-sharkCompiler.cpp sharkCompiler.hpp
-sharkCompiler.cpp sharkEntry.hpp
-sharkCompiler.cpp sharkFunction.hpp
-sharkCompiler.cpp sharkRuntime.hpp
-
-sharkCompiler.hpp abstractCompiler.hpp
-sharkCompiler.hpp ciEnv.hpp
-sharkCompiler.hpp ciMethod.hpp
-sharkCompiler.hpp llvmHeaders.hpp
-sharkCompiler.hpp sharkBuilder.hpp
-
-sharkConstantPool.cpp allocation.hpp
-sharkConstantPool.cpp constantPoolOop.hpp
-sharkConstantPool.cpp cpCacheOop.hpp
-sharkConstantPool.cpp debug.hpp
-sharkConstantPool.cpp llvmHeaders.hpp
-sharkConstantPool.cpp methodOop.hpp
-sharkConstantPool.cpp sharkBuilder.hpp
-sharkConstantPool.cpp sharkConstantPool.hpp
-sharkConstantPool.cpp sharkRuntime.hpp
-sharkConstantPool.cpp sharkState.inline.hpp
-sharkConstantPool.cpp sharkType.hpp
-sharkConstantPool.cpp sharkValue.inline.hpp
-
-sharkConstantPool.hpp allocation.hpp
-sharkConstantPool.hpp llvmHeaders.hpp
-sharkConstantPool.hpp sharkBuilder.hpp
-sharkConstantPool.hpp sharkTopLevelBlock.hpp
-
-sharkEntry.cpp sharkEntry.hpp
-
-sharkEntry.hpp llvmHeaders.hpp
-
-sharkFunction.cpp allocation.hpp
-sharkFunction.cpp ciTypeFlow.hpp
-sharkFunction.cpp debug.hpp
-sharkFunction.cpp llvmHeaders.hpp
-sharkFunction.cpp shark_globals.hpp
-sharkFunction.cpp sharkBuilder.hpp
-sharkFunction.cpp sharkEntry.hpp
-sharkFunction.cpp sharkFunction.hpp
-sharkFunction.cpp sharkMonitor.hpp
-sharkFunction.cpp sharkState.inline.hpp
-sharkFunction.cpp sharkTopLevelBlock.hpp
-
-sharkFunction.hpp allocation.hpp
-sharkFunction.hpp ciEnv.hpp
-sharkFunction.hpp ciStreams.hpp
-sharkFunction.hpp ciTypeFlow.hpp
-sharkFunction.hpp llvmHeaders.hpp
-sharkFunction.hpp sharkBuilder.hpp
-
-sharkInliner.cpp allocation.hpp
-sharkInliner.cpp bytecodes.hpp
-sharkInliner.cpp ciField.hpp
-sharkInliner.cpp ciMethod.hpp
-sharkInliner.cpp ciStreams.hpp
-sharkInliner.cpp shark_globals.hpp
-sharkInliner.cpp sharkInliner.hpp
-sharkInliner.cpp sharkState.inline.hpp
-sharkInliner.cpp sharkValue.inline.hpp
-
-sharkInliner.hpp allocation.hpp
-sharkInliner.hpp ciMethod.hpp
-sharkInliner.hpp sharkState.inline.hpp
-
-sharkMonitor.cpp llvmHeaders.hpp
-sharkMonitor.cpp sharkMonitor.hpp
-sharkMonitor.cpp sharkRuntime.hpp
-sharkMonitor.cpp sharkState.inline.hpp
-sharkMonitor.cpp sharkTopLevelBlock.hpp
-
-sharkMonitor.hpp allocation.hpp
-sharkMonitor.hpp llvmHeaders.hpp
-sharkMonitor.hpp sharkBuilder.hpp
-sharkMonitor.hpp sharkFunction.hpp
-
-sharkRuntime.cpp biasedLocking.hpp
-sharkRuntime.cpp deoptimization.hpp
-sharkRuntime.cpp llvmHeaders.hpp
-sharkRuntime.cpp klassOop.hpp
-sharkRuntime.cpp sharkBuilder.hpp
-sharkRuntime.cpp sharkRuntime.hpp
-sharkRuntime.cpp sharkType.hpp
-sharkRuntime.cpp thread.hpp
-
-sharkRuntime.hpp allocation.hpp
-sharkRuntime.hpp llvmHeaders.hpp
-sharkRuntime.hpp klassOop.hpp
-sharkRuntime.hpp sharkBuilder.hpp
-sharkRuntime.hpp thread.hpp
-
-sharkState.cpp allocation.hpp
-sharkState.cpp ciType.hpp
-sharkState.cpp ciTypeFlow.hpp
-sharkState.cpp sharkBuilder.hpp
-sharkState.cpp sharkCacheDecache.hpp
-sharkState.cpp sharkState.inline.hpp
-sharkState.cpp sharkTopLevelBlock.hpp
-sharkState.cpp sharkType.hpp
-sharkState.cpp sharkValue.inline.hpp
-
-sharkState.hpp allocation.hpp
-sharkState.hpp ciMethod.hpp
-sharkState.hpp llvmHeaders.hpp
-sharkState.hpp sharkBuilder.hpp
-sharkState.hpp sharkValue.hpp
-
-sharkState.inline.hpp sharkBlock.hpp
-sharkState.inline.hpp sharkBuilder.hpp
-sharkState.inline.hpp sharkState.hpp
-
-sharkStateScanner.cpp sharkState.inline.hpp
-sharkStateScanner.cpp sharkStateScanner.hpp
-
-sharkStateScanner.hpp allocation.hpp
-sharkStateScanner.hpp llvmHeaders.hpp
-sharkStateScanner.hpp sharkFunction.hpp
-
sharkType.cpp arrayOop.hpp
sharkType.cpp globalDefinitions.hpp
sharkType.cpp llvmHeaders.hpp
diff -r 52cac9f018fd -r 8228a1d1008b ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Fri Mar 06 11:33:48 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Fri Mar 06 09:47:04 2009 -0500
@@ -28,15 +28,10 @@
using namespace llvm;
-std::map<const llvm::Function*, SharkEntry*> SharkBuilder::sharkEntry;
-
-SharkBuilder::SharkBuilder()
+SharkBuilder::SharkBuilder(SharkCompiler* compiler)
: IRBuilder<>(),
- _module("shark"),
- _module_provider(module()),
- _execution_engine(ExecutionEngine::createJIT
- (&_module_provider, NULL, new MyJITMemoryManager(),
- /* Fast */ false)) {
+ _compiler(compiler)
+{
init_external_functions();
}
@@ -177,15 +172,3 @@ CallInst *SharkBuilder::CreateMemoryBarr
ConstantInt::get(Type::Int1Ty, 0)};
return CreateCall(llvm_memory_barrier_fn(), args, args + 5);
}
-
-void SharkBuilder::MyJITMemoryManager::endFunctionBody
- (const llvm::Function *F, unsigned char *FunctionStart,
- unsigned char *FunctionEnd)
-{
- mm->endFunctionBody(F, FunctionStart, FunctionEnd);
-
- SharkEntry *entry = sharkEntry[F];
- if (entry)
- entry->set_bounds((address) FunctionStart, (address) FunctionEnd);
-}
-
diff -r 52cac9f018fd -r 8228a1d1008b ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Fri Mar 06 11:33:48 2009 +0100
More information about the distro-pkg-dev
mailing list