Mercurial > hg > graal-compiler
changeset 22659:5d9dbda5a74a
AMD64: introduce AMD64HotSpotRestoreRbpOp.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Fri, 18 Sep 2015 15:10:05 +0200 |
parents | d08945fe8cb4 |
children | 6d7173d9e720 |
files | graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueOp.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java |
diffstat | 4 files changed, 56 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java Fri Sep 18 15:09:46 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java Fri Sep 18 15:10:05 2015 +0200 @@ -25,35 +25,28 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass; -import com.oracle.graal.lir.Variable; import com.oracle.graal.lir.amd64.AMD64BlockEndOp; import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * @see AMD64HotSpotEpilogueOp */ -abstract class AMD64HotSpotEpilogueBlockEndOp extends AMD64BlockEndOp { +abstract class AMD64HotSpotEpilogueBlockEndOp extends AMD64BlockEndOp implements AMD64HotSpotRestoreRbpOp { protected AMD64HotSpotEpilogueBlockEndOp(LIRInstructionClass<? extends AMD64HotSpotEpilogueBlockEndOp> c) { super(c); } - /** - * The type of location (i.e., stack or register) in which RBP is saved is not known until - * initial LIR generation is finished. Until then, we use a placeholder variable so that LIR - * verification is successful. - */ - private static final Variable PLACEHOLDER = new Variable(LIRKind.value(JavaKind.Long), Integer.MAX_VALUE); - @Use({REG, STACK}) protected AllocatableValue savedRbp = PLACEHOLDER; protected void leaveFrameAndRestoreRbp(CompilationResultBuilder crb, AMD64MacroAssembler masm) { AMD64HotSpotEpilogueOp.leaveFrameAndRestoreRbp(savedRbp, crb, masm); } + public void setSavedRbp(AllocatableValue value) { + savedRbp = value; + } }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueOp.java Fri Sep 18 15:09:46 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueOp.java Fri Sep 18 15:10:05 2015 +0200 @@ -29,33 +29,23 @@ import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; import jdk.internal.jvmci.code.Register; import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass; -import com.oracle.graal.lir.Variable; import com.oracle.graal.lir.amd64.AMD64LIRInstruction; import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Superclass for operations that use the value of RBP saved in a method's prologue. */ -abstract class AMD64HotSpotEpilogueOp extends AMD64LIRInstruction { +abstract class AMD64HotSpotEpilogueOp extends AMD64LIRInstruction implements AMD64HotSpotRestoreRbpOp { protected AMD64HotSpotEpilogueOp(LIRInstructionClass<? extends AMD64HotSpotEpilogueOp> c) { super(c); } - /** - * The type of location (i.e., stack or register) in which RBP is saved is not known until - * initial LIR generation is finished. Until then, we use a placeholder variable so that LIR - * verification is successful. - */ - private static final Variable PLACEHOLDER = new Variable(LIRKind.value(JavaKind.Long), Integer.MAX_VALUE); - - @Use({REG, STACK}) protected AllocatableValue savedRbp = PLACEHOLDER; + @Use({REG, STACK}) private AllocatableValue savedRbp = PLACEHOLDER; protected void leaveFrameAndRestoreRbp(CompilationResultBuilder crb, AMD64MacroAssembler masm) { leaveFrameAndRestoreRbp(savedRbp, crb, masm); @@ -73,4 +63,8 @@ } crb.frameContext.leave(crb); } + + public void setSavedRbp(AllocatableValue value) { + savedRbp = value; + } }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Fri Sep 18 15:09:46 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Fri Sep 18 15:10:05 2015 +0200 @@ -219,13 +219,13 @@ /** * List of epilogue operations that need to restore RBP. */ - List<AMD64HotSpotEpilogueOp> epilogueOps = new ArrayList<>(2); + List<AMD64HotSpotRestoreRbpOp> epilogueOps = new ArrayList<>(2); @Override public <I extends LIRInstruction> I append(I op) { I ret = super.append(op); - if (op instanceof AMD64HotSpotEpilogueOp) { - epilogueOps.add((AMD64HotSpotEpilogueOp) op); + if (op instanceof AMD64HotSpotRestoreRbpOp) { + epilogueOps.add((AMD64HotSpotRestoreRbpOp) op); } return ret; } @@ -535,8 +535,8 @@ ((AMD64HotSpotLIRGenerationResult) getResult()).setDeoptimizationRescueSlot(((AMD64FrameMapBuilder) getResult().getFrameMapBuilder()).allocateDeoptimizationRescueSlot()); } - for (AMD64HotSpotEpilogueOp op : epilogueOps) { - op.savedRbp = savedRbp; + for (AMD64HotSpotRestoreRbpOp op : epilogueOps) { + op.setSavedRbp(savedRbp); } if (BenchmarkCounters.enabled) { // ensure that the rescue slot is available
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java Fri Sep 18 15:10:05 2015 +0200 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2015, 2015, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.graal.hotspot.amd64; + +import jdk.internal.jvmci.amd64.AMD64Kind; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; + +import com.oracle.graal.lir.Variable; + +public interface AMD64HotSpotRestoreRbpOp { + + /** + * The type of location (i.e., stack or register) in which RBP is saved is not known until + * initial LIR generation is finished. Until then, we use a placeholder variable so that LIR + * verification is successful. + */ + Variable PLACEHOLDER = new Variable(LIRKind.value(AMD64Kind.QWORD), Integer.MAX_VALUE); + + void setSavedRbp(AllocatableValue value); +}