src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCArrayEqualsOp.java

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 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) 2013, 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,42 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.lir.sparc;
  
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BPCC;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.Annul.ANNUL;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.Annul.NOT_ANNUL;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_NOT_TAKEN;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_TAKEN;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.CC.Xcc;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.ConditionFlag.Equal;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.ConditionFlag.Less;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.ConditionFlag.NotEqual;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
- import static jdk.vm.ci.code.ValueUtil.asRegister;
- import static jdk.vm.ci.sparc.SPARC.g0;
- import static jdk.vm.ci.sparc.SPARCKind.WORD;
  
  import java.lang.reflect.Array;
  import java.lang.reflect.Field;
  
  import org.graalvm.compiler.asm.Label;
--- 20,42 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.lir.sparc;
  
+ import static jdk.vm.ci.code.ValueUtil.asRegister;
+ import static jdk.vm.ci.sparc.SPARC.g0;
+ import static jdk.vm.ci.sparc.SPARCKind.WORD;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BPCC;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.Annul.ANNUL;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.Annul.NOT_ANNUL;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_NOT_TAKEN;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_TAKEN;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.CC.Xcc;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.ConditionFlag.Equal;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.ConditionFlag.Less;
  import static org.graalvm.compiler.asm.sparc.SPARCAssembler.ConditionFlag.NotEqual;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
  
  import java.lang.reflect.Array;
  import java.lang.reflect.Field;
  
  import org.graalvm.compiler.asm.Label;
*** 47,58 ****
  import org.graalvm.compiler.lir.Opcode;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
  
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.meta.JavaKind;
- import jdk.vm.ci.meta.Value;
  import jdk.vm.ci.sparc.SPARCKind;
  import sun.misc.Unsafe;
  
  /**
   * Emits code which compares two arrays of the same length.
--- 47,58 ----
  import org.graalvm.compiler.lir.Opcode;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
  
  import jdk.vm.ci.code.Register;
+ import jdk.vm.ci.meta.AllocatableValue;
  import jdk.vm.ci.meta.JavaKind;
  import jdk.vm.ci.sparc.SPARCKind;
  import sun.misc.Unsafe;
  
  /**
   * Emits code which compares two arrays of the same length.
*** 64,84 ****
  
      private final JavaKind kind;
      private final int arrayBaseOffset;
      private final int arrayIndexScale;
  
!     @Def({REG}) protected Value resultValue;
!     @Alive({REG}) protected Value array1Value;
!     @Alive({REG}) protected Value array2Value;
!     @Alive({REG}) protected Value lengthValue;
!     @Temp({REG}) protected Value temp1;
!     @Temp({REG}) protected Value temp2;
!     @Temp({REG}) protected Value temp3;
!     @Temp({REG}) protected Value temp4;
!     @Temp({REG}) protected Value temp5;
  
!     public SPARCArrayEqualsOp(LIRGeneratorTool tool, JavaKind kind, Value result, Value array1, Value array2, Value length) {
          super(TYPE, SIZE);
          this.kind = kind;
  
          Class<?> arrayClass = Array.newInstance(kind.toJavaClass(), 0).getClass();
          this.arrayBaseOffset = UNSAFE.arrayBaseOffset(arrayClass);
--- 64,84 ----
  
      private final JavaKind kind;
      private final int arrayBaseOffset;
      private final int arrayIndexScale;
  
!     @Def({REG}) protected AllocatableValue resultValue;
!     @Alive({REG}) protected AllocatableValue array1Value;
!     @Alive({REG}) protected AllocatableValue array2Value;
!     @Alive({REG}) protected AllocatableValue lengthValue;
!     @Temp({REG}) protected AllocatableValue temp1;
!     @Temp({REG}) protected AllocatableValue temp2;
!     @Temp({REG}) protected AllocatableValue temp3;
!     @Temp({REG}) protected AllocatableValue temp4;
!     @Temp({REG}) protected AllocatableValue temp5;
  
!     public SPARCArrayEqualsOp(LIRGeneratorTool tool, JavaKind kind, AllocatableValue result, AllocatableValue array1, AllocatableValue array2, AllocatableValue length) {
          super(TYPE, SIZE);
          this.kind = kind;
  
          Class<?> arrayClass = Array.newInstance(kind.toJavaClass(), 0).getClass();
          this.arrayBaseOffset = UNSAFE.arrayBaseOffset(arrayClass);