changeset 4881:edf2bb42e70f

Recent changes to patch queue
author goetz
date Fri, 28 Jun 2013 16:31:09 +0200
parents 8d5597e3e9bb
children 874e94d3b21d
files ppc_patches/0003-2_C_interpreter-fix_for_8010460.patch ppc_patches/0003-4_C_interpreter-Wunused_value.patch ppc_patches/0006_C_interpreter-adapt_stack_handling.patch ppc_patches/0009_linux_ppc_files.patch ppc_patches/0014_aix_make_changes.patch ppc_patches/0015_aix_ppc_files.patch ppc_patches/0113_opto-Extend_Load_and_Store_nodes_to_know_about_memory_ordering.patch ppc_patches/0201_C_interpreter-implement_bytecode_profiling.patch ppc_patches/0204_opto-explicit_specification_of_rematerialization_in_ad_file.patch ppc_patches/0208_rt-improve_handling_of_memory_ordering_in_taskqueue_hpp.patch ppc_patches/series
diffstat 11 files changed, 630 insertions(+), 569 deletions(-) [+]
line wrap: on
line diff
--- a/ppc_patches/0003-2_C_interpreter-fix_for_8010460.patch	Mon Jun 24 17:34:32 2013 +0200
+++ b/ppc_patches/0003-2_C_interpreter-fix_for_8010460.patch	Fri Jun 28 16:31:09 2013 +0200
@@ -3,7 +3,7 @@
 
 diff -r b5c8a61d7fa0 src/share/vm/interpreter/bytecodeInterpreter.cpp
 --- a/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Jun 21 15:56:24 2013 -0700
-+++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp	Mon Jun 24 11:04:59 2013 +0200
++++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp	Wed Jun 26 10:56:11 2013 +0200
 @@ -481,9 +481,9 @@
      // So we have a second version of the assertion which handles the case where EnableInvokeDynamic was
      // switched off because of the wrong classes.
@@ -16,3 +16,22 @@
        assert(labs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + extra_stack_entries
                                                                                                 + 1), "bad stack limit");
      }
+@@ -2233,7 +2233,7 @@
+         }
+ 
+         Method* method = cache->f1_as_method();
+-        VERIFY_OOP(method);
++        if (VerifyOops) method->verify();
+ 
+         if (cache->has_appendix()) {
+           ConstantPool* constants = METHOD->constants();
+@@ -2265,8 +2265,7 @@
+         }
+ 
+         Method* method = cache->f1_as_method();
+-
+-        VERIFY_OOP(method);
++        if (VerifyOops) method->verify();
+ 
+         if (cache->has_appendix()) {
+           ConstantPool* constants = METHOD->constants();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ppc_patches/0003-4_C_interpreter-Wunused_value.patch	Fri Jun 28 16:31:09 2013 +0200
@@ -0,0 +1,44 @@
+# HG changeset patch
+# Parent f4f6ae481e1a8f66d0c1870fb6406fb30fd7af63
+Fix bytecodeInterpreter to compile with '-Wunused-value'.
+diff -r f4f6ae481e1a -r 79a9a0cf0f70 src/share/vm/interpreter/bytecodeInterpreter.cpp
+--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp	Thu Jun 27 13:04:51 2013 -0700
++++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Jun 28 14:14:22 2013 +0200
+@@ -1581,7 +1581,7 @@
+ #define ARRAY_LOADTO32(T, T2, format, stackRes, extra)                                \
+       {                                                                               \
+           ARRAY_INTRO(-2);                                                            \
+-          extra;                                                                      \
++          (void)extra;                                                                \
+           SET_ ## stackRes(*(T2 *)(((address) arrObj->base(T)) + index * sizeof(T2)), \
+                            -2);                                                       \
+           UPDATE_PC_AND_TOS_AND_CONTINUE(1, -1);                                      \
+@@ -1592,8 +1592,8 @@
+       {                                                                                    \
+           ARRAY_INTRO(-2);                                                                 \
+           SET_ ## stackRes(*(T2 *)(((address) arrObj->base(T)) + index * sizeof(T2)), -1); \
+-          extra;                                                                           \
+-          UPDATE_PC_AND_CONTINUE(1);                                            \
++          (void)extra;                                                                     \
++          UPDATE_PC_AND_CONTINUE(1);                                                       \
+       }
+ 
+       CASE(_iaload):
+@@ -1617,7 +1617,7 @@
+ #define ARRAY_STOREFROM32(T, T2, format, stackSrc, extra)                            \
+       {                                                                              \
+           ARRAY_INTRO(-3);                                                           \
+-          extra;                                                                     \
++         (void)extra;                                                                \
+           *(T2 *)(((address) arrObj->base(T)) + index * sizeof(T2)) = stackSrc( -1); \
+           UPDATE_PC_AND_TOS_AND_CONTINUE(1, -3);                                     \
+       }
+@@ -1626,7 +1626,7 @@
+ #define ARRAY_STOREFROM64(T, T2, stackSrc, extra)                                    \
+       {                                                                              \
+           ARRAY_INTRO(-4);                                                           \
+-          extra;                                                                     \
++          (void)extra;                                                               \
+           *(T2 *)(((address) arrObj->base(T)) + index * sizeof(T2)) = stackSrc( -1); \
+           UPDATE_PC_AND_TOS_AND_CONTINUE(1, -4);                                     \
+       }
--- a/ppc_patches/0006_C_interpreter-adapt_stack_handling.patch	Mon Jun 24 17:34:32 2013 +0200
+++ b/ppc_patches/0006_C_interpreter-adapt_stack_handling.patch	Fri Jun 28 16:31:09 2013 +0200
@@ -1,42 +1,55 @@
 # HG changeset patch
-# Parent 8a2a2e4dc129814da7beb9c1c7b90556e8091ee1
+# Parent 304ac424842e6acd4ffa7d12d290a5a59927d3f4
 C-interpreter: Stack handling improvements.
 
 Some shared functions supporting stack handling by the C-interpreter.
-diff -r 8a2a2e4dc129 src/share/vm/runtime/stubRoutines.hpp
---- a/src/share/vm/runtime/stubRoutines.hpp	Fri Feb 15 12:20:38 2013 +0100
-+++ b/src/share/vm/runtime/stubRoutines.hpp	Fri Feb 15 12:23:55 2013 +0100
-@@ -232,7 +232,9 @@
-   static jint    verify_oop_count()                        { return _verify_oop_count; }
-   static jint*   verify_oop_count_addr()                   { return &_verify_oop_count; }
-   // a subroutine for debugging the GC
--  static address verify_oop_subroutine_entry_address()    { return (address)&_verify_oop_subroutine_entry; }
-+  static address verify_oop_subroutine_entry_address()     { return (address)&_verify_oop_subroutine_entry; }
-+  // We need this address to lazily jump to in interpreter.
-+  static address throw_StackOverflowError_entry_address()  { return (address)&_throw_StackOverflowError_entry; }
 
-   static address catch_exception_entry()                   { return _catch_exception_entry; }
-
-diff -r 8a2a2e4dc129 src/share/vm/runtime/thread.hpp
---- a/src/share/vm/runtime/thread.hpp	Fri Feb 15 12:20:38 2013 +0100
-+++ b/src/share/vm/runtime/thread.hpp	Fri Feb 15 12:23:55 2013 +0100
-@@ -536,6 +536,19 @@
-     return (_stack_base >= adr && adr >= (_stack_base - _stack_size));
-   }
-
-+#ifdef CC_INTERP
-+  // The cppInterpreter does not support implicit checks, thus we check
-+  // stack overflow by comparison. We precompute the limit of the stack
-+  // and load it from here to simplify the check in assembly.
-+ protected:
-+  address _memory_stack_limit;
+diff -r 304ac424842e src/share/vm/runtime/thread.cpp
+--- a/src/share/vm/runtime/thread.cpp	Wed Jun 26 10:58:46 2013 +0200
++++ b/src/share/vm/runtime/thread.cpp	Wed Jun 26 15:38:36 2013 +0200
+@@ -312,6 +312,8 @@
+ void Thread::record_stack_base_and_size() {
+   set_stack_base(os::current_stack_base());
+   set_stack_size(os::current_stack_size());
++  if (is_Java_thread())
++    ((JavaThread*) this)->set_stack_overflow_limit();
+   // CR 7190089: on Solaris, primordial thread's stack is adjusted
+   // in initialize_thread(). Without the adjustment, stack size is
+   // incorrect if stack is set to unlimited (ulimit -s unlimited).
+diff -r 304ac424842e src/share/vm/runtime/thread.hpp
+--- a/src/share/vm/runtime/thread.hpp	Wed Jun 26 10:58:46 2013 +0200
++++ b/src/share/vm/runtime/thread.hpp	Wed Jun 26 15:38:36 2013 +0200
+@@ -893,7 +893,11 @@
+ 
+  private:
+ 
+-  StackGuardState        _stack_guard_state;
++  StackGuardState  _stack_guard_state;
 +
-+ public:
-+  address memory_stack_limit()                { return _memory_stack_limit;    }
-+  void set_memory_stack_limit(address limit)  { _memory_stack_limit = limit;   }
-+  static ByteSize memory_stack_limit_offset() { return byte_offset_of(Thread, _memory_stack_limit); }
-+#endif
++  // Precompute the limit of the stack as used in stack overflow checks.
++  // We load it from here to simplify the stack overflow check in assembly.
++  address          _stack_overflow_limit;
+ 
+   // Compiler exception handling (NOTE: The _exception_oop is *NOT* the same as _pending_exception. It is
+   // used to temp. parsing values into and out of the runtime system during exception handling for compiled
+@@ -1301,6 +1305,12 @@
+   // and reguard if possible.
+   bool reguard_stack(void);
+ 
++  address stack_overflow_limit() { return _stack_overflow_limit; }
++  void set_stack_overflow_limit() {
++    _stack_overflow_limit = _stack_base - _stack_size +
++      ((StackShadowPages + StackYellowPages + StackRedPages) * os::vm_page_size());
++  }
 +
-   uintptr_t self_raw_id()                    { return _self_raw_id; }
-   void      set_self_raw_id(uintptr_t value) { _self_raw_id = value; }
-
+   // Misc. accessors/mutators
+   void set_do_not_unlock(void)                   { _do_not_unlock_if_synchronized = true; }
+   void clr_do_not_unlock(void)                   { _do_not_unlock_if_synchronized = false; }
+@@ -1335,6 +1345,7 @@
+   static ByteSize exception_oop_offset()         { return byte_offset_of(JavaThread, _exception_oop       ); }
+   static ByteSize exception_pc_offset()          { return byte_offset_of(JavaThread, _exception_pc        ); }
+   static ByteSize exception_handler_pc_offset()  { return byte_offset_of(JavaThread, _exception_handler_pc); }
++  static ByteSize stack_overflow_limit_offset()  { return byte_offset_of(JavaThread, _stack_overflow_limit); }
+   static ByteSize is_method_handle_return_offset() { return byte_offset_of(JavaThread, _is_method_handle_return); }
+   static ByteSize stack_guard_state_offset()     { return byte_offset_of(JavaThread, _stack_guard_state   ); }
+   static ByteSize suspend_flags_offset()         { return byte_offset_of(JavaThread, _suspend_flags       ); }
--- a/ppc_patches/0009_linux_ppc_files.patch	Mon Jun 24 17:34:32 2013 +0200
+++ b/ppc_patches/0009_linux_ppc_files.patch	Fri Jun 28 16:31:09 2013 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent ebd8e5f0807c89743a86df94752167835540ad88
+# Parent 3348a8244d70331e8fe7d2d22450da22f5fbe817
 ppc: PPC platform files as required to start up the interpreter.
 
 With this change the HotSpot (libjvm.so) compiles and
@@ -12,9 +12,9 @@
 ------------
 ALT_BOOTDIR=/sapmnt/depot/tools/gen/linuxppc64/licenseware/jse/1.7.0 ALT_OUTPUTDIR=/priv/d046063/OpenJDK/output_dbg_ppc64 CC_INTERP=true OPENJDK=true ARCH_DATA_MODEL=64 MAKE_VERBOSE=y HOTSPOT_BUILD_JOBS=1 make jvmgcore 2>&1 | tee /priv/d046063/OpenJDK/output_dbg_ppc64.log
 
-diff -r ebd8e5f0807c src/cpu/ppc/vm/assembler_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/assembler_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/assembler_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/assembler_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,700 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -716,9 +716,9 @@
 +  code()->decode();
 +}
 +#endif // !PRODUCT
-diff -r ebd8e5f0807c src/cpu/ppc/vm/assembler_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/assembler_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/assembler_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/assembler_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,1963 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -2683,9 +2683,9 @@
 +
 +
 +#endif // CPU_PPC_VM_ASSEMBLER_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/assembler_ppc.inline.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/assembler_ppc.inline.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/assembler_ppc.inline.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/assembler_ppc.inline.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,792 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -3479,9 +3479,9 @@
 +
 +
 +#endif // CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,105 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -3588,9 +3588,9 @@
 +
 +
 +#endif // CPU_PPC_VM_BYTECODEINTERPRETER_PPC_PP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,290 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -3882,9 +3882,9 @@
 +#endif // CC_INTERP
 +
 +#endif // CPU_PPC_VM_BYTECODEINTERPRETER_PPC_INLINE_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/bytecodes_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/bytecodes_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/bytecodes_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/bytecodes_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,31 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -3917,9 +3917,9 @@
 +void Bytecodes::pd_initialize() {
 +  // No ppc specific initialization.
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/bytecodes_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/bytecodes_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/bytecodes_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/bytecodes_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,31 @@
 +/*
 + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -3952,9 +3952,9 @@
 +// No ppc64 specific bytecodes
 +
 +#endif // CPU_PPC_VM_BYTECODES_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/bytes_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/bytes_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/bytes_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/bytes_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,156 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -4112,9 +4112,9 @@
 +};
 +
 +#endif // CPU_PPC_VM_BYTES_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/codeBuffer_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/codeBuffer_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/codeBuffer_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/codeBuffer_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -4151,9 +4151,9 @@
 +  void flush_bundle(bool start_new_bundle) {}
 +
 +#endif // CPU_PPC_VM_CODEBUFFER_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/compiledIC_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/compiledIC_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/compiledIC_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/compiledIC_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,261 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4416,9 +4416,9 @@
 +}
 +
 +#endif // !PRODUCT
-diff -r ebd8e5f0807c src/cpu/ppc/vm/copy_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/copy_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/copy_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/copy_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,163 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -4583,9 +4583,9 @@
 +}
 +
 +#endif // CPU_PPC_VM_COPY_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -4630,10 +4630,10 @@
 +  void generate_compute_interpreter_state(Label& exception_return);
 +
 +#endif // CPU_PPC_VM_CPPINTERPRETERGENERATOR_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/cppInterpreter_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
-@@ -0,0 +1,3053 @@
+diff -r 3348a8244d70 src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
+@@ -0,0 +1,3047 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 + * Copyright 2012, 2013 SAP AG. All rights reserved.
@@ -5060,8 +5060,8 @@
 +    __ ppc_addi(max_stack, max_stack, Method::extra_stack_entries());
 +  }
 +
-+  // mem_stack_limit = thread->memory_stack_limit();
-+  __ ppc_ld(mem_stack_limit, thread_(memory_stack_limit));
++  // mem_stack_limit = thread->stack_limit();
++  __ ppc_ld(mem_stack_limit, thread_(stack_overflow_limit));
 +
 +  // Point locals at the first argument. Method's locals are the
 +  // parameters on top of caller's expression stack.
@@ -6151,12 +6151,8 @@
 +  // Resize frame to get rid of a potential extension.
 +  __ resize_frame_to_initial_caller(PPC_scratch_1, PPC_scratch_2);
 +
-+
-+
 +  // Load target address of the runtime stub.
-+  __ load_const(PPC_scratch_2, (StubRoutines::throw_StackOverflowError_entry_address()));
-+  // Dereference the address.
-+  __ ppc_ld(PPC_scratch_2, 0, PPC_scratch_2);
++  __ load_const(PPC_scratch_2, (StubRoutines::throw_StackOverflowError_entry()));
 +  __ ppc_mtctr(PPC_scratch_2);
 +  __ ppc_bctr();
 +
@@ -6793,9 +6789,7 @@
 +  //      Since we restored the caller SP above, the rethrow_excp_entry can restore the original interpreter state
 +  //      registers using the stack and resume the calling method with a pending excp.
 +
-+  __ load_const(PPC_ARG1, (StubRoutines::throw_StackOverflowError_entry_address()));
-+  // Dereference the address
-+  __ ppc_ld(PPC_ARG1, 0, PPC_ARG1);
++  __ load_const(PPC_ARG1, (StubRoutines::throw_StackOverflowError_entry()));
 +  __ ppc_mtctr(PPC_ARG1);
 +  __ ppc_bctr();
 +  }
@@ -7687,9 +7681,9 @@
 +}
 +
 +#endif // CC_INTERP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/cppInterpreter_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/cppInterpreter_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/cppInterpreter_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/cppInterpreter_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -7730,9 +7724,9 @@
 +  const static int InterpreterCodeSize = 12*K;
 +
 +#endif // CPU_PPC_VM_CPPINTERPRETER_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/debug_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/debug_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/debug_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/debug_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -7769,9 +7763,9 @@
 +#include "utilities/top.hpp"
 +
 +void pd_ps(frame f) {}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/depChecker_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/depChecker_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/depChecker_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/depChecker_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,31 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -7804,9 +7798,9 @@
 +// Nothing to do on ppc64
 +
 +#endif // CPU_PPC_VM_DEPCHECKER_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/disassembler_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/disassembler_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/disassembler_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/disassembler_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,37 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -7845,9 +7839,9 @@
 +  }
 +
 +#endif // CPU_PPC_VM_DISASSEMBLER_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/frame_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/frame_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/frame_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/frame_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,306 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -8155,9 +8149,9 @@
 +  // unused... but returns fp() to minimize changes introduced by 7087445
 +  return fp();
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/frame_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/frame_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/frame_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/frame_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,449 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -8608,9 +8602,9 @@
 +  };
 +
 +#endif // CPU_PPC_VM_FRAME_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/frame_ppc.inline.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/frame_ppc.inline.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/frame_ppc.inline.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/frame_ppc.inline.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,239 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -8851,9 +8845,9 @@
 +}
 +
 +#endif // CPU_PPC_VM_FRAME_PPC_INLINE_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/globalDefinitions_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/globalDefinitions_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/globalDefinitions_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/globalDefinitions_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,34 @@
 +/*
 + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -8889,9 +8883,9 @@
 +const int StackAlignmentInBytes  = 16;
 +
 +#endif // CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/globals_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/globals_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/globals_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/globals_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,116 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -9009,9 +9003,9 @@
 +
 +
 +#endif // CPU_PPC_VM_GLOBALS_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/icBuffer_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/icBuffer_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/icBuffer_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/icBuffer_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,71 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -9084,9 +9078,9 @@
 +  void* o = (void*)move->data();
 +  return o;
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/icache_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/icache_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/icache_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/icache_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,77 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -9165,9 +9159,9 @@
 +  // First call to flush itself
 +  ICache::invalidate_range((address)(*flush_icache_stub), 0);
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/icache_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/icache_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/icache_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/icache_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,44 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -9213,9 +9207,9 @@
 +};
 +
 +#endif // CPU_PPC_VM_ICACHE_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/interp_masm_ppc_64.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/interp_masm_ppc_64.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/interp_masm_ppc_64.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/interp_masm_ppc_64.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,504 @@
 +/*
 + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -9721,9 +9715,9 @@
 +  ppc_ld(PPC_prev_state, state_(_prev_link));
 +}
 +#endif // CC_INTERP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/interp_masm_ppc_64.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/interp_masm_ppc_64.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/interp_masm_ppc_64.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/interp_masm_ppc_64.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,89 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -9814,9 +9808,9 @@
 +};
 +
 +#endif // CPU_PPC_VM_INTERP_MASM_PPC_64_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,37 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -9855,9 +9849,9 @@
 +  address generate_Reference_get_entry(void);
 +
 +#endif // CPU_PPC_VM_INTERPRETERGENERATOR_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/interpreterRT_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/interpreterRT_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/interpreterRT_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/interpreterRT_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,150 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10009,9 +10003,9 @@
 +  assert(m->is_native(), "sanity check");
 +  return AbstractInterpreter::result_handler(m->result_type());
 +IRT_END
-diff -r ebd8e5f0807c src/cpu/ppc/vm/interpreterRT_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/interpreterRT_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/interpreterRT_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/interpreterRT_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,62 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10075,9 +10069,9 @@
 +static address get_signature(JavaThread* thread, Method* method);
 +
 +#endif // CPU_PPC_VM_INTERPRETERRT_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/interpreter_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/interpreter_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/interpreter_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/interpreter_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,738 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10817,9 +10811,9 @@
 +
 +  assert(f->is_interpreted_frame(), "must be interpreted");
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/interpreter_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/interpreter_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/interpreter_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/interpreter_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,42 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10863,9 +10857,9 @@
 +  }
 +
 +#endif // CPU_PPC_VM_INTERPRETER_PPC_PP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,82 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10949,9 +10943,9 @@
 +  void set_last_Java_sp(intptr_t* sp) { OrderAccess::release(); _last_Java_sp = sp; }
 +
 +#endif // CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/jniFastGetField_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/jniFastGetField_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/jniFastGetField_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/jniFastGetField_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,75 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -11028,9 +11022,9 @@
 +address JNI_FastGetField::generate_fast_get_double_field() {
 +  return generate_fast_get_float_field0(T_DOUBLE);
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/jniTypes_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/jniTypes_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/jniTypes_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/jniTypes_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,110 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -11142,9 +11136,9 @@
 +};
 +
 +#endif // CPU_PPC_VM_JNITYPES_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/jni_ppc.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/jni_ppc.h	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/jni_ppc.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/jni_ppc.h	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,53 @@
 +/*
 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -11199,9 +11193,9 @@
 +typedef signed char jbyte;
 +
 +#endif // CPU_PPC_VM_JNI_PPC_H
-diff -r ebd8e5f0807c src/cpu/ppc/vm/macroAssembler_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/macroAssembler_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/macroAssembler_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/macroAssembler_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,3016 @@
 +/*
 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -14219,9 +14213,9 @@
 +}
 +
 +#endif // !PRODUCT
-diff -r ebd8e5f0807c src/cpu/ppc/vm/macroAssembler_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/macroAssembler_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/macroAssembler_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/macroAssembler_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,662 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -14885,9 +14879,9 @@
 +};
 +
 +#endif // CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,382 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -15271,9 +15265,9 @@
 +}
 +
 +#endif // CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/metaspaceShared_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/metaspaceShared_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/metaspaceShared_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/metaspaceShared_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,61 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -15336,9 +15330,9 @@
 +  Unimplemented();
 +}
 +
-diff -r ebd8e5f0807c src/cpu/ppc/vm/methodHandles_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/methodHandles_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/methodHandles_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/methodHandles_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,540 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -15880,9 +15874,9 @@
 +  BLOCK_COMMENT("} trace_method_handle");
 +}
 +#endif // PRODUCT
-diff -r ebd8e5f0807c src/cpu/ppc/vm/methodHandles_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/methodHandles_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/methodHandles_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/methodHandles_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,62 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -15946,9 +15940,9 @@
 +                                  Register recv, Register method_temp,
 +                                  Register temp2, Register temp3,
 +                                  bool for_compiler_entry);
-diff -r ebd8e5f0807c src/cpu/ppc/vm/nativeInst_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/nativeInst_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/nativeInst_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/nativeInst_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,381 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -16331,9 +16325,9 @@
 +  *(address*)(ctable + destination_toc_offset()) = new_destination;
 +}
 +
-diff -r ebd8e5f0807c src/cpu/ppc/vm/nativeInst_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/nativeInst_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/nativeInst_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/nativeInst_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,397 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -16732,9 +16726,9 @@
 +}
 +
 +#endif // CPU_PPC_VM_NATIVEINST_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/registerMap_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/registerMap_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/registerMap_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/registerMap_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,45 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -16781,9 +16775,9 @@
 +  void pd_initialize_from(const RegisterMap* map) {}
 +
 +#endif // CPU_PPC_VM_REGISTERMAP_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/register_definitions_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/register_definitions_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/register_definitions_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/register_definitions_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,42 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -16827,9 +16821,9 @@
 +REGISTER_DEFINITION(Register, noreg);
 +
 +REGISTER_DEFINITION(FloatRegister, fnoreg);
-diff -r ebd8e5f0807c src/cpu/ppc/vm/register_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/register_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/register_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/register_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,77 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -16908,9 +16902,9 @@
 +  };
 +  return is_valid() ? names[encoding()] : "vnoreg";
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/register_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/register_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/register_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/register_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,635 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -17547,9 +17541,9 @@
 +#endif
 +
 +#endif // CPU_PPC_VM_REGISTER_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/relocInfo_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/relocInfo_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/relocInfo_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/relocInfo_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,145 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -17696,9 +17690,9 @@
 +
 +void metadata_Relocation::pd_fix_value(address x) {
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/relocInfo_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/relocInfo_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/relocInfo_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/relocInfo_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -17746,9 +17740,9 @@
 +  };
 +
 +#endif // CPU_PPC_VM_RELOCINFO_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/sharedRuntime_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/sharedRuntime_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/sharedRuntime_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/sharedRuntime_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,3208 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -20958,9 +20952,9 @@
 +  return RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_in_bytes/wordSize,
 +                                       oop_maps, true);
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/stubGenerator_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/stubGenerator_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,2058 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -23020,9 +23014,9 @@
 +void StubGenerator_generate(CodeBuffer* code, bool all) {
 +  StubGenerator g(code, all);
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,40 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -23064,9 +23058,9 @@
 +// a description of how to extend it, see the stubRoutines.hpp file.
 +
 +
-diff -r ebd8e5f0807c src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,40 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -23108,9 +23102,9 @@
 +};
 +
 +#endif // CPU_PPC_VM_STUBROUTINES_PPC_64_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/vmStructs_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/vmStructs_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/vmStructs_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/vmStructs_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,41 @@
 +/*
 + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -23153,9 +23147,9 @@
 +#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 +
 +#endif // CPU_PPC_VM_VMSTRUCTS_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/vm_version_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/vm_version_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/vm_version_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/vm_version_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,472 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -23629,9 +23623,9 @@
 +void VM_Version::revert() {
 +  _features = saved_features;
 +}
-diff -r ebd8e5f0807c src/cpu/ppc/vm/vm_version_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/vm_version_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/vm_version_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/vm_version_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,93 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -23726,9 +23720,9 @@
 +};
 +
 +#endif // CPU_PPC_VM_VM_VERSION_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/vmreg_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/vmreg_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/vmreg_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/vmreg_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,51 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -23781,9 +23775,9 @@
 +  }
 +}
 +
-diff -r ebd8e5f0807c src/cpu/ppc/vm/vmreg_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/vmreg_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/vmreg_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/vmreg_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -23820,9 +23814,9 @@
 +  FloatRegister as_FloatRegister();
 +
 +#endif // CPU_PPC_VM_VMREG_PPC_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/vmreg_ppc.inline.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/vmreg_ppc.inline.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/vmreg_ppc.inline.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/vmreg_ppc.inline.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,71 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -23895,9 +23889,9 @@
 +}
 +
 +#endif // CPU_PPC_VM_VMREG_PPC_INLINE_HPP
-diff -r ebd8e5f0807c src/cpu/ppc/vm/vtableStubs_ppc_64.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/cpu/ppc/vm/vtableStubs_ppc_64.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/cpu/ppc/vm/vtableStubs_ppc_64.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/cpu/ppc/vm/vtableStubs_ppc_64.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,269 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -24168,9 +24162,9 @@
 +  const unsigned int icache_line_size = 32;
 +  return icache_line_size;
 +}
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,401 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -24573,9 +24567,9 @@
 +#undef strasm_ppc_nobarrier_clobber_memory
 +
 +#endif // OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_INLINE_HPP
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,54 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -24631,9 +24625,9 @@
 +define_pd_global(bool, UseVectoredExceptions,    false);
 +
 +#endif // OS_CPU_LINUX_PPC_VM_GLOBALS_LINUX_PPC_HPP
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,145 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -24780,10 +24774,10 @@
 +#undef inlasm_ppc_fence
 +
 +#endif // OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_INLINE_HPP
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
-@@ -0,0 +1,617 @@
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
+@@ -0,0 +1,608 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 + * Copyright 2012, 2013 SAP AG. All rights reserved.
@@ -24879,16 +24873,7 @@
 +  return (char*) -1;
 +}
 +
-+void os::initialize_thread(Thread *thread) {
-+  assert(thread != NULL, "Sanity check");
-+  if (!thread->is_Java_thread()) return;
-+
-+  // Initialize the memory stack limit.
-+  address mem_stk_limit = thread->stack_base() - thread->stack_size() +
-+    ((StackShadowPages + StackYellowPages + StackRedPages) * os::vm_page_size());
-+
-+  thread->set_memory_stack_limit(mem_stk_limit);
-+}
++void os::initialize_thread(Thread *thread) { }
 +
 +// Frame information (pc, sp, fp) retrieved via ucontext
 +// always looks like a C-frame according to the frame
@@ -25401,9 +25386,9 @@
 +  assert(((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0, "incorrect stack alignment");
 +}
 +#endif
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -25440,9 +25425,9 @@
 +  static bool register_code_area(char *low, char *high) { return true; }
 +
 +#endif // OS_CPU_LINUX_PPC_VM_OS_LINUX_PPC_HPP
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -25494,9 +25479,9 @@
 +}
 +
 +#endif // OS_CPU_LINUX_PPC_VM_PREFETCH_LINUX_OJDKPPC_HPP
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -25537,9 +25522,9 @@
 +void ThreadLocalStorage::pd_set_thread(Thread* thread) {
 +  os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
 +}
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,36 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -25577,9 +25562,9 @@
 +  }
 +
 +#endif // OS_CPU_LINUX_PPC_VM_THREADLS_LINUX_PPC_HPP
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,36 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -25617,9 +25602,9 @@
 +}
 +
 +void JavaThread::cache_global_variables() { }
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,83 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -25704,9 +25689,9 @@
 +  intptr_t* last_interpreter_fp() { return _last_interpreter_fp; }
 +
 +#endif // OS_CPU_LINUX_PPC_VM_THREAD_LINUX_PPC_HPP
-diff -r ebd8e5f0807c src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp	Mon Jun 24 14:43:43 2013 +0200
+diff -r 3348a8244d70 src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp	Wed Jun 26 15:37:31 2013 +0200
 @@ -0,0 +1,55 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -25763,3 +25748,15 @@
 +#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 +
 +#endif // OS_CPU_LINUX_PPC_VM_VMSTRUCTS_LINUX_PPC_HPP
+diff -r 3348a8244d70 src/share/vm/runtime/globals.hpp
+--- a/src/share/vm/runtime/globals.hpp	Wed Jun 26 14:08:26 2013 +0200
++++ b/src/share/vm/runtime/globals.hpp	Wed Jun 26 15:37:31 2013 +0200
+@@ -3609,7 +3609,7 @@
+           NOT_LP64(LINUX_ONLY(2*G) NOT_LINUX(0)),                           \
+           "Address to allocate shared memory region for class data")        \
+                                                                             \
+-  diagnostic(bool, EnableInvokeDynamic, true PPC64_ONLY(&& false),          \
++  diagnostic(bool, EnableInvokeDynamic, true,                               \
+           "support JSR 292 (method handles, invokedynamic, "                \
+           "anonymous classes")                                              \
+                                                                             \
--- a/ppc_patches/0014_aix_make_changes.patch	Mon Jun 24 17:34:32 2013 +0200
+++ b/ppc_patches/0014_aix_make_changes.patch	Fri Jun 28 16:31:09 2013 +0200
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent db3171ee407475ab29c4df188e0b22e4d15e29d3
+# Parent e70db17f41127a5863cab537539ce451d6f3d0cb
 make: Implement aix ppc64 build.
 
-diff -r db3171ee4074 make/aix/Makefile
+diff -r e70db17f4112 make/aix/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/Makefile	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/Makefile	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,377 @@
 +#
 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -383,9 +383,9 @@
 +.PHONY: all compiler1 compiler2 core zero shark
 +.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs
 +.PHONY: checks check_os_version check_j2se_version
-diff -r db3171ee4074 make/aix/adlc_updater
+diff -r e70db17f4112 make/aix/adlc_updater
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/adlc_updater	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/adlc_updater	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,20 @@
 +#! /bin/sh
 +#
@@ -407,9 +407,9 @@
 +fix_lines $2/$1 $3/$1
 +[ -f $3/$1 ] && cmp -s $2/$1 $3/$1 || \
 +( [ -f $3/$1 ] && echo Updating $3/$1 ; touch $2/made-change ; mv $2/$1 $3/$1 )
-diff -r db3171ee4074 make/aix/build.sh
+diff -r e70db17f4112 make/aix/build.sh
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/build.sh	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/build.sh	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,99 @@
 +#! /bin/sh
 +#
@@ -510,9 +510,9 @@
 +echo \
 +${GNUMAKE} -f ${Location}/make/linux/Makefile $Build_Options GAMMADIR=${Location}
 +${GNUMAKE} -f ${Location}/make/linux/Makefile $Build_Options GAMMADIR=${Location}
-diff -r db3171ee4074 make/aix/makefiles/adjust-mflags.sh
+diff -r e70db17f4112 make/aix/makefiles/adjust-mflags.sh
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/adjust-mflags.sh	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/adjust-mflags.sh	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,87 @@
 +#! /bin/sh
 +#
@@ -601,9 +601,9 @@
 +esac
 +
 +echo "${MFLAGS}"
-diff -r db3171ee4074 make/aix/makefiles/adlc.make
+diff -r e70db17f4112 make/aix/makefiles/adlc.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/adlc.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/adlc.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,233 @@
 +#
 +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -838,9 +838,9 @@
 +# #########################################################################
 +
 +.PHONY: all dump refresh_adfiles clean cleanall
-diff -r db3171ee4074 make/aix/makefiles/build_vm_def.sh
+diff -r e70db17f4112 make/aix/makefiles/build_vm_def.sh
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/build_vm_def.sh	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/build_vm_def.sh	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,18 @@
 +#!/bin/sh
 +
@@ -860,9 +860,9 @@
 +              if ($3 ~ /^SharedArchivePath__9Arguments$/) print "\t" $3 ";"
 +          }' \
 +    | sort -u
-diff -r db3171ee4074 make/aix/makefiles/buildtree.make
+diff -r e70db17f4112 make/aix/makefiles/buildtree.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/buildtree.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/buildtree.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,364 @@
 +#
 +# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -1228,9 +1228,9 @@
 +FORCE:
 +
 +.PHONY:  all FORCE
-diff -r db3171ee4074 make/aix/makefiles/compiler2.make
+diff -r e70db17f4112 make/aix/makefiles/compiler2.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/compiler2.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/compiler2.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,32 @@
 +#
 +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -1264,9 +1264,9 @@
 +VM_SUBDIR = server
 +
 +CFLAGS += -DCOMPILER2
-diff -r db3171ee4074 make/aix/makefiles/core.make
+diff -r e70db17f4112 make/aix/makefiles/core.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/core.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/core.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,33 @@
 +#
 +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -1301,9 +1301,9 @@
 +VM_SUBDIR = server
 +
 +# Note:  macros.hpp defines CORE
-diff -r db3171ee4074 make/aix/makefiles/debug.make
+diff -r e70db17f4112 make/aix/makefiles/debug.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/debug.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/debug.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,41 @@
 +#
 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -1346,9 +1346,9 @@
 +VERSION = debug
 +SYSDEFS += -DASSERT -DDEBUG
 +PICFLAGS = DEFAULT
-diff -r db3171ee4074 make/aix/makefiles/defs.make
+diff -r e70db17f4112 make/aix/makefiles/defs.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/defs.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/defs.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,231 @@
 +#
 +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -1581,9 +1581,9 @@
 +EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
 +
 +
-diff -r db3171ee4074 make/aix/makefiles/dtrace.make
+diff -r e70db17f4112 make/aix/makefiles/dtrace.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/dtrace.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/dtrace.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,27 @@
 +#
 +# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -1612,9 +1612,9 @@
 +# Linux does not build jvm_db
 +LIBJVM_DB =
 +
-diff -r db3171ee4074 make/aix/makefiles/fastdebug.make
+diff -r e70db17f4112 make/aix/makefiles/fastdebug.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/fastdebug.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/fastdebug.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,73 @@
 +#
 +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -1689,9 +1689,9 @@
 +VERSION = optimized
 +SYSDEFS += -DASSERT -DFASTDEBUG
 +PICFLAGS = DEFAULT
-diff -r db3171ee4074 make/aix/makefiles/jsig.make
+diff -r e70db17f4112 make/aix/makefiles/jsig.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/jsig.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/jsig.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,87 @@
 +#
 +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -1780,9 +1780,9 @@
 +	$(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
 +
 +.PHONY: install_jsig
-diff -r db3171ee4074 make/aix/makefiles/jvmti.make
+diff -r e70db17f4112 make/aix/makefiles/jvmti.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/jvmti.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/jvmti.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,118 @@
 +#
 +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -1902,9 +1902,9 @@
 +
 +# #########################################################################
 +
-diff -r db3171ee4074 make/aix/makefiles/mapfile-vers-debug
+diff -r e70db17f4112 make/aix/makefiles/mapfile-vers-debug
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/mapfile-vers-debug	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/mapfile-vers-debug	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,274 @@
 +#
 +# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -2180,9 +2180,9 @@
 +                *;
 +};
 +
-diff -r db3171ee4074 make/aix/makefiles/mapfile-vers-jsig
+diff -r e70db17f4112 make/aix/makefiles/mapfile-vers-jsig
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/mapfile-vers-jsig	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/mapfile-vers-jsig	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,38 @@
 +#
 +# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -2222,9 +2222,9 @@
 +        local:
 +                *;
 +};
-diff -r db3171ee4074 make/aix/makefiles/mapfile-vers-product
+diff -r e70db17f4112 make/aix/makefiles/mapfile-vers-product
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/mapfile-vers-product	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/mapfile-vers-product	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,267 @@
 +#
 +# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -2493,9 +2493,9 @@
 +                *;
 +};
 +
-diff -r db3171ee4074 make/aix/makefiles/ppc64.make
+diff -r e70db17f4112 make/aix/makefiles/ppc64.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/ppc64.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/ppc64.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,110 @@
 +#
 +# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -2607,9 +2607,9 @@
 +#AOUT_FLAGS += -q64
 +#AOUT_FLAGS += -L/lib64
 +#AOUT_FLAGS += -Wl,-melf64ppc
-diff -r db3171ee4074 make/aix/makefiles/product.make
+diff -r e70db17f4112 make/aix/makefiles/product.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/product.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/product.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,58 @@
 +#
 +# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -2669,9 +2669,9 @@
 +# If we can create .debuginfo files, then the VM is stripped in vm.make
 +# and this macro is not used.
 +# LINK_LIB.CXX/POST_HOOK += $(STRIP_$(LINK_INTO))
-diff -r db3171ee4074 make/aix/makefiles/rules.make
+diff -r e70db17f4112 make/aix/makefiles/rules.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/rules.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/rules.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,203 @@
 +#
 +# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -2876,9 +2876,9 @@
 +	@exit 666
 +
 +.PHONY: default
-diff -r db3171ee4074 make/aix/makefiles/sa.make
+diff -r e70db17f4112 make/aix/makefiles/sa.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/sa.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/sa.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,116 @@
 +#
 +# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -2996,9 +2996,9 @@
 +	rm -rf $(SA_CLASSDIR)
 +	rm -rf $(GENERATED)/sa-jdi.jar
 +	rm -rf $(AGENT_FILES_LIST)
-diff -r db3171ee4074 make/aix/makefiles/saproc.make
+diff -r e70db17f4112 make/aix/makefiles/saproc.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/saproc.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/saproc.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,117 @@
 +#
 +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -3117,9 +3117,9 @@
 +	fi
 +
 +.PHONY: install_saproc
-diff -r db3171ee4074 make/aix/makefiles/top.make
+diff -r e70db17f4112 make/aix/makefiles/top.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/top.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/top.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,144 @@
 +#
 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -3265,9 +3265,9 @@
 +.PHONY: default vm_build_preliminaries
 +.PHONY: lists ad_stuff jvmti_stuff sa_stuff the_vm clean realclean
 +.PHONY: checks check_os_version install
-diff -r db3171ee4074 make/aix/makefiles/trace.make
+diff -r e70db17f4112 make/aix/makefiles/trace.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/trace.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/trace.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,120 @@
 +#
 +# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -3337,7 +3337,7 @@
 +
 +TraceGeneratedFiles = $(TraceGeneratedNames:%=$(TraceOutDir)/%)
 +
-+XSLT = $(REMOTE) $(RUN.JAVA) -Djavax.xml.accessExternalDTD=file -classpath $(JvmtiOutDir) jvmtiGen
++XSLT = $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen
 +
 +XML_DEPS =  $(TraceSrcDir)/trace.xml  $(TraceSrcDir)/tracetypes.xml \
 +	$(TraceSrcDir)/trace.dtd $(TraceSrcDir)/xinclude.mod
@@ -3389,9 +3389,9 @@
 +	rm $(TraceGeneratedFiles)
 +
 +
-diff -r db3171ee4074 make/aix/makefiles/vm.make
+diff -r e70db17f4112 make/aix/makefiles/vm.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/vm.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/vm.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,377 @@
 +#
 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -3770,9 +3770,9 @@
 +install: install_jvm install_jsig install_saproc
 +
 +.PHONY: default build install install_jvm
-diff -r db3171ee4074 make/aix/makefiles/xlc.make
+diff -r e70db17f4112 make/aix/makefiles/xlc.make
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/makefiles/xlc.make	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/makefiles/xlc.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,180 @@
 +#
 +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -3954,9 +3954,9 @@
 +else
 +  STRIP = strip
 +endif
-diff -r db3171ee4074 make/aix/platform_ppc64
+diff -r e70db17f4112 make/aix/platform_ppc64
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/aix/platform_ppc64	Mon Jun 24 15:27:06 2013 +0200
++++ b/make/aix/platform_ppc64	Tue Jun 25 12:40:30 2013 +0200
 @@ -0,0 +1,17 @@
 +os_family = aix
 +
@@ -3975,9 +3975,9 @@
 +gnu_dis_arch = ppc64
 +
 +sysdefs = -DAIX -DPPC64
-diff -r db3171ee4074 make/defs.make
---- a/make/defs.make	Mon Jun 24 15:26:03 2013 +0200
-+++ b/make/defs.make	Mon Jun 24 15:27:06 2013 +0200
+diff -r e70db17f4112 make/defs.make
+--- a/make/defs.make	Mon Jun 24 17:49:17 2013 +0200
++++ b/make/defs.make	Tue Jun 25 12:40:30 2013 +0200
 @@ -166,11 +166,15 @@
    HOST := $(shell uname -n)
  endif
--- a/ppc_patches/0015_aix_ppc_files.patch	Mon Jun 24 17:34:32 2013 +0200
+++ b/ppc_patches/0015_aix_ppc_files.patch	Fri Jun 28 16:31:09 2013 +0200
@@ -1,13 +1,13 @@
 # HG changeset patch
-# Parent 9358c0b2e2904456f58a3fdba07f699b23e76a87
+# Parent 4acea56cea4c90d9df275761feed0626ecd2ea7f
 aix: AIX platform files as required to start up the interpreter.
 
 With this change the AIX vm should compile as jvmgcore and run
 purely interpreted.
 
-diff -r 9358c0b2e290 src/os/aix/vm/attachListener_aix.cpp
+diff -r 4acea56cea4c src/os/aix/vm/attachListener_aix.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/attachListener_aix.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/attachListener_aix.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,551 @@
 +/*
 + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -560,9 +560,9 @@
 +  // Cleanup server socket to detach clients.
 +  listener_cleanup();
 +}
-diff -r 9358c0b2e290 src/os/aix/vm/c2_globals_aix.hpp
+diff -r 4acea56cea4c src/os/aix/vm/c2_globals_aix.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/c2_globals_aix.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/c2_globals_aix.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,37 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -601,9 +601,9 @@
 +//
 +
 +#endif // OS_AIX_VM_C2_GLOBALS_AIX_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/decoder_aix.hpp
+diff -r 4acea56cea4c src/os/aix/vm/decoder_aix.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/decoder_aix.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/decoder_aix.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,48 @@
 +/*
 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -653,9 +653,9 @@
 +    return false;
 +  }
 +};
-diff -r 9358c0b2e290 src/os/aix/vm/globals_aix.hpp
+diff -r 4acea56cea4c src/os/aix/vm/globals_aix.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/globals_aix.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/globals_aix.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,63 @@
 +/*
 + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -720,9 +720,9 @@
 +define_pd_global(bool, UseThreadPriorities, true) ;
 +
 +#endif // OS_AIX_VM_GLOBALS_AIX_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/interfaceSupport_aix.hpp
+diff -r 4acea56cea4c src/os/aix/vm/interfaceSupport_aix.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/interfaceSupport_aix.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/interfaceSupport_aix.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -759,9 +759,9 @@
 +}
 +
 +#endif // OS_LINUX_VM_INTERFACESUPPORT_LINUX_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/jsig.c
+diff -r 4acea56cea4c src/os/aix/vm/jsig.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/jsig.c	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/jsig.c	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,233 @@
 +/*
 + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -996,9 +996,9 @@
 +  }
 +  return NULL;
 +}
-diff -r 9358c0b2e290 src/os/aix/vm/jvm_aix.cpp
+diff -r 4acea56cea4c src/os/aix/vm/jvm_aix.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/jvm_aix.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/jvm_aix.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,201 @@
 +/*
 + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -1201,9 +1201,9 @@
 +  }
 +  return false;
 +}
-diff -r 9358c0b2e290 src/os/aix/vm/jvm_aix.h
+diff -r 4acea56cea4c src/os/aix/vm/jvm_aix.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/jvm_aix.h	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/jvm_aix.h	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,123 @@
 +/*
 + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -1328,9 +1328,9 @@
 +#endif /* JVM_MD_H */
 +
 +#endif // OS_AIX_VM_JVM_AIX_H
-diff -r 9358c0b2e290 src/os/aix/vm/libperfstat_aix.cpp
+diff -r 4acea56cea4c src/os/aix/vm/libperfstat_aix.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/libperfstat_aix.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/libperfstat_aix.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,124 @@
 +/*
 + * Copyright 2012, 2013 SAP AG. All rights reserved.
@@ -1456,9 +1456,9 @@
 +  assert(g_fun_perfstat_reset, "");
 +  g_fun_perfstat_reset();
 +}
-diff -r 9358c0b2e290 src/os/aix/vm/libperfstat_aix.hpp
+diff -r 4acea56cea4c src/os/aix/vm/libperfstat_aix.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/libperfstat_aix.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/libperfstat_aix.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,59 @@
 +/*
 + * Copyright 2012, 2013 SAP AG. All rights reserved.
@@ -1519,9 +1519,9 @@
 +};
 +
 +#endif // OS_AIX_VM_LIBPERFSTAT_AIX_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/loadlib_aix.cpp
+diff -r 4acea56cea4c src/os/aix/vm/loadlib_aix.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/loadlib_aix.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/loadlib_aix.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,185 @@
 +/*
 + * Copyright 2012, 2013 SAP AG. All rights reserved.
@@ -1708,9 +1708,9 @@
 +
 +}
 +
-diff -r 9358c0b2e290 src/os/aix/vm/loadlib_aix.hpp
+diff -r 4acea56cea4c src/os/aix/vm/loadlib_aix.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/loadlib_aix.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/loadlib_aix.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,128 @@
 +/*
 + * Copyright 2012, 2013 SAP AG. All rights reserved.
@@ -1840,9 +1840,9 @@
 +
 +
 +#endif // OS_AIX_VM_LOADLIB_AIX_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/mutex_aix.inline.hpp
+diff -r 4acea56cea4c src/os/aix/vm/mutex_aix.inline.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/mutex_aix.inline.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/mutex_aix.inline.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,33 @@
 +/*
 + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -1877,9 +1877,9 @@
 +#include "thread_aix.inline.hpp"
 +
 +#endif // OS_AIX_VM_MUTEX_AIX_INLINE_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/osThread_aix.cpp
+diff -r 4acea56cea4c src/os/aix/vm/osThread_aix.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/osThread_aix.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/osThread_aix.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,58 @@
 +/*
 + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -1939,9 +1939,9 @@
 +void OSThread::pd_destroy() {
 +  delete _startThread_lock;
 +}
-diff -r 9358c0b2e290 src/os/aix/vm/osThread_aix.hpp
+diff -r 4acea56cea4c src/os/aix/vm/osThread_aix.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/osThread_aix.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/osThread_aix.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,144 @@
 +/*
 + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -2087,9 +2087,9 @@
 +  } _last_cpu_times;
 +
 +#endif // OS_AIX_VM_OSTHREAD_AIX_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/os_aix.cpp
+diff -r 4acea56cea4c src/os/aix/vm/os_aix.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/os_aix.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/os_aix.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,5098 @@
 +/*
 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -7189,9 +7189,9 @@
 +
 +  return strlen(buffer);
 +}
-diff -r 9358c0b2e290 src/os/aix/vm/os_aix.hpp
+diff -r 4acea56cea4c src/os/aix/vm/os_aix.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/os_aix.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/os_aix.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,381 @@
 +/*
 + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -7574,9 +7574,9 @@
 +};
 +
 +#endif // OS_AIX_VM_OS_AIX_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/os_aix.inline.hpp
+diff -r 4acea56cea4c src/os/aix/vm/os_aix.inline.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/os_aix.inline.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/os_aix.inline.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,286 @@
 +/*
 + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -7864,9 +7864,9 @@
 +  return ::setsockopt(fd, level, optname, optval, optlen);
 +}
 +#endif // OS_AIX_VM_OS_AIX_INLINE_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/os_share_aix.hpp
+diff -r 4acea56cea4c src/os/aix/vm/os_share_aix.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/os_share_aix.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/os_share_aix.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,37 @@
 +/*
 + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -7905,9 +7905,9 @@
 +#define PROCFILE_LENGTH 128
 +
 +#endif // OS_AIX_VM_OS_SHARE_AIX_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/perfMemory_aix.cpp
+diff -r 4acea56cea4c src/os/aix/vm/perfMemory_aix.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/perfMemory_aix.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/perfMemory_aix.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,1026 @@
 +/*
 + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -8935,9 +8935,9 @@
 +char* PerfMemory::backing_store_filename() {
 +  return backing_store_file_name;
 +}
-diff -r 9358c0b2e290 src/os/aix/vm/porting_aix.cpp
+diff -r 4acea56cea4c src/os/aix/vm/porting_aix.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/porting_aix.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/porting_aix.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,367 @@
 +/*
 + * Copyright 2012, 2013 SAP AG. All rights reserved.
@@ -9306,9 +9306,9 @@
 +  return rc; // error: return 0 [sic]
 +
 +}
-diff -r 9358c0b2e290 src/os/aix/vm/porting_aix.hpp
+diff -r 4acea56cea4c src/os/aix/vm/porting_aix.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/porting_aix.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/porting_aix.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,81 @@
 +/*
 + * Copyright 2012, 2013 SAP AG. All rights reserved.
@@ -9391,9 +9391,9 @@
 +      const struct tbtable** p_tb,     // [out] optional: ptr to traceback table to get further information
 +      char* p_errmsg, size_t errmsglen // [out] optional: user provided buffer for error messages
 +    );
-diff -r 9358c0b2e290 src/os/aix/vm/threadCritical_aix.cpp
+diff -r 4acea56cea4c src/os/aix/vm/threadCritical_aix.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/threadCritical_aix.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/threadCritical_aix.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,68 @@
 +/*
 + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -9463,9 +9463,9 @@
 +    guarantee(ret == 0, "fatal error with pthread_mutex_unlock()");
 +  }
 +}
-diff -r 9358c0b2e290 src/os/aix/vm/thread_aix.inline.hpp
+diff -r 4acea56cea4c src/os/aix/vm/thread_aix.inline.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/thread_aix.inline.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/thread_aix.inline.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,42 @@
 +/*
 + * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -9509,9 +9509,9 @@
 +inline void ThreadLocalStorage::pd_invalidate_all() {} // nothing to do
 +
 +#endif // OS_AIX_VM_THREAD_AIX_INLINE_HPP
-diff -r 9358c0b2e290 src/os/aix/vm/vmError_aix.cpp
+diff -r 4acea56cea4c src/os/aix/vm/vmError_aix.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os/aix/vm/vmError_aix.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os/aix/vm/vmError_aix.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,122 @@
 +/*
 + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -9635,9 +9635,9 @@
 +
 +  sigthreadmask(SIG_UNBLOCK, &newset, NULL);
 +}
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,401 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10040,9 +10040,9 @@
 +#undef strasm_ppc_nobarrier_clobber_memory
 +
 +#endif // OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_INLINE_HPP
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,54 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10098,9 +10098,9 @@
 +define_pd_global(bool, UseVectoredExceptions,    false);
 +
 +#endif // OS_CPU_AIX_OJDKPPC_VM_GLOBALS_AIX_PPC_HPP
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,147 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10249,10 +10249,10 @@
 +#undef inlasm_ppc_fence
 +
 +#endif // OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_INLINE_HPP
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp	Mon Jun 24 14:42:07 2013 +0200
-@@ -0,0 +1,568 @@
++++ b/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp	Wed Jun 26 15:35:51 2013 +0200
+@@ -0,0 +1,560 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 + * Copyright 2012, 2013 SAP AG. All rights reserved.
@@ -10342,15 +10342,7 @@
 +// OS specific thread initialization
 +//
 +// Calculate and store the limits of the memory stack.
-+void os::initialize_thread(Thread *thread) {
-+  assert(thread != NULL, "Sanity check");
-+  if (!thread->is_Java_thread()) return;
-+
-+  // Initialize the memory stack limit.
-+  address mem_stk_limit = ((JavaThread *)thread)->stack_yellow_zone_base() +
-+    (os::vm_page_size() * StackShadowPages);
-+  thread->set_memory_stack_limit(mem_stk_limit);
-+}
++void os::initialize_thread(Thread *thread) { }
 +
 +// Frame information (pc, sp, fp) retrieved via ucontext
 +// always looks like a C-frame according to the frame
@@ -10821,9 +10813,9 @@
 +  assert(((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0, "incorrect stack alignment");
 +}
 +#endif
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10860,9 +10852,9 @@
 +  static bool register_code_area(char *low, char *high) { return true; }
 +
 +#endif // OS_CPU_AIX_OJDKPPC_VM_OS_AIX_PPC_HPP
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,58 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10922,9 +10914,9 @@
 +}
 +
 +#endif // OS_CPU_AIX_PPC_64_VM_PREFETCH_AIX_PPC_64_INLINE_HPP
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.cpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,40 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -10966,9 +10958,9 @@
 +void ThreadLocalStorage::pd_set_thread(Thread* thread) {
 +  os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
 +}
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.hpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,36 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -11006,9 +10998,9 @@
 +  }
 +
 +#endif // OS_CPU_AIX_OJDKPPC_VM_THREADLS_AIX_PPC_HPP
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,36 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -11046,9 +11038,9 @@
 +}
 +
 +void JavaThread::cache_global_variables() { }
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,79 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -11129,9 +11121,9 @@
 +  intptr_t* last_interpreter_fp() { return _last_interpreter_fp; }
 +
 +#endif // OS_CPU_AIX_OJDKPPC_VM_THREAD_AIX_PPC_HPP
-diff -r 9358c0b2e290 src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp
+diff -r 4acea56cea4c src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,55 @@
 +/*
 + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -11188,9 +11180,9 @@
 +#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 +
 +#endif // OS_CPU_AIX_OJDKPPC_VM_VMSTRUCTS_AIX_PPC_HPP
-diff -r 9358c0b2e290 src/share/vm/utilities/globalDefinitions_xlc.hpp
+diff -r 4acea56cea4c src/share/vm/utilities/globalDefinitions_xlc.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/share/vm/utilities/globalDefinitions_xlc.hpp	Mon Jun 24 14:42:07 2013 +0200
++++ b/src/share/vm/utilities/globalDefinitions_xlc.hpp	Wed Jun 26 15:35:51 2013 +0200
 @@ -0,0 +1,202 @@
 +/*
 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
--- a/ppc_patches/0113_opto-Extend_Load_and_Store_nodes_to_know_about_memory_ordering.patch	Mon Jun 24 17:34:32 2013 +0200
+++ b/ppc_patches/0113_opto-Extend_Load_and_Store_nodes_to_know_about_memory_ordering.patch	Fri Jun 28 16:31:09 2013 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 8f5be7b8a71780bf3d614670b8231c48fb774100
+# Parent 28c433879bb8231f5f9d311dede4ad3ae4e773b5
 opto: Extend Load and Store nodes to know about memory ordering.
 
 On some platforms, Load and Store nodes can be reordered violating
@@ -21,9 +21,9 @@
 Actually, we would like to remove the default arguments to these functions,
 as they tend to cause wrong usage (too many args).
 
-diff -r 8f5be7b8a717 src/share/vm/opto/generateOptoStub.cpp
---- a/src/share/vm/opto/generateOptoStub.cpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/generateOptoStub.cpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/generateOptoStub.cpp
+--- a/src/share/vm/opto/generateOptoStub.cpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/generateOptoStub.cpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -113,7 +113,6 @@
    // The order of stores into TLS is critical!  Setting _thread_in_native MUST
    // be last, because a GC is allowed at any time after setting it and the GC
@@ -42,9 +42,9 @@
  #endif
  
    // For is-fancy-jump, the C-return value is also the branch target
-diff -r 8f5be7b8a717 src/share/vm/opto/graphKit.cpp
---- a/src/share/vm/opto/graphKit.cpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/graphKit.cpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/graphKit.cpp
+--- a/src/share/vm/opto/graphKit.cpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/graphKit.cpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -596,7 +596,8 @@
  
        Node *adr = basic_plus_adr(ex_node, ex_node, offset);
@@ -155,9 +155,9 @@
  
    } __ else_(); {
      __ make_leaf_call(tf, CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), "g1_wb_post", card_adr, __ thread());
-diff -r 8f5be7b8a717 src/share/vm/opto/graphKit.hpp
---- a/src/share/vm/opto/graphKit.hpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/graphKit.hpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/graphKit.hpp
+--- a/src/share/vm/opto/graphKit.hpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/graphKit.hpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -485,37 +485,51 @@
  
    // Create a LoadNode, reading from the parser's memory state.
@@ -262,9 +262,9 @@
  
    // For the few case where the barriers need special help
    void pre_barrier(bool do_load, Node* ctl,
-diff -r 8f5be7b8a717 src/share/vm/opto/idealKit.cpp
---- a/src/share/vm/opto/idealKit.cpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/idealKit.cpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/idealKit.cpp
+--- a/src/share/vm/opto/idealKit.cpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/idealKit.cpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -368,16 +368,16 @@
  
  Node* IdealKit::store(Node* ctl, Node* adr, Node *val, BasicType bt,
@@ -286,9 +286,9 @@
    }
    st = transform(st);
    set_memory(st, adr_idx);
-diff -r 8f5be7b8a717 src/share/vm/opto/idealKit.hpp
---- a/src/share/vm/opto/idealKit.hpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/idealKit.hpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/idealKit.hpp
+--- a/src/share/vm/opto/idealKit.hpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/idealKit.hpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -226,7 +226,8 @@
                Node* val,
                BasicType bt,
@@ -299,10 +299,10 @@
  
    // Store a card mark ordered after store_oop
    Node* storeCM(Node* ctl,
-diff -r 8f5be7b8a717 src/share/vm/opto/library_call.cpp
---- a/src/share/vm/opto/library_call.cpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/library_call.cpp	Fri Jun 07 12:38:38 2013 +0200
-@@ -2470,13 +2470,14 @@
+diff -r 28c433879bb8 src/share/vm/opto/library_call.cpp
+--- a/src/share/vm/opto/library_call.cpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/library_call.cpp	Fri Jun 28 15:11:02 2013 +0200
+@@ -2471,13 +2471,14 @@
        break;
      }
  
@@ -319,7 +319,7 @@
        } else {
          // We can't tell at compile time if we are storing in the Java heap or outside
          // of it. So we need to emit code to conditionally do the proper type of
-@@ -2488,11 +2489,11 @@
+@@ -2489,11 +2490,11 @@
          __ if_then(heap_base_oop, BoolTest::ne, null(), PROB_UNLIKELY(0.999)); {
            // Sync IdealKit and graphKit.
            sync_kit(ideal);
@@ -333,7 +333,7 @@
          } __ end_if();
          // Final sync IdealKit and GraphKit.
          final_sync(ideal);
-@@ -2779,7 +2780,13 @@
+@@ -2780,7 +2781,13 @@
  
    // Add the trailing membar surrounding the access
    insert_mem_bar(Op_MemBarCPUOrder);
@@ -347,7 +347,7 @@
  
  #ifdef _LP64
    if (type == T_OBJECT && adr->bottom_type()->is_ptr_to_narrowoop() && kind == LS_xchg) {
-@@ -2847,9 +2854,9 @@
+@@ -2848,9 +2855,9 @@
    const bool require_atomic_access = true;
    Node* store;
    if (type == T_OBJECT) // reference stores need a store barrier.
@@ -359,7 +359,7 @@
    }
    insert_mem_bar(Op_MemBarCPUOrder);
    return true;
-@@ -2858,13 +2865,29 @@
+@@ -2859,13 +2866,29 @@
  bool LibraryCallKit::inline_unsafe_fence(vmIntrinsics::ID id) {
    // Regardless of form, don't allow previous ld/st to move down,
    // then issue acquire, release, or volatile mem_bar.
@@ -389,7 +389,7 @@
        return true;
      case vmIntrinsics::_fullFence:
        insert_mem_bar(Op_MemBarVolatile);
-@@ -5128,7 +5151,7 @@
+@@ -5129,7 +5152,7 @@
          // Store a zero to the immediately preceding jint:
          Node* x1 = _gvn.transform( new(C) AddXNode(start, MakeConX(-bump_bit)) );
          Node* p1 = basic_plus_adr(dest, x1);
@@ -398,9 +398,9 @@
          mem = _gvn.transform(mem);
        }
      }
-diff -r 8f5be7b8a717 src/share/vm/opto/macro.cpp
---- a/src/share/vm/opto/macro.cpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/macro.cpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/macro.cpp
+--- a/src/share/vm/opto/macro.cpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/macro.cpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -1086,7 +1086,7 @@
  
  Node* PhaseMacroExpand::make_store(Node* ctl, Node* mem, Node* base, int offset, Node* value, BasicType bt) {
@@ -410,9 +410,9 @@
    transform_later(mem);
    return mem;
  }
-diff -r 8f5be7b8a717 src/share/vm/opto/memnode.cpp
---- a/src/share/vm/opto/memnode.cpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/memnode.cpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/memnode.cpp
+--- a/src/share/vm/opto/memnode.cpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/memnode.cpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -907,7 +907,7 @@
  
  //----------------------------LoadNode::make-----------------------------------
@@ -440,7 +440,7 @@
 +  case T_INT:     return new (C) LoadINode (ctl, mem, adr, adr_type, rt->is_int(),  sem);
 +  case T_CHAR:    return new (C) LoadUSNode(ctl, mem, adr, adr_type, rt->is_int(),  sem);
 +  case T_SHORT:   return new (C) LoadSNode (ctl, mem, adr, adr_type, rt->is_int(),  sem);
-+  case T_LONG:    return new (C) LoadLNode (ctl, mem, adr, adr_type, rt->is_long(), sem);
++  case T_LONG:    return new (C) LoadLNode (ctl, mem, adr, adr_type, rt->is_long(), false, sem);
 +  case T_FLOAT:   return new (C) LoadFNode (ctl, mem, adr, adr_type, rt,            sem);
 +  case T_DOUBLE:  return new (C) LoadDNode (ctl, mem, adr, adr_type, rt,            sem);
 +  case T_ADDRESS: return new (C) LoadPNode (ctl, mem, adr, adr_type, rt->is_ptr(),  sem);
@@ -544,7 +544,7 @@
      mem = phase->transform(mem);
      done_offset += BytesPerInt;
    }
-@@ -3684,14 +3685,14 @@
+@@ -3694,14 +3695,14 @@
        ++new_long;
        off[nst] = offset;
        st[nst++] = StoreNode::make(*phase, ctl, zmem, adr, atp,
@@ -561,7 +561,7 @@
        }
        if (con1 != 0) {
          ++new_int;
-@@ -3699,7 +3700,7 @@
+@@ -3709,7 +3710,7 @@
          adr = make_raw_address(offset, phase);
          off[nst]  = offset;
          st[nst++] = StoreNode::make(*phase, ctl, zmem, adr, atp,
@@ -570,9 +570,9 @@
        }
      }
  
-diff -r 8f5be7b8a717 src/share/vm/opto/memnode.hpp
---- a/src/share/vm/opto/memnode.hpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/memnode.hpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/memnode.hpp
+--- a/src/share/vm/opto/memnode.hpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/memnode.hpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -134,20 +134,35 @@
  //------------------------------LoadNode---------------------------------------
  // Load value; requires Memory and Address
@@ -969,9 +969,9 @@
    virtual int Opcode() const;
    virtual int store_Opcode() const { return Op_StorePConditional; }
    virtual bool depends_only_on_test() const { return true; }
-diff -r 8f5be7b8a717 src/share/vm/opto/parse2.cpp
---- a/src/share/vm/opto/parse2.cpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/parse2.cpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/parse2.cpp
+--- a/src/share/vm/opto/parse2.cpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/parse2.cpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -62,7 +62,7 @@
    Node* val = pop();
    dec_sp(2);                  // Pop array and index
@@ -990,9 +990,9 @@
      break;
    }
    case Bytecodes::_lastore: {
-diff -r 8f5be7b8a717 src/share/vm/opto/parse3.cpp
---- a/src/share/vm/opto/parse3.cpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/parse3.cpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/parse3.cpp
+--- a/src/share/vm/opto/parse3.cpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/parse3.cpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -217,7 +217,9 @@
      type = Type::get_const_basic_type(bt);
    }
@@ -1033,9 +1033,9 @@
    }
  
    // If reference is volatile, prevent following volatiles ops from
-diff -r 8f5be7b8a717 src/share/vm/opto/vectornode.hpp
---- a/src/share/vm/opto/vectornode.hpp	Fri Jun 07 12:36:49 2013 +0200
-+++ b/src/share/vm/opto/vectornode.hpp	Fri Jun 07 12:38:38 2013 +0200
+diff -r 28c433879bb8 src/share/vm/opto/vectornode.hpp
+--- a/src/share/vm/opto/vectornode.hpp	Fri Jun 28 14:17:30 2013 +0200
++++ b/src/share/vm/opto/vectornode.hpp	Fri Jun 28 15:11:02 2013 +0200
 @@ -380,7 +380,7 @@
  class StoreVectorNode : public StoreNode {
   public:
--- a/ppc_patches/0201_C_interpreter-implement_bytecode_profiling.patch	Mon Jun 24 17:34:32 2013 +0200
+++ b/ppc_patches/0201_C_interpreter-implement_bytecode_profiling.patch	Fri Jun 28 16:31:09 2013 +0200
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent 84fd980e69ee155f80ae36002f29703ea7d16205
+# Parent 738d32552a9693f1f440426756e7b4906b3b7552
 C-interpreter: implement bytecode profiling.
 
-diff -r 84fd980e69ee src/share/vm/interpreter/bytecodeInterpreter.cpp
---- a/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Jun 07 12:50:21 2013 +0200
-+++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Jun 07 12:51:22 2013 +0200
+diff -r 738d32552a96 src/share/vm/interpreter/bytecodeInterpreter.cpp
+--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Jun 28 14:17:32 2013 +0200
++++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Jun 28 14:34:21 2013 +0200
 @@ -28,6 +28,7 @@
  #include "interpreter/bytecodeHistogram.hpp"
  #include "interpreter/bytecodeInterpreter.hpp"
@@ -37,11 +37,11 @@
      goto handle_exception;
  
  #ifdef PRODUCT
-@@ -346,7 +348,22 @@
+@@ -341,7 +343,23 @@
        if (UseLoopCounter) {                                                                         \
          bool do_OSR = UseOnStackReplacement;                                                        \
-         INCR_BACKEDGE_COUNT(mcs);                                                                   \
--        if (do_OSR) do_OSR = BACKEDGE_COUNT(mcs)->reached_InvocationLimit();                        \
+         mcs->backedge_counter()->increment();                                                       \
+-        if (do_OSR) do_OSR = mcs->backedge_counter()->reached_InvocationLimit();                    \
 +        if (ProfileInterpreter) {                                                                   \
 +          BI_PROFILE_GET_OR_CREATE_METHOD_DATA(handle_exception);                                   \
 +          /* Check for overflow against MDO count. */                                               \
@@ -56,12 +56,13 @@
 +            && (!(mdo_last_branch_taken_count & 1023));                                             \
 +        } else {                                                                                    \
 +          /* check for overflow of backedge counter */                                              \
-+          do_OSR = do_OSR && INVOCATION_COUNT(mcs)->reached_InvocationLimit(BACKEDGE_COUNT(mcs));   \
++          do_OSR = do_OSR                                                                           \
++            && mcs->invocation_counter()->reached_InvocationLimit(mcs->backedge_counter());         \
 +        }                                                                                           \
          if (do_OSR) {                                                                               \
            nmethod*  osr_nmethod;                                                                    \
            OSR_REQUEST(osr_nmethod, branch_pc);                                                      \
-@@ -359,7 +376,6 @@
+@@ -354,7 +372,6 @@
            }                                                                                         \
          }                                                                                           \
        }  /* UseCompiler ... */                                                                      \
@@ -69,7 +70,7 @@
        SAFEPOINT;                                                                                    \
      }
  
-@@ -392,16 +408,20 @@
+@@ -387,16 +404,20 @@
  #undef CACHE_FRAME
  #define CACHE_FRAME()
  
@@ -94,7 +95,7 @@
      VERIFY_OOP(obj_)
  
  #define VMdoubleConstZero() 0.0
-@@ -636,6 +656,13 @@
+@@ -630,6 +651,13 @@
           topOfStack < istate->stack_base(),
           "Stack top out of range");
  
@@ -108,11 +109,11 @@
    switch (istate->msg()) {
      case initialize: {
        if (initialized++) ShouldNotReachHere(); // Only one initialize call
-@@ -657,15 +684,12 @@
+@@ -651,15 +679,12 @@
            METHOD->increment_interpreter_invocation_count(THREAD);
          }
-         INCR_INVOCATION_COUNT(mcs);
--        if (INVOCATION_COUNT(mcs)->reached_InvocationLimit()) {
+         mcs->invocation_counter()->increment();
+-        if (mcs->invocation_counter()->reached_InvocationLimit()) {
 -            CALL_VM((void)InterpreterRuntime::frequency_counter_overflow(THREAD, NULL), handle_exception);
 -
 -            // We no longer retry on a counter overflow
@@ -120,7 +121,7 @@
 -            // istate->set_msg(retry_method);
 -            // THREAD->clr_do_not_unlock();
 -            // return;
-+        if (INVOCATION_COUNT(mcs)->reached_InvocationLimit(BACKEDGE_COUNT(mcs))) {
++        if (mcs->invocation_counter()->reached_InvocationLimit(mcs->backedge_counter())) {
 +          CALL_VM((void)InterpreterRuntime::frequency_counter_overflow(THREAD, NULL), handle_exception);
 +          // We no longer retry on a counter overflow
          }
@@ -129,7 +130,15 @@
          SAFEPOINT;
        }
  
-@@ -806,9 +830,18 @@
+@@ -681,7 +706,6 @@
+       }
+ #endif // HACK
+ 
+-
+       // lock method if synchronized
+       if (METHOD->is_synchronized()) {
+         // oop rcvr = locals[0].j.r;
+@@ -796,9 +820,18 @@
      case popping_frame: {
        // returned from a java call to pop the frame, restart the call
        // clear the message so we don't confuse ourselves later
@@ -149,7 +158,7 @@
        THREAD->clr_pop_frame_in_process();
        goto run;
      }
-@@ -842,6 +875,11 @@
+@@ -832,6 +865,11 @@
        if (THREAD->has_pending_exception()) goto handle_exception;
        // Update the pc by the saved amount of the invoke bytecode size
        UPDATE_PC(istate->bcp_advance());
@@ -161,7 +170,7 @@
        goto run;
      }
  
-@@ -849,6 +887,11 @@
+@@ -839,6 +877,11 @@
        // Returned from an opcode that will reexecute. Deopt was
        // a result of a PopFrame request.
        //
@@ -173,7 +182,7 @@
        goto run;
      }
  
-@@ -871,6 +914,11 @@
+@@ -861,6 +904,11 @@
        }
        UPDATE_PC(Bytecodes::length_at(METHOD, pc));
        if (THREAD->has_pending_exception()) goto handle_exception;
@@ -185,7 +194,7 @@
        goto run;
      }
      case got_monitors: {
-@@ -1124,6 +1172,11 @@
+@@ -1111,6 +1159,11 @@
            uint16_t reg = Bytes::get_Java_u2(pc + 2);
  
            opcode = pc[1];
@@ -197,7 +206,7 @@
            switch(opcode) {
                case Bytecodes::_aload:
                    VERIFY_OOP(LOCALS_OBJECT(reg));
-@@ -1167,10 +1220,13 @@
+@@ -1154,10 +1207,13 @@
                    UPDATE_PC_AND_CONTINUE(6);
                }
                case Bytecodes::_ret:
@@ -212,7 +221,7 @@
            }
        }
  
-@@ -1251,7 +1307,7 @@
+@@ -1238,7 +1294,7 @@
        CASE(_i##opcname):                                                \
            if (test && (STACK_INT(-1) == 0)) {                           \
                VM_JAVA_ERROR(vmSymbols::java_lang_ArithmeticException(), \
@@ -221,7 +230,7 @@
            }                                                             \
            SET_STACK_INT(VMint##opname(STACK_INT(-2),                    \
                                        STACK_INT(-1)),                   \
-@@ -1263,7 +1319,7 @@
+@@ -1250,7 +1306,7 @@
              jlong l1 = STACK_LONG(-1);                                  \
              if (VMlongEqz(l1)) {                                        \
                VM_JAVA_ERROR(vmSymbols::java_lang_ArithmeticException(), \
@@ -230,7 +239,7 @@
              }                                                           \
            }                                                             \
            /* First long at (-1,-2) next long at (-3,-4) */              \
-@@ -1476,17 +1532,23 @@
+@@ -1463,17 +1519,23 @@
  
  #define COMPARISON_OP(name, comparison)                                      \
        CASE(_if_icmp##name): {                                                \
@@ -256,7 +265,7 @@
            UPDATE_PC_AND_TOS(skip, -1);                                       \
            DO_BACKEDGE_CHECKS(skip, branch_pc);                               \
            CONTINUE;                                                          \
-@@ -1495,9 +1557,12 @@
+@@ -1482,9 +1544,12 @@
  #define COMPARISON_OP2(name, comparison)                                     \
        COMPARISON_OP(name, comparison)                                        \
        CASE(_if_acmp##name): {                                                \
@@ -270,7 +279,7 @@
            UPDATE_PC_AND_TOS(skip, -2);                                       \
            DO_BACKEDGE_CHECKS(skip, branch_pc);                               \
            CONTINUE;                                                          \
-@@ -1505,9 +1570,12 @@
+@@ -1492,9 +1557,12 @@
  
  #define NULL_COMPARISON_NOT_OP(name)                                         \
        CASE(_if##name): {                                                     \
@@ -284,7 +293,7 @@
            UPDATE_PC_AND_TOS(skip, -1);                                       \
            DO_BACKEDGE_CHECKS(skip, branch_pc);                               \
            CONTINUE;                                                          \
-@@ -1515,9 +1583,12 @@
+@@ -1502,9 +1570,12 @@
  
  #define NULL_COMPARISON_OP(name)                                             \
        CASE(_if##name): {                                                     \
@@ -298,7 +307,7 @@
            UPDATE_PC_AND_TOS(skip, -1);                                       \
            DO_BACKEDGE_CHECKS(skip, branch_pc);                               \
            CONTINUE;                                                          \
-@@ -1540,9 +1611,14 @@
+@@ -1527,9 +1598,14 @@
            int32_t  high = Bytes::get_Java_u4((address)&lpc[2]);
            int32_t  skip;
            key -= low;
@@ -316,7 +325,7 @@
            // Does this really need a full backedge check (osr?)
            address branch_pc = pc;
            UPDATE_PC_AND_TOS(skip, -1);
-@@ -1556,14 +1632,21 @@
+@@ -1543,14 +1619,21 @@
            jint* lpc  = (jint*)VMalignWordUp(pc+1);
            int32_t  key  = STACK_INT(-1);
            int32_t  skip = Bytes::get_Java_u4((address) lpc); /* default amount */
@@ -343,7 +352,7 @@
            address branch_pc = pc;
            UPDATE_PC_AND_TOS(skip, -1);
            DO_BACKEDGE_CHECKS(skip, branch_pc);
-@@ -1648,7 +1731,7 @@
+@@ -1635,7 +1718,7 @@
        if ((uint32_t)index >= (uint32_t)arrObj->length()) {                     \
            sprintf(message, "%d", index);                                       \
            VM_JAVA_ERROR(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), \
@@ -352,7 +361,7 @@
        }
  
        /* 32-bit loads. These handle conversion from < 32-bit types */
-@@ -1729,15 +1812,22 @@
+@@ -1716,15 +1799,22 @@
            // arrObj, index are set
            if (rhsObject != NULL) {
              /* Check assignability of rhsObject into arrObj */
@@ -379,7 +388,7 @@
            }
            // G1GC port. Use accessor instead of storing manually.
            // Takes care of write barriers internally and replaces the code above.
-@@ -2139,10 +2229,14 @@
+@@ -2124,10 +2214,14 @@
              if (UseTLAB) {
                result = (oop) THREAD->tlab().allocate(obj_size);
              }
@@ -395,7 +404,7 @@
                HeapWord* compare_to = *Universe::heap()->top_addr();
                HeapWord* new_top = compare_to + obj_size;
                if (new_top <= *Universe::heap()->end_addr()) {
-@@ -2152,6 +2246,7 @@
+@@ -2137,6 +2231,7 @@
                  result = (oop) compare_to;
                }
              }
@@ -403,7 +412,7 @@
              if (result != NULL) {
                // Initialize object (if nonzero size and need) and then the header
                if (need_zero ) {
-@@ -2207,42 +2302,40 @@
+@@ -2192,42 +2287,40 @@
            if (STACK_OBJECT(-1) != NULL) {
              VERIFY_OOP(STACK_OBJECT(-1));
              u2 index = Bytes::get_Java_u2(pc+1);
@@ -458,7 +467,7 @@
            } else {
              VERIFY_OOP(STACK_OBJECT(-1));
              u2 index = Bytes::get_Java_u2(pc+1);
-@@ -2252,16 +2345,20 @@
+@@ -2237,16 +2330,20 @@
                CALL_VM(InterpreterRuntime::quicken_io_cc(THREAD), handle_exception);
              }
              Klass* klassOf = (Klass*) METHOD->constants()->slot_at(index).get_klass();
@@ -481,7 +490,7 @@
            }
            UPDATE_PC_AND_CONTINUE(3);
  
-@@ -2404,6 +2501,9 @@
+@@ -2389,6 +2486,9 @@
          istate->set_callee_entry_point(method->from_interpreted_entry());
          istate->set_bcp_advance(5);
  
@@ -491,7 +500,7 @@
          UPDATE_PC_AND_RETURN(0); // I'll be back...
        }
  
-@@ -2437,6 +2537,9 @@
+@@ -2421,6 +2521,9 @@
          istate->set_callee_entry_point(method->from_interpreted_entry());
          istate->set_bcp_advance(3);
  
@@ -501,7 +510,7 @@
          UPDATE_PC_AND_RETURN(0); // I'll be back...
        }
  
-@@ -2464,14 +2567,18 @@
+@@ -2448,14 +2551,18 @@
            CHECK_NULL(STACK_OBJECT(-(cache->parameter_size())));
            if (cache->is_vfinal()) {
              callee = cache->f2_as_vfinal_method();
@@ -523,7 +532,7 @@
            }
            istate->set_callee(callee);
            istate->set_callee_entry_point(callee->from_interpreted_entry());
-@@ -2502,15 +2609,18 @@
+@@ -2486,15 +2593,18 @@
          // interface.  The link resolver checks this but only for the first
          // time this interface is called.
          if (i == int2->itable_length()) {
@@ -544,7 +553,7 @@
          istate->set_callee(callee);
          istate->set_callee_entry_point(callee->from_interpreted_entry());
  #ifdef VM_JVMTI
-@@ -2542,8 +2652,11 @@
+@@ -2526,8 +2636,11 @@
            Method* callee;
            if ((Bytecodes::Code)opcode == Bytecodes::_invokevirtual) {
              CHECK_NULL(STACK_OBJECT(-(cache->parameter_size())));
@@ -558,7 +567,7 @@
                // get receiver
                int parms = cache->parameter_size();
                // this works but needs a resourcemark and seems to create a vtable on every call:
-@@ -2552,8 +2665,9 @@
+@@ -2536,8 +2649,9 @@
                // this fails with an assert
                // InstanceKlass* rcvrKlass = InstanceKlass::cast(STACK_OBJECT(-parms)->klass());
                // but this works
@@ -570,7 +579,7 @@
                /*
                  Executing this code in java.lang.String:
                      public String(char value[]) {
-@@ -2571,12 +2685,17 @@
+@@ -2555,12 +2669,17 @@
  
                */
                callee = (Method*) rcvrKlass->start_of_vtable()[ cache->f2_as_index()];
@@ -588,7 +597,7 @@
            }
  
            istate->set_callee(callee);
-@@ -2628,6 +2747,8 @@
+@@ -2612,6 +2731,8 @@
        CASE(_goto):
        {
            int16_t offset = (int16_t)Bytes::get_Java_u2(pc + 1);
@@ -597,7 +606,7 @@
            address branch_pc = pc;
            UPDATE_PC(offset);
            DO_BACKEDGE_CHECKS(offset, branch_pc);
-@@ -2644,6 +2765,8 @@
+@@ -2628,6 +2749,8 @@
        CASE(_goto_w):
        {
            int32_t offset = Bytes::get_Java_u4(pc + 1);
@@ -606,7 +615,7 @@
            address branch_pc = pc;
            UPDATE_PC(offset);
            DO_BACKEDGE_CHECKS(offset, branch_pc);
-@@ -2653,6 +2776,9 @@
+@@ -2637,6 +2760,9 @@
        /* return from a jsr or jsr_w */
  
        CASE(_ret): {
@@ -616,7 +625,7 @@
            pc = istate->method()->code_base() + (intptr_t)(LOCALS_ADDR(pc[1]));
            UPDATE_PC_AND_CONTINUE(0);
        }
-@@ -2734,6 +2860,9 @@
+@@ -2718,6 +2844,9 @@
        }
        // for AbortVMOnException flag
        NOT_PRODUCT(Exceptions::debug_check_abort(except_oop));
@@ -626,7 +635,7 @@
        goto run;
      }
      if (TraceExceptions) {
-@@ -2936,7 +3065,7 @@
+@@ -2920,7 +3049,7 @@
            oop rcvr = base->obj();
            if (rcvr == NULL) {
              if (!suppress_error) {
@@ -635,7 +644,7 @@
                illegal_state_oop = THREAD->pending_exception();
                THREAD->clear_pending_exception();
              }
-@@ -3014,7 +3143,7 @@
+@@ -3008,7 +3137,7 @@
      // A pending exception that was pending prior to a possible popping frame
      // overrides the popping frame.
      //
@@ -644,10 +653,10 @@
      if (illegal_state_oop() != NULL || original_exception() != NULL) {
        // inform the frame manager we have no result
        istate->set_msg(throwing_exception);
-diff -r 84fd980e69ee src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp
+diff -r 738d32552a96 src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp	Fri Jun 07 12:51:22 2013 +0200
-@@ -0,0 +1,307 @@
++++ b/src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp	Fri Jun 28 14:34:21 2013 +0200
+@@ -0,0 +1,308 @@
 +/*
 + * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
 + * Copyright 2012 SAP AG. All rights reserved.
@@ -785,7 +794,8 @@
 +      GET_METHOD_COUNTERS(mcs);                                                \
 +      /* The profiling method data doesn't exist for this method, */           \
 +      /* create it if the counters have overflowed. */                         \
-+      if (INVOCATION_COUNT(mcs)->reached_ProfileLimit(BACKEDGE_COUNT(mcs))) {  \
++      if (mcs->invocation_counter()                                            \
++                         ->reached_ProfileLimit(mcs->backedge_counter())) {    \
 +        /* Must use CALL_VM, because an async exception may be pending. */     \
 +        CALL_VM((InterpreterRuntime::profile_method(THREAD)),                  \
 +                exception_handler);                                            \
@@ -955,9 +965,9 @@
 +#endif // CC_INTERP
 +
 +#endif // SHARE_VM_INTERPRETER_BYTECODECINTERPRETERPROFILING_HPP
-diff -r 84fd980e69ee src/share/vm/interpreter/interpreterRuntime.cpp
---- a/src/share/vm/interpreter/interpreterRuntime.cpp	Fri Jun 07 12:50:21 2013 +0200
-+++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Fri Jun 07 12:51:22 2013 +0200
+diff -r 738d32552a96 src/share/vm/interpreter/interpreterRuntime.cpp
+--- a/src/share/vm/interpreter/interpreterRuntime.cpp	Fri Jun 28 14:17:32 2013 +0200
++++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Fri Jun 28 14:34:21 2013 +0200
 @@ -267,6 +267,49 @@
    }
  }
@@ -1008,9 +1018,9 @@
  static Handle get_preinitialized_exception(Klass* k, TRAPS) {
    // get klass
    InstanceKlass* klass = InstanceKlass::cast(k);
-diff -r 84fd980e69ee src/share/vm/interpreter/interpreterRuntime.hpp
---- a/src/share/vm/interpreter/interpreterRuntime.hpp	Fri Jun 07 12:50:21 2013 +0200
-+++ b/src/share/vm/interpreter/interpreterRuntime.hpp	Fri Jun 07 12:51:22 2013 +0200
+diff -r 738d32552a96 src/share/vm/interpreter/interpreterRuntime.hpp
+--- a/src/share/vm/interpreter/interpreterRuntime.hpp	Fri Jun 28 14:17:32 2013 +0200
++++ b/src/share/vm/interpreter/interpreterRuntime.hpp	Fri Jun 28 14:34:21 2013 +0200
 @@ -67,6 +67,10 @@
    static ConstantPoolCacheEntry* cache_entry_at(JavaThread *thread, int i)  { return method(thread)->constants()->cache()->entry_at(i); }
    static ConstantPoolCacheEntry* cache_entry(JavaThread *thread)            { return cache_entry_at(thread, Bytes::get_native_u2(bcp(thread) + 1)); }
@@ -1040,9 +1050,9 @@
    // Statics & fields
    static void    resolve_get_put(JavaThread* thread, Bytecodes::Code bytecode);
  
-diff -r 84fd980e69ee src/share/vm/interpreter/invocationCounter.hpp
---- a/src/share/vm/interpreter/invocationCounter.hpp	Fri Jun 07 12:50:21 2013 +0200
-+++ b/src/share/vm/interpreter/invocationCounter.hpp	Fri Jun 07 12:51:22 2013 +0200
+diff -r 738d32552a96 src/share/vm/interpreter/invocationCounter.hpp
+--- a/src/share/vm/interpreter/invocationCounter.hpp	Fri Jun 28 14:17:32 2013 +0200
++++ b/src/share/vm/interpreter/invocationCounter.hpp	Fri Jun 28 14:34:21 2013 +0200
 @@ -101,13 +101,17 @@
  
    // Test counter using scaled limits like the asm interpreter would do rather than doing
@@ -1066,9 +1076,9 @@
    }
  
    void increment()                               { _counter += count_increment; }
-diff -r 84fd980e69ee src/share/vm/oops/methodData.cpp
---- a/src/share/vm/oops/methodData.cpp	Fri Jun 07 12:50:21 2013 +0200
-+++ b/src/share/vm/oops/methodData.cpp	Fri Jun 07 12:51:22 2013 +0200
+diff -r 738d32552a96 src/share/vm/oops/methodData.cpp
+--- a/src/share/vm/oops/methodData.cpp	Fri Jun 28 14:17:32 2013 +0200
++++ b/src/share/vm/oops/methodData.cpp	Fri Jun 28 14:34:21 2013 +0200
 @@ -244,6 +244,11 @@
    return mdp;
  }
@@ -1081,9 +1091,9 @@
  
  #ifndef PRODUCT
  void RetData::print_data_on(outputStream* st) {
-diff -r 84fd980e69ee src/share/vm/oops/methodData.hpp
---- a/src/share/vm/oops/methodData.hpp	Fri Jun 07 12:50:21 2013 +0200
-+++ b/src/share/vm/oops/methodData.hpp	Fri Jun 07 12:51:22 2013 +0200
+diff -r 738d32552a96 src/share/vm/oops/methodData.hpp
+--- a/src/share/vm/oops/methodData.hpp	Fri Jun 28 14:17:32 2013 +0200
++++ b/src/share/vm/oops/methodData.hpp	Fri Jun 28 14:34:21 2013 +0200
 @@ -225,6 +225,11 @@
    static ByteSize cell_offset(int index) {
      return byte_offset_of(DataLayout, _cells) + in_ByteSize(index * cell_size);
@@ -1361,9 +1371,9 @@
  private:
    friend class ProfileData;
  
-diff -r 84fd980e69ee src/share/vm/runtime/arguments.cpp
---- a/src/share/vm/runtime/arguments.cpp	Fri Jun 07 12:50:21 2013 +0200
-+++ b/src/share/vm/runtime/arguments.cpp	Fri Jun 07 12:51:22 2013 +0200
+diff -r 738d32552a96 src/share/vm/runtime/arguments.cpp
+--- a/src/share/vm/runtime/arguments.cpp	Fri Jun 28 14:17:32 2013 +0200
++++ b/src/share/vm/runtime/arguments.cpp	Fri Jun 28 14:34:21 2013 +0200
 @@ -3578,10 +3578,10 @@
    // Clear flags not supported by the C++ interpreter
  #if !defined(PPC64)
@@ -1376,10 +1386,10 @@
  #endif // CC_INTERP
  
  #ifdef COMPILER2
-diff -r 84fd980e69ee src/share/vm/runtime/globals.hpp
---- a/src/share/vm/runtime/globals.hpp	Fri Jun 07 12:50:21 2013 +0200
-+++ b/src/share/vm/runtime/globals.hpp	Fri Jun 07 12:51:22 2013 +0200
-@@ -2708,6 +2708,9 @@
+diff -r 738d32552a96 src/share/vm/runtime/globals.hpp
+--- a/src/share/vm/runtime/globals.hpp	Fri Jun 28 14:17:32 2013 +0200
++++ b/src/share/vm/runtime/globals.hpp	Fri Jun 28 14:34:21 2013 +0200
+@@ -2712,6 +2712,9 @@
    product_pd(bool, ProfileInterpreter,                                      \
             "Profile at the bytecode level during interpretation")           \
                                                                              \
--- a/ppc_patches/0204_opto-explicit_specification_of_rematerialization_in_ad_file.patch	Mon Jun 24 17:34:32 2013 +0200
+++ b/ppc_patches/0204_opto-explicit_specification_of_rematerialization_in_ad_file.patch	Fri Jun 28 16:31:09 2013 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent dd3eff874934a56077568fb2368aa1785b424f40
+# Parent 898e495e7e960edbe3b9795e1a0c83699805bcdd
 opto: explicit specification of rematerialization in ad file.
 
 Introduce attributes "ins_cannot_rematerialize" and
@@ -16,12 +16,12 @@
 MachConstantBaseNode. This causes the assertion 'edge_from_to' in
 Scheduling::verify_good_schedule() to fire.
 
-diff -r dd3eff874934 src/share/vm/adlc/formssel.cpp
---- a/src/share/vm/adlc/formssel.cpp	Wed Feb 20 09:59:18 2013 +0100
-+++ b/src/share/vm/adlc/formssel.cpp	Wed Feb 20 10:20:00 2013 +0100
-@@ -532,6 +532,28 @@
-   if( data_type != Form::none )
-     rematerialize = true;
+diff -r 898e495e7e96 src/share/vm/adlc/formssel.cpp
+--- a/src/share/vm/adlc/formssel.cpp	Fri Jun 28 15:59:15 2013 +0200
++++ b/src/share/vm/adlc/formssel.cpp	Fri Jun 28 16:00:02 2013 +0200
+@@ -549,6 +549,28 @@
+     return false;
+   }
  
 +  // Enforce/prohibit rematerializations.
 +  // - If an instruction is attributed with 'ins_cannot_rematerialize(true)'
@@ -36,10 +36,10 @@
 +  //   Causes that MachNode::rematerialize() returns true.
 +  Attribute *attr = _attribs;
 +  while (attr != NULL) {
-+    if (!strcmp(attr->_ident,"ins_cannot_rematerialize") && !strcmp(attr->_val,"true")) {
++    if (!strcmp(attr->_ident,"ins_cannot_rematerialize") && !strcmp(attr->_val, "true")) {
 +      return false;
 +    }
-+    if (!strcmp(attr->_ident,"ins_should_rematerialize") && !strcmp(attr->_val,"true")) {
++    if (!strcmp(attr->_ident,"ins_should_rematerialize") && !strcmp(attr->_val, "true")) {
 +      return true;
 +    }
 +    attr = (Attribute *)attr->_next;
@@ -48,10 +48,10 @@
    // Constants
    if( _components.count() == 1 && _components[0]->is(Component::USE_DEF) )
      rematerialize = true;
-diff -r dd3eff874934 src/share/vm/adlc/output_h.cpp
---- a/src/share/vm/adlc/output_h.cpp	Wed Feb 20 09:59:18 2013 +0100
-+++ b/src/share/vm/adlc/output_h.cpp	Wed Feb 20 10:20:00 2013 +0100
-@@ -1570,6 +1570,9 @@
+diff -r 898e495e7e96 src/share/vm/adlc/output_h.cpp
+--- a/src/share/vm/adlc/output_h.cpp	Fri Jun 28 15:59:15 2013 +0200
++++ b/src/share/vm/adlc/output_h.cpp	Fri Jun 28 16:00:02 2013 +0200
+@@ -1605,6 +1605,9 @@
      while (attr != NULL) {
        if (strcmp (attr->_ident,"ins_cost") &&
            strncmp(attr->_ident,"ins_field_", 10) != 0 &&
--- a/ppc_patches/0208_rt-improve_handling_of_memory_ordering_in_taskqueue_hpp.patch	Mon Jun 24 17:34:32 2013 +0200
+++ b/ppc_patches/0208_rt-improve_handling_of_memory_ordering_in_taskqueue_hpp.patch	Fri Jun 28 16:31:09 2013 +0200
@@ -828,18 +828,6 @@
 +
 +
 +#endif // SHARE_VM_UTILITIES_TASKQUEUE_HPP
-diff -r 4a3d3fbe571c src/share/vm/opto/memnode.cpp
---- a/src/share/vm/opto/memnode.cpp	Mon Apr 08 15:52:47 2013 +0200
-+++ b/src/share/vm/opto/memnode.cpp	Mon Apr 08 15:54:55 2013 +0200
-@@ -914,7 +914,7 @@
-   case T_INT:     return new (C) LoadINode (ctl, mem, adr, adr_type, rt->is_int(),  sem);
-   case T_CHAR:    return new (C) LoadUSNode(ctl, mem, adr, adr_type, rt->is_int(),  sem);
-   case T_SHORT:   return new (C) LoadSNode (ctl, mem, adr, adr_type, rt->is_int(),  sem);
--  case T_LONG:    return new (C) LoadLNode (ctl, mem, adr, adr_type, rt->is_long(), sem);
-+  case T_LONG:    return new (C) LoadLNode (ctl, mem, adr, adr_type, rt->is_long(), false, sem);
-   case T_FLOAT:   return new (C) LoadFNode (ctl, mem, adr, adr_type, rt,            sem);
-   case T_DOUBLE:  return new (C) LoadDNode (ctl, mem, adr, adr_type, rt,            sem);
-   case T_ADDRESS: return new (C) LoadPNode (ctl, mem, adr, adr_type, rt->is_ptr(),  sem);
 diff -r 4a3d3fbe571c src/share/vm/utilities/taskqueue.hpp
 --- a/src/share/vm/utilities/taskqueue.hpp	Mon Apr 08 15:52:47 2013 +0200
 +++ b/src/share/vm/utilities/taskqueue.hpp	Mon Apr 08 15:54:55 2013 +0200
--- a/ppc_patches/series	Mon Jun 24 17:34:32 2013 +0200
+++ b/ppc_patches/series	Fri Jun 28 16:31:09 2013 +0200
@@ -1,10 +1,9 @@
 0003-2_C_interpreter-fix_for_8010460.patch
-0003-3_Build-Fix_for_JEP_185.patch
+0003-4_C_interpreter-Wunused_value.patch
 0004_opto-trampoline_relocations.patch
 0005_rt-use_stubs_to_implement_safefetch_.patch
 0006_C_interpreter-adapt_stack_handling.patch
 0007_C_interpreter-biased_locking.patch
-0103_C_interpreter-support_method_handles.patch
 0008_linux_ppc_make_changes.patch
 0009_linux_ppc_files.patch
 0011_AIX_IA64_preprocessor_conditionals.patch
@@ -30,7 +29,6 @@
 0120_opto-constants_for_Call_nodes.patch
 0121_basic_C2_adaptions_for_ppc.patch
 0122_PPC-C2_compiler_port-ppc_files.patch
-0200_C_interpreter-profiling_fix.patch
 0201_C_interpreter-implement_bytecode_profiling.patch
 0202_C_interpreter-support_OSR_.patch
 0203_opto-Move_static_in_dump_cnt_to_Compile_object.patch