Mercurial > hg > truffle
changeset 18432:6b58802e45b2
Revert Backend.frameMap(FrameMapBuilder) to Backend.frameMap(RegisterConfig).
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Mon, 10 Nov 2014 18:37:28 +0100 |
parents | 84ac6a1a0dcb |
children | a0cd3a1e7d7d |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/DelayedFrameMapBuilder.java |
diffstat | 6 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Wed Nov 05 20:16:00 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Mon Nov 10 18:37:28 2014 +0100 @@ -73,7 +73,7 @@ */ public abstract FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig); - public abstract FrameMap newFrameMap(FrameMapBuilder frameMapBuilder); + public abstract FrameMap newFrameMap(RegisterConfig registerConfig); public abstract LIRGeneratorTool newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes);
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Wed Nov 05 20:16:00 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Mon Nov 10 18:37:28 2014 +0100 @@ -71,8 +71,8 @@ } @Override - public FrameMap newFrameMap(FrameMapBuilder frameMapBuilder) { - return new AMD64FrameMap(getCodeCache(), frameMapBuilder.getRegisterConfig()); + public FrameMap newFrameMap(RegisterConfig registerConfig) { + return new AMD64FrameMap(getCodeCache(), registerConfig); } @Override
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Wed Nov 05 20:16:00 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Mon Nov 10 18:37:28 2014 +0100 @@ -393,8 +393,8 @@ * Use the HSAIL register set when the compilation target is HSAIL. */ @Override - public FrameMap newFrameMap(FrameMapBuilder frameMapBuilder) { - return new HSAILFrameMap(getCodeCache(), frameMapBuilder.getRegisterConfig()); + public FrameMap newFrameMap(RegisterConfig registerConfig) { + return new HSAILFrameMap(getCodeCache(), registerConfig); } @Override
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Wed Nov 05 20:16:00 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Mon Nov 10 18:37:28 2014 +0100 @@ -161,8 +161,8 @@ } @Override - public FrameMap newFrameMap(FrameMapBuilder frameMapBuilder) { - return new PTXFrameMap(getCodeCache(), frameMapBuilder.getRegisterConfig()); + public FrameMap newFrameMap(RegisterConfig registerConfig) { + return new PTXFrameMap(getCodeCache(), registerConfig); } /**
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Wed Nov 05 20:16:00 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Mon Nov 10 18:37:28 2014 +0100 @@ -77,8 +77,8 @@ } @Override - public FrameMap newFrameMap(FrameMapBuilder frameMapBuilder) { - return new SPARCFrameMap(getCodeCache(), frameMapBuilder.getRegisterConfig()); + public FrameMap newFrameMap(RegisterConfig registerConfig) { + return new SPARCFrameMap(getCodeCache(), registerConfig); } @Override
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/DelayedFrameMapBuilder.java Wed Nov 05 20:16:00 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/DelayedFrameMapBuilder.java Mon Nov 10 18:37:28 2014 +0100 @@ -37,7 +37,7 @@ @FunctionalInterface public interface FrameMapFactory { - FrameMap newFrameMap(FrameMapBuilder frameMapBuilder); + FrameMap newFrameMap(RegisterConfig registerConfig); } private final RegisterConfig registerConfig; @@ -181,7 +181,7 @@ } public FrameMap buildFrameMap(LIRGenerationResult res) { - FrameMap frameMap = factory.newFrameMap(this); + FrameMap frameMap = factory.newFrameMap(registerConfig); HashMap<VirtualStackSlot, StackSlot> mapping = new HashMap<>(); // fill mapStackSlots(frameMap, mapping);