src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64RestoreRegistersOp.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.
*** 22,41 ****
   */
  
  
  package org.graalvm.compiler.lir.amd64;
  
- 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.amd64.AMD64MacroAssembler;
  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.amd64.AMD64Kind;
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.code.StackSlot;
--- 22,42 ----
   */
  
  
  package org.graalvm.compiler.lir.amd64;
  
  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.amd64.AMD64MacroAssembler;
  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.amd64.AMD64Kind;
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.code.StackSlot;
*** 43,53 ****
  
  /**
   * Restores registers from stack slots.
   */
  @Opcode("RESTORE_REGISTER")
! public class AMD64RestoreRegistersOp extends AMD64LIRInstruction {
      public static final LIRInstructionClass<AMD64RestoreRegistersOp> TYPE = LIRInstructionClass.create(AMD64RestoreRegistersOp.class);
  
      /**
       * The slots from which the registers are restored.
       */
--- 44,54 ----
  
  /**
   * Restores registers from stack slots.
   */
  @Opcode("RESTORE_REGISTER")
! public class AMD64RestoreRegistersOp extends AMD64LIRInstruction implements StandardOp.RestoreRegistersOp {
      public static final LIRInstructionClass<AMD64RestoreRegistersOp> TYPE = LIRInstructionClass.create(AMD64RestoreRegistersOp.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, AMD64MacroAssembler masm, Register result, StackSlot input) {
          AMD64Move.stack2reg((AMD64Kind) input.getPlatformKind(), crb, masm, result, input);
      }
--- 69,79 ----
          this.slots = values;
          this.save = save;
      }
  
      protected Register[] getSavedRegisters() {
!         return save.getSavedRegisters();
      }
  
      protected void restoreRegister(CompilationResultBuilder crb, AMD64MacroAssembler masm, Register result, StackSlot input) {
          AMD64Move.stack2reg((AMD64Kind) input.getPlatformKind(), crb, masm, result, input);
      }