Merge branch 'feature/jdk8u212' into develop

beehive-lab · May 16, 2019 · 8ee4e5e · 8ee4e5e
2 parents 7b598c6 + 1b94f51
commit 8ee4e5e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,12 @@ workingsets.xml
 .idea
 *.pydevproject
 
+# VScode generated
+.vscode/
+
+# Mac OS
+.DS_Store
+
 # Python bytecode
 *.pyc
 
@@ -62,6 +68,7 @@ compilations-*.cfg
 codebuffer.c
 *_errors
 *_output
+olc/
 
 # Libraries
 /lib/*
@@ -70,6 +77,9 @@ codebuffer.c
 !/lib/okra-1.9.jar
 !/lib/jnumautils-0.1-SNAPSHOT.jar
 
+# Javadoc
+/*/javadoc/
+
 .metadata/*
 .recommenders/*
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Added
 
+- jdk8u212 support
 - Binary file and assembly generation for offline compiled methods (for debugging/educational purposes)
 - Support `-C1X:+PrintLIRWithAssembly` and `-C1X:PrintCFGToFile` for all platforms through objdump
 - Off-heap allocation for allocation profiler (-XX:+AllocationProfilerAll -XX:+AllocationProfilerDump)

diff --git a/com.sun.max/src/com/sun/max/config/jdk/Package.java b/com.sun.max/src/com/sun/max/config/jdk/Package.java
@@ -159,7 +159,7 @@ public Package() {
             Extensions.registerClassForReInit("java.util.concurrent.atomic.Striped64");
 
             Extensions.resetField("sun.misc.InnocuousThread", "ACC");
-            Extensions.resetField("sun.misc.InnocuousThread", "THREADGROUP");
+            Extensions.resetField("sun.misc.InnocuousThread", "INNOCUOUSTHREADGROUP");
             Extensions.registerClassForReInit("sun.misc.InnocuousThread");
         }
     }

diff --git a/com.sun.max/src/com/sun/max/vm/hosted/JDKInterceptor.java b/com.sun.max/src/com/sun/max/vm/hosted/JDKInterceptor.java
@@ -222,9 +222,10 @@ public static void setLibraryPath(String paths) {
         JDK.java_lang_Terminator,
             "handler",
         JDK.sun_misc_InnocuousThread,
-            new FieldOffsetRecomputation("THREADLOCALS", JDK.java_lang_Thread, "threadLocals"),
-            new FieldOffsetRecomputation("INHERITABLETHREADLOCALS", JDK.java_lang_Thread, "inheritableThreadLocals"),
+            new FieldOffsetRecomputation("THREAD_LOCALS", JDK.java_lang_Thread, "threadLocals"),
+            new FieldOffsetRecomputation("INHERITABLE_THREAD_LOCALS", JDK.java_lang_Thread, "inheritableThreadLocals"),
             new FieldOffsetRecomputation("INHERITEDACCESSCONTROLCONTEXT", JDK.java_lang_Thread, "inheritedAccessControlContext"),
+            new FieldOffsetRecomputation("CONTEXTCLASSLOADER", JDK.java_lang_Thread, "contextClassLoader"),
         JDK.sun_misc_PerfCounter,
             new ValueField("lb", ReferenceValue.from(LongBuffer.allocate(1))).makeNonFinal(),
         JDK.sun_misc_ProxyGenerator,

diff --git a/docs/Status.rst b/docs/Status.rst
@@ -11,9 +11,9 @@ Maxine is being developed and tested on the following configurations:
 +----------------+----------------------+--------------------------+--------------------+
 | Architecture   | OS                   | Java                     | MaxineVM Version   |
 +================+======================+==========================+====================+
-| X86_64         | Ubuntu 18.04         | OpenJDK 8 (u191)         | 2.7.0              |
+| X86_64         | Ubuntu 18.04         | OpenJDK 8 (u212)         | 2.8.0              |
 +----------------+----------------------+--------------------------+--------------------+
-| x86_64         | macOS Mojave 10.14.3 | OpenJDK 8 (u181)         | 2.7.0              |
+| x86_64         | macOS Mojave 10.14   | OpenJDK 8 (u212)         | 2.8.0              |
 +----------------+----------------------+--------------------------+--------------------+
 | Aarch64        | Ubuntu 16.04/18.04   | OpenJDK 8 (u181)         | 2.6.0              |
 +----------------+----------------------+--------------------------+--------------------+
@@ -29,7 +29,9 @@ MaxineVM.
 +--------------------+------------------------+
 | MaxineVM Version   | Java Version           |
 +====================+========================+
-| >= 2.7.0           | Open JDK 8 u191        |
+| >= 2.8.0           | Open JDK 8 u212        |
++--------------------+------------------------+
+| 2.7.0              | Open JDK 8 u191        |
 +--------------------+------------------------+
 | 2.5.1 - 2.6.0      | Open JDK 8 u181        |
 +--------------------+------------------------+

diff --git a/docs/build.rst b/docs/build.rst
@@ -249,7 +249,9 @@ To get it and add it to your ``PATH`` execute::
  git clone https://github.com/graalvm/mx
  export PATH=$PATH:$(pwd)/mx
 
-Maxine also depends on openJDK 8. To get it from the ubuntu repositories run::
+Maxine also depends on openJDK 8.
+To see the supported jdk versions please refer to the :doc:`Status <./Status>` page.
+To get it from the ubuntu repositories run::
 
  sudo apt-get install openjdk-8-jdk