src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java

*** 20,53 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.sparc;
  
  import static org.graalvm.compiler.core.common.LocationIdentity.any;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER;
- import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.PreferGraalStubs;
  import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.JUMP_ADDRESS;
  import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS;
- import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF;
  import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF_NOFP;
- import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPTIMIZATION_HANDLER;
- import static org.graalvm.compiler.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER;
  import static org.graalvm.compiler.hotspot.replacements.CRC32Substitutions.UPDATE_BYTES_CRC32;
- import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall;
- import static jdk.vm.ci.meta.Value.ILLEGAL;
- import static jdk.vm.ci.sparc.SPARC.i0;
- import static jdk.vm.ci.sparc.SPARC.i1;
- import static jdk.vm.ci.sparc.SPARC.o0;
- import static jdk.vm.ci.sparc.SPARC.o1;
  
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
- import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.word.WordTypes;
  
  import jdk.vm.ci.code.CallingConvention;
  import jdk.vm.ci.code.CodeCacheProvider;
  import jdk.vm.ci.code.RegisterValue;
--- 20,50 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.sparc;
  
+ import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall;
+ import static jdk.vm.ci.meta.Value.ILLEGAL;
+ import static jdk.vm.ci.sparc.SPARC.i0;
+ import static jdk.vm.ci.sparc.SPARC.i1;
+ import static jdk.vm.ci.sparc.SPARC.o0;
+ import static jdk.vm.ci.sparc.SPARC.o1;
  import static org.graalvm.compiler.core.common.LocationIdentity.any;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER;
  import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.JUMP_ADDRESS;
  import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS;
  import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF_NOFP;
  import static org.graalvm.compiler.hotspot.replacements.CRC32Substitutions.UPDATE_BYTES_CRC32;
  
  import org.graalvm.compiler.core.common.LIRKind;
+ import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
  import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.word.WordTypes;
  
  import jdk.vm.ci.code.CallingConvention;
  import jdk.vm.ci.code.CodeCacheProvider;
  import jdk.vm.ci.code.RegisterValue;
*** 67,77 ****
          super(jvmciRuntime, runtime, metaAccess, codeCache, wordTypes);
          this.nativeABICallerSaveRegisters = nativeABICallerSaveRegisters;
      }
  
      @Override
!     public void initialize(HotSpotProviders providers) {
          GraalHotSpotVMConfig config = runtime.getVMConfig();
          TargetDescription target = providers.getCodeCache().getTarget();
          PlatformKind word = target.arch.getWordKind();
  
          // The calling convention for the exception handler stub is (only?) defined in
--- 64,74 ----
          super(jvmciRuntime, runtime, metaAccess, codeCache, wordTypes);
          this.nativeABICallerSaveRegisters = nativeABICallerSaveRegisters;
      }
  
      @Override
!     public void initialize(HotSpotProviders providers, OptionValues options) {
          GraalHotSpotVMConfig config = runtime.getVMConfig();
          TargetDescription target = providers.getCodeCache().getTarget();
          PlatformKind word = target.arch.getWordKind();
  
          // The calling convention for the exception handler stub is (only?) defined in
*** 84,104 ****
          CallingConvention outgoingExceptionCc = new CallingConvention(0, ILLEGAL, outgoingException, outgoingExceptionPc);
          CallingConvention incomingExceptionCc = new CallingConvention(0, ILLEGAL, incomingException, incomingExceptionPc);
          register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER, 0L, PRESERVES_REGISTERS, LEAF_NOFP, outgoingExceptionCc, incomingExceptionCc, NOT_REEXECUTABLE, any()));
          register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, PRESERVES_REGISTERS, LEAF_NOFP, outgoingExceptionCc, incomingExceptionCc, NOT_REEXECUTABLE, any()));
  
-         if (PreferGraalStubs.getValue()) {
-             link(new SPARCDeoptimizationStub(providers, target, registerStubCall(DEOPTIMIZATION_HANDLER, REEXECUTABLE, LEAF, NO_LOCATIONS)));
-             link(new SPARCUncommonTrapStub(providers, target, registerStubCall(UNCOMMON_TRAP_HANDLER, REEXECUTABLE, LEAF, NO_LOCATIONS)));
-         }
- 
          if (config.useCRC32Intrinsics) {
              // This stub does callee saving
              registerForeignCall(UPDATE_BYTES_CRC32, config.updateBytesCRC32Stub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, any());
          }
  
!         super.initialize(providers);
      }
  
      @Override
      public Value[] getNativeABICallerSaveRegisters() {
          return nativeABICallerSaveRegisters;
--- 81,96 ----
          CallingConvention outgoingExceptionCc = new CallingConvention(0, ILLEGAL, outgoingException, outgoingExceptionPc);
          CallingConvention incomingExceptionCc = new CallingConvention(0, ILLEGAL, incomingException, incomingExceptionPc);
          register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER, 0L, PRESERVES_REGISTERS, LEAF_NOFP, outgoingExceptionCc, incomingExceptionCc, NOT_REEXECUTABLE, any()));
          register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, PRESERVES_REGISTERS, LEAF_NOFP, outgoingExceptionCc, incomingExceptionCc, NOT_REEXECUTABLE, any()));
  
          if (config.useCRC32Intrinsics) {
              // This stub does callee saving
              registerForeignCall(UPDATE_BYTES_CRC32, config.updateBytesCRC32Stub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, any());
          }
  
!         super.initialize(providers, options);
      }
  
      @Override
      public Value[] getNativeABICallerSaveRegisters() {
          return nativeABICallerSaveRegisters;