/hg/icedtea6: 2009-11-11 Gary Benson <[e-mail]>

[gbenson]

changeset 3adabf9ea7ef in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3adabf9ea7ef
author: Gary Benson <gbenson@...>
date: Wed Nov 11 10:34:05 2009 +0000

        2009-11-11 Gary Benson <gbenson@...>

         * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
        (frame::is_fake_stub_frame): Removed.
        (frame::sender_for_fake_stub_frame): Likewise.
        (frame::sender_for_nonentry_frame): New method.
                * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
        (frame::is_fake_stub_frame): Removed.
        (frame::sender_for_fake_stub_frame): Likewise.
        (frame::sender_for_nonentry_frame): New method.
        (frame::sender): Refactored.


diffstat:

3 files changed, 16 insertions(+), 28 deletions(-)
ChangeLog                                    |   12 +++++++++++
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp |   27 ++------------------------
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp |    5 ----

diffs (85 lines):

diff -r b078cdccad9c -r 3adabf9ea7ef ChangeLog
--- a/ChangeLog Wed Nov 11 10:30:19 2009 +0000
+++ b/ChangeLog Wed Nov 11 10:34:05 2009 +0000
@@ -1,3 +1,15 @@ 2009-11-11  Gary Benson  <gbenson@redhat
[phone]  Gary Benson  <gbenson@...>
+
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
+ (frame::is_fake_stub_frame): Removed.
+ (frame::sender_for_fake_stub_frame): Likewise.
+ (frame::sender_for_nonentry_frame): New method.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
+ (frame::is_fake_stub_frame): Removed.
+ (frame::sender_for_fake_stub_frame): Likewise.
+ (frame::sender_for_nonentry_frame): New method.
+ (frame::sender): Refactored.
+
 2009-11-11  Gary Benson  <gbenson@...>
 
  * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
diff -r b078cdccad9c -r 3adabf9ea7ef ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Wed Nov 11 10:30:19 2009 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Wed Nov 11 10:34:05 2009 +0000
@@ -34,10 +34,6 @@ 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 {
@@ -50,15 +46,7 @@ frame frame::sender_for_entry_frame(Regi
   return frame(sender_sp(), sp() + 1);
 }
 
-frame frame::sender_for_interpreter_frame(RegisterMap *map) const {
-  return frame(sender_sp(), sp() + 1);
-}
-
-frame frame::sender_for_compiled_frame(RegisterMap *map) const {
-  return frame(sender_sp(), sp() + 1);
-}
-
-frame frame::sender_for_fake_stub_frame(RegisterMap *map) const {
+frame frame::sender_for_nonentry_frame(RegisterMap *map) const {
   return frame(sender_sp(), sp() + 1);
 }
 
@@ -69,17 +57,8 @@ frame frame::sender(RegisterMap* map) co
 
   if (is_entry_frame())
     return sender_for_entry_frame(map);
-
-  if (is_interpreted_frame())
-    return sender_for_interpreter_frame(map);
-
-  if (is_compiled_frame())
-    return sender_for_compiled_frame(map);
-
-  if (is_fake_stub_frame())
-    return sender_for_fake_stub_frame(map);
-
-  ShouldNotReachHere();
+  else
+    return sender_for_nonentry_frame(map);
 }
 
 #ifdef CC_INTERP
diff -r b078cdccad9c -r 3adabf9ea7ef ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp Wed Nov 11 10:30:19 2009 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp Wed Nov 11 10:34:05 2009 +0000
@@ -65,10 +65,7 @@
   }
 
  public:
-  bool is_fake_stub_frame() const;
-
- public:
-  frame sender_for_fake_stub_frame(RegisterMap* map) const;
+  frame sender_for_nonentry_frame(RegisterMap* map) const;
 
  public:
   void zero_print_on_error(int           index,