Assorted improvements.

Author: peter-hofer

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMulAddOp.java

@@ -128,6 +128,11 @@ public AMD64BigIntegerMulAddOp(
         };
     }
 
+    @Override
+    public boolean modifiesStackPointer() {
+        return spillR13;
+    }
+
     @Override
     public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
         GraalError.guarantee(outValue.getPlatformKind().equals(AMD64Kind.QWORD), "Invalid outValue kind: %s", outValue);

substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java

@@ -148,10 +148,7 @@ public SubstrateAArch64RegisterConfig(ConfigKind config, MetaAccessProvider meta
          * or sp.
          */
         regs.remove(r31);
-        /*
-         * If enabled, the heapBaseRegister and threadRegister are r27 and r28, respectively. See
-         * AArch64ReservedRegisters and ReservedRegisters for more information.
-         */
+        /* Reserved registers: see AArch64ReservedRegisters and ReservedRegisters for details. */
         regs.remove(ReservedRegisters.singleton().getHeapBaseRegister());
         regs.remove(ReservedRegisters.singleton().getThreadRegister());
         regs.remove(ReservedRegisters.singleton().getCodeBaseRegister());

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ReservedRegisters.java

@@ -94,9 +94,7 @@ public Register getCodeBaseRegister() {
     public boolean isAllowedInFrameState(JavaValue value) {
         if (value instanceof RegisterValue rv) {
             Register r = rv.getRegister();
-            if (r.equals(threadRegister) || r.equals(heapBaseRegister) || r.equals(codeBaseRegister)) {
-                return true;
-            }
+            return r.equals(threadRegister) || r.equals(heapBaseRegister) || r.equals(codeBaseRegister);
         }
         return false;
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java

@@ -891,6 +891,9 @@ public void printDiagnostics(Log log, ErrorContext context, int maxDiagnosticLev
             log.string("Runtime information:").indent(true);
             log.string("Isolate id: ").signed(Isolates.getIsolateId()).newline();
             log.string("Heap base: ").zhex(KnownIntrinsics.heapBase()).newline();
+            if (SubstrateOptions.RelativeCodePointers.getValue()) {
+                log.string("Code base: ").zhex(KnownIntrinsics.codeBase()).newline();
+            }
             log.string("CGlobalData base: ").zhex(CGlobalDataInfo.CGLOBALDATA_RUNTIME_BASE_ADDRESS.getPointer()).newline();
 
             if (Container.singleton().isContainerized()) {
@@ -1142,6 +1145,11 @@ private static final class ImageCodeLocationInfoPrinter {
          * NOTE: this method may only be called by a single thread.
          */
         public boolean printLocationInfo(Log log, UnsignedWord value) {
+            if (SubstrateOptions.RelativeCodePointers.getValue() && KnownIntrinsics.codeBase().equal(value)) {
+                log.string("is the code base");
+                return true;
+            }
+
             CodeInfo imageCodeInfo = CodeInfoTable.getFirstImageCodeInfo();
             while (imageCodeInfo.isNonNull()) {
                 if (imageCodeInfo.equal(value)) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -1453,7 +1453,11 @@ private static void validateRelativeCodePointers(HostedOptionKey<Boolean> option
 
             UserError.guarantee(Platform.includedIn(PLATFORM_JNI.class) || Platform.includedIn(NATIVE_ONLY.class), "%s is supported only with hardware target platforms.", enabledOption);
 
-            // Offsets need to be passed on between layer builds rather than using symbol names.
+            /*
+             * GR-59707: Dispatch tables must potentially be patched at runtime still. Method
+             * offsets for dispatch need to be passed on between layer builds rather than using
+             * symbol names.
+             */
             UserError.guarantee(!ImageLayerBuildingSupport.buildingImageLayer(), "%s is currently not supported with layered images.", enabledOption);
 
             // The concept of a code base would need to be introduced in the LLVM backend first.

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/SetThreadAndHeapBasePrologue.java

@@ -30,7 +30,7 @@
 import com.oracle.svm.core.c.function.CEntryPointOptions;
 
 /**
- * Required by legacy code. Use {@link InitializeReservedRegistersPrologue} instead.
+ * GR-64740: required by legacy code. Use {@link InitializeReservedRegistersPrologue} instead.
  */
 public class SetThreadAndHeapBasePrologue implements CEntryPointOptions.Prologue {
     @Uninterruptible(reason = "prologue")

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java

@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.graal.snippets;
 
+import static com.oracle.svm.core.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
 import static com.oracle.svm.core.graal.nodes.WriteCodeBaseNode.writeCurrentVMCodeBase;
 import static com.oracle.svm.core.graal.nodes.WriteCurrentVMThreadNode.writeCurrentVMThread;
 import static com.oracle.svm.core.graal.nodes.WriteHeapBaseNode.writeCurrentVMHeapBase;
@@ -201,23 +202,27 @@ static boolean hasHeapBase() {
         return ImageSingletons.lookup(CompressEncoding.class).hasBase();
     }
 
-    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     private static void setHeapBase(PointerBase heapBase) {
         writeCurrentVMHeapBase(heapBase);
         if (MemoryProtectionProvider.isAvailable()) {
             MemoryProtectionProvider.singleton().unlockCurrentIsolate();
         }
     }
 
-    @Uninterruptible(reason = "Called from uninterruptible code.")
+    @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE)
     @NeverInline("Heap base register is set in caller, prevent reads from floating before that.")
     private static void initCodeBase() {
-        ImageCodeInfo imageCodeInfo = MultiLayeredImageSingleton.getForLayer(ImageCodeInfo.class, 0);
+        ImageCodeInfo imageCodeInfo = MultiLayeredImageSingleton.getForLayer(ImageCodeInfo.class, MultiLayeredImageSingleton.INITIAL_LAYER_NUMBER);
         CodePointer codeBase = imageCodeInfo.getCodeStart();
         writeCurrentVMCodeBase(codeBase);
     }
 
-    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    /**
+     * Use {@link #initBaseRegisters} instead. Calling this method is not necessary unless
+     * heap-relative addressing is needed before the heap is fully set up.
+     */
+    @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public static void earlyInitHeapBase(PointerBase heapBase) {
         setHeapBase(heapBase);
     }
@@ -226,7 +231,7 @@ public static void earlyInitHeapBase(PointerBase heapBase) {
      * Sets the heap base register to the provided value. If the code base register is in use,
      * initializes it to contain the code base address.
      */
-    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public static void initBaseRegisters(PointerBase heapBase) {
         setHeapBase(heapBase);
         if (SubstrateOptions.useRelativeCodePointers()) {
@@ -235,7 +240,7 @@ public static void initBaseRegisters(PointerBase heapBase) {
     }
 
     /** Sets the heap base register, and if in use, the code base register, to the given values. */
-    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public static void initBaseRegisters(PointerBase heapBase, PointerBase codeBase) {
         setHeapBase(heapBase);
         if (SubstrateOptions.useRelativeCodePointers()) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/layeredimagesingleton/MultiLayeredImageSingleton.java

@@ -39,6 +39,7 @@ public interface MultiLayeredImageSingleton extends LayeredImageSingleton {
      */
     int UNUSED_LAYER_NUMBER = -1;
     int UNKNOWN_LAYER_NUMBER = 0;
+    int INITIAL_LAYER_NUMBER = 0;
 
     /**
      * Returns an array containing the image singletons installed for {@code key} within all layers.

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/MethodOffset.java

@@ -39,8 +39,7 @@ public final class MethodOffset implements WordBase {
     private final ResolvedJavaMethod method;
 
     public MethodOffset(ResolvedJavaMethod method) {
-        Objects.requireNonNull(method);
-        this.method = method;
+        this.method = Objects.requireNonNull(method);
     }
 
     public ResolvedJavaMethod getMethod() {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SubstrateMethodOffsetConstant.java

@@ -42,7 +42,7 @@ public class SubstrateMethodOffsetConstant implements VMConstant {
     private final MethodOffset offset;
 
     public SubstrateMethodOffsetConstant(MethodOffset offset) {
-        this.offset = offset;
+        this.offset = Objects.requireNonNull(offset);
     }
 
     public MethodOffset offset() {
@@ -61,7 +61,7 @@ public String toValueString() {
 
     @Override
     public String toString() {
-        return "method offset: " + ((offset == null) ? "null" : offset.getMethod().format("%H.%n"));
+        return "method offset: " + offset.getMethod().format("%H.%n");
     }
 
     @Override
@@ -74,6 +74,6 @@ public boolean equals(Object obj) {
 
     @Override
     public int hashCode() {
-        return (offset == null) ? 0 : Objects.hashCode(offset.getMethod());
+        return Objects.hashCode(offset.getMethod());
     }
 }