diff --git a/8264805-Backport-Ahead-of-Time-Compiler.patch b/8264805-Backport-Ahead-of-Time-Compiler.patch index 55945af73dbc5ecf319b316dedea2ebc131ec1c3..4ac19f3ec5f2e753e053ebe7e12980fe3b913fb8 100644 --- a/8264805-Backport-Ahead-of-Time-Compiler.patch +++ b/8264805-Backport-Ahead-of-Time-Compiler.patch @@ -2502,7 +2502,7 @@ index 535b795fa..c9b9e2676 100644 +++ b/src/hotspot/os/windows/os_windows.cpp @@ -1,5 +1,5 @@ /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. +- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * diff --git a/8264806-Backport-Graal-Compiler.patch b/8264806-Backport-Graal-Compiler.patch index 044f35d8c4f6a79c8639c39854ccd953e17cac63..48a10ba4e69d1ba09500761247a82ff1aeb19776 100644 --- a/8264806-Backport-Graal-Compiler.patch +++ b/8264806-Backport-Graal-Compiler.patch @@ -6075,8 +6075,8 @@ index 69ea97ddf..529e2df27 100644 --- a/make/autoconf/lib-tests.m4 +++ b/make/autoconf/lib-tests.m4 @@ -30,6 +30,38 @@ - # Minimum supported version JTREG_MINIMUM_VERSION=7.3.1 + GTEST_MINIMUM_VERSION=1.13.0 +############################################################################### +# diff --git a/8335610-DiagnosticFramework-CmdLine-is_executable-co.patch b/8335610-DiagnosticFramework-CmdLine-is_executable-co.patch new file mode 100644 index 0000000000000000000000000000000000000000..2390ef8bea7b5d47fc1ae6399bd5318c417238ec --- /dev/null +++ b/8335610-DiagnosticFramework-CmdLine-is_executable-co.patch @@ -0,0 +1,22 @@ +Subject: 8335610: DiagnosticFramework: CmdLine::is_executable() correction + +--- + src/hotspot/share/services/diagnosticFramework.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hotspot/share/services/diagnosticFramework.hpp b/src/hotspot/share/services/diagnosticFramework.hpp +index e182e5440..166384193 100644 +--- a/src/hotspot/share/services/diagnosticFramework.hpp ++++ b/src/hotspot/share/services/diagnosticFramework.hpp +@@ -67,7 +67,7 @@ public: + const char* cmd_addr() const { return _cmd; } + size_t cmd_len() const { return _cmd_len; } + bool is_empty() const { return _cmd_len == 0; } +- bool is_executable() const { return is_empty() || _cmd[0] != '#'; } ++ bool is_executable() const { return !is_empty() && _cmd[0] != '#'; } + bool is_stop() const { return !is_empty() && strncmp("stop", _cmd, _cmd_len) == 0; } + }; + +-- +2.33.0 + diff --git a/8337274-Remove-repeated-the-in-StyleSheet.create-Sma.patch b/8337274-Remove-repeated-the-in-StyleSheet.create-Sma.patch new file mode 100644 index 0000000000000000000000000000000000000000..c829490d81fea92780e13c8faa95a2b1f4890bc2 --- /dev/null +++ b/8337274-Remove-repeated-the-in-StyleSheet.create-Sma.patch @@ -0,0 +1,40 @@ +Subject: 8337274: Remove repeated 'the' in StyleSheet.create{Small,Large}AttributeSet + +--- + .../share/classes/javax/swing/text/html/StyleSheet.java | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java +index 958b3a899..25490291a 100644 +--- a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java ++++ b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java +@@ -691,7 +691,7 @@ public class StyleSheet extends StyleContext { + * to return an AttributeSet that provides some sort of + * attribute conversion. + * +- * @param a The set of attributes to be represented in the ++ * @param a The set of attributes to be represented in + * the compact form. + */ + protected SmallAttributeSet createSmallAttributeSet(AttributeSet a) { +@@ -707,7 +707,7 @@ public class StyleSheet extends StyleContext { + * to return a MutableAttributeSet that provides some sort of + * attribute conversion. + * +- * @param a The set of attributes to be represented in the ++ * @param a The set of attributes to be represented in + * the larger form. + */ + protected MutableAttributeSet createLargeAttributeSet(AttributeSet a) { +@@ -2140,7 +2140,7 @@ public class StyleSheet extends StyleContext { + /** + * Returns a string that represents the value + * of the HTML.Attribute.TYPE attribute. +- * If this attributes is not defined, then ++ * If this attributes is not defined, + * then the type defaults to "disc" unless + * the tag is on Ordered list. In the case + * of the latter, the default type is "decimal". +-- +2.33.0 + diff --git a/8337982-Remove-dead-undef-assrt0n.patch b/8337982-Remove-dead-undef-assrt0n.patch new file mode 100644 index 0000000000000000000000000000000000000000..760d1f05a8b3de004f0fb97816cbc234a02f62e9 --- /dev/null +++ b/8337982-Remove-dead-undef-assrt0n.patch @@ -0,0 +1,21 @@ +Subject: 8337982: Remove dead undef assrt0n + +--- + src/hotspot/share/memory/metaspace/blockTree.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/hotspot/share/memory/metaspace/blockTree.cpp b/src/hotspot/share/memory/metaspace/blockTree.cpp +index ed2964534..9c78eef84 100644 +--- a/src/hotspot/share/memory/metaspace/blockTree.cpp ++++ b/src/hotspot/share/memory/metaspace/blockTree.cpp +@@ -180,7 +180,6 @@ void BlockTree::verify() const { + // as many nodes as are in this tree) + _counter.check(counter); + +- #undef assrt0n + } + + void BlockTree::zap_range(MetaWord* p, size_t word_size) { +-- +2.33.0 + diff --git a/8338785-The-java.awt.datatransfer.SystemFlavorMap-FL.patch b/8338785-The-java.awt.datatransfer.SystemFlavorMap-FL.patch new file mode 100644 index 0000000000000000000000000000000000000000..13fba95a3528c1f0c2962ddb3014cf6f9017a8e5 --- /dev/null +++ b/8338785-The-java.awt.datatransfer.SystemFlavorMap-FL.patch @@ -0,0 +1,22 @@ +Subject: 8338785: The java.awt.datatransfer.SystemFlavorMap#FLAVOR_MAP_KEY field is not used + +--- + .../share/classes/java/awt/datatransfer/SystemFlavorMap.java | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java +index d48146513..4bde236fc 100644 +--- a/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java ++++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java +@@ -61,8 +61,6 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { + */ + private static String JavaMIME = "JAVA_DATAFLAVOR:"; + +- private static final Object FLAVOR_MAP_KEY = new Object(); +- + /** + * The list of valid, decoded text flavor representation classes, in order + * from best to worst. +-- +2.33.0 + diff --git a/Add-JBooster-Lazy-AOT-module.patch b/Add-JBooster-Lazy-AOT-module.patch index 5816e3c60d1b713b7660f63950fbde74ce86eb0d..97543e35699012366b1e673c8f9ca94b274ce260 100644 --- a/Add-JBooster-Lazy-AOT-module.patch +++ b/Add-JBooster-Lazy-AOT-module.patch @@ -1263,7 +1263,7 @@ index 8ceca7cd3..0d501e494 100644 +++ b/src/hotspot/share/prims/jvm.cpp @@ -1,5 +1,5 @@ /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. +- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * diff --git a/Apply-TBI-to-ZGC-of-JDK17.patch b/Apply-TBI-to-ZGC-of-JDK17.patch index e8d050d5aedbcf04210804284f80dd0cfb0b3164..a960c1c0005216b0c06e7f706a409f5e0fd0ede9 100644 --- a/Apply-TBI-to-ZGC-of-JDK17.patch +++ b/Apply-TBI-to-ZGC-of-JDK17.patch @@ -1584,7 +1584,7 @@ index f8900a13b..356c6ca8b 100644 +#endif while (len > 0) { const unsigned int nBytes = len > INT_MAX ? INT_MAX : (unsigned int)len; - const ssize_t num_written = (ssize_t)os::write(_fd, buf, nBytes); + const bool successful_write = os::write(_fd, buf, nBytes); diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp index cd0115248..41e946563 100644 --- a/src/hotspot/share/prims/jni.cpp diff --git a/Backport-Important-Fixed-Issues.patch b/Backport-Important-Fixed-Issues.patch index 3d453ba0e1449b48d56ca5d19f64e320af7ffa41..af236a8ba8151585a6d1befd271d65f7c9c1abab 100644 --- a/Backport-Important-Fixed-Issues.patch +++ b/Backport-Important-Fixed-Issues.patch @@ -141,19 +141,6 @@ index 52e6ab86c..88a9289b9 100644 if (j >= 1024) { st->print_cr(UINT64_FORMAT " k", uint64_t(j) / 1024); } else { -diff --git a/src/hotspot/os/linux/os_perf_linux.cpp b/src/hotspot/os/linux/os_perf_linux.cpp -index 7c42379a0..958848dc8 100644 ---- a/src/hotspot/os/linux/os_perf_linux.cpp -+++ b/src/hotspot/os/linux/os_perf_linux.cpp -@@ -847,7 +847,7 @@ SystemProcessInterface::SystemProcesses::ProcessIterator::ProcessIterator() { - bool SystemProcessInterface::SystemProcesses::ProcessIterator::initialize() { - _dir = os::opendir("/proc"); - _entry = NULL; -- _valid = true; -+ _valid = _dir != nullptr; // May be null if /proc is not accessible. - next_process(); - - return true; diff --git a/src/hotspot/share/c1/c1_globals.hpp b/src/hotspot/share/c1/c1_globals.hpp index 7564b2b8a..41d4607f8 100644 --- a/src/hotspot/share/c1/c1_globals.hpp @@ -190,7 +177,7 @@ index 98ab42022..56ed8a5dd 100644 * * This code is free software; you can redistribute it and/or modify it @@ -750,12 +750,14 @@ bool PSScavenge::should_attempt_scavenge() { - // changed, decide if that test should also be changed. + size_t avg_promoted = (size_t) policy->padded_average_promoted_in_bytes(); size_t promotion_estimate = MIN2(avg_promoted, young_gen->used_in_bytes()); - bool result = promotion_estimate < old_gen->free_in_bytes(); @@ -206,19 +193,6 @@ index 98ab42022..56ed8a5dd 100644 if (young_gen->used_in_bytes() < (size_t) policy->padded_average_promoted_in_bytes()) { log_trace(ergo)(" padded_promoted_average is greater than maximum promotion = " SIZE_FORMAT, young_gen->used_in_bytes()); } -diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp -index 78d6ab48f..a72c15a49 100644 ---- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp -+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp -@@ -228,7 +228,7 @@ static int write_klass(JfrCheckpointWriter* writer, KlassPtr klass, bool leakp) - writer->write(cld != NULL ? cld_id(cld, leakp) : 0); - writer->write(mark_symbol(klass, leakp)); - writer->write(package_id(klass, leakp)); -- writer->write(get_flags(klass)); -+ writer->write(klass->modifier_flags()); - writer->write(klass->is_hidden()); - return 1; - } diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp index 13de7651e..411733814 100644 --- a/src/hotspot/share/opto/c2compiler.cpp @@ -661,191 +635,6 @@ index 050f27e72..197f3238b 100644 return; if ( comboBox.isEditable() ) { -diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java -index 34c53ca91..81972a052 100644 ---- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java -+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java -@@ -98,10 +98,13 @@ public class BasicDirectoryModel extends AbstractListModel implements Pr - * This method is used to interrupt file loading thread. - */ - public void invalidateFileCache() { -- if (filesLoader != null) { -- filesLoader.loadThread.interrupt(); -- filesLoader.cancelRunnables(); -- filesLoader = null; -+ synchronized (this) { -+ if (filesLoader != null) { -+ filesLoader.loadThread.interrupt(); -+ filesLoader = null; -+ // Increment fetch ID to invalidate pending DoChangeContents -+ fetchID.incrementAndGet(); -+ } - } - } - -@@ -156,14 +159,15 @@ public class BasicDirectoryModel extends AbstractListModel implements Pr - if (currentDirectory == null) { - return; - } -- if (filesLoader != null) { -- filesLoader.loadThread.interrupt(); -- filesLoader.cancelRunnables(); -- } - -- int fid = fetchID.incrementAndGet(); -- setBusy(true, fid); -- filesLoader = new FilesLoader(currentDirectory, fid); -+ synchronized (this) { -+ if (filesLoader != null) { -+ filesLoader.loadThread.interrupt(); -+ } -+ int fid = fetchID.incrementAndGet(); -+ setBusy(true, fid); -+ filesLoader = new FilesLoader(currentDirectory, fid); -+ } - } - - /** -@@ -276,7 +280,6 @@ public class BasicDirectoryModel extends AbstractListModel implements Pr - private final boolean fileSelectionEnabled; - private final int fid; - private final File currentDirectory; -- private volatile DoChangeContents runnable; - private final Thread loadThread; - - private FilesLoader(File currentDirectory, int fid) { -@@ -297,22 +300,20 @@ public class BasicDirectoryModel extends AbstractListModel implements Pr - } - - private void run0() { -- FileSystemView fileSystem = fileSystemView; -- - if (loadThread.isInterrupted()) { - return; - } - -- File[] list = fileSystem.getFiles(currentDirectory, useFileHiding); -+ File[] list = fileSystemView.getFiles(currentDirectory, useFileHiding); - - if (loadThread.isInterrupted()) { - return; - } - - final Vector newFileCache = new Vector(); -- Vector newFiles = new Vector(); -+ final Vector newFiles = new Vector(); - -- // run through the file list, add directories and selectable files to fileCache -+ // Run through the file list, add directories and selectable files to fileCache - // Note that this block must be OUTSIDE of Invoker thread because of - // deadlock possibility with custom synchronized FileSystemView - for (File file : list) { -@@ -339,7 +340,7 @@ public class BasicDirectoryModel extends AbstractListModel implements Pr - - // To avoid loads of synchronizations with Invoker and improve performance we - // execute the whole block on the COM thread -- runnable = ShellFolder.invoke(new Callable() { -+ DoChangeContents runnable = ShellFolder.invoke(new Callable() { - public DoChangeContents call() { - int newSize = newFileCache.size(); - int oldSize = fileCache.size(); -@@ -388,7 +389,7 @@ public class BasicDirectoryModel extends AbstractListModel implements Pr - } - if (!fileCache.equals(newFileCache)) { - if (loadThread.isInterrupted()) { -- cancelRunnables(); -+ return null; - } - return new DoChangeContents(newFileCache, 0, fileCache, 0, fid); - } -@@ -400,12 +401,6 @@ public class BasicDirectoryModel extends AbstractListModel implements Pr - SwingUtilities.invokeLater(runnable); - } - } -- -- private void cancelRunnables() { -- if (runnable != null) { -- runnable.cancel(); -- } -- } - } - - -@@ -514,13 +509,13 @@ public class BasicDirectoryModel extends AbstractListModel implements Pr - private final class DoChangeContents implements Runnable { - private final List addFiles; - private final List remFiles; -- private boolean doFire = true; - private final int fid; -- private int addStart = 0; -- private int remStart = 0; -+ private final int addStart; -+ private final int remStart; - -- DoChangeContents(List addFiles, int addStart, List remFiles, -- int remStart, int fid) { -+ private DoChangeContents(List addFiles, int addStart, -+ List remFiles, int remStart, -+ int fid) { - this.addFiles = addFiles; - this.addStart = addStart; - this.remFiles = remFiles; -@@ -528,31 +523,31 @@ public class BasicDirectoryModel extends AbstractListModel implements Pr - this.fid = fid; - } - -- synchronized void cancel() { -- doFire = false; -- } -- -- public synchronized void run() { -- if (fetchID.get() == fid && doFire) { -- int remSize = (remFiles == null) ? 0 : remFiles.size(); -- int addSize = (addFiles == null) ? 0 : addFiles.size(); -- synchronized(fileCache) { -- if (remSize > 0) { -- fileCache.removeAll(remFiles); -- } -- if (addSize > 0) { -- fileCache.addAll(addStart, addFiles); -- } -- files = null; -- directories = null; -- } -- if (remSize > 0 && addSize == 0) { -- fireIntervalRemoved(BasicDirectoryModel.this, remStart, remStart + remSize - 1); -- } else if (addSize > 0 && remSize == 0 && addStart + addSize <= fileCache.size()) { -- fireIntervalAdded(BasicDirectoryModel.this, addStart, addStart + addSize - 1); -- } else { -- fireContentsChanged(); -+ @Override -+ public void run() { -+ if (fetchID.get() != fid) { -+ return; -+ } -+ final int remSize = (remFiles == null) ? 0 : remFiles.size(); -+ final int addSize = (addFiles == null) ? 0 : addFiles.size(); -+ final int cacheSize; -+ synchronized (fileCache) { -+ if (remSize > 0) { -+ fileCache.removeAll(remFiles); -+ } -+ if (addSize > 0) { -+ fileCache.addAll(addStart, addFiles); - } -+ files = null; -+ directories = null; -+ cacheSize = fileCache.size(); -+ } -+ if (remSize > 0 && addSize == 0) { -+ fireIntervalRemoved(BasicDirectoryModel.this, remStart, remStart + remSize - 1); -+ } else if (addSize > 0 && remSize == 0 && addStart + addSize <= cacheSize) { -+ fireIntervalAdded(BasicDirectoryModel.this, addStart, addStart + addSize - 1); -+ } else { -+ fireContentsChanged(); - } - } - } diff --git a/src/java.desktop/share/classes/javax/swing/text/html/CSS.java b/src/java.desktop/share/classes/javax/swing/text/html/CSS.java index c14b5a126..311f172b8 100644 --- a/src/java.desktop/share/classes/javax/swing/text/html/CSS.java @@ -2020,127 +1809,6 @@ index 000000000..830216f0d + passFailJFrame.awaitAndCheck(); + } +} -diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java b/test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java -new file mode 100644 -index 000000000..19c637049 ---- /dev/null -+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java -@@ -0,0 +1,115 @@ -+/* -+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+package jdk.jfr.api.consumer; -+ -+import java.lang.reflect.Modifier; -+import java.util.List; -+ -+import jdk.jfr.Event; -+import jdk.jfr.Recording; -+import jdk.jfr.consumer.RecordedClass; -+import jdk.jfr.consumer.RecordedEvent; -+import jdk.test.lib.jfr.Events; -+ -+/** -+ * @test -+ * @summary Verifies methods of RecordedClass -+ * @key jfr -+ * @requires vm.hasJFR -+ * @library /test/lib -+ * @run main/othervm jdk.jfr.api.consumer.TestRecordedClass -+ */ -+public class TestRecordedClass { -+ -+ static class TestEvent extends Event { -+ Class typeA; -+ Class typeB; -+ } -+ -+ private static class TypeA { -+ } -+ -+ public final static class TypeB { -+ } -+ -+ public static void main(String[] args) throws Exception { -+ try (Recording recording = new Recording()) { -+ recording.start(); -+ TestEvent event = new TestEvent(); -+ event.typeA = TypeA.class; -+ event.typeB = TypeB.class; -+ event.commit(); -+ recording.stop(); -+ -+ List events = Events.fromRecording(recording); -+ Events.hasEvents(events); -+ for (RecordedEvent recordedEvent : events) { -+ RecordedClass typeA = recordedEvent.getClass("typeA"); -+ RecordedClass typeB = recordedEvent.getClass("typeB"); -+ assertModifiers(typeA, TypeA.class); -+ assertModifiers(typeB, TypeB.class); -+ assertName(typeA, TypeA.class); -+ assertName(typeB, TypeB.class); -+ assertClassLoader(typeA, TypeA.class.getClassLoader()); -+ assertClassLoader(typeB, TypeB.class.getClassLoader()); -+ assertId(typeA); -+ assertId(typeB); -+ if (typeA.getId() == typeB.getId()) { -+ throw new Exception("Same ID for different classes"); -+ } -+ } -+ } -+ } -+ -+ private static void assertId(RecordedClass recordedClass) throws Exception { -+ long id = recordedClass.getId(); -+ if (id < 1 || id >= 1024 * 1024) { -+ throw new Exception("Expected class ID to be above 1 and below 1 M"); -+ } -+ } -+ -+ private static void assertClassLoader(RecordedClass recordedClass, ClassLoader classLoader) throws Exception { -+ String expected = classLoader.getClass().getName(); -+ String actual = recordedClass.getClassLoader().getType().getName(); -+ if (!expected.equals(actual)) { -+ throw new Exception("Expected class loader to be " + expected + ", was " + actual); -+ } -+ } -+ -+ private static void assertName(RecordedClass recordedClass, Class clazz) throws Exception { -+ String className = clazz.getClass().getName(); -+ if (className.equals(recordedClass.getName())) { -+ throw new Exception("Expected class to be named " + className); -+ } -+ } -+ -+ private static void assertModifiers(RecordedClass recordedClass, Class clazz) throws Exception { -+ int modifiers = clazz.getModifiers(); -+ if (modifiers != recordedClass.getModifiers()) { -+ String expected = Modifier.toString(modifiers); -+ String actual = Modifier.toString(recordedClass.getModifiers()); -+ throw new Exception("Expected modifier to be '" + expected + "', was '" + actual + "'"); -+ } -+ } -+} diff --git a/test/jdk/sun/jvmstat/monitor/MonitoredVm/ConcurrentGetMonitoredHost.java b/test/jdk/sun/jvmstat/monitor/MonitoredVm/ConcurrentGetMonitoredHost.java new file mode 100644 index 000000000..a6049f6a0 diff --git a/Backport-of-8330191-Fix-typo-in-precompiled.hpp.patch b/Backport-of-8330191-Fix-typo-in-precompiled.hpp.patch new file mode 100644 index 0000000000000000000000000000000000000000..45357adf68744e28f3f61468caa3fa9e067ea84b --- /dev/null +++ b/Backport-of-8330191-Fix-typo-in-precompiled.hpp.patch @@ -0,0 +1,29 @@ +Subject: Backport of 8330191: Fix typo in precompiled.hpp + +--- + src/hotspot/share/precompiled/precompiled.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/hotspot/share/precompiled/precompiled.hpp b/src/hotspot/share/precompiled/precompiled.hpp +index d34304741..54d03ed71 100644 +--- a/src/hotspot/share/precompiled/precompiled.hpp ++++ b/src/hotspot/share/precompiled/precompiled.hpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -29,7 +29,7 @@ + + // These header files are included in at least 130 C++ files, as of + // measurements made in November 2018. This list excludes files named +-// *.include.hpp, since including them decreased build performance. ++// *.inline.hpp, since including them decreased build performance. + + #include "classfile/classLoaderData.hpp" + #include "classfile/javaClasses.hpp" +-- +2.33.0 + diff --git a/Backport-of-8333088-ubsan-shenandoahAdaptiveHeuristi.patch b/Backport-of-8333088-ubsan-shenandoahAdaptiveHeuristi.patch new file mode 100644 index 0000000000000000000000000000000000000000..6ed37f3082758fb444f37e4b24d1aaa097f0730d --- /dev/null +++ b/Backport-of-8333088-ubsan-shenandoahAdaptiveHeuristi.patch @@ -0,0 +1,22 @@ +Subject: Backport of 8333088: ubsan: shenandoahAdaptiveHeuristics.cpp: runtime error: division by zero + +--- + .../gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp +index 819f1e8d7..371e4c90c 100644 +--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp ++++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp +@@ -243,7 +243,7 @@ bool ShenandoahAdaptiveHeuristics::should_start_gc() { + + double avg_cycle_time = _gc_time_history->davg() + (_margin_of_error_sd * _gc_time_history->dsd()); + double avg_alloc_rate = _allocation_rate.upper_bound(_margin_of_error_sd); +- if (avg_cycle_time > allocation_headroom / avg_alloc_rate) { ++ if (avg_cycle_time * avg_alloc_rate > allocation_headroom) { + log_info(gc)("Trigger: Average GC time (%.2f ms) is above the time for average allocation rate (%.0f %sB/s) to deplete free headroom (" SIZE_FORMAT "%s) (margin of error = %.2f)", + avg_cycle_time * 1000, + byte_size_in_proper_unit(avg_alloc_rate), proper_unit_for_byte_size(avg_alloc_rate), +-- +2.33.0 + diff --git a/Backport-of-8337712-Wrong-javadoc-in-java.util.Date-.patch b/Backport-of-8337712-Wrong-javadoc-in-java.util.Date-.patch new file mode 100644 index 0000000000000000000000000000000000000000..a4c36c1d7f55458cd50a9c4629c5c9584536bb3c --- /dev/null +++ b/Backport-of-8337712-Wrong-javadoc-in-java.util.Date-.patch @@ -0,0 +1,29 @@ +Subject: Backport of 8337712: Wrong javadoc in java.util.Date#toString(): 61 and right parenthesis + +--- + src/java.base/share/classes/java/util/Date.java | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/java.base/share/classes/java/util/Date.java b/src/java.base/share/classes/java/util/Date.java +index d0b31a402..9a0552dd3 100644 +--- a/src/java.base/share/classes/java/util/Date.java ++++ b/src/java.base/share/classes/java/util/Date.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -1014,7 +1014,7 @@ public class Date + *
  • {@code mm} is the minute within the hour ({@code 00} through + * {@code 59}), as two decimal digits. + *
  • {@code ss} is the second within the minute ({@code 00} through +- * {@code 61}, as two decimal digits. ++ * {@code 61}), as two decimal digits. + *
  • {@code zzz} is the time zone (and may reflect daylight saving + * time). Standard time zone abbreviations include those + * recognized by the method {@code parse}. If time zone +-- +2.33.0 + diff --git a/Backport-of-8339351-Remove-duplicate-line-in-FileMap.patch b/Backport-of-8339351-Remove-duplicate-line-in-FileMap.patch new file mode 100644 index 0000000000000000000000000000000000000000..7f76a14d59ff6296058307e1afe1dddbe3c4ebdd --- /dev/null +++ b/Backport-of-8339351-Remove-duplicate-line-in-FileMap.patch @@ -0,0 +1,21 @@ +Subject: Backport of 8339351: Remove duplicate line in FileMapHeader::print + +--- + src/hotspot/share/cds/filemap.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp +index fa981d38c..106c14bfc 100644 +--- a/src/hotspot/share/cds/filemap.cpp ++++ b/src/hotspot/share/cds/filemap.cpp +@@ -287,7 +287,6 @@ void FileMapHeader::print(outputStream* st) { + st->print_cr("- core_region_alignment: " SIZE_FORMAT, _core_region_alignment); + st->print_cr("- obj_alignment: %d", _obj_alignment); + st->print_cr("- narrow_oop_base: " INTPTR_FORMAT, p2i(_narrow_oop_base)); +- st->print_cr("- narrow_oop_base: " INTPTR_FORMAT, p2i(_narrow_oop_base)); + st->print_cr("- narrow_oop_shift %d", _narrow_oop_shift); + st->print_cr("- compact_strings: %d", _compact_strings); + st->print_cr("- max_heap_size: " UINTX_FORMAT, _max_heap_size); +-- +2.33.0 + diff --git a/Backport-of-JDK-8305680.patch b/Backport-of-JDK-8305680.patch new file mode 100644 index 0000000000000000000000000000000000000000..e21eb9afbd01dbb08ba8c55ef678c8930b47adb1 --- /dev/null +++ b/Backport-of-JDK-8305680.patch @@ -0,0 +1,30 @@ +Subject: Backport of JDK-8305680 + +--- + src/hotspot/share/services/diagnosticCommand.cpp | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp +index 51f47421c..1400e4a3f 100644 +--- a/src/hotspot/share/services/diagnosticCommand.cpp ++++ b/src/hotspot/share/services/diagnosticCommand.cpp +@@ -191,16 +191,6 @@ void HelpDCmd::execute(DCmdSource source, TRAPS) { + factory->is_enabled() ? "" : " [disabled]"); + output()->print_cr("%s", factory->description()); + output()->print_cr("\nImpact: %s", factory->impact()); +- JavaPermission p = factory->permission(); +- if(p._class != NULL) { +- if(p._action != NULL) { +- output()->print_cr("\nPermission: %s(%s, %s)", +- p._class, p._name == NULL ? "null" : p._name, p._action); +- } else { +- output()->print_cr("\nPermission: %s(%s)", +- p._class, p._name == NULL ? "null" : p._name); +- } +- } + output()->cr(); + cmd = factory->create_resource_instance(output()); + if (cmd != NULL) { +-- +2.33.0 + diff --git a/Backport-of-JDK-8305937.patch b/Backport-of-JDK-8305937.patch new file mode 100644 index 0000000000000000000000000000000000000000..e4532dc1f5e5d50c26f150ae2155f59e299b6e96 --- /dev/null +++ b/Backport-of-JDK-8305937.patch @@ -0,0 +1,23 @@ +Subject: Backport of JDK-8305937 + +Signed-off-by: Qeryu +--- + test/jdk/com/sun/jdi/TestScaffold.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/jdk/com/sun/jdi/TestScaffold.java b/test/jdk/com/sun/jdi/TestScaffold.java +index 2d4885c90..e46a44eda 100644 +--- a/test/jdk/com/sun/jdi/TestScaffold.java ++++ b/test/jdk/com/sun/jdi/TestScaffold.java +@@ -513,7 +513,7 @@ abstract public class TestScaffold extends TargetAdapter { + public void connect(String args[]) { + ArgInfo argInfo = parseArgs(args); + +- argInfo.targetVMArgs += VMConnection.getDebuggeeVMOptions(); ++ argInfo.targetVMArgs = VMConnection.getDebuggeeVMOptions() + " " + argInfo.targetVMArgs; + connection = new VMConnection(argInfo.connectorSpec, + argInfo.traceFlags); + +-- +2.33.0 + diff --git a/Huawei-Fix-JBooster-file-issue-caused-by-os-write-change.patch b/Huawei-Fix-JBooster-file-issue-caused-by-os-write-change.patch new file mode 100644 index 0000000000000000000000000000000000000000..b59b1f3cdc137550b5796848fcab0f0202775a96 --- /dev/null +++ b/Huawei-Fix-JBooster-file-issue-caused-by-os-write-change.patch @@ -0,0 +1,84 @@ +From bc5f9fe895849d80d69ef273703e17d2e3ffc968 Mon Sep 17 00:00:00 2001 +Subject: Fix JBooster file issue caused by os::write change + +--- + .../share/jbooster/net/serializationWrappers.cpp | 15 +++++++++------ + .../share/jbooster/net/serializationWrappers.hpp | 2 +- + test/hotspot/gtest/jbooster/test_net.cpp | 6 +----- + test/hotspot/gtest/jbooster/test_util.cpp | 4 ++-- + 4 files changed, 13 insertions(+), 14 deletions(-) + +diff --git a/src/hotspot/share/jbooster/net/serializationWrappers.cpp b/src/hotspot/share/jbooster/net/serializationWrappers.cpp +index 13db948f6..58310e976 100644 +--- a/src/hotspot/share/jbooster/net/serializationWrappers.cpp ++++ b/src/hotspot/share/jbooster/net/serializationWrappers.cpp +@@ -385,12 +385,15 @@ int FileWrapper::deserialize(MessageBuffer& buf) { + JB_RETURN(buf.deserialize_ref_no_meta(size_to_recv)); + + // content (use low-level APIs to save a memcpy) +- uint32_t left = size_to_recv; +- do { +- uint32_t write_size = (uint32_t) os::write(_fd, buf.cur_buf_ptr(), left); +- buf.skip_cur_offset(write_size); +- left -= write_size; +- } while (left > 0); ++ if (!os::write(_fd, buf.cur_buf_ptr(), size_to_recv)) { ++ int e = errno; ++ errno = 0; ++ guarantee(e != 0, "sanity"); ++ log_warning(jbooster, serialization)("Fail to write file \"%s\": errno=%s(\"%s\") .", ++ _file_path, os::errno_name(e), os::strerror(e)); ++ JB_RETURN(e); ++ } ++ buf.skip_cur_offset(size_to_recv); + + // update status + _handled_file_size += size_to_recv; +diff --git a/src/hotspot/share/jbooster/net/serializationWrappers.hpp b/src/hotspot/share/jbooster/net/serializationWrappers.hpp +index cc7f96c15..02816fcc5 100644 +--- a/src/hotspot/share/jbooster/net/serializationWrappers.hpp ++++ b/src/hotspot/share/jbooster/net/serializationWrappers.hpp +@@ -253,7 +253,7 @@ public: + + bool is_null() const { return _file_size == MessageConst::NULL_PTR; } + bool is_file_all_handled() const { +- assert(_file_size >= _handled_file_size, "sanity"); ++ guarantee(_file_size >= _handled_file_size, "sanity"); + return _handled_once && _file_size == _handled_file_size; + } + +diff --git a/test/hotspot/gtest/jbooster/test_net.cpp b/test/hotspot/gtest/jbooster/test_net.cpp +index a2c45be5e..9eb29fc3a 100644 +--- a/test/hotspot/gtest/jbooster/test_net.cpp ++++ b/test/hotspot/gtest/jbooster/test_net.cpp +@@ -348,11 +348,7 @@ static void create_test_file_for_file_wrapper(const char* file_name) { + int fd = os::open(file_name, O_BINARY | O_WRONLY | O_CREAT | O_EXCL | O_TRUNC, 0666); + ASSERT_TRUE(fd >= 0); + ASSERT_EQ(errno, 0); +- uint32_t left = mem_size; +- do { +- uint32_t write_size = (uint32_t) os::write(fd, mem + mem_size - left, left); +- left -= write_size; +- } while (left > 0); ++ ASSERT_TRUE(os::write(fd, mem, mem_size)); + os::close(fd); + FREE_C_HEAP_ARRAY(char, mem); + } +diff --git a/test/hotspot/gtest/jbooster/test_util.cpp b/test/hotspot/gtest/jbooster/test_util.cpp +index ab7fd9b39..cd65804be 100644 +--- a/test/hotspot/gtest/jbooster/test_util.cpp ++++ b/test/hotspot/gtest/jbooster/test_util.cpp +@@ -46,8 +46,8 @@ static const char* get_type_name(T t) { + } + + static void write_file(const char* file_path, const char* content) { +- int fd = os::open(file_path, O_BINARY | O_WRONLY | O_CREAT, 0666);; +- os::write(fd, content, strlen(content) + 1); ++ int fd = os::open(file_path, O_BINARY | O_WRONLY | O_CREAT, 0666); ++ ASSERT_TRUE(os::write(fd, content, strlen(content) + 1)); + os::close(fd); + } + +-- +2.23.0 + diff --git a/KAE-zip-Features.patch b/KAE-zip-Features.patch index f4c16a8e696861093a9d10fd8308b27e4538b448..a68b802c665d171ecd722470fed5ef1c5993011c 100644 --- a/KAE-zip-Features.patch +++ b/KAE-zip-Features.patch @@ -87,7 +87,7 @@ index bb09d8cf8..8b03ea56e 100644 ifeq ($(LIBZIP_CAN_USE_MMAP), true) @@ -139,10 +169,11 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \ - DISABLED_WARNINGS_clang := format-nonliteral, \ + DISABLED_WARNINGS_clang := format-nonliteral deprecated-non-prototype, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \ diff --git a/LoongArch64-support.patch b/LoongArch64-support.patch index c18da430506e6140222bc0dc1d78057dbd9010e7..a9a6ec6688f8f65e11799caf879c0581504c43da 100644 --- a/LoongArch64-support.patch +++ b/LoongArch64-support.patch @@ -1,578 +1,5 @@ -From afca9d06db52ee145c9f6342677c4b8a0e2988aa Mon Sep 17 00:00:00 2001 -From: songliyang -Date: Thu, 25 Jul 2024 15:34:22 +0800 -Subject: [PATCH] LoongArch64 support - ---- - make/autoconf/jvm-features.m4 | 36 +- - make/autoconf/platform.m4 | 27 + - .../abstractInterpreter_loongarch.cpp | 133 + - .../cpu/loongarch/assembler_loongarch.cpp | 849 + - .../cpu/loongarch/assembler_loongarch.hpp | 2831 +++ - .../loongarch/assembler_loongarch.inline.hpp | 33 + - src/hotspot/cpu/loongarch/bytes_loongarch.hpp | 73 + - .../loongarch/c1_CodeStubs_loongarch_64.cpp | 360 + - .../cpu/loongarch/c1_Defs_loongarch.hpp | 79 + - .../loongarch/c1_FpuStackSim_loongarch.hpp | 32 + - .../loongarch/c1_FpuStackSim_loongarch_64.cpp | 31 + - .../cpu/loongarch/c1_FrameMap_loongarch.hpp | 143 + - .../loongarch/c1_FrameMap_loongarch_64.cpp | 362 + - .../loongarch/c1_LIRAssembler_loongarch.hpp | 84 + - .../c1_LIRAssembler_loongarch_64.cpp | 3402 ++++ - .../c1_LIRGenerator_loongarch_64.cpp | 1386 ++ - .../cpu/loongarch/c1_LIR_loongarch_64.cpp | 57 + - .../cpu/loongarch/c1_LinearScan_loongarch.hpp | 70 + - .../loongarch/c1_LinearScan_loongarch_64.cpp | 33 + - .../loongarch/c1_MacroAssembler_loongarch.hpp | 112 + - .../c1_MacroAssembler_loongarch_64.cpp | 365 + - .../loongarch/c1_Runtime1_loongarch_64.cpp | 1148 ++ - .../cpu/loongarch/c1_globals_loongarch.hpp | 65 + - .../loongarch/c2_MacroAssembler_loongarch.cpp | 1872 ++ - .../loongarch/c2_MacroAssembler_loongarch.hpp | 144 + - .../cpu/loongarch/c2_globals_loongarch.hpp | 90 + - .../cpu/loongarch/c2_init_loongarch.cpp | 37 + - .../c2_safepointPollStubTable_loongarch.cpp | 50 + - .../cpu/loongarch/codeBuffer_loongarch.hpp | 35 + - .../cpu/loongarch/compiledIC_loongarch.cpp | 144 + - src/hotspot/cpu/loongarch/copy_loongarch.hpp | 77 + - .../cpu/loongarch/disassembler_loongarch.hpp | 57 + - .../loongarch/foreign_globals_loongarch.cpp | 42 + - .../loongarch/foreign_globals_loongarch.hpp | 31 + - src/hotspot/cpu/loongarch/frame_loongarch.cpp | 668 + - src/hotspot/cpu/loongarch/frame_loongarch.hpp | 162 + - .../cpu/loongarch/frame_loongarch.inline.hpp | 245 + - .../gc/g1/g1BarrierSetAssembler_loongarch.cpp | 532 + - .../gc/g1/g1BarrierSetAssembler_loongarch.hpp | 71 + - .../loongarch/gc/g1/g1Globals_loongarch.hpp | 30 + - .../shared/barrierSetAssembler_loongarch.cpp | 320 + - .../shared/barrierSetAssembler_loongarch.hpp | 93 + - .../gc/shared/barrierSetNMethod_loongarch.cpp | 157 + - ...cardTableBarrierSetAssembler_loongarch.cpp | 119 + - ...cardTableBarrierSetAssembler_loongarch.hpp | 44 + - .../modRefBarrierSetAssembler_loongarch.cpp | 53 + - .../modRefBarrierSetAssembler_loongarch.hpp | 54 + - .../c1/shenandoahBarrierSetC1_loongarch.cpp | 130 + - ...henandoahBarrierSetAssembler_loongarch.cpp | 784 + - ...henandoahBarrierSetAssembler_loongarch.hpp | 85 + - .../gc/shenandoah/shenandoah_loongarch_64.ad | 222 + - .../gc/z/zBarrierSetAssembler_loongarch.cpp | 462 + - .../gc/z/zBarrierSetAssembler_loongarch.hpp | 101 + - .../cpu/loongarch/gc/z/zGlobals_loongarch.cpp | 211 + - .../cpu/loongarch/gc/z/zGlobals_loongarch.hpp | 35 + - .../cpu/loongarch/gc/z/z_loongarch_64.ad | 273 + - .../loongarch/globalDefinitions_loongarch.hpp | 55 + - .../cpu/loongarch/globals_loongarch.hpp | 106 + - .../cpu/loongarch/icBuffer_loongarch.cpp | 100 + - .../cpu/loongarch/icache_loongarch.cpp | 42 + - .../cpu/loongarch/icache_loongarch.hpp | 41 + - .../cpu/loongarch/interp_masm_loongarch.hpp | 270 + - .../loongarch/interp_masm_loongarch_64.cpp | 2042 ++ - .../cpu/loongarch/interpreterRT_loongarch.hpp | 62 + - .../loongarch/interpreterRT_loongarch_64.cpp | 282 + - .../loongarch/javaFrameAnchor_loongarch.hpp | 87 + - .../jniFastGetField_loongarch_64.cpp | 197 + - .../cpu/loongarch/jniTypes_loongarch.hpp | 143 + - .../jvmciCodeInstaller_loongarch.cpp | 202 + - src/hotspot/cpu/loongarch/loongarch.ad | 25 + - src/hotspot/cpu/loongarch/loongarch_64.ad | 15678 ++++++++++++++++ - .../loongarch/macroAssembler_loongarch.cpp | 3839 ++++ - .../loongarch/macroAssembler_loongarch.hpp | 754 + - .../macroAssembler_loongarch.inline.hpp | 34 + - .../macroAssembler_loongarch_trig.cpp | 1633 ++ - .../cpu/loongarch/matcher_loongarch.hpp | 145 + - .../cpu/loongarch/methodHandles_loongarch.cpp | 585 + - .../cpu/loongarch/methodHandles_loongarch.hpp | 62 + - .../cpu/loongarch/nativeInst_loongarch.cpp | 529 + - .../cpu/loongarch/nativeInst_loongarch.hpp | 531 + - .../cpu/loongarch/registerMap_loongarch.hpp | 61 + - .../register_definitions_loongarch.cpp | 103 + - .../cpu/loongarch/register_loongarch.cpp | 59 + - .../cpu/loongarch/register_loongarch.hpp | 499 + - .../cpu/loongarch/relocInfo_loongarch.cpp | 132 + - .../cpu/loongarch/relocInfo_loongarch.hpp | 44 + - .../cpu/loongarch/runtime_loongarch_64.cpp | 199 + - .../loongarch/sharedRuntime_loongarch_64.cpp | 3113 +++ - .../loongarch/stubGenerator_loongarch_64.cpp | 5176 +++++ - .../cpu/loongarch/stubRoutines_loongarch.hpp | 89 + - .../loongarch/stubRoutines_loongarch_64.cpp | 183 + - ...templateInterpreterGenerator_loongarch.cpp | 2197 +++ - .../cpu/loongarch/templateTable_loongarch.hpp | 43 + - .../loongarch/templateTable_loongarch_64.cpp | 4043 ++++ - .../universalNativeInvoker_loongarch_64.cpp | 32 + - .../universalUpcallHandler_loongarch_64.cpp | 41 + - .../cpu/loongarch/vmStructs_loongarch.hpp | 61 + - .../loongarch/vm_version_ext_loongarch.cpp | 85 + - .../loongarch/vm_version_ext_loongarch.hpp | 54 + - .../cpu/loongarch/vm_version_loongarch.cpp | 432 + - .../cpu/loongarch/vm_version_loongarch.hpp | 295 + - src/hotspot/cpu/loongarch/vmreg_loongarch.cpp | 58 + - src/hotspot/cpu/loongarch/vmreg_loongarch.hpp | 58 + - .../cpu/loongarch/vmreg_loongarch.inline.hpp | 39 + - .../loongarch/vtableStubs_loongarch_64.cpp | 331 + - .../cpu/mips/abstractInterpreter_mips.cpp | 133 + - src/hotspot/cpu/mips/assembler_mips.cpp | 764 + - src/hotspot/cpu/mips/assembler_mips.hpp | 1777 ++ - .../cpu/mips/assembler_mips.inline.hpp | 33 + - src/hotspot/cpu/mips/bytes_mips.hpp | 181 + - .../cpu/mips/c2_MacroAssembler_mips.cpp | 614 + - .../cpu/mips/c2_MacroAssembler_mips.hpp | 162 + - src/hotspot/cpu/mips/c2_globals_mips.hpp | 91 + - src/hotspot/cpu/mips/c2_init_mips.cpp | 34 + - src/hotspot/cpu/mips/codeBuffer_mips.hpp | 35 + - src/hotspot/cpu/mips/compiledIC_mips.cpp | 147 + - src/hotspot/cpu/mips/copy_mips.hpp | 77 + - src/hotspot/cpu/mips/depChecker_mips.cpp | 30 + - src/hotspot/cpu/mips/depChecker_mips.hpp | 31 + - src/hotspot/cpu/mips/disassembler_mips.hpp | 57 + - src/hotspot/cpu/mips/foreign_globals_mips.cpp | 42 + - src/hotspot/cpu/mips/foreign_globals_mips.hpp | 31 + - src/hotspot/cpu/mips/frame_mips.cpp | 665 + - src/hotspot/cpu/mips/frame_mips.hpp | 215 + - src/hotspot/cpu/mips/frame_mips.inline.hpp | 238 + - .../mips/gc/g1/g1BarrierSetAssembler_mips.cpp | 373 + - .../mips/gc/g1/g1BarrierSetAssembler_mips.hpp | 71 + - src/hotspot/cpu/mips/gc/g1/g1Globals_mips.hpp | 30 + - .../gc/shared/barrierSetAssembler_mips.cpp | 194 + - .../gc/shared/barrierSetAssembler_mips.hpp | 84 + - .../mips/gc/shared/barrierSetNMethod_mips.cpp | 41 + - .../cardTableBarrierSetAssembler_mips.cpp | 144 + - .../cardTableBarrierSetAssembler_mips.hpp | 42 + - .../shared/modRefBarrierSetAssembler_mips.cpp | 53 + - .../shared/modRefBarrierSetAssembler_mips.hpp | 54 + - .../cpu/mips/globalDefinitions_mips.hpp | 47 + - src/hotspot/cpu/mips/globals_mips.hpp | 132 + - src/hotspot/cpu/mips/icBuffer_mips.cpp | 96 + - src/hotspot/cpu/mips/icache_mips.cpp | 41 + - src/hotspot/cpu/mips/icache_mips.hpp | 41 + - src/hotspot/cpu/mips/interp_masm_mips.hpp | 266 + - src/hotspot/cpu/mips/interp_masm_mips_64.cpp | 2140 +++ - src/hotspot/cpu/mips/interpreterRT_mips.hpp | 60 + - .../cpu/mips/interpreterRT_mips_64.cpp | 260 + - src/hotspot/cpu/mips/javaFrameAnchor_mips.hpp | 87 + - .../cpu/mips/jniFastGetField_mips_64.cpp | 203 + - src/hotspot/cpu/mips/jniTypes_mips.hpp | 143 + - src/hotspot/cpu/mips/macroAssembler_mips.cpp | 3686 ++++ - src/hotspot/cpu/mips/macroAssembler_mips.hpp | 704 + - .../cpu/mips/macroAssembler_mips.inline.hpp | 34 + - src/hotspot/cpu/mips/matcher_mips.hpp | 145 + - src/hotspot/cpu/mips/methodHandles_mips.cpp | 597 + - src/hotspot/cpu/mips/methodHandles_mips.hpp | 62 + - src/hotspot/cpu/mips/mips.ad | 25 + - src/hotspot/cpu/mips/mips_64.ad | 12317 ++++++++++++ - src/hotspot/cpu/mips/nativeInst_mips.cpp | 1825 ++ - src/hotspot/cpu/mips/nativeInst_mips.hpp | 734 + - src/hotspot/cpu/mips/registerMap_mips.hpp | 50 + - .../cpu/mips/register_definitions_mips.cpp | 103 + - src/hotspot/cpu/mips/register_mips.cpp | 52 + - src/hotspot/cpu/mips/register_mips.hpp | 344 + - src/hotspot/cpu/mips/relocInfo_mips.cpp | 160 + - src/hotspot/cpu/mips/relocInfo_mips.hpp | 44 + - src/hotspot/cpu/mips/runtime_mips_64.cpp | 206 + - .../cpu/mips/sharedRuntime_mips_64.cpp | 3384 ++++ - .../cpu/mips/stubGenerator_mips_64.cpp | 2725 +++ - src/hotspot/cpu/mips/stubRoutines_mips.hpp | 59 + - src/hotspot/cpu/mips/stubRoutines_mips_64.cpp | 35 + - .../templateInterpreterGenerator_mips.cpp | 2094 +++ - src/hotspot/cpu/mips/templateTable_mips.hpp | 43 + - .../cpu/mips/templateTable_mips_64.cpp | 4613 +++++ - .../mips/universalNativeInvoker_mips_64.cpp | 32 + - .../mips/universalUpcallHandler_mips_64.cpp | 41 + - src/hotspot/cpu/mips/vmStructs_mips.hpp | 68 + - src/hotspot/cpu/mips/vm_version_ext_mips.cpp | 90 + - src/hotspot/cpu/mips/vm_version_ext_mips.hpp | 54 + - src/hotspot/cpu/mips/vm_version_mips.cpp | 523 + - src/hotspot/cpu/mips/vm_version_mips.hpp | 218 + - src/hotspot/cpu/mips/vmreg_mips.cpp | 56 + - src/hotspot/cpu/mips/vmreg_mips.hpp | 56 + - src/hotspot/cpu/mips/vmreg_mips.inline.hpp | 38 + - src/hotspot/cpu/mips/vtableStubs_mips_64.cpp | 348 + - src/hotspot/cpu/ppc/gc/z/zGlobals_ppc.hpp | 2 + - src/hotspot/os/linux/os_linux.cpp | 10 +- - .../assembler_linux_loongarch.cpp | 24 + - .../atomic_linux_loongarch.hpp | 275 + - .../bytes_linux_loongarch.inline.hpp | 37 + - .../copy_linux_loongarch.inline.hpp | 125 + - .../gc/z/zSyscall_linux_loongarch.hpp | 41 + - .../globals_linux_loongarch.hpp | 43 + - .../os_cpu/linux_loongarch/linux_loongarch.s | 25 + - .../orderAccess_linux_loongarch.hpp | 52 + - .../linux_loongarch/os_linux_loongarch.cpp | 529 + - .../linux_loongarch/os_linux_loongarch.hpp | 38 + - .../prefetch_linux_loongarch.inline.hpp | 56 + - .../safefetch_linux_loongarch64.S | 56 + - .../thread_linux_loongarch.cpp | 105 + - .../thread_linux_loongarch.hpp | 66 + - .../vmStructs_linux_loongarch.hpp | 55 + - .../vm_version_linux_loongarch.cpp | 95 + - .../linux_mips/assembler_linux_mips.cpp | 24 + - .../os_cpu/linux_mips/atomic_linux_mips.hpp | 194 + - .../linux_mips/bytes_linux_mips.inline.hpp | 37 + - .../linux_mips/copy_linux_mips.inline.hpp | 125 + - .../os_cpu/linux_mips/globals_linux_mips.hpp | 51 + - src/hotspot/os_cpu/linux_mips/linux_mips.s | 25 + - .../linux_mips/orderAccess_linux_mips.hpp | 52 + - .../os_cpu/linux_mips/os_linux_mips.cpp | 817 + - .../os_cpu/linux_mips/os_linux_mips.hpp | 39 + - .../linux_mips/prefetch_linux_mips.inline.hpp | 58 + - .../linux_mips/safefetch_linux_mips64.S | 60 + - .../os_cpu/linux_mips/thread_linux_mips.cpp | 108 + - .../os_cpu/linux_mips/thread_linux_mips.hpp | 66 + - .../linux_mips/vmStructs_linux_mips.hpp | 55 + - .../linux_mips/vm_version_linux_mips.cpp | 28 + - src/hotspot/share/asm/codeBuffer.cpp | 7 + - src/hotspot/share/c1/c1_Compiler.cpp | 8 +- - src/hotspot/share/c1/c1_LIR.cpp | 36 +- - src/hotspot/share/c1/c1_LIR.hpp | 59 +- - src/hotspot/share/c1/c1_LIRAssembler.cpp | 10 +- - src/hotspot/share/c1/c1_LIRAssembler.hpp | 10 +- - src/hotspot/share/c1/c1_LinearScan.cpp | 14 +- - src/hotspot/share/code/nmethod.cpp | 12 +- - src/hotspot/share/code/relocInfo.cpp | 4 +- - src/hotspot/share/code/relocInfo.hpp | 19 +- - src/hotspot/share/code/vtableStubs.cpp | 11 + - .../gc/g1/g1ParScanThreadState.inline.hpp | 9 + - .../gc/shenandoah/shenandoahArguments.cpp | 8 +- - src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp | 8 +- - .../share/interpreter/interpreterRuntime.cpp | 8 +- - .../share/interpreter/interpreterRuntime.hpp | 8 +- - .../templateInterpreterGenerator.hpp | 10 +- - .../share/jfr/utilities/jfrBigEndian.hpp | 8 +- - src/hotspot/share/jvmci/vmStructs_jvmci.cpp | 17 + - src/hotspot/share/memory/metaspace.cpp | 17 +- - src/hotspot/share/opto/output.cpp | 43 + - src/hotspot/share/opto/type.cpp | 14 + - src/hotspot/share/runtime/objectMonitor.cpp | 10 + - src/hotspot/share/runtime/os.cpp | 9 +- - src/hotspot/share/runtime/sharedRuntime.cpp | 8 +- - .../share/runtime/sharedRuntimeTrig.cpp | 15 + - src/hotspot/share/runtime/thread.inline.hpp | 10 +- - src/hotspot/share/utilities/macros.hpp | 56 + - .../native/libsaproc/LinuxDebuggerLocal.cpp | 28 +- - .../linux/native/libsaproc/libproc.h | 13 +- - .../linux/native/libsaproc/ps_proc.c | 8 +- - .../classes/sun/jvm/hotspot/HotSpotAgent.java | 12 + - .../MachineDescriptionLOONGARCH64.java | 41 + - .../debugger/MachineDescriptionMIPS64.java | 41 + - .../debugger/linux/LinuxCDebugger.java | 26 +- - .../linux/LinuxThreadContextFactory.java | 14 +- - .../loongarch64/LinuxLOONGARCH64CFrame.java | 92 + - .../LinuxLOONGARCH64ThreadContext.java | 47 + - .../linux/mips64/LinuxMIPS64CFrame.java | 80 + - .../mips64/LinuxMIPS64ThreadContext.java | 47 + - .../loongarch64/LOONGARCH64ThreadContext.java | 128 + - .../debugger/mips64/MIPS64ThreadContext.java | 128 + - .../hotspot/debugger/posix/elf/ELFHeader.java | 8 + - .../loongarch64/ProcLOONGARCH64Thread.java | 92 + - .../ProcLOONGARCH64ThreadContext.java | 47 + - .../ProcLOONGARCH64ThreadFactory.java | 45 + - .../proc/mips64/ProcMIPS64Thread.java | 92 + - .../proc/mips64/ProcMIPS64ThreadContext.java | 47 + - .../proc/mips64/ProcMIPS64ThreadFactory.java | 45 + - .../debugger/remote/RemoteDebuggerClient.java | 18 + - .../loongarch64/RemoteLOONGARCH64Thread.java | 54 + - .../RemoteLOONGARCH64ThreadContext.java | 51 + - .../RemoteLOONGARCH64ThreadFactory.java | 45 + - .../remote/mips64/RemoteMIPS64Thread.java | 54 + - .../mips64/RemoteMIPS64ThreadContext.java | 51 + - .../mips64/RemoteMIPS64ThreadFactory.java | 45 + - .../sun/jvm/hotspot/runtime/Threads.java | 12 + - .../LinuxLOONGARCH64JavaThreadPDAccess.java | 135 + - .../LinuxMIPS64JavaThreadPDAccess.java | 135 + - .../LOONGARCH64CurrentFrameGuess.java | 250 + - .../runtime/loongarch64/LOONGARCH64Frame.java | 519 + - .../LOONGARCH64JavaCallWrapper.java | 59 + - .../loongarch64/LOONGARCH64RegisterMap.java | 52 + - .../mips64/MIPS64CurrentFrameGuess.java | 217 + - .../hotspot/runtime/mips64/MIPS64Frame.java | 539 + - .../runtime/mips64/MIPS64JavaCallWrapper.java | 59 + - .../runtime/mips64/MIPS64RegisterMap.java | 52 + - .../jvm/hotspot/utilities/PlatformInfo.java | 15 +- - ...LoongArch64HotSpotJVMCIBackendFactory.java | 142 + - .../LoongArch64HotSpotRegisterConfig.java | 297 + - .../LoongArch64HotSpotVMConfig.java | 77 + - .../ci/hotspot/loongarch64/package-info.java | 28 + - .../jdk/vm/ci/loongarch64/LoongArch64.java | 249 + - .../vm/ci/loongarch64/LoongArch64Kind.java | 163 + - .../jdk/vm/ci/loongarch64/package-info.java | 28 + - .../share/classes/module-info.java | 7 + - src/utils/hsdis/Makefile | 3 + - .../TestAESIntrinsicsOnSupportedConfig.java | 8 +- - .../TestAESIntrinsicsOnUnsupportedConfig.java | 8 +- - .../testcases/GenericTestCaseForOtherCPU.java | 13 +- - .../vm/ci/code/test/CodeInstallationTest.java | 11 + - .../jdk/vm/ci/code/test/DataPatchTest.java | 11 +- - .../code/test/InterpreterFrameSizeTest.java | 11 +- - .../code/test/MaxOopMapStackOffsetTest.java | 11 +- - .../jdk/vm/ci/code/test/NativeCallTest.java | 11 +- - .../code/test/SimpleCodeInstallationTest.java | 11 +- - .../vm/ci/code/test/SimpleDebugInfoTest.java | 11 +- - .../code/test/VirtualObjectDebugInfoTest.java | 11 +- - .../loongarch64/LoongArch64TestAssembler.java | 568 + - .../compiler/lib/ir_framework/IRNode.java | 10 +- - .../runtime/TestConstantsInError.java | 12 +- - .../argumentcorruption/CheckLongArgs.java | 7 + - .../criticalnatives/lookup/LookUp.java | 7 + - .../sha/predicate/IntrinsicPredicates.java | 17 +- - .../ReservedStack/ReservedStackTest.java | 9 +- - .../ir_framework/tests/TestIRMatching.java | 8 +- - .../nsk/share/jdi/ArgumentHandler.java | 178 +- - .../jdk/jfr/event/os/TestCPUInformation.java | 10 +- - test/jdk/sun/security/pkcs11/PKCS11Test.java | 6 + - ...stMutuallyExclusivePlatformPredicates.java | 8 +- - test/lib/jdk/test/lib/Platform.java | 14 + - 316 files changed, 118576 insertions(+), 189 deletions(-) - create mode 100644 src/hotspot/cpu/loongarch/abstractInterpreter_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/assembler_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/assembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/assembler_loongarch.inline.hpp - create mode 100644 src/hotspot/cpu/loongarch/bytes_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/c1_CodeStubs_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/c1_Defs_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/c1_FpuStackSim_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/c1_FpuStackSim_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/c1_FrameMap_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/c1_FrameMap_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/c1_LIRAssembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/c1_LIRAssembler_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/c1_LIRGenerator_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/c1_LIR_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/c1_LinearScan_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/c1_LinearScan_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/c1_MacroAssembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/c1_MacroAssembler_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/c1_Runtime1_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/c1_globals_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/c2_MacroAssembler_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/c2_MacroAssembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/c2_globals_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/c2_init_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/c2_safepointPollStubTable_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/codeBuffer_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/compiledIC_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/copy_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/disassembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/foreign_globals_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/foreign_globals_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/frame_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/frame_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/frame_loongarch.inline.hpp - create mode 100644 src/hotspot/cpu/loongarch/gc/g1/g1BarrierSetAssembler_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/gc/g1/g1BarrierSetAssembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/gc/g1/g1Globals_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shared/barrierSetAssembler_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shared/barrierSetAssembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shared/barrierSetNMethod_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shared/cardTableBarrierSetAssembler_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shared/cardTableBarrierSetAssembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shared/modRefBarrierSetAssembler_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shared/modRefBarrierSetAssembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shenandoah/c1/shenandoahBarrierSetC1_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shenandoah/shenandoahBarrierSetAssembler_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shenandoah/shenandoahBarrierSetAssembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/gc/shenandoah/shenandoah_loongarch_64.ad - create mode 100644 src/hotspot/cpu/loongarch/gc/z/zBarrierSetAssembler_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/gc/z/zBarrierSetAssembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/gc/z/zGlobals_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/gc/z/zGlobals_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/gc/z/z_loongarch_64.ad - create mode 100644 src/hotspot/cpu/loongarch/globalDefinitions_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/globals_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/icBuffer_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/icache_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/icache_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/interp_masm_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/interp_masm_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/interpreterRT_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/interpreterRT_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/javaFrameAnchor_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/jniFastGetField_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/jniTypes_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/jvmciCodeInstaller_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/loongarch.ad - create mode 100644 src/hotspot/cpu/loongarch/loongarch_64.ad - create mode 100644 src/hotspot/cpu/loongarch/macroAssembler_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/macroAssembler_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/macroAssembler_loongarch.inline.hpp - create mode 100644 src/hotspot/cpu/loongarch/macroAssembler_loongarch_trig.cpp - create mode 100644 src/hotspot/cpu/loongarch/matcher_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/methodHandles_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/methodHandles_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/nativeInst_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/nativeInst_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/registerMap_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/register_definitions_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/register_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/register_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/relocInfo_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/relocInfo_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/runtime_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/sharedRuntime_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/stubGenerator_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/stubRoutines_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/stubRoutines_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/templateInterpreterGenerator_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/templateTable_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/templateTable_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/universalNativeInvoker_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/universalUpcallHandler_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/loongarch/vmStructs_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/vm_version_ext_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/vm_version_ext_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/vm_version_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/vm_version_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/vmreg_loongarch.cpp - create mode 100644 src/hotspot/cpu/loongarch/vmreg_loongarch.hpp - create mode 100644 src/hotspot/cpu/loongarch/vmreg_loongarch.inline.hpp - create mode 100644 src/hotspot/cpu/loongarch/vtableStubs_loongarch_64.cpp - create mode 100644 src/hotspot/cpu/mips/abstractInterpreter_mips.cpp - create mode 100644 src/hotspot/cpu/mips/assembler_mips.cpp - create mode 100644 src/hotspot/cpu/mips/assembler_mips.hpp - create mode 100644 src/hotspot/cpu/mips/assembler_mips.inline.hpp - create mode 100644 src/hotspot/cpu/mips/bytes_mips.hpp - create mode 100644 src/hotspot/cpu/mips/c2_MacroAssembler_mips.cpp - create mode 100644 src/hotspot/cpu/mips/c2_MacroAssembler_mips.hpp - create mode 100644 src/hotspot/cpu/mips/c2_globals_mips.hpp - create mode 100644 src/hotspot/cpu/mips/c2_init_mips.cpp - create mode 100644 src/hotspot/cpu/mips/codeBuffer_mips.hpp - create mode 100644 src/hotspot/cpu/mips/compiledIC_mips.cpp - create mode 100644 src/hotspot/cpu/mips/copy_mips.hpp - create mode 100644 src/hotspot/cpu/mips/depChecker_mips.cpp - create mode 100644 src/hotspot/cpu/mips/depChecker_mips.hpp - create mode 100644 src/hotspot/cpu/mips/disassembler_mips.hpp - create mode 100644 src/hotspot/cpu/mips/foreign_globals_mips.cpp - create mode 100644 src/hotspot/cpu/mips/foreign_globals_mips.hpp - create mode 100644 src/hotspot/cpu/mips/frame_mips.cpp - create mode 100644 src/hotspot/cpu/mips/frame_mips.hpp - create mode 100644 src/hotspot/cpu/mips/frame_mips.inline.hpp - create mode 100644 src/hotspot/cpu/mips/gc/g1/g1BarrierSetAssembler_mips.cpp - create mode 100644 src/hotspot/cpu/mips/gc/g1/g1BarrierSetAssembler_mips.hpp - create mode 100644 src/hotspot/cpu/mips/gc/g1/g1Globals_mips.hpp - create mode 100644 src/hotspot/cpu/mips/gc/shared/barrierSetAssembler_mips.cpp - create mode 100644 src/hotspot/cpu/mips/gc/shared/barrierSetAssembler_mips.hpp - create mode 100644 src/hotspot/cpu/mips/gc/shared/barrierSetNMethod_mips.cpp - create mode 100644 src/hotspot/cpu/mips/gc/shared/cardTableBarrierSetAssembler_mips.cpp - create mode 100644 src/hotspot/cpu/mips/gc/shared/cardTableBarrierSetAssembler_mips.hpp - create mode 100644 src/hotspot/cpu/mips/gc/shared/modRefBarrierSetAssembler_mips.cpp - create mode 100644 src/hotspot/cpu/mips/gc/shared/modRefBarrierSetAssembler_mips.hpp - create mode 100644 src/hotspot/cpu/mips/globalDefinitions_mips.hpp - create mode 100644 src/hotspot/cpu/mips/globals_mips.hpp - create mode 100644 src/hotspot/cpu/mips/icBuffer_mips.cpp - create mode 100644 src/hotspot/cpu/mips/icache_mips.cpp - create mode 100644 src/hotspot/cpu/mips/icache_mips.hpp - create mode 100644 src/hotspot/cpu/mips/interp_masm_mips.hpp - create mode 100644 src/hotspot/cpu/mips/interp_masm_mips_64.cpp - create mode 100644 src/hotspot/cpu/mips/interpreterRT_mips.hpp - create mode 100644 src/hotspot/cpu/mips/interpreterRT_mips_64.cpp - create mode 100644 src/hotspot/cpu/mips/javaFrameAnchor_mips.hpp - create mode 100644 src/hotspot/cpu/mips/jniFastGetField_mips_64.cpp - create mode 100644 src/hotspot/cpu/mips/jniTypes_mips.hpp - create mode 100644 src/hotspot/cpu/mips/macroAssembler_mips.cpp - create mode 100644 src/hotspot/cpu/mips/macroAssembler_mips.hpp - create mode 100644 src/hotspot/cpu/mips/macroAssembler_mips.inline.hpp - create mode 100644 src/hotspot/cpu/mips/matcher_mips.hpp - create mode 100644 src/hotspot/cpu/mips/methodHandles_mips.cpp - create mode 100644 src/hotspot/cpu/mips/methodHandles_mips.hpp - create mode 100644 src/hotspot/cpu/mips/mips.ad - create mode 100644 src/hotspot/cpu/mips/mips_64.ad - create mode 100644 src/hotspot/cpu/mips/nativeInst_mips.cpp - create mode 100644 src/hotspot/cpu/mips/nativeInst_mips.hpp - create mode 100644 src/hotspot/cpu/mips/registerMap_mips.hpp - create mode 100644 src/hotspot/cpu/mips/register_definitions_mips.cpp - create mode 100644 src/hotspot/cpu/mips/register_mips.cpp - create mode 100644 src/hotspot/cpu/mips/register_mips.hpp - create mode 100644 src/hotspot/cpu/mips/relocInfo_mips.cpp - create mode 100644 src/hotspot/cpu/mips/relocInfo_mips.hpp - create mode 100644 src/hotspot/cpu/mips/runtime_mips_64.cpp - create mode 100644 src/hotspot/cpu/mips/sharedRuntime_mips_64.cpp - create mode 100644 src/hotspot/cpu/mips/stubGenerator_mips_64.cpp - create mode 100644 src/hotspot/cpu/mips/stubRoutines_mips.hpp - create mode 100644 src/hotspot/cpu/mips/stubRoutines_mips_64.cpp - create mode 100644 src/hotspot/cpu/mips/templateInterpreterGenerator_mips.cpp - create mode 100644 src/hotspot/cpu/mips/templateTable_mips.hpp - create mode 100644 src/hotspot/cpu/mips/templateTable_mips_64.cpp - create mode 100644 src/hotspot/cpu/mips/universalNativeInvoker_mips_64.cpp - create mode 100644 src/hotspot/cpu/mips/universalUpcallHandler_mips_64.cpp - create mode 100644 src/hotspot/cpu/mips/vmStructs_mips.hpp - create mode 100644 src/hotspot/cpu/mips/vm_version_ext_mips.cpp - create mode 100644 src/hotspot/cpu/mips/vm_version_ext_mips.hpp - create mode 100644 src/hotspot/cpu/mips/vm_version_mips.cpp - create mode 100644 src/hotspot/cpu/mips/vm_version_mips.hpp - create mode 100644 src/hotspot/cpu/mips/vmreg_mips.cpp - create mode 100644 src/hotspot/cpu/mips/vmreg_mips.hpp - create mode 100644 src/hotspot/cpu/mips/vmreg_mips.inline.hpp - create mode 100644 src/hotspot/cpu/mips/vtableStubs_mips_64.cpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/assembler_linux_loongarch.cpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/atomic_linux_loongarch.hpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/bytes_linux_loongarch.inline.hpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/copy_linux_loongarch.inline.hpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/gc/z/zSyscall_linux_loongarch.hpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/globals_linux_loongarch.hpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/linux_loongarch.s - create mode 100644 src/hotspot/os_cpu/linux_loongarch/orderAccess_linux_loongarch.hpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.cpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.hpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/prefetch_linux_loongarch.inline.hpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/safefetch_linux_loongarch64.S - create mode 100644 src/hotspot/os_cpu/linux_loongarch/thread_linux_loongarch.cpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/thread_linux_loongarch.hpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/vmStructs_linux_loongarch.hpp - create mode 100644 src/hotspot/os_cpu/linux_loongarch/vm_version_linux_loongarch.cpp - create mode 100644 src/hotspot/os_cpu/linux_mips/assembler_linux_mips.cpp - create mode 100644 src/hotspot/os_cpu/linux_mips/atomic_linux_mips.hpp - create mode 100644 src/hotspot/os_cpu/linux_mips/bytes_linux_mips.inline.hpp - create mode 100644 src/hotspot/os_cpu/linux_mips/copy_linux_mips.inline.hpp - create mode 100644 src/hotspot/os_cpu/linux_mips/globals_linux_mips.hpp - create mode 100644 src/hotspot/os_cpu/linux_mips/linux_mips.s - create mode 100644 src/hotspot/os_cpu/linux_mips/orderAccess_linux_mips.hpp - create mode 100644 src/hotspot/os_cpu/linux_mips/os_linux_mips.cpp - create mode 100644 src/hotspot/os_cpu/linux_mips/os_linux_mips.hpp - create mode 100644 src/hotspot/os_cpu/linux_mips/prefetch_linux_mips.inline.hpp - create mode 100644 src/hotspot/os_cpu/linux_mips/safefetch_linux_mips64.S - create mode 100644 src/hotspot/os_cpu/linux_mips/thread_linux_mips.cpp - create mode 100644 src/hotspot/os_cpu/linux_mips/thread_linux_mips.hpp - create mode 100644 src/hotspot/os_cpu/linux_mips/vmStructs_linux_mips.hpp - create mode 100644 src/hotspot/os_cpu/linux_mips/vm_version_linux_mips.cpp - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionLOONGARCH64.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionMIPS64.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64CFrame.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64ThreadContext.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64CFrame.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64ThreadContext.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/loongarch64/LOONGARCH64ThreadContext.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/mips64/MIPS64ThreadContext.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64Thread.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadContext.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadFactory.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64Thread.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadContext.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadFactory.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64Thread.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadContext.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadFactory.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64Thread.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadContext.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadFactory.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_loongarch64/LinuxLOONGARCH64JavaThreadPDAccess.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_mips64/LinuxMIPS64JavaThreadPDAccess.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64CurrentFrameGuess.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64Frame.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64JavaCallWrapper.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64RegisterMap.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64CurrentFrameGuess.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64Frame.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64JavaCallWrapper.java - create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64RegisterMap.java - create mode 100644 src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotJVMCIBackendFactory.java - create mode 100644 src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotRegisterConfig.java - create mode 100644 src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotVMConfig.java - create mode 100644 src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/package-info.java - create mode 100644 src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/LoongArch64.java - create mode 100644 src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/LoongArch64Kind.java - create mode 100644 src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/package-info.java - create mode 100644 test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/loongarch64/LoongArch64TestAssembler.java - diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4 -index aa99b037b..d0c3a8575 100644 +index aa99b037b2b..d0c3a85757b 100644 --- a/make/autoconf/jvm-features.m4 +++ b/make/autoconf/jvm-features.m4 @@ -23,6 +23,12 @@ @@ -654,7 +81,7 @@ index aa99b037b..d0c3a8575 100644 JVM_FEATURES_CHECK_JFR JVM_FEATURES_CHECK_JVMCI diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4 -index eb6626626..931434c4e 100644 +index eb66266262b..931434c4e7b 100644 --- a/make/autoconf/platform.m4 +++ b/make/autoconf/platform.m4 @@ -23,6 +23,12 @@ @@ -712,7 +139,7 @@ index eb6626626..931434c4e 100644 elif test "x$OPENJDK_$1_CPU" = xsparc; then diff --git a/src/hotspot/cpu/loongarch/abstractInterpreter_loongarch.cpp b/src/hotspot/cpu/loongarch/abstractInterpreter_loongarch.cpp new file mode 100644 -index 000000000..fbcd4050b +index 00000000000..fbcd4050b64 --- /dev/null +++ b/src/hotspot/cpu/loongarch/abstractInterpreter_loongarch.cpp @@ -0,0 +1,133 @@ @@ -851,7 +278,7 @@ index 000000000..fbcd4050b + diff --git a/src/hotspot/cpu/loongarch/assembler_loongarch.cpp b/src/hotspot/cpu/loongarch/assembler_loongarch.cpp new file mode 100644 -index 000000000..e6e62ccca +index 00000000000..e6e62cccad0 --- /dev/null +++ b/src/hotspot/cpu/loongarch/assembler_loongarch.cpp @@ -0,0 +1,849 @@ @@ -1706,7 +1133,7 @@ index 000000000..e6e62ccca +} diff --git a/src/hotspot/cpu/loongarch/assembler_loongarch.hpp b/src/hotspot/cpu/loongarch/assembler_loongarch.hpp new file mode 100644 -index 000000000..5eae8b999 +index 00000000000..5eae8b9995c --- /dev/null +++ b/src/hotspot/cpu/loongarch/assembler_loongarch.hpp @@ -0,0 +1,2831 @@ @@ -4543,7 +3970,7 @@ index 000000000..5eae8b999 +#endif // CPU_LOONGARCH_ASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/assembler_loongarch.inline.hpp b/src/hotspot/cpu/loongarch/assembler_loongarch.inline.hpp new file mode 100644 -index 000000000..9ca0cd450 +index 00000000000..9ca0cd45047 --- /dev/null +++ b/src/hotspot/cpu/loongarch/assembler_loongarch.inline.hpp @@ -0,0 +1,33 @@ @@ -4582,7 +4009,7 @@ index 000000000..9ca0cd450 +#endif // CPU_LOONGARCH_ASSEMBLER_LOONGARCH_INLINE_HPP diff --git a/src/hotspot/cpu/loongarch/bytes_loongarch.hpp b/src/hotspot/cpu/loongarch/bytes_loongarch.hpp new file mode 100644 -index 000000000..c15344eb3 +index 00000000000..c15344eb390 --- /dev/null +++ b/src/hotspot/cpu/loongarch/bytes_loongarch.hpp @@ -0,0 +1,73 @@ @@ -4661,7 +4088,7 @@ index 000000000..c15344eb3 +#endif // CPU_LOONGARCH_BYTES_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/c1_CodeStubs_loongarch_64.cpp b/src/hotspot/cpu/loongarch/c1_CodeStubs_loongarch_64.cpp new file mode 100644 -index 000000000..663a9aec2 +index 00000000000..663a9aec2a9 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_CodeStubs_loongarch_64.cpp @@ -0,0 +1,360 @@ @@ -5027,7 +4454,7 @@ index 000000000..663a9aec2 +#undef __ diff --git a/src/hotspot/cpu/loongarch/c1_Defs_loongarch.hpp b/src/hotspot/cpu/loongarch/c1_Defs_loongarch.hpp new file mode 100644 -index 000000000..1140e4443 +index 00000000000..1140e44431d --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_Defs_loongarch.hpp @@ -0,0 +1,79 @@ @@ -5112,7 +4539,7 @@ index 000000000..1140e4443 +#endif // CPU_LOONGARCH_C1_DEFS_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/c1_FpuStackSim_loongarch.hpp b/src/hotspot/cpu/loongarch/c1_FpuStackSim_loongarch.hpp new file mode 100644 -index 000000000..047412d03 +index 00000000000..047412d036a --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_FpuStackSim_loongarch.hpp @@ -0,0 +1,32 @@ @@ -5150,7 +4577,7 @@ index 000000000..047412d03 +#endif // CPU_LOONGARCH_C1_FPUSTACKSIM_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/c1_FpuStackSim_loongarch_64.cpp b/src/hotspot/cpu/loongarch/c1_FpuStackSim_loongarch_64.cpp new file mode 100644 -index 000000000..1a89c437a +index 00000000000..1a89c437a83 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_FpuStackSim_loongarch_64.cpp @@ -0,0 +1,31 @@ @@ -5187,7 +4614,7 @@ index 000000000..1a89c437a +#include "precompiled.hpp" diff --git a/src/hotspot/cpu/loongarch/c1_FrameMap_loongarch.hpp b/src/hotspot/cpu/loongarch/c1_FrameMap_loongarch.hpp new file mode 100644 -index 000000000..4f0cf0536 +index 00000000000..4f0cf053617 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_FrameMap_loongarch.hpp @@ -0,0 +1,143 @@ @@ -5336,7 +4763,7 @@ index 000000000..4f0cf0536 +#endif // CPU_LOONGARCH_C1_FRAMEMAP_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/c1_FrameMap_loongarch_64.cpp b/src/hotspot/cpu/loongarch/c1_FrameMap_loongarch_64.cpp new file mode 100644 -index 000000000..8d439fda0 +index 00000000000..8d439fda060 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_FrameMap_loongarch_64.cpp @@ -0,0 +1,362 @@ @@ -5704,7 +5131,7 @@ index 000000000..8d439fda0 +} diff --git a/src/hotspot/cpu/loongarch/c1_LIRAssembler_loongarch.hpp b/src/hotspot/cpu/loongarch/c1_LIRAssembler_loongarch.hpp new file mode 100644 -index 000000000..baadeebb2 +index 00000000000..baadeebb243 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_LIRAssembler_loongarch.hpp @@ -0,0 +1,84 @@ @@ -5794,7 +5221,7 @@ index 000000000..baadeebb2 +#endif // CPU_LOONGARCH_C1_LIRASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/c1_LIRAssembler_loongarch_64.cpp b/src/hotspot/cpu/loongarch/c1_LIRAssembler_loongarch_64.cpp new file mode 100644 -index 000000000..cde86e3b3 +index 00000000000..cde86e3b3a1 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_LIRAssembler_loongarch_64.cpp @@ -0,0 +1,3402 @@ @@ -9202,7 +8629,7 @@ index 000000000..cde86e3b3 +#undef __ diff --git a/src/hotspot/cpu/loongarch/c1_LIRGenerator_loongarch_64.cpp b/src/hotspot/cpu/loongarch/c1_LIRGenerator_loongarch_64.cpp new file mode 100644 -index 000000000..28298dcc3 +index 00000000000..28298dcc375 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_LIRGenerator_loongarch_64.cpp @@ -0,0 +1,1386 @@ @@ -10594,7 +10021,7 @@ index 000000000..28298dcc3 +} diff --git a/src/hotspot/cpu/loongarch/c1_LIR_loongarch_64.cpp b/src/hotspot/cpu/loongarch/c1_LIR_loongarch_64.cpp new file mode 100644 -index 000000000..01e8c9f27 +index 00000000000..01e8c9f270e --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_LIR_loongarch_64.cpp @@ -0,0 +1,57 @@ @@ -10657,7 +10084,7 @@ index 000000000..01e8c9f27 +#endif // PRODUCT diff --git a/src/hotspot/cpu/loongarch/c1_LinearScan_loongarch.hpp b/src/hotspot/cpu/loongarch/c1_LinearScan_loongarch.hpp new file mode 100644 -index 000000000..f15dacafe +index 00000000000..f15dacafeba --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_LinearScan_loongarch.hpp @@ -0,0 +1,70 @@ @@ -10733,7 +10160,7 @@ index 000000000..f15dacafe +#endif // CPU_LOONGARCH_C1_LINEARSCAN_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/c1_LinearScan_loongarch_64.cpp b/src/hotspot/cpu/loongarch/c1_LinearScan_loongarch_64.cpp new file mode 100644 -index 000000000..219b2e367 +index 00000000000..219b2e3671c --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_LinearScan_loongarch_64.cpp @@ -0,0 +1,33 @@ @@ -10772,7 +10199,7 @@ index 000000000..219b2e367 +} diff --git a/src/hotspot/cpu/loongarch/c1_MacroAssembler_loongarch.hpp b/src/hotspot/cpu/loongarch/c1_MacroAssembler_loongarch.hpp new file mode 100644 -index 000000000..38ff4c583 +index 00000000000..38ff4c58369 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_MacroAssembler_loongarch.hpp @@ -0,0 +1,112 @@ @@ -10890,7 +10317,7 @@ index 000000000..38ff4c583 +#endif // CPU_LOONGARCH_C1_MACROASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/c1_MacroAssembler_loongarch_64.cpp b/src/hotspot/cpu/loongarch/c1_MacroAssembler_loongarch_64.cpp new file mode 100644 -index 000000000..022195134 +index 00000000000..0221951342a --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_MacroAssembler_loongarch_64.cpp @@ -0,0 +1,365 @@ @@ -11261,7 +10688,7 @@ index 000000000..022195134 +#endif // ifndef PRODUCT diff --git a/src/hotspot/cpu/loongarch/c1_Runtime1_loongarch_64.cpp b/src/hotspot/cpu/loongarch/c1_Runtime1_loongarch_64.cpp new file mode 100644 -index 000000000..87da18e29 +index 00000000000..87da18e294a --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_Runtime1_loongarch_64.cpp @@ -0,0 +1,1148 @@ @@ -12415,7 +11842,7 @@ index 000000000..87da18e29 +} diff --git a/src/hotspot/cpu/loongarch/c1_globals_loongarch.hpp b/src/hotspot/cpu/loongarch/c1_globals_loongarch.hpp new file mode 100644 -index 000000000..ce84af28c +index 00000000000..ce84af28c9b --- /dev/null +++ b/src/hotspot/cpu/loongarch/c1_globals_loongarch.hpp @@ -0,0 +1,65 @@ @@ -12486,7 +11913,7 @@ index 000000000..ce84af28c +#endif // CPU_LOONGARCH_C1_GLOBALS_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/c2_MacroAssembler_loongarch.cpp b/src/hotspot/cpu/loongarch/c2_MacroAssembler_loongarch.cpp new file mode 100644 -index 000000000..0c91c74d6 +index 00000000000..0c91c74d63e --- /dev/null +++ b/src/hotspot/cpu/loongarch/c2_MacroAssembler_loongarch.cpp @@ -0,0 +1,1872 @@ @@ -14364,7 +13791,7 @@ index 000000000..0c91c74d6 +} diff --git a/src/hotspot/cpu/loongarch/c2_MacroAssembler_loongarch.hpp b/src/hotspot/cpu/loongarch/c2_MacroAssembler_loongarch.hpp new file mode 100644 -index 000000000..2babade2e +index 00000000000..2babade2e22 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c2_MacroAssembler_loongarch.hpp @@ -0,0 +1,144 @@ @@ -14514,7 +13941,7 @@ index 000000000..2babade2e +#endif // CPU_LOONGARCH_C2_MACROASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/c2_globals_loongarch.hpp b/src/hotspot/cpu/loongarch/c2_globals_loongarch.hpp new file mode 100644 -index 000000000..0e40e2ca7 +index 00000000000..0e40e2ca7cf --- /dev/null +++ b/src/hotspot/cpu/loongarch/c2_globals_loongarch.hpp @@ -0,0 +1,90 @@ @@ -14610,7 +14037,7 @@ index 000000000..0e40e2ca7 +#endif // CPU_LOONGARCH_C2_GLOBALS_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/c2_init_loongarch.cpp b/src/hotspot/cpu/loongarch/c2_init_loongarch.cpp new file mode 100644 -index 000000000..ec78b942d +index 00000000000..ec78b942d40 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c2_init_loongarch.cpp @@ -0,0 +1,37 @@ @@ -14653,7 +14080,7 @@ index 000000000..ec78b942d +} diff --git a/src/hotspot/cpu/loongarch/c2_safepointPollStubTable_loongarch.cpp b/src/hotspot/cpu/loongarch/c2_safepointPollStubTable_loongarch.cpp new file mode 100644 -index 000000000..866858b26 +index 00000000000..866858b26b8 --- /dev/null +++ b/src/hotspot/cpu/loongarch/c2_safepointPollStubTable_loongarch.cpp @@ -0,0 +1,50 @@ @@ -14709,7 +14136,7 @@ index 000000000..866858b26 +#undef __ diff --git a/src/hotspot/cpu/loongarch/codeBuffer_loongarch.hpp b/src/hotspot/cpu/loongarch/codeBuffer_loongarch.hpp new file mode 100644 -index 000000000..653d95806 +index 00000000000..653d95806bf --- /dev/null +++ b/src/hotspot/cpu/loongarch/codeBuffer_loongarch.hpp @@ -0,0 +1,35 @@ @@ -14750,7 +14177,7 @@ index 000000000..653d95806 +#endif // CPU_LOONGARCH_CODEBUFFER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/compiledIC_loongarch.cpp b/src/hotspot/cpu/loongarch/compiledIC_loongarch.cpp new file mode 100644 -index 000000000..b3f70a166 +index 00000000000..b3f70a1665b --- /dev/null +++ b/src/hotspot/cpu/loongarch/compiledIC_loongarch.cpp @@ -0,0 +1,144 @@ @@ -14900,7 +14327,7 @@ index 000000000..b3f70a166 +#endif // !PRODUCT diff --git a/src/hotspot/cpu/loongarch/copy_loongarch.hpp b/src/hotspot/cpu/loongarch/copy_loongarch.hpp new file mode 100644 -index 000000000..54b847a73 +index 00000000000..54b847a7369 --- /dev/null +++ b/src/hotspot/cpu/loongarch/copy_loongarch.hpp @@ -0,0 +1,77 @@ @@ -14983,7 +14410,7 @@ index 000000000..54b847a73 +#endif //CPU_LOONGARCH_COPY_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/disassembler_loongarch.hpp b/src/hotspot/cpu/loongarch/disassembler_loongarch.hpp new file mode 100644 -index 000000000..fd176c8f0 +index 00000000000..fd176c8f056 --- /dev/null +++ b/src/hotspot/cpu/loongarch/disassembler_loongarch.hpp @@ -0,0 +1,57 @@ @@ -15046,7 +14473,7 @@ index 000000000..fd176c8f0 +#endif // CPU_LOONGARCH_DISASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/foreign_globals_loongarch.cpp b/src/hotspot/cpu/loongarch/foreign_globals_loongarch.cpp new file mode 100644 -index 000000000..fb4647c27 +index 00000000000..fb4647c2723 --- /dev/null +++ b/src/hotspot/cpu/loongarch/foreign_globals_loongarch.cpp @@ -0,0 +1,42 @@ @@ -15094,7 +14521,7 @@ index 000000000..fb4647c27 +} diff --git a/src/hotspot/cpu/loongarch/foreign_globals_loongarch.hpp b/src/hotspot/cpu/loongarch/foreign_globals_loongarch.hpp new file mode 100644 -index 000000000..680a27363 +index 00000000000..680a27363ec --- /dev/null +++ b/src/hotspot/cpu/loongarch/foreign_globals_loongarch.hpp @@ -0,0 +1,31 @@ @@ -15131,7 +14558,7 @@ index 000000000..680a27363 +#endif // CPU_LOONGARCH_FOREIGN_GLOBALS_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/frame_loongarch.cpp b/src/hotspot/cpu/loongarch/frame_loongarch.cpp new file mode 100644 -index 000000000..1aba8e4dd +index 00000000000..1aba8e4dd27 --- /dev/null +++ b/src/hotspot/cpu/loongarch/frame_loongarch.cpp @@ -0,0 +1,668 @@ @@ -15805,7 +15232,7 @@ index 000000000..1aba8e4dd +#endif diff --git a/src/hotspot/cpu/loongarch/frame_loongarch.hpp b/src/hotspot/cpu/loongarch/frame_loongarch.hpp new file mode 100644 -index 000000000..738b53063 +index 00000000000..738b5306366 --- /dev/null +++ b/src/hotspot/cpu/loongarch/frame_loongarch.hpp @@ -0,0 +1,162 @@ @@ -15973,7 +15400,7 @@ index 000000000..738b53063 +#endif // CPU_LOONGARCH_FRAME_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/frame_loongarch.inline.hpp b/src/hotspot/cpu/loongarch/frame_loongarch.inline.hpp new file mode 100644 -index 000000000..8b0e05027 +index 00000000000..8b0e0502701 --- /dev/null +++ b/src/hotspot/cpu/loongarch/frame_loongarch.inline.hpp @@ -0,0 +1,245 @@ @@ -16224,7 +15651,7 @@ index 000000000..8b0e05027 +#endif // CPU_LOONGARCH_FRAME_LOONGARCH_INLINE_HPP diff --git a/src/hotspot/cpu/loongarch/gc/g1/g1BarrierSetAssembler_loongarch.cpp b/src/hotspot/cpu/loongarch/gc/g1/g1BarrierSetAssembler_loongarch.cpp new file mode 100644 -index 000000000..e12926450 +index 00000000000..e129264506b --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/g1/g1BarrierSetAssembler_loongarch.cpp @@ -0,0 +1,532 @@ @@ -16762,7 +16189,7 @@ index 000000000..e12926450 +#endif // COMPILER1 diff --git a/src/hotspot/cpu/loongarch/gc/g1/g1BarrierSetAssembler_loongarch.hpp b/src/hotspot/cpu/loongarch/gc/g1/g1BarrierSetAssembler_loongarch.hpp new file mode 100644 -index 000000000..745046ac0 +index 00000000000..745046ac0cc --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/g1/g1BarrierSetAssembler_loongarch.hpp @@ -0,0 +1,71 @@ @@ -16839,7 +16266,7 @@ index 000000000..745046ac0 +#endif // CPU_LOONGARCH_GC_G1_G1BARRIERSETASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/gc/g1/g1Globals_loongarch.hpp b/src/hotspot/cpu/loongarch/gc/g1/g1Globals_loongarch.hpp new file mode 100644 -index 000000000..44b7ff148 +index 00000000000..44b7ff1485f --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/g1/g1Globals_loongarch.hpp @@ -0,0 +1,30 @@ @@ -16875,7 +16302,7 @@ index 000000000..44b7ff148 +#endif // CPU_LOONGARCH_GC_G1_G1GLOBALS_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/gc/shared/barrierSetAssembler_loongarch.cpp b/src/hotspot/cpu/loongarch/gc/shared/barrierSetAssembler_loongarch.cpp new file mode 100644 -index 000000000..4706559a8 +index 00000000000..4706559a837 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shared/barrierSetAssembler_loongarch.cpp @@ -0,0 +1,320 @@ @@ -17201,7 +16628,7 @@ index 000000000..4706559a8 + diff --git a/src/hotspot/cpu/loongarch/gc/shared/barrierSetAssembler_loongarch.hpp b/src/hotspot/cpu/loongarch/gc/shared/barrierSetAssembler_loongarch.hpp new file mode 100644 -index 000000000..f87c20611 +index 00000000000..f87c2061132 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shared/barrierSetAssembler_loongarch.hpp @@ -0,0 +1,93 @@ @@ -17300,7 +16727,7 @@ index 000000000..f87c20611 +#endif // CPU_LOONGARCH_GC_SHARED_BARRIERSETASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/gc/shared/barrierSetNMethod_loongarch.cpp b/src/hotspot/cpu/loongarch/gc/shared/barrierSetNMethod_loongarch.cpp new file mode 100644 -index 000000000..65cee60f6 +index 00000000000..65cee60f69d --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shared/barrierSetNMethod_loongarch.cpp @@ -0,0 +1,157 @@ @@ -17463,7 +16890,7 @@ index 000000000..65cee60f6 +} diff --git a/src/hotspot/cpu/loongarch/gc/shared/cardTableBarrierSetAssembler_loongarch.cpp b/src/hotspot/cpu/loongarch/gc/shared/cardTableBarrierSetAssembler_loongarch.cpp new file mode 100644 -index 000000000..96dc9562a +index 00000000000..96dc9562a02 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shared/cardTableBarrierSetAssembler_loongarch.cpp @@ -0,0 +1,119 @@ @@ -17588,7 +17015,7 @@ index 000000000..96dc9562a +} diff --git a/src/hotspot/cpu/loongarch/gc/shared/cardTableBarrierSetAssembler_loongarch.hpp b/src/hotspot/cpu/loongarch/gc/shared/cardTableBarrierSetAssembler_loongarch.hpp new file mode 100644 -index 000000000..7d628ca6a +index 00000000000..7d628ca6a85 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shared/cardTableBarrierSetAssembler_loongarch.hpp @@ -0,0 +1,44 @@ @@ -17638,7 +17065,7 @@ index 000000000..7d628ca6a +#endif // CPU_LOONGARCH_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/gc/shared/modRefBarrierSetAssembler_loongarch.cpp b/src/hotspot/cpu/loongarch/gc/shared/modRefBarrierSetAssembler_loongarch.cpp new file mode 100644 -index 000000000..71c3cb493 +index 00000000000..71c3cb49386 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shared/modRefBarrierSetAssembler_loongarch.cpp @@ -0,0 +1,53 @@ @@ -17697,7 +17124,7 @@ index 000000000..71c3cb493 +} diff --git a/src/hotspot/cpu/loongarch/gc/shared/modRefBarrierSetAssembler_loongarch.hpp b/src/hotspot/cpu/loongarch/gc/shared/modRefBarrierSetAssembler_loongarch.hpp new file mode 100644 -index 000000000..086bdebb5 +index 00000000000..086bdebb506 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shared/modRefBarrierSetAssembler_loongarch.hpp @@ -0,0 +1,54 @@ @@ -17757,7 +17184,7 @@ index 000000000..086bdebb5 +#endif // CPU_LOONGARCH_GC_SHARED_MODREFBARRIERSETASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/gc/shenandoah/c1/shenandoahBarrierSetC1_loongarch.cpp b/src/hotspot/cpu/loongarch/gc/shenandoah/c1/shenandoahBarrierSetC1_loongarch.cpp new file mode 100644 -index 000000000..f82a2500d +index 00000000000..f82a2500d41 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shenandoah/c1/shenandoahBarrierSetC1_loongarch.cpp @@ -0,0 +1,130 @@ @@ -17893,7 +17320,7 @@ index 000000000..f82a2500d +} diff --git a/src/hotspot/cpu/loongarch/gc/shenandoah/shenandoahBarrierSetAssembler_loongarch.cpp b/src/hotspot/cpu/loongarch/gc/shenandoah/shenandoahBarrierSetAssembler_loongarch.cpp new file mode 100644 -index 000000000..e90623fe9 +index 00000000000..e90623fe989 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shenandoah/shenandoahBarrierSetAssembler_loongarch.cpp @@ -0,0 +1,784 @@ @@ -18683,7 +18110,7 @@ index 000000000..e90623fe9 +#endif // COMPILER1 diff --git a/src/hotspot/cpu/loongarch/gc/shenandoah/shenandoahBarrierSetAssembler_loongarch.hpp b/src/hotspot/cpu/loongarch/gc/shenandoah/shenandoahBarrierSetAssembler_loongarch.hpp new file mode 100644 -index 000000000..e2c862f6c +index 00000000000..e2c862f6c5c --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shenandoah/shenandoahBarrierSetAssembler_loongarch.hpp @@ -0,0 +1,85 @@ @@ -18774,7 +18201,7 @@ index 000000000..e2c862f6c +#endif // CPU_LOONGARCH_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/gc/shenandoah/shenandoah_loongarch_64.ad b/src/hotspot/cpu/loongarch/gc/shenandoah/shenandoah_loongarch_64.ad new file mode 100644 -index 000000000..04f67d231 +index 00000000000..04f67d23157 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/shenandoah/shenandoah_loongarch_64.ad @@ -0,0 +1,222 @@ @@ -19002,7 +18429,7 @@ index 000000000..04f67d231 +%} diff --git a/src/hotspot/cpu/loongarch/gc/z/zBarrierSetAssembler_loongarch.cpp b/src/hotspot/cpu/loongarch/gc/z/zBarrierSetAssembler_loongarch.cpp new file mode 100644 -index 000000000..372d80cf1 +index 00000000000..372d80cf11b --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/z/zBarrierSetAssembler_loongarch.cpp @@ -0,0 +1,462 @@ @@ -19470,7 +18897,7 @@ index 000000000..372d80cf1 +#endif // COMPILER2 diff --git a/src/hotspot/cpu/loongarch/gc/z/zBarrierSetAssembler_loongarch.hpp b/src/hotspot/cpu/loongarch/gc/z/zBarrierSetAssembler_loongarch.hpp new file mode 100644 -index 000000000..6a96d6fdd +index 00000000000..6a96d6fdd60 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/z/zBarrierSetAssembler_loongarch.hpp @@ -0,0 +1,101 @@ @@ -19577,7 +19004,7 @@ index 000000000..6a96d6fdd +#endif // CPU_LOONGARCH_GC_Z_ZBARRIERSETASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/gc/z/zGlobals_loongarch.cpp b/src/hotspot/cpu/loongarch/gc/z/zGlobals_loongarch.cpp new file mode 100644 -index 000000000..85db1cf18 +index 00000000000..85db1cf1854 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/z/zGlobals_loongarch.cpp @@ -0,0 +1,211 @@ @@ -19794,7 +19221,7 @@ index 000000000..85db1cf18 +} diff --git a/src/hotspot/cpu/loongarch/gc/z/zGlobals_loongarch.hpp b/src/hotspot/cpu/loongarch/gc/z/zGlobals_loongarch.hpp new file mode 100644 -index 000000000..542fd2674 +index 00000000000..542fd267434 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/z/zGlobals_loongarch.hpp @@ -0,0 +1,35 @@ @@ -19835,7 +19262,7 @@ index 000000000..542fd2674 +#endif // CPU_LOONGARCH_GC_Z_ZGLOBALS_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/gc/z/z_loongarch_64.ad b/src/hotspot/cpu/loongarch/gc/z/z_loongarch_64.ad new file mode 100644 -index 000000000..262cfd50b +index 00000000000..262cfd50b65 --- /dev/null +++ b/src/hotspot/cpu/loongarch/gc/z/z_loongarch_64.ad @@ -0,0 +1,273 @@ @@ -20114,7 +19541,7 @@ index 000000000..262cfd50b +%} diff --git a/src/hotspot/cpu/loongarch/globalDefinitions_loongarch.hpp b/src/hotspot/cpu/loongarch/globalDefinitions_loongarch.hpp new file mode 100644 -index 000000000..363cd6e20 +index 00000000000..363cd6e2092 --- /dev/null +++ b/src/hotspot/cpu/loongarch/globalDefinitions_loongarch.hpp @@ -0,0 +1,55 @@ @@ -20175,7 +19602,7 @@ index 000000000..363cd6e20 +#endif // CPU_LOONGARCH_GLOBALDEFINITIONS_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/globals_loongarch.hpp b/src/hotspot/cpu/loongarch/globals_loongarch.hpp new file mode 100644 -index 000000000..2358ca315 +index 00000000000..2358ca31596 --- /dev/null +++ b/src/hotspot/cpu/loongarch/globals_loongarch.hpp @@ -0,0 +1,106 @@ @@ -20287,7 +19714,7 @@ index 000000000..2358ca315 +#endif // CPU_LOONGARCH_GLOBALS_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/icBuffer_loongarch.cpp b/src/hotspot/cpu/loongarch/icBuffer_loongarch.cpp new file mode 100644 -index 000000000..a8f08bbf4 +index 00000000000..a8f08bbf422 --- /dev/null +++ b/src/hotspot/cpu/loongarch/icBuffer_loongarch.cpp @@ -0,0 +1,100 @@ @@ -20393,7 +19820,7 @@ index 000000000..a8f08bbf4 +} diff --git a/src/hotspot/cpu/loongarch/icache_loongarch.cpp b/src/hotspot/cpu/loongarch/icache_loongarch.cpp new file mode 100644 -index 000000000..d577e41f5 +index 00000000000..d577e41f59c --- /dev/null +++ b/src/hotspot/cpu/loongarch/icache_loongarch.cpp @@ -0,0 +1,42 @@ @@ -20441,7 +19868,7 @@ index 000000000..d577e41f5 +} diff --git a/src/hotspot/cpu/loongarch/icache_loongarch.hpp b/src/hotspot/cpu/loongarch/icache_loongarch.hpp new file mode 100644 -index 000000000..3a180549f +index 00000000000..3a180549fc6 --- /dev/null +++ b/src/hotspot/cpu/loongarch/icache_loongarch.hpp @@ -0,0 +1,41 @@ @@ -20488,7 +19915,7 @@ index 000000000..3a180549f +#endif // CPU_LOONGARCH_ICACHE_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/interp_masm_loongarch.hpp b/src/hotspot/cpu/loongarch/interp_masm_loongarch.hpp new file mode 100644 -index 000000000..7dea5deb1 +index 00000000000..7dea5deb183 --- /dev/null +++ b/src/hotspot/cpu/loongarch/interp_masm_loongarch.hpp @@ -0,0 +1,270 @@ @@ -20764,7 +20191,7 @@ index 000000000..7dea5deb1 +#endif // CPU_LOONGARCH_INTERP_MASM_LOONGARCH_64_HPP diff --git a/src/hotspot/cpu/loongarch/interp_masm_loongarch_64.cpp b/src/hotspot/cpu/loongarch/interp_masm_loongarch_64.cpp new file mode 100644 -index 000000000..cb8ad8a35 +index 00000000000..cb8ad8a359c --- /dev/null +++ b/src/hotspot/cpu/loongarch/interp_masm_loongarch_64.cpp @@ -0,0 +1,2042 @@ @@ -22812,7 +22239,7 @@ index 000000000..cb8ad8a35 +} diff --git a/src/hotspot/cpu/loongarch/interpreterRT_loongarch.hpp b/src/hotspot/cpu/loongarch/interpreterRT_loongarch.hpp new file mode 100644 -index 000000000..d53d951a1 +index 00000000000..d53d951a160 --- /dev/null +++ b/src/hotspot/cpu/loongarch/interpreterRT_loongarch.hpp @@ -0,0 +1,62 @@ @@ -22880,7 +22307,7 @@ index 000000000..d53d951a1 +#endif // CPU_LOONGARCH_INTERPRETERRT_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/interpreterRT_loongarch_64.cpp b/src/hotspot/cpu/loongarch/interpreterRT_loongarch_64.cpp new file mode 100644 -index 000000000..85a199e76 +index 00000000000..85a199e760d --- /dev/null +++ b/src/hotspot/cpu/loongarch/interpreterRT_loongarch_64.cpp @@ -0,0 +1,282 @@ @@ -23168,7 +22595,7 @@ index 000000000..85a199e76 +JRT_END diff --git a/src/hotspot/cpu/loongarch/javaFrameAnchor_loongarch.hpp b/src/hotspot/cpu/loongarch/javaFrameAnchor_loongarch.hpp new file mode 100644 -index 000000000..048107c24 +index 00000000000..048107c2425 --- /dev/null +++ b/src/hotspot/cpu/loongarch/javaFrameAnchor_loongarch.hpp @@ -0,0 +1,87 @@ @@ -23261,7 +22688,7 @@ index 000000000..048107c24 +#endif // CPU_LOONGARCH_JAVAFRAMEANCHOR_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/jniFastGetField_loongarch_64.cpp b/src/hotspot/cpu/loongarch/jniFastGetField_loongarch_64.cpp new file mode 100644 -index 000000000..5b0828092 +index 00000000000..5b08280921c --- /dev/null +++ b/src/hotspot/cpu/loongarch/jniFastGetField_loongarch_64.cpp @@ -0,0 +1,197 @@ @@ -23464,7 +22891,7 @@ index 000000000..5b0828092 +} diff --git a/src/hotspot/cpu/loongarch/jniTypes_loongarch.hpp b/src/hotspot/cpu/loongarch/jniTypes_loongarch.hpp new file mode 100644 -index 000000000..0ee04e042 +index 00000000000..0ee04e042b5 --- /dev/null +++ b/src/hotspot/cpu/loongarch/jniTypes_loongarch.hpp @@ -0,0 +1,143 @@ @@ -23613,7 +23040,7 @@ index 000000000..0ee04e042 +#endif // CPU_LOONGARCH_JNITYPES_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/jvmciCodeInstaller_loongarch.cpp b/src/hotspot/cpu/loongarch/jvmciCodeInstaller_loongarch.cpp new file mode 100644 -index 000000000..eb75830ec +index 00000000000..eb75830ec9c --- /dev/null +++ b/src/hotspot/cpu/loongarch/jvmciCodeInstaller_loongarch.cpp @@ -0,0 +1,202 @@ @@ -23821,7 +23248,7 @@ index 000000000..eb75830ec +} diff --git a/src/hotspot/cpu/loongarch/loongarch.ad b/src/hotspot/cpu/loongarch/loongarch.ad new file mode 100644 -index 000000000..80dff0c76 +index 00000000000..80dff0c7626 --- /dev/null +++ b/src/hotspot/cpu/loongarch/loongarch.ad @@ -0,0 +1,25 @@ @@ -23852,10 +23279,10 @@ index 000000000..80dff0c76 + diff --git a/src/hotspot/cpu/loongarch/loongarch_64.ad b/src/hotspot/cpu/loongarch/loongarch_64.ad new file mode 100644 -index 000000000..0c6516fc1 +index 00000000000..7e01822e0e9 --- /dev/null +++ b/src/hotspot/cpu/loongarch/loongarch_64.ad -@@ -0,0 +1,15678 @@ +@@ -0,0 +1,15689 @@ +// +// Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2015, 2022, Loongson Technology. All rights reserved. @@ -30302,6 +29729,17 @@ index 000000000..0c6516fc1 + ins_pipe(empty); +%} + ++instruct same_addr_load_fence() %{ ++ match(SameAddrLoadFence); ++ ins_cost(400); ++ ++ format %{ "MEMBAR @ same_addr_load_fence" %} ++ ins_encode %{ ++ __ dbar(0x700); ++ %} ++ ins_pipe(pipe_slow); ++%} ++ +//----------Move Instructions-------------------------------------------------- +instruct castX2P(mRegP dst, mRegL src) %{ + match(Set dst (CastX2P src)); @@ -39536,7 +38974,7 @@ index 000000000..0c6516fc1 + diff --git a/src/hotspot/cpu/loongarch/macroAssembler_loongarch.cpp b/src/hotspot/cpu/loongarch/macroAssembler_loongarch.cpp new file mode 100644 -index 000000000..06fbc1815 +index 00000000000..06fbc181583 --- /dev/null +++ b/src/hotspot/cpu/loongarch/macroAssembler_loongarch.cpp @@ -0,0 +1,3839 @@ @@ -43381,7 +42819,7 @@ index 000000000..06fbc1815 +#endif diff --git a/src/hotspot/cpu/loongarch/macroAssembler_loongarch.hpp b/src/hotspot/cpu/loongarch/macroAssembler_loongarch.hpp new file mode 100644 -index 000000000..204ca1a1a +index 00000000000..204ca1a1a07 --- /dev/null +++ b/src/hotspot/cpu/loongarch/macroAssembler_loongarch.hpp @@ -0,0 +1,754 @@ @@ -44141,7 +43579,7 @@ index 000000000..204ca1a1a +#endif // CPU_LOONGARCH_MACROASSEMBLER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/macroAssembler_loongarch.inline.hpp b/src/hotspot/cpu/loongarch/macroAssembler_loongarch.inline.hpp new file mode 100644 -index 000000000..49302590c +index 00000000000..49302590c37 --- /dev/null +++ b/src/hotspot/cpu/loongarch/macroAssembler_loongarch.inline.hpp @@ -0,0 +1,34 @@ @@ -44181,13 +43619,13 @@ index 000000000..49302590c +#endif // CPU_LOONGARCH_MACROASSEMBLER_LOONGARCH_INLINE_HPP diff --git a/src/hotspot/cpu/loongarch/macroAssembler_loongarch_trig.cpp b/src/hotspot/cpu/loongarch/macroAssembler_loongarch_trig.cpp new file mode 100644 -index 000000000..63b5b0da7 +index 00000000000..9c74be2dbd3 --- /dev/null +++ b/src/hotspot/cpu/loongarch/macroAssembler_loongarch_trig.cpp -@@ -0,0 +1,1633 @@ +@@ -0,0 +1,1634 @@ +/* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, Cavium. All rights reserved. (By BELLSOFT) -+ * Copyright (c) 2022, Loongson Technology. All rights reserved. ++ * Copyright (c) 2022, 2024, Loongson Technology. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it @@ -45094,7 +44532,7 @@ index 000000000..63b5b0da7 + b(Q_DONE); + bind(JX_IS_0); + if (UseLASX) { -+ xvfmul_d(v28, v18, v6); // f[0,1] * x[0] ++ xvfmul_d(v28, v18, v6); // f[0,3] * x[0] + fmul_d(v30, v19, v6); // f[4] * x[0] + } else { + vfmul_d(v28, v18, v6); // f[0,1] * x[0] @@ -45323,6 +44761,7 @@ index 000000000..63b5b0da7 + st_w(tmp2, SCR2, 0); + addi_w(SCR1, SCR1, 24); + addi_w(jz, jz, 1); ++ alsl_d(SCR2, jz, iqBase, 2 - 1); + st_w(tmp3, SCR2, 0); // iq[jz] = (int) fw + b(Z_ZERO_CHECK_DONE); + bind(Z_IS_LESS_THAN_TWO24B); @@ -45820,7 +45259,7 @@ index 000000000..63b5b0da7 +} diff --git a/src/hotspot/cpu/loongarch/matcher_loongarch.hpp b/src/hotspot/cpu/loongarch/matcher_loongarch.hpp new file mode 100644 -index 000000000..21a691b1f +index 00000000000..21a691b1faa --- /dev/null +++ b/src/hotspot/cpu/loongarch/matcher_loongarch.hpp @@ -0,0 +1,145 @@ @@ -45971,7 +45410,7 @@ index 000000000..21a691b1f +#endif // CPU_LOONGARCH_MATCHER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/methodHandles_loongarch.cpp b/src/hotspot/cpu/loongarch/methodHandles_loongarch.cpp new file mode 100644 -index 000000000..31b3040c3 +index 00000000000..31b3040c3a5 --- /dev/null +++ b/src/hotspot/cpu/loongarch/methodHandles_loongarch.cpp @@ -0,0 +1,585 @@ @@ -46562,7 +46001,7 @@ index 000000000..31b3040c3 +#endif //PRODUCT diff --git a/src/hotspot/cpu/loongarch/methodHandles_loongarch.hpp b/src/hotspot/cpu/loongarch/methodHandles_loongarch.hpp new file mode 100644 -index 000000000..a97520ea7 +index 00000000000..a97520ea768 --- /dev/null +++ b/src/hotspot/cpu/loongarch/methodHandles_loongarch.hpp @@ -0,0 +1,62 @@ @@ -46630,7 +46069,7 @@ index 000000000..a97520ea7 + } diff --git a/src/hotspot/cpu/loongarch/nativeInst_loongarch.cpp b/src/hotspot/cpu/loongarch/nativeInst_loongarch.cpp new file mode 100644 -index 000000000..25ef0ecd2 +index 00000000000..25ef0ecd224 --- /dev/null +++ b/src/hotspot/cpu/loongarch/nativeInst_loongarch.cpp @@ -0,0 +1,529 @@ @@ -47165,7 +46604,7 @@ index 000000000..25ef0ecd2 +} diff --git a/src/hotspot/cpu/loongarch/nativeInst_loongarch.hpp b/src/hotspot/cpu/loongarch/nativeInst_loongarch.hpp new file mode 100644 -index 000000000..0ec8ebddf +index 00000000000..0ec8ebddf09 --- /dev/null +++ b/src/hotspot/cpu/loongarch/nativeInst_loongarch.hpp @@ -0,0 +1,531 @@ @@ -47702,7 +47141,7 @@ index 000000000..0ec8ebddf +#endif // CPU_LOONGARCH_NATIVEINST_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/registerMap_loongarch.hpp b/src/hotspot/cpu/loongarch/registerMap_loongarch.hpp new file mode 100644 -index 000000000..07aa5b228 +index 00000000000..07aa5b22817 --- /dev/null +++ b/src/hotspot/cpu/loongarch/registerMap_loongarch.hpp @@ -0,0 +1,61 @@ @@ -47769,7 +47208,7 @@ index 000000000..07aa5b228 +#endif // CPU_LOONGARCH_REGISTERMAP_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/register_definitions_loongarch.cpp b/src/hotspot/cpu/loongarch/register_definitions_loongarch.cpp new file mode 100644 -index 000000000..58f40b747 +index 00000000000..58f40b747c2 --- /dev/null +++ b/src/hotspot/cpu/loongarch/register_definitions_loongarch.cpp @@ -0,0 +1,103 @@ @@ -47878,7 +47317,7 @@ index 000000000..58f40b747 +REGISTER_DEFINITION(FloatRegister, f31); diff --git a/src/hotspot/cpu/loongarch/register_loongarch.cpp b/src/hotspot/cpu/loongarch/register_loongarch.cpp new file mode 100644 -index 000000000..54d90167a +index 00000000000..54d90167a52 --- /dev/null +++ b/src/hotspot/cpu/loongarch/register_loongarch.cpp @@ -0,0 +1,59 @@ @@ -47943,7 +47382,7 @@ index 000000000..54d90167a +} diff --git a/src/hotspot/cpu/loongarch/register_loongarch.hpp b/src/hotspot/cpu/loongarch/register_loongarch.hpp new file mode 100644 -index 000000000..85669f435 +index 00000000000..85669f435c7 --- /dev/null +++ b/src/hotspot/cpu/loongarch/register_loongarch.hpp @@ -0,0 +1,499 @@ @@ -48448,7 +47887,7 @@ index 000000000..85669f435 +#endif //CPU_LOONGARCH_REGISTER_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/relocInfo_loongarch.cpp b/src/hotspot/cpu/loongarch/relocInfo_loongarch.cpp new file mode 100644 -index 000000000..079d581c9 +index 00000000000..079d581c91f --- /dev/null +++ b/src/hotspot/cpu/loongarch/relocInfo_loongarch.cpp @@ -0,0 +1,132 @@ @@ -48586,7 +48025,7 @@ index 000000000..079d581c9 +} diff --git a/src/hotspot/cpu/loongarch/relocInfo_loongarch.hpp b/src/hotspot/cpu/loongarch/relocInfo_loongarch.hpp new file mode 100644 -index 000000000..c85ca4963 +index 00000000000..c85ca4963f3 --- /dev/null +++ b/src/hotspot/cpu/loongarch/relocInfo_loongarch.hpp @@ -0,0 +1,44 @@ @@ -48636,7 +48075,7 @@ index 000000000..c85ca4963 +#endif // CPU_LOONGARCH_RELOCINFO_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/runtime_loongarch_64.cpp b/src/hotspot/cpu/loongarch/runtime_loongarch_64.cpp new file mode 100644 -index 000000000..fae11f47e +index 00000000000..fae11f47e62 --- /dev/null +++ b/src/hotspot/cpu/loongarch/runtime_loongarch_64.cpp @@ -0,0 +1,199 @@ @@ -48841,7 +48280,7 @@ index 000000000..fae11f47e +} diff --git a/src/hotspot/cpu/loongarch/sharedRuntime_loongarch_64.cpp b/src/hotspot/cpu/loongarch/sharedRuntime_loongarch_64.cpp new file mode 100644 -index 000000000..30c06f404 +index 00000000000..30c06f40493 --- /dev/null +++ b/src/hotspot/cpu/loongarch/sharedRuntime_loongarch_64.cpp @@ -0,0 +1,3113 @@ @@ -51960,7 +51399,7 @@ index 000000000..30c06f404 +#endif diff --git a/src/hotspot/cpu/loongarch/stubGenerator_loongarch_64.cpp b/src/hotspot/cpu/loongarch/stubGenerator_loongarch_64.cpp new file mode 100644 -index 000000000..21bfc7d78 +index 00000000000..21bfc7d78cb --- /dev/null +++ b/src/hotspot/cpu/loongarch/stubGenerator_loongarch_64.cpp @@ -0,0 +1,5176 @@ @@ -57142,7 +56581,7 @@ index 000000000..21bfc7d78 +} diff --git a/src/hotspot/cpu/loongarch/stubRoutines_loongarch.hpp b/src/hotspot/cpu/loongarch/stubRoutines_loongarch.hpp new file mode 100644 -index 000000000..20f2a14af +index 00000000000..20f2a14afcd --- /dev/null +++ b/src/hotspot/cpu/loongarch/stubRoutines_loongarch.hpp @@ -0,0 +1,89 @@ @@ -57237,7 +56676,7 @@ index 000000000..20f2a14af +#endif // CPU_LOONGARCH_STUBROUTINES_LOONGARCH_64_HPP diff --git a/src/hotspot/cpu/loongarch/stubRoutines_loongarch_64.cpp b/src/hotspot/cpu/loongarch/stubRoutines_loongarch_64.cpp new file mode 100644 -index 000000000..53ded54ae +index 00000000000..53ded54ae6c --- /dev/null +++ b/src/hotspot/cpu/loongarch/stubRoutines_loongarch_64.cpp @@ -0,0 +1,183 @@ @@ -57426,7 +56865,7 @@ index 000000000..53ded54ae +}; diff --git a/src/hotspot/cpu/loongarch/templateInterpreterGenerator_loongarch.cpp b/src/hotspot/cpu/loongarch/templateInterpreterGenerator_loongarch.cpp new file mode 100644 -index 000000000..02af7c8ff +index 00000000000..02af7c8ffa7 --- /dev/null +++ b/src/hotspot/cpu/loongarch/templateInterpreterGenerator_loongarch.cpp @@ -0,0 +1,2197 @@ @@ -59629,7 +59068,7 @@ index 000000000..02af7c8ff +#endif // !PRODUCT diff --git a/src/hotspot/cpu/loongarch/templateTable_loongarch.hpp b/src/hotspot/cpu/loongarch/templateTable_loongarch.hpp new file mode 100644 -index 000000000..ddb38faf4 +index 00000000000..ddb38faf446 --- /dev/null +++ b/src/hotspot/cpu/loongarch/templateTable_loongarch.hpp @@ -0,0 +1,43 @@ @@ -59678,7 +59117,7 @@ index 000000000..ddb38faf4 +#endif // CPU_LOONGARCH_TEMPLATETABLE_LOONGARCH_64_HPP diff --git a/src/hotspot/cpu/loongarch/templateTable_loongarch_64.cpp b/src/hotspot/cpu/loongarch/templateTable_loongarch_64.cpp new file mode 100644 -index 000000000..2474f90c2 +index 00000000000..2474f90c247 --- /dev/null +++ b/src/hotspot/cpu/loongarch/templateTable_loongarch_64.cpp @@ -0,0 +1,4043 @@ @@ -63727,7 +63166,7 @@ index 000000000..2474f90c2 +} diff --git a/src/hotspot/cpu/loongarch/universalNativeInvoker_loongarch_64.cpp b/src/hotspot/cpu/loongarch/universalNativeInvoker_loongarch_64.cpp new file mode 100644 -index 000000000..87f6a1132 +index 00000000000..87f6a113268 --- /dev/null +++ b/src/hotspot/cpu/loongarch/universalNativeInvoker_loongarch_64.cpp @@ -0,0 +1,32 @@ @@ -63765,7 +63204,7 @@ index 000000000..87f6a1132 +} diff --git a/src/hotspot/cpu/loongarch/universalUpcallHandler_loongarch_64.cpp b/src/hotspot/cpu/loongarch/universalUpcallHandler_loongarch_64.cpp new file mode 100644 -index 000000000..7586b0848 +index 00000000000..7586b084868 --- /dev/null +++ b/src/hotspot/cpu/loongarch/universalUpcallHandler_loongarch_64.cpp @@ -0,0 +1,41 @@ @@ -63812,7 +63251,7 @@ index 000000000..7586b0848 +} diff --git a/src/hotspot/cpu/loongarch/vmStructs_loongarch.hpp b/src/hotspot/cpu/loongarch/vmStructs_loongarch.hpp new file mode 100644 -index 000000000..5b9f7b789 +index 00000000000..5b9f7b78981 --- /dev/null +++ b/src/hotspot/cpu/loongarch/vmStructs_loongarch.hpp @@ -0,0 +1,61 @@ @@ -63879,7 +63318,7 @@ index 000000000..5b9f7b789 +#endif // CPU_LOONGARCH_VMSTRUCTS_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/vm_version_ext_loongarch.cpp b/src/hotspot/cpu/loongarch/vm_version_ext_loongarch.cpp new file mode 100644 -index 000000000..31da20e6f +index 00000000000..31da20e6f39 --- /dev/null +++ b/src/hotspot/cpu/loongarch/vm_version_ext_loongarch.cpp @@ -0,0 +1,85 @@ @@ -63970,7 +63409,7 @@ index 000000000..31da20e6f +} diff --git a/src/hotspot/cpu/loongarch/vm_version_ext_loongarch.hpp b/src/hotspot/cpu/loongarch/vm_version_ext_loongarch.hpp new file mode 100644 -index 000000000..1a9312313 +index 00000000000..1a93123134c --- /dev/null +++ b/src/hotspot/cpu/loongarch/vm_version_ext_loongarch.hpp @@ -0,0 +1,54 @@ @@ -64030,7 +63469,7 @@ index 000000000..1a9312313 +#endif // CPU_LOONGARCH_VM_VERSION_EXT_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/vm_version_loongarch.cpp b/src/hotspot/cpu/loongarch/vm_version_loongarch.cpp new file mode 100644 -index 000000000..1a1ac9231 +index 00000000000..1a1ac923117 --- /dev/null +++ b/src/hotspot/cpu/loongarch/vm_version_loongarch.cpp @@ -0,0 +1,432 @@ @@ -64468,7 +63907,7 @@ index 000000000..1a1ac9231 +} diff --git a/src/hotspot/cpu/loongarch/vm_version_loongarch.hpp b/src/hotspot/cpu/loongarch/vm_version_loongarch.hpp new file mode 100644 -index 000000000..cae9f863c +index 00000000000..cae9f863c30 --- /dev/null +++ b/src/hotspot/cpu/loongarch/vm_version_loongarch.hpp @@ -0,0 +1,295 @@ @@ -64769,7 +64208,7 @@ index 000000000..cae9f863c +#endif // CPU_LOONGARCH_VM_VERSION_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/vmreg_loongarch.cpp b/src/hotspot/cpu/loongarch/vmreg_loongarch.cpp new file mode 100644 -index 000000000..79d2560f4 +index 00000000000..79d2560f494 --- /dev/null +++ b/src/hotspot/cpu/loongarch/vmreg_loongarch.cpp @@ -0,0 +1,58 @@ @@ -64833,7 +64272,7 @@ index 000000000..79d2560f4 +} diff --git a/src/hotspot/cpu/loongarch/vmreg_loongarch.hpp b/src/hotspot/cpu/loongarch/vmreg_loongarch.hpp new file mode 100644 -index 000000000..819eaff0b +index 00000000000..819eaff0bb3 --- /dev/null +++ b/src/hotspot/cpu/loongarch/vmreg_loongarch.hpp @@ -0,0 +1,58 @@ @@ -64897,7 +64336,7 @@ index 000000000..819eaff0b +#endif // CPU_LOONGARCH_VMREG_LOONGARCH_HPP diff --git a/src/hotspot/cpu/loongarch/vmreg_loongarch.inline.hpp b/src/hotspot/cpu/loongarch/vmreg_loongarch.inline.hpp new file mode 100644 -index 000000000..edb78e36d +index 00000000000..edb78e36daa --- /dev/null +++ b/src/hotspot/cpu/loongarch/vmreg_loongarch.inline.hpp @@ -0,0 +1,39 @@ @@ -64942,7 +64381,7 @@ index 000000000..edb78e36d +#endif // CPU_LOONGARCH_VMREG_LOONGARCH_INLINE_HPP diff --git a/src/hotspot/cpu/loongarch/vtableStubs_loongarch_64.cpp b/src/hotspot/cpu/loongarch/vtableStubs_loongarch_64.cpp new file mode 100644 -index 000000000..6a190529b +index 00000000000..6a190529b64 --- /dev/null +++ b/src/hotspot/cpu/loongarch/vtableStubs_loongarch_64.cpp @@ -0,0 +1,331 @@ @@ -65279,7 +64718,7 @@ index 000000000..6a190529b +} diff --git a/src/hotspot/cpu/mips/abstractInterpreter_mips.cpp b/src/hotspot/cpu/mips/abstractInterpreter_mips.cpp new file mode 100644 -index 000000000..c34334ec4 +index 00000000000..c34334ec4c7 --- /dev/null +++ b/src/hotspot/cpu/mips/abstractInterpreter_mips.cpp @@ -0,0 +1,133 @@ @@ -65418,7 +64857,7 @@ index 000000000..c34334ec4 + diff --git a/src/hotspot/cpu/mips/assembler_mips.cpp b/src/hotspot/cpu/mips/assembler_mips.cpp new file mode 100644 -index 000000000..2205ef1a4 +index 00000000000..2205ef1a42c --- /dev/null +++ b/src/hotspot/cpu/mips/assembler_mips.cpp @@ -0,0 +1,764 @@ @@ -66188,7 +65627,7 @@ index 000000000..2205ef1a4 +} diff --git a/src/hotspot/cpu/mips/assembler_mips.hpp b/src/hotspot/cpu/mips/assembler_mips.hpp new file mode 100644 -index 000000000..8d0d9e0eb +index 00000000000..8d0d9e0eb21 --- /dev/null +++ b/src/hotspot/cpu/mips/assembler_mips.hpp @@ -0,0 +1,1777 @@ @@ -67971,7 +67410,7 @@ index 000000000..8d0d9e0eb +#endif // CPU_MIPS_VM_ASSEMBLER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/assembler_mips.inline.hpp b/src/hotspot/cpu/mips/assembler_mips.inline.hpp new file mode 100644 -index 000000000..39aeb5509 +index 00000000000..39aeb5509a7 --- /dev/null +++ b/src/hotspot/cpu/mips/assembler_mips.inline.hpp @@ -0,0 +1,33 @@ @@ -68010,7 +67449,7 @@ index 000000000..39aeb5509 +#endif // CPU_MIPS_VM_ASSEMBLER_MIPS_INLINE_HPP diff --git a/src/hotspot/cpu/mips/bytes_mips.hpp b/src/hotspot/cpu/mips/bytes_mips.hpp new file mode 100644 -index 000000000..4172db219 +index 00000000000..4172db219b1 --- /dev/null +++ b/src/hotspot/cpu/mips/bytes_mips.hpp @@ -0,0 +1,181 @@ @@ -68197,7 +67636,7 @@ index 000000000..4172db219 +#endif // CPU_MIPS_VM_BYTES_MIPS_HPP diff --git a/src/hotspot/cpu/mips/c2_MacroAssembler_mips.cpp b/src/hotspot/cpu/mips/c2_MacroAssembler_mips.cpp new file mode 100644 -index 000000000..3d98ec11f +index 00000000000..3d98ec11f6b --- /dev/null +++ b/src/hotspot/cpu/mips/c2_MacroAssembler_mips.cpp @@ -0,0 +1,614 @@ @@ -68817,7 +68256,7 @@ index 000000000..3d98ec11f +} diff --git a/src/hotspot/cpu/mips/c2_MacroAssembler_mips.hpp b/src/hotspot/cpu/mips/c2_MacroAssembler_mips.hpp new file mode 100644 -index 000000000..7bdf6e521 +index 00000000000..7bdf6e52126 --- /dev/null +++ b/src/hotspot/cpu/mips/c2_MacroAssembler_mips.hpp @@ -0,0 +1,162 @@ @@ -68985,7 +68424,7 @@ index 000000000..7bdf6e521 +#endif // CPU_MIPS_VM_C2_MACROASSEMBLER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/c2_globals_mips.hpp b/src/hotspot/cpu/mips/c2_globals_mips.hpp new file mode 100644 -index 000000000..f452cebf5 +index 00000000000..f452cebf549 --- /dev/null +++ b/src/hotspot/cpu/mips/c2_globals_mips.hpp @@ -0,0 +1,91 @@ @@ -69082,7 +68521,7 @@ index 000000000..f452cebf5 +#endif // CPU_MIPS_VM_C2_GLOBALS_MIPS_HPP diff --git a/src/hotspot/cpu/mips/c2_init_mips.cpp b/src/hotspot/cpu/mips/c2_init_mips.cpp new file mode 100644 -index 000000000..e6d5815f4 +index 00000000000..e6d5815f424 --- /dev/null +++ b/src/hotspot/cpu/mips/c2_init_mips.cpp @@ -0,0 +1,34 @@ @@ -69122,7 +68561,7 @@ index 000000000..e6d5815f4 +} diff --git a/src/hotspot/cpu/mips/codeBuffer_mips.hpp b/src/hotspot/cpu/mips/codeBuffer_mips.hpp new file mode 100644 -index 000000000..3cc191006 +index 00000000000..3cc191006d4 --- /dev/null +++ b/src/hotspot/cpu/mips/codeBuffer_mips.hpp @@ -0,0 +1,35 @@ @@ -69163,7 +68602,7 @@ index 000000000..3cc191006 +#endif // CPU_MIPS_VM_CODEBUFFER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/compiledIC_mips.cpp b/src/hotspot/cpu/mips/compiledIC_mips.cpp new file mode 100644 -index 000000000..81f67a92a +index 00000000000..81f67a92a78 --- /dev/null +++ b/src/hotspot/cpu/mips/compiledIC_mips.cpp @@ -0,0 +1,147 @@ @@ -69316,7 +68755,7 @@ index 000000000..81f67a92a +#endif // !PRODUCT diff --git a/src/hotspot/cpu/mips/copy_mips.hpp b/src/hotspot/cpu/mips/copy_mips.hpp new file mode 100644 -index 000000000..dcc77adfe +index 00000000000..dcc77adfec1 --- /dev/null +++ b/src/hotspot/cpu/mips/copy_mips.hpp @@ -0,0 +1,77 @@ @@ -69399,7 +68838,7 @@ index 000000000..dcc77adfe +#endif //CPU_MIPS_VM_COPY_MIPS_HPP diff --git a/src/hotspot/cpu/mips/depChecker_mips.cpp b/src/hotspot/cpu/mips/depChecker_mips.cpp new file mode 100644 -index 000000000..756ccb68f +index 00000000000..756ccb68f9c --- /dev/null +++ b/src/hotspot/cpu/mips/depChecker_mips.cpp @@ -0,0 +1,30 @@ @@ -69435,7 +68874,7 @@ index 000000000..756ccb68f +// Nothing to do on mips diff --git a/src/hotspot/cpu/mips/depChecker_mips.hpp b/src/hotspot/cpu/mips/depChecker_mips.hpp new file mode 100644 -index 000000000..11e52b4e8 +index 00000000000..11e52b4e8f8 --- /dev/null +++ b/src/hotspot/cpu/mips/depChecker_mips.hpp @@ -0,0 +1,31 @@ @@ -69472,7 +68911,7 @@ index 000000000..11e52b4e8 +#endif // CPU_MIPS_VM_DEPCHECKER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/disassembler_mips.hpp b/src/hotspot/cpu/mips/disassembler_mips.hpp new file mode 100644 -index 000000000..1ca0053b9 +index 00000000000..1ca0053b923 --- /dev/null +++ b/src/hotspot/cpu/mips/disassembler_mips.hpp @@ -0,0 +1,57 @@ @@ -69535,7 +68974,7 @@ index 000000000..1ca0053b9 +#endif // CPU_MIPS_VM_DISASSEMBLER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/foreign_globals_mips.cpp b/src/hotspot/cpu/mips/foreign_globals_mips.cpp new file mode 100644 -index 000000000..fb4647c27 +index 00000000000..fb4647c2723 --- /dev/null +++ b/src/hotspot/cpu/mips/foreign_globals_mips.cpp @@ -0,0 +1,42 @@ @@ -69583,7 +69022,7 @@ index 000000000..fb4647c27 +} diff --git a/src/hotspot/cpu/mips/foreign_globals_mips.hpp b/src/hotspot/cpu/mips/foreign_globals_mips.hpp new file mode 100644 -index 000000000..3c0068816 +index 00000000000..3c00688168a --- /dev/null +++ b/src/hotspot/cpu/mips/foreign_globals_mips.hpp @@ -0,0 +1,31 @@ @@ -69620,7 +69059,7 @@ index 000000000..3c0068816 +#endif // CPU_MIPS_VM_FOREIGN_GLOBALS_MIPS_HPP diff --git a/src/hotspot/cpu/mips/frame_mips.cpp b/src/hotspot/cpu/mips/frame_mips.cpp new file mode 100644 -index 000000000..bf2b87b24 +index 00000000000..bf2b87b24cc --- /dev/null +++ b/src/hotspot/cpu/mips/frame_mips.cpp @@ -0,0 +1,665 @@ @@ -70291,7 +69730,7 @@ index 000000000..bf2b87b24 +#endif diff --git a/src/hotspot/cpu/mips/frame_mips.hpp b/src/hotspot/cpu/mips/frame_mips.hpp new file mode 100644 -index 000000000..ac706e71f +index 00000000000..ac706e71f9a --- /dev/null +++ b/src/hotspot/cpu/mips/frame_mips.hpp @@ -0,0 +1,215 @@ @@ -70512,7 +69951,7 @@ index 000000000..ac706e71f +#endif // CPU_MIPS_VM_FRAME_MIPS_HPP diff --git a/src/hotspot/cpu/mips/frame_mips.inline.hpp b/src/hotspot/cpu/mips/frame_mips.inline.hpp new file mode 100644 -index 000000000..c408f01d6 +index 00000000000..c408f01d69a --- /dev/null +++ b/src/hotspot/cpu/mips/frame_mips.inline.hpp @@ -0,0 +1,238 @@ @@ -70756,7 +70195,7 @@ index 000000000..c408f01d6 +#endif // CPU_MIPS_VM_FRAME_MIPS_INLINE_HPP diff --git a/src/hotspot/cpu/mips/gc/g1/g1BarrierSetAssembler_mips.cpp b/src/hotspot/cpu/mips/gc/g1/g1BarrierSetAssembler_mips.cpp new file mode 100644 -index 000000000..196ff1582 +index 00000000000..196ff1582a1 --- /dev/null +++ b/src/hotspot/cpu/mips/gc/g1/g1BarrierSetAssembler_mips.cpp @@ -0,0 +1,373 @@ @@ -71135,7 +70574,7 @@ index 000000000..196ff1582 +} diff --git a/src/hotspot/cpu/mips/gc/g1/g1BarrierSetAssembler_mips.hpp b/src/hotspot/cpu/mips/gc/g1/g1BarrierSetAssembler_mips.hpp new file mode 100644 -index 000000000..ec5c243c3 +index 00000000000..ec5c243c3f1 --- /dev/null +++ b/src/hotspot/cpu/mips/gc/g1/g1BarrierSetAssembler_mips.hpp @@ -0,0 +1,71 @@ @@ -71212,7 +70651,7 @@ index 000000000..ec5c243c3 +#endif // CPU_MIPS_GC_G1_G1BARRIERSETASSEMBLER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/gc/g1/g1Globals_mips.hpp b/src/hotspot/cpu/mips/gc/g1/g1Globals_mips.hpp new file mode 100644 -index 000000000..f0c7badaa +index 00000000000..f0c7badaac7 --- /dev/null +++ b/src/hotspot/cpu/mips/gc/g1/g1Globals_mips.hpp @@ -0,0 +1,30 @@ @@ -71248,7 +70687,7 @@ index 000000000..f0c7badaa +#endif // CPU_MIPS_GC_G1_G1GLOBALS_MIPS_HPP diff --git a/src/hotspot/cpu/mips/gc/shared/barrierSetAssembler_mips.cpp b/src/hotspot/cpu/mips/gc/shared/barrierSetAssembler_mips.cpp new file mode 100644 -index 000000000..071debdc3 +index 00000000000..071debdc3a3 --- /dev/null +++ b/src/hotspot/cpu/mips/gc/shared/barrierSetAssembler_mips.cpp @@ -0,0 +1,194 @@ @@ -71448,7 +70887,7 @@ index 000000000..071debdc3 +} diff --git a/src/hotspot/cpu/mips/gc/shared/barrierSetAssembler_mips.hpp b/src/hotspot/cpu/mips/gc/shared/barrierSetAssembler_mips.hpp new file mode 100644 -index 000000000..bc68de604 +index 00000000000..bc68de604d2 --- /dev/null +++ b/src/hotspot/cpu/mips/gc/shared/barrierSetAssembler_mips.hpp @@ -0,0 +1,84 @@ @@ -71538,7 +70977,7 @@ index 000000000..bc68de604 +#endif // CPU_MIPS_GC_SHARED_BARRIERSETASSEMBLER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/gc/shared/barrierSetNMethod_mips.cpp b/src/hotspot/cpu/mips/gc/shared/barrierSetNMethod_mips.cpp new file mode 100644 -index 000000000..3d4e69333 +index 00000000000..3d4e69333b0 --- /dev/null +++ b/src/hotspot/cpu/mips/gc/shared/barrierSetNMethod_mips.cpp @@ -0,0 +1,41 @@ @@ -71585,7 +71024,7 @@ index 000000000..3d4e69333 +} diff --git a/src/hotspot/cpu/mips/gc/shared/cardTableBarrierSetAssembler_mips.cpp b/src/hotspot/cpu/mips/gc/shared/cardTableBarrierSetAssembler_mips.cpp new file mode 100644 -index 000000000..1b2002fd0 +index 00000000000..1b2002fd040 --- /dev/null +++ b/src/hotspot/cpu/mips/gc/shared/cardTableBarrierSetAssembler_mips.cpp @@ -0,0 +1,144 @@ @@ -71735,7 +71174,7 @@ index 000000000..1b2002fd0 +} diff --git a/src/hotspot/cpu/mips/gc/shared/cardTableBarrierSetAssembler_mips.hpp b/src/hotspot/cpu/mips/gc/shared/cardTableBarrierSetAssembler_mips.hpp new file mode 100644 -index 000000000..49c2a0ea8 +index 00000000000..49c2a0ea80e --- /dev/null +++ b/src/hotspot/cpu/mips/gc/shared/cardTableBarrierSetAssembler_mips.hpp @@ -0,0 +1,42 @@ @@ -71783,7 +71222,7 @@ index 000000000..49c2a0ea8 +#endif // CPU_MIPS_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/gc/shared/modRefBarrierSetAssembler_mips.cpp b/src/hotspot/cpu/mips/gc/shared/modRefBarrierSetAssembler_mips.cpp new file mode 100644 -index 000000000..765259e62 +index 00000000000..765259e6266 --- /dev/null +++ b/src/hotspot/cpu/mips/gc/shared/modRefBarrierSetAssembler_mips.cpp @@ -0,0 +1,53 @@ @@ -71842,7 +71281,7 @@ index 000000000..765259e62 +} diff --git a/src/hotspot/cpu/mips/gc/shared/modRefBarrierSetAssembler_mips.hpp b/src/hotspot/cpu/mips/gc/shared/modRefBarrierSetAssembler_mips.hpp new file mode 100644 -index 000000000..5320a4c0a +index 00000000000..5320a4c0add --- /dev/null +++ b/src/hotspot/cpu/mips/gc/shared/modRefBarrierSetAssembler_mips.hpp @@ -0,0 +1,54 @@ @@ -71902,7 +71341,7 @@ index 000000000..5320a4c0a +#endif // CPU_MIPS_GC_SHARED_MODREFBARRIERSETASSEMBLER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/globalDefinitions_mips.hpp b/src/hotspot/cpu/mips/globalDefinitions_mips.hpp new file mode 100644 -index 000000000..2b50d15ff +index 00000000000..2b50d15ffd7 --- /dev/null +++ b/src/hotspot/cpu/mips/globalDefinitions_mips.hpp @@ -0,0 +1,47 @@ @@ -71955,7 +71394,7 @@ index 000000000..2b50d15ff +#endif // CPU_MIPS_VM_GLOBALDEFINITIONS_MIPS_HPP diff --git a/src/hotspot/cpu/mips/globals_mips.hpp b/src/hotspot/cpu/mips/globals_mips.hpp new file mode 100644 -index 000000000..2d88d370c +index 00000000000..2d88d370c94 --- /dev/null +++ b/src/hotspot/cpu/mips/globals_mips.hpp @@ -0,0 +1,132 @@ @@ -72093,7 +71532,7 @@ index 000000000..2d88d370c +#endif // CPU_MIPS_VM_GLOBALS_MIPS_HPP diff --git a/src/hotspot/cpu/mips/icBuffer_mips.cpp b/src/hotspot/cpu/mips/icBuffer_mips.cpp new file mode 100644 -index 000000000..604e951a9 +index 00000000000..604e951a9bf --- /dev/null +++ b/src/hotspot/cpu/mips/icBuffer_mips.cpp @@ -0,0 +1,96 @@ @@ -72195,7 +71634,7 @@ index 000000000..604e951a9 +} diff --git a/src/hotspot/cpu/mips/icache_mips.cpp b/src/hotspot/cpu/mips/icache_mips.cpp new file mode 100644 -index 000000000..848964b63 +index 00000000000..848964b63f6 --- /dev/null +++ b/src/hotspot/cpu/mips/icache_mips.cpp @@ -0,0 +1,41 @@ @@ -72242,7 +71681,7 @@ index 000000000..848964b63 +} diff --git a/src/hotspot/cpu/mips/icache_mips.hpp b/src/hotspot/cpu/mips/icache_mips.hpp new file mode 100644 -index 000000000..f90dee6ee +index 00000000000..f90dee6eef7 --- /dev/null +++ b/src/hotspot/cpu/mips/icache_mips.hpp @@ -0,0 +1,41 @@ @@ -72289,7 +71728,7 @@ index 000000000..f90dee6ee +#endif // CPU_MIPS_VM_ICACHE_MIPS_HPP diff --git a/src/hotspot/cpu/mips/interp_masm_mips.hpp b/src/hotspot/cpu/mips/interp_masm_mips.hpp new file mode 100644 -index 000000000..1b9aa653f +index 00000000000..1b9aa653fd4 --- /dev/null +++ b/src/hotspot/cpu/mips/interp_masm_mips.hpp @@ -0,0 +1,266 @@ @@ -72561,7 +72000,7 @@ index 000000000..1b9aa653f +#endif // CPU_MIPS_VM_INTERP_MASM_MIPS_64_HPP diff --git a/src/hotspot/cpu/mips/interp_masm_mips_64.cpp b/src/hotspot/cpu/mips/interp_masm_mips_64.cpp new file mode 100644 -index 000000000..732325fdb +index 00000000000..732325fdbd4 --- /dev/null +++ b/src/hotspot/cpu/mips/interp_masm_mips_64.cpp @@ -0,0 +1,2140 @@ @@ -74707,7 +74146,7 @@ index 000000000..732325fdb +} diff --git a/src/hotspot/cpu/mips/interpreterRT_mips.hpp b/src/hotspot/cpu/mips/interpreterRT_mips.hpp new file mode 100644 -index 000000000..054138ea4 +index 00000000000..054138ea42b --- /dev/null +++ b/src/hotspot/cpu/mips/interpreterRT_mips.hpp @@ -0,0 +1,60 @@ @@ -74773,7 +74212,7 @@ index 000000000..054138ea4 +#endif // CPU_MIPS_VM_INTERPRETERRT_MIPS_HPP diff --git a/src/hotspot/cpu/mips/interpreterRT_mips_64.cpp b/src/hotspot/cpu/mips/interpreterRT_mips_64.cpp new file mode 100644 -index 000000000..3e8ae9fb5 +index 00000000000..3e8ae9fb5a5 --- /dev/null +++ b/src/hotspot/cpu/mips/interpreterRT_mips_64.cpp @@ -0,0 +1,260 @@ @@ -75039,7 +74478,7 @@ index 000000000..3e8ae9fb5 +JRT_END diff --git a/src/hotspot/cpu/mips/javaFrameAnchor_mips.hpp b/src/hotspot/cpu/mips/javaFrameAnchor_mips.hpp new file mode 100644 -index 000000000..f5f3735e7 +index 00000000000..f5f3735e7cb --- /dev/null +++ b/src/hotspot/cpu/mips/javaFrameAnchor_mips.hpp @@ -0,0 +1,87 @@ @@ -75132,7 +74571,7 @@ index 000000000..f5f3735e7 +#endif // CPU_MIPS_VM_JAVAFRAMEANCHOR_MIPS_HPP diff --git a/src/hotspot/cpu/mips/jniFastGetField_mips_64.cpp b/src/hotspot/cpu/mips/jniFastGetField_mips_64.cpp new file mode 100644 -index 000000000..547414f7e +index 00000000000..547414f7ef3 --- /dev/null +++ b/src/hotspot/cpu/mips/jniFastGetField_mips_64.cpp @@ -0,0 +1,203 @@ @@ -75341,7 +74780,7 @@ index 000000000..547414f7e +} diff --git a/src/hotspot/cpu/mips/jniTypes_mips.hpp b/src/hotspot/cpu/mips/jniTypes_mips.hpp new file mode 100644 -index 000000000..08ac565aa +index 00000000000..08ac565aa53 --- /dev/null +++ b/src/hotspot/cpu/mips/jniTypes_mips.hpp @@ -0,0 +1,143 @@ @@ -75490,7 +74929,7 @@ index 000000000..08ac565aa +#endif // CPU_MIPS_VM_JNITYPES_MIPS_HPP diff --git a/src/hotspot/cpu/mips/macroAssembler_mips.cpp b/src/hotspot/cpu/mips/macroAssembler_mips.cpp new file mode 100644 -index 000000000..1256e9579 +index 00000000000..1256e957970 --- /dev/null +++ b/src/hotspot/cpu/mips/macroAssembler_mips.cpp @@ -0,0 +1,3686 @@ @@ -79182,7 +78621,7 @@ index 000000000..1256e9579 +} diff --git a/src/hotspot/cpu/mips/macroAssembler_mips.hpp b/src/hotspot/cpu/mips/macroAssembler_mips.hpp new file mode 100644 -index 000000000..daec23fcf +index 00000000000..daec23fcf9c --- /dev/null +++ b/src/hotspot/cpu/mips/macroAssembler_mips.hpp @@ -0,0 +1,704 @@ @@ -79892,7 +79331,7 @@ index 000000000..daec23fcf +#endif // CPU_MIPS_VM_MACROASSEMBLER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/macroAssembler_mips.inline.hpp b/src/hotspot/cpu/mips/macroAssembler_mips.inline.hpp new file mode 100644 -index 000000000..92c05fb72 +index 00000000000..92c05fb726a --- /dev/null +++ b/src/hotspot/cpu/mips/macroAssembler_mips.inline.hpp @@ -0,0 +1,34 @@ @@ -79932,7 +79371,7 @@ index 000000000..92c05fb72 +#endif // CPU_MIPS_VM_MACROASSEMBLER_MIPS_INLINE_HPP diff --git a/src/hotspot/cpu/mips/matcher_mips.hpp b/src/hotspot/cpu/mips/matcher_mips.hpp new file mode 100644 -index 000000000..94f58720f +index 00000000000..94f58720ffe --- /dev/null +++ b/src/hotspot/cpu/mips/matcher_mips.hpp @@ -0,0 +1,145 @@ @@ -80083,7 +79522,7 @@ index 000000000..94f58720f +#endif // CPU_MIPS_MATCHER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/methodHandles_mips.cpp b/src/hotspot/cpu/mips/methodHandles_mips.cpp new file mode 100644 -index 000000000..c42797050 +index 00000000000..c4279705062 --- /dev/null +++ b/src/hotspot/cpu/mips/methodHandles_mips.cpp @@ -0,0 +1,597 @@ @@ -80686,7 +80125,7 @@ index 000000000..c42797050 +#endif //PRODUCT diff --git a/src/hotspot/cpu/mips/methodHandles_mips.hpp b/src/hotspot/cpu/mips/methodHandles_mips.hpp new file mode 100644 -index 000000000..a95f8e405 +index 00000000000..a95f8e40596 --- /dev/null +++ b/src/hotspot/cpu/mips/methodHandles_mips.hpp @@ -0,0 +1,62 @@ @@ -80754,7 +80193,7 @@ index 000000000..a95f8e405 + } diff --git a/src/hotspot/cpu/mips/mips.ad b/src/hotspot/cpu/mips/mips.ad new file mode 100644 -index 000000000..3563bbe0e +index 00000000000..3563bbe0e59 --- /dev/null +++ b/src/hotspot/cpu/mips/mips.ad @@ -0,0 +1,25 @@ @@ -80785,7 +80224,7 @@ index 000000000..3563bbe0e + diff --git a/src/hotspot/cpu/mips/mips_64.ad b/src/hotspot/cpu/mips/mips_64.ad new file mode 100644 -index 000000000..882878f73 +index 00000000000..882878f739a --- /dev/null +++ b/src/hotspot/cpu/mips/mips_64.ad @@ -0,0 +1,12317 @@ @@ -93108,7 +92547,7 @@ index 000000000..882878f73 + diff --git a/src/hotspot/cpu/mips/nativeInst_mips.cpp b/src/hotspot/cpu/mips/nativeInst_mips.cpp new file mode 100644 -index 000000000..05c525f35 +index 00000000000..05c525f35ef --- /dev/null +++ b/src/hotspot/cpu/mips/nativeInst_mips.cpp @@ -0,0 +1,1825 @@ @@ -94939,7 +94378,7 @@ index 000000000..05c525f35 +} diff --git a/src/hotspot/cpu/mips/nativeInst_mips.hpp b/src/hotspot/cpu/mips/nativeInst_mips.hpp new file mode 100644 -index 000000000..9f0f24cc3 +index 00000000000..9f0f24cc34b --- /dev/null +++ b/src/hotspot/cpu/mips/nativeInst_mips.hpp @@ -0,0 +1,734 @@ @@ -95679,7 +95118,7 @@ index 000000000..9f0f24cc3 +#endif // CPU_MIPS_VM_NATIVEINST_MIPS_HPP diff --git a/src/hotspot/cpu/mips/registerMap_mips.hpp b/src/hotspot/cpu/mips/registerMap_mips.hpp new file mode 100644 -index 000000000..3f3558f79 +index 00000000000..3f3558f79d4 --- /dev/null +++ b/src/hotspot/cpu/mips/registerMap_mips.hpp @@ -0,0 +1,50 @@ @@ -95735,7 +95174,7 @@ index 000000000..3f3558f79 +#endif // CPU_MIPS_VM_REGISTERMAP_MIPS_HPP diff --git a/src/hotspot/cpu/mips/register_definitions_mips.cpp b/src/hotspot/cpu/mips/register_definitions_mips.cpp new file mode 100644 -index 000000000..4af253183 +index 00000000000..4af25318346 --- /dev/null +++ b/src/hotspot/cpu/mips/register_definitions_mips.cpp @@ -0,0 +1,103 @@ @@ -95844,7 +95283,7 @@ index 000000000..4af253183 +REGISTER_DEFINITION(FloatRegister, f31); diff --git a/src/hotspot/cpu/mips/register_mips.cpp b/src/hotspot/cpu/mips/register_mips.cpp new file mode 100644 -index 000000000..4a9b22bfe +index 00000000000..4a9b22bfef2 --- /dev/null +++ b/src/hotspot/cpu/mips/register_mips.cpp @@ -0,0 +1,52 @@ @@ -95902,13 +95341,13 @@ index 000000000..4a9b22bfe + diff --git a/src/hotspot/cpu/mips/register_mips.hpp b/src/hotspot/cpu/mips/register_mips.hpp new file mode 100644 -index 000000000..4f74717c2 +index 00000000000..c2124538a0f --- /dev/null +++ b/src/hotspot/cpu/mips/register_mips.hpp -@@ -0,0 +1,344 @@ +@@ -0,0 +1,345 @@ +/* + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved. ++ * Copyright (c) 2015, 2024, Loongson Technology. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it @@ -96013,8 +95452,9 @@ index 000000000..4f74717c2 +#define NOREG ((Register)(noreg_RegisterEnumValue)) + +#define I0 ((Register)(i0_RegisterEnumValue)) -+#define I1 ((Register)(i1_RegisterEnumValue)) -+#define I2 ((Register)(i2_RegisterEnumValue)) ++// Conflict with I1 and I2 in googlemock/include/gmock/gmock-actions.h ++//#define I1 ((Register)(i1_RegisterEnumValue)) ++//#define I2 ((Register)(i2_RegisterEnumValue)) +#define I3 ((Register)(i3_RegisterEnumValue)) +#define I4 ((Register)(i4_RegisterEnumValue)) +#define I5 ((Register)(i5_RegisterEnumValue)) @@ -96252,7 +95692,7 @@ index 000000000..4f74717c2 +#endif //CPU_MIPS_VM_REGISTER_MIPS_HPP diff --git a/src/hotspot/cpu/mips/relocInfo_mips.cpp b/src/hotspot/cpu/mips/relocInfo_mips.cpp new file mode 100644 -index 000000000..7d8d072b5 +index 00000000000..7d8d072b51b --- /dev/null +++ b/src/hotspot/cpu/mips/relocInfo_mips.cpp @@ -0,0 +1,160 @@ @@ -96418,7 +95858,7 @@ index 000000000..7d8d072b5 +} diff --git a/src/hotspot/cpu/mips/relocInfo_mips.hpp b/src/hotspot/cpu/mips/relocInfo_mips.hpp new file mode 100644 -index 000000000..1e1e170fd +index 00000000000..1e1e170fd87 --- /dev/null +++ b/src/hotspot/cpu/mips/relocInfo_mips.hpp @@ -0,0 +1,44 @@ @@ -96468,7 +95908,7 @@ index 000000000..1e1e170fd +#endif // CPU_MIPS_VM_RELOCINFO_MIPS_HPP diff --git a/src/hotspot/cpu/mips/runtime_mips_64.cpp b/src/hotspot/cpu/mips/runtime_mips_64.cpp new file mode 100644 -index 000000000..36ab413f0 +index 00000000000..36ab413f0b3 --- /dev/null +++ b/src/hotspot/cpu/mips/runtime_mips_64.cpp @@ -0,0 +1,206 @@ @@ -96680,7 +96120,7 @@ index 000000000..36ab413f0 +} diff --git a/src/hotspot/cpu/mips/sharedRuntime_mips_64.cpp b/src/hotspot/cpu/mips/sharedRuntime_mips_64.cpp new file mode 100644 -index 000000000..48cc424a5 +index 00000000000..48cc424a54e --- /dev/null +++ b/src/hotspot/cpu/mips/sharedRuntime_mips_64.cpp @@ -0,0 +1,3384 @@ @@ -100070,7 +99510,7 @@ index 000000000..48cc424a5 +#endif diff --git a/src/hotspot/cpu/mips/stubGenerator_mips_64.cpp b/src/hotspot/cpu/mips/stubGenerator_mips_64.cpp new file mode 100644 -index 000000000..e894a302b +index 00000000000..e894a302b50 --- /dev/null +++ b/src/hotspot/cpu/mips/stubGenerator_mips_64.cpp @@ -0,0 +1,2725 @@ @@ -102801,7 +102241,7 @@ index 000000000..e894a302b +} diff --git a/src/hotspot/cpu/mips/stubRoutines_mips.hpp b/src/hotspot/cpu/mips/stubRoutines_mips.hpp new file mode 100644 -index 000000000..920c08844 +index 00000000000..920c08844e1 --- /dev/null +++ b/src/hotspot/cpu/mips/stubRoutines_mips.hpp @@ -0,0 +1,59 @@ @@ -102866,7 +102306,7 @@ index 000000000..920c08844 +#endif // CPU_MIPS_VM_STUBROUTINES_MIPS_64_HPP diff --git a/src/hotspot/cpu/mips/stubRoutines_mips_64.cpp b/src/hotspot/cpu/mips/stubRoutines_mips_64.cpp new file mode 100644 -index 000000000..358d580d5 +index 00000000000..358d580d527 --- /dev/null +++ b/src/hotspot/cpu/mips/stubRoutines_mips_64.cpp @@ -0,0 +1,35 @@ @@ -102907,7 +102347,7 @@ index 000000000..358d580d5 +address StubRoutines::gs2::_call_stub_compiled_return = NULL; diff --git a/src/hotspot/cpu/mips/templateInterpreterGenerator_mips.cpp b/src/hotspot/cpu/mips/templateInterpreterGenerator_mips.cpp new file mode 100644 -index 000000000..b723add6d +index 00000000000..b723add6dfc --- /dev/null +++ b/src/hotspot/cpu/mips/templateInterpreterGenerator_mips.cpp @@ -0,0 +1,2094 @@ @@ -105007,7 +104447,7 @@ index 000000000..b723add6d +#endif // !PRODUCT diff --git a/src/hotspot/cpu/mips/templateTable_mips.hpp b/src/hotspot/cpu/mips/templateTable_mips.hpp new file mode 100644 -index 000000000..46a88aba2 +index 00000000000..46a88aba261 --- /dev/null +++ b/src/hotspot/cpu/mips/templateTable_mips.hpp @@ -0,0 +1,43 @@ @@ -105056,7 +104496,7 @@ index 000000000..46a88aba2 +#endif // CPU_MIPS_VM_TEMPLATETABLE_MIPS_64_HPP diff --git a/src/hotspot/cpu/mips/templateTable_mips_64.cpp b/src/hotspot/cpu/mips/templateTable_mips_64.cpp new file mode 100644 -index 000000000..bbf95f452 +index 00000000000..bbf95f45225 --- /dev/null +++ b/src/hotspot/cpu/mips/templateTable_mips_64.cpp @@ -0,0 +1,4613 @@ @@ -109675,7 +109115,7 @@ index 000000000..bbf95f452 +} diff --git a/src/hotspot/cpu/mips/universalNativeInvoker_mips_64.cpp b/src/hotspot/cpu/mips/universalNativeInvoker_mips_64.cpp new file mode 100644 -index 000000000..87f6a1132 +index 00000000000..87f6a113268 --- /dev/null +++ b/src/hotspot/cpu/mips/universalNativeInvoker_mips_64.cpp @@ -0,0 +1,32 @@ @@ -109713,7 +109153,7 @@ index 000000000..87f6a1132 +} diff --git a/src/hotspot/cpu/mips/universalUpcallHandler_mips_64.cpp b/src/hotspot/cpu/mips/universalUpcallHandler_mips_64.cpp new file mode 100644 -index 000000000..7586b0848 +index 00000000000..7586b084868 --- /dev/null +++ b/src/hotspot/cpu/mips/universalUpcallHandler_mips_64.cpp @@ -0,0 +1,41 @@ @@ -109760,7 +109200,7 @@ index 000000000..7586b0848 +} diff --git a/src/hotspot/cpu/mips/vmStructs_mips.hpp b/src/hotspot/cpu/mips/vmStructs_mips.hpp new file mode 100644 -index 000000000..693991435 +index 00000000000..6939914356d --- /dev/null +++ b/src/hotspot/cpu/mips/vmStructs_mips.hpp @@ -0,0 +1,68 @@ @@ -109834,7 +109274,7 @@ index 000000000..693991435 +#endif // CPU_MIPS_VM_VMSTRUCTS_MIPS_HPP diff --git a/src/hotspot/cpu/mips/vm_version_ext_mips.cpp b/src/hotspot/cpu/mips/vm_version_ext_mips.cpp new file mode 100644 -index 000000000..d3f070785 +index 00000000000..d3f07078570 --- /dev/null +++ b/src/hotspot/cpu/mips/vm_version_ext_mips.cpp @@ -0,0 +1,90 @@ @@ -109930,7 +109370,7 @@ index 000000000..d3f070785 +} diff --git a/src/hotspot/cpu/mips/vm_version_ext_mips.hpp b/src/hotspot/cpu/mips/vm_version_ext_mips.hpp new file mode 100644 -index 000000000..ffdcff067 +index 00000000000..ffdcff06777 --- /dev/null +++ b/src/hotspot/cpu/mips/vm_version_ext_mips.hpp @@ -0,0 +1,54 @@ @@ -109990,7 +109430,7 @@ index 000000000..ffdcff067 +#endif // CPU_MIPS_VM_VM_VERSION_EXT_MIPS_HPP diff --git a/src/hotspot/cpu/mips/vm_version_mips.cpp b/src/hotspot/cpu/mips/vm_version_mips.cpp new file mode 100644 -index 000000000..8625bc700 +index 00000000000..8625bc70075 --- /dev/null +++ b/src/hotspot/cpu/mips/vm_version_mips.cpp @@ -0,0 +1,523 @@ @@ -110519,7 +109959,7 @@ index 000000000..8625bc700 +} diff --git a/src/hotspot/cpu/mips/vm_version_mips.hpp b/src/hotspot/cpu/mips/vm_version_mips.hpp new file mode 100644 -index 000000000..30c7b5a93 +index 00000000000..30c7b5a934d --- /dev/null +++ b/src/hotspot/cpu/mips/vm_version_mips.hpp @@ -0,0 +1,218 @@ @@ -110743,7 +110183,7 @@ index 000000000..30c7b5a93 +#endif // CPU_MIPS_VM_VM_VERSION_MIPS_HPP diff --git a/src/hotspot/cpu/mips/vmreg_mips.cpp b/src/hotspot/cpu/mips/vmreg_mips.cpp new file mode 100644 -index 000000000..95dbd17f1 +index 00000000000..95dbd17f1a8 --- /dev/null +++ b/src/hotspot/cpu/mips/vmreg_mips.cpp @@ -0,0 +1,56 @@ @@ -110805,7 +110245,7 @@ index 000000000..95dbd17f1 +} diff --git a/src/hotspot/cpu/mips/vmreg_mips.hpp b/src/hotspot/cpu/mips/vmreg_mips.hpp new file mode 100644 -index 000000000..8ccc8c513 +index 00000000000..8ccc8c513c8 --- /dev/null +++ b/src/hotspot/cpu/mips/vmreg_mips.hpp @@ -0,0 +1,56 @@ @@ -110867,7 +110307,7 @@ index 000000000..8ccc8c513 +#endif // CPU_MIPS_VM_VMREG_MIPS_HPP diff --git a/src/hotspot/cpu/mips/vmreg_mips.inline.hpp b/src/hotspot/cpu/mips/vmreg_mips.inline.hpp new file mode 100644 -index 000000000..12ad7361a +index 00000000000..12ad7361aa5 --- /dev/null +++ b/src/hotspot/cpu/mips/vmreg_mips.inline.hpp @@ -0,0 +1,38 @@ @@ -110911,7 +110351,7 @@ index 000000000..12ad7361a +#endif // CPU_MIPS_VM_VMREG_MIPS_INLINE_HPP diff --git a/src/hotspot/cpu/mips/vtableStubs_mips_64.cpp b/src/hotspot/cpu/mips/vtableStubs_mips_64.cpp new file mode 100644 -index 000000000..f373aac45 +index 00000000000..f373aac45c2 --- /dev/null +++ b/src/hotspot/cpu/mips/vtableStubs_mips_64.cpp @@ -0,0 +1,348 @@ @@ -111264,7 +110704,7 @@ index 000000000..f373aac45 + return icache_line_size; +} diff --git a/src/hotspot/cpu/ppc/gc/z/zGlobals_ppc.hpp b/src/hotspot/cpu/ppc/gc/z/zGlobals_ppc.hpp -index 3657b16fc..a2aab2257 100644 +index 3657b16fc1a..a2aab225743 100644 --- a/src/hotspot/cpu/ppc/gc/z/zGlobals_ppc.hpp +++ b/src/hotspot/cpu/ppc/gc/z/zGlobals_ppc.hpp @@ -30,6 +30,8 @@ const size_t ZPlatformGranuleSizeShift = 21; // 2MB @@ -111277,7 +110717,7 @@ index 3657b16fc..a2aab2257 100644 size_t ZPlatformAddressMetadataShift(); diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 63b7562f1..5b11b0c1d 100644 +index 7c951cee51c..5747d4d3f55 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp @@ -23,6 +23,12 @@ @@ -111293,7 +110733,7 @@ index 63b7562f1..5b11b0c1d 100644 // no precompiled headers #include "jvm.h" #include "classfile/vmSymbols.hpp" -@@ -2459,7 +2465,7 @@ void os::print_memory_info(outputStream* st) { +@@ -2457,7 +2463,7 @@ void os::print_memory_info(outputStream* st) { // before "flags" so if we find a second "model name", then the // "flags" field is considered missing. static bool print_model_name_and_flags(outputStream* st, char* buf, size_t buflen) { @@ -111302,7 +110742,7 @@ index 63b7562f1..5b11b0c1d 100644 // Other platforms have less repetitive cpuinfo files FILE *fp = fopen("/proc/cpuinfo", "r"); if (fp) { -@@ -2549,7 +2555,7 @@ void os::pd_print_cpu_info(outputStream* st, char* buf, size_t buflen) { +@@ -2547,7 +2553,7 @@ void os::pd_print_cpu_info(outputStream* st, char* buf, size_t buflen) { print_sys_devices_cpu_info(st, buf, buflen); } @@ -111313,7 +110753,7 @@ index 63b7562f1..5b11b0c1d 100644 const char* search_string = "CPU"; diff --git a/src/hotspot/os_cpu/linux_loongarch/assembler_linux_loongarch.cpp b/src/hotspot/os_cpu/linux_loongarch/assembler_linux_loongarch.cpp new file mode 100644 -index 000000000..30719a034 +index 00000000000..30719a0340b --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/assembler_linux_loongarch.cpp @@ -0,0 +1,24 @@ @@ -111343,7 +110783,7 @@ index 000000000..30719a034 + */ diff --git a/src/hotspot/os_cpu/linux_loongarch/atomic_linux_loongarch.hpp b/src/hotspot/os_cpu/linux_loongarch/atomic_linux_loongarch.hpp new file mode 100644 -index 000000000..77413aba9 +index 00000000000..77413aba9f4 --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/atomic_linux_loongarch.hpp @@ -0,0 +1,275 @@ @@ -111624,7 +111064,7 @@ index 000000000..77413aba9 +#endif // OS_CPU_LINUX_LOONGARCH_ATOMIC_LINUX_LOONGARCH_HPP diff --git a/src/hotspot/os_cpu/linux_loongarch/bytes_linux_loongarch.inline.hpp b/src/hotspot/os_cpu/linux_loongarch/bytes_linux_loongarch.inline.hpp new file mode 100644 -index 000000000..c9f675bac +index 00000000000..c9f675baca4 --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/bytes_linux_loongarch.inline.hpp @@ -0,0 +1,37 @@ @@ -111667,7 +111107,7 @@ index 000000000..c9f675bac +#endif // OS_CPU_LINUX_LOONGARCH_BYTES_LINUX_LOONGARCH_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_loongarch/copy_linux_loongarch.inline.hpp b/src/hotspot/os_cpu/linux_loongarch/copy_linux_loongarch.inline.hpp new file mode 100644 -index 000000000..826c1fe39 +index 00000000000..826c1fe39ac --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/copy_linux_loongarch.inline.hpp @@ -0,0 +1,125 @@ @@ -111798,7 +111238,7 @@ index 000000000..826c1fe39 +#endif // OS_CPU_LINUX_LOONGARCH_COPY_LINUX_LOONGARCH_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_loongarch/gc/z/zSyscall_linux_loongarch.hpp b/src/hotspot/os_cpu/linux_loongarch/gc/z/zSyscall_linux_loongarch.hpp new file mode 100644 -index 000000000..46d5d5a26 +index 00000000000..46d5d5a268b --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/gc/z/zSyscall_linux_loongarch.hpp @@ -0,0 +1,41 @@ @@ -111845,7 +111285,7 @@ index 000000000..46d5d5a26 +#endif // OS_CPU_LINUX_LOONGARCH_GC_Z_ZSYSCALL_LINUX_LOONGARCH_HPP diff --git a/src/hotspot/os_cpu/linux_loongarch/globals_linux_loongarch.hpp b/src/hotspot/os_cpu/linux_loongarch/globals_linux_loongarch.hpp new file mode 100644 -index 000000000..0b5247aa0 +index 00000000000..0b5247aa0b6 --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/globals_linux_loongarch.hpp @@ -0,0 +1,43 @@ @@ -111894,7 +111334,7 @@ index 000000000..0b5247aa0 +#endif // OS_CPU_LINUX_LOONGARCH_GLOBALS_LINUX_LOONGARCH_HPP diff --git a/src/hotspot/os_cpu/linux_loongarch/linux_loongarch.s b/src/hotspot/os_cpu/linux_loongarch/linux_loongarch.s new file mode 100644 -index 000000000..ebd73af0c +index 00000000000..ebd73af0c53 --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/linux_loongarch.s @@ -0,0 +1,25 @@ @@ -111925,7 +111365,7 @@ index 000000000..ebd73af0c + diff --git a/src/hotspot/os_cpu/linux_loongarch/orderAccess_linux_loongarch.hpp b/src/hotspot/os_cpu/linux_loongarch/orderAccess_linux_loongarch.hpp new file mode 100644 -index 000000000..6236e741d +index 00000000000..6236e741d05 --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/orderAccess_linux_loongarch.hpp @@ -0,0 +1,52 @@ @@ -111983,7 +111423,7 @@ index 000000000..6236e741d +#endif // OS_CPU_LINUX_LOONGARCH_ORDERACCESS_LINUX_LOONGARCH_HPP diff --git a/src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.cpp b/src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.cpp new file mode 100644 -index 000000000..b32ffe910 +index 00000000000..b32ffe9105e --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.cpp @@ -0,0 +1,529 @@ @@ -112518,7 +111958,7 @@ index 000000000..b32ffe910 +} diff --git a/src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.hpp b/src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.hpp new file mode 100644 -index 000000000..fa02f8ba2 +index 00000000000..fa02f8ba2f9 --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.hpp @@ -0,0 +1,38 @@ @@ -112562,7 +112002,7 @@ index 000000000..fa02f8ba2 +#endif // OS_CPU_LINUX_LOONGARCH_OS_LINUX_LOONGARCH_HPP diff --git a/src/hotspot/os_cpu/linux_loongarch/prefetch_linux_loongarch.inline.hpp b/src/hotspot/os_cpu/linux_loongarch/prefetch_linux_loongarch.inline.hpp new file mode 100644 -index 000000000..cf3a59638 +index 00000000000..cf3a596387c --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/prefetch_linux_loongarch.inline.hpp @@ -0,0 +1,56 @@ @@ -112624,7 +112064,7 @@ index 000000000..cf3a59638 +#endif // OS_CPU_LINUX_LOONGARCH_PREFETCH_LINUX_LOONGARCH_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_loongarch/safefetch_linux_loongarch64.S b/src/hotspot/os_cpu/linux_loongarch/safefetch_linux_loongarch64.S new file mode 100644 -index 000000000..fdc6da358 +index 00000000000..fdc6da358e5 --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/safefetch_linux_loongarch64.S @@ -0,0 +1,56 @@ @@ -112686,7 +112126,7 @@ index 000000000..fdc6da358 + jr $r1 diff --git a/src/hotspot/os_cpu/linux_loongarch/thread_linux_loongarch.cpp b/src/hotspot/os_cpu/linux_loongarch/thread_linux_loongarch.cpp new file mode 100644 -index 000000000..9204302bc +index 00000000000..9204302bca8 --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/thread_linux_loongarch.cpp @@ -0,0 +1,105 @@ @@ -112797,7 +112237,7 @@ index 000000000..9204302bc +void JavaThread::cache_global_variables() { } diff --git a/src/hotspot/os_cpu/linux_loongarch/thread_linux_loongarch.hpp b/src/hotspot/os_cpu/linux_loongarch/thread_linux_loongarch.hpp new file mode 100644 -index 000000000..82fc6fb65 +index 00000000000..82fc6fb659f --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/thread_linux_loongarch.hpp @@ -0,0 +1,66 @@ @@ -112869,7 +112309,7 @@ index 000000000..82fc6fb65 +#endif // OS_CPU_LINUX_LOONGARCH_VM_THREAD_LINUX_LOONGARCH_HPP diff --git a/src/hotspot/os_cpu/linux_loongarch/vmStructs_linux_loongarch.hpp b/src/hotspot/os_cpu/linux_loongarch/vmStructs_linux_loongarch.hpp new file mode 100644 -index 000000000..a39cb79bb +index 00000000000..a39cb79bb1e --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/vmStructs_linux_loongarch.hpp @@ -0,0 +1,55 @@ @@ -112930,7 +112370,7 @@ index 000000000..a39cb79bb +#endif // OS_CPU_LINUX_LOONGARCH_VMSTRUCTS_LINUX_LOONGARCH_HPP diff --git a/src/hotspot/os_cpu/linux_loongarch/vm_version_linux_loongarch.cpp b/src/hotspot/os_cpu/linux_loongarch/vm_version_linux_loongarch.cpp new file mode 100644 -index 000000000..3711a7036 +index 00000000000..3711a7036a1 --- /dev/null +++ b/src/hotspot/os_cpu/linux_loongarch/vm_version_linux_loongarch.cpp @@ -0,0 +1,95 @@ @@ -113031,7 +112471,7 @@ index 000000000..3711a7036 +} diff --git a/src/hotspot/os_cpu/linux_mips/assembler_linux_mips.cpp b/src/hotspot/os_cpu/linux_mips/assembler_linux_mips.cpp new file mode 100644 -index 000000000..30719a034 +index 00000000000..30719a0340b --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/assembler_linux_mips.cpp @@ -0,0 +1,24 @@ @@ -113061,7 +112501,7 @@ index 000000000..30719a034 + */ diff --git a/src/hotspot/os_cpu/linux_mips/atomic_linux_mips.hpp b/src/hotspot/os_cpu/linux_mips/atomic_linux_mips.hpp new file mode 100644 -index 000000000..c82e3ce1e +index 00000000000..c82e3ce1ecf --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/atomic_linux_mips.hpp @@ -0,0 +1,194 @@ @@ -113261,7 +112701,7 @@ index 000000000..c82e3ce1e +#endif // OS_CPU_LINUX_MIPS_VM_ATOMIC_LINUX_MIPS_HPP diff --git a/src/hotspot/os_cpu/linux_mips/bytes_linux_mips.inline.hpp b/src/hotspot/os_cpu/linux_mips/bytes_linux_mips.inline.hpp new file mode 100644 -index 000000000..5b5cd10aa +index 00000000000..5b5cd10aa55 --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/bytes_linux_mips.inline.hpp @@ -0,0 +1,37 @@ @@ -113304,7 +112744,7 @@ index 000000000..5b5cd10aa +#endif // OS_CPU_LINUX_MIPS_VM_BYTES_LINUX_MIPS_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_mips/copy_linux_mips.inline.hpp b/src/hotspot/os_cpu/linux_mips/copy_linux_mips.inline.hpp new file mode 100644 -index 000000000..3fd6ef7b3 +index 00000000000..3fd6ef7b36c --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/copy_linux_mips.inline.hpp @@ -0,0 +1,125 @@ @@ -113435,7 +112875,7 @@ index 000000000..3fd6ef7b3 +#endif // OS_CPU_LINUX_MIPS_VM_COPY_LINUX_MIPS_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_mips/globals_linux_mips.hpp b/src/hotspot/os_cpu/linux_mips/globals_linux_mips.hpp new file mode 100644 -index 000000000..f1599ac5f +index 00000000000..f1599ac5f17 --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/globals_linux_mips.hpp @@ -0,0 +1,51 @@ @@ -113492,7 +112932,7 @@ index 000000000..f1599ac5f +#endif // OS_CPU_LINUX_MIPS_VM_GLOBALS_LINUX_MIPS_HPP diff --git a/src/hotspot/os_cpu/linux_mips/linux_mips.s b/src/hotspot/os_cpu/linux_mips/linux_mips.s new file mode 100644 -index 000000000..36c8d810c +index 00000000000..36c8d810c3c --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/linux_mips.s @@ -0,0 +1,25 @@ @@ -113523,7 +112963,7 @@ index 000000000..36c8d810c + diff --git a/src/hotspot/os_cpu/linux_mips/orderAccess_linux_mips.hpp b/src/hotspot/os_cpu/linux_mips/orderAccess_linux_mips.hpp new file mode 100644 -index 000000000..a92bf43bd +index 00000000000..a92bf43bdbb --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/orderAccess_linux_mips.hpp @@ -0,0 +1,52 @@ @@ -113581,7 +113021,7 @@ index 000000000..a92bf43bd +#endif // OS_CPU_LINUX_MIPS_VM_ORDERACCESS_LINUX_MIPS_HPP diff --git a/src/hotspot/os_cpu/linux_mips/os_linux_mips.cpp b/src/hotspot/os_cpu/linux_mips/os_linux_mips.cpp new file mode 100644 -index 000000000..ff1af7beb +index 00000000000..ff1af7beb68 --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/os_linux_mips.cpp @@ -0,0 +1,817 @@ @@ -114404,7 +113844,7 @@ index 000000000..ff1af7beb +} diff --git a/src/hotspot/os_cpu/linux_mips/os_linux_mips.hpp b/src/hotspot/os_cpu/linux_mips/os_linux_mips.hpp new file mode 100644 -index 000000000..c07d08156 +index 00000000000..c07d08156f2 --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/os_linux_mips.hpp @@ -0,0 +1,39 @@ @@ -114449,7 +113889,7 @@ index 000000000..c07d08156 +#endif // OS_CPU_LINUX_MIPS_VM_OS_LINUX_MIPS_HPP diff --git a/src/hotspot/os_cpu/linux_mips/prefetch_linux_mips.inline.hpp b/src/hotspot/os_cpu/linux_mips/prefetch_linux_mips.inline.hpp new file mode 100644 -index 000000000..93490345f +index 00000000000..93490345f0b --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/prefetch_linux_mips.inline.hpp @@ -0,0 +1,58 @@ @@ -114513,7 +113953,7 @@ index 000000000..93490345f +#endif // OS_CPU_LINUX_MIPS_VM_PREFETCH_LINUX_MIPS_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_mips/safefetch_linux_mips64.S b/src/hotspot/os_cpu/linux_mips/safefetch_linux_mips64.S new file mode 100644 -index 000000000..fc6ee6eca +index 00000000000..fc6ee6eca65 --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/safefetch_linux_mips64.S @@ -0,0 +1,60 @@ @@ -114579,7 +114019,7 @@ index 000000000..fc6ee6eca + nop diff --git a/src/hotspot/os_cpu/linux_mips/thread_linux_mips.cpp b/src/hotspot/os_cpu/linux_mips/thread_linux_mips.cpp new file mode 100644 -index 000000000..4372eb41e +index 00000000000..4372eb41e9c --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/thread_linux_mips.cpp @@ -0,0 +1,108 @@ @@ -114693,7 +114133,7 @@ index 000000000..4372eb41e +void JavaThread::cache_global_variables() { } diff --git a/src/hotspot/os_cpu/linux_mips/thread_linux_mips.hpp b/src/hotspot/os_cpu/linux_mips/thread_linux_mips.hpp new file mode 100644 -index 000000000..c38f6950f +index 00000000000..c38f6950fd0 --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/thread_linux_mips.hpp @@ -0,0 +1,66 @@ @@ -114765,7 +114205,7 @@ index 000000000..c38f6950f +#endif // OS_CPU_LINUX_MIPS_VM_THREAD_LINUX_MIPS_HPP diff --git a/src/hotspot/os_cpu/linux_mips/vmStructs_linux_mips.hpp b/src/hotspot/os_cpu/linux_mips/vmStructs_linux_mips.hpp new file mode 100644 -index 000000000..b7454bf04 +index 00000000000..b7454bf045a --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/vmStructs_linux_mips.hpp @@ -0,0 +1,55 @@ @@ -114826,7 +114266,7 @@ index 000000000..b7454bf04 +#endif // OS_CPU_LINUX_MIPS_VM_VMSTRUCTS_LINUX_MIPS_HPP diff --git a/src/hotspot/os_cpu/linux_mips/vm_version_linux_mips.cpp b/src/hotspot/os_cpu/linux_mips/vm_version_linux_mips.cpp new file mode 100644 -index 000000000..93e4bea04 +index 00000000000..93e4bea04c6 --- /dev/null +++ b/src/hotspot/os_cpu/linux_mips/vm_version_linux_mips.cpp @@ -0,0 +1,28 @@ @@ -114858,8 +114298,33 @@ index 000000000..93e4bea04 +#include "precompiled.hpp" +#include "runtime/os.hpp" +#include "runtime/vm_version.hpp" +diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp +index b45f432dac9..02bec17ddf3 100644 +--- a/src/hotspot/share/adlc/formssel.cpp ++++ b/src/hotspot/share/adlc/formssel.cpp +@@ -22,6 +22,12 @@ + * + */ + ++/* ++ * This file has been modified by Loongson Technology in 2023, These ++ * modifications are Copyright (c) 2023, Loongson Technology, and are made ++ * available on the same license terms set forth above. ++ */ ++ + // FORMS.CPP - Definitions for ADL Parser Forms Classes + #include "adlc.hpp" + +@@ -4124,6 +4130,7 @@ bool MatchRule::is_ideal_membar() const { + !strcmp(_opType,"MemBarVolatile") || + !strcmp(_opType,"MemBarCPUOrder") || + !strcmp(_opType,"MemBarStoreStore") || ++ !strcmp(_opType,"SameAddrLoadFence" ) || + !strcmp(_opType,"OnSpinWait"); + } + diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp -index 0012152d4..e3660cab2 100644 +index 0012152d48d..e3660cab271 100644 --- a/src/hotspot/share/asm/codeBuffer.cpp +++ b/src/hotspot/share/asm/codeBuffer.cpp @@ -22,6 +22,12 @@ @@ -114884,7 +114349,7 @@ index 0012152d4..e3660cab2 100644 rtype == relocInfo::external_word_type, "code needs relocation information"); diff --git a/src/hotspot/share/c1/c1_Compiler.cpp b/src/hotspot/share/c1/c1_Compiler.cpp -index de173c64a..df93c01d8 100644 +index de173c64af1..df93c01d893 100644 --- a/src/hotspot/share/c1/c1_Compiler.cpp +++ b/src/hotspot/share/c1/c1_Compiler.cpp @@ -43,6 +43,12 @@ @@ -114910,7 +114375,7 @@ index de173c64a..df93c01d8 100644 case vmIntrinsics::_updateDirectByteBufferCRC32C: #endif diff --git a/src/hotspot/share/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp -index 308f3a09c..53a68cdb2 100644 +index 308f3a09c15..53a68cdb2fd 100644 --- a/src/hotspot/share/c1/c1_LIR.cpp +++ b/src/hotspot/share/c1/c1_LIR.cpp @@ -22,6 +22,12 @@ @@ -115062,7 +114527,7 @@ index 308f3a09c..53a68cdb2 100644 void LIR_Op4::print_instr(outputStream* out) const { print_condition(out, condition()); out->print(" "); diff --git a/src/hotspot/share/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp -index 717404e97..e9a981b20 100644 +index 717404e9726..e9a981b20c2 100644 --- a/src/hotspot/share/c1/c1_LIR.hpp +++ b/src/hotspot/share/c1/c1_LIR.hpp @@ -22,6 +22,12 @@ @@ -115299,7 +114764,7 @@ index 717404e97..e9a981b20 100644 LIR_Opr cmp_opr1 = LIR_OprFact::illegalOpr, LIR_Opr cmp_opr2 = LIR_OprFact::illegalOpr) { append(new LIR_Op4(lir_cmove, condition, src1, src2, cmp_opr1, cmp_opr2, dst, type)); diff --git a/src/hotspot/share/c1/c1_LIRAssembler.cpp b/src/hotspot/share/c1/c1_LIRAssembler.cpp -index 989a6f8ad..e288de2ab 100644 +index 989a6f8ad25..e288de2ab8e 100644 --- a/src/hotspot/share/c1/c1_LIRAssembler.cpp +++ b/src/hotspot/share/c1/c1_LIRAssembler.cpp @@ -22,6 +22,12 @@ @@ -115334,7 +114799,7 @@ index 989a6f8ad..e288de2ab 100644 switch(op->code()) { case lir_cmove: diff --git a/src/hotspot/share/c1/c1_LIRAssembler.hpp b/src/hotspot/share/c1/c1_LIRAssembler.hpp -index c82baa15f..84c34db49 100644 +index c82baa15fe7..84c34db4985 100644 --- a/src/hotspot/share/c1/c1_LIRAssembler.hpp +++ b/src/hotspot/share/c1/c1_LIRAssembler.hpp @@ -22,6 +22,12 @@ @@ -115369,7 +114834,7 @@ index c82baa15f..84c34db49 100644 LIR_Opr cmp_opr1 = LIR_OprFact::illegalOpr, LIR_Opr cmp_opr2 = LIR_OprFact::illegalOpr); #else diff --git a/src/hotspot/share/c1/c1_LinearScan.cpp b/src/hotspot/share/c1/c1_LinearScan.cpp -index d3d38d11a..6947406b2 100644 +index d3d38d11a90..6947406b2e7 100644 --- a/src/hotspot/share/c1/c1_LinearScan.cpp +++ b/src/hotspot/share/c1/c1_LinearScan.cpp @@ -35,6 +35,12 @@ @@ -115422,7 +114887,7 @@ index d3d38d11a..6947406b2 100644 prev_cmove = (LIR_Op4*)prev_op; #else diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp -index eef8e6b4b..1da32556e 100644 +index f5861d1f3ed..e1b78dcf381 100644 --- a/src/hotspot/share/code/nmethod.cpp +++ b/src/hotspot/share/code/nmethod.cpp @@ -22,6 +22,12 @@ @@ -115459,7 +114924,7 @@ index eef8e6b4b..1da32556e 100644 st.print("runtime_call"); CallRelocation* r = (CallRelocation*)iter.reloc(); diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp -index 47769c53a..ed69d18d7 100644 +index 47769c53a5b..ed69d18d759 100644 --- a/src/hotspot/share/code/relocInfo.cpp +++ b/src/hotspot/share/code/relocInfo.cpp @@ -402,6 +402,7 @@ void virtual_call_Relocation::unpack_data() { @@ -115488,7 +114953,7 @@ index 47769c53a..ed69d18d7 100644 CallRelocation* r = (CallRelocation*) reloc(); tty->print(" | [destination=" INTPTR_FORMAT "]", p2i(r->destination())); diff --git a/src/hotspot/share/code/relocInfo.hpp b/src/hotspot/share/code/relocInfo.hpp -index 55d4ac7c6..b1c347330 100644 +index 55d4ac7c62d..b1c34733021 100644 --- a/src/hotspot/share/code/relocInfo.hpp +++ b/src/hotspot/share/code/relocInfo.hpp @@ -266,7 +266,11 @@ class relocInfo { @@ -115545,7 +115010,7 @@ index 55d4ac7c6..b1c347330 100644 // Trampoline Relocations. // A trampoline allows to encode a small branch in the code, even if there diff --git a/src/hotspot/share/code/vtableStubs.cpp b/src/hotspot/share/code/vtableStubs.cpp -index 7ea2d19fc..7306230e8 100644 +index 7ea2d19fcd3..7306230e8fb 100644 --- a/src/hotspot/share/code/vtableStubs.cpp +++ b/src/hotspot/share/code/vtableStubs.cpp @@ -22,6 +22,12 @@ @@ -115582,7 +115047,7 @@ index 7ea2d19fc..7306230e8 100644 // ppc (linux, LE): 356 276 // ppc (AIX): 416 296 diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp -index f09441088..a8c1f97a8 100644 +index f0944108810..a8c1f97a80e 100644 --- a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp @@ -22,6 +22,12 @@ @@ -115608,8 +115073,48 @@ index f09441088..a8c1f97a8 100644 assert(_task_queue->taskqueue_empty(), "invariant"); } +diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp +index 56fdd2abeb4..17b9bcafd47 100644 +--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp ++++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp +@@ -22,6 +22,12 @@ + * + */ + ++/* ++ * This file has been modified by Loongson Technology in 2023, These ++ * modifications are Copyright (c) 2023, Loongson Technology, and are made ++ * available on the same license terms set forth above. ++ */ ++ + #include "precompiled.hpp" + #include "gc/shared/tlab_globals.hpp" + #include "gc/shared/c2/barrierSetC2.hpp" +@@ -266,6 +272,8 @@ public: + + bool is_volatile = (decorators & MO_SEQ_CST) != 0; + bool is_acquire = (decorators & MO_ACQUIRE) != 0; ++ bool is_relaxed = (decorators & MO_RELAXED) != 0; ++ bool is_unsafe = (decorators & C2_UNSAFE_ACCESS) != 0; + + // If reference is volatile, prevent following volatiles ops from + // floating up before the volatile access. +@@ -299,6 +307,13 @@ public: + assert(_leading_membar == NULL || support_IRIW_for_not_multiple_copy_atomic_cpu, "no leading membar expected"); + Node* mb = kit->insert_mem_bar(Op_MemBarAcquire, n); + mb->as_MemBar()->set_trailing_load(); ++ } else if (is_relaxed && is_unsafe) { ++#ifdef LOONGARCH64 ++ assert(kit != nullptr, "unsupported at optimization time"); ++ Node* n = _access.raw_access(); ++ Node* mb = kit->insert_mem_bar(Op_SameAddrLoadFence, n); ++ mb->as_MemBar()->set_trailing_load(); ++#endif + } + } + } diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp -index 7d31ff02e..07dac06ae 100644 +index 7d31ff02e1a..07dac06aecf 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp @@ -22,6 +22,12 @@ @@ -115635,7 +115140,7 @@ index 7d31ff02e..07dac06ae 100644 #endif diff --git a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp -index 0e99bf107..d5541cf89 100644 +index 0e99bf107c1..d5541cf8966 100644 --- a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp +++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp @@ -21,6 +21,12 @@ @@ -115661,7 +115166,7 @@ index 0e99bf107..d5541cf89 100644 #else LIR_Op(), diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp -index d66ed24d8..b682bb9d6 100644 +index d66ed24d862..b682bb9d62a 100644 --- a/src/hotspot/share/interpreter/interpreterRuntime.cpp +++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp @@ -22,6 +22,12 @@ @@ -115687,7 +115192,7 @@ index d66ed24d8..b682bb9d6 100644 if (src_address == dest_address) { return; diff --git a/src/hotspot/share/interpreter/interpreterRuntime.hpp b/src/hotspot/share/interpreter/interpreterRuntime.hpp -index c32431784..8209c42a1 100644 +index c32431784aa..8209c42a1c4 100644 --- a/src/hotspot/share/interpreter/interpreterRuntime.hpp +++ b/src/hotspot/share/interpreter/interpreterRuntime.hpp @@ -22,6 +22,12 @@ @@ -115713,7 +115218,7 @@ index c32431784..8209c42a1 100644 static void popframe_move_outgoing_args(JavaThread* current, void* src_address, void* dest_address); #endif diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp -index 4e167ff45..9441bae96 100644 +index 4e167ff451a..9441bae96c1 100644 --- a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp +++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp @@ -22,6 +22,12 @@ @@ -115742,7 +115247,7 @@ index 4e167ff45..9441bae96 100644 #ifdef PPC void lock_method(Register Rflags, Register Rscratch1, Register Rscratch2, bool flags_preloaded=false); diff --git a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp -index 597ddb380..427a9503e 100644 +index 597ddb3800f..427a9503eaf 100644 --- a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp +++ b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp @@ -22,6 +22,12 @@ @@ -115768,7 +115273,7 @@ index 597ddb380..427a9503e 100644 #else #warning "Unconfigured platform" diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp -index 3f57d487b..3b49daaf9 100644 +index 3f57d487bae..3b49daaf96e 100644 --- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp @@ -22,6 +22,12 @@ @@ -115803,7 +115308,7 @@ index 3f57d487b..3b49daaf9 100644 #define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \ diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp -index 1e897615e..9dc65a72b 100644 +index d1882c70e2c..7e62537658a 100644 --- a/src/hotspot/share/memory/metaspace.cpp +++ b/src/hotspot/share/memory/metaspace.cpp @@ -23,6 +23,12 @@ @@ -115819,7 +115324,7 @@ index 1e897615e..9dc65a72b 100644 #include "precompiled.hpp" #include "cds/metaspaceShared.hpp" #include "classfile/classLoaderData.hpp" -@@ -587,12 +593,15 @@ bool Metaspace::class_space_is_initialized() { +@@ -581,12 +587,15 @@ bool Metaspace::class_space_is_initialized() { // On error, returns an unreserved space. ReservedSpace Metaspace::reserve_address_space_for_compressed_classes(size_t size) { @@ -115836,7 +115341,7 @@ index 1e897615e..9dc65a72b 100644 // Additionally, above 32G, ensure the lower LogKlassAlignmentInBytes bits // of the upper 32-bits of the address are zero so we can handle a shift // when decoding. -@@ -649,16 +658,16 @@ ReservedSpace Metaspace::reserve_address_space_for_compressed_classes(size_t siz +@@ -643,16 +652,16 @@ ReservedSpace Metaspace::reserve_address_space_for_compressed_classes(size_t siz return rs; } } @@ -115856,8 +115361,115 @@ index 1e897615e..9dc65a72b 100644 } #endif // _LP64 +diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp +index 614d0b4e112..8d7764eb8a0 100644 +--- a/src/hotspot/share/opto/classes.hpp ++++ b/src/hotspot/share/opto/classes.hpp +@@ -22,6 +22,12 @@ + * + */ + ++/* ++ * This file has been modified by Loongson Technology in 2023, These ++ * modifications are Copyright (c) 2023, Loongson Technology, and are made ++ * available on the same license terms set forth above. ++ */ ++ + #include "utilities/macros.hpp" + + // The giant table of Node classes. +@@ -223,6 +229,7 @@ macro(StoreStoreFence) + macro(MemBarReleaseLock) + macro(MemBarVolatile) + macro(MemBarStoreStore) ++macro(SameAddrLoadFence) + macro(MergeMem) + macro(MinI) + macro(MinL) +diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp +index 4e8e39ffa74..6c7770dbf9c 100644 +--- a/src/hotspot/share/opto/compile.cpp ++++ b/src/hotspot/share/opto/compile.cpp +@@ -22,6 +22,12 @@ + * + */ + ++/* ++ * This file has been modified by Loongson Technology in 2023, These ++ * modifications are Copyright (c) 2023, Loongson Technology, and are made ++ * available on the same license terms set forth above. ++ */ ++ + #include "precompiled.hpp" + #include "jvm_io.h" + #include "asm/macroAssembler.hpp" +@@ -3522,6 +3528,7 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f + n->set_req(MemBarNode::Precedent, top()); + } + break; ++ case Op_SameAddrLoadFence: + case Op_MemBarAcquire: { + if (n->as_MemBar()->trailing_load() && n->req() > MemBarNode::Precedent) { + // At parse time, the trailing MemBarAcquire for a volatile load +diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp +index 074b129b059..a1886f813c3 100644 +--- a/src/hotspot/share/opto/memnode.cpp ++++ b/src/hotspot/share/opto/memnode.cpp +@@ -22,6 +22,12 @@ + * + */ + ++/* ++ * This file has been modified by Loongson Technology in 2023, These ++ * modifications are Copyright (c) 2023, Loongson Technology, and are made ++ * available on the same license terms set forth above. ++ */ ++ + #include "precompiled.hpp" + #include "classfile/javaClasses.hpp" + #include "compiler/compileLog.hpp" +@@ -3298,6 +3304,7 @@ MemBarNode* MemBarNode::make(Compile* C, int opcode, int atp, Node* pn) { + case Op_MemBarReleaseLock: return new MemBarReleaseLockNode(C, atp, pn); + case Op_MemBarVolatile: return new MemBarVolatileNode(C, atp, pn); + case Op_MemBarCPUOrder: return new MemBarCPUOrderNode(C, atp, pn); ++ case Op_SameAddrLoadFence: return new SameAddrLoadFenceNode(C, atp, pn); + case Op_OnSpinWait: return new OnSpinWaitNode(C, atp, pn); + case Op_Initialize: return new InitializeNode(C, atp, pn); + default: ShouldNotReachHere(); return nullptr; +diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp +index 99a30486274..71bf997533f 100644 +--- a/src/hotspot/share/opto/memnode.hpp ++++ b/src/hotspot/share/opto/memnode.hpp +@@ -22,6 +22,12 @@ + * + */ + ++/* ++ * This file has been modified by Loongson Technology in 2023, These ++ * modifications are Copyright (c) 2023, Loongson Technology, and are made ++ * available on the same license terms set forth above. ++ */ ++ + #ifndef SHARE_OPTO_MEMNODE_HPP + #define SHARE_OPTO_MEMNODE_HPP + +@@ -1336,6 +1342,14 @@ public: + virtual uint ideal_reg() const { return 0; } // not matched in the AD file + }; + ++// Used to prevent LoadLoad reorder for same address. ++class SameAddrLoadFenceNode: public MemBarNode { ++public: ++ SameAddrLoadFenceNode(Compile* C, int alias_idx, Node* precedent) ++ : MemBarNode(C, alias_idx, precedent) {} ++ virtual int Opcode() const; ++}; ++ + class OnSpinWaitNode: public MemBarNode { + public: + OnSpinWaitNode(Compile* C, int alias_idx, Node* precedent) diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp -index 8a1ed0d31..596829c07 100644 +index 43c46a0eb8f..af7a37a1bf2 100644 --- a/src/hotspot/share/opto/output.cpp +++ b/src/hotspot/share/opto/output.cpp @@ -22,6 +22,12 @@ @@ -115873,7 +115485,7 @@ index 8a1ed0d31..596829c07 100644 #include "precompiled.hpp" #include "asm/assembler.inline.hpp" #include "asm/macroAssembler.inline.hpp" -@@ -1011,6 +1017,27 @@ void PhaseOutput::Process_OopMap_Node(MachNode *mach, int current_offset) { +@@ -1016,6 +1022,27 @@ void PhaseOutput::Process_OopMap_Node(MachNode *mach, int current_offset) { // Add the safepoint in the DebugInfoRecorder if( !mach->is_MachCall() ) { mcall = nullptr; @@ -115901,7 +115513,7 @@ index 8a1ed0d31..596829c07 100644 C->debug_info()->add_safepoint(safepoint_pc_offset, sfn->_oop_map); } else { mcall = mach->as_MachCall(); -@@ -1686,6 +1713,22 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) { +@@ -1691,6 +1718,22 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) { DEBUG_ONLY(uint instr_offset = cb->insts_size()); n->emit(*cb, C->regalloc()); current_offset = cb->insts_size(); @@ -115925,7 +115537,7 @@ index 8a1ed0d31..596829c07 100644 // Above we only verified that there is enough space in the instruction section. // However, the instruction may emit stubs that cause code buffer expansion. diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp -index e99bf8eb8..67f8de896 100644 +index f13ffbc12af..f78be3e0871 100644 --- a/src/hotspot/share/opto/type.cpp +++ b/src/hotspot/share/opto/type.cpp @@ -22,6 +22,12 @@ @@ -115957,7 +115569,7 @@ index e99bf8eb8..67f8de896 100644 { Bad, T_ILLEGAL, "vectormask:", false, Op_RegVectMask, relocInfo::none }, // VectorMask. { Bad, T_ILLEGAL, "vectora:", false, Op_VecA, relocInfo::none }, // VectorA. diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp -index 374816fd3..e7015344a 100644 +index 374816fd355..e7015344a18 100644 --- a/src/hotspot/share/runtime/objectMonitor.cpp +++ b/src/hotspot/share/runtime/objectMonitor.cpp @@ -22,6 +22,12 @@ @@ -115992,7 +115604,7 @@ index 374816fd3..e7015344a 100644 assert(owner_raw() != current, "invariant"); assert(_Responsible != current, "invariant"); diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp -index 69cf6f143..16dc031e4 100644 +index e786b057262..6f34a7d5ea5 100644 --- a/src/hotspot/share/runtime/os.cpp +++ b/src/hotspot/share/runtime/os.cpp @@ -22,6 +22,12 @@ @@ -116008,7 +115620,7 @@ index 69cf6f143..16dc031e4 100644 #include "precompiled.hpp" #include "jvm.h" #include "classfile/javaClasses.hpp" -@@ -1228,7 +1234,8 @@ bool os::is_first_C_frame(frame* fr) { +@@ -1238,7 +1244,8 @@ bool os::is_first_C_frame(frame* fr) { if ((uintptr_t)fr->sender_sp() == (uintptr_t)-1 || is_pointer_bad(fr->sender_sp())) return true; uintptr_t old_fp = (uintptr_t)fr->link_or_null(); @@ -116019,7 +115631,7 @@ index 69cf6f143..16dc031e4 100644 // stack grows downwards; if old_fp is below current fp or if the stack diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp -index 9af4b513a..1a3e9fd0a 100644 +index 9af4b513a99..1a3e9fd0ad5 100644 --- a/src/hotspot/share/runtime/sharedRuntime.cpp +++ b/src/hotspot/share/runtime/sharedRuntime.cpp @@ -22,6 +22,12 @@ @@ -116045,7 +115657,7 @@ index 9af4b513a..1a3e9fd0a 100644 // in the constant pool to ensure ordering between the barrier and oops // accesses. For native_wrappers we need a constant. diff --git a/src/hotspot/share/runtime/sharedRuntimeTrig.cpp b/src/hotspot/share/runtime/sharedRuntimeTrig.cpp -index 6e3aa30b0..8f1d486f5 100644 +index 6e3aa30b0b9..8f1d486f5cb 100644 --- a/src/hotspot/share/runtime/sharedRuntimeTrig.cpp +++ b/src/hotspot/share/runtime/sharedRuntimeTrig.cpp @@ -22,6 +22,13 @@ @@ -116078,7 +115690,7 @@ index 6e3aa30b0..8f1d486f5 100644 S1 = -1.66666666666666324348e-01, /* 0xBFC55555, 0x55555549 */ S2 = 8.33333333332248946124e-03, /* 0x3F811111, 0x1110F8A6 */ diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp -index d86fce3c8..71bfd4dfa 100644 +index d86fce3c8ac..71bfd4dfa19 100644 --- a/src/hotspot/share/runtime/thread.inline.hpp +++ b/src/hotspot/share/runtime/thread.inline.hpp @@ -23,6 +23,12 @@ @@ -116112,8 +115724,33 @@ index d86fce3c8..71bfd4dfa 100644 // Use membars when accessing volatile _thread_state. See // Threads::create_vm() for size checks. Atomic::release_store((volatile jint*)&_thread_state, (jint)s); +diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp +index 33de84a68c1..7dc3d58f381 100644 +--- a/src/hotspot/share/runtime/vmStructs.cpp ++++ b/src/hotspot/share/runtime/vmStructs.cpp +@@ -22,6 +22,12 @@ + * + */ + ++/* ++ * This file has been modified by Loongson Technology in 2023, These ++ * modifications are Copyright (c) 2023, Loongson Technology, and are made ++ * available on the same license terms set forth above. ++ */ ++ + #include "precompiled.hpp" + #include "cds/filemap.hpp" + #include "ci/ciField.hpp" +@@ -1597,6 +1603,7 @@ typedef HashtableEntry KlassHashtableEntry; + declare_c2_type(StoreFenceNode, MemBarNode) \ + declare_c2_type(MemBarVolatileNode, MemBarNode) \ + declare_c2_type(MemBarCPUOrderNode, MemBarNode) \ ++ declare_c2_type(SameAddrLoadFenceNode, MemBarNode) \ + declare_c2_type(OnSpinWaitNode, MemBarNode) \ + declare_c2_type(BlackholeNode, MultiNode) \ + declare_c2_type(InitializeNode, MemBarNode) \ diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp -index 33ecfe089..4d024b357 100644 +index 33ecfe089f8..4d024b35735 100644 --- a/src/hotspot/share/utilities/macros.hpp +++ b/src/hotspot/share/utilities/macros.hpp @@ -22,6 +22,12 @@ @@ -116204,7 +115841,7 @@ index 33ecfe089..4d024b357 100644 #define COMPILER_HEADER(basename) XSTR(COMPILER_HEADER_STEM(basename).hpp) #define COMPILER_HEADER_INLINE(basename) XSTR(COMPILER_HEADER_STEM(basename).inline.hpp) diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp b/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp -index 9accba375..200bb1e82 100644 +index 9accba375a2..200bb1e82f3 100644 --- a/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp +++ b/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp @@ -23,6 +23,13 @@ @@ -116271,7 +115908,7 @@ index 9accba375..200bb1e82 100644 #define REG_INDEX(reg) sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext_##reg diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h -index a69496e77..64312b470 100644 +index a69496e77a4..64312b4705d 100644 --- a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h +++ b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h @@ -22,6 +22,13 @@ @@ -116309,7 +115946,7 @@ index a69496e77..64312b470 100644 // This C bool type must be int for compatibility with Linux calls and // it would be a mistake to equivalence it to C++ bool on many platforms diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c -index 1101b9999..301c9f9f2 100644 +index 3068f475626..d35cc73221f 100644 --- a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c +++ b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c @@ -22,6 +22,12 @@ @@ -116335,7 +115972,7 @@ index 1101b9999..301c9f9f2 100644 print_debug("ptrace(PTRACE_GETREGS, ...) failed for lwp(%d) errno(%d) \"%s\"\n", pid, errno, strerror(errno)); diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java -index e0e9b4b67..9af1218ed 100644 +index e0e9b4b6727..9af1218ed46 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java @@ -23,6 +23,12 @@ @@ -116373,7 +116010,7 @@ index e0e9b4b67..9af1218ed 100644 machDesc = (MachineDescription) diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionLOONGARCH64.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionLOONGARCH64.java new file mode 100644 -index 000000000..99cea8c7f +index 00000000000..99cea8c7f14 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionLOONGARCH64.java @@ -0,0 +1,41 @@ @@ -116420,7 +116057,7 @@ index 000000000..99cea8c7f +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionMIPS64.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionMIPS64.java new file mode 100644 -index 000000000..1b49efd20 +index 00000000000..1b49efd2017 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionMIPS64.java @@ -0,0 +1,41 @@ @@ -116466,7 +116103,7 @@ index 000000000..1b49efd20 + } +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java -index 469bb6e06..ea3a118de 100644 +index 469bb6e0665..ea3a118de2a 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java @@ -23,6 +23,12 @@ @@ -116523,7 +116160,7 @@ index 469bb6e06..ea3a118de 100644 Address sp = context.getRegisterAsAddress(PPC64ThreadContext.SP); if (sp == null) return null; diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java -index 69a34fe2a..c21e0d6a6 100644 +index 69a34fe2afa..c21e0d6a611 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java @@ -22,6 +22,12 @@ @@ -116563,7 +116200,7 @@ index 69a34fe2a..c21e0d6a6 100644 try { diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64CFrame.java new file mode 100644 -index 000000000..0e6caee5a +index 00000000000..0e6caee5a49 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64CFrame.java @@ -0,0 +1,92 @@ @@ -116661,7 +116298,7 @@ index 000000000..0e6caee5a +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64ThreadContext.java new file mode 100644 -index 000000000..604642598 +index 00000000000..604642598e0 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64ThreadContext.java @@ -0,0 +1,47 @@ @@ -116714,7 +116351,7 @@ index 000000000..604642598 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64CFrame.java new file mode 100644 -index 000000000..2e3eb564d +index 00000000000..2e3eb564da2 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64CFrame.java @@ -0,0 +1,80 @@ @@ -116800,7 +116437,7 @@ index 000000000..2e3eb564d +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64ThreadContext.java new file mode 100644 -index 000000000..98e0f3f0b +index 00000000000..98e0f3f0bcf --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64ThreadContext.java @@ -0,0 +1,47 @@ @@ -116853,7 +116490,7 @@ index 000000000..98e0f3f0b +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/loongarch64/LOONGARCH64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/loongarch64/LOONGARCH64ThreadContext.java new file mode 100644 -index 000000000..1de3cb1a4 +index 00000000000..1de3cb1a472 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/loongarch64/LOONGARCH64ThreadContext.java @@ -0,0 +1,128 @@ @@ -116987,7 +116624,7 @@ index 000000000..1de3cb1a4 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/mips64/MIPS64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/mips64/MIPS64ThreadContext.java new file mode 100644 -index 000000000..d3479a65e +index 00000000000..d3479a65ea0 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/mips64/MIPS64ThreadContext.java @@ -0,0 +1,128 @@ @@ -117120,7 +116757,7 @@ index 000000000..d3479a65e + public abstract Address getRegisterAsAddress(int index); +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java -index 7113a3a49..de47531db 100644 +index 7113a3a497b..de47531db7c 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java @@ -22,6 +22,12 @@ @@ -117147,7 +116784,7 @@ index 7113a3a49..de47531db 100644 public short getFileType(); diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64Thread.java new file mode 100644 -index 000000000..1f60fa6cf +index 00000000000..1f60fa6cfb2 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64Thread.java @@ -0,0 +1,92 @@ @@ -117245,7 +116882,7 @@ index 000000000..1f60fa6cf +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadContext.java new file mode 100644 -index 000000000..ef5597ac4 +index 00000000000..ef5597ac4e9 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadContext.java @@ -0,0 +1,47 @@ @@ -117298,7 +116935,7 @@ index 000000000..ef5597ac4 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadFactory.java new file mode 100644 -index 000000000..abad1bb38 +index 00000000000..abad1bb38b7 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadFactory.java @@ -0,0 +1,45 @@ @@ -117349,7 +116986,7 @@ index 000000000..abad1bb38 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64Thread.java new file mode 100644 -index 000000000..5c1e0be89 +index 00000000000..5c1e0be8932 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64Thread.java @@ -0,0 +1,92 @@ @@ -117447,7 +117084,7 @@ index 000000000..5c1e0be89 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadContext.java new file mode 100644 -index 000000000..d44223d76 +index 00000000000..d44223d768a --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadContext.java @@ -0,0 +1,47 @@ @@ -117500,7 +117137,7 @@ index 000000000..d44223d76 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadFactory.java new file mode 100644 -index 000000000..bad478fc5 +index 00000000000..bad478fc5ca --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadFactory.java @@ -0,0 +1,45 @@ @@ -117550,7 +117187,7 @@ index 000000000..bad478fc5 + } +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java -index 2bd396c8f..da89480f7 100644 +index 2bd396c8f4f..da89480f72c 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java @@ -22,6 +22,12 @@ @@ -117594,7 +117231,7 @@ index 2bd396c8f..da89480f7 100644 Class tf = Class.forName("sun.jvm.hotspot.debugger.remote." + diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64Thread.java new file mode 100644 -index 000000000..242dd279e +index 00000000000..242dd279e1a --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64Thread.java @@ -0,0 +1,54 @@ @@ -117654,7 +117291,7 @@ index 000000000..242dd279e +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadContext.java new file mode 100644 -index 000000000..634d5ad04 +index 00000000000..634d5ad049f --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadContext.java @@ -0,0 +1,51 @@ @@ -117711,7 +117348,7 @@ index 000000000..634d5ad04 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadFactory.java new file mode 100644 -index 000000000..4fb9cc7c0 +index 00000000000..4fb9cc7c069 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadFactory.java @@ -0,0 +1,45 @@ @@ -117762,7 +117399,7 @@ index 000000000..4fb9cc7c0 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64Thread.java new file mode 100644 -index 000000000..c2f7d841f +index 00000000000..c2f7d841f20 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64Thread.java @@ -0,0 +1,54 @@ @@ -117822,7 +117459,7 @@ index 000000000..c2f7d841f +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadContext.java new file mode 100644 -index 000000000..23646905d +index 00000000000..23646905d74 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadContext.java @@ -0,0 +1,51 @@ @@ -117879,7 +117516,7 @@ index 000000000..23646905d +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadFactory.java new file mode 100644 -index 000000000..b39b01449 +index 00000000000..b39b0144901 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadFactory.java @@ -0,0 +1,45 @@ @@ -117929,7 +117566,7 @@ index 000000000..b39b01449 + } +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java -index d16ac8aae..de1e70a72 100644 +index d16ac8aae51..de1e70a7290 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java @@ -22,6 +22,12 @@ @@ -117967,7 +117604,7 @@ index d16ac8aae..de1e70a72 100644 access = (JavaThreadPDAccess) diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_loongarch64/LinuxLOONGARCH64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_loongarch64/LinuxLOONGARCH64JavaThreadPDAccess.java new file mode 100644 -index 000000000..75d6bf2c6 +index 00000000000..75d6bf2c642 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_loongarch64/LinuxLOONGARCH64JavaThreadPDAccess.java @@ -0,0 +1,135 @@ @@ -118108,7 +117745,7 @@ index 000000000..75d6bf2c6 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_mips64/LinuxMIPS64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_mips64/LinuxMIPS64JavaThreadPDAccess.java new file mode 100644 -index 000000000..882237449 +index 00000000000..88223744932 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_mips64/LinuxMIPS64JavaThreadPDAccess.java @@ -0,0 +1,135 @@ @@ -118249,7 +117886,7 @@ index 000000000..882237449 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64CurrentFrameGuess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64CurrentFrameGuess.java new file mode 100644 -index 000000000..824270e13 +index 00000000000..824270e1329 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64CurrentFrameGuess.java @@ -0,0 +1,250 @@ @@ -118505,7 +118142,7 @@ index 000000000..824270e13 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64Frame.java new file mode 100644 -index 000000000..576654594 +index 00000000000..576654594d8 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64Frame.java @@ -0,0 +1,519 @@ @@ -119030,7 +118667,7 @@ index 000000000..576654594 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64JavaCallWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64JavaCallWrapper.java new file mode 100644 -index 000000000..0ad9573a4 +index 00000000000..0ad9573a42d --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64JavaCallWrapper.java @@ -0,0 +1,59 @@ @@ -119095,7 +118732,7 @@ index 000000000..0ad9573a4 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64RegisterMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64RegisterMap.java new file mode 100644 -index 000000000..2cf904d38 +index 00000000000..2cf904d3885 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64RegisterMap.java @@ -0,0 +1,52 @@ @@ -119153,7 +118790,7 @@ index 000000000..2cf904d38 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64CurrentFrameGuess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64CurrentFrameGuess.java new file mode 100644 -index 000000000..c11458abe +index 00000000000..c11458abe2c --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64CurrentFrameGuess.java @@ -0,0 +1,217 @@ @@ -119376,7 +119013,7 @@ index 000000000..c11458abe +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64Frame.java new file mode 100644 -index 000000000..e11d64737 +index 00000000000..e11d64737dd --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64Frame.java @@ -0,0 +1,539 @@ @@ -119921,7 +119558,7 @@ index 000000000..e11d64737 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64JavaCallWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64JavaCallWrapper.java new file mode 100644 -index 000000000..8a4a28a60 +index 00000000000..8a4a28a6055 --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64JavaCallWrapper.java @@ -0,0 +1,59 @@ @@ -119986,7 +119623,7 @@ index 000000000..8a4a28a60 +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64RegisterMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64RegisterMap.java new file mode 100644 -index 000000000..f2da760af +index 00000000000..f2da760af4a --- /dev/null +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64RegisterMap.java @@ -0,0 +1,52 @@ @@ -120043,7 +119680,7 @@ index 000000000..f2da760af + protected Address getLocationPD(VMReg reg) { return null; } +} diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java -index f4cd48732..6901946e5 100644 +index f4cd4873207..6901946e58a 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java @@ -22,6 +22,13 @@ @@ -120084,7 +119721,7 @@ index f4cd48732..6901946e5 100644 } diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotJVMCIBackendFactory.java new file mode 100644 -index 000000000..1f54e9f3c +index 00000000000..1f54e9f3c59 --- /dev/null +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotJVMCIBackendFactory.java @@ -0,0 +1,142 @@ @@ -120232,7 +119869,7 @@ index 000000000..1f54e9f3c +} diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotRegisterConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotRegisterConfig.java new file mode 100644 -index 000000000..e1a007000 +index 00000000000..e1a007000d2 --- /dev/null +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotRegisterConfig.java @@ -0,0 +1,297 @@ @@ -120535,7 +120172,7 @@ index 000000000..e1a007000 +} diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotVMConfig.java new file mode 100644 -index 000000000..0a2e85720 +index 00000000000..0a2e857204c --- /dev/null +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/LoongArch64HotSpotVMConfig.java @@ -0,0 +1,77 @@ @@ -120618,7 +120255,7 @@ index 000000000..0a2e85720 +} diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/package-info.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/package-info.java new file mode 100644 -index 000000000..74c6ca980 +index 00000000000..74c6ca9801f --- /dev/null +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/loongarch64/package-info.java @@ -0,0 +1,28 @@ @@ -120652,7 +120289,7 @@ index 000000000..74c6ca980 +package jdk.vm.ci.hotspot.loongarch64; diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/LoongArch64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/LoongArch64.java new file mode 100644 -index 000000000..930b17e82 +index 00000000000..930b17e820a --- /dev/null +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/LoongArch64.java @@ -0,0 +1,249 @@ @@ -120907,7 +120544,7 @@ index 000000000..930b17e82 +} diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/LoongArch64Kind.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/LoongArch64Kind.java new file mode 100644 -index 000000000..047a1dbbe +index 00000000000..047a1dbbe36 --- /dev/null +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/LoongArch64Kind.java @@ -0,0 +1,163 @@ @@ -121076,7 +120713,7 @@ index 000000000..047a1dbbe +} diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/package-info.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/package-info.java new file mode 100644 -index 000000000..6df1b7b3a +index 00000000000..6df1b7b3a92 --- /dev/null +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/loongarch64/package-info.java @@ -0,0 +1,28 @@ @@ -121109,7 +120746,7 @@ index 000000000..6df1b7b3a + */ +package jdk.vm.ci.loongarch64; diff --git a/src/jdk.internal.vm.ci/share/classes/module-info.java b/src/jdk.internal.vm.ci/share/classes/module-info.java -index ed1976957..62a4ff4be 100644 +index ed197695720..62a4ff4be0f 100644 --- a/src/jdk.internal.vm.ci/share/classes/module-info.java +++ b/src/jdk.internal.vm.ci/share/classes/module-info.java @@ -23,6 +23,12 @@ @@ -121133,7 +120770,7 @@ index ed1976957..62a4ff4be 100644 jdk.vm.ci.hotspot.amd64.AMD64HotSpotJVMCIBackendFactory; } diff --git a/src/utils/hsdis/Makefile b/src/utils/hsdis/Makefile -index 66dac7130..dd2ccd340 100644 +index 66dac7130bd..dd2ccd340f2 100644 --- a/src/utils/hsdis/Makefile +++ b/src/utils/hsdis/Makefile @@ -89,6 +89,9 @@ CC = gcc @@ -121147,7 +120784,7 @@ index 66dac7130..dd2ccd340 100644 OUTFLAGS += -o $@ else diff --git a/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java -index 4c56daebf..928361304 100644 +index 4c56daebfb8..92836130408 100644 --- a/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java +++ b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java @@ -21,12 +21,18 @@ @@ -121171,7 +120808,7 @@ index 4c56daebf..928361304 100644 * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * @run main/othervm/timeout=600 -Xbootclasspath/a:. diff --git a/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java -index 03016ea3d..62ce6c1a7 100644 +index 03016ea3dd6..62ce6c1a7a5 100644 --- a/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java +++ b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java @@ -21,6 +21,12 @@ @@ -121197,7 +120834,7 @@ index 03016ea3d..62ce6c1a7 100644 * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java -index 468cd83d7..40d2b03e3 100644 +index 468cd83d7a2..40d2b03e301 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java @@ -21,6 +21,12 @@ @@ -121241,7 +120878,7 @@ index 468cd83d7..40d2b03e3 100644 this.checkUseSHA = checkUseSHA; } diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java -index d7ecc7c04..0d47a2f30 100644 +index d7ecc7c04ef..0d47a2f3037 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java @@ -20,16 +20,25 @@ @@ -121280,7 +120917,7 @@ index d7ecc7c04..0d47a2f30 100644 Assert.fail("unsupported architecture"); return null; diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java -index 2e3f90368..a07fcc8af 100644 +index 2e3f90368b1..a07fcc8af94 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java @@ -21,10 +21,16 @@ @@ -121313,7 +120950,7 @@ index 2e3f90368..a07fcc8af 100644 */ diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java -index b88832677..00860c8a6 100644 +index b88832677eb..00860c8a66a 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java @@ -21,10 +21,16 @@ @@ -121346,7 +120983,7 @@ index b88832677..00860c8a6 100644 */ diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java -index f473d089a..6ca7b76f1 100644 +index f473d089a54..6ca7b76f1e7 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java @@ -21,10 +21,16 @@ @@ -121379,7 +121016,7 @@ index f473d089a..6ca7b76f1 100644 */ diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java -index 0f5c8be3f..3b6b464b1 100644 +index 0f5c8be3f2d..3b6b464b1c1 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java @@ -21,10 +21,16 @@ @@ -121412,7 +121049,7 @@ index 0f5c8be3f..3b6b464b1 100644 */ package jdk.vm.ci.code.test; diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java -index e5fc53e80..75494d5cc 100644 +index e5fc53e8013..75494d5ccf1 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java @@ -21,10 +21,16 @@ @@ -121445,7 +121082,7 @@ index e5fc53e80..75494d5cc 100644 */ diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java -index bfd611312..08be94ac1 100644 +index bfd611312a2..08be94ac132 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java @@ -21,10 +21,16 @@ @@ -121478,7 +121115,7 @@ index bfd611312..08be94ac1 100644 */ diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java -index 1fb0d77eb..b2d40f70a 100644 +index 1fb0d77eb73..b2d40f70a80 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java @@ -21,10 +21,16 @@ @@ -121512,7 +121149,7 @@ index 1fb0d77eb..b2d40f70a 100644 diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/loongarch64/LoongArch64TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/loongarch64/LoongArch64TestAssembler.java new file mode 100644 -index 000000000..4c7686845 +index 00000000000..4c76868453a --- /dev/null +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/loongarch64/LoongArch64TestAssembler.java @@ -0,0 +1,568 @@ @@ -122085,7 +121722,7 @@ index 000000000..4c7686845 + +} diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java -index 2f2395b77..58482edb3 100644 +index 2f2395b77c6..58482edb32e 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java @@ -21,6 +21,12 @@ @@ -122113,7 +121750,7 @@ index 2f2395b77..58482edb3 100644 public static final String CHECKCAST_ARRAYCOPY = "(.*((?i:call_leaf_nofp,runtime)|CALL,\\s?runtime leaf nofp|BCTRL.*.leaf call).*checkcast_arraycopy.*" + END; diff --git a/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java b/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java -index 85fd3fa93..0655f2b0b 100644 +index 85fd3fa938d..0655f2b0bd1 100644 --- a/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java +++ b/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java @@ -21,6 +21,12 @@ @@ -122157,7 +121794,7 @@ index 85fd3fa93..0655f2b0b 100644 .shouldMatch("Test_MT2/.*::test \\(3 bytes\\) made not entrant"); } else { diff --git a/test/hotspot/jtreg/compiler/runtime/criticalnatives/argumentcorruption/CheckLongArgs.java b/test/hotspot/jtreg/compiler/runtime/criticalnatives/argumentcorruption/CheckLongArgs.java -index 10d87d51f..dbea76741 100644 +index 10d87d51f0f..dbea76741d6 100644 --- a/test/hotspot/jtreg/compiler/runtime/criticalnatives/argumentcorruption/CheckLongArgs.java +++ b/test/hotspot/jtreg/compiler/runtime/criticalnatives/argumentcorruption/CheckLongArgs.java @@ -21,10 +21,17 @@ @@ -122179,7 +121816,7 @@ index 10d87d51f..dbea76741 100644 */ package compiler.runtime.criticalnatives.argumentcorruption; diff --git a/test/hotspot/jtreg/compiler/runtime/criticalnatives/lookup/LookUp.java b/test/hotspot/jtreg/compiler/runtime/criticalnatives/lookup/LookUp.java -index 23c1e6e6a..2f402d567 100644 +index 23c1e6e6acb..2f402d567d9 100644 --- a/test/hotspot/jtreg/compiler/runtime/criticalnatives/lookup/LookUp.java +++ b/test/hotspot/jtreg/compiler/runtime/criticalnatives/lookup/LookUp.java @@ -21,10 +21,17 @@ @@ -122201,7 +121838,7 @@ index 23c1e6e6a..2f402d567 100644 */ package compiler.runtime.criticalnatives.lookup; diff --git a/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java b/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java -index 689c7c8cc..f734c1baa 100644 +index 689c7c8cc2f..f734c1baa3f 100644 --- a/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java +++ b/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java @@ -21,6 +21,12 @@ @@ -122259,7 +121896,7 @@ index 689c7c8cc..f734c1baa 100644 public static final BooleanSupplier SHA512_INSTRUCTION_AVAILABLE = new OrPredicate(new CPUSpecificPredicate("aarch64.*", new String[] { "sha512" }, null), diff --git a/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java -index 36f74d01b..035b91b9d 100644 +index 36f74d01b54..035b91b9d8e 100644 --- a/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java +++ b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java @@ -21,6 +21,12 @@ @@ -122286,7 +121923,7 @@ index 36f74d01b..035b91b9d 100644 } diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java -index 26dd3514e..2818343ec 100644 +index 26dd3514e8e..2818343ec3d 100644 --- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java +++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java @@ -21,6 +21,12 @@ @@ -122312,7 +121949,7 @@ index 26dd3514e..2818343ec 100644 } else if (Platform.isS390x()){ cmp = "CLFI"; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ArgumentHandler.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ArgumentHandler.java -index 168631895..e2f3a1347 100644 +index 16863189500..e2f3a13473b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ArgumentHandler.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ArgumentHandler.java @@ -21,6 +21,12 @@ @@ -122540,8 +122177,30 @@ index 168631895..e2f3a1347 100644 + {"aix-ppc64", "dt_shmem"}, }; } +diff --git a/test/jdk/java/nio/channels/DatagramChannel/Disconnect.java b/test/jdk/java/nio/channels/DatagramChannel/Disconnect.java +index cdc5882fefd..16120f85168 100644 +--- a/test/jdk/java/nio/channels/DatagramChannel/Disconnect.java ++++ b/test/jdk/java/nio/channels/DatagramChannel/Disconnect.java +@@ -52,7 +52,7 @@ public class Disconnect { + if (IPSupport.hasIPv4()) { + // test with IPv4 only + try (DatagramChannel dc = DatagramChannel.open(StandardProtocolFamily.INET)) { +- InetAddress lo4 = InetAddress.ofLiteral("127.0.0.1"); ++ InetAddress lo4 = InetAddress.getByName("127.0.0.1"); + System.out.println("Testing with INET family and " + lo4); + test(dc, lo4); + test(dc, lo4); +@@ -62,7 +62,7 @@ public class Disconnect { + if (IPSupport.hasIPv6()) { + // test with IPv6 only + try (DatagramChannel dc = DatagramChannel.open(StandardProtocolFamily.INET6)) { +- InetAddress lo6 = InetAddress.ofLiteral("::1"); ++ InetAddress lo6 = InetAddress.getByName("::1"); + System.out.println("Testing with INET6 family and " + lo6); + test(dc, lo6); + test(dc, lo6); diff --git a/test/jdk/jdk/jfr/event/os/TestCPUInformation.java b/test/jdk/jdk/jfr/event/os/TestCPUInformation.java -index c51665800..913136a1f 100644 +index c5166580010..913136a1fd1 100644 --- a/test/jdk/jdk/jfr/event/os/TestCPUInformation.java +++ b/test/jdk/jdk/jfr/event/os/TestCPUInformation.java @@ -21,6 +21,12 @@ @@ -122568,25 +122227,8 @@ index c51665800..913136a1f 100644 } } } -diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java -index becbc9695..453545207 100644 ---- a/test/jdk/sun/security/pkcs11/PKCS11Test.java -+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java -@@ -21,6 +21,12 @@ - * questions. - */ - -+/* -+ * This file has been modified by Loongson Technology in 2022, These -+ * modifications are Copyright (c) 2021, 2022, Loongson Technology, and are made -+ * available on the same license terms set forth above. -+ */ -+ - // common infrastructure for SunPKCS11 tests - - import java.io.ByteArrayOutputStream; diff --git a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java -index f8ce856bd..003e75094 100644 +index e78e200ac24..2b9fcc0ff47 100644 --- a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java +++ b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java @@ -33,6 +33,12 @@ import java.util.HashSet; @@ -122612,7 +122254,7 @@ index f8ce856bd..003e75094 100644 OS("isAix", "isLinux", "isOSX", "isWindows"), VM_TYPE("isClient", "isServer", "isMinimal", "isZero", "isEmbedded"), diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java -index 00e922bb1..d01b20e1e 100644 +index 2e2e16e6593..64b42446e84 100644 --- a/test/lib/jdk/test/lib/Platform.java +++ b/test/lib/jdk/test/lib/Platform.java @@ -21,6 +21,12 @@ @@ -122643,6 +122285,3 @@ index 00e922bb1..d01b20e1e 100644 public static String getOsArch() { return osArch; } --- -2.33.0 - diff --git a/add-version-txt.patch b/add-version-txt.patch index dabf1c16e7dc29daa16c6091a68da0aa7df789f0..be2d555d0cd681c1ec02654da51a49477ac760c7 100644 --- a/add-version-txt.patch +++ b/add-version-txt.patch @@ -13,7 +13,7 @@ index 000000000..b717bafbe --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ -+17.0.12.0.13 ++17.0.13.0.13 -- 2.19.0 diff --git a/downgrade-fcntl64-to-fcntl-on-linux.patch b/downgrade-fcntl64-to-fcntl-on-linux.patch new file mode 100644 index 0000000000000000000000000000000000000000..2d20d5209954d27fd19db99e8cf2e31a20e01279 --- /dev/null +++ b/downgrade-fcntl64-to-fcntl-on-linux.patch @@ -0,0 +1,28 @@ +From d01d6f1d2c4baeb238a850ccedc8b2ab1a926eb0 Mon Sep 17 00:00:00 2001 +Date: Thu, 31 Oct 2024 17:06:06 +0800 +Subject: downgrade fcntl64 to fcntl on linux + +--- + src/hotspot/os/linux/os_linux.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp +index e59af5504..96b92344f 100644 +--- a/src/hotspot/os/linux/os_linux.cpp ++++ b/src/hotspot/os/linux/os_linux.cpp +@@ -122,6 +122,12 @@ + #include + #endif + ++#if defined(AARCH64) ++ __asm__(".symver fcntl64,fcntl@GLIBC_2.17"); ++#elif defined(AMD64) ++ __asm__(".symver fcntl64,fcntl@GLIBC_2.2.5"); ++#endif ++ + // if RUSAGE_THREAD for getrusage() has not been defined, do it here. The code calling + // getrusage() is prepared to handle the associated failure. + #ifndef RUSAGE_THREAD +-- +2.22.0 + diff --git a/jdk-updates-jdk17u-jdk-17.0.12+7.tar.gz b/jdk-updates-jdk17u-jdk-17.0.13+11.tar.gz similarity index 85% rename from jdk-updates-jdk17u-jdk-17.0.12+7.tar.gz rename to jdk-updates-jdk17u-jdk-17.0.13+11.tar.gz index 47278351786ff9bed1a711afcc5af03c8129c6ea..0b1eca37b1f3299ab57054d1285c13c810eb0164 100644 Binary files a/jdk-updates-jdk17u-jdk-17.0.12+7.tar.gz and b/jdk-updates-jdk17u-jdk-17.0.13+11.tar.gz differ diff --git a/openjdk-17.spec b/openjdk-17.spec index b5c485fe4686ef9cb50f711cac5fde019263a35d..cf0660897fba7dd6eb92b2cc84884b67a47fe0ce 100644 --- a/openjdk-17.spec +++ b/openjdk-17.spec @@ -161,7 +161,7 @@ # Used via new version scheme. JDK 17 was # GA'ed in March 2021 => 21.9 %global vendor_version_string 21.9 -%global securityver 12 +%global securityver 13 # buildjdkver is usually same as %%{majorver}, # but in time of bootstrap of next jdk, it is majorver-1, # and this it is better to change it here, on single place @@ -187,7 +187,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 7 +%global buildver 11 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -903,7 +903,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 3 +Release: 2 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages @@ -1026,7 +1026,20 @@ Patch53: Add-JBooster-options-check.patch Patch54: KAE-zip-Features.patch Patch55: heap-dump-redact-support.patch Patch56: Backport-Important-Fixed-Issues.patch - +Patch57: Backport-of-JDK-8305680.patch +Patch58: Backport-of-JDK-8305937.patch +Patch59: 8338785-The-java.awt.datatransfer.SystemFlavorMap-FL.patch +Patch60: 8337982-Remove-dead-undef-assrt0n.patch +Patch61: 8337274-Remove-repeated-the-in-StyleSheet.create-Sma.patch +Patch62: 8335610-DiagnosticFramework-CmdLine-is_executable-co.patch +Patch63: Backport-of-8333088-ubsan-shenandoahAdaptiveHeuristi.patch +Patch64: Backport-of-8339351-Remove-duplicate-line-in-FileMap.patch +Patch65: Backport-of-8330191-Fix-typo-in-precompiled.hpp.patch +Patch66: Backport-of-8337712-Wrong-javadoc-in-java.util.Date-.patch + +#17.0.13 +Patch67: Huawei-Fix-JBooster-file-issue-caused-by-os-write-change.patch +Patch68: downgrade-fcntl64-to-fcntl-on-linux.patch ############################################ # # LoongArch64 specific patches @@ -1283,6 +1296,7 @@ pushd %{top_level_dir_name} %patch41 -p1 %patch42 -p1 %patch43 -p1 +%ifnarch riscv64 %patch44 -p1 %patch45 -p1 %patch46 -p1 @@ -1296,7 +1310,19 @@ pushd %{top_level_dir_name} %patch54 -p1 %patch55 -p1 %patch56 -p1 - +%endif +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 +%patch60 -p1 +%patch61 -p1 +%patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 popd # openjdk %endif @@ -1863,6 +1889,38 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Wed Nov 6 2024 Pan Xuefeng - 1:17.0.13.11-2 +- upgrade LoongArch64 port to 17.0.13 + +* Thu Oct 31 2024 neu-mobi - 1:17.0.13.11-1 +- add downgrade-fcntl64-to-fcntl-on-linux.patch + +* Wed Oct 16 2024 Benshuai5D - 1:17.0.13.11-0 +- modify 8264805-Backport-Ahead-of-Time-Compiler.patch +- modify 8264806-Backport-Graal-Compiler.patch +- modify Add-JBooster-Lazy-AOT-module.patch +- modify Apply-TBI-to-ZGC-of-JDK17.patch +- modify Backport-Important-Fixed-Issues.patch +- modify KAE-zip-Features.patch +- modify add-version-txt.patch +- add Huawei-Fix-JBooster-file-issue-caused-by-os-write-change.patch +- update to 17.0.13+11(ga) + +* Mon Oct 14 2024 Autistic_boyya - 1:17.0.12.7-5 +- Add Backport-of-JDK-8305680.patch +- Add Backport-of-JDK-8305937.patch +- Add 8338785-The-java.awt.datatransfer.SystemFlavorMap-FL.patch +- Add 8337982-Remove-dead-undef-assrt0n.patch +- Add 8337274-Remove-repeated-the-in-StyleSheet.create-Sma.patch +- Add 8335610-DiagnosticFramework-CmdLine-is_executable-co.patch +- Add Backport-of-8333088-ubsan-shenandoahAdaptiveHeuristi.patch +- Add Backport-of-8339351-Remove-duplicate-line-in-FileMap.patch +- Add Backport-of-8330191-Fix-typo-in-precompiled.hpp.patch +- Add Backport-of-8337712-Wrong-javadoc-in-java.util.Date-.patch + +* Mon Sep 23 2024 Dingli Zhang - 1:17.0.12.7-4 +- Remove the KAE patch for riscv64 to fix build errors + * Fri Aug 30 2024 neu-mob - 1:17.0.12.7-3 - Add some features: JBooster/KAE zip