changeset cdef2ad5c0ed in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=cdef2ad5c0ed
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Apr 12 15:06:09 2010 +0200
PR icedtea/459: shark do nothing on stub frame
2010-04-12 Xerxes R?nby <xerxes at zafena.se>
PR icedtea/459:
* Makefile.am: (ICEDTEA_PATCHES): Apply
patches/zero/shark_do_nothing_on_stub_frame.patch.
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
(frame::is_fake_stub_frame): New method.
* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
(frame::is_fake_stub_frame): Likewise.
* patches/zero/shark_do_nothing_on_stub_frame.patch: New.
diffstat:
5 files changed, 34 insertions(+)
ChangeLog | 11 +++++++++++
Makefile.am | 1 +
patches/zero/shark_do_nothing_on_stub_frame.patch | 15 +++++++++++++++
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 4 ++++
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 3 +++
diffs (75 lines):
diff -r 1e3f9ece9b6b -r cdef2ad5c0ed ChangeLog
--- a/ChangeLog Mon Apr 12 13:46:45 2010 +0200
+++ b/ChangeLog Mon Apr 12 15:06:09 2010 +0200
@@ -1,3 +1,14 @@ 2010-04-12 Matthias Klose <doko at ubuntu
+2010-04-12 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ PR icedtea/459:
+ * Makefile.am: (ICEDTEA_PATCHES):
+ Apply patches/zero/shark_do_nothing_on_stub_frame.patch.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
+ (frame::is_fake_stub_frame): New method.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
+ (frame::is_fake_stub_frame): Likewise.
+ * patches/zero/shark_do_nothing_on_stub_frame.patch: New.
+
2010-04-12 Matthias Klose <doko at ubuntu.com>
* configure.ac: Clarify result message of the NSS check.
diff -r 1e3f9ece9b6b -r cdef2ad5c0ed Makefile.am
--- a/Makefile.am Mon Apr 12 13:46:45 2010 +0200
+++ b/Makefile.am Mon Apr 12 15:06:09 2010 +0200
@@ -221,6 +221,7 @@ ICEDTEA_PATCHES = \
patches/zero/6913869.patch \
patches/zero/6914622.patch \
patches/zero/6939845.patch \
+ patches/zero/shark_do_nothing_on_stub_frame.patch \
patches/icedtea-notice-safepoints.patch \
patches/icedtea-parisc-opt.patch \
patches/icedtea-lucene-crash.patch \
diff -r 1e3f9ece9b6b -r cdef2ad5c0ed patches/zero/shark_do_nothing_on_stub_frame.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/shark_do_nothing_on_stub_frame.patch Mon Apr 12 15:06:09 2010 +0200
@@ -0,0 +1,15 @@
+Index: hotspot/src/share/vm/runtime/frame.cpp
+===================================================================
+--- openjdk/hotspot.orig/src/share/vm/runtime/frame.cpp 2010-02-17 04:11:10.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/frame.cpp 2010-03-25 10:06:18.334380336 +0100
+@@ -1205,6 +1205,10 @@
+ if (is_interpreted_frame()) { oops_interpreted_do(f, map, use_interpreter_oop_map_cache);
+ } else if (is_entry_frame()) { oops_entry_do (f, map);
+ } else if (CodeCache::contains(pc())) { oops_code_blob_do (f, map);
++#ifdef SHARK
++ } else if (is_fake_stub_frame()) {
++ // nothing to do
++#endif // SHARK
+ } else {
+ ShouldNotReachHere();
+ }
diff -r 1e3f9ece9b6b -r cdef2ad5c0ed ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Mon Apr 12 13:46:45 2010 +0200
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Mon Apr 12 15:06:09 2010 +0200
@@ -34,6 +34,10 @@ void RegisterMap::check_location_valid()
bool frame::is_interpreted_frame() const {
return zeroframe()->is_interpreter_frame();
+}
+
+bool frame::is_fake_stub_frame() const {
+ return zeroframe()->is_fake_stub_frame();
}
frame frame::sender_for_entry_frame(RegisterMap *map) const {
diff -r 1e3f9ece9b6b -r cdef2ad5c0ed ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp Mon Apr 12 13:46:45 2010 +0200
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp Mon Apr 12 15:06:09 2010 +0200
@@ -65,6 +65,9 @@
}
public:
+ bool is_fake_stub_frame() const;
+
+ public:
frame sender_for_nonentry_frame(RegisterMap* map) const;
public: