src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2018, Red Hat Inc. 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
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2018, Red Hat Inc. 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
*** 23,53 ****
   */
  
  
  package org.graalvm.compiler.lir.aarch64;
  
- import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
  import static jdk.vm.ci.code.ValueUtil.asStackSlot;
  import static jdk.vm.ci.code.ValueUtil.isStackSlot;
  
  import java.util.Arrays;
  
  import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
  import org.graalvm.compiler.lir.LIRInstructionClass;
  import org.graalvm.compiler.lir.LIRValueUtil;
  import org.graalvm.compiler.lir.Opcode;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.code.StackSlot;
  import jdk.vm.ci.meta.AllocatableValue;
  
  /**
   * Restores registers from stack slots.
   */
  @Opcode("RESTORE_REGISTER")
! public class AArch64RestoreRegistersOp extends AArch64LIRInstruction {
      public static final LIRInstructionClass<AArch64RestoreRegistersOp> TYPE = LIRInstructionClass.create(AArch64RestoreRegistersOp.class);
  
      /**
       * The slots from which the registers are restored.
       */
--- 23,54 ----
   */
  
  
  package org.graalvm.compiler.lir.aarch64;
  
  import static jdk.vm.ci.code.ValueUtil.asStackSlot;
  import static jdk.vm.ci.code.ValueUtil.isStackSlot;
+ import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
  
  import java.util.Arrays;
  
  import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
  import org.graalvm.compiler.lir.LIRInstructionClass;
  import org.graalvm.compiler.lir.LIRValueUtil;
  import org.graalvm.compiler.lir.Opcode;
+ import org.graalvm.compiler.lir.StandardOp;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.code.StackSlot;
  import jdk.vm.ci.meta.AllocatableValue;
  
  /**
   * Restores registers from stack slots.
   */
  @Opcode("RESTORE_REGISTER")
! public class AArch64RestoreRegistersOp extends AArch64LIRInstruction implements StandardOp.RestoreRegistersOp {
      public static final LIRInstructionClass<AArch64RestoreRegistersOp> TYPE = LIRInstructionClass.create(AArch64RestoreRegistersOp.class);
  
      /**
       * The slots from which the registers are restored.
       */
*** 68,78 ****
          this.slots = values;
          this.save = save;
      }
  
      protected Register[] getSavedRegisters() {
!         return save.savedRegisters;
      }
  
      protected void restoreRegister(CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, StackSlot input) {
          AArch64Move.stack2reg(crb, masm, result.asValue(), input);
      }
--- 69,79 ----
          this.slots = values;
          this.save = save;
      }
  
      protected Register[] getSavedRegisters() {
!         return save.getSavedRegisters();
      }
  
      protected void restoreRegister(CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, StackSlot input) {
          AArch64Move.stack2reg(crb, masm, result.asValue(), input);
      }