/hg/icedtea: 7 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 11 05:02:11 PDT 2010
changeset a044595518ad in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a044595518ad
author: Gary Benson <gbenson at redhat.com>
date: Wed Jun 09 17:37:28 2010 +0100
PR icedtea/323: Backport new frame anchor and stack overflow code
for Zero and Shark
2010-05-10 Gary Benson <gbenson at redhat.com>
PR icedtea/323
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
(SharkBuilder::throw_StackOverflowError): New method.
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
(SharkBuilder::throw_StackOverflowError): Likewise.
* ports/hotspot/src/share/vm/shark/sharkStack.hpp
(SharkStack::initialize): Removed argument.
(SharkStack::CreateStackOverflowCheck): Updated.
(SharkStack::CreateCheckStack): Removed method.
(SharkStack::frame_anchor_addr): Likewise.
(SharkStack::last_Java_sp_addr): New method.
(SharkStack::last_Java_fp_addr): New method.
(SharkStack::CreateSetLastJavaFrame): Use new frame anchor code.
(SharkStack::CreateResetLastJavaFrame): Likewise.
(SharkStack::CreateAssertLastJavaSPIsNull): New method.
* ports/hotspot/src/share/vm/shark/sharkStack.cpp
(SharkStack::initialize): Updated for new stack overflow code.
(SharkStack::CreateStackOverflowCheck): Likewise.
(SharkStack::CreateCheckStack): Removed.
(SharkStackWithNormalFrame::SharkStackWithNormalFrame): Updated
for new stack overflow code.
(SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise.
(SharkStack::CreateAssertLastJavaSPIsNull): New method.
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
(SharkNativeWrapper::initialize): Whitespace fix.
changeset 1de4376d0732 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1de4376d0732
author: Gary Benson <gbenson at redhat.com>
date: Wed Jun 09 17:42:58 2010 +0100
PR icedtea/323: Remove now unnecessary hack.
2010-05-11 Gary Benson <gbenson at redhat.com>
PR icedtea/323
* patches/hotspot/default/icedtea-shark.patch
(Deoptimization::create_vframeArray): Remove a now-
unnecessary hack.
changeset 1852744c5c16 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1852744c5c16
author: Gary Benson <gbenson at redhat.com>
date: Wed Jun 09 17:44:09 2010 +0100
PR icedtea/483: Fix signedness of T_BYTE and T_CHAR results
2010-05-13 Gary Benson <gbenson at redhat.com>
PR icedtea/483
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
(SharkNativeWrapper::initialize): Fix signedness of T_BYTE
and T_CHAR results.
changeset 86213d4d475a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=86213d4d475a
author: Gary Benson <gbenson at redhat.com>
date: Fri May 07 10:49:34 2010 +0100
Use new stack overflow code in Shark.
2010-05-07 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
(SharkRuntime::uncommon_trap): Use new stack overflow code.
(FakeStubFrame::build): Likewise.
* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Updated.
* ports/hotspot/src/share/vm/includeDB_shark: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
(SharkDecacher::end_frame): Updated for newer HotSpot.
changeset 254a1f83b7da in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=254a1f83b7da
author: Gary Benson <gbenson at redhat.com>
date: Fri May 14 13:55:26 2010 +0100
Fix PR icedtea/484: Method still in use can be marked as a zombie
2010-05-14 Gary Benson <gbenson at redhat.com>
PR icedtea/484
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
(SharkBuilder::deoptimized_entry_point): New method.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
(SharkBuilder::uncommon_trap): Return int instead of void.
(SharkBuilder::deoptimized_entry_point): New method.
* ports/hotspot/src/share/vm/shark/sharkContext.cpp
(SharkContext::SharkContext): Updated entry point types.
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
(SharkNativeWrapper::initialize): Make generated wrappers
return 0 instead of void.
* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
(SharkRuntime::uncommon_trap): Return int instead of void.
* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
(SharkRuntime::uncommon_trap): Don't enter the interpreter,
just return the number of frames that have been deoptimized.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
(SharkTopLevelBlock::do_trap): Return the number of deoptimized
frames instead of void. (SharkTopLevelBlock::handle_return):
Return 0 instead of void. (SharkTopLevelBlock::do_call):
Deoptimize where necessary.
changeset 494ed9fb8215 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=494ed9fb8215
author: Gary Benson <gbenson at redhat.com>
date: Fri May 14 17:37:29 2010 +0100
Fix stack leak in Shark
This commit fixes a bug where having an exception handler in a loop
would caused a little bit of stack to be allocated every time the
handler was invoked. This code...
int a = 23; int b = 0; while (true) { try { int c =
a / b; } catch (ArithmeticException e) { // do nothing
} }
...would eventually fail with a stack overflow.
2010-05-14 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp
(SharkCodeBuffer::inline_data): New method.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
(SharkBuilder::CreateInlineData): Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
(SharkBuilder::CreateInlineData): Likewise.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
(SharkTopLevelBlock::handle_exception): Inline the exception
handler table in the code buffer rather than creating it on
the stack.
changeset d7d97061baf3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d7d97061baf3
author: Gary Benson <gbenson at redhat.com>
date: Thu May 20 12:40:31 2010 +0100
PR icedtea/494: exception handlers not installed Speed up exception
handling
This commit fixes PR icedtea/494, a bug where some exception
handlers were not installed. Shark relied on exception handler
tables supplied by the TypeFlow pass, but it turns out that TypeFlow
does not record all exceptions in its tables. Shark now builds its
own tables.
While implementing this I realised that the VM call carried out to
figure out which exception handler to use is unnecessary in most
cases. I've left the original code in, but added a fast path which
bypasses a lot of the junk.
2010-05-20 Gary Benson <gbenson at redhat.com>
PR icedtea/494
* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp
(SharkCompileInvariants::java_lang_Throwable_klass): New method.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
(SharkTopLevelBlock::_exc_handlers): New field.
(SharkTopLevelBlock::_exceptions): Likewise.
(SharkTopLevelBlock::compute_exceptions): New method.
(SharkTopLevelBlock::num_exceptions): Rewritten.
(SharkTopLevelBlock::exc_handler): New method.
(SharkTopLevelBlock::exception): Rewritten.
(SharkTopLevelBlock::marshal_exception_fast): New method.
(SharkTopLevelBlock::marshal_exception_slow): Likewise.
(SharkTopLevelBlock::handler_for_exception): Likewise.
(SharkTopLevelBlock::make_trap): Likewise.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
(SharkTopLevelBlock::enter): Compute exceptions on entry,
and skip over any null handlers.
(SharkTopLevelBlock::compute_exceptions): New method.
(SharkTopLevelBlock::handle_exception): Rewritten.
(SharkTopLevelBlock::marshal_exception_fast): New method.
(SharkTopLevelBlock::marshal_exception_slow): Likewise.
(SharkTopLevelBlock::handler_for_exception): Likewise.
(SharkTopLevelBlock::make_trap): Likewise.
(SharkTopLevelBlock::can_reach_helper): Skip over null handlers.
diffstat:
17 files changed, 491 insertions(+), 190 deletions(-)
ChangeLog | 116 +++++++
patches/hotspot/default/icedtea-shark.patch | 21 -
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 1
ports/hotspot/src/share/vm/includeDB_shark | 3
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 24 +
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 16
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 1
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 11
ports/hotspot/src/share/vm/shark/sharkContext.cpp | 6
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp | 7
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 10
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 35 +-
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 4
ports/hotspot/src/share/vm/shark/sharkStack.cpp | 110 +++---
ports/hotspot/src/share/vm/shark/sharkStack.hpp | 41 +-
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 246 +++++++++++----
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 29 +
diffs (truncated from 1092 to 500 lines):
diff -r b645643e700f -r d7d97061baf3 ChangeLog
--- a/ChangeLog Wed Jun 09 14:26:24 2010 +0100
+++ b/ChangeLog Thu May 20 12:40:31 2010 +0100
@@ -1,3 +1,109 @@ 2010-05-07 Deepak Bhole <dbhole at redhat.
+2010-05-20 Gary Benson <gbenson at redhat.com>
+
+ PR icedtea/494
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp
+ (SharkCompileInvariants::java_lang_Throwable_klass): New method.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+ (SharkTopLevelBlock::_exc_handlers): New field.
+ (SharkTopLevelBlock::_exceptions): Likewise.
+ (SharkTopLevelBlock::compute_exceptions): New method.
+ (SharkTopLevelBlock::num_exceptions): Rewritten.
+ (SharkTopLevelBlock::exc_handler): New method.
+ (SharkTopLevelBlock::exception): Rewritten.
+ (SharkTopLevelBlock::marshal_exception_fast): New method.
+ (SharkTopLevelBlock::marshal_exception_slow): Likewise.
+ (SharkTopLevelBlock::handler_for_exception): Likewise.
+ (SharkTopLevelBlock::make_trap): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+ (SharkTopLevelBlock::enter): Compute exceptions on entry,
+ and skip over any null handlers.
+ (SharkTopLevelBlock::compute_exceptions): New method.
+ (SharkTopLevelBlock::handle_exception): Rewritten.
+ (SharkTopLevelBlock::marshal_exception_fast): New method.
+ (SharkTopLevelBlock::marshal_exception_slow): Likewise.
+ (SharkTopLevelBlock::handler_for_exception): Likewise.
+ (SharkTopLevelBlock::make_trap): Likewise.
+ (SharkTopLevelBlock::can_reach_helper): Skip over null handlers.
+
+2010-05-14 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp
+ (SharkCodeBuffer::inline_data): New method.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+ (SharkBuilder::CreateInlineData): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+ (SharkBuilder::CreateInlineData): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+ (SharkTopLevelBlock::handle_exception): Inline the exception
+ handler table in the code buffer rather than creating it on
+ the stack.
+
+2010-05-14 Gary Benson <gbenson at redhat.com>
+
+ PR icedtea/484
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+ (SharkBuilder::deoptimized_entry_point): New method.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+ (SharkBuilder::uncommon_trap): Return int instead of void.
+ (SharkBuilder::deoptimized_entry_point): New method.
+ * ports/hotspot/src/share/vm/shark/sharkContext.cpp
+ (SharkContext::SharkContext): Updated entry point types.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
+ (SharkNativeWrapper::initialize): Make generated wrappers
+ return 0 instead of void.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
+ (SharkRuntime::uncommon_trap): Return int instead of void.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
+ (SharkRuntime::uncommon_trap): Don't enter the interpreter,
+ just return the number of frames that have been deoptimized.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+ (SharkTopLevelBlock::do_trap): Return the number of deoptimized
+ frames instead of void.
+ (SharkTopLevelBlock::handle_return): Return 0 instead of void.
+ (SharkTopLevelBlock::do_call): Deoptimize where necessary.
+
+2010-05-13 Gary Benson <gbenson at redhat.com>
+
+ PR icedtea/483
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
+ (SharkNativeWrapper::initialize): Fix signedness of T_BYTE
+ and T_CHAR results.
+
+2010-05-11 Gary Benson <gbenson at redhat.com>
+
+ PR icedtea/323
+ * patches/hotspot/default/icedtea-shark.patch
+ (Deoptimization::create_vframeArray):
+ Remove a now-unnecessary hack.
+
+2010-05-10 Gary Benson <gbenson at redhat.com>
+
+ PR icedtea/323
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+ (SharkBuilder::throw_StackOverflowError): New method.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+ (SharkBuilder::throw_StackOverflowError): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.hpp
+ (SharkStack::initialize): Removed argument.
+ (SharkStack::CreateStackOverflowCheck): Updated.
+ (SharkStack::CreateCheckStack): Removed method.
+ (SharkStack::frame_anchor_addr): Likewise.
+ (SharkStack::last_Java_sp_addr): New method.
+ (SharkStack::last_Java_fp_addr): New method.
+ (SharkStack::CreateSetLastJavaFrame): Use new frame anchor code.
+ (SharkStack::CreateResetLastJavaFrame): Likewise.
+ (SharkStack::CreateAssertLastJavaSPIsNull): New method.
+ * ports/hotspot/src/share/vm/shark/sharkStack.cpp
+ (SharkStack::initialize): Updated for new stack overflow code.
+ (SharkStack::CreateStackOverflowCheck): Likewise.
+ (SharkStack::CreateCheckStack): Removed.
+ (SharkStackWithNormalFrame::SharkStackWithNormalFrame): Updated
+ for new stack overflow code.
+ (SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise.
+ (SharkStack::CreateAssertLastJavaSPIsNull): New method.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
+ (SharkNativeWrapper::initialize): Whitespace fix.
+
2010-05-07 Deepak Bhole <dbhole at redhat.com>
PR icedtea/436:
@@ -31,6 +137,16 @@ 2010-05-06 Deepak Bhole <dbhole at redhat.
putProvider.SunJCE) if initiated for an https connection.
(inTrustedCallChain): New method. Returns if given class/method is
in the call chain, and everything upto there is trusted.
+
+2010-05-07 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
+ (SharkRuntime::uncommon_trap): Use new stack overflow code.
+ (FakeStubFrame::build): Likewise.
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Updated.
+ * ports/hotspot/src/share/vm/includeDB_shark: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
+ (SharkDecacher::end_frame): Updated for newer HotSpot.
2010-05-05 Gary Benson <gbenson at redhat.com>
diff -r b645643e700f -r d7d97061baf3 patches/hotspot/default/icedtea-shark.patch
--- a/patches/hotspot/default/icedtea-shark.patch Wed Jun 09 14:26:24 2010 +0100
+++ b/patches/hotspot/default/icedtea-shark.patch Thu May 20 12:40:31 2010 +0100
@@ -279,27 +279,6 @@ diff -Nru openjdk.orig/hotspot/src/share
UnrollBlock* info = new UnrollBlock(array->frame_size() * BytesPerWord,
caller_adjustment * BytesPerWord,
-@@ -921,7 +928,20 @@
- // stuff a C2I adapter we can properly fill in the callee-save
- // register locations.
- frame caller = fr.sender(reg_map);
-+#ifdef ZERO
-+ int frame_size;
-+ {
-+ // In zero, frame::sp() is the *end* of the frame, so
-+ // caller.sp() - fr.sp() is the size of the *caller*.
-+ RegisterMap dummy_map(thread, false);
-+ frame frame_1 = thread->last_frame();
-+ frame frame_2 = frame_1.sender(&dummy_map);
-+ assert(frame_2.sp() == fr.sp(), "should be");
-+ frame_size = frame_2.sp() - frame_1.sp();
-+ }
-+#else
- int frame_size = caller.sp() - fr.sp();
-+#endif // ZERO
-
- frame sender = caller;
-
@@ -1073,7 +1093,7 @@
JRT_END
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Thu May 20 12:40:31 2010 +0100
@@ -47,6 +47,7 @@ define_pd_global(intx, Tier4BackEdge
define_pd_global(intx, OnStackReplacePercentage, 933 );
define_pd_global(intx, FreqInlineSize, 325 );
+define_pd_global(intx, InlineSmallCode, 1000 );
define_pd_global(intx, NewRatio, 12 );
define_pd_global(intx, NewSizeThreadIncrease, 4*K );
define_pd_global(intx, InitialCodeCacheSize, 160*K);
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/includeDB_shark Thu May 20 12:40:31 2010 +0100
@@ -1,6 +1,6 @@
//
// Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
-// Copyright 2008, 2009 Red Hat, Inc.
+// Copyright 2008, 2009, 2010 Red Hat, Inc.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -273,6 +273,7 @@ sharkRuntime.cpp
sharkRuntime.cpp llvmHeaders.hpp
sharkRuntime.cpp klassOop.hpp
sharkRuntime.cpp sharkRuntime.hpp
+sharkRuntime.cpp stack_<arch>.inline.hpp
sharkRuntime.cpp thread.hpp
sharkRuntime.hpp allocation.hpp
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu May 20 12:40:31 2010 +0100
@@ -319,13 +319,21 @@ Value* SharkBuilder::osr_migration_end()
return make_function((address) SharedRuntime::OSR_migration_end, "C", "v");
}
-// Uncommon trap
+// Semi-VM calls
+
+Value* SharkBuilder::throw_StackOverflowError() {
+ return make_function((address) ZeroStack::handle_overflow, "T", "v");
+}
Value* SharkBuilder::uncommon_trap() {
- return make_function((address) SharkRuntime::uncommon_trap, "Ti", "v");
+ return make_function((address) SharkRuntime::uncommon_trap, "Ti", "i");
}
-// Native-Java transition.
+Value* SharkBuilder::deoptimized_entry_point() {
+ return make_function((address) CppInterpreter::main_loop, "iT", "v");
+}
+
+// Native-Java transition
Value* SharkBuilder::check_special_condition_for_native_trans() {
return make_function(
@@ -538,6 +546,16 @@ Value* SharkBuilder::CreateInlineOop(job
name);
}
+Value* SharkBuilder::CreateInlineData(void* data,
+ size_t size,
+ const Type* type,
+ const char* name) {
+ return CreateIntToPtr(
+ code_buffer_address(code_buffer()->inline_data(data, size)),
+ type,
+ name);
+}
+
// Helpers for creating basic blocks.
BasicBlock* SharkBuilder::GetBlockInsertionPoint() const {
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Thu May 20 12:40:31 2010 +0100
@@ -125,13 +125,15 @@ class SharkBuilder : public llvm::IRBuil
llvm::Value* unsafe_field_offset_to_byte_offset();
llvm::Value* osr_migration_end();
- // Intrinsics and external functions, part 3: Uncommon trap.
- // This is a special case in that it is invoked like a non-VM
- // call but it does VM call stuff. This is acceptable so long
- // as the method that calls uncommon_trap returns to its caller
- // immediately that uncommon_trap returns.
+ // Intrinsics and external functions, part 3: semi-VM calls.
+ // These are special cases that do VM call stuff but are invoked
+ // as though they were normal calls. This is acceptable so long
+ // as the method that calls them returns to its immediately that
+ // the semi VM call returns.
public:
+ llvm::Value* throw_StackOverflowError();
llvm::Value* uncommon_trap();
+ llvm::Value* deoptimized_entry_point();
// Intrinsics and external functions, part 4: Native-Java transition.
// This is a special case in that it is invoked during a thread
@@ -192,6 +194,10 @@ class SharkBuilder : public llvm::IRBuil
llvm::Value* CreateInlineOop(ciObject* object, const char* name = "") {
return CreateInlineOop(object->encoding(), name);
}
+ llvm::Value* CreateInlineData(void* data,
+ size_t size,
+ const llvm::Type* type,
+ const char* name = "");
// Helpers for creating basic blocks.
// NB don't use unless SharkFunction::CreateBlock is unavailable.
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu May 20 12:40:31 2010 +0100
@@ -149,6 +149,7 @@ void SharkDecacher::end_frame() {
pc_offset(),
target(),
bci(),
+ true,
debug_info()->create_scope_values(locarray()),
debug_info()->create_scope_values(exparray()),
debug_info()->create_monitor_values(monarray()));
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp Thu May 20 12:40:31 2010 +0100
@@ -73,4 +73,15 @@ class SharkCodeBuffer : public StackObj
masm()->store_oop(object);
return offset;
}
+
+ // Inline a block of non-oop data into the buffer and return its offset.
+ public:
+ int inline_data(void *src, size_t size) const {
+ masm()->align(BytesPerWord);
+ int offset = masm()->offset();
+ void *dst = masm()->pc();
+ masm()->advance(size);
+ memcpy(dst, src, size);
+ return offset;
+ }
};
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkContext.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkContext.cpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.cpp Thu May 20 12:40:31 2010 +0100
@@ -1,6 +1,6 @@
/*
* Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2009 Red Hat, Inc.
+ * Copyright 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -76,14 +76,14 @@ SharkContext::SharkContext(const char* n
params.push_back(methodOop_type());
params.push_back(intptr_type());
params.push_back(thread_type());
- _entry_point_type = FunctionType::get(void_type(), params, false);
+ _entry_point_type = FunctionType::get(jint_type(), params, false);
params.clear();
params.push_back(methodOop_type());
params.push_back(PointerType::getUnqual(jbyte_type()));
params.push_back(intptr_type());
params.push_back(thread_type());
- _osr_entry_point_type = FunctionType::get(void_type(), params, false);
+ _osr_entry_point_type = FunctionType::get(jint_type(), params, false);
// Create mappings
for (int i = 0; i < T_CONFLICT; i++) {
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkInvariants.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkInvariants.hpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkInvariants.hpp Thu May 20 12:40:31 2010 +0100
@@ -1,6 +1,6 @@
/*
* Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2008, 2009 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -93,10 +93,13 @@ class SharkCompileInvariants : public Re
return builder()->code_buffer();
}
- // That well-known class...
+ // Commonly used classes
protected:
ciInstanceKlass* java_lang_Object_klass() const {
return env()->Object_klass();
+ }
+ ciInstanceKlass* java_lang_Throwable_klass() const {
+ return env()->Throwable_klass();
}
};
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp Thu May 20 12:40:31 2010 +0100
@@ -99,7 +99,7 @@ void SharkNativeWrapper::initialize(cons
builder()->CreateStore(
builder()->CreateInlineOop(
JNIHandles::make_local(
- target()->method_holder()->klass_part()->java_mirror())),
+ target()->method_holder()->klass_part()->java_mirror())),
oop_tmp_slot());
param_types.push_back(box_type);
@@ -283,7 +283,7 @@ void SharkNativeWrapper::initialize(cons
builder()->SetInsertPoint(exception);
CreateResetHandleBlock();
stack()->CreatePopFrame(0);
- builder()->CreateRetVoid();
+ builder()->CreateRet(LLVMValue::jint_constant(0));
builder()->SetInsertPoint(no_exception);
@@ -327,11 +327,11 @@ void SharkNativeWrapper::initialize(cons
needs_cast = true;
break;
- case T_BYTE:
+ case T_CHAR:
needs_cast = true;
break;
- case T_CHAR:
+ case T_BYTE:
case T_SHORT:
needs_cast = true;
is_signed = true;
@@ -348,5 +348,5 @@ void SharkNativeWrapper::initialize(cons
result_addr,
PointerType::getUnqual(SharkType::to_stackType(result_type))));
}
- builder()->CreateRetVoid();
+ builder()->CreateRet(LLVMValue::jint_constant(0));
}
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp Thu May 20 12:40:31 2010 +0100
@@ -1,6 +1,6 @@
/*
* Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2008, 2009 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -192,13 +192,15 @@ bool SharkRuntime::is_subtype_of(klassOo
return object_klass->klass_part()->is_subtype_of(check_klass);
}
-void SharkRuntime::uncommon_trap(JavaThread* thread, int trap_request) {
+int SharkRuntime::uncommon_trap(JavaThread* thread, int trap_request) {
+ Thread *THREAD = thread;
+
// In C2, uncommon_trap_blob creates a frame, so all the various
// deoptimization functions expect to find the frame of the method
- // being deopted one frame down on the stack. Create a dummy frame
- // to mirror this.
- ZeroStack *stack = thread->zero_stack();
- thread->push_zero_frame(FakeStubFrame::build(stack));
+ // being deopted one frame down on the stack. We create a dummy
+ // frame to mirror this.
+ FakeStubFrame *stubframe = FakeStubFrame::build(CHECK_0);
+ thread->push_zero_frame(stubframe);
// Initiate the trap
thread->set_last_Java_frame();
@@ -214,11 +216,13 @@ void SharkRuntime::uncommon_trap(JavaThr
int number_of_frames = urb->number_of_frames();
for (int i = 0; i < number_of_frames; i++) {
intptr_t size = urb->frame_sizes()[i];
- thread->push_zero_frame(InterpreterFrame::build(stack, size));
+ InterpreterFrame *frame = InterpreterFrame::build(size, CHECK_0);
+ thread->push_zero_frame(frame);
}
// Push another dummy frame
- thread->push_zero_frame(FakeStubFrame::build(stack));
+ stubframe = FakeStubFrame::build(CHECK_0);
+ thread->push_zero_frame(stubframe);
// Fill in the skeleton frames
thread->set_last_Java_frame();
@@ -228,18 +232,13 @@ void SharkRuntime::uncommon_trap(JavaThr
// Pop our dummy frame
thread->pop_zero_frame();
- // Jump into the interpreter
-#ifdef CC_INTERP
- CppInterpreter::main_loop(number_of_frames - 1, thread);
-#else
- Unimplemented();
-#endif // CC_INTERP
+ // Fall back into the interpreter
+ return number_of_frames;
}
-FakeStubFrame* FakeStubFrame::build(ZeroStack* stack) {
- if (header_words > stack->available_words()) {
- Unimplemented();
- }
+FakeStubFrame* FakeStubFrame::build(TRAPS) {
+ ZeroStack *stack = ((JavaThread *) THREAD)->zero_stack();
+ stack->overflow_check(header_words, CHECK_NULL);
stack->push(0); // next_frame, filled in later
intptr_t *fp = stack->sp();
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp Thu May 20 12:40:31 2010 +0100
@@ -1,6 +1,6 @@
/*
* Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2008, 2009 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -79,5 +79,5 @@ class SharkRuntime : public AllStatic {
public:
static void dump(const char *name, intptr_t value);
static bool is_subtype_of(klassOop check_klass, klassOop object_klass);
- static void uncommon_trap(JavaThread* thread, int trap_request);
+ static int uncommon_trap(JavaThread* thread, int trap_request);
};
diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkStack.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkStack.cpp Wed Jun 09 14:26:24 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkStack.cpp Thu May 20 12:40:31 2010 +0100
@@ -28,7 +28,9 @@
using namespace llvm;
-void SharkStack::initialize(Value* method, bool setup_sp_and_method) {
+void SharkStack::initialize(Value* method) {
+ bool setup_sp_and_method = (method != NULL);
+
int locals_words = max_locals();
int extra_locals = locals_words - arg_size();
More information about the distro-pkg-dev
mailing list