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

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2016, 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) 2015, 2017, 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.
*** 20,47 ****
   * 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.asm.sparc.SPARCAssembler.BPCC;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.CBCOND;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.INSTRUCTION_SIZE;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.Annul.ANNUL;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_TAKEN;
  import static org.graalvm.compiler.lir.sparc.SPARCMove.loadFromConstantTable;
- import static jdk.vm.ci.code.ValueUtil.asRegister;
- import static jdk.vm.ci.sparc.SPARC.g0;
  
  import org.graalvm.compiler.asm.Assembler.LabelHint;
  import org.graalvm.compiler.asm.Label;
  import org.graalvm.compiler.asm.sparc.SPARCAssembler.CC;
  import org.graalvm.compiler.asm.sparc.SPARCAssembler.ConditionFlag;
  import org.graalvm.compiler.asm.sparc.SPARCMacroAssembler;
  import org.graalvm.compiler.core.common.calc.Condition;
  import org.graalvm.compiler.lir.LIRInstructionClass;
  import org.graalvm.compiler.lir.LabelRef;
  import org.graalvm.compiler.lir.SwitchStrategy;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  import org.graalvm.compiler.lir.sparc.SPARCControlFlow;
  import org.graalvm.compiler.lir.sparc.SPARCDelayedControlTransfer;
  
  import jdk.vm.ci.code.Register;
--- 20,48 ----
   * 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.code.ValueUtil.asRegister;
+ import static jdk.vm.ci.sparc.SPARC.g0;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BPCC;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.CBCOND;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.INSTRUCTION_SIZE;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.Annul.ANNUL;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_TAKEN;
  import static org.graalvm.compiler.lir.sparc.SPARCMove.loadFromConstantTable;
  
  import org.graalvm.compiler.asm.Assembler.LabelHint;
  import org.graalvm.compiler.asm.Label;
  import org.graalvm.compiler.asm.sparc.SPARCAssembler.CC;
  import org.graalvm.compiler.asm.sparc.SPARCAssembler.ConditionFlag;
  import org.graalvm.compiler.asm.sparc.SPARCMacroAssembler;
  import org.graalvm.compiler.core.common.calc.Condition;
  import org.graalvm.compiler.lir.LIRInstructionClass;
  import org.graalvm.compiler.lir.LabelRef;
  import org.graalvm.compiler.lir.SwitchStrategy;
+ import org.graalvm.compiler.lir.Variable;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  import org.graalvm.compiler.lir.sparc.SPARCControlFlow;
  import org.graalvm.compiler.lir.sparc.SPARCDelayedControlTransfer;
  
  import jdk.vm.ci.code.Register;
*** 52,62 ****
  import jdk.vm.ci.sparc.SPARC.CPUFeature;
  
  final class SPARCHotSpotStrategySwitchOp extends SPARCControlFlow.StrategySwitchOp {
      public static final LIRInstructionClass<SPARCHotSpotStrategySwitchOp> TYPE = LIRInstructionClass.create(SPARCHotSpotStrategySwitchOp.class);
  
!     SPARCHotSpotStrategySwitchOp(Value constantTableBase, SwitchStrategy strategy, LabelRef[] keyTargets, LabelRef defaultTarget, Value key, Value scratch) {
          super(TYPE, constantTableBase, strategy, keyTargets, defaultTarget, key, scratch);
      }
  
      public class HotSpotSwitchClosure extends SwitchClosure {
          protected HotSpotSwitchClosure(Register keyRegister, Register constantBaseRegister, CompilationResultBuilder crb, SPARCMacroAssembler masm) {
--- 53,63 ----
  import jdk.vm.ci.sparc.SPARC.CPUFeature;
  
  final class SPARCHotSpotStrategySwitchOp extends SPARCControlFlow.StrategySwitchOp {
      public static final LIRInstructionClass<SPARCHotSpotStrategySwitchOp> TYPE = LIRInstructionClass.create(SPARCHotSpotStrategySwitchOp.class);
  
!     SPARCHotSpotStrategySwitchOp(Value constantTableBase, SwitchStrategy strategy, LabelRef[] keyTargets, LabelRef defaultTarget, AllocatableValue key, Variable scratch) {
          super(TYPE, constantTableBase, strategy, keyTargets, defaultTarget, key, scratch);
      }
  
      public class HotSpotSwitchClosure extends SwitchClosure {
          protected HotSpotSwitchClosure(Register keyRegister, Register constantBaseRegister, CompilationResultBuilder crb, SPARCMacroAssembler masm) {