changeset 483:c489641155e3

coro: fix coro.patch problem with vmSymbols.hpp
author Lukas Stadler <lukas.stadler@jku.at>
date Tue, 17 Jul 2012 11:59:30 +0200
parents 4765d908e696
children ad665697620c
files coro.patch
diffstat 1 files changed, 30 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/coro.patch	Mon Jul 16 20:40:17 2012 -0700
+++ b/coro.patch	Tue Jul 17 11:59:30 2012 +0200
@@ -1,7 +1,7 @@
 diff --git a/src/cpu/x86/vm/assembler_x86.cpp b/src/cpu/x86/vm/assembler_x86.cpp
 --- a/src/cpu/x86/vm/assembler_x86.cpp
 +++ b/src/cpu/x86/vm/assembler_x86.cpp
-@@ -5913,7 +5913,7 @@
+@@ -6003,7 +6003,7 @@
  
    push_CPU_state();   // keeps alignment at 16 bytes
    lea(c_rarg0, ExternalAddress((address) msg));
@@ -13,7 +13,7 @@
 diff --git a/src/cpu/x86/vm/assembler_x86.hpp b/src/cpu/x86/vm/assembler_x86.hpp
 --- a/src/cpu/x86/vm/assembler_x86.hpp
 +++ b/src/cpu/x86/vm/assembler_x86.hpp
-@@ -794,7 +794,7 @@
+@@ -798,7 +798,7 @@
  
  
    // Instruction prefixes
@@ -1215,7 +1215,7 @@
 diff --git a/src/os/windows/vm/os_windows.cpp b/src/os/windows/vm/os_windows.cpp
 --- a/src/os/windows/vm/os_windows.cpp
 +++ b/src/os/windows/vm/os_windows.cpp
-@@ -2291,7 +2291,7 @@
+@@ -2308,7 +2308,7 @@
      bool in_java = thread->thread_state() == _thread_in_Java;
  
      // Handle potential stack overflows up front.
@@ -1326,8 +1326,8 @@
 diff --git a/src/share/vm/classfile/javaClasses.cpp b/src/share/vm/classfile/javaClasses.cpp
 --- a/src/share/vm/classfile/javaClasses.cpp
 +++ b/src/share/vm/classfile/javaClasses.cpp
-@@ -2978,6 +2978,99 @@
-   }
+@@ -2992,6 +2992,99 @@
+   compute_offset(_limit_offset, k, vmSymbols::limit_name(), vmSymbols::int_signature());
  }
  
 +/* stack manipulation */
@@ -1426,7 +1426,7 @@
  void java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(TRAPS) {
    if (_owner_offset != 0) return;
  
-@@ -3092,6 +3185,9 @@
+@@ -3099,6 +3192,9 @@
  
    // generated interpreter code wants to know about the offsets we just computed:
    AbstractAssembler::update_delayed_values();
@@ -1439,7 +1439,7 @@
 diff --git a/src/share/vm/classfile/javaClasses.hpp b/src/share/vm/classfile/javaClasses.hpp
 --- a/src/share/vm/classfile/javaClasses.hpp
 +++ b/src/share/vm/classfile/javaClasses.hpp
-@@ -1391,6 +1391,68 @@
+@@ -1430,6 +1430,68 @@
    MEMBERNAME_INJECTED_FIELDS(macro)         \
    METHODTYPEFORM_INJECTED_FIELDS(macro)
  
@@ -1511,7 +1511,7 @@
 diff --git a/src/share/vm/classfile/systemDictionary.hpp b/src/share/vm/classfile/systemDictionary.hpp
 --- a/src/share/vm/classfile/systemDictionary.hpp
 +++ b/src/share/vm/classfile/systemDictionary.hpp
-@@ -186,6 +186,11 @@
+@@ -183,6 +183,11 @@
    template(Short_klass,                  java_lang_Short,                Pre) \
    template(Integer_klass,                java_lang_Integer,              Pre) \
    template(Long_klass,                   java_lang_Long,                 Pre) \
@@ -1526,7 +1526,7 @@
 diff --git a/src/share/vm/classfile/vmSymbols.hpp b/src/share/vm/classfile/vmSymbols.hpp
 --- a/src/share/vm/classfile/vmSymbols.hpp
 +++ b/src/share/vm/classfile/vmSymbols.hpp
-@@ -392,6 +392,7 @@
+@@ -400,6 +400,7 @@
    template(void_float_signature,                      "()F")                                      \
    template(void_double_signature,                     "()D")                                      \
    template(int_void_signature,                        "(I)V")                                     \
@@ -1534,7 +1534,7 @@
    template(int_int_signature,                         "(I)I")                                     \
    template(char_char_signature,                       "(C)C")                                     \
    template(short_short_signature,                     "(S)S")                                     \
-@@ -508,7 +509,7 @@
+@@ -517,7 +518,7 @@
    template(createGarbageCollectorMBean_signature,      "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/management/GarbageCollectorMBean;") \
    template(trigger_name,                               "trigger")                                                 \
    template(clear_name,                                 "clear")                                                   \
@@ -1543,7 +1543,7 @@
    template(startAgent_name,                            "startAgent")                                              \
    template(startRemoteAgent_name,                      "startRemoteManagementAgent")                              \
    template(startLocalAgent_name,                       "startLocalManagementAgent")                               \
-@@ -530,7 +531,7 @@
+@@ -539,7 +540,7 @@
    template(addThreadDumpForMonitors_name,              "addThreadDumpForMonitors")                                \
    template(addThreadDumpForSynchronizers_name,         "addThreadDumpForSynchronizers")                           \
    template(addThreadDumpForMonitors_signature,         "(Ljava/lang/management/ThreadInfo;[Ljava/lang/Object;[I)V") \
@@ -1552,11 +1552,10 @@
                                                                                                                    \
    /* JVMTI/java.lang.instrument support and VM Attach mechanism */                                                \
    template(sun_misc_VMSupport,                         "sun/misc/VMSupport")                                      \
-@@ -540,6 +541,27 @@
-   template(serializePropertiesToByteArray_signature,   "()[B")                                                    \
+@@ -550,6 +551,27 @@
    template(serializeAgentPropertiesToByteArray_name,   "serializeAgentPropertiesToByteArray")                     \
    template(classRedefinedCount_name,                   "classRedefinedCount")                                     \
-+                                                                                                                  \
+                                                                                                                   \
 +  /* coroutine support */                                                                                         \
 +  template(java_dyn_CoroutineSupport,                  "java/dyn/CoroutineSupport")                               \
 +  template(java_dyn_CoroutineBase,                     "java/dyn/CoroutineBase")                                  \
@@ -1577,10 +1576,11 @@
 +  template(objectValues_name,                          "objectValues")                                            \
 +  template(long_array_signature,                       "[J")                                                      \
 +  template(object_array_signature,                     "[Ljava/lang/Object;")                                     \
-   /*end*/
- 
- 
-@@ -884,9 +906,22 @@
++                                                                                                                  \
+   /* trace signatures */                                                                                          \
+   TRACE_TEMPLATES(template)                                                                                       \
+                                                                                                                   \
+@@ -888,9 +910,22 @@
     do_name(     prefetchReadStatic_name,                         "prefetchReadStatic")                                  \
    do_intrinsic(_prefetchWriteStatic,      sun_misc_Unsafe,        prefetchWriteStatic_name, prefetch_signature,  F_SN)  \
     do_name(     prefetchWriteStatic_name,                        "prefetchWriteStatic")                                 \
@@ -1810,7 +1810,7 @@
 diff --git a/src/share/vm/prims/jni.cpp b/src/share/vm/prims/jni.cpp
 --- a/src/share/vm/prims/jni.cpp
 +++ b/src/share/vm/prims/jni.cpp
-@@ -5149,6 +5149,28 @@
+@@ -5151,6 +5151,28 @@
  
      // Check if we should compile all classes on bootclasspath
      NOT_PRODUCT(if (CompileTheWorld) ClassLoader::compile_the_world();)
@@ -1839,7 +1839,7 @@
      // Since this is not a JVM_ENTRY we have to set the thread state manually before leaving.
      ThreadStateTransition::transition_and_fence(thread, _thread_in_vm, _thread_in_native);
    } else {
-@@ -5279,7 +5301,7 @@
+@@ -5281,7 +5303,7 @@
    thread->set_thread_state(_thread_in_vm);
    // Must do this before initialize_thread_local_storage
    thread->record_stack_base_and_size();
@@ -3525,7 +3525,7 @@
 diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp
 --- a/src/share/vm/runtime/globals.hpp
 +++ b/src/share/vm/runtime/globals.hpp
-@@ -3901,6 +3901,12 @@
+@@ -3898,6 +3898,12 @@
            "EINTR for I/O operations results in OS_INTRPT. The default value"\
            " of this flag is true for JDK 6 and earlier")                    \
                                                                              \
@@ -3536,8 +3536,8 @@
 +          "The number of free coroutine stacks a thread can keep")          \
 +                                                                            \
    diagnostic(bool, WhiteBoxAPI, false,                                      \
-           "Enable internal testing APIs")
- 
+           "Enable internal testing APIs")                                   \
+                                                                             \
 diff --git a/src/share/vm/runtime/handles.cpp b/src/share/vm/runtime/handles.cpp
 --- a/src/share/vm/runtime/handles.cpp
 +++ b/src/share/vm/runtime/handles.cpp
@@ -3654,7 +3654,7 @@
  #include "runtime/deoptimization.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/frame.inline.hpp"
-@@ -1312,6 +1313,10 @@
+@@ -1335,6 +1336,10 @@
    _interp_only_mode    = 0;
    _special_runtime_exit_condition = _no_async_condition;
    _pending_async_exception = NULL;
@@ -3665,7 +3665,7 @@
    _is_compiling = false;
    _thread_stat = NULL;
    _thread_stat = new ThreadStatistics();
-@@ -1495,6 +1500,8 @@
+@@ -1518,6 +1523,8 @@
    // Record real stack base and size.
    this->record_stack_base_and_size();
  
@@ -3674,7 +3674,7 @@
    // Initialize thread local storage; set before calling MutexLocker
    this->initialize_thread_local_storage();
  
-@@ -2439,6 +2446,12 @@
+@@ -2462,6 +2469,12 @@
      frame* fr = fst.current();
      f(fr, fst.register_map());
    }
@@ -3687,7 +3687,7 @@
  }
  
  
-@@ -2595,6 +2608,13 @@
+@@ -2618,6 +2631,13 @@
        fst.current()->oops_do(f, cf, fst.register_map());
      }
    }
@@ -3701,7 +3701,7 @@
  
    // callee_target is never live across a gc point so NULL it here should
    // it still contain a methdOop.
-@@ -2636,6 +2656,13 @@
+@@ -2659,6 +2679,13 @@
        fst.current()->nmethods_do(cf);
      }
    }
@@ -3715,7 +3715,7 @@
  }
  
  // Printing
-@@ -3197,6 +3224,7 @@
+@@ -3220,6 +3247,7 @@
    // stacksize. This adjusted size is what is used to figure the placement
    // of the guard pages.
    main_thread->record_stack_base_and_size();
@@ -3723,7 +3723,7 @@
    main_thread->initialize_thread_local_storage();
  
    main_thread->set_active_handles(JNIHandleBlock::allocate_block());
-@@ -4486,3 +4514,9 @@
+@@ -4512,3 +4540,9 @@
    VMThread* thread = VMThread::vm_thread();
    if (thread != NULL) thread->verify();
  }