/hg/release/icedtea7-forest-2.1/hotspot: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 16 13:34:44 PDT 2012
changeset 84f98de21493 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=84f98de21493
author: kvn
date: Wed May 23 12:11:25 2012 -0700
7158801: Improve VM CompileOnly option
Summary: Fixed buffer overflow during parsing flags -XX:CompileCommand=, -XX:CompileOnly= and command lines in .hotspot_compiler file.
Reviewed-by: never
changeset 8b8c198ec5c4 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=8b8c198ec5c4
author: kamg
date: Fri Jun 08 12:49:52 2012 -0400
7158804: Improve config file parsing
Summary: Check buffer length when reading
Reviewed-by: dholmes, dcubed
changeset f43620c8febc in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=f43620c8febc
author: andrew
date: Fri Oct 12 14:26:47 2012 +0100
7158807: Revise stack management with volatile call sites
Summary: Add missing stack banging into method handle assebly code and throw a StackOverflowError.
Reviewed-by: jrose, twisti
changeset 5da7e3791b0d in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=5da7e3791b0d
author: kvn
date: Wed Sep 19 21:14:10 2012 -0700
7198606: Improve VM optimization
Reviewed-by: roland, twisti
changeset 767fdaea4155 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=767fdaea4155
author: andrew
date: Tue Oct 16 21:33:00 2012 +0100
Added tag icedtea-2.1.3 for changeset 5da7e3791b0d
diffstat:
.hgtags | 1 +
src/cpu/sparc/vm/methodHandles_sparc.cpp | 31 +++++++++++++++++++++++++++++++
src/cpu/x86/vm/methodHandles_x86.cpp | 31 +++++++++++++++++++++++++++++--
src/share/vm/compiler/compilerOracle.cpp | 4 ++--
src/share/vm/opto/loopTransform.cpp | 3 +++
src/share/vm/runtime/arguments.cpp | 2 +-
6 files changed, 67 insertions(+), 5 deletions(-)
diffs (180 lines):
diff -r c159737dd826 -r 767fdaea4155 .hgtags
--- a/.hgtags Fri Aug 31 21:58:49 2012 +0100
+++ b/.hgtags Tue Oct 16 21:33:00 2012 +0100
@@ -220,3 +220,4 @@
0000000000000000000000000000000000000000 icedtea-2.1.1
8b7c4c5f6ba9a0a7e8114d886a574d99827934a1 icedtea-2.1.1
fbe959dad801cae4c21edcd4afdc0e030f1d07b4 icedtea-2.1.2
+5da7e3791b0d3b2930dffa33e51c73fb93697a41 icedtea-2.1.3
diff -r c159737dd826 -r 767fdaea4155 src/cpu/sparc/vm/methodHandles_sparc.cpp
--- a/src/cpu/sparc/vm/methodHandles_sparc.cpp Fri Aug 31 21:58:49 2012 +0100
+++ b/src/cpu/sparc/vm/methodHandles_sparc.cpp Tue Oct 16 21:33:00 2012 +0100
@@ -694,6 +694,17 @@
if (arg_slots.is_constant() && arg_slots.as_constant() == 0)
return;
+ // We have to insert at least one word, so bang the stack.
+ if (UseStackBanging) {
+ // Save G3_method_handle since bang_stack_with_offset uses it as a temp register
+ __ mov(G3_method_handle, temp_reg);
+ int frame_size = (arg_slots.is_constant() ? -1 * arg_slots.as_constant() * wordSize : 0);
+ if (frame_size <= 0)
+ frame_size = 256 * Interpreter::stackElementSize; // conservative
+ __ generate_stack_overflow_check(frame_size);
+ __ mov(temp_reg, G3_method_handle);
+ }
+
assert_different_registers(argslot_reg, temp_reg, temp2_reg, temp3_reg,
(!arg_slots.is_register() ? Gargs : arg_slots.as_register()));
@@ -1587,6 +1598,14 @@
"copied argument(s) must fall within current frame");
}
+ if (UseStackBanging) {
+ // Save G3_method_handle since bang_stack_with_offset uses it as a temp register
+ __ mov(G3_method_handle, O3_scratch);
+ // Bang the stack before pushing args.
+ int frame_size = 256 * Interpreter::stackElementSize; // conservative
+ __ generate_stack_overflow_check(frame_size + sizeof(RicochetFrame));
+ __ mov(O3_scratch, G3_method_handle);
+ }
// insert location is always the bottom of the argument list:
__ neg(O1_stack_move);
push_arg_slots(_masm, O0_argslot, O1_stack_move, O2_scratch, O3_scratch);
@@ -2003,6 +2022,18 @@
// The return handler will further cut back the stack when it takes
// down the RF. Perhaps there is a way to streamline this further.
+ if (UseStackBanging) {
+ // Save G3_method_handle since bang_stack_with_offset uses it as a temp register
+ __ mov(G3_method_handle, O4_scratch);
+ // Bang the stack before recursive call.
+ // Even if slots == 0, we are inside a RicochetFrame.
+ int frame_size = collect_count.is_constant() ? collect_count.as_constant() * wordSize : -1;
+ if (frame_size < 0) {
+ frame_size = 256 * Interpreter::stackElementSize; // conservative
+ }
+ __ generate_stack_overflow_check(frame_size + sizeof(RicochetFrame));
+ __ mov(O4_scratch, G3_method_handle);
+ }
// State during recursive call:
// ... keep1 | dest | dest=42 | keep3 | RF... | collect | bounce_pc |
__ jump_to_method_handle_entry(G3_method_handle, O1_scratch);
diff -r c159737dd826 -r 767fdaea4155 src/cpu/x86/vm/methodHandles_x86.cpp
--- a/src/cpu/x86/vm/methodHandles_x86.cpp Fri Aug 31 21:58:49 2012 +0100
+++ b/src/cpu/x86/vm/methodHandles_x86.cpp Tue Oct 16 21:33:00 2012 +0100
@@ -687,6 +687,14 @@
if (VerifyMethodHandles)
verify_stack_move(_masm, arg_slots, -1);
+ // We have to insert at least one word, so bang the stack.
+ if (UseStackBanging) {
+ int frame_size = (arg_slots.is_constant() ? -1 * arg_slots.as_constant() * wordSize : 0);
+ if (frame_size <= 0)
+ frame_size = 256 * Interpreter::stackElementSize; // conservative
+ __ generate_stack_overflow_check(frame_size);
+ }
+
// Make space on the stack for the inserted argument(s).
// Then pull down everything shallower than rax_argslot.
// The stacked return address gets pulled down with everything else.
@@ -1698,6 +1706,11 @@
"copied argument(s) must fall within current frame");
}
+ if (UseStackBanging) {
+ // Bang the stack before pushing args.
+ int frame_size = 256 * Interpreter::stackElementSize; // conservative
+ __ generate_stack_overflow_check(frame_size + sizeof(RicochetFrame));
+ }
// insert location is always the bottom of the argument list:
Address insert_location = __ argument_address(constant(0));
int pre_arg_words = insert_location.disp() / wordSize; // return PC is pushed
@@ -2135,6 +2148,15 @@
// The return handler will further cut back the stack when it takes
// down the RF. Perhaps there is a way to streamline this further.
+ if (UseStackBanging) {
+ // Bang the stack before recursive call.
+ // Even if slots == 0, we are inside a RicochetFrame.
+ int frame_size = collect_count.is_constant() ? collect_count.as_constant() * wordSize : -1;
+ if (frame_size < 0) {
+ frame_size = 256 * Interpreter::stackElementSize; // conservative
+ }
+ __ generate_stack_overflow_check(frame_size + sizeof(RicochetFrame));
+ }
// State during recursive call:
// ... keep1 | dest | dest=42 | keep3 | RF... | collect | bounce_pc |
__ jump_to_method_handle_entry(rcx_recv, rdx_temp);
@@ -2265,10 +2287,15 @@
// grab another temp
Register rsi_temp = rsi;
- { if (rsi_temp == saved_last_sp) __ push(saved_last_sp); }
+ if (rsi_temp == saved_last_sp) {
+ __ push(saved_last_sp);
+ // Need to re-push return PC to keep it on stack top.
+ __ lea(saved_last_sp, ExternalAddress(SharedRuntime::ricochet_blob()->bounce_addr()).addr());
+ __ push(saved_last_sp);
+ }
// (preceding push must be done after argslot address is taken!)
#define UNPUSH_RSI \
- { if (rsi_temp == saved_last_sp) __ pop(saved_last_sp); }
+ { if (rsi_temp == saved_last_sp) { __ pop(saved_last_sp); __ pop(saved_last_sp); } }
// arx_argslot points both to the array and to the first output arg
vmarg = Address(rax_argslot, 0);
diff -r c159737dd826 -r 767fdaea4155 src/share/vm/compiler/compilerOracle.cpp
--- a/src/share/vm/compiler/compilerOracle.cpp Fri Aug 31 21:58:49 2012 +0100
+++ b/src/share/vm/compiler/compilerOracle.cpp Tue Oct 16 21:33:00 2012 +0100
@@ -573,7 +573,7 @@
char token[1024];
int pos = 0;
int c = getc(stream);
- while(c != EOF) {
+ while(c != EOF && pos < (int)(sizeof(token)-1)) {
if (c == '\n') {
token[pos++] = '\0';
parse_from_line(token);
@@ -594,7 +594,7 @@
int pos = 0;
const char* sp = str;
int c = *sp++;
- while (c != '\0') {
+ while (c != '\0' && pos < (int)(sizeof(token)-1)) {
if (c == '\n') {
token[pos++] = '\0';
parse_line(token);
diff -r c159737dd826 -r 767fdaea4155 src/share/vm/opto/loopTransform.cpp
--- a/src/share/vm/opto/loopTransform.cpp Fri Aug 31 21:58:49 2012 +0100
+++ b/src/share/vm/opto/loopTransform.cpp Tue Oct 16 21:33:00 2012 +0100
@@ -2733,6 +2733,8 @@
result_mem = new (C, 1) ProjNode(call,TypeFunc::Memory);
_igvn.register_new_node_with_optimizer(result_mem);
+/* Disable following optimization until proper fix (add missing checks).
+
// If this fill is tightly coupled to an allocation and overwrites
// the whole body, allow it to take over the zeroing.
AllocateNode* alloc = AllocateNode::Ideal_allocation(base, this);
@@ -2756,6 +2758,7 @@
#endif
}
}
+*/
// Redirect the old control and memory edges that are outside the loop.
Node* exit = head->loopexit()->proj_out(0);
diff -r c159737dd826 -r 767fdaea4155 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp Fri Aug 31 21:58:49 2012 +0100
+++ b/src/share/vm/runtime/arguments.cpp Tue Oct 16 21:33:00 2012 +0100
@@ -842,7 +842,7 @@
bool result = true;
int c = getc(stream);
- while(c != EOF) {
+ while(c != EOF && pos < (int)(sizeof(token)-1)) {
if (in_white_space) {
if (in_comment) {
if (c == '\n') in_comment = false;
More information about the distro-pkg-dev
mailing list