Revert "JBR-4306 Robot doesn't work as expected in some cases on macOS"

This reverts commit 803039d6db.

.github/workflows/submit.yml

@@ -341,7 +341,6 @@ jobs:
         run: >
           if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then
             cat build/*/test-results/*/text/newfailures.txt ;
-            cat build/*/test-results/*/text/other_errors.txt ;
             exit 1 ;
           fi
 
@@ -808,7 +807,6 @@ jobs:
         run: >
           if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then
             cat build/*/test-results/*/text/newfailures.txt ;
-            cat build/*/test-results/*/text/other_errors.txt ;
             exit 1 ;
           fi
 
@@ -1220,7 +1218,6 @@ jobs:
         run: >
           if ((Get-ChildItem -Path build\*\test-results\test-summary.txt -Recurse | Select-String -Pattern "TEST SUCCESS" ).Count -eq 0) {
             Get-Content -Path build\*\test-results\*\*\newfailures.txt ;
-            Get-Content -Path build\*\test-results\*\*\other_errors.txt ;
             exit 1
           }
 
@@ -1614,7 +1611,6 @@ jobs:
         run: >
           if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then
             cat build/*/test-results/*/text/newfailures.txt ;
-            cat build/*/test-results/*/text/other_errors.txt ;
             exit 1 ;
           fi
 

.jcheck/conf

@@ -1,7 +1,6 @@
 [general]
 project=jdk-updates
 jbs=JDK
-version=17.0.3
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

doc/building.html

@@ -507,7 +507,7 @@
 </ul>
 <h2 id="running-tests">Running Tests</h2>
 <p>Most of the JDK tests are using the <a href="http://openjdk.java.net/jtreg">JTReg</a> test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc.</p>
-<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
+<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
 <p>Building of Hotspot Gtest suite requires the source code of Google Test framework. The top directory, which contains both <code>googletest</code> and <code>googlemock</code> directories, should be specified via <code>--with-gtest</code>. The supported version of Google Test is 1.8.1, whose source code can be obtained:</p>
 <ul>
 <li>by downloading and unpacking the source bundle from <a href="https://github.com/google/googletest/releases/tag/release-1.8.1">here</a></li>

doc/building.md

@@ -848,7 +848,7 @@ containing `lib/jtreg.jar` etc.
 
 The [Adoption Group](https://wiki.openjdk.java.net/display/Adoption) provides
 recent builds of jtreg [here](
-https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/).
+https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact).
 Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
 `jtreg` directory that you just unpacked.
 

doc/testing.html

@@ -193,9 +193,7 @@ TEST FAILURE</code></pre>
 <h4 id="aot_modules-1">AOT_MODULES</h4>
 <p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
 <h4 id="retry_count">RETRY_COUNT</h4>
-<p>Retry failed tests up to a set number of times, until they pass. This allows to pass the tests with intermittent failures. Defaults to 0.</p>
-<h4 id="repeat_count">REPEAT_COUNT</h4>
-<p>Repeat the tests up to a set number of times, stopping at first failure. This helps to reproduce intermittent test failures. Defaults to 0.</p>
+<p>Retry failed tests up to a set number of times. Defaults to 0.</p>
 <h3 id="gtest-keywords">Gtest keywords</h3>
 <h4 id="repeat">REPEAT</h4>
 <p>The number of times to repeat the tests (<code>--gtest_repeat</code>).</p>

doc/testing.md

@@ -419,15 +419,7 @@ modules. If multiple modules are specified, they should be separated by space
 
 #### RETRY_COUNT
 
-Retry failed tests up to a set number of times, until they pass.
-This allows to pass the tests with intermittent failures.
-Defaults to 0.
-
-#### REPEAT_COUNT
-
-Repeat the tests up to a set number of times, stopping at first failure.
-This helps to reproduce intermittent test failures.
-Defaults to 0.
+Retry failed tests up to a set number of times. Defaults to 0.
 
 ### Gtest keywords
 

jb/project/docker/Dockerfile.riscv_on_x64

@@ -1,23 +0,0 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_x64.sh script.
-
-# Pull a concrete version of Linux that does NOT recieve updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-FROM ubuntu:jammy
-
-# Install the necessary build tools
-RUN     apt install build-essential autoconf
-
-# Set up boot JDK for building
-COPY boot_jdk_amd64.tar.gz /jdk17/
-RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_musl_amd64.tar.gz && rm /jdk17/boot_jdk_amd64.tar.gz
-ENV BOOT_JDK=/jdk17
-
-COPY sdk-x86_64-linux-gnu-to-riscv64-linux-gnu-20220423.tar.gz /devkit/
-RUN cd /devkit && tar --strip-components=1 -xzf sdk-x86_64-linux-gnu-to-riscv64-linux-gnu-20220423.tar.gz && rm /devkit/sdk-x86_64-linux-gnu-to-riscv64-linux-gnu-20220423.tar.gz
-ENV DEVKIT_PATH=/devkit
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"

jb/project/docker/mkdocker_riscv_cross_x64.sh

@@ -1,26 +0,0 @@
-#!/bin/bash -x
-
-# This script creates a Docker image suitable for cross building riscv variant
-# of the JetBrains Runtime version 17. Host is x86_64
-
-BOOT_JDK_REMOTE_FILE=zulu17.34.19-ca-jdk17.0.3-linux_x64.tar.gz
-BOOT_JDK_SHA=caa17c167d045631f9fd85de246bc5313f29cef5ebb1c21524508d3e1196590c
-BOOT_JDK_LOCAL_FILE=boot_jdk_amd64.tar.gz
-
-if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
-    # Obtain "boot JDK" from outside of the container.
-    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
-else
-    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
-fi
-
-# Verify that what we've downloaded can be trusted.
-sha256sum -c - <<EOF
-$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
-EOF
-
-docker build -t jbr17buildenv -f Dockerfile.riscv_on_x64 .
-
-# NB: the resulting container can (and should) be used without the network
-# connection (--network none) during build in order to reduce the chance
-# of build contamination.

jb/project/tools/common/scripts/common.sh

@@ -31,7 +31,7 @@ architecture=$3 # aarch64 or x64
 bundle_type=$(do_maketest)
 do_maketest=$?
 tag_prefix="jbr-"
-OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "$tag_prefix" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d ",")
+OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "$tag_prefix" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1)
 VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
 VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
 VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")

jb/project/tools/linux/scripts/mkimages_aarch64.sh

@@ -1,42 +1,11 @@
 #!/bin/bash -x
 
-# The following parameters must be specified:
+# The following parameter must be specified:
 #   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
 #
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
-#
-# Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_linux_aarch64
 
 source jb/project/tools/common/scripts/common.sh
 
-JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64}
-
-function do_configure {
-  sh configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build="$JDK_BUILD_NUMBER" \
-    --with-version-opt=b"$build_number" \
-    --with-boot-jdk="$BOOT_JDK" \
-    --enable-cds=yes \
-    $REPRODUCIBLE_BUILD_OPTS \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    || do_exit $?
-}
-
 function is_musl {
   libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
   if [ -z $libc ]; then
@@ -46,109 +15,73 @@ function is_musl {
   return 0
 }
 
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 
-  libc_type_suffix=''
+LIBC_TYPE_SUFFIX=''
 
-  if is_musl; then libc_type_suffix='musl-' ; fi
+if is_musl; then LIBC_TYPE_SUFFIX='musl-' ; fi
 
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix}b${build_number}
+sh configure \
+  --with-debug-level=release \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-jvm-features=shenandoahgc \
+  --with-version-pre= \
+  --with-version-build="${JDK_BUILD_NUMBER}" \
+  --with-version-opt=b${build_number} \
+  --with-boot-jdk=${BOOT_JDK} \
+  --enable-cds=yes \
+  $REPRODUCIBLE_BUILD_OPTS \
+  $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+  || exit $?
+make clean CONF=linux-aarch64-server-release || exit $?
+make images CONF=linux-aarch64-server-release test-image || exit $?
 
-  echo Running jlink....
-  [ -d "$IMAGES_DIR"/"$__arch_name" ] && rm -rf "${IMAGES_DIR:?}"/"$__arch_name"
-  $JSDK/bin/jlink \
-    --module-path "$__modules_path" --no-man-pages --compress=2 \
-    --add-modules "$__modules" --output "$IMAGES_DIR"/"$__arch_name"
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__arch_name"/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__arch_name"/release > release
-    mv release "$IMAGES_DIR"/"$__arch_name"/release
-    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__arch_name"/lib
-    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__arch_name"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
-  fi
-
-  # jmod does not preserve file permissions (JDK-8173610)
-  [ -f "$IMAGES_DIR"/"$__arch_name"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__arch_name"/lib/jcef_helper
-
-  echo Creating "$JBR".tar.gz ...
-
-  (cd "$IMAGES_DIR" &&
-    find "$__arch_name" -print0 | LC_ALL=C sort -z | \
-    tar $REPRODUCIBLE_TAR_OPTS \
-      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
-  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
-  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
-  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
-  gzip "$JBR".tar || do_exit $?
-  rm -rf "${IMAGES_DIR:?}"/"$__arch_name"
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=linux-aarch64-server-release
-
-case "$bundle_type" in
-  "jcef")
-    do_reset_changes=1
-    do_maketest=1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "fd")
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=linux-aarch64-server-fastdebug
-    ;;
-esac
-
-if [ -z "$INC_BUILD" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBSDK=${JBRSDK_BASE_NAME}-linux-${LIBC_TYPE_SUFFIX}aarch64-b${build_number}
+BASE_DIR=build/linux-aarch64-server-release/images
+JSDK=${BASE_DIR}/jdk
 JBRSDK_BUNDLE=jbrsdk
 
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
-  update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
-  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+rm -rf $BASE_DIR/$JBRSDK_BUNDLE
+cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
-  jbr_name_postfix="_${bundle_type}"
-fi
+echo Creating $JBSDK.tar.gz ...
+sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
+mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
 
-# create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+zip_native_debug_symbols $JSDK "${JBSDK}_diz"
 
-# create sdk image bundle
-modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
-  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
-fi
-create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
+# NB: --sort=name requires tar1.28
+tar $REPRODUCIBLE_TAR_OPTS --sort=name -pcf $JBSDK.tar \
+  --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
+  -C $BASE_DIR ${JBRSDK_BUNDLE} || exit $?
+touch -c -d @$SOURCE_DATE_EPOCH $JBRSDK.tar
+gzip $JBSDK.tar || exit $?
 
-if [ $do_maketest -eq 1 ]; then
-    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-aarch64-b${build_number}
-    echo Creating "$JBRSDK_TEST" ...
-    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
-    make test-image CONF=$RELEASE_NAME || do_exit $?
-    tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
-    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
-    gzip "$JBRSDK_TEST".tar || do_exit $?
-fi
+JBR_BUNDLE=jbr
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+rm -rf $BASE_DIR/$JBR_BUNDLE
 
-do_exit 0
+JBR=$JBR_BASE_NAME-linux-${LIBC_TYPE_SUFFIX}aarch64-b$build_number
+grep -v javafx jb/project/tools/common/modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.aarch64
+echo Running jlink....
+${JSDK}/bin/jlink \
+  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+  --add-modules $(xargs < modules.list.aarch64 | sed s/" "//g | sed s/',$'//g) \
+  --output ${BASE_DIR}/${JBR_BUNDLE} || exit $?
+
+echo Modifying release info ...
+grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${BASE_DIR}/${JBR_BUNDLE}/release
+
+echo Creating $JBR.tar.gz ...
+tar $REPRODUCIBLE_TAR_OPTS --sort=name -pcf $JBR.tar -C $BASE_DIR ${JBR_BUNDLE} || exit $?
+touch -c -d @$SOURCE_DATE_EPOCH $JBR.tar
+gzip $JBR.tar || exit $?
+
+JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-${LIBC_TYPE_SUFFIX}test-aarch64-b$build_number
+echo Creating $JBRSDK_TEST.tar.gz ...
+tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
+gzip $JBRSDK_TEST.tar || exit $?

jb/project/tools/linux/scripts/mkimages_riscv_crossx64.sh

@@ -1,154 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
-#
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
-#
-# Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_linux_x64
-
-source jb/project/tools/common/scripts/common.sh
-
-JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
-
-function do_configure {
-  sh configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --openjdk-target=riscv64-unknown-linux-gnu \
-    --with-devkit="$DEVKIT_PATH"
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build="$JDK_BUILD_NUMBER" \
-    --with-version-opt=b"$build_number" \
-    --with-boot-jdk="$BOOT_JDK" \
-    --with-build-jdk="$BUILD_JDK" \
-    --disable-warnings-as-errors \
-    --enable-cds=yes \
-    $REPRODUCIBLE_BUILD_OPTS \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    || do_exit $?
-}
-
-function is_musl {
-#old check doesn't work with cross-compiling, so return 0 always
-  return 0
-}
-
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
-
-  libc_type_suffix=''
-
-  if is_musl; then libc_type_suffix='musl-' ; fi
-
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix}b${build_number}
-
-  echo Running jlink....
-  [ -d "$IMAGES_DIR"/"$__arch_name" ] && rm -rf "${IMAGES_DIR:?}"/"$__arch_name"
-  $JSDK/bin/jlink \
-    --module-path "$__modules_path" --no-man-pages --compress=2 \
-    --add-modules "$__modules" --output "$IMAGES_DIR"/"$__arch_name"
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__arch_name"/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__arch_name"/release > release
-    mv release "$IMAGES_DIR"/"$__arch_name"/release
-    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__arch_name"/lib
-    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__arch_name"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
-  fi
-
-  # jmod does not preserve file permissions (JDK-8173610)
-  [ -f "$IMAGES_DIR"/"$__arch_name"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__arch_name"/lib/jcef_helper
-
-  echo Creating "$JBR".tar.gz ...
-
-  (cd "$IMAGES_DIR" &&
-    find "$__arch_name" -print0 | LC_ALL=C sort -z | \
-    tar $REPRODUCIBLE_TAR_OPTS \
-      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
-  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
-  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
-  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
-  gzip "$JBR".tar || do_exit $?
-  rm -rf "${IMAGES_DIR:?}"/"$__arch_name"
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=linux-riscv-server-release
-
-case "$bundle_type" in
-  "jcef")
-    do_reset_changes=1
-    do_maketest=1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "fd")
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=linux-riscv-server-fastdebug
-    ;;
-esac
-
-if [ -z "$INC_BUILD" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
-JBRSDK_BUNDLE=jbrsdk
-
-echo Fixing permissions
-chmod -R a+r $JSDK
-
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-  update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
-  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
-
-  jbr_name_postfix="_${bundle_type}"
-fi
-
-# create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
-
-# create sdk image bundle
-modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
-  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
-fi
-create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
-
-if [ $do_maketest -eq 1 ]; then
-    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x64-b${build_number}
-    echo Creating "$JBRSDK_TEST" ...
-    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
-    make test-image CONF=$RELEASE_NAME || do_exit $?
-    tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
-    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
-    gzip "$JBRSDK_TEST".tar || do_exit $?
-fi
-
-do_exit 0

jb/project/tools/linux/scripts/mkimages_x64.sh

@@ -69,7 +69,6 @@ function create_image_bundle {
   if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
     sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__arch_name"/release > release
     mv release "$IMAGES_DIR"/"$__arch_name"/release
-    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__arch_name"/lib
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__arch_name"/jmods
     zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi

jb/project/tools/mac/scripts/mkimages.sh

@@ -91,7 +91,6 @@ function create_image_bundle {
   if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
     sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
     mv release $JRE_CONTENTS/Home/release
-    cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/src.zip $JRE_CONTENTS/Home/lib
     copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
     zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
   fi

jb/project/tools/patches/add_jcef_module_aarch64.patch

@@ -1,30 +0,0 @@
-diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
-index 522acb7..c40e689 100644
---- jb/project/tools/common/modules.list
-+++ jb/project/tools/common/modules.list
-@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
- jdk.xml.dom,
- jdk.zipfs,
- jdk.hotspot.agent,
--jdk.jcmd
-+jdk.jcmd,
-+jcef,
-+gluegen.rt,
-+jogl.all
-diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
-index 897647e..781d180 100644
---- src/java.desktop/share/classes/module-info.java
-+++ src/java.desktop/share/classes/module-info.java
-@@ -116,7 +116,11 @@ module java.desktop {
-     // see make/GensrcModuleInfo.gmk
-     exports sun.awt to
-         jdk.accessibility,
--        jdk.unsupported.desktop;
-+        jdk.unsupported.desktop,
-+        jcef,
-+        jogl.all;
-+
-+    exports java.awt.peer to jcef;
-
-     exports java.awt.dnd.peer to jdk.unsupported.desktop;
-     exports sun.awt.dnd to jdk.unsupported.desktop;

jb/project/tools/test/check_jbr_size.sh

@@ -1,16 +1,5 @@
 #!/bin/bash
 
-
-while getopts ":t" o; do
-    case "${o}" in
-        t)
-          t="With Teamcity tests info"
-          TC_PRINT=1
-          ;;
-    esac
-done
-shift $((OPTIND-1))
-
 NEWFILEPATH=$1
 CONFIGID=$2
 BUILDID=$3
@@ -18,7 +7,6 @@ TOKEN=$4
 #
 # Get the size of new artifact
 #
-
 unameOut="$(uname -s)"
 case "${unameOut}" in
     Linux*)
@@ -28,11 +16,7 @@ case "${unameOut}" in
       NEWFILESIZE=$(stat -f%z "$NEWFILEPATH")
       ;;
     CYGWIN*)
-      NEWFILESIZE=$(stat -c%s$4
-#
-# Get the size of new artifact
-#
- "$NEWFILEPATH")
+      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
       ;;
     MINGW*)
       NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
@@ -42,7 +26,6 @@ case "${unameOut}" in
       exit 1
 esac
 FILENAME=$(basename ${NEWFILEPATH})
-
 #
 # Get pattern of artifact name
 # Base filename pattern: <BUNDLE_TYPE>-<JDK_VERSION>-<OS>-<ARCH>-b<BUILD>.tar.gz: jbr_dcevm-17.0.2-osx-x64-b1234.tar.gz
@@ -51,40 +34,16 @@ FILENAME=$(basename ${NEWFILEPATH})
 
 BUNDLE_TYPE=jbrsdk
 OS_ARCH_PATTERN=""
-FILE_EXTENSION=tar.gz
-
-re='(jbr[a-z_]*).*-[0-9_\.]+-(.+)-b[0-9]+(.+)'
+re='(jbr[a-z_]*).+[0-9_\.]+-(.+)-b.+\.tar\.gz'
 if [[ $FILENAME =~ $re ]]; then
   BUNDLE_TYPE=${BASH_REMATCH[1]}
   OS_ARCH_PATTERN=${BASH_REMATCH[2]}
-  FILE_EXTENSION=${BASH_REMATCH[3]}
 fi
-
-if [ $TC_PRINT -eq 1 ]; then
-  testname_file_ext=`echo $FILE_EXTENSION | sed 's/\./_/g'`
-  testname=$BUNDLE_TYPE"_"$OS_ARCH_PATTERN$testname_file_ext
-  echo \#\#teamcity[testStarted name=\'$testname\']
-fi
-
-
 echo "BUNDLE_TYPE: "  $BUNDLE_TYPE
 echo "OS_ARCH_PATTERN: " $OS_ARCH_PATTERN
-echo "FILE_EXTENSION: " $FILE_EXTENSION
 echo "New size of $FILENAME = $NEWFILESIZE bytes."
 
 
-function test_failed_msg() {
-  if [ $3 -eq 1 ]; then
-    echo \#\#teamcity[testFailed name=\'$1\' message=\'$2\']
-  fi
-}
-
-function test_finished_msg() {
-  if [ $2 -eq 1 ]; then
-    echo \#\#teamcity[testFinished name=\'$1\']
-  fi
-}
-
 #
 # Get previous successful build ID
 # Example:
@@ -103,11 +62,8 @@ if [[ $CURL_RESPONSE =~ $re ]]; then
   ID=${BASH_REMATCH[1]}
   echo "BUILD Number: ${BASH_REMATCH[2]}"
 else
-  msg="ERROR: can't find previous build"
-  echo $msg
+  echo "ERROR: can't find previous build"
   echo $CURL_RESPONSE
-  test_failed_msg $testname $msg $TC_PRINT
-  test_finished_msg $testname $TC_PRINT
   exit 1
 fi
 
@@ -122,7 +78,7 @@ echo "Atrifacts of previous build of $CONFIGID :"
 echo $CURL_RESPONSE
 
 # Find binary size (in response) with reg exp
-re='name=\"('$BUNDLE_TYPE'[^\"]+'${OS_ARCH_PATTERN}'[^\"]+'${FILE_EXTENSION}')\" size=\"([0-9]+)\"'
+re='name=\"('$BUNDLE_TYPE'[^\"]+'${OS_ARCH_PATTERN}'[^\"]+\.tar\.gz)\" size=\"([0-9]+)\"'
 
 if [[ $CURL_RESPONSE =~ $re ]]; then
   OLDFILENAME=${BASH_REMATCH[1]}
@@ -133,20 +89,14 @@ if [[ $CURL_RESPONSE =~ $re ]]; then
   let allowedSize=OLDFILESIZE+OLDFILESIZE/20 # use 5% threshold
   echo "Allowed size = $allowedSize"
   if [[ "$NEWFILESIZE" -gt "$allowedSize" ]]; then
-    msg="ERROR: new size is significally greater than prev size (need to investigate)"
-    echo $msg
-    test_failed_msg $testname $msg $TC_PRINT
-    test_finished_msg $testname $TC_PRINT
+    echo "ERROR: new size is significally greater than prev size (need to investigate)"
     exit 1
   else
     echo "PASSED"
-   test_finished_msg $testname $TC_PRINT
   fi
 else
-  msg="ERROR: can't find string with size in xml response:"
-  echo $msg
+  echo "ERROR: can't find string with size in xml response:"
   echo $CURL_RESPONSE
-  test_failed_msg $testname $msg $TC_PRINT
-  test_finished_msg $testname $TC_PRINT
   exit 1
 fi
+

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -56,7 +56,6 @@ function create_image_bundle {
   if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
     sed 's/JBR/JBRSDK/g' $__arch_name/release > release
     mv release $__arch_name/release
-    cp $IMAGES_DIR/jdk/lib/src.zip $__arch_name/lib
     copy_jmods "$__modules" "$__modules_path" "$__arch_name"/jmods
   fi
 }

make/RunTests.gmk

@@ -200,7 +200,7 @@ $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
 $(eval $(call ParseKeywordVariable, JTREG, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
         TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
-        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT, \
+        RETRY_COUNT MAX_OUTPUT, \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
         EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS, \
 ))
@@ -744,15 +744,6 @@ define SetupRunJtregTestBody
   JTREG_RETAIN ?= fail,error
   JTREG_RUN_PROBLEM_LISTS ?= false
   JTREG_RETRY_COUNT ?= 0
-  JTREG_REPEAT_COUNT ?= 0
-
-  ifneq ($$(JTREG_RETRY_COUNT), 0)
-    ifneq ($$(JTREG_REPEAT_COUNT), 0)
-      $$(info Error: Cannot use both JTREG_RETRY_COUNT and JTREG_REPEAT_COUNT together.)
-      $$(info Please choose one or the other.)
-      $$(error Cannot continue)
-    endif
-  endif
 
   ifneq ($$(JTREG_LAUNCHER_OPTIONS), )
     $1_JTREG_LAUNCHER_OPTIONS += $$(JTREG_LAUNCHER_OPTIONS)
@@ -884,18 +875,6 @@ define SetupRunJtregTestBody
         done
   endif
 
-  ifneq ($$(JTREG_REPEAT_COUNT), 0)
-    $1_COMMAND_LINE := \
-        for i in {1..$$(JTREG_REPEAT_COUNT)}; do \
-          $$(PRINTF) "\nRepeating Jtreg run: $$$$i out of $$(JTREG_REPEAT_COUNT)\n"; \
-          $$($1_COMMAND_LINE); \
-          if [ "`$$(CAT) $$($1_EXITCODE)`" != "0" ]; then \
-            $$(PRINTF) "\nFailures detected, no more repeats.\n"; \
-            break; \
-          fi; \
-        done
-  endif
-
   run-test-$1: pre-run-test clean-workdir-$1
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')

make/autoconf/build-aux/config.guess

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -111,15 +111,6 @@ if [ "x$OUT" = x ]; then
   fi
 fi
 
-# Test and fix RISC-V.
-if [ "x$OUT" = x ]; then
-  if [ `uname -s` = Linux ]; then
-    if [ `uname -m` = riscv64 ]; then
-      OUT=riscv64-unknown-linux-gnu
-    fi
-  fi
-fi
-
 # Test and fix cpu on macos-aarch64, uname -p reports arm, buildsys expects aarch64
 echo $OUT | grep arm-apple-darwin > /dev/null 2> /dev/null
 if test $? != 0; then

make/autoconf/flags-cflags.m4

@@ -95,24 +95,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
   # info flags for toolchains unless we know they work.
   # See JDK-8207057.
   ASFLAGS_DEBUG_SYMBOLS=""
-
-  # Debug prefix mapping if supported by compiler
-  DEBUG_PREFIX_CFLAGS=
-
   # Debug symbols
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
-      # Check if compiler supports -fdebug-prefix-map. If so, use that to make
-      # the debug symbol paths resolve to paths relative to the workspace root.
-      workspace_root_trailing_slash="${WORKSPACE_ROOT%/}/"
-      DEBUG_PREFIX_CFLAGS="-fdebug-prefix-map=${workspace_root_trailing_slash}="
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_PREFIX_CFLAGS}],
-        IF_FALSE: [
-            DEBUG_PREFIX_CFLAGS=
-        ]
-      )
-    fi
-
     CFLAGS_DEBUG_SYMBOLS="-g"
     ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
@@ -124,11 +108,6 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
     CFLAGS_DEBUG_SYMBOLS="-Z7"
   fi
 
-  if test "x$DEBUG_PREFIX_CFLAGS" != x; then
-    CFLAGS_DEBUG_SYMBOLS="$CFLAGS_DEBUG_SYMBOLS $DEBUG_PREFIX_CFLAGS"
-    ASFLAGS_DEBUG_SYMBOLS="$ASFLAGS_DEBUG_SYMBOLS $DEBUG_PREFIX_CFLAGS"
-  fi
-
   AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
   AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
 ])
@@ -799,6 +778,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
               FILE_MACRO_CFLAGS=
           ]
       )
+      # -fdebug-prefix-map is supported by all modern versions of gcc/clang
+      DEBUG_PREFIX_CFLAGS=" -fdebug-prefix-map=${workspace_root_trailing_slash}="
     elif test "x$TOOLCHAIN_TYPE" = xmicrosoft &&
         test "x$ENABLE_REPRODUCIBLE_BUILD" = xtrue; then
       # There is a known issue with the pathmap if the mapping is made to the
@@ -829,12 +810,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
       $OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
       $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS \
-      $REPRODUCIBLE_CFLAGS"
+      $REPRODUCIBLE_CFLAGS $DEBUG_PREFIX_CFLAGS"
 
   CFLAGS_JDK_COMMON="$ALWAYS_CFLAGS_JDK $ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
       $OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
       $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK \
-      $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS"
+      $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS $DEBUG_PREFIX_CFLAGS"
 
   # Use ${$2EXTRA_CFLAGS} to block EXTRA_CFLAGS to be added to build flags.
   # (Currently we don't have any OPENJDK_BUILD_EXTRA_CFLAGS, but that might

make/autoconf/flags-other.m4

@@ -82,6 +82,14 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     BASIC_ASFLAGS="-nologo -c"
   fi
+
+  if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
+    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+      workspace_root_trailing_slash="${WORKSPACE_ROOT%/}/"
+      BASIC_ASFLAGS+=" -fdebug-prefix-map=${workspace_root_trailing_slash}="
+    fi
+  fi
+
   AC_SUBST(BASIC_ASFLAGS)
 
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then

make/autoconf/jdk-options.m4

@@ -169,23 +169,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   fi
   AC_SUBST(CACERTS_FILE)
 
-  # Choose cacerts source folder for user provided PEM files
-  AC_ARG_WITH(cacerts-src, [AS_HELP_STRING([--with-cacerts-src],
-      [specify alternative cacerts source folder containing certificates])])
-  CACERTS_SRC=""
-  AC_MSG_CHECKING([for cacerts source])
-  if test "x$with_cacerts_src" == x; then
-    AC_MSG_RESULT([default])
-  else
-    CACERTS_SRC=$with_cacerts_src
-    if test ! -d "$CACERTS_SRC"; then
-      AC_MSG_RESULT([fail])
-      AC_MSG_ERROR([Specified cacerts source folder "$CACERTS_SRC" does not exist])
-    fi
-    AC_MSG_RESULT([$CACERTS_SRC])
-  fi
-  AC_SUBST(CACERTS_SRC)
-
   # Enable or disable unlimited crypto
   UTIL_ARG_ENABLE(NAME: unlimited-crypto, DEFAULT: true, RESULT: UNLIMITED_CRYPTO,
       DESC: [enable unlimited crypto policy])

make/autoconf/jvm-features.m4

@@ -308,8 +308,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_SHENANDOAHGC],
     AC_MSG_CHECKING([if platform is supported by Shenandoah])
     if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || \
         test "x$OPENJDK_TARGET_CPU" = "xaarch64" || \
-        test "x$OPENJDK_TARGET_CPU" = "xppc64le" || \
-        test "x$OPENJDK_TARGET_CPU" = "xriscv64"; then
+        test "x$OPENJDK_TARGET_CPU" = "xppc64le"; then
       AC_MSG_RESULT([yes])
     else
       AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU])
@@ -359,8 +358,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
         AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
         AVAILABLE=false
       fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xppc64le" || \
-        test "x$OPENJDK_TARGET_CPU" = "xriscv64"; then
+    elif test "x$OPENJDK_TARGET_CPU" = "xppc64le"; then
       if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
         AC_MSG_RESULT([yes])
       else

make/autoconf/libraries.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -146,12 +146,6 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
     fi
   fi
 
-  # Because RISC-V only has word-sized atomics, it requries libatomic where
-  # other common architectures do not.  So link libatomic by default.
-  if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xriscv64; then
-    BASIC_JVM_LIBS="$BASIC_JVM_LIBS -latomic"
-  fi
-
   # perfstat lib
   if test "x$OPENJDK_TARGET_OS" = xaix; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat"

make/autoconf/platform.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -561,8 +561,6 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
     HOTSPOT_$1_CPU_DEFINE=PPC64
   elif test "x$OPENJDK_$1_CPU" = xppc64le; then
     HOTSPOT_$1_CPU_DEFINE=PPC64
-  elif test "x$OPENJDK_$1_CPU" = xriscv64; then
-    HOTSPOT_$1_CPU_DEFINE=RISCV64
 
   # The cpu defines below are for zero, we don't support them directly.
   elif test "x$OPENJDK_$1_CPU" = xsparc; then
@@ -573,6 +571,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
     HOTSPOT_$1_CPU_DEFINE=S390
   elif test "x$OPENJDK_$1_CPU" = xs390x; then
     HOTSPOT_$1_CPU_DEFINE=S390
+  elif test "x$OPENJDK_$1_CPU" = xriscv64; then
+    HOTSPOT_$1_CPU_DEFINE=RISCV
   elif test "x$OPENJDK_$1_CPU" != x; then
     HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
   fi

make/autoconf/spec.gmk.in

@@ -412,8 +412,6 @@ GTEST_FRAMEWORK_SRC := @GTEST_FRAMEWORK_SRC@
 
 # Source file for cacerts
 CACERTS_FILE=@CACERTS_FILE@
-# Source folder for user provided cacerts PEM files 
-CACERTS_SRC=@CACERTS_SRC@
 
 # Enable unlimited crypto policy
 UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@

make/autoconf/toolchain.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -234,7 +234,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     if test -n "$XCODEBUILD"; then
       # On Mac OS X, default toolchain to clang after Xcode 5
-      XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version | $HEAD -n 1`
+      XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2>&1 | $HEAD -n 1`
       $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
       if test $? -ne 0; then
         AC_MSG_NOTICE([xcodebuild output: $XCODE_VERSION_OUTPUT])

make/autoconf/toolchain_microsoft.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -25,7 +25,7 @@
 
 ################################################################################
 # The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2019 2017 2022"
+VALID_VS_VERSIONS="2019 2017"
 
 VS_DESCRIPTION_2017="Microsoft Visual Studio 2017"
 VS_VERSION_INTERNAL_2017=141
@@ -56,21 +56,6 @@ VS_SDK_PLATFORM_NAME_2019=
 VS_SUPPORTED_2019=true
 VS_TOOLSET_SUPPORTED_2019=true
 
-VS_DESCRIPTION_2022="Microsoft Visual Studio 2022"
-VS_VERSION_INTERNAL_2022=143
-VS_MSVCR_2022=vcruntime140.dll
-VS_VCRUNTIME_1_2022=vcruntime140_1.dll
-VS_MSVCP_2022=msvcp140.dll
-VS_ENVVAR_2022="VS170COMNTOOLS"
-VS_USE_UCRT_2022="true"
-VS_VS_INSTALLDIR_2022="Microsoft Visual Studio/2022"
-VS_EDITIONS_2022="BuildTools Community Professional Enterprise"
-VS_SDK_INSTALLDIR_2022=
-VS_VS_PLATFORM_NAME_2022="v143"
-VS_SDK_PLATFORM_NAME_2022=
-VS_SUPPORTED_2022=true
-VS_TOOLSET_SUPPORTED_2022=true
-
 ################################################################################
 
 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],

make/autoconf/util.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -230,6 +230,8 @@ AC_DEFUN([UTIL_GET_MATCHING_VALUES],
 # Converts an ISO-8601 date/time string to a unix epoch timestamp. If no
 # suitable conversion method was found, an empty string is returned.
 #
+# Sets the specified variable to the resulting list.
+#
 # $1: result variable name
 # $2: input date/time string
 AC_DEFUN([UTIL_GET_EPOCH_TIMESTAMP],
@@ -239,16 +241,11 @@ AC_DEFUN([UTIL_GET_EPOCH_TIMESTAMP],
     timestamp=$($DATE --utc --date=$2 +"%s" 2> /dev/null)
   else
     # BSD date
-    # ISO-8601 date&time in Zulu 'date'T'time'Z
-    timestamp=$($DATE -u -j -f "%FT%TZ" "$2" "+%s" 2> /dev/null)
+    timestamp=$($DATE -u -j -f "%F %T" "$2" "+%s" 2> /dev/null)
     if test "x$timestamp" = x; then
-      # BSD date cannot handle trailing milliseconds.
-      # Try again ignoring characters at end
-      timestamp=$($DATE -u -j -f "%Y-%m-%dT%H:%M:%S" "$2" "+%s" 2> /dev/null)
-    fi
-    if test "x$timestamp" = x; then
-      # Perhaps the time was missing.
-      timestamp=$($DATE -u -j -f "%FT%TZ" "$2""T00:00:00Z" "+%s" 2> /dev/null)
+      # Perhaps the time was missing
+      timestamp=$($DATE -u -j -f "%F %T" "$2 00:00:00" "+%s" 2> /dev/null)
+      # If this did not work, we give up and return the empty string
     fi
   fi
   $1=$timestamp

make/autoconf/version-numbers

@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2011, 2019, 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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+# Default version, product, and vendor information to use,
+# unless overridden by configure
+
+DEFAULT_VERSION_FEATURE=15
+DEFAULT_VERSION_INTERIM=0
+DEFAULT_VERSION_UPDATE=0
+DEFAULT_VERSION_PATCH=0
+DEFAULT_VERSION_EXTRA1=0
+DEFAULT_VERSION_EXTRA2=0
+DEFAULT_VERSION_EXTRA3=0
+DEFAULT_VERSION_DATE=2020-09-15
+DEFAULT_VERSION_CLASSFILE_MAJOR=59  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_CLASSFILE_MINOR=0
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="14 15"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=15
+DEFAULT_PROMOTED_VERSION_PRE=
+
+LAUNCHER_NAME=openjdk
+PRODUCT_NAME=OpenJDK
+PRODUCT_SUFFIX="Runtime Environment"
+JDK_RC_PLATFORM_NAME=Platform
+COMPANY_NAME=N/A
+HOTSPOT_VM_DISTRO="Dynamic Code Evolution"
+VENDOR_URL=https://openjdk.java.net/
+VENDOR_URL_BUG=https://bugreport.java.com/bugreport/
+VENDOR_URL_VM_BUG=https://bugreport.java.com/bugreport/crash.jsp
+
+# Might need better names for these
+MACOSX_BUNDLE_NAME_BASE="OpenJDK"
+MACOSX_BUNDLE_ID_BASE="net.java.openjdk"

make/common/NativeCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -358,20 +358,6 @@ define SetupCompileNativeFileBody
       # Compile as preprocessed assembler file
       $1_FLAGS := $(BASIC_ASFLAGS) $$($1_BASE_ASFLAGS)
       $1_COMPILER := $(AS)
-
-      # gcc assembly files must contain an appropriate relative .file
-      # path for reproducible builds.
-      ifeq ($(TOOLCHAIN_TYPE), gcc)
-        # If no absolute paths allowed, work out relative source file path
-        # for assembly .file substitution, otherwise use full file path
-        ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), false)
-          $1_REL_ASM_SRC := $$(call RelativePath, $$($1_FILE), $(WORKSPACE_ROOT))
-        else
-          $1_REL_ASM_SRC := $$($1_FILE)
-        endif
-        $1_FLAGS := $$($1_FLAGS) -DASSEMBLY_SRC_FILE='"$$($1_REL_ASM_SRC)"' \
-            -include $(TOPDIR)/make/data/autoheaders/assemblyprefix.h
-      endif
     else ifneq ($$(filter %.cpp %.cc %.mm, $$($1_FILENAME)), )
       # Compile as a C++ or Objective-C++ file
       $1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CXXFLAGS) \
@@ -403,12 +389,6 @@ define SetupCompileNativeFileBody
     $1_OBJ_DEPS := $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \
         $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE)
     $1_COMPILE_OPTIONS := $$($1_FLAGS) $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)
-    # For reproducible builds with gcc ensure random symbol generation is seeded deterministically
-    ifeq ($(TOOLCHAIN_TYPE), gcc)
-       ifeq ($$(ENABLE_REPRODUCIBLE_BUILD), true)
-         $1_COMPILE_OPTIONS += -frandom-seed="$$($1_FILENAME)"
-       endif
-    endif
 
     $$($1_OBJ_JSON): $$($1_OBJ_DEPS)
 	$$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$($1_SRC_FILE), \

make/conf/version-numbers.conf

@@ -28,12 +28,12 @@
 
 DEFAULT_VERSION_FEATURE=17
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=3
+DEFAULT_VERSION_UPDATE=2
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2022-04-19
+DEFAULT_VERSION_DATE=2022-01-18
 DEFAULT_VERSION_CLASSFILE_MAJOR=61  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11

make/data/autoheaders/assemblyprefix.h

@@ -1,29 +0,0 @@
-#
-# Copyright (c) 2022, 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.
-#
-
-// ASSEMBLY_SRC_FILE gets replaced by relative or absolute file path
-// in NativeCompilation.gmk for gcc tooling on Linux. This ensures a
-// reproducible object file through a predictable value of the STT_FILE
-// symbol, and subsequently a reproducible .debuginfo.
-.file ASSEMBLY_SRC_FILE
-

make/data/currency/CurrencyData.properties

@@ -32,7 +32,7 @@ formatVersion=3
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=170
+dataVersion=169
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -54,7 +54,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
     SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
     SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
     TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
-    UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
+    UYU858-UZS860-VEB862-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
     XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
     XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\
     ZWN942-ZWR935

make/devkit/createJMHBundle.sh

@@ -26,7 +26,7 @@
 # Create a bundle in the build directory, containing what's needed to
 # build and run JMH microbenchmarks from the OpenJDK build.
 
-JMH_VERSION=1.34
+JMH_VERSION=1.32
 COMMONS_MATH3_VERSION=3.2
 JOPT_SIMPLE_VERSION=4.6
 

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, 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
@@ -58,9 +58,6 @@ ifeq ($(call check-jvm-feature, compiler2), true)
 
   ADLC_CFLAGS += -I$(TOPDIR)/src/hotspot/share
 
-  # Add file macro mappings
-  ADLC_CFLAGS += $(FILE_MACRO_CFLAGS)
-
   $(eval $(call SetupNativeCompilation, BUILD_ADLC, \
       NAME := adlc, \
       TYPE := EXECUTABLE, \
@@ -149,13 +146,6 @@ ifeq ($(call check-jvm-feature, compiler2), true)
     )))
   endif
 
-  ifeq ($(HOTSPOT_TARGET_CPU_ARCH), riscv)
-    AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
-        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_CPU_ARCH)_v.ad \
-        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_CPU_ARCH)_b.ad \
-    )))
-  endif
-
   ifeq ($(call check-jvm-feature, shenandoahgc), true)
     AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
         $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/shenandoah/shenandoah_$(HOTSPOT_TARGET_CPU).ad \

make/hotspot/lib/JvmFeatures.gmk

@@ -84,7 +84,7 @@ ifneq ($(call check-jvm-feature, jvmti), true)
       jvmtiImpl.cpp jvmtiManageCapabilities.cpp jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp \
       jvmtiCodeBlobEvents.cpp jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp jvmtiEnvThreadState.cpp \
       jvmtiTagMap.cpp jvmtiEventController.cpp evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \
-      jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiEnhancedRedefineClasses.cpp
+      jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp
 endif
 
 ifneq ($(call check-jvm-feature, jvmci), true)

make/jdk/src/classes/build/tools/makezipreproducible/MakeZipReproducible.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -204,10 +204,6 @@ public class MakeZipReproducible {
             entry.setTimeLocal(timestamp);
         }
 
-        // Ensure "extra" field is not set from original ZipEntry info that may be not deterministic
-        // eg.may contain specific UID/GID
-        entry.setExtra(null);
-
         zos.putNextEntry(entry);
         if (entry.getSize() > 0 && entryInputStream != null) {
             entryInputStream.transferTo(zos);

make/modules/java.base/Gendata.gmk

@@ -60,11 +60,7 @@ TARGETS += $(GENDATA_CURDATA)
 
 ################################################################################
 
-ifneq ($(CACERTS_SRC), )
-  GENDATA_CACERTS_SRC := $(CACERTS_SRC)
-else
-  GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
-endif
+GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
 GENDATA_CACERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/cacerts
 
 $(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*)

make/modules/java.desktop/Copy.gmk

@@ -84,7 +84,7 @@ TARGETS += $(COPY_LEGAL)
 ################################################################################
 
 FONTFILE_SRC_DIR := $(TOPDIR)/src/java.desktop/share
-FONTFILE_SRCS := $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.ttf) $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.otf) $(FONTFILE_SRC_DIR)/fonts/fonts.dir $(FONTFILE_SRC_DIR)/fonts/font.conf
+FONTFILE_SRCS := $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.ttf) $(FONTFILE_SRC_DIR)/fonts/fonts.dir $(FONTFILE_SRC_DIR)/fonts/font.conf
 FONTFILE_TARGET_FILES := $(subst $(FONTFILE_SRC_DIR),$(LIB_DST_DIR),$(FONTFILE_SRCS))
 
 $(LIB_DST_DIR)/fonts/%: $(FONTFILE_SRC_DIR)/fonts/%

make/test/JtregNativeHotspot.gmk

@@ -863,7 +863,7 @@ ifeq ($(call isTargetOs, linux), true)
     BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeFPRegs := -ldl
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libAsyncGetCallTraceTest := -ldl
 else
-  BUILD_HOTSPOT_JTREG_EXCLUDE += libtest-rw.c libtest-rwx.c \
+  BUILD_HOTSPOT_JTREG_EXCLUDE += libtest-rw.c libtest-rwx.c libTestJNI.c \
       exeinvoke.c exestack-gap.c exestack-tls.c libAsyncGetCallTraceTest.cpp
 endif
 
@@ -871,7 +871,7 @@ BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm
 
 ifeq ($(call isTargetOs, windows), true)
     BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
-    BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c
+    BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit := jvm.lib
 else
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread

src/demo/share/jfc/SwingSet2/TableDemo.java

@@ -741,13 +741,4 @@ public class TableDemo extends DemoModule {
         footerTextField.setDragEnabled(dragEnabled);
     }
 
-    @Override
-    public ImageIcon createImageIcon(String filename, String description) {
-        ImageIcon imageIcon = super.createImageIcon(filename, description);
-        AccessibleContext context = imageIcon.getAccessibleContext();
-        if (context!= null) {
-            context.setAccessibleName(description);
-        }
-        return imageIcon;
-    }
 }

src/hotspot/cpu/aarch64/aarch64.ad

@@ -2373,8 +2373,6 @@ const bool Matcher::match_rule_supported(int opcode) {
 
   bool ret_value = true;
   switch (opcode) {
-    case Op_OnSpinWait:
-      return VM_Version::supports_on_spin_wait();
     case Op_CacheWB:
     case Op_CacheWBPreSync:
     case Op_CacheWBPostSync:
@@ -3850,7 +3848,7 @@ encode %{
     // Try to CAS m->owner from NULL to current thread.
     __ add(tmp, disp_hdr, (ObjectMonitor::owner_offset_in_bytes()-markWord::monitor_value));
     __ cmpxchg(tmp, zr, rthread, Assembler::xword, /*acquire*/ true,
-               /*release*/ true, /*weak*/ false, rscratch1); // Sets flags for result
+               /*release*/ true, /*weak*/ false, noreg); // Sets flags for result
 
     // Store a non-null value into the box to avoid looking like a re-entrant
     // lock. The fast-path monitor unlock code checks for
@@ -3859,15 +3857,6 @@ encode %{
     __ mov(tmp, (address)markWord::unused_mark().value());
     __ str(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
 
-    __ br(Assembler::EQ, cont); // CAS success means locking succeeded
-
-    __ cmp(rscratch1, rthread);
-    __ br(Assembler::NE, cont); // Check for recursive locking
-
-    // Recursive lock case
-    __ increment(Address(disp_hdr, ObjectMonitor::recursions_offset_in_bytes() - markWord::monitor_value), 1);
-    // flag == EQ still from the cmp above, checking if this is a reentrant lock
-
     __ bind(cont);
     // flag == EQ indicates success
     // flag == NE indicates failure
@@ -3915,20 +3904,11 @@ encode %{
     __ add(tmp, tmp, -(int)markWord::monitor_value); // monitor
     __ ldr(rscratch1, Address(tmp, ObjectMonitor::owner_offset_in_bytes()));
     __ ldr(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset_in_bytes()));
-
-    Label notRecursive;
-    __ cmp(rscratch1, rthread);
+    __ eor(rscratch1, rscratch1, rthread); // Will be 0 if we are the owner.
+    __ orr(rscratch1, rscratch1, disp_hdr); // Will be 0 if there are 0 recursions
+    __ cmp(rscratch1, zr); // Sets flags for result
     __ br(Assembler::NE, cont);
 
-    __ cbz(disp_hdr, notRecursive);
-
-    // Recursive lock
-    __ sub(disp_hdr, disp_hdr, 1u);
-    __ str(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset_in_bytes()));
-    // flag == EQ was set in the ownership check above
-    __ b(cont);
-
-    __ bind(notRecursive);
     __ ldr(rscratch1, Address(tmp, ObjectMonitor::EntryList_offset_in_bytes()));
     __ ldr(disp_hdr, Address(tmp, ObjectMonitor::cxq_offset_in_bytes()));
     __ orr(rscratch1, rscratch1, disp_hdr); // Will be 0 if both are 0.
@@ -14341,18 +14321,6 @@ instruct signumF_reg(vRegF dst, vRegF src, vRegF zero, vRegF one) %{
   ins_pipe(fp_uop_d);
 %}
 
-instruct onspinwait() %{
-  match(OnSpinWait);
-  ins_cost(INSN_COST);
-
-  format %{ "onspinwait" %}
-
-  ins_encode %{
-    __ spin_wait();
-  %}
-  ins_pipe(pipe_class_empty);
-%}
-
 // ============================================================================
 // Logical Instructions
 

src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1590,9 +1590,7 @@ void LIR_Assembler::emit_compare_and_swap(LIR_OpCompareAndSwap* op) {
 }
 
 
-void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type,
-                          LIR_Opr cmp_opr1, LIR_Opr cmp_opr2) {
-  assert(cmp_opr1 == LIR_OprFact::illegalOpr && cmp_opr2 == LIR_OprFact::illegalOpr, "unnecessary cmp oprs on aarch64");
+void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) {
 
   Assembler::Condition acond, ncond;
   switch (condition) {
@@ -2990,7 +2988,7 @@ void LIR_Assembler::membar_loadstore() { __ membar(MacroAssembler::LoadStore); }
 void LIR_Assembler::membar_storeload() { __ membar(MacroAssembler::StoreLoad); }
 
 void LIR_Assembler::on_spin_wait() {
-  __ spin_wait();
+  Unimplemented();
 }
 
 void LIR_Assembler::get_thread(LIR_Opr result_reg) {

src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp

@@ -355,7 +355,7 @@ void C1_MacroAssembler::remove_frame(int framesize) {
 }
 
 
-void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
+void C1_MacroAssembler::verified_entry() {
   // If we have to make this method not-entrant we'll overwrite its
   // first instruction with a jump.  For this action to be legal we
   // must ensure that this first instruction is a B, BL, NOP, BKPT,

src/hotspot/cpu/aarch64/disassembler_aarch64.hpp

@@ -34,6 +34,14 @@
     return "";
   }
 
+  // Returns address of n-th instruction preceding addr,
+  // NULL if no preceding instruction can be found.
+  // On ARM(aarch64), we assume a constant instruction length.
+  // It might be beneficial to check "is_readable" as we do on ppc and s390.
+  static address find_prev_instr(address addr, int n_instr) {
+    return addr - Assembler::instruction_size*n_instr;
+  }
+
   // special-case instruction decoding.
   // There may be cases where the binutils disassembler doesn't do
   // the perfect job. In those cases, decode_instruction0 may kick in

src/hotspot/cpu/aarch64/globals_aarch64.hpp

@@ -111,15 +111,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(int, SoftwarePrefetchHintDistance, -1,                        \
           "Use prfm hint with specified distance in compiled code."     \
           "Value -1 means off.")                                        \
-          range(-1, 4096)                                               \
-  product(ccstr, OnSpinWaitInst, "none", DIAGNOSTIC,                    \
-          "The instruction to use to implement "                        \
-          "java.lang.Thread.onSpinWait()."                              \
-          "Options: none, nop, isb, yield.")                            \
-  product(uint, OnSpinWaitInstCount, 1, DIAGNOSTIC,                     \
-          "The number of OnSpinWaitInst instructions to generate."      \
-          "It cannot be used with OnSpinWaitInst=none.")                \
-          range(1, 99)
+          range(-1, 4096)
 
 // end of ARCH_FLAGS
 

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -2027,6 +2027,15 @@ void MacroAssembler::increment(Address dst, int value)
   str(rscratch1, dst);
 }
 
+
+void MacroAssembler::pusha() {
+  push(0x7fffffff, sp);
+}
+
+void MacroAssembler::popa() {
+  pop(0x7fffffff, sp);
+}
+
 // Push lots of registers in the bit set supplied.  Don't push sp.
 // Return the number of words pushed
 int MacroAssembler::push(unsigned int bitset, Register stack) {
@@ -2668,7 +2677,7 @@ void MacroAssembler::pop_call_clobbered_registers_except(RegSet exclude) {
 
 void MacroAssembler::push_CPU_state(bool save_vectors, bool use_sve,
                                     int sve_vector_size_in_bytes) {
-  push(RegSet::range(r0, r29), sp); // integer registers except lr & sp
+  push(0x3fffffff, sp);         // integer registers except lr & sp
   if (save_vectors && use_sve && sve_vector_size_in_bytes > 16) {
     sub(sp, sp, sve_vector_size_in_bytes * FloatRegisterImpl::number_of_registers);
     for (int i = 0; i < FloatRegisterImpl::number_of_registers; i++) {
@@ -2704,14 +2713,7 @@ void MacroAssembler::pop_CPU_state(bool restore_vectors, bool use_sve,
     reinitialize_ptrue();
   }
 
-  // integer registers except lr & sp
-  pop(RegSet::range(r0, r17), sp);
-#ifdef R18_RESERVED
-  ldp(zr, r19, Address(post(sp, 2 * wordSize)));
-  pop(RegSet::range(r20, r29), sp);
-#else
-  pop(RegSet::range(r18_tls, r29), sp);
-#endif
+  pop(0x3fffffff, sp);         // integer registers except lr & sp
 }
 
 /**
@@ -5352,21 +5354,3 @@ void MacroAssembler::verify_cross_modify_fence_not_required() {
   }
 }
 #endif
-
-void MacroAssembler::spin_wait() {
-  for (int i = 0; i < VM_Version::spin_wait_desc().inst_count(); ++i) {
-    switch (VM_Version::spin_wait_desc().inst()) {
-      case SpinWait::NOP:
-        nop();
-        break;
-      case SpinWait::ISB:
-        isb();
-        break;
-      case SpinWait::YIELD:
-        yield();
-        break;
-      default:
-        ShouldNotReachHere();
-    }
-  }
-}

src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp

@@ -1123,6 +1123,10 @@ public:
   void push(Register src);
   void pop(Register dst);
 
+  // push all registers onto the stack
+  void pusha();
+  void popa();
+
   void repne_scan(Register addr, Register value, Register count,
                   Register scratch);
   void repne_scanw(Register addr, Register value, Register count,
@@ -1410,9 +1414,6 @@ public:
   void cache_wb(Address line);
   void cache_wbsync(bool is_pre);
 
-  // Code for java.lang.Thread::onSpinWait() intrinsic.
-  void spin_wait();
-
 private:
   // Check the current thread doesn't need a cross modify fence.
   void verify_cross_modify_fence_not_required() PRODUCT_RETURN;

src/hotspot/cpu/aarch64/spin_wait_aarch64.hpp

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2021, Amazon.com Inc. 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.
- *
- */
-
-#ifndef CPU_AARCH64_SPIN_WAIT_AARCH64_HPP
-#define CPU_AARCH64_SPIN_WAIT_AARCH64_HPP
-
-class SpinWait {
-public:
-  enum Inst {
-    NONE = -1,
-    NOP,
-    ISB,
-    YIELD
-  };
-
-private:
-  Inst _inst;
-  int _count;
-
-public:
-  SpinWait(Inst inst = NONE, int count = 0) : _inst(inst), _count(count) {}
-
-  Inst inst() const { return _inst; }
-  int inst_count() const { return _count; }
-};
-
-#endif // CPU_AARCH64_SPIN_WAIT_AARCH64_HPP

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

@@ -3223,194 +3223,6 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
-  // Arguments:
-  //
-  // Inputs:
-  //   c_rarg0   - byte[]  source+offset
-  //   c_rarg1   - int[]   SHA.state
-  //   c_rarg2   - int     offset
-  //   c_rarg3   - int     limit
-  //
-  address generate_md5_implCompress(bool multi_block, const char *name) {
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, "StubRoutines", name);
-    address start = __ pc();
-
-    Register buf       = c_rarg0;
-    Register state     = c_rarg1;
-    Register ofs       = c_rarg2;
-    Register limit     = c_rarg3;
-    Register a         = r4;
-    Register b         = r5;
-    Register c         = r6;
-    Register d         = r7;
-    Register rscratch3 = r10;
-    Register rscratch4 = r11;
-
-    Label keys;
-    Label md5_loop;
-
-    __ BIND(md5_loop);
-
-    // Save hash values for addition after rounds
-    __ ldrw(a, Address(state,  0));
-    __ ldrw(b, Address(state,  4));
-    __ ldrw(c, Address(state,  8));
-    __ ldrw(d, Address(state, 12));
-
-#define FF(r1, r2, r3, r4, k, s, t)              \
-    __ eorw(rscratch3, r3, r4);                  \
-    __ movw(rscratch2, t);                       \
-    __ andw(rscratch3, rscratch3, r2);           \
-    __ addw(rscratch4, r1, rscratch2);           \
-    __ ldrw(rscratch1, Address(buf, k*4));       \
-    __ eorw(rscratch3, rscratch3, r4);           \
-    __ addw(rscratch3, rscratch3, rscratch1);    \
-    __ addw(rscratch3, rscratch3, rscratch4);    \
-    __ rorw(rscratch2, rscratch3, 32 - s);       \
-    __ addw(r1, rscratch2, r2);
-
-#define GG(r1, r2, r3, r4, k, s, t)              \
-    __ eorw(rscratch2, r2, r3);                  \
-    __ ldrw(rscratch1, Address(buf, k*4));       \
-    __ andw(rscratch3, rscratch2, r4);           \
-    __ movw(rscratch2, t);                       \
-    __ eorw(rscratch3, rscratch3, r3);           \
-    __ addw(rscratch4, r1, rscratch2);           \
-    __ addw(rscratch3, rscratch3, rscratch1);    \
-    __ addw(rscratch3, rscratch3, rscratch4);    \
-    __ rorw(rscratch2, rscratch3, 32 - s);       \
-    __ addw(r1, rscratch2, r2);
-
-#define HH(r1, r2, r3, r4, k, s, t)              \
-    __ eorw(rscratch3, r3, r4);                  \
-    __ movw(rscratch2, t);                       \
-    __ addw(rscratch4, r1, rscratch2);           \
-    __ ldrw(rscratch1, Address(buf, k*4));       \
-    __ eorw(rscratch3, rscratch3, r2);           \
-    __ addw(rscratch3, rscratch3, rscratch1);    \
-    __ addw(rscratch3, rscratch3, rscratch4);    \
-    __ rorw(rscratch2, rscratch3, 32 - s);       \
-    __ addw(r1, rscratch2, r2);
-
-#define II(r1, r2, r3, r4, k, s, t)              \
-    __ movw(rscratch3, t);                       \
-    __ ornw(rscratch2, r2, r4);                  \
-    __ addw(rscratch4, r1, rscratch3);           \
-    __ ldrw(rscratch1, Address(buf, k*4));       \
-    __ eorw(rscratch3, rscratch2, r3);           \
-    __ addw(rscratch3, rscratch3, rscratch1);    \
-    __ addw(rscratch3, rscratch3, rscratch4);    \
-    __ rorw(rscratch2, rscratch3, 32 - s);       \
-    __ addw(r1, rscratch2, r2);
-
-    // Round 1
-    FF(a, b, c, d,  0,  7, 0xd76aa478)
-    FF(d, a, b, c,  1, 12, 0xe8c7b756)
-    FF(c, d, a, b,  2, 17, 0x242070db)
-    FF(b, c, d, a,  3, 22, 0xc1bdceee)
-    FF(a, b, c, d,  4,  7, 0xf57c0faf)
-    FF(d, a, b, c,  5, 12, 0x4787c62a)
-    FF(c, d, a, b,  6, 17, 0xa8304613)
-    FF(b, c, d, a,  7, 22, 0xfd469501)
-    FF(a, b, c, d,  8,  7, 0x698098d8)
-    FF(d, a, b, c,  9, 12, 0x8b44f7af)
-    FF(c, d, a, b, 10, 17, 0xffff5bb1)
-    FF(b, c, d, a, 11, 22, 0x895cd7be)
-    FF(a, b, c, d, 12,  7, 0x6b901122)
-    FF(d, a, b, c, 13, 12, 0xfd987193)
-    FF(c, d, a, b, 14, 17, 0xa679438e)
-    FF(b, c, d, a, 15, 22, 0x49b40821)
-
-    // Round 2
-    GG(a, b, c, d,  1,  5, 0xf61e2562)
-    GG(d, a, b, c,  6,  9, 0xc040b340)
-    GG(c, d, a, b, 11, 14, 0x265e5a51)
-    GG(b, c, d, a,  0, 20, 0xe9b6c7aa)
-    GG(a, b, c, d,  5,  5, 0xd62f105d)
-    GG(d, a, b, c, 10,  9, 0x02441453)
-    GG(c, d, a, b, 15, 14, 0xd8a1e681)
-    GG(b, c, d, a,  4, 20, 0xe7d3fbc8)
-    GG(a, b, c, d,  9,  5, 0x21e1cde6)
-    GG(d, a, b, c, 14,  9, 0xc33707d6)
-    GG(c, d, a, b,  3, 14, 0xf4d50d87)
-    GG(b, c, d, a,  8, 20, 0x455a14ed)
-    GG(a, b, c, d, 13,  5, 0xa9e3e905)
-    GG(d, a, b, c,  2,  9, 0xfcefa3f8)
-    GG(c, d, a, b,  7, 14, 0x676f02d9)
-    GG(b, c, d, a, 12, 20, 0x8d2a4c8a)
-
-    // Round 3
-    HH(a, b, c, d,  5,  4, 0xfffa3942)
-    HH(d, a, b, c,  8, 11, 0x8771f681)
-    HH(c, d, a, b, 11, 16, 0x6d9d6122)
-    HH(b, c, d, a, 14, 23, 0xfde5380c)
-    HH(a, b, c, d,  1,  4, 0xa4beea44)
-    HH(d, a, b, c,  4, 11, 0x4bdecfa9)
-    HH(c, d, a, b,  7, 16, 0xf6bb4b60)
-    HH(b, c, d, a, 10, 23, 0xbebfbc70)
-    HH(a, b, c, d, 13,  4, 0x289b7ec6)
-    HH(d, a, b, c,  0, 11, 0xeaa127fa)
-    HH(c, d, a, b,  3, 16, 0xd4ef3085)
-    HH(b, c, d, a,  6, 23, 0x04881d05)
-    HH(a, b, c, d,  9,  4, 0xd9d4d039)
-    HH(d, a, b, c, 12, 11, 0xe6db99e5)
-    HH(c, d, a, b, 15, 16, 0x1fa27cf8)
-    HH(b, c, d, a,  2, 23, 0xc4ac5665)
-
-    // Round 4
-    II(a, b, c, d,  0,  6, 0xf4292244)
-    II(d, a, b, c,  7, 10, 0x432aff97)
-    II(c, d, a, b, 14, 15, 0xab9423a7)
-    II(b, c, d, a,  5, 21, 0xfc93a039)
-    II(a, b, c, d, 12,  6, 0x655b59c3)
-    II(d, a, b, c,  3, 10, 0x8f0ccc92)
-    II(c, d, a, b, 10, 15, 0xffeff47d)
-    II(b, c, d, a,  1, 21, 0x85845dd1)
-    II(a, b, c, d,  8,  6, 0x6fa87e4f)
-    II(d, a, b, c, 15, 10, 0xfe2ce6e0)
-    II(c, d, a, b,  6, 15, 0xa3014314)
-    II(b, c, d, a, 13, 21, 0x4e0811a1)
-    II(a, b, c, d,  4,  6, 0xf7537e82)
-    II(d, a, b, c, 11, 10, 0xbd3af235)
-    II(c, d, a, b,  2, 15, 0x2ad7d2bb)
-    II(b, c, d, a,  9, 21, 0xeb86d391)
-
-#undef FF
-#undef GG
-#undef HH
-#undef II
-
-    // write hash values back in the correct order
-    __ ldrw(rscratch1, Address(state,  0));
-    __ addw(rscratch1, rscratch1, a);
-    __ strw(rscratch1, Address(state,  0));
-
-    __ ldrw(rscratch2, Address(state,  4));
-    __ addw(rscratch2, rscratch2, b);
-    __ strw(rscratch2, Address(state,  4));
-
-    __ ldrw(rscratch3, Address(state,  8));
-    __ addw(rscratch3, rscratch3, c);
-    __ strw(rscratch3, Address(state,  8));
-
-    __ ldrw(rscratch4, Address(state, 12));
-    __ addw(rscratch4, rscratch4, d);
-    __ strw(rscratch4, Address(state, 12));
-
-    if (multi_block) {
-      __ add(buf, buf, 64);
-      __ add(ofs, ofs, 64);
-      __ cmp(ofs, limit);
-      __ br(Assembler::LE, md5_loop);
-      __ mov(c_rarg0, ofs); // return ofs
-    }
-
-    __ ret(lr);
-
-    return start;
-  }
-
   // Arguments:
   //
   // Inputs:
@@ -6370,18 +6182,6 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
-  // Support for spin waits.
-  address generate_spin_wait() {
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, "StubRoutines", "spin_wait");
-    address start = __ pc();
-
-    __ spin_wait();
-    __ ret(lr);
-
-    return start;
-  }
-
 #ifdef LINUX
 
   // ARMv8.1 LSE versions of the atomic stubs used by Atomic::PlatformXX.
@@ -7664,10 +7464,6 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_counterMode_AESCrypt = generate_counterMode_AESCrypt();
     }
 
-    if (UseMD5Intrinsics) {
-      StubRoutines::_md5_implCompress      = generate_md5_implCompress(false,    "md5_implCompress");
-      StubRoutines::_md5_implCompressMB    = generate_md5_implCompress(true,     "md5_implCompressMB");
-    }
     if (UseSHA1Intrinsics) {
       StubRoutines::_sha1_implCompress     = generate_sha1_implCompress(false,   "sha1_implCompress");
       StubRoutines::_sha1_implCompressMB   = generate_sha1_implCompress(true,    "sha1_implCompressMB");
@@ -7690,8 +7486,6 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_updateBytesAdler32 = generate_updateBytesAdler32();
     }
 
-    StubRoutines::aarch64::_spin_wait = generate_spin_wait();
-
 #ifdef LINUX
 
     generate_atomic_entry_points();

src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp

@@ -57,10 +57,6 @@ address StubRoutines::aarch64::_string_indexof_linear_uu = NULL;
 address StubRoutines::aarch64::_string_indexof_linear_ul = NULL;
 address StubRoutines::aarch64::_large_byte_array_inflate = NULL;
 address StubRoutines::aarch64::_method_entry_barrier = NULL;
-
-static void empty_spin_wait() { }
-address StubRoutines::aarch64::_spin_wait = CAST_FROM_FN_PTR(address, empty_spin_wait);
-
 bool StubRoutines::aarch64::_completed = false;
 
 /**

src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp

@@ -36,7 +36,7 @@ static bool    returns_to_call_stub(address return_pc)   {
 
 enum platform_dependent_constants {
   code_size1 = 19000,          // simply increase if too small (assembler will crash if too small)
-  code_size2 = 45000           // simply increase if too small (assembler will crash if too small)
+  code_size2 = 32000           // simply increase if too small (assembler will crash if too small)
 };
 
 class aarch64 {
@@ -72,8 +72,6 @@ class aarch64 {
 
   static address _method_entry_barrier;
 
-  static address _spin_wait;
-
   static bool _completed;
 
  public:
@@ -179,10 +177,6 @@ class aarch64 {
     return _method_entry_barrier;
   }
 
-  static address spin_wait() {
-    return _spin_wait;
-  }
-
   static bool complete() {
     return _completed;
   }

src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp

@@ -1397,12 +1397,11 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ cmp(rscratch1, (u1)StackOverflow::stack_guard_yellow_reserved_disabled);
     __ br(Assembler::NE, no_reguard);
 
-    __ push_call_clobbered_registers();
+    __ pusha(); // XXX only save smashed registers
     __ mov(c_rarg0, rthread);
     __ mov(rscratch2, CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages));
     __ blr(rscratch2);
-    __ pop_call_clobbered_registers();
-
+    __ popa(); // XXX only restore smashed registers
     __ bind(no_reguard);
   }
 

src/hotspot/cpu/aarch64/vm_version_aarch64.cpp

@@ -46,26 +46,6 @@ int VM_Version::_dcache_line_size;
 int VM_Version::_icache_line_size;
 int VM_Version::_initial_sve_vector_length;
 
-SpinWait VM_Version::_spin_wait;
-
-static SpinWait get_spin_wait_desc() {
-  if (strcmp(OnSpinWaitInst, "nop") == 0) {
-    return SpinWait(SpinWait::NOP, OnSpinWaitInstCount);
-  } else if (strcmp(OnSpinWaitInst, "isb") == 0) {
-    return SpinWait(SpinWait::ISB, OnSpinWaitInstCount);
-  } else if (strcmp(OnSpinWaitInst, "yield") == 0) {
-    return SpinWait(SpinWait::YIELD, OnSpinWaitInstCount);
-  } else if (strcmp(OnSpinWaitInst, "none") != 0) {
-    vm_exit_during_initialization("The options for OnSpinWaitInst are nop, isb, yield, and none", OnSpinWaitInst);
-  }
-
-  if (!FLAG_IS_DEFAULT(OnSpinWaitInstCount) && OnSpinWaitInstCount > 0) {
-    vm_exit_during_initialization("OnSpinWaitInstCount cannot be used for OnSpinWaitInst 'none'");
-  }
-
-  return SpinWait{};
-}
-
 void VM_Version::initialize() {
   _supports_cx8 = true;
   _supports_atomic_getset4 = true;
@@ -202,14 +182,6 @@ void VM_Version::initialize() {
     if (FLAG_IS_DEFAULT(UseSIMDForMemoryOps)) {
       FLAG_SET_DEFAULT(UseSIMDForMemoryOps, true);
     }
-
-    if (FLAG_IS_DEFAULT(OnSpinWaitInst)) {
-      FLAG_SET_DEFAULT(OnSpinWaitInst, "isb");
-    }
-
-    if (FLAG_IS_DEFAULT(OnSpinWaitInstCount)) {
-      FLAG_SET_DEFAULT(OnSpinWaitInstCount, 1);
-    }
   }
 
   if (_cpu == CPU_ARM) {
@@ -300,8 +272,9 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseFMA, true);
   }
 
-  if (FLAG_IS_DEFAULT(UseMD5Intrinsics)) {
-    UseMD5Intrinsics = true;
+  if (UseMD5Intrinsics) {
+    warning("MD5 intrinsics are not available on this CPU");
+    FLAG_SET_DEFAULT(UseMD5Intrinsics, false);
   }
 
   if (_features & (CPU_SHA1 | CPU_SHA2 | CPU_SHA3 | CPU_SHA512)) {
@@ -477,7 +450,5 @@ void VM_Version::initialize() {
   }
 #endif
 
-  _spin_wait = get_spin_wait_desc();
-
   UNSUPPORTED_OPTION(CriticalJNINatives);
 }

src/hotspot/cpu/aarch64/vm_version_aarch64.hpp

@@ -26,7 +26,6 @@
 #ifndef CPU_AARCH64_VM_VERSION_AARCH64_HPP
 #define CPU_AARCH64_VM_VERSION_AARCH64_HPP
 
-#include "spin_wait_aarch64.hpp"
 #include "runtime/abstract_vm_version.hpp"
 #include "utilities/sizes.hpp"
 
@@ -46,8 +45,6 @@ protected:
   static int _icache_line_size;
   static int _initial_sve_vector_length;
 
-  static SpinWait _spin_wait;
-
   // Read additional info using OS-specific interfaces
   static void get_os_cpu_info();
 
@@ -145,10 +142,6 @@ public:
 
   static void get_compatible_board(char *buf, int buflen);
 
-  static const SpinWait& spin_wait_desc() { return _spin_wait; }
-
-  static bool supports_on_spin_wait() { return _spin_wait.inst() != SpinWait::NONE; }
-
 #ifdef __APPLE__
   // Is the CPU running emulated (for example macOS Rosetta running x86_64 code on M1 ARM (aarch64)
   static bool is_cpu_emulated();

src/hotspot/cpu/arm/assembler_arm_32.cpp

@@ -47,7 +47,7 @@
 // Convert the raw encoding form into the form expected by the
 // constructor for Address.
 Address Address::make_raw(int base, int index, int scale, int disp, relocInfo::relocType disp_reloc) {
-  RelocationHolder rspec = RelocationHolder::none;
+  RelocationHolder rspec;
   if (disp_reloc != relocInfo::none) {
     rspec = Relocation::spec_simple(disp_reloc);
   }

src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021, 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
@@ -1417,10 +1417,7 @@ void LIR_Assembler::emit_compare_and_swap(LIR_OpCompareAndSwap* op) {
 }
 
 
-void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type,
-                          LIR_Opr cmp_opr1, LIR_Opr cmp_opr2) {
-  assert(cmp_opr1 == LIR_OprFact::illegalOpr && cmp_opr2 == LIR_OprFact::illegalOpr, "unnecessary cmp oprs on arm");
-
+void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) {
   AsmCondition acond = al;
   AsmCondition ncond = nv;
   if (opr1 != opr2) {
@@ -1688,9 +1685,6 @@ void LIR_Assembler::logic_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr
     } else {
       assert(right->is_constant(), "must be");
       const uint c = (uint)right->as_constant_ptr()->as_jint();
-      if (!Assembler::is_arith_imm_in_range(c)) {
-        BAILOUT("illegal arithmetic operand");
-      }
       switch (code) {
         case lir_logic_and: __ and_32(res, lreg, c); break;
         case lir_logic_or:  __ orr_32(res, lreg, c); break;
@@ -1831,8 +1825,8 @@ void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2,
         __ teq(xhi, yhi);
         __ teq(xlo, ylo, eq);
       } else {
-        __ subs(Rtemp, xlo, ylo);
-        __ sbcs(Rtemp, xhi, yhi);
+        __ subs(xlo, xlo, ylo);
+        __ sbcs(xhi, xhi, yhi);
       }
     } else {
       ShouldNotReachHere();

src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp

@@ -70,8 +70,8 @@ void C1_MacroAssembler::remove_frame(int frame_size_in_bytes) {
   raw_pop(FP, LR);
 }
 
-void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
-  if (breakAtEntry) {
+void C1_MacroAssembler::verified_entry() {
+  if (C1Breakpoint) {
     breakpoint();
   }
 }

src/hotspot/cpu/arm/disassembler_arm.hpp

@@ -33,6 +33,14 @@
     return "";
   }
 
+  // Returns address of n-th instruction preceding addr,
+  // NULL if no preceding instruction can be found.
+  // On ARM, we assume a constant instruction length.
+  // It might be beneficial to check "is_readable" as we do on ppc and s390.
+  static address find_prev_instr(address addr, int n_instr) {
+    return addr - Assembler::InstructionSize*n_instr;
+  }
+
   // special-case instruction decoding.
   // There may be cases where the binutils disassembler doesn't do
   // the perfect job. In those cases, decode_instruction0 may kick in

src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp

@@ -81,6 +81,8 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
 
   if (_info->deoptimize_on_exception()) {
     address a = Runtime1::entry_for(Runtime1::predicate_failed_trap_id);
+    // May be used by optimizations like LoopInvariantCodeMotion or RangeCheckEliminator.
+    DEBUG_ONLY( __ untested("RangeCheckStub: predicate_failed_trap_id"); )
     //__ load_const_optimized(R0, a);
     __ add_const_optimized(R0, R29_TOC, MacroAssembler::offset_to_global_toc(a));
     __ mtctr(R0);

src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1554,10 +1554,8 @@ inline void load_to_reg(LIR_Assembler *lasm, LIR_Opr src, LIR_Opr dst) {
   }
 }
 
-void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type,
-                          LIR_Opr cmp_opr1, LIR_Opr cmp_opr2) {
-  assert(cmp_opr1 == LIR_OprFact::illegalOpr && cmp_opr2 == LIR_OprFact::illegalOpr, "unnecessary cmp oprs on ppc");
 
+void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) {
   if (opr1->is_equal(opr2) || opr1->is_same_register(opr2)) {
     load_to_reg(this, opr1, result); // Condition doesn't matter.
     return;

src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp

@@ -87,8 +87,8 @@ void C1_MacroAssembler::build_frame(int frame_size_in_bytes, int bang_size_in_by
 }
 
 
-void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
-  if (breakAtEntry) illtrap();
+void C1_MacroAssembler::verified_entry() {
+  if (C1Breakpoint) illtrap();
   // build frame
 }
 

src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp

@@ -41,18 +41,17 @@
 // Compress char[] to byte[] by compressing 16 bytes at once.
 void C2_MacroAssembler::string_compress_16(Register src, Register dst, Register cnt,
                                            Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5,
-                                           Label& Lfailure, bool ascii) {
+                                           Label& Lfailure) {
 
   const Register tmp0 = R0;
-  const int byte_mask = ascii ? 0x7F : 0xFF;
   assert_different_registers(src, dst, cnt, tmp0, tmp1, tmp2, tmp3, tmp4, tmp5);
   Label Lloop, Lslow;
 
   // Check if cnt >= 8 (= 16 bytes)
-  lis(tmp1, byte_mask);           // tmp1 = 0x00FF00FF00FF00FF (non ascii case)
+  lis(tmp1, 0xFF);                // tmp1 = 0x00FF00FF00FF00FF
   srwi_(tmp2, cnt, 3);
   beq(CCR0, Lslow);
-  ori(tmp1, tmp1, byte_mask);
+  ori(tmp1, tmp1, 0xFF);
   rldimi(tmp1, tmp1, 32, 0);
   mtctr(tmp2);
 
@@ -68,7 +67,7 @@ void C2_MacroAssembler::string_compress_16(Register src, Register dst, Register
   rldimi(tmp4, tmp4, 2*8, 2*8);   // _4_6_7_7
 
   andc_(tmp0, tmp0, tmp1);
-  bne(CCR0, Lfailure);            // Not latin1/ascii.
+  bne(CCR0, Lfailure);            // Not latin1.
   addi(src, src, 16);
 
   rlwimi(tmp3, tmp2, 0*8, 24, 31);// _____1_3
@@ -88,49 +87,20 @@ void C2_MacroAssembler::string_compress_16(Register src, Register dst, Register
 }
 
 // Compress char[] to byte[]. cnt must be positive int.
-void C2_MacroAssembler::string_compress(Register src, Register dst, Register cnt, Register tmp,
-                                        Label& Lfailure, bool ascii) {
-  const int byte_mask = ascii ? 0x7F : 0xFF;
+void C2_MacroAssembler::string_compress(Register src, Register dst, Register cnt, Register tmp, Label& Lfailure) {
   Label Lloop;
   mtctr(cnt);
 
   bind(Lloop);
   lhz(tmp, 0, src);
-  cmplwi(CCR0, tmp, byte_mask);
-  bgt(CCR0, Lfailure);            // Not latin1/ascii.
+  cmplwi(CCR0, tmp, 0xff);
+  bgt(CCR0, Lfailure);            // Not latin1.
   addi(src, src, 2);
   stb(tmp, 0, dst);
   addi(dst, dst, 1);
   bdnz(Lloop);
 }
 
-void C2_MacroAssembler::encode_iso_array(Register src, Register dst, Register len,
-                                         Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5,
-                                         Register result, bool ascii) {
-  Label Lslow, Lfailure1, Lfailure2, Ldone;
-
-  string_compress_16(src, dst, len, tmp1, tmp2, tmp3, tmp4, tmp5, Lfailure1, ascii);
-  rldicl_(result, len, 0, 64-3); // Remaining characters.
-  beq(CCR0, Ldone);
-  bind(Lslow);
-  string_compress(src, dst, result, tmp2, Lfailure2, ascii);
-  li(result, 0);
-  b(Ldone);
-
-  bind(Lfailure1);
-  mr(result, len);
-  mfctr(tmp1);
-  rldimi_(result, tmp1, 3, 0); // Remaining characters.
-  beq(CCR0, Ldone);
-  b(Lslow);
-
-  bind(Lfailure2);
-  mfctr(result); // Remaining characters.
-
-  bind(Ldone);
-  subf(result, result, len);
-}
-
 // Inflate byte[] to char[] by inflating 16 bytes at once.
 void C2_MacroAssembler::string_inflate_16(Register src, Register dst, Register cnt,
                                           Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5) {

src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp

@@ -32,16 +32,10 @@
   // Compress char[] to byte[] by compressing 16 bytes at once.
   void string_compress_16(Register src, Register dst, Register cnt,
                           Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5,
-                          Label& Lfailure, bool ascii = false);
+                          Label& Lfailure);
 
   // Compress char[] to byte[]. cnt must be positive int.
-  void string_compress(Register src, Register dst, Register cnt, Register tmp,
-                       Label& Lfailure, bool ascii = false);
-
-  // Encode UTF16 to ISO_8859_1 or ASCII. Return len on success or position of first mismatch.
-  void encode_iso_array(Register src, Register dst, Register len,
-                        Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5,
-                        Register result, bool ascii);
+  void string_compress(Register src, Register dst, Register cnt, Register tmp, Label& Lfailure);
 
   // Inflate byte[] to char[] by inflating 16 bytes at once.
   void string_inflate_16(Register src, Register dst, Register cnt,

src/hotspot/cpu/ppc/disassembler_ppc.cpp

@@ -87,6 +87,22 @@
     } \
   }
 
+address Disassembler::find_prev_instr(address here, int n_instr) {
+  if (!os::is_readable_pointer(here)) return NULL;    // obviously a bad location to decode
+
+  // Find most distant possible starting point.
+  // Narrow down because we don't want to SEGV while printing.
+  address start = here - n_instr*Assembler::instr_maxlen(); // starting point can't be further away.
+  while ((start < here) && !os::is_readable_range(start, here)) {
+    start = align_down(start, os::min_page_size()) + os::min_page_size();
+  }
+  if (start >= here) {
+    // Strange. Can only happen with here on page boundary.
+    return NULL;
+  }
+  return start;
+}
+
 address Disassembler::decode_instruction0(address here, outputStream * st, address virtual_begin ) {
   if (is_abstract()) {
     // The disassembler library was not loaded (yet),

src/hotspot/cpu/ppc/disassembler_ppc.hpp

@@ -34,6 +34,15 @@
     return "ppc64";
   }
 
+  // Find preceding instruction.
+  //
+  // Starting at the passed location, the n-th preceding (towards lower addresses)
+  // location is searched, the contents of which - if interpreted as
+  // instructions - has the passed location as n-th successor.
+  //  - If no such location exists, NULL is returned. The caller should then
+  //    terminate its search and react properly.
+  static address find_prev_instr(address here, int n_instr);
+
   // special-case instruction decoding.
   // There may be cases where the binutils disassembler doesn't do
   // the perfect job. In those cases, decode_instruction0 may kick in

src/hotspot/cpu/ppc/frame_ppc.cpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 SAP SE. 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
@@ -294,57 +294,9 @@ void frame::patch_pc(Thread* thread, address pc) {
 }
 
 bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
+  // Is there anything to do?
   assert(is_interpreted_frame(), "Not an interpreted frame");
-  // These are reasonable sanity checks
-  if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) {
-    return false;
-  }
-  if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) {
-    return false;
-  }
-  int min_frame_slots = (abi_minframe_size + ijava_state_size) / sizeof(intptr_t);
-  if (fp() - min_frame_slots < sp()) {
-    return false;
-  }
-  // These are hacks to keep us out of trouble.
-  // The problem with these is that they mask other problems
-  if (fp() <= sp()) {        // this attempts to deal with unsigned comparison above
-    return false;
-  }
-
-  // do some validation of frame elements
-
-  // first the method
-
-  Method* m = *interpreter_frame_method_addr();
-
-  // validate the method we'd find in this potential sender
-  if (!Method::is_valid_method(m)) return false;
-
-  // stack frames shouldn't be much larger than max_stack elements
-  // this test requires the use of unextended_sp which is the sp as seen by
-  // the current frame, and not sp which is the "raw" pc which could point
-  // further because of local variables of the callee method inserted after
-  // method arguments
-  if (fp() - unextended_sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) {
-    return false;
-  }
-
-  // validate bci/bcx
-
-  address  bcp    = interpreter_frame_bcp();
-  if (m->validate_bci_from_bcp(bcp) < 0) {
-    return false;
-  }
-
-  // validate constantPoolCache*
-  ConstantPoolCache* cp = *interpreter_frame_cache_addr();
-  if (MetaspaceObj::is_valid(cp) == false) return false;
-
-  // validate locals
-
-  address locals =  (address) *interpreter_frame_locals_addr();
-  return thread->is_in_stack_range_incl(locals, (address)fp());
+  return true;
 }
 
 BasicType frame::interpreter_frame_result(oop* oop_result, jvalue* value_result) {

src/hotspot/cpu/ppc/matcher_ppc.hpp

@@ -157,6 +157,6 @@
   }
 
   // Implements a variant of EncodeISOArrayNode that encode ASCII only
-  static const bool supports_encode_ascii_array = true;
+  static const bool supports_encode_ascii_array = false;
 
 #endif // CPU_PPC_MATCHER_PPC_HPP

src/hotspot/cpu/ppc/ppc.ad

@@ -12798,26 +12798,30 @@ instruct encode_iso_array(rarg1RegP src, rarg2RegP dst, iRegIsrc len, iRegIdst r
   effect(TEMP_DEF result, TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, TEMP tmp5,
          USE_KILL src, USE_KILL dst, KILL ctr, KILL cr0);
   ins_cost(300);
-  format %{ "Encode iso array $src,$dst,$len -> $result \t// KILL $tmp1, $tmp2, $tmp3, $tmp4, $tmp5" %}
+  format %{ "Encode array $src,$dst,$len -> $result \t// KILL $tmp1, $tmp2, $tmp3, $tmp4, $tmp5" %}
   ins_encode %{
-    __ encode_iso_array($src$$Register, $dst$$Register, $len$$Register, $tmp1$$Register, $tmp2$$Register,
-                        $tmp3$$Register, $tmp4$$Register, $tmp5$$Register, $result$$Register, false);
-  %}
-  ins_pipe(pipe_class_default);
-%}
+    Label Lslow, Lfailure1, Lfailure2, Ldone;
+    __ string_compress_16($src$$Register, $dst$$Register, $len$$Register, $tmp1$$Register,
+                          $tmp2$$Register, $tmp3$$Register, $tmp4$$Register, $tmp5$$Register, Lfailure1);
+    __ rldicl_($result$$Register, $len$$Register, 0, 64-3); // Remaining characters.
+    __ beq(CCR0, Ldone);
+    __ bind(Lslow);
+    __ string_compress($src$$Register, $dst$$Register, $result$$Register, $tmp2$$Register, Lfailure2);
+    __ li($result$$Register, 0);
+    __ b(Ldone);
 
-// encode char[] to byte[] in ASCII
-instruct encode_ascii_array(rarg1RegP src, rarg2RegP dst, iRegIsrc len, iRegIdst result, iRegLdst tmp1,
-                          iRegLdst tmp2, iRegLdst tmp3, iRegLdst tmp4, iRegLdst tmp5, regCTR ctr, flagsRegCR0 cr0) %{
-  predicate(((EncodeISOArrayNode*)n)->is_ascii());
-  match(Set result (EncodeISOArray src (Binary dst len)));
-  effect(TEMP_DEF result, TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, TEMP tmp5,
-         USE_KILL src, USE_KILL dst, KILL ctr, KILL cr0);
-  ins_cost(300);
-  format %{ "Encode ascii array $src,$dst,$len -> $result \t// KILL $tmp1, $tmp2, $tmp3, $tmp4, $tmp5" %}
-  ins_encode %{
-    __ encode_iso_array($src$$Register, $dst$$Register, $len$$Register, $tmp1$$Register, $tmp2$$Register,
-                        $tmp3$$Register, $tmp4$$Register, $tmp5$$Register, $result$$Register, true);
+    __ bind(Lfailure1);
+    __ mr($result$$Register, $len$$Register);
+    __ mfctr($tmp1$$Register);
+    __ rldimi_($result$$Register, $tmp1$$Register, 3, 0); // Remaining characters.
+    __ beq(CCR0, Ldone);
+    __ b(Lslow);
+
+    __ bind(Lfailure2);
+    __ mfctr($result$$Register); // Remaining characters.
+
+    __ bind(Ldone);
+    __ subf($result$$Register, $result$$Register, $len$$Register);
   %}
   ins_pipe(pipe_class_default);
 %}

src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp

@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "interpreter/interpreter.hpp"
-#include "oops/constMethod.hpp"
-#include "oops/klass.inline.hpp"
-#include "oops/method.hpp"
-#include "runtime/frame.inline.hpp"
-#include "utilities/align.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/macros.hpp"
-
-int AbstractInterpreter::BasicType_as_index(BasicType type) {
-  int i = 0;
-  switch (type) {
-    case T_BOOLEAN: i = 0; break;
-    case T_CHAR   : i = 1; break;
-    case T_BYTE   : i = 2; break;
-    case T_SHORT  : i = 3; break;
-    case T_INT    : i = 4; break;
-    case T_LONG   : i = 5; break;
-    case T_VOID   : i = 6; break;
-    case T_FLOAT  : i = 7; break;
-    case T_DOUBLE : i = 8; break;
-    case T_OBJECT : i = 9; break;
-    case T_ARRAY  : i = 9; break;
-    default       : ShouldNotReachHere();
-  }
-  assert(0 <= i && i < AbstractInterpreter::number_of_result_handlers,
-         "index out of bounds");
-  return i;
-}
-
-// How much stack a method activation needs in words.
-int AbstractInterpreter::size_top_interpreter_activation(Method* method) {
-  const int entry_size = frame::interpreter_frame_monitor_size();
-
-  // total overhead size: entry_size + (saved fp thru expr stack
-  // bottom).  be sure to change this if you add/subtract anything
-  // to/from the overhead area
-  const int overhead_size =
-    -(frame::interpreter_frame_initial_sp_offset) + entry_size;
-
-  const int stub_code = frame::entry_frame_after_call_words;
-  assert_cond(method != NULL);
-  const int method_stack = (method->max_locals() + method->max_stack()) *
-                           Interpreter::stackElementWords;
-  return (overhead_size + method_stack + stub_code);
-}
-
-// asm based interpreter deoptimization helpers
-int AbstractInterpreter::size_activation(int max_stack,
-                                         int temps,
-                                         int extra_args,
-                                         int monitors,
-                                         int callee_params,
-                                         int callee_locals,
-                                         bool is_top_frame) {
-  // Note: This calculation must exactly parallel the frame setup
-  // in TemplateInterpreterGenerator::generate_method_entry.
-
-  // fixed size of an interpreter frame:
-  int overhead = frame::sender_sp_offset -
-                 frame::interpreter_frame_initial_sp_offset;
-  // Our locals were accounted for by the caller (or last_frame_adjust
-  // on the transistion) Since the callee parameters already account
-  // for the callee's params we only need to account for the extra
-  // locals.
-  int size = overhead +
-             (callee_locals - callee_params) +
-             monitors * frame::interpreter_frame_monitor_size() +
-             // On the top frame, at all times SP <= ESP, and SP is
-             // 16-aligned.  We ensure this by adjusting SP on method
-             // entry and re-entry to allow room for the maximum size of
-             // the expression stack.  When we call another method we bump
-             // SP so that no stack space is wasted.  So, only on the top
-             // frame do we need to allow max_stack words.
-             (is_top_frame ? max_stack : temps + extra_args);
-
-  // On riscv we always keep the stack pointer 16-aligned, so we
-  // must round up here.
-  size = align_up(size, 2);
-
-  return size;
-}
-
-void AbstractInterpreter::layout_activation(Method* method,
-                                            int tempcount,
-                                            int popframe_extra_args,
-                                            int moncount,
-                                            int caller_actual_parameters,
-                                            int callee_param_count,
-                                            int callee_locals,
-                                            frame* caller,
-                                            frame* interpreter_frame,
-                                            bool is_top_frame,
-                                            bool is_bottom_frame) {
-  // The frame interpreter_frame is guaranteed to be the right size,
-  // as determined by a previous call to the size_activation() method.
-  // It is also guaranteed to be walkable even though it is in a
-  // skeletal state
-  assert_cond(method != NULL && caller != NULL && interpreter_frame != NULL);
-  int max_locals = method->max_locals() * Interpreter::stackElementWords;
-  int extra_locals = (method->max_locals() - method->size_of_parameters()) *
-    Interpreter::stackElementWords;
-
-#ifdef ASSERT
-  assert(caller->sp() == interpreter_frame->sender_sp(), "Frame not properly walkable");
-#endif
-
-  interpreter_frame->interpreter_frame_set_method(method);
-  // NOTE the difference in using sender_sp and interpreter_frame_sender_sp
-  // interpreter_frame_sender_sp is the original sp of the caller (the unextended_sp)
-  // and sender_sp is fp
-  intptr_t* locals = NULL;
-  if (caller->is_interpreted_frame()) {
-    locals = caller->interpreter_frame_last_sp() + caller_actual_parameters - 1;
-  } else {
-    locals = interpreter_frame->sender_sp() + max_locals - 1;
-  }
-
-#ifdef ASSERT
-  if (caller->is_interpreted_frame()) {
-    assert(locals < caller->fp() + frame::interpreter_frame_initial_sp_offset, "bad placement");
-  }
-#endif
-
-  interpreter_frame->interpreter_frame_set_locals(locals);
-  BasicObjectLock* montop = interpreter_frame->interpreter_frame_monitor_begin();
-  BasicObjectLock* monbot = montop - moncount;
-  interpreter_frame->interpreter_frame_set_monitor_end(monbot);
-
-  // Set last_sp
-  intptr_t* last_sp = (intptr_t*) monbot -
-    tempcount*Interpreter::stackElementWords -
-    popframe_extra_args;
-  interpreter_frame->interpreter_frame_set_last_sp(last_sp);
-
-  // All frames but the initial (oldest) interpreter frame we fill in have
-  // a value for sender_sp that allows walking the stack but isn't
-  // truly correct. Correct the value here.
-  if (extra_locals != 0 &&
-      interpreter_frame->sender_sp() ==
-      interpreter_frame->interpreter_frame_sender_sp()) {
-    interpreter_frame->set_interpreter_frame_sender_sp(caller->sp() +
-                                                       extra_locals);
-  }
-
-  *interpreter_frame->interpreter_frame_cache_addr() =
-    method->constants()->cache();
-  *interpreter_frame->interpreter_frame_mirror_addr() =
-    method->method_holder()->java_mirror();
-}

src/hotspot/cpu/riscv/assembler_riscv.cpp

@@ -1,372 +0,0 @@
-/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-
-#include "precompiled.hpp"
-#include "asm/assembler.hpp"
-#include "asm/assembler.inline.hpp"
-#include "compiler/disassembler.hpp"
-#include "interpreter/interpreter.hpp"
-#include "memory/resourceArea.hpp"
-#include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/sharedRuntime.hpp"
-
-int AbstractAssembler::code_fill_byte() {
-  return 0;
-}
-
-void Assembler::add(Register Rd, Register Rn, int64_t increment, Register temp) {
-  if (is_imm_in_range(increment, 12, 0)) {
-    addi(Rd, Rn, increment);
-  } else {
-    assert_different_registers(Rn, temp);
-    li(temp, increment);
-    add(Rd, Rn, temp);
-  }
-}
-
-void Assembler::addw(Register Rd, Register Rn, int64_t increment, Register temp) {
-  if (is_imm_in_range(increment, 12, 0)) {
-    addiw(Rd, Rn, increment);
-  } else {
-    assert_different_registers(Rn, temp);
-    li(temp, increment);
-    addw(Rd, Rn, temp);
-  }
-}
-
-void Assembler::sub(Register Rd, Register Rn, int64_t decrement, Register temp) {
-  if (is_imm_in_range(-decrement, 12, 0)) {
-    addi(Rd, Rn, -decrement);
-  } else {
-    assert_different_registers(Rn, temp);
-    li(temp, decrement);
-    sub(Rd, Rn, temp);
-  }
-}
-
-void Assembler::subw(Register Rd, Register Rn, int64_t decrement, Register temp) {
-  if (is_imm_in_range(-decrement, 12, 0)) {
-    addiw(Rd, Rn, -decrement);
-  } else {
-    assert_different_registers(Rn, temp);
-    li(temp, decrement);
-    subw(Rd, Rn, temp);
-  }
-}
-
-void Assembler::zext_w(Register Rd, Register Rs) {
-  add_uw(Rd, Rs, zr);
-}
-
-void Assembler::_li(Register Rd, int64_t imm) {
-  // int64_t is in range 0x8000 0000 0000 0000 ~ 0x7fff ffff ffff ffff
-  int shift = 12;
-  int64_t upper = imm, lower = imm;
-  // Split imm to a lower 12-bit sign-extended part and the remainder,
-  // because addi will sign-extend the lower imm.
-  lower = ((int32_t)imm << 20) >> 20;
-  upper -= lower;
-
-  // Test whether imm is a 32-bit integer.
-  if (!(((imm) & ~(int64_t)0x7fffffff) == 0 ||
-        (((imm) & ~(int64_t)0x7fffffff) == ~(int64_t)0x7fffffff))) {
-    while (((upper >> shift) & 1) == 0) { shift++; }
-    upper >>= shift;
-    li(Rd, upper);
-    slli(Rd, Rd, shift);
-    if (lower != 0) {
-      addi(Rd, Rd, lower);
-    }
-  } else {
-    // 32-bit integer
-    Register hi_Rd = zr;
-    if (upper != 0) {
-      lui(Rd, (int32_t)upper);
-      hi_Rd = Rd;
-    }
-    if (lower != 0 || hi_Rd == zr) {
-      addiw(Rd, hi_Rd, lower);
-    }
-  }
-}
-
-void Assembler::li64(Register Rd, int64_t imm) {
-   // Load upper 32 bits. upper = imm[63:32], but if imm[31] == 1 or
-   // (imm[31:28] == 0x7ff && imm[19] == 1), upper = imm[63:32] + 1.
-   int64_t lower = imm & 0xffffffff;
-   lower -= ((lower << 44) >> 44);
-   int64_t tmp_imm = ((uint64_t)(imm & 0xffffffff00000000)) + (uint64_t)lower;
-   int32_t upper = (tmp_imm - (int32_t)lower) >> 32;
-
-   // Load upper 32 bits
-   int64_t up = upper, lo = upper;
-   lo = (lo << 52) >> 52;
-   up -= lo;
-   up = (int32_t)up;
-   lui(Rd, up);
-   addi(Rd, Rd, lo);
-
-   // Load the rest 32 bits.
-   slli(Rd, Rd, 12);
-   addi(Rd, Rd, (int32_t)lower >> 20);
-   slli(Rd, Rd, 12);
-   lower = ((int32_t)imm << 12) >> 20;
-   addi(Rd, Rd, lower);
-   slli(Rd, Rd, 8);
-   lower = imm & 0xff;
-   addi(Rd, Rd, lower);
-}
-
-void Assembler::li32(Register Rd, int32_t imm) {
-  // int32_t is in range 0x8000 0000 ~ 0x7fff ffff, and imm[31] is the sign bit
-  int64_t upper = imm, lower = imm;
-  lower = (imm << 20) >> 20;
-  upper -= lower;
-  upper = (int32_t)upper;
-  // lui Rd, imm[31:12] + imm[11]
-  lui(Rd, upper);
-  // use addiw to distinguish li32 to li64
-  addiw(Rd, Rd, lower);
-}
-
-#define INSN(NAME, REGISTER)                                       \
-  void Assembler::NAME(const address &dest, Register temp) {       \
-    assert_cond(dest != NULL);                                     \
-    int64_t distance = dest - pc();                                \
-    if (is_imm_in_range(distance, 20, 1)) {                        \
-      jal(REGISTER, distance);                                     \
-    } else {                                                       \
-      assert(temp != noreg, "temp must not be empty register!");   \
-      int32_t offset = 0;                                          \
-      movptr_with_offset(temp, dest, offset);                      \
-      jalr(REGISTER, temp, offset);                                \
-    }                                                              \
-  }                                                                \
-  void Assembler::NAME(Label &l, Register temp) {                  \
-    jal(REGISTER, l, temp);                                        \
-  }                                                                \
-
-  INSN(j,   x0);
-  INSN(jal, x1);
-
-#undef INSN
-
-#define INSN(NAME, REGISTER)                                       \
-  void Assembler::NAME(Register Rs) {                              \
-    jalr(REGISTER, Rs, 0);                                         \
-  }
-
-  INSN(jr,   x0);
-  INSN(jalr, x1);
-
-#undef INSN
-
-void Assembler::ret() {
-  jalr(x0, x1, 0);
-}
-
-#define INSN(NAME, REGISTER)                                      \
-  void Assembler::NAME(const address &dest, Register temp) {      \
-    assert_cond(dest != NULL);                                    \
-    assert(temp != noreg, "temp must not be empty register!");    \
-    int64_t distance = dest - pc();                               \
-    if (is_offset_in_range(distance, 32)) {                       \
-      auipc(temp, distance + 0x800);                              \
-      jalr(REGISTER, temp, ((int32_t)distance << 20) >> 20);      \
-    } else {                                                      \
-      int32_t offset = 0;                                         \
-      movptr_with_offset(temp, dest, offset);                     \
-      jalr(REGISTER, temp, offset);                               \
-    }                                                             \
-  }
-
-  INSN(call, x1);
-  INSN(tail, x0);
-
-#undef INSN
-
-#define INSN(NAME, REGISTER)                                   \
-  void Assembler::NAME(const Address &adr, Register temp) {    \
-    switch (adr.getMode()) {                                   \
-      case Address::literal: {                                 \
-        code_section()->relocate(pc(), adr.rspec());           \
-        NAME(adr.target(), temp);                              \
-        break;                                                 \
-      }                                                        \
-      case Address::base_plus_offset: {                        \
-        int32_t offset = 0;                                    \
-        baseOffset(temp, adr, offset);                         \
-        jalr(REGISTER, temp, offset);                          \
-        break;                                                 \
-      }                                                        \
-      default:                                                 \
-        ShouldNotReachHere();                                  \
-    }                                                          \
-  }
-
-  INSN(j,    x0);
-  INSN(jal,  x1);
-  INSN(call, x1);
-  INSN(tail, x0);
-
-#undef INSN
-
-void Assembler::wrap_label(Register r1, Register r2, Label &L, compare_and_branch_insn insn,
-                           compare_and_branch_label_insn neg_insn, bool is_far) {
-  if (is_far) {
-    Label done;
-    (this->*neg_insn)(r1, r2, done, /* is_far */ false);
-    j(L);
-    bind(done);
-  } else {
-    if (L.is_bound()) {
-      (this->*insn)(r1, r2, target(L));
-    } else {
-      L.add_patch_at(code(), locator());
-      (this->*insn)(r1, r2, pc());
-    }
-  }
-}
-
-void Assembler::wrap_label(Register Rt, Label &L, Register tmp, load_insn_by_temp insn) {
-  if (L.is_bound()) {
-    (this->*insn)(Rt, target(L), tmp);
-  } else {
-    L.add_patch_at(code(), locator());
-    (this->*insn)(Rt, pc(), tmp);
-  }
-}
-
-void Assembler::wrap_label(Register Rt, Label &L, jal_jalr_insn insn) {
-  if (L.is_bound()) {
-    (this->*insn)(Rt, target(L));
-  } else {
-    L.add_patch_at(code(), locator());
-    (this->*insn)(Rt, pc());
-  }
-}
-
-void Assembler::movptr_with_offset(Register Rd, address addr, int32_t &offset) {
-  uintptr_t imm64 = (uintptr_t)addr;
-#ifndef PRODUCT
-  {
-    char buffer[64];
-    snprintf(buffer, sizeof(buffer), "0x%" PRIx64, imm64);
-    block_comment(buffer);
-  }
-#endif
-  assert(is_unsigned_imm_in_range(imm64, 47, 0) || (imm64 == (uintptr_t)-1),
-         "48-bit overflow in address constant");
-  // Load upper 32 bits
-  int32_t imm = imm64 >> 16;
-  int64_t upper = imm, lower = imm;
-  lower = (lower << 52) >> 52;
-  upper -= lower;
-  upper = (int32_t)upper;
-  lui(Rd, upper);
-  addi(Rd, Rd, lower);
-
-  // Load the rest 16 bits.
-  slli(Rd, Rd, 11);
-  addi(Rd, Rd, (imm64 >> 5) & 0x7ff);
-  slli(Rd, Rd, 5);
-
-  // This offset will be used by following jalr/ld.
-  offset = imm64 & 0x1f;
-}
-
-void Assembler::movptr(Register Rd, uintptr_t imm64) {
-  movptr(Rd, (address)imm64);
-}
-
-void Assembler::movptr(Register Rd, address addr) {
-  int offset = 0;
-  movptr_with_offset(Rd, addr, offset);
-  addi(Rd, Rd, offset);
-}
-
-void Assembler::ifence() {
-  fence_i();
-  if (UseConservativeFence) {
-    fence(ir, ir);
-  }
-}
-
-#define INSN(NAME, NEG_INSN)                                                         \
-  void Assembler::NAME(Register Rs, Register Rt, const address &dest) {              \
-    NEG_INSN(Rt, Rs, dest);                                                          \
-  }                                                                                  \
-  void Assembler::NAME(Register Rs, Register Rt, Label &l, bool is_far) {            \
-    NEG_INSN(Rt, Rs, l, is_far);                                                     \
-  }
-
-  INSN(bgt,  blt);
-  INSN(ble,  bge);
-  INSN(bgtu, bltu);
-  INSN(bleu, bgeu);
-#undef INSN
-
-#undef __
-
-Address::Address(address target, relocInfo::relocType rtype) : _base(noreg), _offset(0), _mode(literal) {
-  _target = target;
-  switch (rtype) {
-    case relocInfo::oop_type:
-    case relocInfo::metadata_type:
-      // Oops are a special case. Normally they would be their own section
-      // but in cases like icBuffer they are literals in the code stream that
-      // we don't have a section for. We use none so that we get a literal address
-      // which is always patchable.
-      break;
-    case relocInfo::external_word_type:
-      _rspec = external_word_Relocation::spec(target);
-      break;
-    case relocInfo::internal_word_type:
-      _rspec = internal_word_Relocation::spec(target);
-      break;
-    case relocInfo::opt_virtual_call_type:
-      _rspec = opt_virtual_call_Relocation::spec();
-      break;
-    case relocInfo::static_call_type:
-      _rspec = static_call_Relocation::spec();
-      break;
-    case relocInfo::runtime_call_type:
-      _rspec = runtime_call_Relocation::spec();
-      break;
-    case relocInfo::poll_type:
-    case relocInfo::poll_return_type:
-      _rspec = Relocation::spec_simple(rtype);
-      break;
-    case relocInfo::none:
-      _rspec = RelocationHolder::none;
-      break;
-    default:
-      ShouldNotReachHere();
-  }
-}

src/hotspot/cpu/riscv/assembler_riscv.inline.hpp

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_ASSEMBLER_RISCV_INLINE_HPP
-#define CPU_RISCV_ASSEMBLER_RISCV_INLINE_HPP
-
-#include "asm/assembler.inline.hpp"
-#include "asm/codeBuffer.hpp"
-#include "code/codeCache.hpp"
-
-inline bool is_imm_in_range(long value, unsigned bits, unsigned align_bits) {
-  intx sign_bits = (value >> (bits + align_bits - 1));
-  return ((value & right_n_bits(align_bits)) == 0) && ((sign_bits == 0) || (sign_bits == -1));
-}
-
-inline bool is_unsigned_imm_in_range(intx value, unsigned bits, unsigned align_bits) {
-  return (value >= 0) && ((value & right_n_bits(align_bits)) == 0) && ((value >> (align_bits + bits)) == 0);
-}
-
-inline bool is_offset_in_range(intx offset, unsigned bits) {
-  return is_imm_in_range(offset, bits, 0);
-}
-
-#endif // CPU_RISCV_ASSEMBLER_RISCV_INLINE_HPP

src/hotspot/cpu/riscv/bytes_riscv.hpp

@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2016 SAP SE. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_BYTES_RISCV_HPP
-#define CPU_RISCV_BYTES_RISCV_HPP
-
-#include "memory/allStatic.hpp"
-
-class Bytes: AllStatic {
- public:
-  // Efficient reading and writing of unaligned unsigned data in platform-specific byte ordering
-  // RISCV needs to check for alignment.
-
-  // Forward declarations of the compiler-dependent implementation
-  static inline u2 swap_u2(u2 x);
-  static inline u4 swap_u4(u4 x);
-  static inline u8 swap_u8(u8 x);
-
-  static inline u2 get_native_u2(address p) {
-    if ((intptr_t(p) & 1) == 0) {
-      return *(u2*)p;
-    } else {
-      return ((u2)(p[1]) << 8) |
-             ((u2)(p[0]));
-    }
-  }
-
-  static inline u4 get_native_u4(address p) {
-    switch (intptr_t(p) & 3) {
-      case 0:
-        return *(u4*)p;
-
-      case 2:
-        return ((u4)(((u2*)p)[1]) << 16) |
-               ((u4)(((u2*)p)[0]));
-
-      default:
-        return ((u4)(p[3]) << 24) |
-               ((u4)(p[2]) << 16) |
-               ((u4)(p[1]) <<  8) |
-               ((u4)(p[0]));
-    }
-  }
-
-  static inline u8 get_native_u8(address p) {
-    switch (intptr_t(p) & 7) {
-      case 0:
-        return *(u8*)p;
-
-      case 4:
-        return ((u8)(((u4*)p)[1]) << 32) |
-               ((u8)(((u4*)p)[0]));
-
-      case 2:
-        return ((u8)(((u2*)p)[3]) << 48) |
-               ((u8)(((u2*)p)[2]) << 32) |
-               ((u8)(((u2*)p)[1]) << 16) |
-               ((u8)(((u2*)p)[0]));
-
-      default:
-        return ((u8)(p[7]) << 56) |
-               ((u8)(p[6]) << 48) |
-               ((u8)(p[5]) << 40) |
-               ((u8)(p[4]) << 32) |
-               ((u8)(p[3]) << 24) |
-               ((u8)(p[2]) << 16) |
-               ((u8)(p[1]) <<  8) |
-               ((u8)(p[0]));
-    }
-  }
-
-  static inline void put_native_u2(address p, u2 x) {
-    if ((intptr_t(p) & 1) == 0) {
-      *(u2*)p = x;
-    } else {
-      p[1] = x >> 8;
-      p[0] = x;
-    }
-  }
-
-  static inline void put_native_u4(address p, u4 x) {
-    switch (intptr_t(p) & 3) {
-      case 0:
-        *(u4*)p = x;
-        break;
-
-      case 2:
-        ((u2*)p)[1] = x >> 16;
-        ((u2*)p)[0] = x;
-        break;
-
-      default:
-        ((u1*)p)[3] = x >> 24;
-        ((u1*)p)[2] = x >> 16;
-        ((u1*)p)[1] = x >>  8;
-        ((u1*)p)[0] = x;
-        break;
-    }
-  }
-
-  static inline void put_native_u8(address p, u8 x) {
-    switch (intptr_t(p) & 7) {
-      case 0:
-        *(u8*)p = x;
-        break;
-
-      case 4:
-        ((u4*)p)[1] = x >> 32;
-        ((u4*)p)[0] = x;
-        break;
-
-      case 2:
-        ((u2*)p)[3] = x >> 48;
-        ((u2*)p)[2] = x >> 32;
-        ((u2*)p)[1] = x >> 16;
-        ((u2*)p)[0] = x;
-        break;
-
-      default:
-        ((u1*)p)[7] = x >> 56;
-        ((u1*)p)[6] = x >> 48;
-        ((u1*)p)[5] = x >> 40;
-        ((u1*)p)[4] = x >> 32;
-        ((u1*)p)[3] = x >> 24;
-        ((u1*)p)[2] = x >> 16;
-        ((u1*)p)[1] = x >>  8;
-        ((u1*)p)[0] = x;
-        break;
-    }
-  }
-
-  // Efficient reading and writing of unaligned unsigned data in Java byte ordering (i.e. big-endian ordering)
-  static inline u2 get_Java_u2(address p) { return swap_u2(get_native_u2(p)); }
-  static inline u4 get_Java_u4(address p) { return swap_u4(get_native_u4(p)); }
-  static inline u8 get_Java_u8(address p) { return swap_u8(get_native_u8(p)); }
-
-  static inline void put_Java_u2(address p, u2 x) { put_native_u2(p, swap_u2(x)); }
-  static inline void put_Java_u4(address p, u4 x) { put_native_u4(p, swap_u4(x)); }
-  static inline void put_Java_u8(address p, u8 x) { put_native_u8(p, swap_u8(x)); }
-};
-
-#include OS_CPU_HEADER(bytes)
-
-#endif // CPU_RISCV_BYTES_RISCV_HPP

src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp

@@ -1,353 +0,0 @@
-/*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "asm/macroAssembler.inline.hpp"
-#include "c1/c1_CodeStubs.hpp"
-#include "c1/c1_FrameMap.hpp"
-#include "c1/c1_LIRAssembler.hpp"
-#include "c1/c1_MacroAssembler.hpp"
-#include "c1/c1_Runtime1.hpp"
-#include "classfile/javaClasses.hpp"
-#include "nativeInst_riscv.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "vmreg_riscv.inline.hpp"
-
-
-#define __ ce->masm()->
-
-void C1SafepointPollStub::emit_code(LIR_Assembler* ce) {
-  __ bind(_entry);
-  InternalAddress safepoint_pc(__ pc() - __ offset() + safepoint_offset());
-  __ code_section()->relocate(__ pc(), safepoint_pc.rspec());
-  __ la(t0, safepoint_pc.target());
-  __ sd(t0, Address(xthread, JavaThread::saved_exception_pc_offset()));
-
-  assert(SharedRuntime::polling_page_return_handler_blob() != NULL,
-         "polling page return stub not created yet");
-  address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
-
-  __ far_jump(RuntimeAddress(stub));
-}
-
-void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
-  __ bind(_entry);
-  Metadata *m = _method->as_constant_ptr()->as_metadata();
-  __ mov_metadata(t0, m);
-  ce->store_parameter(t0, 1);
-  ce->store_parameter(_bci, 0);
-  __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::counter_overflow_id)));
-  ce->add_call_info_here(_info);
-  ce->verify_oop_map(_info);
-  __ j(_continuation);
-}
-
-RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, LIR_Opr array)
-  : _index(index), _array(array), _throw_index_out_of_bounds_exception(false) {
-  assert(info != NULL, "must have info");
-  _info = new CodeEmitInfo(info);
-}
-
-RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index)
-  : _index(index), _array(NULL), _throw_index_out_of_bounds_exception(true) {
-  assert(info != NULL, "must have info");
-  _info = new CodeEmitInfo(info);
-}
-
-void RangeCheckStub::emit_code(LIR_Assembler* ce) {
-  __ bind(_entry);
-  if (_info->deoptimize_on_exception()) {
-    address a = Runtime1::entry_for(Runtime1::predicate_failed_trap_id);
-    __ far_call(RuntimeAddress(a));
-    ce->add_call_info_here(_info);
-    ce->verify_oop_map(_info);
-    debug_only(__ should_not_reach_here());
-    return;
-  }
-
-  if (_index->is_cpu_register()) {
-    __ mv(t0, _index->as_register());
-  } else {
-    __ mv(t0, _index->as_jint());
-  }
-  Runtime1::StubID stub_id;
-  if (_throw_index_out_of_bounds_exception) {
-    stub_id = Runtime1::throw_index_exception_id;
-  } else {
-    assert(_array != NULL, "sanity");
-    __ mv(t1, _array->as_pointer_register());
-    stub_id = Runtime1::throw_range_check_failed_id;
-  }
-  int32_t off = 0;
-  __ la_patchable(ra, RuntimeAddress(Runtime1::entry_for(stub_id)), off);
-  __ jalr(ra, ra, off);
-  ce->add_call_info_here(_info);
-  ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
-}
-
-PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
-  _info = new CodeEmitInfo(info);
-}
-
-void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
-  __ bind(_entry);
-  address a = Runtime1::entry_for(Runtime1::predicate_failed_trap_id);
-  __ far_call(RuntimeAddress(a));
-  ce->add_call_info_here(_info);
-  ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
-}
-
-void DivByZeroStub::emit_code(LIR_Assembler* ce) {
-  if (_offset != -1) {
-    ce->compilation()->implicit_exception_table()->append(_offset, __ offset());
-  }
-  __ bind(_entry);
-  __ far_call(Address(Runtime1::entry_for(Runtime1::throw_div0_exception_id), relocInfo::runtime_call_type));
-  ce->add_call_info_here(_info);
-  ce->verify_oop_map(_info);
-#ifdef ASSERT
-  __ should_not_reach_here();
-#endif
-}
-
-// Implementation of NewInstanceStub
-NewInstanceStub::NewInstanceStub(LIR_Opr klass_reg, LIR_Opr result, ciInstanceKlass* klass, CodeEmitInfo* info, Runtime1::StubID stub_id) {
-  _result = result;
-  _klass = klass;
-  _klass_reg = klass_reg;
-  _info = new CodeEmitInfo(info);
-  assert(stub_id == Runtime1::new_instance_id                 ||
-         stub_id == Runtime1::fast_new_instance_id            ||
-         stub_id == Runtime1::fast_new_instance_init_check_id,
-         "need new_instance id");
-  _stub_id = stub_id;
-}
-
-void NewInstanceStub::emit_code(LIR_Assembler* ce) {
-  assert(__ rsp_offset() == 0, "frame size should be fixed");
-  __ bind(_entry);
-  __ mv(x13, _klass_reg->as_register());
-  __ far_call(RuntimeAddress(Runtime1::entry_for(_stub_id)));
-  ce->add_call_info_here(_info);
-  ce->verify_oop_map(_info);
-  assert(_result->as_register() == x10, "result must in x10");
-  __ j(_continuation);
-}
-
-// Implementation of NewTypeArrayStub
-NewTypeArrayStub::NewTypeArrayStub(LIR_Opr klass_reg, LIR_Opr length, LIR_Opr result, CodeEmitInfo* info) {
-  _klass_reg = klass_reg;
-  _length = length;
-  _result = result;
-  _info = new CodeEmitInfo(info);
-}
-
-void NewTypeArrayStub::emit_code(LIR_Assembler* ce) {
-  assert(__ rsp_offset() == 0, "frame size should be fixed");
-  __ bind(_entry);
-  assert(_length->as_register() == x9, "length must in x9");
-  assert(_klass_reg->as_register() == x13, "klass_reg must in x13");
-  __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::new_type_array_id)));
-  ce->add_call_info_here(_info);
-  ce->verify_oop_map(_info);
-  assert(_result->as_register() == x10, "result must in x10");
-  __ j(_continuation);
-}
-
-// Implementation of NewObjectArrayStub
-NewObjectArrayStub::NewObjectArrayStub(LIR_Opr klass_reg, LIR_Opr length, LIR_Opr result, CodeEmitInfo* info) {
-  _klass_reg = klass_reg;
-  _result = result;
-  _length = length;
-  _info = new CodeEmitInfo(info);
-}
-
-void NewObjectArrayStub::emit_code(LIR_Assembler* ce) {
-  assert(__ rsp_offset() == 0, "frame size should be fixed");
-  __ bind(_entry);
-  assert(_length->as_register() == x9, "length must in x9");
-  assert(_klass_reg->as_register() == x13, "klass_reg must in x13");
-  __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::new_object_array_id)));
-  ce->add_call_info_here(_info);
-  ce->verify_oop_map(_info);
-  assert(_result->as_register() == x10, "result must in x10");
-  __ j(_continuation);
-}
-
-// Implementation of MonitorAccessStubs
-MonitorEnterStub::MonitorEnterStub(LIR_Opr obj_reg, LIR_Opr lock_reg, CodeEmitInfo* info)
-: MonitorAccessStub(obj_reg, lock_reg) {
-  _info = new CodeEmitInfo(info);
-}
-
-void MonitorEnterStub::emit_code(LIR_Assembler* ce) {
-  assert(__ rsp_offset() == 0, "frame size should be fixed");
-  __ bind(_entry);
-  ce->store_parameter(_obj_reg->as_register(),  1);
-  ce->store_parameter(_lock_reg->as_register(), 0);
-  Runtime1::StubID enter_id;
-  if (ce->compilation()->has_fpu_code()) {
-    enter_id = Runtime1::monitorenter_id;
-  } else {
-    enter_id = Runtime1::monitorenter_nofpu_id;
-  }
-  __ far_call(RuntimeAddress(Runtime1::entry_for(enter_id)));
-  ce->add_call_info_here(_info);
-  ce->verify_oop_map(_info);
-  __ j(_continuation);
-}
-
-void MonitorExitStub::emit_code(LIR_Assembler* ce) {
-  __ bind(_entry);
-  if (_compute_lock) {
-    // lock_reg was destroyed by fast unlocking attempt => recompute it
-    ce->monitor_address(_monitor_ix, _lock_reg);
-  }
-  ce->store_parameter(_lock_reg->as_register(), 0);
-  // note: non-blocking leaf routine => no call info needed
-  Runtime1::StubID exit_id;
-  if (ce->compilation()->has_fpu_code()) {
-    exit_id = Runtime1::monitorexit_id;
-  } else {
-    exit_id = Runtime1::monitorexit_nofpu_id;
-  }
-  __ la(ra, _continuation);
-  __ far_jump(RuntimeAddress(Runtime1::entry_for(exit_id)));
-}
-
-// Implementation of patching:
-// - Copy the code at given offset to an inlined buffer (first the bytes, then the number of bytes)
-// - Replace original code with a call to the stub
-// At Runtime:
-// - call to stub, jump to runtime
-// - in runtime: preserve all registers (rspecially objects, i.e., source and destination object)
-// - in runtime: after initializing class, restore original code, reexecute instruction
-
-int PatchingStub::_patch_info_offset = -NativeGeneralJump::instruction_size;
-
-void PatchingStub::align_patch_site(MacroAssembler* masm) {}
-
-void PatchingStub::emit_code(LIR_Assembler* ce) {
-  assert(false, "RISCV should not use C1 runtime patching");
-}
-
-void DeoptimizeStub::emit_code(LIR_Assembler* ce) {
-  __ bind(_entry);
-  ce->store_parameter(_trap_request, 0);
-  __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::deoptimize_id)));
-  ce->add_call_info_here(_info);
-  DEBUG_ONLY(__ should_not_reach_here());
-}
-
-void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
-  address a = NULL;
-  if (_info->deoptimize_on_exception()) {
-    // Deoptimize, do not throw the exception, because it is probably wrong to do it here.
-    a = Runtime1::entry_for(Runtime1::predicate_failed_trap_id);
-  } else {
-    a = Runtime1::entry_for(Runtime1::throw_null_pointer_exception_id);
-  }
-
-  ce->compilation()->implicit_exception_table()->append(_offset, __ offset());
-  __ bind(_entry);
-  __ far_call(RuntimeAddress(a));
-  ce->add_call_info_here(_info);
-  ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
-}
-
-void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
-  assert(__ rsp_offset() == 0, "frame size should be fixed");
-
-  __ bind(_entry);
-  // pass the object in a tmp register because all other registers
-  // must be preserved
-  if (_obj->is_cpu_register()) {
-    __ mv(t0, _obj->as_register());
-  }
-  __ far_call(RuntimeAddress(Runtime1::entry_for(_stub)), NULL, t1);
-  ce->add_call_info_here(_info);
-  debug_only(__ should_not_reach_here());
-}
-
-void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
-  // ---------------slow case: call to native-----------------
-  __ bind(_entry);
-  // Figure out where the args should go
-  // This should really convert the IntrinsicID to the Method* and signature
-  // but I don't know how to do that.
-  const int args_num = 5;
-  VMRegPair args[args_num];
-  BasicType signature[args_num] = { T_OBJECT, T_INT, T_OBJECT, T_INT, T_INT };
-  SharedRuntime::java_calling_convention(signature, args, args_num);
-
-  // push parameters
-  Register r[args_num];
-  r[0] = src()->as_register();
-  r[1] = src_pos()->as_register();
-  r[2] = dst()->as_register();
-  r[3] = dst_pos()->as_register();
-  r[4] = length()->as_register();
-
-  // next registers will get stored on the stack
-  for (int j = 0; j < args_num; j++) {
-    VMReg r_1 = args[j].first();
-    if (r_1->is_stack()) {
-      int st_off = r_1->reg2stack() * wordSize;
-      __ sd(r[j], Address(sp, st_off));
-    } else {
-      assert(r[j] == args[j].first()->as_Register(), "Wrong register for arg");
-    }
-  }
-
-  ce->align_call(lir_static_call);
-
-  ce->emit_static_call_stub();
-  if (ce->compilation()->bailed_out()) {
-    return; // CodeCache is full
-  }
-  Address resolve(SharedRuntime::get_resolve_static_call_stub(),
-                  relocInfo::static_call_type);
-  address call = __ trampoline_call(resolve);
-  if (call == NULL) {
-    ce->bailout("trampoline stub overflow");
-    return;
-  }
-  ce->add_call_info_here(info());
-
-#ifndef PRODUCT
-  if (PrintC1Statistics) {
-    __ la(t1, ExternalAddress((address)&Runtime1::_arraycopy_slowcase_cnt));
-    __ add_memory_int32(Address(t1), 1);
-  }
-#endif
-
-  __ j(_continuation);
-}
-
-#undef __

src/hotspot/cpu/riscv/c1_Defs_riscv.hpp

@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C1_DEFS_RISCV_HPP
-#define CPU_RISCV_C1_DEFS_RISCV_HPP
-
-// native word offsets from memory address (little endian)
-enum {
-  pd_lo_word_offset_in_bytes = 0,
-  pd_hi_word_offset_in_bytes = BytesPerWord
-};
-
-// explicit rounding operations are required to implement the strictFP mode
-enum {
-  pd_strict_fp_requires_explicit_rounding = false
-};
-
-// registers
-enum {
-  pd_nof_cpu_regs_frame_map = RegisterImpl::number_of_registers,       // number of registers used during code emission
-  pd_nof_fpu_regs_frame_map = FloatRegisterImpl::number_of_registers,  // number of float registers used during code emission
-
-  // caller saved
-  pd_nof_caller_save_cpu_regs_frame_map = 13, // number of registers killed by calls
-  pd_nof_caller_save_fpu_regs_frame_map = 32, // number of float registers killed by calls
-
-  pd_first_callee_saved_reg = pd_nof_caller_save_cpu_regs_frame_map,
-  pd_last_callee_saved_reg = 21,
-
-  pd_last_allocatable_cpu_reg = pd_nof_caller_save_cpu_regs_frame_map - 1,
-
-  pd_nof_cpu_regs_reg_alloc
-    = pd_nof_caller_save_cpu_regs_frame_map,  // number of registers that are visible to register allocator
-  pd_nof_fpu_regs_reg_alloc = 32,  // number of float registers that are visible to register allocator
-
-  pd_nof_cpu_regs_linearscan = 32, // number of registers visible to linear scan
-  pd_nof_fpu_regs_linearscan = pd_nof_fpu_regs_frame_map, // number of float registers visible to linear scan
-  pd_nof_xmm_regs_linearscan = 0, // don't have vector registers
-
-  pd_first_cpu_reg  = 0,
-  pd_last_cpu_reg   = pd_nof_cpu_regs_reg_alloc - 1,
-  pd_first_byte_reg = 0,
-  pd_last_byte_reg  = pd_nof_cpu_regs_reg_alloc - 1,
-
-  pd_first_fpu_reg  = pd_nof_cpu_regs_frame_map,
-  pd_last_fpu_reg   = pd_first_fpu_reg + 31,
-
-  pd_first_callee_saved_fpu_reg_1 = 8 + pd_first_fpu_reg,
-  pd_last_callee_saved_fpu_reg_1  = 9 + pd_first_fpu_reg,
-  pd_first_callee_saved_fpu_reg_2 = 18 + pd_first_fpu_reg,
-  pd_last_callee_saved_fpu_reg_2  = 27 + pd_first_fpu_reg
-};
-
-
-// Encoding of float value in debug info.  This is true on x86 where
-// floats are extended to doubles when stored in the stack, false for
-// RISCV where floats and doubles are stored in their native form.
-enum {
-  pd_float_saved_as_double = false
-};
-
-#endif // CPU_RISCV_C1_DEFS_RISCV_HPP

src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.cpp

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-//--------------------------------------------------------
-//               FpuStackSim
-//--------------------------------------------------------
-
-// No FPU stack on RISCV

src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.hpp

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C1_FPUSTACKSIM_RISCV_HPP
-#define CPU_RISCV_C1_FPUSTACKSIM_RISCV_HPP
-
-// No FPU stack on RISCV
-class FpuStackSim;
-
-#endif // CPU_RISCV_C1_FPUSTACKSIM_RISCV_HPP

src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp

@@ -1,388 +0,0 @@
-/*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "c1/c1_FrameMap.hpp"
-#include "c1/c1_LIR.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "vmreg_riscv.inline.hpp"
-
-LIR_Opr FrameMap::map_to_opr(BasicType type, VMRegPair* reg, bool) {
-  LIR_Opr opr = LIR_OprFact::illegalOpr;
-  VMReg r_1 = reg->first();
-  VMReg r_2 = reg->second();
-  if (r_1->is_stack()) {
-    // Convert stack slot to an SP offset
-    // The calling convention does not count the SharedRuntime::out_preserve_stack_slots() value
-    // so we must add it in here.
-    int st_off = (r_1->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
-    opr = LIR_OprFact::address(new LIR_Address(sp_opr, st_off, type));
-  } else if (r_1->is_Register()) {
-    Register reg1 = r_1->as_Register();
-    if (r_2->is_Register() && (type == T_LONG || type == T_DOUBLE)) {
-      Register reg2 = r_2->as_Register();
-      assert(reg2 == reg1, "must be same register");
-      opr = as_long_opr(reg1);
-    } else if (is_reference_type(type)) {
-      opr = as_oop_opr(reg1);
-    } else if (type == T_METADATA) {
-      opr = as_metadata_opr(reg1);
-    } else if (type == T_ADDRESS) {
-      opr = as_address_opr(reg1);
-    } else {
-      opr = as_opr(reg1);
-    }
-  } else if (r_1->is_FloatRegister()) {
-    assert(type == T_DOUBLE || type == T_FLOAT, "wrong type");
-    int num = r_1->as_FloatRegister()->encoding();
-    if (type == T_FLOAT) {
-      opr = LIR_OprFact::single_fpu(num);
-    } else {
-      opr = LIR_OprFact::double_fpu(num);
-    }
-  } else {
-    ShouldNotReachHere();
-  }
-  return opr;
-}
-
-LIR_Opr FrameMap::zr_opr;
-LIR_Opr FrameMap::r1_opr;
-LIR_Opr FrameMap::r2_opr;
-LIR_Opr FrameMap::r3_opr;
-LIR_Opr FrameMap::r4_opr;
-LIR_Opr FrameMap::r5_opr;
-LIR_Opr FrameMap::r6_opr;
-LIR_Opr FrameMap::r7_opr;
-LIR_Opr FrameMap::r8_opr;
-LIR_Opr FrameMap::r9_opr;
-LIR_Opr FrameMap::r10_opr;
-LIR_Opr FrameMap::r11_opr;
-LIR_Opr FrameMap::r12_opr;
-LIR_Opr FrameMap::r13_opr;
-LIR_Opr FrameMap::r14_opr;
-LIR_Opr FrameMap::r15_opr;
-LIR_Opr FrameMap::r16_opr;
-LIR_Opr FrameMap::r17_opr;
-LIR_Opr FrameMap::r18_opr;
-LIR_Opr FrameMap::r19_opr;
-LIR_Opr FrameMap::r20_opr;
-LIR_Opr FrameMap::r21_opr;
-LIR_Opr FrameMap::r22_opr;
-LIR_Opr FrameMap::r23_opr;
-LIR_Opr FrameMap::r24_opr;
-LIR_Opr FrameMap::r25_opr;
-LIR_Opr FrameMap::r26_opr;
-LIR_Opr FrameMap::r27_opr;
-LIR_Opr FrameMap::r28_opr;
-LIR_Opr FrameMap::r29_opr;
-LIR_Opr FrameMap::r30_opr;
-LIR_Opr FrameMap::r31_opr;
-
-LIR_Opr FrameMap::fp_opr;
-LIR_Opr FrameMap::sp_opr;
-
-LIR_Opr FrameMap::receiver_opr;
-
-LIR_Opr FrameMap::zr_oop_opr;
-LIR_Opr FrameMap::r1_oop_opr;
-LIR_Opr FrameMap::r2_oop_opr;
-LIR_Opr FrameMap::r3_oop_opr;
-LIR_Opr FrameMap::r4_oop_opr;
-LIR_Opr FrameMap::r5_oop_opr;
-LIR_Opr FrameMap::r6_oop_opr;
-LIR_Opr FrameMap::r7_oop_opr;
-LIR_Opr FrameMap::r8_oop_opr;
-LIR_Opr FrameMap::r9_oop_opr;
-LIR_Opr FrameMap::r10_oop_opr;
-LIR_Opr FrameMap::r11_oop_opr;
-LIR_Opr FrameMap::r12_oop_opr;
-LIR_Opr FrameMap::r13_oop_opr;
-LIR_Opr FrameMap::r14_oop_opr;
-LIR_Opr FrameMap::r15_oop_opr;
-LIR_Opr FrameMap::r16_oop_opr;
-LIR_Opr FrameMap::r17_oop_opr;
-LIR_Opr FrameMap::r18_oop_opr;
-LIR_Opr FrameMap::r19_oop_opr;
-LIR_Opr FrameMap::r20_oop_opr;
-LIR_Opr FrameMap::r21_oop_opr;
-LIR_Opr FrameMap::r22_oop_opr;
-LIR_Opr FrameMap::r23_oop_opr;
-LIR_Opr FrameMap::r24_oop_opr;
-LIR_Opr FrameMap::r25_oop_opr;
-LIR_Opr FrameMap::r26_oop_opr;
-LIR_Opr FrameMap::r27_oop_opr;
-LIR_Opr FrameMap::r28_oop_opr;
-LIR_Opr FrameMap::r29_oop_opr;
-LIR_Opr FrameMap::r30_oop_opr;
-LIR_Opr FrameMap::r31_oop_opr;
-
-LIR_Opr FrameMap::t0_opr;
-LIR_Opr FrameMap::t1_opr;
-LIR_Opr FrameMap::t0_long_opr;
-LIR_Opr FrameMap::t1_long_opr;
-
-LIR_Opr FrameMap::r10_metadata_opr;
-LIR_Opr FrameMap::r11_metadata_opr;
-LIR_Opr FrameMap::r12_metadata_opr;
-LIR_Opr FrameMap::r13_metadata_opr;
-LIR_Opr FrameMap::r14_metadata_opr;
-LIR_Opr FrameMap::r15_metadata_opr;
-
-LIR_Opr FrameMap::long10_opr;
-LIR_Opr FrameMap::long11_opr;
-LIR_Opr FrameMap::fpu10_float_opr;
-LIR_Opr FrameMap::fpu10_double_opr;
-
-LIR_Opr FrameMap::_caller_save_cpu_regs[] = { 0, };
-LIR_Opr FrameMap::_caller_save_fpu_regs[] = { 0, };
-
-//--------------------------------------------------------
-//               FrameMap
-//--------------------------------------------------------
-// |---f31--|
-// |---..---|
-// |---f28--|
-// |---f27--|<---pd_last_callee_saved_fpu_reg_2
-// |---..---|
-// |---f18--|<---pd_first_callee_saved_fpu_reg_2
-// |---f17--|
-// |---..---|
-// |---f10--|
-// |---f9---|<---pd_last_callee_saved_fpu_reg_1
-// |---f8---|<---pd_first_callee_saved_fpu_reg_1
-// |---f7---|
-// |---..---|
-// |---f0---|
-// |---x27--|
-// |---x23--|
-// |---x8---|
-// |---x4---|
-// |---x3---|
-// |---x2---|
-// |---x1---|
-// |---x0---|
-// |---x26--|<---pd_last_callee_saved_reg
-// |---..---|
-// |---x18--|
-// |---x9---|<---pd_first_callee_saved_reg
-// |---x31--|
-// |---..---|
-// |---x28--|
-// |---x17--|
-// |---..---|
-// |---x10--|
-// |---x7---|
-
-void FrameMap::initialize() {
-  assert(!_init_done, "once");
-
-  int i = 0;
-
-  // caller save register
-  map_register(i, x7);  r7_opr  = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x10); r10_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x11); r11_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x12); r12_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x13); r13_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x14); r14_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x15); r15_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x16); r16_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x17); r17_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x28); r28_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x29); r29_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x30); r30_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x31); r31_opr = LIR_OprFact::single_cpu(i); i++;
-
-  // callee save register
-  map_register(i, x9);  r9_opr  = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x18); r18_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x19); r19_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x20); r20_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x21); r21_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x22); r22_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x24); r24_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x25); r25_opr = LIR_OprFact::single_cpu(i); i++;
-  map_register(i, x26); r26_opr = LIR_OprFact::single_cpu(i); i++;
-
-  // special register
-  map_register(i, x0);  zr_opr  = LIR_OprFact::single_cpu(i); i++;  // zr
-  map_register(i, x1);  r1_opr  = LIR_OprFact::single_cpu(i); i++;  // ra
-  map_register(i, x2);  r2_opr  = LIR_OprFact::single_cpu(i); i++;  // sp
-  map_register(i, x3);  r3_opr  = LIR_OprFact::single_cpu(i); i++;  // gp
-  map_register(i, x4);  r4_opr  = LIR_OprFact::single_cpu(i); i++;  // thread
-  map_register(i, x8);  r8_opr  = LIR_OprFact::single_cpu(i); i++;  // fp
-  map_register(i, x23); r23_opr = LIR_OprFact::single_cpu(i); i++;  // java thread
-  map_register(i, x27); r27_opr = LIR_OprFact::single_cpu(i); i++;  // heapbase
-
-  // tmp register
-  map_register(i, x5);  r5_opr  = LIR_OprFact::single_cpu(i); i++;  // t0
-  map_register(i, x6);  r6_opr  = LIR_OprFact::single_cpu(i); i++;  // t1
-
-  t0_opr = r5_opr;
-  t1_opr = r6_opr;
-  t0_long_opr = LIR_OprFact::double_cpu(r5_opr->cpu_regnr(), r5_opr->cpu_regnr());
-  t1_long_opr = LIR_OprFact::double_cpu(r6_opr->cpu_regnr(), r6_opr->cpu_regnr());
-
-  long10_opr  = LIR_OprFact::double_cpu(r10_opr->cpu_regnr(), r10_opr->cpu_regnr());
-  long11_opr  = LIR_OprFact::double_cpu(r11_opr->cpu_regnr(), r11_opr->cpu_regnr());
-
-  fpu10_float_opr   = LIR_OprFact::single_fpu(10);
-  fpu10_double_opr  = LIR_OprFact::double_fpu(10);
-
-  i = 0;
-  _caller_save_cpu_regs[i++]  = r7_opr;
-  _caller_save_cpu_regs[i++]  = r10_opr;
-  _caller_save_cpu_regs[i++]  = r11_opr;
-  _caller_save_cpu_regs[i++]  = r12_opr;
-  _caller_save_cpu_regs[i++]  = r13_opr;
-  _caller_save_cpu_regs[i++]  = r14_opr;
-  _caller_save_cpu_regs[i++]  = r15_opr;
-  _caller_save_cpu_regs[i++]  = r16_opr;
-  _caller_save_cpu_regs[i++]  = r17_opr;
-  _caller_save_cpu_regs[i++]  = r28_opr;
-  _caller_save_cpu_regs[i++]  = r29_opr;
-  _caller_save_cpu_regs[i++]  = r30_opr;
-  _caller_save_cpu_regs[i++]  = r31_opr;
-
-  _init_done = true;
-
-  zr_oop_opr  = as_oop_opr(x0);
-  r1_oop_opr  = as_oop_opr(x1);
-  r2_oop_opr  = as_oop_opr(x2);
-  r3_oop_opr  = as_oop_opr(x3);
-  r4_oop_opr  = as_oop_opr(x4);
-  r5_oop_opr  = as_oop_opr(x5);
-  r6_oop_opr  = as_oop_opr(x6);
-  r7_oop_opr  = as_oop_opr(x7);
-  r8_oop_opr  = as_oop_opr(x8);
-  r9_oop_opr  = as_oop_opr(x9);
-  r10_oop_opr = as_oop_opr(x10);
-  r11_oop_opr = as_oop_opr(x11);
-  r12_oop_opr = as_oop_opr(x12);
-  r13_oop_opr = as_oop_opr(x13);
-  r14_oop_opr = as_oop_opr(x14);
-  r15_oop_opr = as_oop_opr(x15);
-  r16_oop_opr = as_oop_opr(x16);
-  r17_oop_opr = as_oop_opr(x17);
-  r18_oop_opr = as_oop_opr(x18);
-  r19_oop_opr = as_oop_opr(x19);
-  r20_oop_opr = as_oop_opr(x20);
-  r21_oop_opr = as_oop_opr(x21);
-  r22_oop_opr = as_oop_opr(x22);
-  r23_oop_opr = as_oop_opr(x23);
-  r24_oop_opr = as_oop_opr(x24);
-  r25_oop_opr = as_oop_opr(x25);
-  r26_oop_opr = as_oop_opr(x26);
-  r27_oop_opr = as_oop_opr(x27);
-  r28_oop_opr = as_oop_opr(x28);
-  r29_oop_opr = as_oop_opr(x29);
-  r30_oop_opr = as_oop_opr(x30);
-  r31_oop_opr = as_oop_opr(x31);
-
-  r10_metadata_opr = as_metadata_opr(x10);
-  r11_metadata_opr = as_metadata_opr(x11);
-  r12_metadata_opr = as_metadata_opr(x12);
-  r13_metadata_opr = as_metadata_opr(x13);
-  r14_metadata_opr = as_metadata_opr(x14);
-  r15_metadata_opr = as_metadata_opr(x15);
-
-  sp_opr = as_pointer_opr(sp);
-  fp_opr = as_pointer_opr(fp);
-
-  VMRegPair regs;
-  BasicType sig_bt = T_OBJECT;
-  SharedRuntime::java_calling_convention(&sig_bt, &regs, 1);
-  receiver_opr = as_oop_opr(regs.first()->as_Register());
-
-  for (i = 0; i < nof_caller_save_fpu_regs; i++) {
-    _caller_save_fpu_regs[i] = LIR_OprFact::single_fpu(i);
-  }
-}
-
-
-Address FrameMap::make_new_address(ByteSize sp_offset) const {
-  return Address(sp, in_bytes(sp_offset));
-}
-
-
-// ----------------mapping-----------------------
-// all mapping is based on fp addressing, except for simple leaf methods where we access
-// the locals sp based (and no frame is built)
-
-
-// Frame for simple leaf methods (quick entries)
-//
-//   +----------+
-//   | ret addr |   <- TOS
-//   +----------+
-//   | args     |
-//   | ......   |
-
-// Frame for standard methods
-//
-//   | .........|  <- TOS
-//   | locals   |
-//   +----------+
-//   |  old fp, |
-//   +----------+
-//   | ret addr |
-//   +----------+
-//   |  args    |  <- FP
-//   | .........|
-
-
-// For OopMaps, map a local variable or spill index to an VMRegImpl name.
-// This is the offset from sp() in the frame of the slot for the index,
-// skewed by VMRegImpl::stack0 to indicate a stack location (vs.a register.)
-//
-//           framesize +
-//           stack0         stack0          0  <- VMReg
-//             |              | <registers> |
-//  ...........|..............|.............|
-//      0 1 2 3 x x 4 5 6 ... |                <- local indices
-//      ^           ^        sp()                 ( x x indicate link
-//      |           |                               and return addr)
-//  arguments   non-argument locals
-
-
-VMReg FrameMap::fpu_regname (int n) {
-  // Return the OptoReg name for the fpu stack slot "n"
-  // A spilled fpu stack slot comprises to two single-word OptoReg's.
-  return as_FloatRegister(n)->as_VMReg();
-}
-
-LIR_Opr FrameMap::stack_pointer() {
-  return FrameMap::sp_opr;
-}
-
-// JSR 292
-LIR_Opr FrameMap::method_handle_invoke_SP_save_opr() {
-  return LIR_OprFact::illegalOpr;  // Not needed on riscv
-}
-
-bool FrameMap::validate_frame() {
-  return true;
-}

src/hotspot/cpu/riscv/c1_FrameMap_riscv.hpp

@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C1_FRAMEMAP_RISCV_HPP
-#define CPU_RISCV_C1_FRAMEMAP_RISCV_HPP
-
-//  On RISCV the frame looks as follows:
-//
-//  +-----------------------------+---------+----------------------------------------+----------------+-----------
-//  | size_arguments-nof_reg_args | 2 words | size_locals-size_arguments+numreg_args | _size_monitors | spilling .
-//  +-----------------------------+---------+----------------------------------------+----------------+-----------
-
- public:
-  static const int pd_c_runtime_reserved_arg_size;
-
-  enum {
-    first_available_sp_in_frame = 0,
-    frame_pad_in_bytes = 16,
-    nof_reg_args = 8
-  };
-
- public:
-  static LIR_Opr receiver_opr;
-
-  static LIR_Opr zr_opr;
-  static LIR_Opr r1_opr;
-  static LIR_Opr r2_opr;
-  static LIR_Opr r3_opr;
-  static LIR_Opr r4_opr;
-  static LIR_Opr r5_opr;
-  static LIR_Opr r6_opr;
-  static LIR_Opr r7_opr;
-  static LIR_Opr r8_opr;
-  static LIR_Opr r9_opr;
-  static LIR_Opr r10_opr;
-  static LIR_Opr r11_opr;
-  static LIR_Opr r12_opr;
-  static LIR_Opr r13_opr;
-  static LIR_Opr r14_opr;
-  static LIR_Opr r15_opr;
-  static LIR_Opr r16_opr;
-  static LIR_Opr r17_opr;
-  static LIR_Opr r18_opr;
-  static LIR_Opr r19_opr;
-  static LIR_Opr r20_opr;
-  static LIR_Opr r21_opr;
-  static LIR_Opr r22_opr;
-  static LIR_Opr r23_opr;
-  static LIR_Opr r24_opr;
-  static LIR_Opr r25_opr;
-  static LIR_Opr r26_opr;
-  static LIR_Opr r27_opr;
-  static LIR_Opr r28_opr;
-  static LIR_Opr r29_opr;
-  static LIR_Opr r30_opr;
-  static LIR_Opr r31_opr;
-  static LIR_Opr fp_opr;
-  static LIR_Opr sp_opr;
-
-  static LIR_Opr zr_oop_opr;
-  static LIR_Opr r1_oop_opr;
-  static LIR_Opr r2_oop_opr;
-  static LIR_Opr r3_oop_opr;
-  static LIR_Opr r4_oop_opr;
-  static LIR_Opr r5_oop_opr;
-  static LIR_Opr r6_oop_opr;
-  static LIR_Opr r7_oop_opr;
-  static LIR_Opr r8_oop_opr;
-  static LIR_Opr r9_oop_opr;
-  static LIR_Opr r10_oop_opr;
-  static LIR_Opr r11_oop_opr;
-  static LIR_Opr r12_oop_opr;
-  static LIR_Opr r13_oop_opr;
-  static LIR_Opr r14_oop_opr;
-  static LIR_Opr r15_oop_opr;
-  static LIR_Opr r16_oop_opr;
-  static LIR_Opr r17_oop_opr;
-  static LIR_Opr r18_oop_opr;
-  static LIR_Opr r19_oop_opr;
-  static LIR_Opr r20_oop_opr;
-  static LIR_Opr r21_oop_opr;
-  static LIR_Opr r22_oop_opr;
-  static LIR_Opr r23_oop_opr;
-  static LIR_Opr r24_oop_opr;
-  static LIR_Opr r25_oop_opr;
-  static LIR_Opr r26_oop_opr;
-  static LIR_Opr r27_oop_opr;
-  static LIR_Opr r28_oop_opr;
-  static LIR_Opr r29_oop_opr;
-  static LIR_Opr r30_oop_opr;
-  static LIR_Opr r31_oop_opr;
-
-  static LIR_Opr t0_opr;
-  static LIR_Opr t1_opr;
-  static LIR_Opr t0_long_opr;
-  static LIR_Opr t1_long_opr;
-
-  static LIR_Opr r10_metadata_opr;
-  static LIR_Opr r11_metadata_opr;
-  static LIR_Opr r12_metadata_opr;
-  static LIR_Opr r13_metadata_opr;
-  static LIR_Opr r14_metadata_opr;
-  static LIR_Opr r15_metadata_opr;
-
-  static LIR_Opr long10_opr;
-  static LIR_Opr long11_opr;
-  static LIR_Opr fpu10_float_opr;
-  static LIR_Opr fpu10_double_opr;
-
-  static LIR_Opr as_long_opr(Register r) {
-    return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r));
-  }
-  static LIR_Opr as_pointer_opr(Register r) {
-    return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r));
-  }
-
-  // VMReg name for spilled physical FPU stack slot n
-  static VMReg fpu_regname(int n);
-
-  static bool is_caller_save_register(LIR_Opr opr) { return true; }
-  static bool is_caller_save_register(Register r)  { return true; }
-
-  static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; }
-  static int last_cpu_reg()             { return pd_last_cpu_reg; }
-
-#endif // CPU_RISCV_C1_FRAMEMAP_RISCV_HPP

src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp

@@ -1,281 +0,0 @@
-/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "asm/assembler.hpp"
-#include "c1/c1_LIRAssembler.hpp"
-#include "c1/c1_MacroAssembler.hpp"
-
-#ifndef PRODUCT
-#define COMMENT(x)   do { __ block_comment(x); } while (0)
-#else
-#define COMMENT(x)
-#endif
-
-#define __ _masm->
-
-void LIR_Assembler::arithmetic_idiv(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr illegal,
-                                    LIR_Opr result, CodeEmitInfo* info) {
-  // opcode check
-  assert((code == lir_idiv) || (code == lir_irem), "opcode must be idiv or irem");
-  bool is_irem = (code == lir_irem);
-  // opreand check
-  assert(left->is_single_cpu(), "left must be a register");
-  assert(right->is_single_cpu() || right->is_constant(), "right must be a register or constant");
-  assert(result->is_single_cpu(), "result must be a register");
-  Register lreg = left->as_register();
-  Register dreg = result->as_register();
-
-  // power-of-2 constant check and codegen
-  if (right->is_constant()) {
-    int c = right->as_constant_ptr()->as_jint();
-    assert(c > 0 && is_power_of_2(c), "divisor must be power-of-2 constant");
-    if (is_irem) {
-      if (c == 1) {
-        // move 0 to dreg if divisor is 1
-        __ mv(dreg, zr);
-      } else {
-        unsigned int shift = exact_log2(c);
-        __ sraiw(t0, lreg, 0x1f);
-        __ srliw(t0, t0, BitsPerInt - shift);
-        __ addw(t1, lreg, t0);
-        if (is_imm_in_range(c - 1, 12, 0)) {
-          __ andi(t1, t1, c - 1);
-        } else {
-          __ zero_extend(t1, t1, shift);
-        }
-        __ subw(dreg, t1, t0);
-      }
-    } else {
-      if (c == 1) {
-        // move lreg to dreg if divisor is 1
-        __ mv(dreg, lreg);
-      } else {
-        unsigned int shift = exact_log2(c);
-        __ sraiw(t0, lreg, 0x1f);
-        if (is_imm_in_range(c - 1, 12, 0)) {
-          __ andi(t0, t0, c - 1);
-        } else {
-          __ zero_extend(t0, t0, shift);
-        }
-        __ addw(dreg, t0, lreg);
-        __ sraiw(dreg, dreg, shift);
-      }
-    }
-  } else {
-    Register rreg = right->as_register();
-    __ corrected_idivl(dreg, lreg, rreg, is_irem);
-  }
-}
-
-void LIR_Assembler::arith_op_single_cpu_right_constant(LIR_Code code, LIR_Opr left, LIR_Opr right,
-                                                       Register lreg, Register dreg) {
-  // cpu register - constant
-  jlong c;
-
-  switch (right->type()) {
-    case T_LONG:
-      c = right->as_constant_ptr()->as_jlong(); break;
-    case T_INT:     // fall through
-    case T_ADDRESS:
-      c = right->as_constant_ptr()->as_jint(); break;
-    default:
-      ShouldNotReachHere();
-      c = 0;   // unreachable
-  }
-
-  assert(code == lir_add || code == lir_sub, "mismatched arithmetic op");
-  if (c == 0 && dreg == lreg) {
-    COMMENT("effective nop elided");
-    return;
-  }
-  switch (left->type()) {
-    case T_INT:
-      switch (code) {
-        case lir_add: __ addw(dreg, lreg, c); break;
-        case lir_sub: __ subw(dreg, lreg, c); break;
-        default:      ShouldNotReachHere();
-      }
-    break;
-    case T_OBJECT:  // fall through
-    case T_ADDRESS:
-      switch (code) {
-        case lir_add: __ add(dreg, lreg, c); break;
-        case lir_sub: __ sub(dreg, lreg, c); break;
-        default:      ShouldNotReachHere();
-      }
-    break;
-    default:
-      ShouldNotReachHere();
-  }
-}
-
-void LIR_Assembler::arith_op_single_cpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest) {
-  Register lreg = left->as_register();
-  Register dreg = as_reg(dest);
-
-  if (right->is_single_cpu()) {
-    // cpu register - cpu register
-    assert(left->type() == T_INT && right->type() == T_INT && dest->type() == T_INT, "should be");
-    Register rreg = right->as_register();
-    switch (code) {
-      case lir_add: __ addw(dest->as_register(), lreg, rreg); break;
-      case lir_sub: __ subw(dest->as_register(), lreg, rreg); break;
-      case lir_mul: __ mulw(dest->as_register(), lreg, rreg); break;
-      default:      ShouldNotReachHere();
-    }
-  } else if (right->is_double_cpu()) {
-    Register rreg = right->as_register_lo();
-    // sigle_cpu + double_cpu; can happen with obj_long
-    assert(code == lir_add || code == lir_sub, "mismatched arithmetic op");
-    switch (code) {
-      case lir_add: __ add(dreg, lreg, rreg); break;
-      case lir_sub: __ sub(dreg, lreg, rreg); break;
-      default:      ShouldNotReachHere();
-    }
-  } else if (right->is_constant()) {
-    arith_op_single_cpu_right_constant(code, left, right, lreg, dreg);
-  } else {
-    ShouldNotReachHere();
-  }
-}
-
-void LIR_Assembler::arith_op_double_cpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest) {
-  Register lreg_lo = left->as_register_lo();
-
-  if (right->is_double_cpu()) {
-    // cpu register - cpu register
-    Register rreg_lo = right->as_register_lo();
-    switch (code) {
-      case lir_add: __ add(dest->as_register_lo(), lreg_lo, rreg_lo); break;
-      case lir_sub: __ sub(dest->as_register_lo(), lreg_lo, rreg_lo); break;
-      case lir_mul: __ mul(dest->as_register_lo(), lreg_lo, rreg_lo); break;
-      case lir_div: __ corrected_idivq(dest->as_register_lo(), lreg_lo, rreg_lo, false); break;
-      case lir_rem: __ corrected_idivq(dest->as_register_lo(), lreg_lo, rreg_lo, true); break;
-      default:
-        ShouldNotReachHere();
-    }
-  } else if (right->is_constant()) {
-    jlong c = right->as_constant_ptr()->as_jlong();
-    Register dreg = as_reg(dest);
-    switch (code) {
-      case lir_add: // fall through
-      case lir_sub:
-        if (c == 0 && dreg == lreg_lo) {
-          COMMENT("effective nop elided");
-          return;
-        }
-        code == lir_add ? __ add(dreg, lreg_lo, c) : __ sub(dreg, lreg_lo, c);
-        break;
-      case lir_div:
-        assert(c > 0 && is_power_of_2(c), "divisor must be power-of-2 constant");
-        if (c == 1) {
-          // move lreg_lo to dreg if divisor is 1
-          __ mv(dreg, lreg_lo);
-        } else {
-          unsigned int shift = exact_log2_long(c);
-          // use t0 as intermediate result register
-          __ srai(t0, lreg_lo, 0x3f);
-          if (is_imm_in_range(c - 1, 12, 0)) {
-            __ andi(t0, t0, c - 1);
-          } else {
-            __ zero_extend(t0, t0, shift);
-          }
-          __ add(dreg, t0, lreg_lo);
-          __ srai(dreg, dreg, shift);
-        }
-        break;
-      case lir_rem:
-        assert(c > 0 && is_power_of_2(c), "divisor must be power-of-2 constant");
-        if (c == 1) {
-          // move 0 to dreg if divisor is 1
-          __ mv(dreg, zr);
-        } else {
-          unsigned int shift = exact_log2_long(c);
-          __ srai(t0, lreg_lo, 0x3f);
-          __ srli(t0, t0, BitsPerLong - shift);
-          __ add(t1, lreg_lo, t0);
-          if (is_imm_in_range(c - 1, 12, 0)) {
-            __ andi(t1, t1, c - 1);
-          } else {
-            __ zero_extend(t1, t1, shift);
-          }
-          __ sub(dreg, t1, t0);
-        }
-        break;
-      default:
-        ShouldNotReachHere();
-    }
-  } else {
-    ShouldNotReachHere();
-  }
-}
-
-void LIR_Assembler::arith_op_single_fpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest) {
-  assert(right->is_single_fpu(), "right hand side of float arithmetics needs to be float register");
-  switch (code) {
-    case lir_add: __ fadd_s(dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
-    case lir_sub: __ fsub_s(dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
-    case lir_mul: __ fmul_s(dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
-    case lir_div: __ fdiv_s(dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
-    default:
-      ShouldNotReachHere();
-  }
-}
-
-void LIR_Assembler::arith_op_double_fpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest) {
-  if (right->is_double_fpu()) {
-    // fpu register - fpu register
-    switch (code) {
-      case lir_add: __ fadd_d(dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
-      case lir_sub: __ fsub_d(dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
-      case lir_mul: __ fmul_d(dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
-      case lir_div: __ fdiv_d(dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
-      default:
-        ShouldNotReachHere();
-    }
-  } else {
-    ShouldNotReachHere();
-  }
-}
-
-void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest,
-                             CodeEmitInfo* info, bool pop_fpu_stack) {
-  assert(info == NULL, "should never be used, idiv/irem and ldiv/lrem not handled by this method");
-
-  if (left->is_single_cpu()) {
-    arith_op_single_cpu(code, left, right, dest);
-  } else if (left->is_double_cpu()) {
-    arith_op_double_cpu(code, left, right, dest);
-  } else if (left->is_single_fpu()) {
-    arith_op_single_fpu(code, left, right, dest);
-  } else if (left->is_double_fpu()) {
-    arith_op_double_fpu(code, left, right, dest);
-  } else {
-    ShouldNotReachHere();
-  }
-}
-
-#undef __

src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.hpp

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C1_LIRASSEMBLER_ARITH_RISCV_HPP
-#define CPU_RISCV_C1_LIRASSEMBLER_ARITH_RISCV_HPP
-
-  // arith_op sub functions
-  void arith_op_single_cpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest);
-  void arith_op_double_cpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest);
-  void arith_op_single_fpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest);
-  void arith_op_double_fpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest);
-  void arith_op_single_cpu_right_constant(LIR_Code code, LIR_Opr left, LIR_Opr right, Register lreg, Register dreg);
-  void arithmetic_idiv(LIR_Op3* op, bool is_irem);
-
-#endif // CPU_RISCV_C1_LIRASSEMBLER_ARITH_RISCV_HPP

src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.cpp

@@ -1,388 +0,0 @@
-/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "asm/assembler.hpp"
-#include "c1/c1_LIRAssembler.hpp"
-#include "c1/c1_MacroAssembler.hpp"
-#include "ci/ciArrayKlass.hpp"
-#include "oops/objArrayKlass.hpp"
-#include "runtime/stubRoutines.hpp"
-
-#define __ _masm->
-
-
-void LIR_Assembler::generic_arraycopy(Register src, Register src_pos, Register length,
-                                      Register dst, Register dst_pos, CodeStub *stub) {
-  assert(src == x11 && src_pos == x12, "mismatch in calling convention");
-  // Save the arguments in case the generic arraycopy fails and we
-  // have to fall back to the JNI stub
-  arraycopy_store_args(src, src_pos, length, dst, dst_pos);
-
-  address copyfunc_addr = StubRoutines::generic_arraycopy();
-  assert(copyfunc_addr != NULL, "generic arraycopy stub required");
-
-  // The arguments are in java calling convention so we shift them
-  // to C convention
-  assert_different_registers(c_rarg0, j_rarg1, j_rarg2, j_rarg3, j_rarg4);
-  __ mv(c_rarg0, j_rarg0);
-  assert_different_registers(c_rarg1, j_rarg2, j_rarg3, j_rarg4);
-  __ mv(c_rarg1, j_rarg1);
-  assert_different_registers(c_rarg2, j_rarg3, j_rarg4);
-  __ mv(c_rarg2, j_rarg2);
-  assert_different_registers(c_rarg3, j_rarg4);
-  __ mv(c_rarg3, j_rarg3);
-  __ mv(c_rarg4, j_rarg4);
-#ifndef PRODUCT
-  if (PrintC1Statistics) {
-    __ add_memory_int32(ExternalAddress((address)&Runtime1::_generic_arraycopystub_cnt), 1);
-  }
-#endif
-  __ far_call(RuntimeAddress(copyfunc_addr));
-  __ beqz(x10, *stub->continuation());
-  // Reload values from the stack so they are where the stub
-  // expects them.
-  arraycopy_load_args(src, src_pos, length, dst, dst_pos);
-
-  // x10 is -1^K where K == partial copied count
-  __ xori(t0, x10, -1);
-  // adjust length down and src/end pos up by partial copied count
-  __ subw(length, length, t0);
-  __ addw(src_pos, src_pos, t0);
-  __ addw(dst_pos, dst_pos, t0);
-  __ j(*stub->entry());
-
-  __ bind(*stub->continuation());
-}
-
-void LIR_Assembler::arraycopy_simple_check(Register src, Register src_pos, Register length,
-                                           Register dst, Register dst_pos, Register tmp,
-                                           CodeStub *stub, int flags) {
-  // test for NULL
-  if (flags & LIR_OpArrayCopy::src_null_check) {
-    __ beqz(src, *stub->entry(), /* is_far */ true);
-  }
-  if (flags & LIR_OpArrayCopy::dst_null_check) {
-    __ beqz(dst, *stub->entry(), /* is_far */ true);
-  }
-
-  // If the compiler was not able to prove that exact type of the source or the destination
-  // of the arraycopy is an array type, check at runtime if the source or the destination is
-  // an instance type.
-  if (flags & LIR_OpArrayCopy::type_check) {
-    if (!(flags & LIR_OpArrayCopy::LIR_OpArrayCopy::dst_objarray)) {
-      __ load_klass(tmp, dst);
-      __ lw(t0, Address(tmp, in_bytes(Klass::layout_helper_offset())));
-      __ li(t1, Klass::_lh_neutral_value);
-      __ bge(t0, t1, *stub->entry(), /* is_far */ true);
-    }
-
-    if (!(flags & LIR_OpArrayCopy::LIR_OpArrayCopy::src_objarray)) {
-      __ load_klass(tmp, src);
-      __ lw(t0, Address(tmp, in_bytes(Klass::layout_helper_offset())));
-      __ li(t1, Klass::_lh_neutral_value);
-      __ bge(t0, t1, *stub->entry(), /* is_far */ true);
-    }
-  }
-
-  // check if negative
-  if (flags & LIR_OpArrayCopy::src_pos_positive_check) {
-    __ bltz(src_pos, *stub->entry(), /* is_far */ true);
-  }
-  if (flags & LIR_OpArrayCopy::dst_pos_positive_check) {
-    __ bltz(dst_pos, *stub->entry(), /* is_far */ true);
-  }
-  if (flags & LIR_OpArrayCopy::length_positive_check) {
-    __ bltz(length, *stub->entry(), /* is_far */ true);
-  }
-
-  if (flags & LIR_OpArrayCopy::src_range_check) {
-    __ addw(tmp, src_pos, length);
-    __ lwu(t0, Address(src, arrayOopDesc::length_offset_in_bytes()));
-    __ bgtu(tmp, t0, *stub->entry(), /* is_far */ true);
-  }
-  if (flags & LIR_OpArrayCopy::dst_range_check) {
-    __ addw(tmp, dst_pos, length);
-    __ lwu(t0, Address(dst, arrayOopDesc::length_offset_in_bytes()));
-    __ bgtu(tmp, t0, *stub->entry(), /* is_far */ true);
-  }
-}
-
-void LIR_Assembler::arraycopy_checkcast(Register src, Register src_pos, Register length,
-                                        Register dst, Register dst_pos, Register tmp,
-                                        CodeStub *stub, BasicType basic_type,
-                                        address copyfunc_addr, int flags) {
-  // src is not a sub class of dst so we have to do a
-  // per-element check.
-  int mask = LIR_OpArrayCopy::src_objarray | LIR_OpArrayCopy::dst_objarray;
-  if ((flags & mask) != mask) {
-    // Check that at least both of them object arrays.
-    assert(flags & mask, "one of the two should be known to be an object array");
-
-    if (!(flags & LIR_OpArrayCopy::src_objarray)) {
-      __ load_klass(tmp, src);
-    } else if (!(flags & LIR_OpArrayCopy::dst_objarray)) {
-      __ load_klass(tmp, dst);
-    }
-    int lh_offset = in_bytes(Klass::layout_helper_offset());
-    Address klass_lh_addr(tmp, lh_offset);
-    jint objArray_lh = Klass::array_layout_helper(T_OBJECT);
-    __ lw(t0, klass_lh_addr);
-    __ mvw(t1, objArray_lh);
-    __ bne(t0, t1, *stub->entry(), /* is_far */ true);
-  }
-
-  // Spill because stubs can use any register they like and it's
-  // easier to restore just those that we care about.
-  arraycopy_store_args(src, src_pos, length, dst, dst_pos);
-  arraycopy_checkcast_prepare_params(src, src_pos, length, dst, dst_pos, basic_type);
-  __ far_call(RuntimeAddress(copyfunc_addr));
-
-#ifndef PRODUCT
-  if (PrintC1Statistics) {
-    Label failed;
-    __ bnez(x10, failed);
-    __ add_memory_int32(ExternalAddress((address)&Runtime1::_arraycopy_checkcast_cnt), 1);
-    __ bind(failed);
-  }
-#endif
-
-  __ beqz(x10, *stub->continuation());
-
-#ifndef PRODUCT
-  if (PrintC1Statistics) {
-    __ add_memory_int32(ExternalAddress((address)&Runtime1::_arraycopy_checkcast_attempt_cnt), 1);
-  }
-#endif
-  assert_different_registers(dst, dst_pos, length, src_pos, src, x10, t0);
-
-  // Restore previously spilled arguments
-  arraycopy_load_args(src, src_pos, length, dst, dst_pos);
-
-  // return value is -1^K where K is partial copied count
-  __ xori(t0, x10, -1);
-  // adjust length down and src/end pos up by partial copied count
-  __ subw(length, length, t0);
-  __ addw(src_pos, src_pos, t0);
-  __ addw(dst_pos, dst_pos, t0);
-}
-
-void LIR_Assembler::arraycopy_type_check(Register src, Register src_pos, Register length,
-                                         Register dst, Register dst_pos, Register tmp,
-                                         CodeStub *stub, BasicType basic_type, int flags) {
-  // We don't know the array types are compatible
-  if (basic_type != T_OBJECT) {
-    // Simple test for basic type arrays
-    if (UseCompressedClassPointers) {
-      __ lwu(tmp, Address(src, oopDesc::klass_offset_in_bytes()));
-      __ lwu(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
-    } else {
-      __ ld(tmp, Address(src, oopDesc::klass_offset_in_bytes()));
-      __ ld(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
-    }
-    __ bne(tmp, t0, *stub->entry(), /* is_far */ true);
-  } else {
-    // For object arrays, if src is a sub class of dst then we can
-    // safely do the copy.
-    Label cont, slow;
-
-#define PUSH(r1, r2)                                     \
-    __ addi(sp, sp, -2 * wordSize);                      \
-    __ sd(r1, Address(sp, 1 * wordSize));                \
-    __ sd(r2, Address(sp, 0));
-
-#define POP(r1, r2)                                      \
-    __ ld(r1, Address(sp, 1 * wordSize));                \
-    __ ld(r2, Address(sp, 0));                           \
-    __ addi(sp, sp, 2 * wordSize);
-
-    PUSH(src, dst);
-    __ load_klass(src, src);
-    __ load_klass(dst, dst);
-    __ check_klass_subtype_fast_path(src, dst, tmp, &cont, &slow, NULL);
-
-    PUSH(src, dst);
-    __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::slow_subtype_check_id)));
-    POP(src, dst);
-    __ bnez(dst, cont);
-
-    __ bind(slow);
-    POP(src, dst);
-
-    address copyfunc_addr = StubRoutines::checkcast_arraycopy();
-    if (copyfunc_addr != NULL) { // use stub if available
-      arraycopy_checkcast(src, src_pos, length, dst, dst_pos, tmp, stub, basic_type, copyfunc_addr, flags);
-    }
-
-    __ j(*stub->entry());
-    __ bind(cont);
-    POP(src, dst);
-  }
-}
-
-void LIR_Assembler::arraycopy_assert(Register src, Register dst, Register tmp, ciArrayKlass *default_type, int flags) {
-  assert(default_type != NULL, "NULL default_type!");
-  BasicType basic_type = default_type->element_type()->basic_type();
-
-  if (basic_type == T_ARRAY) { basic_type = T_OBJECT; }
-  if (basic_type != T_OBJECT || !(flags & LIR_OpArrayCopy::type_check)) {
-    // Sanity check the known type with the incoming class.  For the
-    // primitive case the types must match exactly with src.klass and
-    // dst.klass each exactly matching the default type.  For the
-    // object array case, if no type check is needed then either the
-    // dst type is exactly the expected type and the src type is a
-    // subtype which we can't check or src is the same array as dst
-    // but not necessarily exactly of type default_type.
-    Label known_ok, halt;
-    __ mov_metadata(tmp, default_type->constant_encoding());
-    if (UseCompressedClassPointers) {
-      __ encode_klass_not_null(tmp);
-    }
-
-    if (basic_type != T_OBJECT) {
-      if (UseCompressedClassPointers) {
-        __ lwu(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
-      } else {
-        __ ld(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
-      }
-      __ bne(tmp, t0, halt);
-      if (UseCompressedClassPointers) {
-        __ lwu(t0, Address(src, oopDesc::klass_offset_in_bytes()));
-      } else {
-        __ ld(t0, Address(src, oopDesc::klass_offset_in_bytes()));
-      }
-      __ beq(tmp, t0, known_ok);
-    } else {
-      if (UseCompressedClassPointers) {
-        __ lwu(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
-      } else {
-        __ ld(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
-      }
-      __ beq(tmp, t0, known_ok);
-      __ beq(src, dst, known_ok);
-    }
-    __ bind(halt);
-    __ stop("incorrect type information in arraycopy");
-    __ bind(known_ok);
-  }
-}
-
-void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
-  ciArrayKlass *default_type = op->expected_type();
-  Register src = op->src()->as_register();
-  Register dst = op->dst()->as_register();
-  Register src_pos = op->src_pos()->as_register();
-  Register dst_pos = op->dst_pos()->as_register();
-  Register length = op->length()->as_register();
-  Register tmp = op->tmp()->as_register();
-
-  CodeStub* stub = op->stub();
-  int flags = op->flags();
-  BasicType basic_type = default_type != NULL ? default_type->element_type()->basic_type() : T_ILLEGAL;
-  if (is_reference_type(basic_type)) { basic_type = T_OBJECT; }
-
-  // if we don't know anything, just go through the generic arraycopy
-  if (default_type == NULL) {
-    generic_arraycopy(src, src_pos, length, dst, dst_pos, stub);
-    return;
-  }
-
-  assert(default_type != NULL && default_type->is_array_klass() && default_type->is_loaded(),
-         "must be true at this point");
-
-  arraycopy_simple_check(src, src_pos, length, dst, dst_pos, tmp, stub, flags);
-
-  if (flags & LIR_OpArrayCopy::type_check) {
-    arraycopy_type_check(src, src_pos, length, dst, dst_pos, tmp, stub, basic_type, flags);
-  }
-
-#ifdef ASSERT
-  arraycopy_assert(src, dst, tmp, default_type, flags);
-#endif
-
-#ifndef PRODUCT
-  if (PrintC1Statistics) {
-    __ add_memory_int32(ExternalAddress(Runtime1::arraycopy_count_address(basic_type)), 1);
-  }
-#endif
-  arraycopy_prepare_params(src, src_pos, length, dst, dst_pos, basic_type);
-
-  bool disjoint = (flags & LIR_OpArrayCopy::overlapping) == 0;
-  bool aligned = (flags & LIR_OpArrayCopy::unaligned) == 0;
-  const char *name = NULL;
-  address entry = StubRoutines::select_arraycopy_function(basic_type, aligned, disjoint, name, false);
-
-  CodeBlob *cb = CodeCache::find_blob(entry);
-  if (cb != NULL) {
-    __ far_call(RuntimeAddress(entry));
-  } else {
-    const int args_num = 3;
-    __ call_VM_leaf(entry, args_num);
-  }
-
-  __ bind(*stub->continuation());
-}
-
-
-void LIR_Assembler::arraycopy_prepare_params(Register src, Register src_pos, Register length,
-                                             Register dst, Register dst_pos, BasicType basic_type) {
-  int scale = array_element_size(basic_type);
-  __ shadd(c_rarg0, src_pos, src, t0, scale);
-  __ add(c_rarg0, c_rarg0, arrayOopDesc::base_offset_in_bytes(basic_type));
-  assert_different_registers(c_rarg0, dst, dst_pos, length);
-  __ shadd(c_rarg1, dst_pos, dst, t0, scale);
-  __ add(c_rarg1, c_rarg1, arrayOopDesc::base_offset_in_bytes(basic_type));
-  assert_different_registers(c_rarg1, dst, length);
-  __ mv(c_rarg2, length);
-  assert_different_registers(c_rarg2, dst);
-}
-
-void LIR_Assembler::arraycopy_checkcast_prepare_params(Register src, Register src_pos, Register length,
-                                                       Register dst, Register dst_pos, BasicType basic_type) {
-  arraycopy_prepare_params(src, src_pos, length, dst, dst_pos, basic_type);
-  __ load_klass(c_rarg4, dst);
-  __ ld(c_rarg4, Address(c_rarg4, ObjArrayKlass::element_klass_offset()));
-  __ lwu(c_rarg3, Address(c_rarg4, Klass::super_check_offset_offset()));
-}
-
-void LIR_Assembler::arraycopy_store_args(Register src, Register src_pos, Register length,
-                                         Register dst, Register dst_pos) {
-  __ sd(dst_pos, Address(sp, 0));                // 0: dst_pos sp offset
-  __ sd(dst, Address(sp, 1 * BytesPerWord));     // 1: dst sp offset
-  __ sd(length, Address(sp, 2 * BytesPerWord));  // 2: length sp offset
-  __ sd(src_pos, Address(sp, 3 * BytesPerWord)); // 3: src_pos sp offset
-  __ sd(src, Address(sp, 4 * BytesPerWord));     // 4: src sp offset
-}
-
-void LIR_Assembler::arraycopy_load_args(Register src, Register src_pos, Register length,
-                                        Register dst, Register dst_pos) {
-  __ ld(dst_pos, Address(sp, 0));                // 0: dst_pos sp offset
-  __ ld(dst, Address(sp, 1 * BytesPerWord));     // 1: dst sp offset
-  __ ld(length, Address(sp, 2 * BytesPerWord));  // 2: length sp offset
-  __ ld(src_pos, Address(sp, 3 * BytesPerWord)); // 3: src_pos sp offset
-  __ ld(src, Address(sp, 4 * BytesPerWord));     // 4: src sp offset
-}
-
-#undef __

src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.hpp

@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C1_LIRASSEMBLER_ARRAYCOPY_RISCV_HPP
-#define CPU_RISCV_C1_LIRASSEMBLER_ARRAYCOPY_RISCV_HPP
-
-  // arraycopy sub functions
-  void generic_arraycopy(Register src, Register src_pos, Register length,
-                         Register dst, Register dst_pos, CodeStub *stub);
-  void arraycopy_simple_check(Register src, Register src_pos, Register length,
-                              Register dst, Register dst_pos, Register tmp,
-                              CodeStub *stub, int flags);
-  void arraycopy_checkcast(Register src, Register src_pos, Register length,
-                           Register dst, Register dst_pos, Register tmp,
-                           CodeStub *stub, BasicType basic_type,
-                           address copyfunc_addr, int flags);
-  void arraycopy_type_check(Register src, Register src_pos, Register length,
-                            Register dst, Register dst_pos, Register tmp,
-                            CodeStub *stub, BasicType basic_type, int flags);
-  void arraycopy_assert(Register src, Register dst, Register tmp, ciArrayKlass *default_type, int flags);
-  void arraycopy_prepare_params(Register src, Register src_pos, Register length,
-                                Register dst, Register dst_pos, BasicType basic_type);
-  void arraycopy_checkcast_prepare_params(Register src, Register src_pos, Register length,
-                                          Register dst, Register dst_pos, BasicType basic_type);
-  void arraycopy_store_args(Register src, Register src_pos, Register length,
-                            Register dst, Register dst_pos);
-  void arraycopy_load_args(Register src, Register src_pos, Register length,
-                           Register dst, Register dst_pos);
-
-#endif // CPU_RISCV_C1_LIRASSEMBLER_ARRAYCOPY_RISCV_HPP

src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp

@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C1_LIRASSEMBLER_RISCV_HPP
-#define CPU_RISCV_C1_LIRASSEMBLER_RISCV_HPP
-
-// ArrayCopyStub needs access to bailout
-friend class ArrayCopyStub;
-
-private:
-
-#include "c1_LIRAssembler_arith_riscv.hpp"
-#include "c1_LIRAssembler_arraycopy_riscv.hpp"
-
-  int array_element_size(BasicType type) const;
-
-  static Register as_reg(LIR_Opr op) {
-    return op->is_double_cpu() ? op->as_register_lo() : op->as_register();
-  }
-
-  Address as_Address(LIR_Address* addr, Register tmp);
-
-  // helper functions which checks for overflow and sets bailout if it
-  // occurs.  Always returns a valid embeddable pointer but in the
-  // bailout case the pointer won't be to unique storage.
-  address float_constant(float f);
-  address double_constant(double d);
-  address int_constant(jlong n);
-
-  // Ensure we have a valid Address (base + offset) to a stack-slot.
-  Address stack_slot_address(int index, uint shift, int adjust = 0);
-
-  // Record the type of the receiver in ReceiverTypeData
-  void type_profile_helper(Register mdo,
-                           ciMethodData *md, ciProfileData *data,
-                           Register recv, Label* update_done);
-
-  void add_debug_info_for_branch(address adr, CodeEmitInfo* info);
-
-  void casw(Register addr, Register newval, Register cmpval);
-  void caswu(Register addr, Register newval, Register cmpval);
-  void casl(Register addr, Register newval, Register cmpval);
-
-  void poll_for_safepoint(relocInfo::relocType rtype, CodeEmitInfo* info = NULL);
-
-  void deoptimize_trap(CodeEmitInfo *info);
-
-  enum {
-    // See emit_static_call_stub for detail
-    // CompiledStaticCall::to_interp_stub_size() (14) + CompiledStaticCall::to_trampoline_stub_size() (1 + 3 + address)
-    _call_stub_size = 14 * NativeInstruction::instruction_size +
-                      (NativeInstruction::instruction_size + NativeCallTrampolineStub::instruction_size),
-    // See emit_exception_handler for detail
-    // verify_not_null_oop + far_call + should_not_reach_here + invalidate_registers(DEBUG_ONLY)
-    _exception_handler_size = DEBUG_ONLY(584) NOT_DEBUG(548), // or smaller
-    // See emit_deopt_handler for detail
-    // auipc (1) + far_jump (6 or 2)
-    _deopt_handler_size = 1 * NativeInstruction::instruction_size +
-                          6 * NativeInstruction::instruction_size // or smaller
-  };
-
-  void check_conflict(ciKlass* exact_klass, intptr_t current_klass, Register tmp,
-                      Label &next, Label &none, Address mdo_addr);
-  void check_no_conflict(ciKlass* exact_klass, intptr_t current_klass, Register tmp, Address mdo_addr, Label &next);
-
-  void check_exact_klass(Register tmp, ciKlass* exact_klass);
-
-  void check_null(Register tmp, Label &update, intptr_t current_klass, Address mdo_addr, bool do_update, Label &next);
-
-  void (MacroAssembler::*add)(Register prev, RegisterOrConstant incr, Register addr);
-  void (MacroAssembler::*xchg)(Register prev, Register newv, Register addr);
-
-  void get_op(BasicType type);
-
-  // emit_typecheck_helper sub functions
-  void data_check(LIR_OpTypeCheck *op, ciMethodData **md, ciProfileData **data);
-  void typecheck_helper_slowcheck(ciKlass* k, Register obj, Register Rtmp1,
-                                  Register k_RInfo, Register klass_RInfo,
-                                  Label* failure_target, Label* success_target);
-  void profile_object(ciMethodData* md, ciProfileData* data, Register obj,
-                      Register klass_RInfo, Label* obj_is_null);
-  void typecheck_loaded(LIR_OpTypeCheck* op, ciKlass* k, Register k_RInfo);
-
-  // emit_opTypeCheck sub functions
-  void typecheck_lir_store(LIR_OpTypeCheck* op, bool should_profile);
-
-  void type_profile(Register obj, ciMethodData* md, Register klass_RInfo, Register k_RInfo,
-                    ciProfileData* data, Label* success, Label* failure,
-                    Label& profile_cast_success, Label& profile_cast_failure);
-
-  void lir_store_slowcheck(Register k_RInfo, Register klass_RInfo, Register Rtmp1,
-                           Label* success_target, Label* failure_target);
-
-  void const2reg_helper(LIR_Opr src);
-
-  void emit_branch(LIR_Condition cmp_flag, LIR_Opr cmp1, LIR_Opr cmp2, Label& label, bool is_far, bool is_unordered);
-
-  void logic_op_reg32(Register dst, Register left, Register right, LIR_Code code);
-  void logic_op_reg(Register dst, Register left, Register right, LIR_Code code);
-  void logic_op_imm(Register dst, Register left, int right, LIR_Code code);
-
-public:
-
-  void emit_cmove(LIR_Op4* op);
-
-  void store_parameter(Register r, int offset_from_rsp_in_words);
-  void store_parameter(jint c, int offset_from_rsp_in_words);
-
-#endif // CPU_RISCV_C1_LIRASSEMBLER_RISCV_HPP

src/hotspot/cpu/riscv/c1_LIR_riscv.cpp

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "asm/register.hpp"
-#include "c1/c1_LIR.hpp"
-
-FloatRegister LIR_OprDesc::as_float_reg() const {
-  return as_FloatRegister(fpu_regnr());
-}
-
-FloatRegister LIR_OprDesc::as_double_reg() const {
-  return as_FloatRegister(fpu_regnrLo());
-}
-
-// Reg2 unused.
-LIR_Opr LIR_OprFact::double_fpu(int reg1, int reg2) {
-  assert(as_FloatRegister(reg2) == fnoreg, "Not used on this platform");
-  return (LIR_Opr)(intptr_t)((reg1 << LIR_OprDesc::reg1_shift) |
-                             (reg1 << LIR_OprDesc::reg2_shift) |
-                             LIR_OprDesc::double_type          |
-                             LIR_OprDesc::fpu_register         |
-                             LIR_OprDesc::double_size);
-}
-
-#ifndef PRODUCT
-void LIR_Address::verify() const {
-  assert(base()->is_cpu_register(), "wrong base operand");
-  assert(index()->is_illegal() || index()->is_double_cpu() || index()->is_single_cpu(), "wrong index operand");
-  assert(base()->type() == T_ADDRESS || base()->type() == T_OBJECT || base()->type() == T_LONG ||
-         base()->type() == T_METADATA, "wrong type for addresses");
-}
-#endif // PRODUCT

src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "c1/c1_Instruction.hpp"
-#include "c1/c1_LinearScan.hpp"
-#include "utilities/bitMap.inline.hpp"
-
-void LinearScan::allocate_fpu_stack() {
-  // No FPU stack on RISCV
-}

src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp

@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C1_LINEARSCAN_RISCV_HPP
-#define CPU_RISCV_C1_LINEARSCAN_RISCV_HPP
-
-inline bool LinearScan::is_processed_reg_num(int reg_num)
-{
-  return reg_num <= FrameMap::last_cpu_reg() || reg_num >= pd_nof_cpu_regs_frame_map;
-}
-
-inline int LinearScan::num_physical_regs(BasicType type) {
-  return 1;
-}
-
-inline bool LinearScan::requires_adjacent_regs(BasicType type) {
-  return false;
-}
-
-inline bool LinearScan::is_caller_save(int assigned_reg) {
-  assert(assigned_reg >= 0 && assigned_reg < nof_regs, "should call this only for registers");
-  if (assigned_reg < pd_first_callee_saved_reg) {
-    return true;
-  }
-  if (assigned_reg > pd_last_callee_saved_reg && assigned_reg < pd_first_callee_saved_fpu_reg_1) {
-    return true;
-  }
-  if (assigned_reg > pd_last_callee_saved_fpu_reg_1 && assigned_reg < pd_first_callee_saved_fpu_reg_2) {
-    return true;
-  }
-  if (assigned_reg > pd_last_callee_saved_fpu_reg_2 && assigned_reg < pd_last_fpu_reg) {
-    return true;
-  }
-  return false;
-}
-
-inline void LinearScan::pd_add_temps(LIR_Op* op) {
-  // No special case behaviours yet
-}
-
-
-// Implementation of LinearScanWalker
-
-inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur)
-{
-  if (allocator()->gen()->is_vreg_flag_set(cur->reg_num(), LIRGenerator::callee_saved)) {
-    assert(cur->type() != T_FLOAT && cur->type() != T_DOUBLE, "cpu regs only");
-    _first_reg = pd_first_callee_saved_reg;
-    _last_reg = pd_last_callee_saved_reg;
-    return true;
-  } else if (cur->type() == T_INT || cur->type() == T_LONG || cur->type() == T_OBJECT ||
-             cur->type() == T_ADDRESS || cur->type() == T_METADATA) {
-    _first_reg = pd_first_cpu_reg;
-    _last_reg = pd_last_allocatable_cpu_reg;
-    return true;
-  }
-  return false;
-}
-
-#endif // CPU_RISCV_C1_LINEARSCAN_RISCV_HPP

src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp

@@ -1,450 +0,0 @@
-/*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "c1/c1_LIR.hpp"
-#include "c1/c1_MacroAssembler.hpp"
-#include "c1/c1_Runtime1.hpp"
-#include "classfile/systemDictionary.hpp"
-#include "gc/shared/barrierSetAssembler.hpp"
-#include "gc/shared/collectedHeap.hpp"
-#include "interpreter/interpreter.hpp"
-#include "oops/arrayOop.hpp"
-#include "oops/markWord.hpp"
-#include "runtime/basicLock.hpp"
-#include "runtime/os.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "runtime/stubRoutines.hpp"
-
-void C1_MacroAssembler::float_cmp(bool is_float, int unordered_result,
-                                  FloatRegister freg0, FloatRegister freg1,
-                                  Register result)
-{
-  if (is_float) {
-    float_compare(result, freg0, freg1, unordered_result);
-  } else {
-    double_compare(result, freg0, freg1, unordered_result);
-  }
-}
-
-int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr, Register tmp, Label& slow_case) {
-  const int aligned_mask = BytesPerWord - 1;
-  const int hdr_offset = oopDesc::mark_offset_in_bytes();
-  assert(hdr != obj && hdr != disp_hdr && obj != disp_hdr, "registers must be different");
-  Label done;
-  int null_check_offset = -1;
-
-  verify_oop(obj);
-
-  // save object being locked into the BasicObjectLock
-  sd(obj, Address(disp_hdr, BasicObjectLock::obj_offset_in_bytes()));
-
-  null_check_offset = offset();
-
-  if (DiagnoseSyncOnValueBasedClasses != 0) {
-    load_klass(hdr, obj);
-    lwu(hdr, Address(hdr, Klass::access_flags_offset()));
-    andi(t0, hdr, JVM_ACC_IS_VALUE_BASED_CLASS);
-    bnez(t0, slow_case, true /* is_far */);
-  }
-
-  if (UseBiasedLocking) {
-    assert(tmp != noreg, "should have tmp register at this point");
-    biased_locking_enter(disp_hdr, obj, hdr, tmp, false, done, &slow_case);
-  }
-
-  // Load object header
-  ld(hdr, Address(obj, hdr_offset));
-  // and mark it as unlocked
-  ori(hdr, hdr, markWord::unlocked_value);
-  // save unlocked object header into the displaced header location on the stack
-  sd(hdr, Address(disp_hdr, 0));
-  // test if object header is still the same (i.e. unlocked), and if so, store the
-  // displaced header address in the object header - if it is not the same, get the
-  // object header instead
-  la(t1, Address(obj, hdr_offset));
-  cmpxchgptr(hdr, disp_hdr, t1, t0, done, /*fallthough*/NULL);
-  // if the object header was the same, we're done
-  // if the object header was not the same, it is now in the hdr register
-  // => test if it is a stack pointer into the same stack (recursive locking), i.e.:
-  //
-  // 1) (hdr & aligned_mask) == 0
-  // 2) sp <= hdr
-  // 3) hdr <= sp + page_size
-  //
-  // these 3 tests can be done by evaluating the following expression:
-  //
-  // (hdr -sp) & (aligned_mask - page_size)
-  //
-  // assuming both the stack pointer and page_size have their least
-  // significant 2 bits cleared and page_size is a power of 2
-  sub(hdr, hdr, sp);
-  li(t0, aligned_mask - os::vm_page_size());
-  andr(hdr, hdr, t0);
-  // for recursive locking, the result is zero => save it in the displaced header
-  // location (NULL in the displaced hdr location indicates recursive locking)
-  sd(hdr, Address(disp_hdr, 0));
-  // otherwise we don't care about the result and handle locking via runtime call
-  bnez(hdr, slow_case, /* is_far */ true);
-  bind(done);
-  return null_check_offset;
-}
-
-void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_hdr, Label& slow_case) {
-  const int aligned_mask = BytesPerWord - 1;
-  const int hdr_offset = oopDesc::mark_offset_in_bytes();
-  assert(hdr != obj && hdr != disp_hdr && obj != disp_hdr, "registers must be different");
-  Label done;
-
-  if (UseBiasedLocking) {
-    // load object
-    ld(obj, Address(disp_hdr, BasicObjectLock::obj_offset_in_bytes()));
-    biased_locking_exit(obj, hdr, done);
-  }
-
-  // load displaced header
-  ld(hdr, Address(disp_hdr, 0));
-  // if the loaded hdr is NULL we had recursive locking
-  // if we had recursive locking, we are done
-  beqz(hdr, done);
-  if (!UseBiasedLocking) {
-    // load object
-    ld(obj, Address(disp_hdr, BasicObjectLock::obj_offset_in_bytes()));
-  }
-  verify_oop(obj);
-  // test if object header is pointing to the displaced header, and if so, restore
-  // the displaced header in the object - if the object header is not pointing to
-  // the displaced header, get the object header instead
-  // if the object header was not pointing to the displaced header,
-  // we do unlocking via runtime call
-  if (hdr_offset) {
-    la(t0, Address(obj, hdr_offset));
-    cmpxchgptr(disp_hdr, hdr, t0, t1, done, &slow_case);
-  } else {
-    cmpxchgptr(disp_hdr, hdr, obj, t1, done, &slow_case);
-  }
-  bind(done);
-}
-
-// Defines obj, preserves var_size_in_bytes
-void C1_MacroAssembler::try_allocate(Register obj, Register var_size_in_bytes, int con_size_in_bytes, Register tmp1, Register tmp2, Label& slow_case) {
-  if (UseTLAB) {
-    tlab_allocate(obj, var_size_in_bytes, con_size_in_bytes, tmp1, tmp2, slow_case, /* is_far */ true);
-  } else {
-    eden_allocate(obj, var_size_in_bytes, con_size_in_bytes, tmp1, slow_case, /* is_far */ true);
-  }
-}
-
-void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register tmp1, Register tmp2) {
-  assert_different_registers(obj, klass, len);
-  if (UseBiasedLocking & !len->is_valid()) {
-    assert_different_registers(obj, klass, len, tmp1, tmp2);
-    ld(tmp1, Address(klass, Klass::prototype_header_offset()));
-  } else {
-    // This assumes that all prototype bits fitr in an int32_t
-    mv(tmp1, (int32_t)(intptr_t)markWord::prototype().value());
-  }
-  sd(tmp1, Address(obj, oopDesc::mark_offset_in_bytes()));
-
-  if (UseCompressedClassPointers) { // Take care not to kill klass
-    encode_klass_not_null(tmp1, klass);
-    sw(tmp1, Address(obj, oopDesc::klass_offset_in_bytes()));
-  } else {
-    sd(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
-  }
-
-  if (len->is_valid()) {
-    sw(len, Address(obj, arrayOopDesc::length_offset_in_bytes()));
-  } else if (UseCompressedClassPointers) {
-    store_klass_gap(obj, zr);
-  }
-}
-
-// preserves obj, destroys len_in_bytes
-void C1_MacroAssembler::initialize_body(Register obj, Register len_in_bytes, int hdr_size_in_bytes, Register tmp) {
-  assert(hdr_size_in_bytes >= 0, "header size must be positive or 0");
-  Label done;
-
-  // len_in_bytes is positive and ptr sized
-  sub(len_in_bytes, len_in_bytes, hdr_size_in_bytes);
-  beqz(len_in_bytes, done);
-
-  // Preserve obj
-  if (hdr_size_in_bytes) {
-    add(obj, obj, hdr_size_in_bytes);
-  }
-  zero_memory(obj, len_in_bytes, tmp);
-  if (hdr_size_in_bytes) {
-    sub(obj, obj, hdr_size_in_bytes);
-  }
-
-  bind(done);
-}
-
-void C1_MacroAssembler::allocate_object(Register obj, Register tmp1, Register tmp2, int header_size, int object_size, Register klass, Label& slow_case) {
-  assert_different_registers(obj, tmp1, tmp2);
-  assert(header_size >= 0 && object_size >= header_size, "illegal sizes");
-
-  try_allocate(obj, noreg, object_size * BytesPerWord, tmp1, tmp2, slow_case);
-
-  initialize_object(obj, klass, noreg, object_size * HeapWordSize, tmp1, tmp2, UseTLAB);
-}
-
-void C1_MacroAssembler::initialize_object(Register obj, Register klass, Register var_size_in_bytes, int con_size_in_bytes, Register tmp1, Register tmp2, bool is_tlab_allocated) {
-  assert((con_size_in_bytes & MinObjAlignmentInBytesMask) == 0,
-         "con_size_in_bytes is not multiple of alignment");
-  const int hdr_size_in_bytes = instanceOopDesc::header_size() * HeapWordSize;
-
-  initialize_header(obj, klass, noreg, tmp1, tmp2);
-
-  if (!(UseTLAB && ZeroTLAB && is_tlab_allocated)) {
-    // clear rest of allocated space
-    const Register index = tmp2;
-    // 16: multipler for threshold
-    const int threshold = 16 * BytesPerWord;    // approximate break even point for code size (see comments below)
-    if (var_size_in_bytes != noreg) {
-      mv(index, var_size_in_bytes);
-      initialize_body(obj, index, hdr_size_in_bytes, tmp1);
-    } else if (con_size_in_bytes <= threshold) {
-      // use explicit null stores
-      int i = hdr_size_in_bytes;
-      if (i < con_size_in_bytes && (con_size_in_bytes % (2 * BytesPerWord))) { // 2: multipler for BytesPerWord
-        sd(zr, Address(obj, i));
-        i += BytesPerWord;
-      }
-      for (; i < con_size_in_bytes; i += BytesPerWord) {
-        sd(zr, Address(obj, i));
-      }
-    } else if (con_size_in_bytes > hdr_size_in_bytes) {
-      block_comment("zero memory");
-      // use loop to null out the fields
-      int words = (con_size_in_bytes - hdr_size_in_bytes) / BytesPerWord;
-      mv(index, words / 8); // 8: byte size
-
-      const int unroll = 8; // Number of sd(zr) instructions we'll unroll
-      int remainder = words % unroll;
-      la(t0, Address(obj, hdr_size_in_bytes + remainder * BytesPerWord));
-
-      Label entry_point, loop;
-      j(entry_point);
-
-      bind(loop);
-      sub(index, index, 1);
-      for (int i = -unroll; i < 0; i++) {
-        if (-i == remainder) {
-          bind(entry_point);
-        }
-        sd(zr, Address(t0, i * wordSize));
-      }
-      if (remainder == 0) {
-        bind(entry_point);
-      }
-      add(t0, t0, unroll * wordSize);
-      bnez(index, loop);
-    }
-  }
-
-  membar(MacroAssembler::StoreStore);
-
-  if (CURRENT_ENV->dtrace_alloc_probes()) {
-    assert(obj == x10, "must be");
-    far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id)));
-  }
-
-  verify_oop(obj);
-}
-
-void C1_MacroAssembler::allocate_array(Register obj, Register len, Register tmp1, Register tmp2, int header_size, int f, Register klass, Label& slow_case) {
-  assert_different_registers(obj, len, tmp1, tmp2, klass);
-
-  // determine alignment mask
-  assert(!(BytesPerWord & 1), "must be multiple of 2 for masking code to work");
-
-  // check for negative or excessive length
-  mv(t0, (int32_t)max_array_allocation_length);
-  bgeu(len, t0, slow_case, /* is_far */ true);
-
-  const Register arr_size = tmp2; // okay to be the same
-  // align object end
-  mv(arr_size, (int32_t)header_size * BytesPerWord + MinObjAlignmentInBytesMask);
-  shadd(arr_size, len, arr_size, t0, f);
-  andi(arr_size, arr_size, ~(uint)MinObjAlignmentInBytesMask);
-
-  try_allocate(obj, arr_size, 0, tmp1, tmp2, slow_case);
-
-  initialize_header(obj, klass, len, tmp1, tmp2);
-
-  // clear rest of allocated space
-  const Register len_zero = len;
-  initialize_body(obj, arr_size, header_size * BytesPerWord, len_zero);
-
-  membar(MacroAssembler::StoreStore);
-
-  if (CURRENT_ENV->dtrace_alloc_probes()) {
-    assert(obj == x10, "must be");
-    far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id)));
-  }
-
-  verify_oop(obj);
-}
-
-void C1_MacroAssembler::inline_cache_check(Register receiver, Register iCache, Label &L) {
-  verify_oop(receiver);
-  // explicit NULL check not needed since load from [klass_offset] causes a trap
-  // check against inline cache
-  assert(!MacroAssembler::needs_explicit_null_check(oopDesc::klass_offset_in_bytes()), "must add explicit null check");
-  cmp_klass(receiver, iCache, t0, L);
-}
-
-void C1_MacroAssembler::build_frame(int framesize, int bang_size_in_bytes) {
-  assert(bang_size_in_bytes >= framesize, "stack bang size incorrect");
-  // Make sure there is enough stack space for this method's activation.
-  // Note that we do this before creating a frame.
-  generate_stack_overflow_check(bang_size_in_bytes);
-  MacroAssembler::build_frame(framesize);
-
-  // Insert nmethod entry barrier into frame.
-  BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-  bs->nmethod_entry_barrier(this);
-}
-
-void C1_MacroAssembler::remove_frame(int framesize) {
-  MacroAssembler::remove_frame(framesize);
-}
-
-
-void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
-  // If we have to make this method not-entrant we'll overwrite its
-  // first instruction with a jump. For this action to be legal we
-  // must ensure that this first instruction is a J, JAL or NOP.
-  // Make it a NOP.
-
-  nop();
-}
-
-void C1_MacroAssembler::load_parameter(int offset_in_words, Register reg) {
-  //  fp + -2: link
-  //     + -1: return address
-  //     +  0: argument with offset 0
-  //     +  1: argument with offset 1
-  //     +  2: ...
-  ld(reg, Address(fp, offset_in_words * BytesPerWord));
-}
-
-#ifndef PRODUCT
-
-void C1_MacroAssembler::verify_stack_oop(int stack_offset) {
-  if (!VerifyOops) {
-    return;
-  }
-  verify_oop_addr(Address(sp, stack_offset), "oop");
-}
-
-void C1_MacroAssembler::verify_not_null_oop(Register r) {
-  if (!VerifyOops) return;
-  Label not_null;
-  bnez(r, not_null);
-  stop("non-null oop required");
-  bind(not_null);
-  verify_oop(r);
-}
-
-void C1_MacroAssembler::invalidate_registers(bool inv_x10, bool inv_x9, bool inv_x12, bool inv_x13, bool inv_x14, bool inv_x15) {
-#ifdef ASSERT
-  static int nn;
-  if (inv_x10) { mv(x10, 0xDEAD); }
-  if (inv_x9)  { mv(x9, 0xDEAD);  }
-  if (inv_x12) { mv(x12, nn++);   }
-  if (inv_x13) { mv(x13, 0xDEAD); }
-  if (inv_x14) { mv(x14, 0xDEAD); }
-  if (inv_x15) { mv(x15, 0xDEAD); }
-#endif // ASSERT
-}
-#endif // ifndef PRODUCT
-
-typedef void (C1_MacroAssembler::*c1_cond_branch_insn)(Register op1, Register op2, Label& label, bool is_far);
-typedef void (C1_MacroAssembler::*c1_float_cond_branch_insn)(FloatRegister op1, FloatRegister op2,
-              Label& label, bool is_far, bool is_unordered);
-
-static c1_cond_branch_insn c1_cond_branch[] =
-{
-  /* SHORT branches */
-  (c1_cond_branch_insn)&Assembler::beq,
-  (c1_cond_branch_insn)&Assembler::bne,
-  (c1_cond_branch_insn)&Assembler::blt,
-  (c1_cond_branch_insn)&Assembler::ble,
-  (c1_cond_branch_insn)&Assembler::bge,
-  (c1_cond_branch_insn)&Assembler::bgt,
-  (c1_cond_branch_insn)&Assembler::bleu, // lir_cond_belowEqual
-  (c1_cond_branch_insn)&Assembler::bgeu  // lir_cond_aboveEqual
-};
-
-static c1_float_cond_branch_insn c1_float_cond_branch[] =
-{
-  /* FLOAT branches */
-  (c1_float_cond_branch_insn)&MacroAssembler::float_beq,
-  (c1_float_cond_branch_insn)&MacroAssembler::float_bne,
-  (c1_float_cond_branch_insn)&MacroAssembler::float_blt,
-  (c1_float_cond_branch_insn)&MacroAssembler::float_ble,
-  (c1_float_cond_branch_insn)&MacroAssembler::float_bge,
-  (c1_float_cond_branch_insn)&MacroAssembler::float_bgt,
-  NULL, // lir_cond_belowEqual
-  NULL, // lir_cond_aboveEqual
-
-  /* DOUBLE branches */
-  (c1_float_cond_branch_insn)&MacroAssembler::double_beq,
-  (c1_float_cond_branch_insn)&MacroAssembler::double_bne,
-  (c1_float_cond_branch_insn)&MacroAssembler::double_blt,
-  (c1_float_cond_branch_insn)&MacroAssembler::double_ble,
-  (c1_float_cond_branch_insn)&MacroAssembler::double_bge,
-  (c1_float_cond_branch_insn)&MacroAssembler::double_bgt,
-  NULL, // lir_cond_belowEqual
-  NULL  // lir_cond_aboveEqual
-};
-
-void C1_MacroAssembler::c1_cmp_branch(int cmpFlag, Register op1, Register op2, Label& label,
-                                      BasicType type, bool is_far) {
-  if (type == T_OBJECT || type == T_ARRAY) {
-    assert(cmpFlag == lir_cond_equal || cmpFlag == lir_cond_notEqual, "Should be equal or notEqual");
-    if (cmpFlag == lir_cond_equal) {
-      beq(op1, op2, label, is_far);
-    } else {
-      bne(op1, op2, label, is_far);
-    }
-  } else {
-    assert(cmpFlag >= 0 && cmpFlag < (int)(sizeof(c1_cond_branch) / sizeof(c1_cond_branch[0])),
-           "invalid c1 conditional branch index");
-    (this->*c1_cond_branch[cmpFlag])(op1, op2, label, is_far);
-  }
-}
-
-void C1_MacroAssembler::c1_float_cmp_branch(int cmpFlag, FloatRegister op1, FloatRegister op2, Label& label,
-                                            bool is_far, bool is_unordered) {
-  assert(cmpFlag >= 0 &&
-         cmpFlag < (int)(sizeof(c1_float_cond_branch) / sizeof(c1_float_cond_branch[0])),
-         "invalid c1 float conditional branch index");
-  (this->*c1_float_cond_branch[cmpFlag])(op1, op2, label, is_far, is_unordered);
-}

src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.hpp

@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C1_MACROASSEMBLER_RISCV_HPP
-#define CPU_RISCV_C1_MACROASSEMBLER_RISCV_HPP
-
-using MacroAssembler::build_frame;
-using MacroAssembler::null_check;
-
-// C1_MacroAssembler contains high-level macros for C1
-
- private:
-  int _rsp_offset;    // track rsp changes
-  // initialization
-  void pd_init() { _rsp_offset = 0; }
-
-
- public:
-  void try_allocate(
-    Register obj,                      // result: pointer to object after successful allocation
-    Register var_size_in_bytes,        // object size in bytes if unknown at compile time; invalid otherwise
-    int      con_size_in_bytes,        // object size in bytes if known at compile time
-    Register tmp1,                     // temp register
-    Register tmp2,                     // temp register
-    Label&   slow_case                 // continuation point if fast allocation fails
-  );
-
-  void initialize_header(Register obj, Register klass, Register len, Register tmp1, Register tmp2);
-  void initialize_body(Register obj, Register len_in_bytes, int hdr_size_in_bytes, Register tmp);
-
-  void float_cmp(bool is_float, int unordered_result,
-                 FloatRegister f0, FloatRegister f1,
-                 Register result);
-
-  // locking
-  // hdr     : must be x10, contents destroyed
-  // obj     : must point to the object to lock, contents preserved
-  // disp_hdr: must point to the displaced header location, contents preserved
-  // tmp     : temporary register, contents destroyed
-  // returns code offset at which to add null check debug information
-  int lock_object  (Register swap, Register obj, Register disp_hdr, Register tmp, Label& slow_case);
-
-  // unlocking
-  // hdr     : contents destroyed
-  // obj     : must point to the object to lock, contents preserved
-  // disp_hdr: must be x10 & must point to the displaced header location, contents destroyed
-  void unlock_object(Register swap, Register obj, Register lock, Label& slow_case);
-
-  void initialize_object(
-    Register obj,                      // result: pointer to object after successful allocation
-    Register klass,                    // object klass
-    Register var_size_in_bytes,        // object size in bytes if unknown at compile time; invalid otherwise
-    int      con_size_in_bytes,        // object size in bytes if   known at compile time
-    Register tmp1,                     // temp register
-    Register tmp2,                     // temp register
-    bool     is_tlab_allocated         // the object was allocated in a TLAB; relevant for the implementation of ZeroTLAB
-  );
-
-  // allocation of fixed-size objects
-  // (can also be used to allocate fixed-size arrays, by setting
-  // hdr_size correctly and storing the array length afterwards)
-  // obj        : will contain pointer to allocated object
-  // t1, t2     : temp registers - contents destroyed
-  // header_size: size of object header in words
-  // object_size: total size of object in words
-  // slow_case  : exit to slow case implementation if fast allocation fails
-  void allocate_object(Register obj, Register tmp1, Register tmp2, int header_size, int object_size, Register klass, Label& slow_case);
-
-  enum {
-    max_array_allocation_length = 0x00FFFFFF
-  };
-
-  // allocation of arrays
-  // obj        : will contain pointer to allocated object
-  // len        : array length in number of elements
-  // t          : temp register - contents destroyed
-  // header_size: size of object header in words
-  // f          : element scale factor
-  // slow_case  : exit to slow case implementation if fast allocation fails
-  void allocate_array(Register obj, Register len, Register tmp1, Register tmp2, int header_size, int f, Register klass, Label& slow_case);
-
-  int  rsp_offset() const { return _rsp_offset; }
-
-  void invalidate_registers(bool inv_r0, bool inv_r19, bool inv_r2, bool inv_r3, bool inv_r4, bool inv_r5) PRODUCT_RETURN;
-
-  // This platform only uses signal-based null checks. The Label is not needed.
-  void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }
-
-  void load_parameter(int offset_in_words, Register reg);
-
-  void inline_cache_check(Register receiver, Register iCache, Label &L);
-
-  static const int c1_double_branch_mask = 1 << 3; // depend on c1_float_cond_branch
-  void c1_cmp_branch(int cmpFlag, Register op1, Register op2, Label& label, BasicType type, bool is_far);
-  void c1_float_cmp_branch(int cmpFlag, FloatRegister op1, FloatRegister op2, Label& label,
-                           bool is_far, bool is_unordered = false);
-
-#endif // CPU_RISCV_C1_MACROASSEMBLER_RISCV_HPP

src/hotspot/cpu/riscv/c1_globals_riscv.hpp

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C1_GLOBALS_RISCV_HPP
-#define CPU_RISCV_C1_GLOBALS_RISCV_HPP
-
-#include "utilities/globalDefinitions.hpp"
-#include "utilities/macros.hpp"
-
-// Sets the default values for platform dependent flags used by the client compiler.
-// (see c1_globals.hpp)
-
-#ifndef COMPILER2
-define_pd_global(bool, BackgroundCompilation,        true );
-define_pd_global(bool, InlineIntrinsics,             true );
-define_pd_global(bool, PreferInterpreterNativeStubs, false);
-define_pd_global(bool, ProfileTraps,                 false);
-define_pd_global(bool, UseOnStackReplacement,        true );
-define_pd_global(bool, TieredCompilation,            false);
-define_pd_global(intx, CompileThreshold,             1500 );
-
-define_pd_global(intx, OnStackReplacePercentage,     933  );
-define_pd_global(intx, NewSizeThreadIncrease,        4*K  );
-define_pd_global(intx, InitialCodeCacheSize,         160*K);
-define_pd_global(intx, ReservedCodeCacheSize,        32*M );
-define_pd_global(intx, NonProfiledCodeHeapSize,      13*M );
-define_pd_global(intx, ProfiledCodeHeapSize,         14*M );
-define_pd_global(intx, NonNMethodCodeHeapSize,       5*M  );
-define_pd_global(bool, ProfileInterpreter,           false);
-define_pd_global(intx, CodeCacheExpansionSize,       32*K );
-define_pd_global(uintx, CodeCacheMinBlockLength,     1);
-define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
-define_pd_global(bool, NeverActAsServerClassMachine, true );
-define_pd_global(uint64_t, MaxRAM,                   1ULL*G);
-define_pd_global(bool, CICompileOSR,                 true );
-#endif // !COMPILER2
-define_pd_global(bool, UseTypeProfile,               false);
-
-define_pd_global(bool, OptimizeSinglePrecision,      true );
-define_pd_global(bool, CSEArrayLength,               false);
-define_pd_global(bool, TwoOperandLIRForm,            false);
-
-#endif // CPU_RISCV_C1_GLOBALS_RISCV_HPP

src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp

@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C2_MACROASSEMBLER_RISCV_HPP
-#define CPU_RISCV_C2_MACROASSEMBLER_RISCV_HPP
-
-// C2_MacroAssembler contains high-level macros for C2
-
- private:
-  void element_compare(Register r1, Register r2,
-                       Register result, Register cnt,
-                       Register tmp1, Register tmp2,
-                       VectorRegister vr1, VectorRegister vr2,
-                       VectorRegister vrs,
-                       bool is_latin, Label& DONE);
- public:
-
-  void string_compare(Register str1, Register str2,
-                      Register cnt1, Register cnt2, Register result,
-                      Register tmp1, Register tmp2, Register tmp3,
-                      int ae);
-
-  void string_indexof_char_short(Register str1, Register cnt1,
-                                 Register ch, Register result,
-                                 bool isL);
-
-  void string_indexof_char(Register str1, Register cnt1,
-                           Register ch, Register result,
-                           Register tmp1, Register tmp2,
-                           Register tmp3, Register tmp4,
-                           bool isL);
-
-  void string_indexof(Register str1, Register str2,
-                      Register cnt1, Register cnt2,
-                      Register tmp1, Register tmp2,
-                      Register tmp3, Register tmp4,
-                      Register tmp5, Register tmp6,
-                      Register result, int ae);
-
-  void string_indexof_linearscan(Register haystack, Register needle,
-                                 Register haystack_len, Register needle_len,
-                                 Register tmp1, Register tmp2,
-                                 Register tmp3, Register tmp4,
-                                 int needle_con_cnt, Register result, int ae);
-
-  void arrays_equals(Register r1, Register r2,
-                     Register tmp3, Register tmp4,
-                     Register tmp5, Register tmp6,
-                     Register result, Register cnt1,
-                     int elem_size);
-
-  void string_equals(Register r1, Register r2,
-                     Register result, Register cnt1,
-                     int elem_size);
-
-  // refer to conditional_branches and float_conditional_branches
-  static const int bool_test_bits = 3;
-  static const int neg_cond_bits = 2;
-  static const int unsigned_branch_mask = 1 << bool_test_bits;
-  static const int double_branch_mask = 1 << bool_test_bits;
-
-  // cmp
-  void cmp_branch(int cmpFlag,
-                  Register op1, Register op2,
-                  Label& label, bool is_far = false);
-
-  void float_cmp_branch(int cmpFlag,
-                        FloatRegister op1, FloatRegister op2,
-                        Label& label, bool is_far = false);
-
-  void enc_cmpUEqNeLeGt_imm0_branch(int cmpFlag, Register op,
-                                    Label& L, bool is_far = false);
-
-  void enc_cmpEqNe_imm0_branch(int cmpFlag, Register op,
-                               Label& L, bool is_far = false);
-
-  void enc_cmove(int cmpFlag,
-                 Register op1, Register op2,
-                 Register dst, Register src);
-
-  void spill(Register r, bool is64, int offset) {
-    is64 ? sd(r, Address(sp, offset))
-         : sw(r, Address(sp, offset));
-  }
-
-  void spill(FloatRegister f, bool is64, int offset) {
-    is64 ? fsd(f, Address(sp, offset))
-         : fsw(f, Address(sp, offset));
-  }
-
-  void spill(VectorRegister v, int offset) {
-    add(t0, sp, offset);
-    vs1r_v(v, t0);
-  }
-
-  void unspill(Register r, bool is64, int offset) {
-    is64 ? ld(r, Address(sp, offset))
-         : lw(r, Address(sp, offset));
-  }
-
-  void unspillu(Register r, bool is64, int offset) {
-    is64 ? ld(r, Address(sp, offset))
-         : lwu(r, Address(sp, offset));
-  }
-
-  void unspill(FloatRegister f, bool is64, int offset) {
-    is64 ? fld(f, Address(sp, offset))
-         : flw(f, Address(sp, offset));
-  }
-
-  void unspill(VectorRegister v, int offset) {
-    add(t0, sp, offset);
-    vl1r_v(v, t0);
-  }
-
-  void spill_copy_vector_stack_to_stack(int src_offset, int dst_offset, int vec_reg_size_in_bytes) {
-    assert(vec_reg_size_in_bytes % 16 == 0, "unexpected vector reg size");
-    unspill(v0, src_offset);
-    spill(v0, dst_offset);
-  }
-
-  void minmax_FD(FloatRegister dst,
-                 FloatRegister src1, FloatRegister src2,
-                 bool is_double, bool is_min);
-
-  // intrinsic methods implemented by rvv instructions
-  void string_equals_v(Register r1, Register r2,
-                       Register result, Register cnt1,
-                       int elem_size);
-
-  void arrays_equals_v(Register r1, Register r2,
-                       Register result, Register cnt1,
-                       int elem_size);
-
-  void string_compare_v(Register str1, Register str2,
-                        Register cnt1, Register cnt2,
-                        Register result,
-                        Register tmp1, Register tmp2,
-                        int encForm);
-
- void clear_array_v(Register base, Register cnt);
-
- void byte_array_inflate_v(Register src, Register dst,
-                           Register len, Register tmp);
-
- void char_array_compress_v(Register src, Register dst,
-                            Register len, Register result,
-                            Register tmp);
-
- void encode_iso_array_v(Register src, Register dst,
-                         Register len, Register result,
-                         Register tmp);
-
- void has_negatives_v(Register ary, Register len,
-                      Register result, Register tmp);
-
- void string_indexof_char_v(Register str1, Register cnt1,
-                            Register ch, Register result,
-                            Register tmp1, Register tmp2,
-                            bool isL);
-
- void minmax_FD_v(VectorRegister dst,
-                  VectorRegister src1, VectorRegister src2,
-                  bool is_double, bool is_min);
-
- void reduce_minmax_FD_v(FloatRegister dst,
-                         FloatRegister src1, VectorRegister src2,
-                         VectorRegister tmp1, VectorRegister tmp2,
-                         bool is_double, bool is_min);
-
-#endif // CPU_RISCV_C2_MACROASSEMBLER_RISCV_HPP

src/hotspot/cpu/riscv/c2_globals_riscv.hpp

@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_C2_GLOBALS_RISCV_HPP
-#define CPU_RISCV_C2_GLOBALS_RISCV_HPP
-
-#include "utilities/globalDefinitions.hpp"
-#include "utilities/macros.hpp"
-
-// Sets the default values for platform dependent flags used by the server compiler.
-// (see c2_globals.hpp).  Alpha-sorted.
-
-define_pd_global(bool, BackgroundCompilation,        true);
-define_pd_global(bool, CICompileOSR,                 true);
-define_pd_global(bool, InlineIntrinsics,             true);
-define_pd_global(bool, PreferInterpreterNativeStubs, false);
-define_pd_global(bool, ProfileTraps,                 true);
-define_pd_global(bool, UseOnStackReplacement,        true);
-define_pd_global(bool, ProfileInterpreter,           true);
-define_pd_global(bool, TieredCompilation,            COMPILER1_PRESENT(true) NOT_COMPILER1(false));
-define_pd_global(intx, CompileThreshold,             10000);
-
-define_pd_global(intx, OnStackReplacePercentage,     140);
-define_pd_global(intx, ConditionalMoveLimit,         0);
-define_pd_global(intx, FLOATPRESSURE,                32);
-define_pd_global(intx, FreqInlineSize,               325);
-define_pd_global(intx, MinJumpTableSize,             10);
-define_pd_global(intx, INTPRESSURE,                  24);
-define_pd_global(intx, InteriorEntryAlignment,       16);
-define_pd_global(intx, NewSizeThreadIncrease, ScaleForWordSize(4*K));
-define_pd_global(intx, LoopUnrollLimit,              60);
-define_pd_global(intx, LoopPercentProfileLimit,      10);
-// InitialCodeCacheSize derived from specjbb2000 run.
-define_pd_global(intx, InitialCodeCacheSize,         2496*K); // Integral multiple of CodeCacheExpansionSize
-define_pd_global(intx, CodeCacheExpansionSize,       64*K);
-
-// Ergonomics related flags
-define_pd_global(uint64_t,MaxRAM,                    128ULL*G);
-define_pd_global(intx, RegisterCostAreaRatio,        16000);
-
-// Peephole and CISC spilling both break the graph, and so makes the
-// scheduler sick.
-define_pd_global(bool, OptoPeephole,                 false);
-define_pd_global(bool, UseCISCSpill,                 false);
-define_pd_global(bool, OptoScheduling,               true);
-define_pd_global(bool, OptoBundling,                 false);
-define_pd_global(bool, OptoRegScheduling,            false);
-define_pd_global(bool, SuperWordLoopUnrollAnalysis,  true);
-define_pd_global(bool, IdealizeClearArrayNode,       true);
-
-define_pd_global(intx, ReservedCodeCacheSize,        48*M);
-define_pd_global(intx, NonProfiledCodeHeapSize,      21*M);
-define_pd_global(intx, ProfiledCodeHeapSize,         22*M);
-define_pd_global(intx, NonNMethodCodeHeapSize,       5*M );
-define_pd_global(uintx, CodeCacheMinBlockLength,     6);
-define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
-
-// Ergonomics related flags
-define_pd_global(bool, NeverActAsServerClassMachine, false);
-
-define_pd_global(bool, TrapBasedRangeChecks,         false); // Not needed.
-
-#endif // CPU_RISCV_C2_GLOBALS_RISCV_HPP

src/hotspot/cpu/riscv/c2_init_riscv.cpp

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2019, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "opto/compile.hpp"
-#include "opto/node.hpp"
-
-// processor dependent initialization for riscv
-
-extern void reg_mask_init();
-
-void Compile::pd_compiler2_init() {
-  guarantee(CodeEntryAlignment >= InteriorEntryAlignment, "" );
-  reg_mask_init();
-}

src/hotspot/cpu/riscv/c2_safepointPollStubTable_riscv.cpp

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
-#include "opto/compile.hpp"
-#include "opto/node.hpp"
-#include "opto/output.hpp"
-#include "runtime/sharedRuntime.hpp"
-
-#define __ masm.
-void C2SafepointPollStubTable::emit_stub_impl(MacroAssembler& masm, C2SafepointPollStub* entry) const {
-  assert(SharedRuntime::polling_page_return_handler_blob() != NULL,
-         "polling page return stub not created yet");
-  address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
-  RuntimeAddress callback_addr(stub);
-
-  __ bind(entry->_stub_label);
-  InternalAddress safepoint_pc(masm.pc() - masm.offset() + entry->_safepoint_offset);
-  masm.code_section()->relocate(masm.pc(), safepoint_pc.rspec());
-  __ la(t0, safepoint_pc.target());
-  __ sd(t0, Address(xthread, JavaThread::saved_exception_pc_offset()));
-  __ far_jump(callback_addr);
-}
-#undef __

src/hotspot/cpu/riscv/codeBuffer_riscv.hpp

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. 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.
- *
- */
-
-#ifndef CPU_RISCV_CODEBUFFER_RISCV_HPP
-#define CPU_RISCV_CODEBUFFER_RISCV_HPP
-
-private:
-  void pd_initialize() {}
-
-public:
-  void flush_bundle(bool start_new_bundle) {}
-
-#endif // CPU_RISCV_CODEBUFFER_RISCV_HPP