/hg/icedtea6: 2009-09-25 Gary Benson <gbenson at redhat.com>
gbenson at icedtea.classpath.org
gbenson at icedtea.classpath.org
Fri Sep 25 02:42:37 PDT 2009
changeset 2a3725ce72d4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2a3725ce72d4
author: Gary Benson <gbenson at redhat.com>
date: Fri Sep 25 05:35:49 2009 -0400
2009-09-25 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Moved
ffi.h to...
* ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp: ...here.
* ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp:
Replaced with...
* ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp: New file.
* ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp:
Removed reference to ZeroStackPrinter.
* ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp:
Replaced references to deoptimizer frame with fake stub frame.
* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
diffstat:
13 files changed, 111 insertions(+), 103 deletions(-)
ChangeLog | 27 ++++++
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 1
ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp | 55 --------------
ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp | 53 +++++++++++++
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 38 +++------
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 4 -
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 4 -
ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 1
ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp | 1
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 14 +--
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 12 +--
diffs (427 lines):
diff -r b9c4bedba90e -r 2a3725ce72d4 ChangeLog
--- a/ChangeLog Thu Sep 24 13:52:11 2009 -0400
+++ b/ChangeLog Fri Sep 25 05:35:49 2009 -0400
@@ -1,10 +1,33 @@ 2009-09-24 Jon VanAlten <jon.vanalten@
+2009-09-25 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Moved ffi.h to...
+ * ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp: ...here.
+
+ * ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp:
+ Replaced with...
+ * ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp: New file.
+
+ * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp:
+ Removed reference to ZeroStackPrinter.
+ * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp: Likewise.
+
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp:
+ Replaced references to deoptimizer frame with fake stub frame.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+
2009-09-24 Jon VanAlten <jon.vanalten at redhat.com>
+
* Makefile.am:
Build PulseAudio class files into distinct subdirectory.
2009-09-18 Man Lung Wong <mwong at redhat.com>
- * Makefile.am: Move the line patches/icedtea-jtreg-layoutextragap.patch to
- the proper location.
+
+ * Makefile.am: Move the line
+ patches/icedtea-jtreg-layoutextragap.patch to the proper location.
2009-09-17 Man Lung Wong <mwong at redhat.com>
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Thu Sep 24 13:52:11 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Fri Sep 25 05:35:49 2009 -0400
@@ -64,6 +64,5 @@ address ShouldNotCallThisEntry();
// Nothing to do with the assembler (or lack of),
// just a real convenient place to include these.
-#include <ffi.h>
#include <entry_zero.hpp>
#include <stack_zero.hpp>
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp Thu Sep 24 13:52:11 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2008 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- */
-
-// | ... |
-// +--------------------+ ------------------
-// | frame_type | low addresses
-// | next_frame | high addresses
-// +--------------------+ ------------------
-// | ... |
-
-class DeoptimizerFrame : public ZeroFrame {
- friend class ZeroStackPrinter;
-
- private:
- DeoptimizerFrame() : ZeroFrame() {
- ShouldNotCallThis();
- }
-
- protected:
- enum Layout {
- header_words = jf_header_words
- };
-
- public:
- static DeoptimizerFrame *build(ZeroStack* stack);
-
- public:
- void identify_word(int frame_index,
- int offset,
- char* fieldbuf,
- char* valuebuf,
- int buflen) const;
-};
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp Thu Sep 24 13:52:11 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp Fri Sep 25 05:35:49 2009 -0400
@@ -35,8 +35,6 @@
// | ... |
class EntryFrame : public ZeroFrame {
- friend class ZeroStackPrinter;
-
private:
EntryFrame() : ZeroFrame() {
ShouldNotCallThis();
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp Fri Sep 25 05:35:49 2009 -0400
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// | ... |
+// +--------------------+ ------------------
+// | frame_type | low addresses
+// | next_frame | high addresses
+// +--------------------+ ------------------
+// | ... |
+
+class FakeStubFrame : public ZeroFrame {
+ private:
+ FakeStubFrame() : ZeroFrame() {
+ ShouldNotCallThis();
+ }
+
+ protected:
+ enum Layout {
+ header_words = jf_header_words
+ };
+
+ public:
+ static FakeStubFrame *build(ZeroStack* stack);
+
+ public:
+ void identify_word(int frame_index,
+ int offset,
+ char* fieldbuf,
+ char* valuebuf,
+ int buflen) const {}
+};
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Thu Sep 24 13:52:11 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Fri Sep 25 05:35:49 2009 -0400
@@ -36,8 +36,8 @@ bool frame::is_interpreted_frame() const
return zeroframe()->is_interpreter_frame();
}
-bool frame::is_deoptimizer_frame() const {
- return zeroframe()->is_deoptimizer_frame();
+bool frame::is_fake_stub_frame() const {
+ return zeroframe()->is_fake_stub_frame();
}
frame frame::sender_for_entry_frame(RegisterMap *map) const {
@@ -58,7 +58,7 @@ frame frame::sender_for_compiled_frame(R
return frame(sender_sp(), sp() + 1);
}
-frame frame::sender_for_deoptimizer_frame(RegisterMap *map) const {
+frame frame::sender_for_fake_stub_frame(RegisterMap *map) const {
return frame(sender_sp(), sp() + 1);
}
@@ -73,13 +73,11 @@ frame frame::sender(RegisterMap* map) co
if (is_interpreted_frame())
return sender_for_interpreter_frame(map);
- assert(_cb == CodeCache::find_blob(pc()),"Must be the same");
- if (_cb != NULL) {
+ if (is_compiled_frame())
return sender_for_compiled_frame(map);
- }
-
- if (is_deoptimizer_frame())
- return sender_for_deoptimizer_frame(map);
+
+ if (is_fake_stub_frame())
+ return sender_for_fake_stub_frame(map);
ShouldNotReachHere();
}
@@ -224,8 +222,8 @@ void ZeroFrame::identify_word(int fram
strncpy(valuebuf, "INTERPRETER_FRAME", buflen);
else if (is_shark_frame())
strncpy(valuebuf, "SHARK_FRAME", buflen);
- else if (is_deoptimizer_frame())
- strncpy(valuebuf, "DEOPTIMIZER_FRAME", buflen);
+ else if (is_fake_stub_frame())
+ strncpy(valuebuf, "FAKE_STUB_FRAME", buflen);
break;
default:
@@ -241,8 +239,8 @@ void ZeroFrame::identify_word(int fram
as_shark_frame()->identify_word(
frame_index, offset, fieldbuf, valuebuf, buflen);
}
- else if (is_deoptimizer_frame()) {
- as_deoptimizer_frame()->identify_word(
+ else if (is_fake_stub_frame()) {
+ as_fake_stub_frame()->identify_word(
frame_index, offset, fieldbuf, valuebuf, buflen);
}
}
@@ -281,7 +279,8 @@ void InterpreterFrame::identify_word(int
}
else if (is_valid && !strcmp(field, "_bcp") && istate->bcp()) {
snprintf(valuebuf, buflen, PTR_FORMAT " (bci %d)",
- istate->bcp(), istate->method()->bci_from(istate->bcp()));
+ (intptr_t) istate->bcp(),
+ istate->method()->bci_from(istate->bcp()));
}
snprintf(fieldbuf, buflen, "%sistate->%s",
field[strlen(field) - 1] == ')' ? "(": "", field);
@@ -351,7 +350,8 @@ void SharkFrame::identify_word(int fra
nmethod *code = method()->code();
if (code && code->pc_desc_at(pc())) {
SimpleScopeDesc ssd(code, pc());
- snprintf(valuebuf, buflen, PTR_FORMAT " (bci %d)", pc(), ssd.bci());
+ snprintf(valuebuf, buflen, PTR_FORMAT " (bci %d)",
+ (intptr_t) pc(), ssd.bci());
}
}
return;
@@ -412,11 +412,3 @@ void ZeroFrame::identify_vp_word(int
return;
}
}
-
-void DeoptimizerFrame::identify_word(int frame_index,
- int offset,
- char* fieldbuf,
- char* valuebuf,
- int buflen) const {
- // Deoptimizer frames have no extra words to identify
-}
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp Thu Sep 24 13:52:11 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp Fri Sep 25 05:35:49 2009 -0400
@@ -65,10 +65,10 @@
}
public:
- bool is_deoptimizer_frame() const;
+ bool is_fake_stub_frame() const;
public:
- frame sender_for_deoptimizer_frame(RegisterMap* map) const;
+ frame sender_for_fake_stub_frame(RegisterMap* map) const;
public:
void zero_print_on_error(int index,
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Thu Sep 24 13:52:11 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Fri Sep 25 05:35:49 2009 -0400
@@ -26,7 +26,7 @@
#include <entryFrame_zero.hpp>
#include <interpreterFrame_zero.hpp>
#include <sharkFrame_zero.hpp>
-#include <deoptimizerFrame_zero.hpp>
+#include <fakeStubFrame_zero.hpp>
// Constructors
@@ -57,7 +57,7 @@ inline frame::frame(intptr_t* sp, intptr
_cb = CodeCache::find_blob_unsafe(pc());
break;
- case ZeroFrame::DEOPTIMIZER_FRAME:
+ case ZeroFrame::FAKE_STUB_FRAME:
_pc = NULL;
_cb = NULL;
break;
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp Thu Sep 24 13:52:11 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp Fri Sep 25 05:35:49 2009 -0400
@@ -23,4 +23,4 @@
*
*/
-// This file is intentionally empty
+#include <ffi.h>
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp Thu Sep 24 13:52:11 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp Fri Sep 25 05:35:49 2009 -0400
@@ -39,7 +39,6 @@
// | ... |
class InterpreterFrame : public ZeroFrame {
- friend class ZeroStackPrinter;
friend class AbstractInterpreter;
private:
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp Thu Sep 24 13:52:11 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp Fri Sep 25 05:35:49 2009 -0400
@@ -41,7 +41,6 @@
// | ... |
class SharkFrame : public ZeroFrame {
- friend class ZeroStackPrinter;
friend class SharkFunction;
private:
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/cpu/zero/vm/stack_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/stack_zero.hpp Thu Sep 24 13:52:11 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/stack_zero.hpp Fri Sep 25 05:35:49 2009 -0400
@@ -97,7 +97,7 @@ class EntryFrame;
class EntryFrame;
class InterpreterFrame;
class SharkFrame;
-class DeoptimizerFrame;
+class FakeStubFrame;
//
// | ... |
@@ -127,7 +127,7 @@ class ZeroFrame {
ENTRY_FRAME = 0xCAFEBABE,
INTERPRETER_FRAME,
SHARK_FRAME,
- DEOPTIMIZER_FRAME
+ FAKE_STUB_FRAME
};
protected:
@@ -158,8 +158,8 @@ class ZeroFrame {
bool is_shark_frame() const {
return type() == SHARK_FRAME;
}
- bool is_deoptimizer_frame() const {
- return type() == DEOPTIMIZER_FRAME;
+ bool is_fake_stub_frame() const {
+ return type() == FAKE_STUB_FRAME;
}
public:
@@ -175,9 +175,9 @@ class ZeroFrame {
assert(is_shark_frame(), "should be");
return (SharkFrame *) this;
}
- DeoptimizerFrame *as_deoptimizer_frame() const {
- assert(is_deoptimizer_frame(), "should be");
- return (DeoptimizerFrame *) this;
+ FakeStubFrame *as_fake_stub_frame() const {
+ assert(is_fake_stub_frame(), "should be");
+ return (FakeStubFrame *) this;
}
public:
diff -r b9c4bedba90e -r 2a3725ce72d4 ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp Thu Sep 24 13:52:11 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp Fri Sep 25 05:35:49 2009 -0400
@@ -203,7 +203,7 @@ void SharkRuntime::uncommon_trap(JavaThr
// being deopted one frame down on the stack. Create a dummy frame
// to mirror this.
ZeroStack *stack = thread->zero_stack();
- thread->push_zero_frame(DeoptimizerFrame::build(stack));
+ thread->push_zero_frame(FakeStubFrame::build(stack));
// Initiate the trap
thread->set_last_Java_frame();
@@ -223,7 +223,7 @@ void SharkRuntime::uncommon_trap(JavaThr
}
// Push another dummy frame
- thread->push_zero_frame(DeoptimizerFrame::build(stack));
+ thread->push_zero_frame(FakeStubFrame::build(stack));
// Fill in the skeleton frames
thread->set_last_Java_frame();
@@ -241,7 +241,7 @@ void SharkRuntime::uncommon_trap(JavaThr
#endif // CC_INTERP
}
-DeoptimizerFrame* DeoptimizerFrame::build(ZeroStack* stack)
+FakeStubFrame* FakeStubFrame::build(ZeroStack* stack)
{
if (header_words > stack->available_words()) {
Unimplemented();
@@ -251,8 +251,8 @@ DeoptimizerFrame* DeoptimizerFrame::buil
intptr_t *fp = stack->sp();
assert(fp - stack->sp() == next_frame_off, "should be");
- stack->push(DEOPTIMIZER_FRAME);
+ stack->push(FAKE_STUB_FRAME);
assert(fp - stack->sp() == frame_type_off, "should be");
- return (DeoptimizerFrame *) fp;
-}
+ return (FakeStubFrame *) fp;
+}
More information about the distro-pkg-dev
mailing list