Mercurial > hg > truffle
changeset 18390:ce15cc6af5fe
Additional constructor for AMD64HotSpotLIRGenerator.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Mon, 17 Nov 2014 11:51:08 +0100 |
parents | 104be1322fb7 |
children | 810222d74f7c |
files | graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java |
diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Sun Nov 16 16:08:57 2014 -0800 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Mon Nov 17 11:51:08 2014 +0100 @@ -35,6 +35,7 @@ import com.oracle.graal.compiler.amd64.*; import com.oracle.graal.compiler.common.*; import com.oracle.graal.compiler.common.calc.*; +import com.oracle.graal.compiler.common.spi.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.HotSpotVMConfig.CompressEncoding; import com.oracle.graal.hotspot.amd64.AMD64HotSpotMove.HotSpotStoreConstantOp; @@ -63,7 +64,11 @@ private HotSpotLockStack lockStack; protected AMD64HotSpotLIRGenerator(HotSpotProviders providers, HotSpotVMConfig config, CallingConvention cc, LIRGenerationResult lirGenRes) { - super(new HotSpotLIRKindTool(providers.getCodeCache().getTarget().wordKind), providers, cc, lirGenRes); + this(new HotSpotLIRKindTool(providers.getCodeCache().getTarget().wordKind), providers, config, cc, lirGenRes); + } + + protected AMD64HotSpotLIRGenerator(LIRKindTool lirKindTool, HotSpotProviders providers, HotSpotVMConfig config, CallingConvention cc, LIRGenerationResult lirGenRes) { + super(lirKindTool, providers, cc, lirGenRes); assert config.basicLockSize == 8; this.config = config; }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java Sun Nov 16 16:08:57 2014 -0800 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java Mon Nov 17 11:51:08 2014 +0100 @@ -103,6 +103,10 @@ return providers.getForeignCalls(); } + protected LIRKindTool getLIRKindTool() { + return lirKindTool; + } + @Override public Variable newVariable(LIRKind lirKind) { return new Variable(lirKind, res.getLIR().nextVariable());