/hg/release/icedtea7-forest-2.4/hotspot: Fix Zero following chan...

[andrew at icedtea.classpath.org]

changeset 09f439dfd7b9 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=09f439dfd7b9
author: andrew
date: Wed Sep 11 04:42:47 2013 +0100

	Fix Zero following changes to entry_frame_call_wrapper in 8016131


diffstat:

 src/cpu/zero/vm/entryFrame_zero.hpp   |  4 ++--
 src/cpu/zero/vm/frame_zero.inline.hpp |  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 24b23eb187fc -r 09f439dfd7b9 src/cpu/zero/vm/entryFrame_zero.hpp
--- a/src/cpu/zero/vm/entryFrame_zero.hpp	Thu Sep 05 15:10:41 2013 +0100
+++ b/src/cpu/zero/vm/entryFrame_zero.hpp	Wed Sep 11 04:42:47 2013 +0100
@@ -58,8 +58,8 @@
                            JavaCallWrapper* call_wrapper,
                            TRAPS);
  public:
-  JavaCallWrapper *call_wrapper() const {
-    return (JavaCallWrapper *) value_of_word(call_wrapper_off);
+  JavaCallWrapper **call_wrapper() const {
+    return (JavaCallWrapper **) addr_of_word(call_wrapper_off);
   }
 
  public:
diff -r 24b23eb187fc -r 09f439dfd7b9 src/cpu/zero/vm/frame_zero.inline.hpp
--- a/src/cpu/zero/vm/frame_zero.inline.hpp	Thu Sep 05 15:10:41 2013 +0100
+++ b/src/cpu/zero/vm/frame_zero.inline.hpp	Wed Sep 11 04:42:47 2013 +0100
@@ -132,7 +132,7 @@
   return fp();
 }
 
-inline JavaCallWrapper* frame::entry_frame_call_wrapper() const {
+inline JavaCallWrapper** frame::entry_frame_call_wrapper_addr() const {
   return zero_entryframe()->call_wrapper();
 }