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

*** 61,70 ****
--- 61,71 ----
  import org.graalvm.compiler.code.DataSection;
  import org.graalvm.compiler.code.DataSection.Data;
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
  import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
+ import org.graalvm.compiler.core.gen.LIRGenerationProvider;
  import org.graalvm.compiler.core.sparc.SPARCNodeMatchRules;
  import org.graalvm.compiler.debug.CounterKey;
  import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotDataBuilder;
*** 107,117 ****
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  /**
   * HotSpot SPARC specific backend.
   */
! public class SPARCHotSpotBackend extends HotSpotHostBackend {
  
      private static final SizeEstimateStatistics CONSTANT_ESTIMATED_STATS = new SizeEstimateStatistics("ESTIMATE");
      private static final SizeEstimateStatistics CONSTANT_ACTUAL_STATS = new SizeEstimateStatistics("ACTUAL");
  
      public SPARCHotSpotBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
--- 108,118 ----
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  /**
   * HotSpot SPARC specific backend.
   */
! public class SPARCHotSpotBackend extends HotSpotHostBackend implements LIRGenerationProvider {
  
      private static final SizeEstimateStatistics CONSTANT_ESTIMATED_STATS = new SizeEstimateStatistics("ESTIMATE");
      private static final SizeEstimateStatistics CONSTANT_ACTUAL_STATS = new SizeEstimateStatistics("ACTUAL");
  
      public SPARCHotSpotBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
*** 132,160 ****
              CounterKey m = counters.computeIfAbsent(name, (n) -> DebugContext.counter(n));
              m.add(debug, count);
          }
      }
  
!     @Override
!     public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
          RegisterConfig registerConfigNonNull = registerConfig == null ? getCodeCache().getRegisterConfig() : registerConfig;
!         return new SPARCFrameMapBuilder(newFrameMap(registerConfigNonNull), getCodeCache(), registerConfigNonNull);
!     }
! 
!     @Override
!     public FrameMap newFrameMap(RegisterConfig registerConfig) {
!         return new SPARCFrameMap(getCodeCache(), registerConfig, this);
      }
  
      @Override
      public LIRGeneratorTool newLIRGenerator(LIRGenerationResult lirGenRes) {
          return new SPARCHotSpotLIRGenerator(getProviders(), getRuntime().getVMConfig(), lirGenRes);
      }
  
      @Override
!     public LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, FrameMapBuilder frameMapBuilder, StructuredGraph graph, Object stub) {
!         return new HotSpotLIRGenerationResult(compilationId, lir, frameMapBuilder, makeCallingConvention(graph, (Stub) stub), stub, config.requiresReservedStackCheck(graph.getMethods()));
      }
  
      @Override
      public NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) {
          return new SPARCHotSpotNodeLIRBuilder(graph, lirGen, new SPARCNodeMatchRules(lirGen));
--- 133,157 ----
              CounterKey m = counters.computeIfAbsent(name, (n) -> DebugContext.counter(n));
              m.add(debug, count);
          }
      }
  
!     private FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
          RegisterConfig registerConfigNonNull = registerConfig == null ? getCodeCache().getRegisterConfig() : registerConfig;
!         FrameMap frameMap = new SPARCFrameMap(getCodeCache(), registerConfigNonNull, this);
!         return new SPARCFrameMapBuilder(frameMap, getCodeCache(), registerConfigNonNull);
      }
  
      @Override
      public LIRGeneratorTool newLIRGenerator(LIRGenerationResult lirGenRes) {
          return new SPARCHotSpotLIRGenerator(getProviders(), getRuntime().getVMConfig(), lirGenRes);
      }
  
      @Override
!     public LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, RegisterConfig registerConfig, StructuredGraph graph, Object stub) {
!         return new HotSpotLIRGenerationResult(compilationId, lir, newFrameMapBuilder(registerConfig), makeCallingConvention(graph, (Stub) stub), stub,
!                         config.requiresReservedStackCheck(graph.getMethods()));
      }
  
      @Override
      public NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) {
          return new SPARCHotSpotNodeLIRBuilder(graph, lirGen, new SPARCNodeMatchRules(lirGen));
*** 225,246 ****
              masm.restoreWindow();
          }
      }
  
      @Override
-     protected Assembler createAssembler(FrameMap frameMap) {
-         return new SPARCMacroAssembler(getTarget());
-     }
- 
-     @Override
      public CompilationResultBuilder newCompilationResultBuilder(LIRGenerationResult lirGenRes, FrameMap frameMap, CompilationResult compilationResult, CompilationResultBuilderFactory factory) {
          HotSpotLIRGenerationResult gen = (HotSpotLIRGenerationResult) lirGenRes;
          LIR lir = gen.getLIR();
          assert gen.getDeoptimizationRescueSlot() == null || frameMap.frameNeedsAllocating() : "method that can deoptimize must have a frame";
  
          Stub stub = gen.getStub();
!         Assembler masm = createAssembler(frameMap);
          // On SPARC we always use stack frames.
          HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null);
          DataBuilder dataBuilder = new HotSpotDataBuilder(getCodeCache().getTarget());
          OptionValues options = lir.getOptions();
          DebugContext debug = lir.getDebug();
--- 222,238 ----
              masm.restoreWindow();
          }
      }
  
      @Override
      public CompilationResultBuilder newCompilationResultBuilder(LIRGenerationResult lirGenRes, FrameMap frameMap, CompilationResult compilationResult, CompilationResultBuilderFactory factory) {
          HotSpotLIRGenerationResult gen = (HotSpotLIRGenerationResult) lirGenRes;
          LIR lir = gen.getLIR();
          assert gen.getDeoptimizationRescueSlot() == null || frameMap.frameNeedsAllocating() : "method that can deoptimize must have a frame";
  
          Stub stub = gen.getStub();
!         Assembler masm = new SPARCMacroAssembler(getTarget());
          // On SPARC we always use stack frames.
          HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null);
          DataBuilder dataBuilder = new HotSpotDataBuilder(getCodeCache().getTarget());
          OptionValues options = lir.getOptions();
          DebugContext debug = lir.getDebug();