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

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2018, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 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.
*** 46,56 ****
  import java.util.ArrayList;
  import java.util.HashSet;
  import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
  
- import jdk.internal.vm.compiler.collections.EconomicMap;
  import jdk.internal.vm.compiler.collections.EconomicSet;
  import jdk.internal.vm.compiler.collections.Equivalence;
  import org.graalvm.compiler.asm.Assembler;
  import org.graalvm.compiler.asm.Label;
  import org.graalvm.compiler.asm.sparc.SPARCAddress;
--- 46,55 ----
*** 58,68 ****
  import org.graalvm.compiler.asm.sparc.SPARCMacroAssembler;
  import org.graalvm.compiler.asm.sparc.SPARCMacroAssembler.ScratchRegister;
  import org.graalvm.compiler.code.CompilationResult;
  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;
--- 57,66 ----
*** 75,87 ****
  import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.hotspot.stubs.Stub;
  import org.graalvm.compiler.lir.InstructionValueConsumer;
  import org.graalvm.compiler.lir.LIR;
- import org.graalvm.compiler.lir.LIRFrameState;
  import org.graalvm.compiler.lir.LIRInstruction;
- import org.graalvm.compiler.lir.StandardOp.SaveRegistersOp;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
  import org.graalvm.compiler.lir.asm.DataBuilder;
  import org.graalvm.compiler.lir.asm.FrameContext;
  import org.graalvm.compiler.lir.framemap.FrameMap;
--- 73,83 ----
*** 133,143 ****
              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);
      }
  
--- 129,140 ----
              CounterKey m = counters.computeIfAbsent(name, (n) -> DebugContext.counter(n));
              m.add(debug, count);
          }
      }
  
!     @Override
!     protected FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
          RegisterConfig registerConfigNonNull = registerConfig == null ? getCodeCache().getRegisterConfig() : registerConfig;
          FrameMap frameMap = new SPARCFrameMap(getCodeCache(), registerConfigNonNull, this);
          return new SPARCFrameMapBuilder(frameMap, getCodeCache(), registerConfigNonNull);
      }
  
*** 145,160 ****
      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));
      }
  
      @Override
--- 142,151 ----
*** 244,257 ****
          if (deoptimizationRescueSlot != null && stub == null) {
              crb.compilationResult.setCustomStackAreaOffset(deoptimizationRescueSlot);
          }
  
          if (stub != null) {
!             // Even on sparc we need to save floating point registers
!             EconomicSet<Register> destroyedCallerRegisters = gatherDestroyedCallerRegisters(lir);
!             EconomicMap<LIRFrameState, SaveRegistersOp> calleeSaveInfo = gen.getCalleeSaveInfo();
!             updateStub(stub, destroyedCallerRegisters, calleeSaveInfo, frameMap);
          }
          assert registerSizePredictionValidator(crb, debug);
          return crb;
      }
  
--- 235,245 ----
          if (deoptimizationRescueSlot != null && stub == null) {
              crb.compilationResult.setCustomStackAreaOffset(deoptimizationRescueSlot);
          }
  
          if (stub != null) {
!             updateStub(stub, gen, frameMap);
          }
          assert registerSizePredictionValidator(crb, debug);
          return crb;
      }