changeset in /hg/icedtea6: 2009-06-18 Gary Benson <gbenson at red...
Gary Benson
gbenson at redhat.com
Thu Jun 18 09:03:08 PDT 2009
changeset 4e8a6af384a1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4e8a6af384a1
description:
2009-06-18 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: New file.
* ports/hotspot/src/share/vm/shark/sharkInvariants.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp
(SharkFunction): Made a subclass of SharkTargetInvariants.
(SharkFunction::SharkFunction): Updated constructor.
(SharkFunction::_compiler): Removed.
(SharkFunction::_flow): Likewise.
(SharkFunction::_iter): Likewise.
(SharkFunction::_thread): Likewise.
(SharkFunction::_max_monitors): Likewise.
(SharkFunction::compiler): Likewise.
(SharkFunction::flow): Likewise.
(SharkFunction::iter): Likewise.
(SharkFunction::thread): Likewise.
(SharkFunction::max_monitors): Likewise.
(SharkFunction::builder): Likewise.
(SharkFunction::arg_size): Likewise.
(SharkFunction::debug_info): Likewise.
(SharkFunction::env): Likewise.
(SharkFunction::max_locals): Likewise.
(SharkFunction::max_stack): Likewise.
(SharkFunction::target): Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp
(SharkFunction::initialize): Updated.
* ports/hotspot/src/share/vm/shark/sharkBlock.hpp
(SharkBlock): Made a subclass of SharkTargetInvariants.
(SharkBlock::SharkBlock): Updated constructors.
(SharkBlock::_builder): Removed.
(SharkBlock::_target): Likewise.
(SharkBlock::_thread): Likewise.
(SharkBlock::builder): Likewise.
(SharkBlock::target): Likewise.
(SharkBlock::thread): Likewise.
(SharkBlock::max_locals): Likewise.
(SharkBlock::max_stack): Likewise.
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
(SharkBlock::initial_current_state): Use SharkState::copy.
* ports/hotspot/src/share/vm/shark/sharkState.hpp
(SharkState): Made a subclass of SharkTargetInvariants.
(SharkState::SharkState): Updated constructors.
(SharkState::_block): Removed.
(SharkState::_function): Likewise.
(SharkState::block): Likewise.
(SharkState::function): Likewise.
(SharkState::builder): Likewise.
(SharkState::max_locals): Likewise.
(SharkState::max_stack): Likewise.
(SharkState::max_monitors): Likewise.
(SharkState::pop): Likewise.
(SharkState::copy): Updated.
(SharkState::decache_for_Java_call): Moved to SharkTopLevelBlock.
(SharkState::cache_after_Java_call): Likewise.
(SharkState::decache_for_VM_call): Likewise.
(SharkState::cache_after_VM_call): Likewise.
(SharkState::decache_for_trap): Likewise.
(SharkPHIState::_block): New field.
(SharkPHIState::block): New method.
* ports/hotspot/src/share/vm/shark/sharkState.inline.hpp: Removed.
* ports/hotspot/src/share/vm/shark/sharkState.cpp
(SharkState::equal_to): Updated.
(SharkState::decache_for_Java_call): Moved to SharkTopLevelBlock.
(SharkState::cache_after_Java_call): Likewise.
(SharkState::decache_for_VM_call): Likewise.
(SharkState::cache_after_VM_call): Likewise.
(SharkState::decache_for_trap): Likewise.
(SharkEntryState::SharkEntryState): Updated.
(SharkPHIState::SharkPHIState): Likewise.
(SharkPHIState::add_incoming): Likewise.
* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp
(SharkStateScanner): Made a subclass of SharkTargetInvariants.
(SharkStateScanner::SharkStateScanner): Updated constructor.
(SharkStateScanner::start_stack): Updated arguments.
(SharkStateScanner::start_locals): Likewise.
(SharkStateScanner::stack_integrity_checks): Made non-static.
(SharkStateScanner::locals_integrity_checks): Likewise.
* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp
(SharkStateScanner::scan): Updated.
(SharkStateScanner::locals_integrity_checks): Likewise.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
(SharkCacherDecacher::builder): Removed.
(SharkDecacher::debug_info): Likewise.
(SharkDecacher::start_stack): Updated arguments.
(SharkDecacher::start_locals): Likewise.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
(SharkDecacher::start_frame): Updated.
(SharkDecacher::start_stack): Likewise..
(SharkDecacher::start_locals): Likewise.
(SharkDecacher::end_frame): Likewise.
* ports/hotspot/src/share/vm/shark/sharkInliner.hpp
(SharkInliner::attempt_inline): Removed thread argument.
* ports/hotspot/src/share/vm/shark/sharkInliner.cpp
(SharkInlineBlock): Made a subclass of SharkTargetInvariants.
(SharkInlineBlock::SharkInlineBlock): Updated constructor.
(SharkInlinerHelper::SharkInlinerHelper): Likewise.
(SharkInlinerHelper::_thread): Removed.
(SharkInlinerHelper::thread): Likewise.
(SharkInlinerHelper::do_inline): Updated.
(SharkInliner::attempt_inline): Updated.
* ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp
(SharkIntrinsics): Made a subclass of SharkTargetInvariants.
(SharkIntrinsics::inline_intrinsic): Updated arguments.
(SharkIntrinsics::SharkIntrinsics): New method.
(SharkIntrinsics::_state): New field.
(SharkIntrinsics::state): New method.
(SharkIntrinsics::do_intrinsic): Likewise.
(SharkIntrinsics::do_Math_minmax): Updated arguments.
(SharkIntrinsics::do_Math_1to1): Likewise.
(SharkIntrinsics::do_Math_2to1): Likewise.
(SharkIntrinsics::do_Object_getClass): Likewise.
(SharkIntrinsics::do_System_currentTimeMillis): Likewise.
(SharkIntrinsics::do_Thread_currentThread): Likewise.
(SharkIntrinsics::do_Unsafe_compareAndSwapInt): Likewise.
* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp
(SharkIntrinsics::inline_intrinsic): Updated.
(SharkIntrinsics::do_intrinsic): New method.
(SharkIntrinsics::do_Math_minmax): Updated.
(SharkIntrinsics::do_Math_1to1): Likewise.
(SharkIntrinsics::do_Math_2to1): Likewise.
(SharkIntrinsics::do_Object_getClass): Likewise.
(SharkIntrinsics::do_System_currentTimeMillis): Likewise.
(SharkIntrinsics::do_Thread_currentThread): Likewise.
(SharkIntrinsics::do_Unsafe_compareAndSwapInt): Likewise.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
(SharkTopLevelBlock::SharkTopLevelBlock): Updated constructor.
(SharkTopLevelBlock::decache_for_Java_call): Moved from SharkState.
(SharkTopLevelBlock::cache_after_Java_call): Likewise.
(SharkTopLevelBlock::decache_for_VM_call): Likewise.
(SharkTopLevelBlock::cache_after_VM_call): Likewise.
(SharkTopLevelBlock::decache_for_trap): Likewise.
(SharkTopLevelBlock::call_vm): Updated.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
(SharkTopLevelBlock::decache_for_Java_call): Moved from SharkState.
(SharkTopLevelBlock::cache_after_Java_call): Likewise.
(SharkTopLevelBlock::decache_for_VM_call): Likewise.
(SharkTopLevelBlock::cache_after_VM_call): Likewise.
(SharkTopLevelBlock::decache_for_trap): Likewise.
(SharkTopLevelBlock::do_trap): Updated.
(SharkTopLevelBlock::improve_virtual_call): Likewise.
(SharkTopLevelBlock::do_call): Likewise.
(SharkTopLevelBlock::acquire_lock): Likewise.
* ports/hotspot/src/share/vm/includeDB_shark: Updated.
diffstat:
22 files changed, 717 insertions(+), 522 deletions(-)
ChangeLog | 153 ++++++++++
ports/hotspot/src/share/vm/includeDB_shark | 47 ++-
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 2
ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 73 +----
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 14
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 16 -
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 3
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 28 -
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 87 ------
ports/hotspot/src/share/vm/shark/sharkInliner.cpp | 28 -
ports/hotspot/src/share/vm/shark/sharkInliner.hpp | 4
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | 214 +++++++--------
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp | 36 +-
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp | 38 ++
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp | 186 +++++++++++++
ports/hotspot/src/share/vm/shark/sharkState.cpp | 87 ------
ports/hotspot/src/share/vm/shark/sharkState.hpp | 77 ++---
ports/hotspot/src/share/vm/shark/sharkState.inline.hpp | 44 ---
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp | 12
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp | 12
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 61 +++-
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 17 -
diffs (truncated from 1991 to 500 lines):
diff -r e86b8e1d9de6 -r 4e8a6af384a1 ChangeLog
--- a/ChangeLog Thu Jun 18 10:58:02 2009 +0200
+++ b/ChangeLog Thu Jun 18 12:00:59 2009 -0400
@@ -1,3 +1,156 @@ 2009-06-18 Mark Wielaard <mark at klomp.o
+2009-06-18 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: New file.
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.cpp: Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp
+ (SharkFunction): Made a subclass of SharkTargetInvariants.
+ (SharkFunction::SharkFunction): Updated constructor.
+ (SharkFunction::_compiler): Removed.
+ (SharkFunction::_flow): Likewise.
+ (SharkFunction::_iter): Likewise.
+ (SharkFunction::_thread): Likewise.
+ (SharkFunction::_max_monitors): Likewise.
+ (SharkFunction::compiler): Likewise.
+ (SharkFunction::flow): Likewise.
+ (SharkFunction::iter): Likewise.
+ (SharkFunction::thread): Likewise.
+ (SharkFunction::max_monitors): Likewise.
+ (SharkFunction::builder): Likewise.
+ (SharkFunction::arg_size): Likewise.
+ (SharkFunction::debug_info): Likewise.
+ (SharkFunction::env): Likewise.
+ (SharkFunction::max_locals): Likewise.
+ (SharkFunction::max_stack): Likewise.
+ (SharkFunction::target): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp
+ (SharkFunction::initialize): Updated.
+
+ * ports/hotspot/src/share/vm/shark/sharkBlock.hpp
+ (SharkBlock): Made a subclass of SharkTargetInvariants.
+ (SharkBlock::SharkBlock): Updated constructors.
+ (SharkBlock::_builder): Removed.
+ (SharkBlock::_target): Likewise.
+ (SharkBlock::_thread): Likewise.
+ (SharkBlock::builder): Likewise.
+ (SharkBlock::target): Likewise.
+ (SharkBlock::thread): Likewise.
+ (SharkBlock::max_locals): Likewise.
+ (SharkBlock::max_stack): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+ (SharkBlock::initial_current_state): Use SharkState::copy.
+
+ * ports/hotspot/src/share/vm/shark/sharkState.hpp
+ (SharkState): Made a subclass of SharkTargetInvariants.
+ (SharkState::SharkState): Updated constructors.
+ (SharkState::_block): Removed.
+ (SharkState::_function): Likewise.
+ (SharkState::block): Likewise.
+ (SharkState::function): Likewise.
+ (SharkState::builder): Likewise.
+ (SharkState::max_locals): Likewise.
+ (SharkState::max_stack): Likewise.
+ (SharkState::max_monitors): Likewise.
+ (SharkState::pop): Likewise.
+ (SharkState::copy): Updated.
+ (SharkState::decache_for_Java_call): Moved to SharkTopLevelBlock.
+ (SharkState::cache_after_Java_call): Likewise.
+ (SharkState::decache_for_VM_call): Likewise.
+ (SharkState::cache_after_VM_call): Likewise.
+ (SharkState::decache_for_trap): Likewise.
+ (SharkPHIState::_block): New field.
+ (SharkPHIState::block): New method.
+ * ports/hotspot/src/share/vm/shark/sharkState.inline.hpp: Removed.
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp
+ (SharkState::equal_to): Updated.
+ (SharkState::decache_for_Java_call): Moved to SharkTopLevelBlock.
+ (SharkState::cache_after_Java_call): Likewise.
+ (SharkState::decache_for_VM_call): Likewise.
+ (SharkState::cache_after_VM_call): Likewise.
+ (SharkState::decache_for_trap): Likewise.
+ (SharkEntryState::SharkEntryState): Updated.
+ (SharkPHIState::SharkPHIState): Likewise.
+ (SharkPHIState::add_incoming): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp
+ (SharkStateScanner): Made a subclass of SharkTargetInvariants.
+ (SharkStateScanner::SharkStateScanner): Updated constructor.
+ (SharkStateScanner::start_stack): Updated arguments.
+ (SharkStateScanner::start_locals): Likewise.
+ (SharkStateScanner::stack_integrity_checks): Made non-static.
+ (SharkStateScanner::locals_integrity_checks): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp
+ (SharkStateScanner::scan): Updated.
+ (SharkStateScanner::locals_integrity_checks): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
+ (SharkCacherDecacher::builder): Removed.
+ (SharkDecacher::debug_info): Likewise.
+ (SharkDecacher::start_stack): Updated arguments.
+ (SharkDecacher::start_locals): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
+ (SharkDecacher::start_frame): Updated.
+ (SharkDecacher::start_stack): Likewise..
+ (SharkDecacher::start_locals): Likewise.
+ (SharkDecacher::end_frame): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkInliner.hpp
+ (SharkInliner::attempt_inline): Removed thread argument.
+ * ports/hotspot/src/share/vm/shark/sharkInliner.cpp
+ (SharkInlineBlock): Made a subclass of SharkTargetInvariants.
+ (SharkInlineBlock::SharkInlineBlock): Updated constructor.
+ (SharkInlinerHelper::SharkInlinerHelper): Likewise.
+ (SharkInlinerHelper::_thread): Removed.
+ (SharkInlinerHelper::thread): Likewise.
+ (SharkInlinerHelper::do_inline): Updated.
+ (SharkInliner::attempt_inline): Updated.
+
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp
+ (SharkIntrinsics): Made a subclass of SharkTargetInvariants.
+ (SharkIntrinsics::inline_intrinsic): Updated arguments.
+ (SharkIntrinsics::SharkIntrinsics): New method.
+ (SharkIntrinsics::_state): New field.
+ (SharkIntrinsics::state): New method.
+ (SharkIntrinsics::do_intrinsic): Likewise.
+ (SharkIntrinsics::do_Math_minmax): Updated arguments.
+ (SharkIntrinsics::do_Math_1to1): Likewise.
+ (SharkIntrinsics::do_Math_2to1): Likewise.
+ (SharkIntrinsics::do_Object_getClass): Likewise.
+ (SharkIntrinsics::do_System_currentTimeMillis): Likewise.
+ (SharkIntrinsics::do_Thread_currentThread): Likewise.
+ (SharkIntrinsics::do_Unsafe_compareAndSwapInt): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp
+ (SharkIntrinsics::inline_intrinsic): Updated.
+ (SharkIntrinsics::do_intrinsic): New method.
+ (SharkIntrinsics::do_Math_minmax): Updated.
+ (SharkIntrinsics::do_Math_1to1): Likewise.
+ (SharkIntrinsics::do_Math_2to1): Likewise.
+ (SharkIntrinsics::do_Object_getClass): Likewise.
+ (SharkIntrinsics::do_System_currentTimeMillis): Likewise.
+ (SharkIntrinsics::do_Thread_currentThread): Likewise.
+ (SharkIntrinsics::do_Unsafe_compareAndSwapInt): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+ (SharkTopLevelBlock::SharkTopLevelBlock): Updated constructor.
+ (SharkTopLevelBlock::decache_for_Java_call): Moved from SharkState.
+ (SharkTopLevelBlock::cache_after_Java_call): Likewise.
+ (SharkTopLevelBlock::decache_for_VM_call): Likewise.
+ (SharkTopLevelBlock::cache_after_VM_call): Likewise.
+ (SharkTopLevelBlock::decache_for_trap): Likewise.
+ (SharkTopLevelBlock::call_vm): Updated.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+ (SharkTopLevelBlock::decache_for_Java_call): Moved from SharkState.
+ (SharkTopLevelBlock::cache_after_Java_call): Likewise.
+ (SharkTopLevelBlock::decache_for_VM_call): Likewise.
+ (SharkTopLevelBlock::cache_after_VM_call): Likewise.
+ (SharkTopLevelBlock::decache_for_trap): Likewise.
+ (SharkTopLevelBlock::do_trap): Updated.
+ (SharkTopLevelBlock::improve_virtual_call): Likewise.
+ (SharkTopLevelBlock::do_call): Likewise.
+ (SharkTopLevelBlock::acquire_lock): Likewise.
+
+ * ports/hotspot/src/share/vm/includeDB_shark: Updated.
+
2009-06-18 Mark Wielaard <mark at klomp.org>
* rt/net/sourceforge/jnlp/services/XExtendedService.java
diff -r e86b8e1d9de6 -r 4e8a6af384a1 ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark Thu Jun 18 10:58:02 2009 +0200
+++ b/ports/hotspot/src/share/vm/includeDB_shark Thu Jun 18 12:00:59 2009 -0400
@@ -50,8 +50,6 @@ ciTypeFlow.hpp
compileBroker.cpp sharkCompiler.hpp
-disassembler_<arch>.cpp sharkEntry.hpp
-
globals.hpp shark_globals_<arch>.hpp
globals.cpp shark_globals.hpp
@@ -75,7 +73,7 @@ sharkBlock.cpp
sharkBlock.cpp sharkBuilder.hpp
sharkBlock.cpp sharkConstant.hpp
sharkBlock.cpp sharkRuntime.hpp
-sharkBlock.cpp sharkState.inline.hpp
+sharkBlock.cpp sharkState.hpp
sharkBlock.cpp sharkValue.hpp
sharkBlock.hpp allocation.hpp
@@ -85,6 +83,7 @@ sharkBlock.hpp
sharkBlock.hpp llvmHeaders.hpp
sharkBlock.hpp sharkBuilder.hpp
sharkBlock.hpp sharkConstant.hpp
+sharkBlock.hpp sharkInvariants.hpp
sharkBlock.hpp sharkState.hpp
sharkBlock.hpp sharkValue.hpp
@@ -121,7 +120,7 @@ sharkCacheDecache.cpp
sharkCacheDecache.cpp sharkBuilder.hpp
sharkCacheDecache.cpp sharkCacheDecache.hpp
sharkCacheDecache.cpp sharkFunction.hpp
-sharkCacheDecache.cpp sharkState.inline.hpp
+sharkCacheDecache.cpp sharkState.hpp
sharkCacheDecache.hpp ciMethod.hpp
sharkCacheDecache.hpp debugInfoRec.hpp
@@ -181,7 +180,7 @@ sharkFunction.cpp
sharkFunction.cpp sharkBuilder.hpp
sharkFunction.cpp sharkEntry.hpp
sharkFunction.cpp sharkFunction.hpp
-sharkFunction.cpp sharkState.inline.hpp
+sharkFunction.cpp sharkState.hpp
sharkFunction.cpp sharkTopLevelBlock.hpp
sharkFunction.hpp allocation.hpp
@@ -191,6 +190,7 @@ sharkFunction.hpp
sharkFunction.hpp llvmHeaders.hpp
sharkFunction.hpp llvmValue.hpp
sharkFunction.hpp sharkBuilder.hpp
+sharkFunction.hpp sharkInvariants.hpp
sharkInliner.cpp allocation.hpp
sharkInliner.cpp bytecodes.hpp
@@ -198,29 +198,44 @@ sharkInliner.cpp
sharkInliner.cpp ciMethod.hpp
sharkInliner.cpp ciStreams.hpp
sharkInliner.cpp shark_globals.hpp
+sharkInliner.cpp sharkBlock.hpp
sharkInliner.cpp sharkConstant.hpp
sharkInliner.cpp sharkInliner.hpp
sharkInliner.cpp sharkIntrinsics.hpp
-sharkInliner.cpp sharkState.inline.hpp
+sharkInliner.cpp sharkState.hpp
sharkInliner.cpp sharkValue.hpp
sharkInliner.hpp allocation.hpp
sharkInliner.hpp ciMethod.hpp
sharkInliner.hpp llvmHeaders.hpp
-sharkInliner.hpp sharkState.inline.hpp
+sharkInliner.hpp sharkState.hpp
sharkIntrinsics.cpp ciMethod.hpp
sharkIntrinsics.cpp llvmHeaders.hpp
sharkIntrinsics.cpp shark_globals.hpp
sharkIntrinsics.cpp sharkIntrinsics.hpp
sharkIntrinsics.cpp sharkRuntime.hpp
-sharkIntrinsics.cpp sharkState.inline.hpp
+sharkIntrinsics.cpp sharkState.hpp
sharkIntrinsics.cpp sharkValue.hpp
sharkIntrinsics.hpp allocation.hpp
sharkIntrinsics.hpp ciMethod.hpp
sharkIntrinsics.hpp llvmHeaders.hpp
sharkIntrinsics.hpp sharkState.hpp
+
+sharkInvariants.cpp sharkInvariants.hpp
+
+sharkInvariants.hpp allocation.hpp
+sharkInvariants.hpp ciEnv.hpp
+sharkInvariants.hpp ciMethod.hpp
+sharkInvariants.hpp ciInstanceKlass.hpp
+sharkInvariants.hpp ciTypeFlow.hpp
+sharkInvariants.hpp debugInfoRec.hpp
+sharkInvariants.hpp dependencies.hpp
+sharkInvariants.hpp llvmHeaders.hpp
+sharkInvariants.hpp sharkBuilder.hpp
+sharkInvariants.hpp sharkCompiler.hpp
+sharkInvariants.hpp sharkMemoryManager.hpp
sharkMemoryManager.hpp llvmHeaders.hpp
sharkMemoryManager.hpp sharkEntry.hpp
@@ -249,7 +264,7 @@ sharkState.cpp
sharkState.cpp ciTypeFlow.hpp
sharkState.cpp sharkBuilder.hpp
sharkState.cpp sharkCacheDecache.hpp
-sharkState.cpp sharkState.inline.hpp
+sharkState.cpp sharkState.hpp
sharkState.cpp sharkTopLevelBlock.hpp
sharkState.cpp sharkType.hpp
sharkState.cpp sharkValue.hpp
@@ -258,19 +273,16 @@ sharkState.hpp
sharkState.hpp ciMethod.hpp
sharkState.hpp llvmHeaders.hpp
sharkState.hpp sharkBuilder.hpp
+sharkState.hpp sharkInvariants.hpp
sharkState.hpp sharkValue.hpp
-sharkState.inline.hpp sharkBlock.hpp
-sharkState.inline.hpp sharkBuilder.hpp
-sharkState.inline.hpp sharkFunction.hpp
-sharkState.inline.hpp sharkState.hpp
-
-sharkStateScanner.cpp sharkState.inline.hpp
+sharkStateScanner.cpp sharkState.hpp
sharkStateScanner.cpp sharkStateScanner.hpp
sharkStateScanner.hpp allocation.hpp
sharkStateScanner.hpp llvmHeaders.hpp
sharkStateScanner.hpp sharkFunction.hpp
+sharkStateScanner.hpp sharkInvariants.hpp
sharkTopLevelBlock.cpp allocation.hpp
sharkTopLevelBlock.cpp bytecodes.hpp
@@ -283,12 +295,13 @@ sharkTopLevelBlock.cpp
sharkTopLevelBlock.cpp llvmHeaders.hpp
sharkTopLevelBlock.cpp llvmValue.hpp
sharkTopLevelBlock.cpp shark_globals.hpp
+sharkTopLevelBlock.cpp sharkCacheDecache.hpp
sharkTopLevelBlock.cpp sharkTopLevelBlock.hpp
sharkTopLevelBlock.cpp sharkBuilder.hpp
sharkTopLevelBlock.cpp sharkConstant.hpp
sharkTopLevelBlock.cpp sharkInliner.hpp
sharkTopLevelBlock.cpp sharkRuntime.hpp
-sharkTopLevelBlock.cpp sharkState.inline.hpp
+sharkTopLevelBlock.cpp sharkState.hpp
sharkTopLevelBlock.cpp sharkValue.hpp
sharkTopLevelBlock.hpp allocation.hpp
@@ -300,7 +313,7 @@ sharkTopLevelBlock.hpp
sharkTopLevelBlock.hpp sharkBlock.hpp
sharkTopLevelBlock.hpp sharkBuilder.hpp
sharkTopLevelBlock.hpp sharkFunction.hpp
-sharkTopLevelBlock.hpp sharkState.inline.hpp
+sharkTopLevelBlock.hpp sharkState.hpp
sharkTopLevelBlock.hpp sharkValue.hpp
sharkType.cpp arrayOop.hpp
diff -r e86b8e1d9de6 -r 4e8a6af384a1 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Thu Jun 18 10:58:02 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Thu Jun 18 12:00:59 2009 -0400
@@ -888,7 +888,7 @@ void SharkBlock::parse_bytecode(int star
SharkState* SharkBlock::initial_current_state()
{
- return new SharkState(this, entry_state());
+ return entry_state()->copy();
}
int SharkBlock::switch_default_dest()
diff -r e86b8e1d9de6 -r 4e8a6af384a1 ports/hotspot/src/share/vm/shark/sharkBlock.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Thu Jun 18 10:58:02 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Thu Jun 18 12:00:59 2009 -0400
@@ -25,61 +25,32 @@
class SharkState;
-class SharkBlock : public ResourceObj {
+class SharkBlock : public SharkTargetInvariants {
+ protected:
+ SharkBlock(const SharkTargetInvariants* parent)
+ : SharkTargetInvariants(parent),
+ _iter(target()),
+ _current_state(NULL) {}
+
+ SharkBlock(const SharkCompileInvariants* parent, ciMethod* target)
+ : SharkTargetInvariants(parent, target),
+ _iter(target),
+ _current_state(NULL) {}
+
+ private:
+ ciBytecodeStream _iter;
+ SharkState* _current_state;
+
public:
- SharkBlock(SharkBuilder* builder,
- ciMethod* target,
- ciBytecodeStream* iter,
- llvm::Value* thread)
- : _builder(builder),
- _target(target),
- _iter(iter),
- _current_state(NULL),
- _thread(thread) {}
-
- private:
- SharkBuilder* _builder;
- ciMethod* _target;
- ciBytecodeStream* _iter;
- SharkState* _current_state;
- llvm::Value* _thread;
-
- public:
- SharkBuilder* builder() const
- {
- return _builder;
- }
- ciMethod* target() const
- {
- return _target;
- }
- ciBytecodeStream* iter() const
- {
- return _iter;
- }
- llvm::Value* thread() const
- {
- return _thread;
- }
-
- // Target properties
- public:
- int max_locals() const
- {
- return target()->max_locals();
- }
- int max_stack() const
- {
- return target()->max_stack();
- }
-
- // Bytecode stream
- public:
- Bytecodes::Code bc() const
+ ciBytecodeStream* iter()
+ {
+ return &_iter;
+ }
+ Bytecodes::Code bc()
{
return iter()->cur_bc();
}
- int bci() const
+ int bci()
{
return iter()->cur_bci();
}
diff -r e86b8e1d9de6 -r 4e8a6af384a1 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu Jun 18 10:58:02 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu Jun 18 12:00:59 2009 -0400
@@ -34,20 +34,20 @@ void SharkDecacher::start_frame()
_pc_offset = builder()->code_buffer()->create_unique_offset();
_oopmap = new OopMap(
oopmap_slot_munge(function()->oopmap_frame_size()),
- oopmap_slot_munge(function()->arg_size()));
+ oopmap_slot_munge(arg_size()));
debug_info()->add_safepoint(pc_offset(), oopmap());
}
-void SharkDecacher::start_stack(int num_slots, int max_slots)
+void SharkDecacher::start_stack(int stack_depth)
{
// Create the array we'll record our stack slots in
- _exparray = new GrowableArray<ScopeValue*>(num_slots);
+ _exparray = new GrowableArray<ScopeValue*>(stack_depth);
// Set the stack pointer
function()->CreateStoreZeroStackPointer(
builder()->CreatePtrToInt(
function()->CreateAddressOfFrameEntry(
- function()->stack_slots_offset() + max_slots - num_slots),
+ function()->stack_slots_offset() + max_stack() - stack_depth),
SharkType::intptr_type()));
}
@@ -123,10 +123,10 @@ void SharkDecacher::process_pc_slot(int
function()->CreateAddressOfFrameEntry(offset));
}
-void SharkDecacher::start_locals(int num_locals)
+void SharkDecacher::start_locals()
{
// Create the array we'll record our local variables in
- _locarray = new GrowableArray<ScopeValue*>(num_locals);}
+ _locarray = new GrowableArray<ScopeValue*>(max_locals());}
void SharkDecacher::process_local_slot(int index,
SharkValue** addr,
@@ -158,7 +158,7 @@ void SharkDecacher::end_frame()
// Record the scope
debug_info()->describe_scope(
pc_offset(),
- function()->target(),
+ target(),
bci(),
debug_info()->create_scope_values(locarray()),
debug_info()->create_scope_values(exparray()),
diff -r e86b8e1d9de6 -r 4e8a6af384a1 ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Thu Jun 18 10:58:02 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Thu Jun 18 12:00:59 2009 -0400
@@ -40,12 +40,6 @@ class SharkCacherDecacher : public Shark
SharkCacherDecacher(SharkFunction* function)
: SharkStateScanner(function) {}
- protected:
- SharkBuilder* builder() const
- {
- return function()->builder();
- }
-
// Helper
protected:
static int adjusted_offset(SharkValue* value, int offset)
@@ -68,12 +62,6 @@ class SharkDecacher : public SharkCacher
int bci() const
{
return _bci;
- }
-
- private:
- DebugInformationRecorder* debug_info() const
- {
- return function()->debug_info();
}
private:
@@ -109,7 +97,7 @@ class SharkDecacher : public SharkCacher
protected:
void start_frame();
More information about the distro-pkg-dev
mailing list