/hg/release/icedtea7-forest-2.1/hotspot: 3 new changesets
aph at icedtea.classpath.org
aph at icedtea.classpath.org
Wed May 30 09:22:21 PDT 2012
changeset 6a152e87cd76 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=6a152e87cd76
author: aph
date: Tue May 29 10:11:11 2012 -0400
Phase 1
changeset a14598bd41e5 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=a14598bd41e5
author: aph
date: Tue May 29 11:06:21 2012 -0400
Phase 2
changeset 1000c4de30f8 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=1000c4de30f8
author: aph
date: Wed May 30 10:20:02 2012 -0400
Don't save locals at a return.
diffstat:
make/linux/makefiles/fastdebug.make | 2 +-
make/linux/makefiles/gcc.make | 2 +-
make/solaris/makefiles/gcc.make | 2 +-
src/cpu/zero/vm/asm_helper.cpp | 11 +
src/cpu/zero/vm/thumb2.cpp | 87 +++++++++----
src/os/linux/vm/os_linux.cpp | 7 +-
src/share/vm/gc_implementation/shared/markSweep.cpp | 5 +
src/share/vm/gc_implementation/shared/markSweep.inline.hpp | 6 +
src/share/vm/interpreter/bytecodeInterpreter.cpp | 8 +-
src/share/vm/runtime/frame.cpp | 3 +
src/share/vm/runtime/vmThread.cpp | 35 +++++
11 files changed, 132 insertions(+), 36 deletions(-)
diffs (344 lines):
diff -r 5b6a9a63a280 -r 1000c4de30f8 make/linux/makefiles/fastdebug.make
--- a/make/linux/makefiles/fastdebug.make Mon May 28 08:48:42 2012 -0400
+++ b/make/linux/makefiles/fastdebug.make Wed May 30 10:20:02 2012 -0400
@@ -31,7 +31,7 @@
# (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files)
ifeq ($(BUILDARCH), ia64)
- # Bug in GCC, causes hang. -O1 will override the -O3 specified earlier
+ # Bug in GCC, causes hang. -O1 will override the -O0 specified earlier
OPT_CFLAGS/callGenerator.o += -O1
OPT_CFLAGS/ciTypeFlow.o += -O1
OPT_CFLAGS/compile.o += -O1
diff -r 5b6a9a63a280 -r 1000c4de30f8 make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make Mon May 28 08:48:42 2012 -0400
+++ b/make/linux/makefiles/gcc.make Wed May 30 10:20:02 2012 -0400
@@ -160,7 +160,7 @@
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
# The flags to use for an Optimized g++ build
-OPT_CFLAGS += -O3
+OPT_CFLAGS += -O0
# Hotspot uses very unstrict aliasing turn this optimization off
OPT_CFLAGS += -fno-strict-aliasing
diff -r 5b6a9a63a280 -r 1000c4de30f8 make/solaris/makefiles/gcc.make
--- a/make/solaris/makefiles/gcc.make Mon May 28 08:48:42 2012 -0400
+++ b/make/solaris/makefiles/gcc.make Wed May 30 10:20:02 2012 -0400
@@ -121,7 +121,7 @@
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
# The flags to use for an Optimized g++ build
-OPT_CFLAGS += -O3
+OPT_CFLAGS += -O0
# Hotspot uses very unstrict aliasing turn this optimization off
OPT_CFLAGS += -fno-strict-aliasing
diff -r 5b6a9a63a280 -r 1000c4de30f8 src/cpu/zero/vm/asm_helper.cpp
--- a/src/cpu/zero/vm/asm_helper.cpp Mon May 28 08:48:42 2012 -0400
+++ b/src/cpu/zero/vm/asm_helper.cpp Wed May 30 10:20:02 2012 -0400
@@ -403,6 +403,8 @@
return thread->pending_exception();
}
+extern "C" void ps();
+
extern "C" oop Helper_SafePoint(JavaThread *thread)
{
{
@@ -412,6 +414,15 @@
return thread->pending_exception();
}
+extern "C" oop Helper_SafePoint2(JavaThread *thread)
+{
+ {
+ HandleMarkCleaner __hmc(thread);
+ }
+ SafepointSynchronize::block(thread);
+ return thread->pending_exception();
+}
+
extern "C" void Helper_RaiseArrayBoundException(JavaThread *thread, int index)
{
char message[jintAsStringSize];
diff -r 5b6a9a63a280 -r 1000c4de30f8 src/cpu/zero/vm/thumb2.cpp
--- a/src/cpu/zero/vm/thumb2.cpp Mon May 28 08:48:42 2012 -0400
+++ b/src/cpu/zero/vm/thumb2.cpp Wed May 30 10:20:02 2012 -0400
@@ -3168,6 +3168,8 @@
unsigned i;
Reg r;
+ if (nregs == 0)
+ return;
JASSERT(nregs > 0, "nregs must be > 0");
if (nregs == 1) {
ldr_imm(codebuf, regs[0], Rstack, 4, 0, 1);
@@ -3445,6 +3447,21 @@
jstack->depth = 0;
}
+// SAVE_STACK and RESTORE_STACK save the stack state so that it's
+// possible to do a stack flush to memory and restore that stack state
+// to the same registers.
+#define SAVE_STACK(JSTACK) \
+ unsigned saved_stack_elements[JSTACK->depth]; \
+ unsigned saved_stack_depth; \
+ memcpy(saved_stack_elements, JSTACK->stack, \
+ JSTACK->depth * sizeof saved_stack_elements[0]); \
+ saved_stack_depth = JSTACK->depth;
+#define RESTORE_STACK(JSTACK, CODEBUF) \
+ Thumb2_Pop_Multiple(CODEBUF, saved_stack_elements, saved_stack_depth); \
+ memcpy(JSTACK->stack, saved_stack_elements, \
+ JSTACK->depth * sizeof saved_stack_elements[0]); \
+ JSTACK->depth = saved_stack_depth;
+
// Call this when we are about to corrupt a local
// The local may already be on the stack
// For example
@@ -4164,7 +4181,6 @@
void Thumb2_Safepoint(Thumb2_Info *jinfo, int stackdepth, int bci, int offset)
{
- Thumb2_Flush(jinfo);
// normal case: read the polling page and branch to skip
// the safepoint test
// abnormal case: read the polling page, trap to handler
@@ -4203,6 +4219,8 @@
//
// n.b. for a return there is no need save or restore locals
+ bool is_return = offset == 0; // This is some kind of return bytecode
+
int r_tmp = Thumb2_Tmp(jinfo, 0);
unsigned dest;
if (offset < 0) {
@@ -4239,33 +4257,34 @@
// now write a magic word after the branch so the signal handler can
// test that a polling page read is kosher
out_16(jinfo->codebuf, THUMB2_POLLING_PAGE_MAGIC);
- // now the safepoint polling code itself
- // n.b. no need for save or restore of locals at return i.e. when offset == 0
- //if (offset != 0) {
- Thumb2_save_locals(jinfo, stackdepth);
- //}
-
- // The frame walking code used by the garbage collector
- // (frame::interpreter_frame_tos_address()) assumes that the stack
- // pointer points one word below the top item on the stack, so we
- // have to adjust the SP saved in istate accordingly. If we don't,
- // the value on TOS won't be seen by the GC and we will crash later.
- sub_imm(jinfo->codebuf, ARM_R0, Rstack, 4);
- store_istate(jinfo, ARM_R0, ISTATE_STACK, stackdepth);
-
- mov_imm(jinfo->codebuf, ARM_R1, bci+CONSTMETHOD_CODEOFFSET);
- add_imm(jinfo->codebuf, ARM_R2, ISTATE_REG(jinfo),
- ISTATE_OFFSET(jinfo, stackdepth, 0));
- bl(jinfo->codebuf, handlers[H_SAFEPOINT]);
- //if (offset != 0) {
- Thumb2_restore_locals(jinfo, stackdepth);
- //}
- if (offset < 0) {
- // needs another unconditional backward branch
- branch_uncond(jinfo->codebuf, dest);
- } else {
- // patch in the forward skip branch
- branch_narrow_patch(jinfo->codebuf, read_loc + 2);
+
+ {
+ // Flush the stack to memory and save its register state.
+ SAVE_STACK(jinfo->jstack);
+ Thumb2_Flush(jinfo);
+
+ // We don't save or restore locals if we're returning.
+ if (! is_return)
+ Thumb2_save_locals(jinfo, stackdepth);
+
+ // now the safepoint polling code itself
+ mov_imm(jinfo->codebuf, ARM_R1, bci+CONSTMETHOD_CODEOFFSET);
+ add_imm(jinfo->codebuf, ARM_R2, ISTATE_REG(jinfo),
+ ISTATE_OFFSET(jinfo, stackdepth, 0));
+ bl(jinfo->codebuf, handlers[H_SAFEPOINT]);
+
+ if (! is_return)
+ Thumb2_restore_locals(jinfo, stackdepth);
+
+ RESTORE_STACK(jinfo->jstack, jinfo->codebuf);
+
+ if (offset < 0) {
+ // needs another unconditional backward branch
+ branch_uncond(jinfo->codebuf, dest);
+ } else {
+ // patch in the forward skip branch
+ branch_narrow_patch(jinfo->codebuf, read_loc + 2);
+ }
}
}
@@ -4467,7 +4486,7 @@
branch_uncond(jinfo->codebuf, ret_idx);
return;
}
- if (OSPACE) jinfo->compiled_return = jinfo->codebuf->idx * 2;
+ jinfo->compiled_return = jinfo->codebuf->idx * 2;
} else {
if (opcode == opc_lreturn || opcode == opc_dreturn) {
Thumb2_Fill(jinfo, 2);
@@ -4482,7 +4501,7 @@
branch_uncond(jinfo->codebuf, ret_idx);
return;
}
- if (OSPACE) jinfo->compiled_word_return[r] = jinfo->codebuf->idx * 2;
+ jinfo->compiled_word_return[r] = jinfo->codebuf->idx * 2;
}
}
@@ -7847,6 +7866,14 @@
handlers[H_SAFEPOINT] = out_pos(&codebuf);
stm(&codebuf, (1<<ARM_LR), ARM_SP, PUSH_FD, 1);
+ // The frame walking code used by the garbage collector
+ // (frame::interpreter_frame_tos_address()) assumes that the stack
+ // pointer points one word below the top item on the stack, so we
+ // have to adjust the SP saved in istate accordingly. If we don't,
+ // the value on TOS won't be seen by the GC and we will crash later.
+ sub_imm(&codebuf, ARM_R0, Rstack, 4);
+ str_imm(&codebuf, ARM_R0, ARM_R2, ISTATE_STACK, 1, 0);
+
// Set up BytecodeInterpreter->_bcp for the GC
// bci+CONSTMETHOD_CODEOFFSET is passed in ARM_R1
// istate is passed in ARM_R2
diff -r 5b6a9a63a280 -r 1000c4de30f8 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp Mon May 28 08:48:42 2012 -0400
+++ b/src/os/linux/vm/os_linux.cpp Wed May 30 10:20:02 2012 -0400
@@ -4215,8 +4215,11 @@
Linux::fast_thread_clock_init();
// Allocate a single page and mark it as readable for safepoint polling
- address polling_page = (address) ::mmap(NULL, Linux::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
- guarantee( polling_page != MAP_FAILED, "os::init_2: failed to allocate polling page" );
+ julong foo = (julong) ::mmap(NULL, 65536, PROT_READ,
+ MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE, -1, 0);
+ address polling_page = (address)(foo & -65536L);
+ if ((julong)polling_page < foo)
+ polling_page += 65536;
os::set_polling_page( polling_page );
diff -r 5b6a9a63a280 -r 1000c4de30f8 src/share/vm/gc_implementation/shared/markSweep.cpp
--- a/src/share/vm/gc_implementation/shared/markSweep.cpp Mon May 28 08:48:42 2012 -0400
+++ b/src/share/vm/gc_implementation/shared/markSweep.cpp Wed May 30 10:20:02 2012 -0400
@@ -30,6 +30,11 @@
#include "oops/objArrayKlass.inline.hpp"
#include "oops/oop.inline.hpp"
+
+void *arse[2];
+
+void sa(void*a, void *b) { arse[0] = a; arse [1] = b; }
+
Stack<oop> MarkSweep::_marking_stack;
Stack<DataLayout*> MarkSweep::_revisit_mdo_stack;
Stack<Klass*> MarkSweep::_revisit_klass_stack;
diff -r 5b6a9a63a280 -r 1000c4de30f8 src/share/vm/gc_implementation/shared/markSweep.inline.hpp
--- a/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Mon May 28 08:48:42 2012 -0400
+++ b/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Wed May 30 10:20:02 2012 -0400
@@ -43,9 +43,15 @@
}
}
+extern "C" void *arse[2];
+
+extern "C" void sa(void*a, void *b);
+
template <class T> inline void MarkSweep::follow_root(T* p) {
assert(!Universe::heap()->is_in_reserved(p),
"roots shouldn't be things within the heap");
+ if (arse[0] <= (void *)p && arse[1] >= (void *)p)
+ fprintf(stderr, "Whip\n");
#ifdef VALIDATE_MARK_SWEEP
if (ValidateMarkSweep) {
guarantee(!_root_refs_stack->contains(p), "should only be in here once");
diff -r 5b6a9a63a280 -r 1000c4de30f8 src/share/vm/interpreter/bytecodeInterpreter.cpp
--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp Mon May 28 08:48:42 2012 -0400
+++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed May 30 10:20:02 2012 -0400
@@ -1507,7 +1507,13 @@
CASE(_freturn):
{
// Allow a safepoint before returning to frame manager.
- SAFEPOINT;
+ if ( SafepointSynchronize::is_synchronizing()) {
+ {
+ /* zap freed handles rather than GC'ing them */
+ HandleMarkCleaner __hmc(THREAD);
+ }
+ CALL_VM(SafepointSynchronize::block(THREAD), handle_exception);
+ }
goto handle_return;
}
diff -r 5b6a9a63a280 -r 1000c4de30f8 src/share/vm/runtime/frame.cpp
--- a/src/share/vm/runtime/frame.cpp Mon May 28 08:48:42 2012 -0400
+++ b/src/share/vm/runtime/frame.cpp Wed May 30 10:20:02 2012 -0400
@@ -785,6 +785,9 @@
}
if (in_stack) {
_f->do_oop(addr);
+ } else {
+ fprintf(stderr, "Arse! %p\n",
+ _fr->interpreter_frame_tos_address());
}
}
}
diff -r 5b6a9a63a280 -r 1000c4de30f8 src/share/vm/runtime/vmThread.cpp
--- a/src/share/vm/runtime/vmThread.cpp Mon May 28 08:48:42 2012 -0400
+++ b/src/share/vm/runtime/vmThread.cpp Wed May 30 10:20:02 2012 -0400
@@ -245,6 +245,39 @@
}
}
+class BangerThread : NamedThread
+{
+public:
+
+ static BangerThread *the_thread;
+
+ static void create() {
+ the_thread = new BangerThread();
+ os::create_thread (the_thread, os::watcher_thread);
+ Thread::start(the_thread);
+ }
+
+ BangerThread() : NamedThread() {
+ set_name("banger");
+ }
+
+ void run() {
+ struct timespec req;
+ req.tv_nsec = 0.5e9;
+ req.tv_sec = 0;
+
+ for (;;)
+ {
+ nanosleep(&req, NULL);
+ // VM_ForceSafepoint op;
+ // VMThread::execute(&op);
+ Universe::heap()->collect(GCCause::_java_lang_system_gc);
+ }
+ }
+};
+
+BangerThread *BangerThread::the_thread;
+
void VMThread::run() {
assert(this == vm_thread(), "check");
@@ -269,6 +302,8 @@
// possible to set the VM thread priority higher than any Java thread.
os::set_native_priority( this, prio );
+ BangerThread::create();
+
// Wait for VM_Operations until termination
this->loop();
More information about the distro-pkg-dev
mailing list