# HG changeset patch # User Josef Eisl # Date 1395134907 -3600 # Node ID 6352a2b94ca7e7817ddce7c1ad50c186a9bab8ec # Parent c3242028cc44bc7242bae1b51edd31b6b42efbd5 LIRGenerator: add getter for DebugInfoBuilder and CallingConvention. diff -r c3242028cc44 -r 6352a2b94ca7 graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXLIRGenerator.java --- a/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXLIRGenerator.java Mon Mar 17 20:05:45 2014 +0100 +++ b/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXLIRGenerator.java Tue Mar 18 10:28:27 2014 +0100 @@ -137,7 +137,7 @@ @Override public void emitPrologue(StructuredGraph graph) { // Need to emit .param directives based on incoming arguments and return value - CallingConvention incomingArguments = cc; + CallingConvention incomingArguments = getCallingConvention(); Object returnObject = incomingArguments.getReturn(); AllocatableValue[] params = incomingArguments.getArguments(); int argCount = incomingArguments.getArgumentCount(); diff -r c3242028cc44 -r 6352a2b94ca7 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Mon Mar 17 20:05:45 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Tue Mar 18 10:28:27 2014 +0100 @@ -69,12 +69,11 @@ } private final FrameMap frameMap; - private final NodeMap nodeOperands; + private final Providers providers; + private final CallingConvention cc; - private final Providers providers; - protected final CallingConvention cc; - - protected final DebugInfoBuilder debugInfoBuilder; + private final NodeMap nodeOperands; + private final DebugInfoBuilder debugInfoBuilder; protected Block currentBlock; private final int traceLevel; @@ -378,7 +377,7 @@ return new LIRFrameState(null, null, null); } assert state != null; - return debugInfoBuilder.build(state, exceptionEdge); + return getDebugInfoBuilder().build(state, exceptionEdge); } /** @@ -523,7 +522,7 @@ } protected void emitPrologue(StructuredGraph graph) { - CallingConvention incomingArguments = cc; + CallingConvention incomingArguments = getCallingConvention(); Value[] params = new Value[incomingArguments.getArgumentCount()]; for (int i = 0; i < params.length; i++) { @@ -864,6 +863,14 @@ return frameMap; } + public CallingConvention getCallingConvention() { + return cc; + } + + public DebugInfoBuilder getDebugInfoBuilder() { + return debugInfoBuilder; + } + @Override public void beforeRegisterAllocation() { insertConstantLoads(); diff -r c3242028cc44 -r 6352a2b94ca7 graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java --- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Mon Mar 17 20:05:45 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Tue Mar 18 10:28:27 2014 +0100 @@ -152,13 +152,13 @@ @Override public StackSlot getLockSlot(int lockDepth) { - return ((HotSpotDebugInfoBuilder) debugInfoBuilder).lockStack().makeLockSlot(lockDepth); + return ((HotSpotDebugInfoBuilder) getDebugInfoBuilder()).lockStack().makeLockSlot(lockDepth); } @Override protected void emitPrologue(StructuredGraph graph) { - CallingConvention incomingArguments = cc; + CallingConvention incomingArguments = getCallingConvention(); Value[] params = new Value[incomingArguments.getArgumentCount() + 1]; for (int i = 0; i < params.length - 1; i++) { diff -r c3242028cc44 -r 6352a2b94ca7 graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerator.java --- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerator.java Mon Mar 17 20:05:45 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerator.java Tue Mar 18 10:28:27 2014 +0100 @@ -79,7 +79,7 @@ @Override public StackSlot getLockSlot(int lockDepth) { - return ((HotSpotDebugInfoBuilder) debugInfoBuilder).lockStack().makeLockSlot(lockDepth); + return ((HotSpotDebugInfoBuilder) getDebugInfoBuilder()).lockStack().makeLockSlot(lockDepth); } @Override