Mercurial > hg > truffle
changeset 5520:e05bb6f6c58b
Merge
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Fri, 08 Jun 2012 15:17:43 +0200 |
| parents | cedae73d9c2a (current diff) bbb1c970cc15 (diff) |
| children | 751b6ab65d54 |
| files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/loop/LoopEx.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/loop/LoopFragmentInside.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/Compiler.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerImpl.java graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/GraalRuntime.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampFactory.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiAddress.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiArchitecture.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiAssumptions.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiBailout.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiBitMap.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiCalleeSaveLayout.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiCallingConvention.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiCodePos.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiCompilationStatistics.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiConstant.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiDebugInfo.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiExceptionHandler.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiFrame.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiGenericCallback.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiKind.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiMonitorValue.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiRegister.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiRegisterConfig.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiRegisterValue.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiRuntimeCall.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiStackSlot.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiTarget.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiTargetMethod.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiUtil.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiValue.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiValueUtil.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiVirtualObject.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/package-info.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiCodeInfo.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiCompiledMethod.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiConstantPool.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptAction.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptReason.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiExceptionHandler.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiExceptionSeen.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiField.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiMethod.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiProfilingInfo.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRegisterAttributes.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRegisterConfig.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiResolvedField.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiResolvedMethod.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiResolvedType.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRuntime.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiSignature.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiType.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiTypeProfile.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/package-info.java |
| diffstat | 367 files changed, 10836 insertions(+), 10584 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/simple/AssignRegisters.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/simple/AssignRegisters.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,8 +24,8 @@ import static com.oracle.graal.alloc.util.LocationUtil.*; -import com.oracle.max.cri.ci.*; import com.oracle.graal.alloc.util.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.LIRInstruction.*; @@ -40,13 +40,13 @@ this.frameMap = frameMap; } - private CiBitMap curRegisterRefMap; - private CiBitMap curFrameRefMap; + private RiBitMap curRegisterRefMap; + private RiBitMap curFrameRefMap; public void execute() { - ValueProcedure useProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return use(value); } }; - ValueProcedure defProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return def(value); } }; - ValueProcedure setReferenceProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return setReference(value); } }; + ValueProcedure useProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return use(value); } }; + ValueProcedure defProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return def(value); } }; + ValueProcedure setReferenceProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return setReference(value); } }; Debug.log("==== start assign registers ===="); for (int i = lir.linearScanOrder().size() - 1; i >= 0; i--) { @@ -70,12 +70,12 @@ if (op.info != null) { Debug.log(" registerRefMap: %s frameRefMap: %s", curRegisterRefMap, curFrameRefMap); - op.info.finish(new CiBitMap(curRegisterRefMap), new CiBitMap(curFrameRefMap), frameMap); + op.info.finish(new RiBitMap(curRegisterRefMap), new RiBitMap(curFrameRefMap), frameMap); if (op instanceof LIRXirInstruction) { LIRXirInstruction xir = (LIRXirInstruction) op; if (xir.infoAfter != null) { - xir.infoAfter.finish(new CiBitMap(curRegisterRefMap), new CiBitMap(curFrameRefMap), frameMap); + xir.infoAfter.finish(new RiBitMap(curRegisterRefMap), new RiBitMap(curFrameRefMap), frameMap); } } } @@ -89,10 +89,10 @@ Debug.log("==== end assign registers ===="); } - private CiValue use(CiValue value) { + private RiValue use(RiValue value) { Debug.log(" use %s", value); if (isLocation(value)) { - CiValue location = asLocation(value).location; + RiValue location = asLocation(value).location; frameMap.setReference(location, curRegisterRefMap, curFrameRefMap); return location; } else { @@ -101,10 +101,10 @@ } } - private CiValue def(CiValue value) { + private RiValue def(RiValue value) { Debug.log(" def %s", value); if (isLocation(value)) { - CiValue location = asLocation(value).location; + RiValue location = asLocation(value).location; frameMap.clearReference(location, curRegisterRefMap, curFrameRefMap); return location; } else { @@ -113,7 +113,7 @@ } } - private CiValue setReference(CiValue value) { + private RiValue setReference(RiValue value) { Debug.log(" setReference %s", value); frameMap.setReference(asLocation(value).location, curRegisterRefMap, curFrameRefMap); return value;
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/simple/DataFlowAnalysis.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/simple/DataFlowAnalysis.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.alloc.simple; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import static com.oracle.graal.lir.ValueUtil.*; import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.LIRInstruction.*; @@ -36,9 +36,9 @@ public class DataFlowAnalysis { private final LIR lir; - private final RiRegisterConfig registerConfig; + private final CiRegisterConfig registerConfig; - public DataFlowAnalysis(LIR lir, RiRegisterConfig registerConfig) { + public DataFlowAnalysis(LIR lir, CiRegisterConfig registerConfig) { this.lir = lir; this.registerConfig = registerConfig; } @@ -57,7 +57,7 @@ return lir.numVariables(); } - private boolean isAllocatableRegister(CiValue value) { + private boolean isAllocatableRegister(RiValue value) { return isRegister(value) && registerConfig.getAttributesMap()[asRegister(value).number].isAllocatable; } @@ -93,14 +93,14 @@ Object entry = killedValues(op.id() + (end ? 1 : 0)); if (entry == null) { // Nothing to do - } else if (entry instanceof CiValue) { - CiValue newValue = proc.doValue((CiValue) entry, null, null); + } else if (entry instanceof RiValue) { + RiValue newValue = proc.doValue((RiValue) entry, null, null); assert newValue == entry : "procedure does not allow to change values"; } else { - CiValue[] values = (CiValue[]) entry; + RiValue[] values = (RiValue[]) entry; for (int i = 0; i < values.length; i++) { if (values[i] != null) { - CiValue newValue = proc.doValue(values[i], null, null); + RiValue newValue = proc.doValue(values[i], null, null); assert newValue == values[i] : "procedure does not allow to change values"; } } @@ -115,7 +115,7 @@ * Numbers all instructions in all blocks. The numbering follows the {@linkplain ComputeLinearScanOrder linear scan order}. */ private void numberInstructions() { - ValueProcedure defProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return setDef(value); } }; + ValueProcedure defProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return setDef(value); } }; int numInstructions = 0; for (Block block : blocks()) { @@ -140,7 +140,7 @@ assert curOpId == numInstructions << 1; } - private CiValue setDef(CiValue value) { + private RiValue setDef(RiValue value) { if (isVariable(value)) { assert definitions[asVariable(value).index] == 0 : "Variable defined twice"; definitions[asVariable(value).index] = curOpId; @@ -154,10 +154,10 @@ private int curOpId; private void backwardDataFlow() { - ValueProcedure inputProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return use(value, curOpId); } }; - ValueProcedure aliveProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return use(value, curOpId + 1); } }; - ValueProcedure tempProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return def(value, true); } }; - ValueProcedure outputProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return def(value, false); } }; + ValueProcedure inputProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return use(value, curOpId); } }; + ValueProcedure aliveProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return use(value, curOpId + 1); } }; + ValueProcedure tempProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return def(value, true); } }; + ValueProcedure outputProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return def(value, false); } }; blockLiveIn = new BitSet[blocks().size()]; registerLive = new BitSet(); @@ -211,7 +211,7 @@ Debug.log("==== end backward data flow analysis ===="); } - private CiValue use(CiValue value, int killOpId) { + private RiValue use(RiValue value, int killOpId) { Debug.log(" use %s", value); if (isVariable(value)) { int variableIdx = asVariable(value).index; @@ -233,7 +233,7 @@ return value; } - private CiValue def(CiValue value, boolean isTemp) { + private RiValue def(RiValue value, boolean isTemp) { Debug.log(" def %s", value); if (isVariable(value)) { int variableIdx = asVariable(value).index; @@ -261,7 +261,7 @@ return value; } - private void kill(CiValue value, int opId) { + private void kill(RiValue value, int opId) { if (opId < 0) { return; } @@ -284,10 +284,10 @@ Object entry = killedValues(opId); if (entry == null) { setKilledValues(opId, value); - } else if (entry instanceof CiValue) { - setKilledValues(opId, new CiValue[] {(CiValue) entry, value}); + } else if (entry instanceof RiValue) { + setKilledValues(opId, new RiValue[] {(RiValue) entry, value}); } else { - CiValue[] killed = (CiValue[]) entry; + RiValue[] killed = (RiValue[]) entry; for (int i = 0; i < killed.length; i++) { if (killed[i] == null) { killed[i] = value;
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/simple/LinearScanAllocator.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/simple/LinearScanAllocator.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,13 @@ */ package com.oracle.graal.alloc.simple; -import static com.oracle.max.cri.ci.CiValueUtil.*; import static com.oracle.graal.alloc.util.LocationUtil.*; - import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiRegister.RegisterFlag; import com.oracle.graal.alloc.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiRegister.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; @@ -60,7 +59,7 @@ } @Override - protected CiValue scratchRegister(Variable spilled) { + protected RiValue scratchRegister(Variable spilled) { GraalInternalError.shouldNotReachHere("needs working implementation"); EnumMap<RegisterFlag, CiRegister[]> categorizedRegs = frameMap.registerConfig.getCategorizedAllocatableRegisters(); @@ -106,7 +105,7 @@ return frameMap.target.arch.registers.length; } - private boolean isAllocatableRegister(CiValue value) { + private boolean isAllocatableRegister(RiValue value) { return isRegister(value) && frameMap.registerConfig.getAttributesMap()[asRegister(value).number].isAllocatable; } @@ -141,8 +140,8 @@ private MoveResolver moveResolver; private LocationMap curLocations; - private CiValue[] curInRegisterState; - private CiValue[] curOutRegisterState; + private RiValue[] curInRegisterState; + private RiValue[] curOutRegisterState; private BitSet curLiveIn; private LIRInstruction curOp; @@ -181,19 +180,19 @@ } private void allocate() { - ValueProcedure recordUseProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return recordUse(value); } }; - ValueProcedure killNonLiveProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return killNonLive(value); } }; - ValueProcedure unblockProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return unblock(value); } }; - ValueProcedure killProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return kill(value); } }; - ValueProcedure blockProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return block(value); } }; - ValueProcedure useProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return use(value, mode, flags); } }; - ValueProcedure defProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return def(value, mode, flags); } }; + ValueProcedure recordUseProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return recordUse(value); } }; + ValueProcedure killNonLiveProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return killNonLive(value); } }; + ValueProcedure unblockProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return unblock(value); } }; + ValueProcedure killProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return kill(value); } }; + ValueProcedure blockProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return block(value); } }; + ValueProcedure useProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return use(value, mode, flags); } }; + ValueProcedure defProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return def(value, mode, flags); } }; Debug.log("==== start linear scan allocation ===="); canonicalSpillLocations = new LocationMap(lir.numVariables()); hintRegisterLocations = new LocationMap(lir.numVariables()); - curInRegisterState = new CiValue[maxRegisterNum()]; - curOutRegisterState = new CiValue[maxRegisterNum()]; + curInRegisterState = new RiValue[maxRegisterNum()]; + curOutRegisterState = new RiValue[maxRegisterNum()]; for (Block block : lir.linearScanOrder()) { Debug.log("start block %s %s", block, block.getLoop()); @@ -273,7 +272,7 @@ Debug.log("==== end linear scan allocation ===="); } - private CiValue killNonLive(CiValue value) { + private RiValue killNonLive(RiValue value) { assert isLocation(value); if (!curLiveIn.get(asLocation(value).variable.index)) { return null; @@ -286,7 +285,7 @@ return value; } - private CiValue unblock(CiValue value) { + private RiValue unblock(RiValue value) { if (isAllocatableRegister(value)) { Debug.log(" unblock register %s", value); int regNum = asRegister(value).number; @@ -296,7 +295,7 @@ return value; } - private CiValue kill(CiValue value) { + private RiValue kill(RiValue value) { if (isVariable(value)) { Location location = curLocations.get(asVariable(value)); Debug.log(" kill location %s", location); @@ -312,7 +311,7 @@ } - private CiValue block(CiValue value) { + private RiValue block(RiValue value) { if (isAllocatableRegister(value)) { Debug.log(" block %s", value); int regNum = asRegister(value).number; @@ -325,14 +324,14 @@ private void spillCallerSaveRegisters() { Debug.log(" spill caller save registers in curInRegisterState %s", Arrays.toString(curInRegisterState)); for (CiRegister reg : frameMap.registerConfig.getCallerSaveRegisters()) { - CiValue in = curInRegisterState[reg.number]; + RiValue in = curInRegisterState[reg.number]; if (in != null && isLocation(in)) { spill(asLocation(in)); } } } - private CiValue recordUse(CiValue value) { + private RiValue recordUse(RiValue value) { if (isVariable(value)) { assert lastUseFor(asVariable(value)) <= curOp.id(); setLastUseFor(asVariable(value), curOp.id()); @@ -341,7 +340,7 @@ return value; } - private CiValue use(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { + private RiValue use(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { assert mode == OperandMode.Input || mode == OperandMode.Alive; if (isVariable(value)) { // State values are not recorded beforehand because it does not matter if they are spilled. Still, it is necessary to record them as used now. @@ -376,7 +375,7 @@ private static final EnumSet<OperandFlag> SPILL_FLAGS = EnumSet.of(OperandFlag.Register, OperandFlag.Stack); - private CiValue def(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { + private RiValue def(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { assert mode == OperandMode.Temp || mode == OperandMode.Output; if (isVariable(value)) { Debug.log(" def %s %s", mode, value); @@ -391,8 +390,8 @@ private void fixupEvicted() { for (int i = 0; i < curInRegisterState.length; i++) { - CiValue in = curInRegisterState[i]; - CiValue out = curOutRegisterState[i]; + RiValue in = curInRegisterState[i]; + RiValue out = curOutRegisterState[i]; if (in != null && in != out && isLocation(in) && curLocations.get(asLocation(in).variable) == in) { Debug.log(" %s was evicted by %s, need to allocate new location", in, out); @@ -409,13 +408,13 @@ private void phiRegisterHints(Block block) { Debug.log(" phi register hints for %s", block); - CiValue[] phiDefinitions = ((StandardOp.PhiLabelOp) block.lir.get(0)).getPhiDefinitions(); + RiValue[] phiDefinitions = ((StandardOp.PhiLabelOp) block.lir.get(0)).getPhiDefinitions(); for (Block pred : block.getPredecessors()) { - CiValue[] phiInputs = ((StandardOp.PhiJumpOp) pred.lir.get(pred.lir.size() - 1)).getPhiInputs(); + RiValue[] phiInputs = ((StandardOp.PhiJumpOp) pred.lir.get(pred.lir.size() - 1)).getPhiInputs(); for (int i = 0; i < phiDefinitions.length; i++) { - CiValue phiDefinition = phiDefinitions[i]; - CiValue phiInput = phiInputs[i]; + RiValue phiDefinition = phiDefinitions[i]; + RiValue phiInput = phiInputs[i]; if (isVariable(phiDefinition)) { Location hintResult = processRegisterHint(asVariable(phiDefinition), OperandMode.Output, phiInput); @@ -427,7 +426,7 @@ } } - private Location processRegisterHint(Variable variable, OperandMode mode, CiValue registerHint) { + private Location processRegisterHint(Variable variable, OperandMode mode, RiValue registerHint) { if (registerHint == null) { return null; } @@ -446,9 +445,9 @@ private Location allocateRegister(final Variable variable, final OperandMode mode, EnumSet<OperandFlag> flags) { if (flags.contains(OperandFlag.RegisterHint)) { - CiValue hintResult = curOp.forEachRegisterHint(variable, mode, new ValueProcedure() { + RiValue hintResult = curOp.forEachRegisterHint(variable, mode, new ValueProcedure() { @Override - public CiValue doValue(CiValue registerHint) { + public RiValue doValue(RiValue registerHint) { return processRegisterHint(variable, mode, registerHint); } }); @@ -457,7 +456,7 @@ } } - CiValue hintResult = processRegisterHint(variable, mode, hintRegisterLocations.get(variable)); + RiValue hintResult = processRegisterHint(variable, mode, hintRegisterLocations.get(variable)); if (hintResult != null) { return asLocation(hintResult); } @@ -519,8 +518,8 @@ } private Location spillCandidate(CiRegister reg) { - CiValue in = curInRegisterState[reg.number]; - CiValue out = curOutRegisterState[reg.number]; + RiValue in = curInRegisterState[reg.number]; + RiValue out = curOutRegisterState[reg.number]; if (in == out && in != null && isLocation(in) && lastUseFor(asLocation(in).variable) < curOp.id()) { return asLocation(in); } @@ -580,7 +579,7 @@ final BitSet liveState = new BitSet(); curLocations.forEachLocation(new ValueProcedure() { @Override - public CiValue doValue(CiValue value) { + public RiValue doValue(RiValue value) { liveState.set(asLocation(value).variable.index); for (Block pred : block.getPredecessors()) { @@ -604,7 +603,7 @@ sb.append(" current lcoations: "); curLocations.forEachLocation(new ValueProcedure() { @Override - public CiValue doValue(CiValue value) { + public RiValue doValue(RiValue value) { sb.append(value).append(" "); return value; }
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/simple/ResolveDataFlow.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/simple/ResolveDataFlow.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,8 +26,8 @@ import java.util.*; -import com.oracle.max.cri.ci.*; import com.oracle.graal.alloc.util.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; @@ -49,7 +49,7 @@ private LocationMap curFromLocations; public void execute() { - ValueProcedure locMappingProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return locMapping(value); } }; + ValueProcedure locMappingProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return locMapping(value); } }; Debug.log("==== start resolve data flow ===="); for (Block toBlock : lir.linearScanOrder()) { @@ -87,7 +87,7 @@ Debug.log("==== end resolve data flow ===="); } - private CiValue locMapping(CiValue value) { + private RiValue locMapping(RiValue value) { Location to = asLocation(value); Location from = curFromLocations.get(to.variable); if (value != from && from != null) { @@ -96,7 +96,7 @@ return value; } - private void phiMapping(CiValue[] inputs, CiValue[] outputs) { + private void phiMapping(RiValue[] inputs, RiValue[] outputs) { assert inputs.length == outputs.length; for (int i = 0; i < inputs.length; i++) { if (inputs[i] != outputs[i]) {
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/simple/SpillAllAllocator.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/simple/SpillAllAllocator.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,13 @@ */ package com.oracle.graal.alloc.simple; -import static com.oracle.max.cri.ci.CiValueUtil.*; import static com.oracle.graal.alloc.util.LocationUtil.*; - import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiRegister.RegisterFlag; import com.oracle.graal.alloc.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiRegister.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; @@ -57,7 +56,7 @@ } @Override - protected CiValue scratchRegister(Variable spilled) { + protected RiValue scratchRegister(Variable spilled) { EnumMap<RegisterFlag, CiRegister[]> categorizedRegs = frameMap.registerConfig.getCategorizedAllocatableRegisters(); CiRegister[] availableRegs = categorizedRegs.get(spilled.flag); for (CiRegister reg : availableRegs) { @@ -102,7 +101,7 @@ return frameMap.target.arch.registers.length; } - private boolean isAllocatableRegister(CiValue value) { + private boolean isAllocatableRegister(RiValue value) { return isRegister(value) && frameMap.registerConfig.getAttributesMap()[asRegister(value).number].isAllocatable; } @@ -149,14 +148,14 @@ } private void allocate() { - ValueProcedure killNonLiveProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return killNonLive(value); } }; - ValueProcedure killBeginProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return kill(value, false); } }; - ValueProcedure killEndProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return kill(value, true); } }; - ValueProcedure killLocationProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return killLocation(value); } }; - ValueProcedure blockProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return block(value); } }; - ValueProcedure loadProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return load(value, mode, flags); } }; - ValueProcedure spillProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return spill(value, mode, flags); } }; - ValueProcedure useSlotProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return useSlot(value); } }; + ValueProcedure killNonLiveProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return killNonLive(value); } }; + ValueProcedure killBeginProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return kill(value, false); } }; + ValueProcedure killEndProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return kill(value, true); } }; + ValueProcedure killLocationProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return killLocation(value); } }; + ValueProcedure blockProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return block(value); } }; + ValueProcedure loadProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return load(value, mode, flags); } }; + ValueProcedure spillProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return spill(value, mode, flags); } }; + ValueProcedure useSlotProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return useSlot(value); } }; Debug.log("==== start spill all allocation ===="); curInRegisterState = new Object[maxRegisterNum()]; @@ -224,7 +223,7 @@ Debug.log("==== end spill all allocation ===="); } - private CiValue killNonLive(CiValue value) { + private RiValue killNonLive(RiValue value) { assert isLocation(value); if (!curLiveIn.get(asLocation(value).variable.index)) { return null; @@ -232,7 +231,7 @@ return value; } - private CiValue kill(CiValue value, boolean end) { + private RiValue kill(RiValue value, boolean end) { if (isVariable(value)) { Debug.log(" kill variable %s", value); @@ -268,7 +267,7 @@ return value; } - private CiValue killLocation(CiValue value) { + private RiValue killLocation(RiValue value) { Debug.log(" kill location %s", value); assert isAllocatableRegister(asLocation(value).location); @@ -279,7 +278,7 @@ return null; } - private CiValue block(CiValue value) { + private RiValue block(RiValue value) { if (isAllocatableRegister(value)) { Debug.log(" block %s", value); int regNum = asRegister(value).number; @@ -290,7 +289,7 @@ return value; } - private CiValue load(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { + private RiValue load(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { assert mode == OperandMode.Input || mode == OperandMode.Alive; if (flags.contains(OperandFlag.Stack)) { return useSlot(value); @@ -314,7 +313,7 @@ } } - private CiValue spill(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { + private RiValue spill(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { assert mode == OperandMode.Temp || mode == OperandMode.Output; if (flags.contains(OperandFlag.Stack)) { return defSlot(value); @@ -335,7 +334,7 @@ } } - private CiValue useSlot(CiValue value) { + private RiValue useSlot(RiValue value) { if (isVariable(value)) { Debug.log(" useSlot %s", value); Location stackLoc = curStackLocations.get(asVariable(value)); @@ -347,7 +346,7 @@ } } - private CiValue defSlot(CiValue value) { + private RiValue defSlot(RiValue value) { if (isVariable(value)) { Debug.log(" assignSlot %s", value); Location stackLoc = new Location(asVariable(value), frameMap.allocateSpillSlot(value.kind)); @@ -362,9 +361,9 @@ private Location allocateRegister(final Variable variable, final Object[] inRegisterState, final Object[] outRegisterState, OperandMode mode, EnumSet<OperandFlag> flags) { if (flags.contains(OperandFlag.RegisterHint)) { - CiValue result = curInstruction.forEachRegisterHint(variable, mode, new ValueProcedure() { + RiValue result = curInstruction.forEachRegisterHint(variable, mode, new ValueProcedure() { @Override - public CiValue doValue(CiValue registerHint) { + public RiValue doValue(RiValue registerHint) { Debug.log(" registerHint %s", registerHint); CiRegister hint = null; if (isRegister(registerHint)) { @@ -418,7 +417,7 @@ final BitSet liveState = new BitSet(); curStackLocations.forEachLocation(new ValueProcedure() { @Override - public CiValue doValue(CiValue value) { + public RiValue doValue(RiValue value) { liveState.set(asLocation(value).variable.index); for (Block pred : block.getPredecessors()) { @@ -456,7 +455,7 @@ sb.append(" curVariableLocations: "); curStackLocations.forEachLocation(new ValueProcedure() { @Override - public CiValue doValue(CiValue value) { + public RiValue doValue(RiValue value) { sb.append(value).append(" "); return value; }
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/IntervalPrinter.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/IntervalPrinter.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,12 @@ */ package com.oracle.graal.alloc.util; -import static com.oracle.max.cri.ci.CiValueUtil.*; import static com.oracle.graal.alloc.util.LocationUtil.*; - import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.graal.alloc.simple.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.LIRInstruction.*; @@ -37,7 +35,7 @@ public final class IntervalPrinter { - public static void printBeforeAllocation(String label, LIR lir, RiRegisterConfig registerConfig, DataFlowAnalysis dataFlow) { + public static void printBeforeAllocation(String label, LIR lir, CiRegisterConfig registerConfig, DataFlowAnalysis dataFlow) { if (Debug.isDumpEnabled()) { IntervalPrinter printer = new IntervalPrinter(lir, registerConfig, dataFlow, null); Debug.dump(lir, label); @@ -45,7 +43,7 @@ } } - public static void printAfterAllocation(String label, LIR lir, RiRegisterConfig registerConfig, DataFlowAnalysis dataFlow, LocationMap[] blockEndLocations) { + public static void printAfterAllocation(String label, LIR lir, CiRegisterConfig registerConfig, DataFlowAnalysis dataFlow, LocationMap[] blockEndLocations) { if (Debug.isDumpEnabled()) { IntervalPrinter printer = new IntervalPrinter(lir, registerConfig, dataFlow, blockEndLocations); Debug.dump(lir, label); @@ -98,13 +96,13 @@ private final LIR lir; - private final RiRegisterConfig registerConfig; + private final CiRegisterConfig registerConfig; private final DataFlowAnalysis dataFlow; private final LocationMap[] blockEndLocations; private final Variable[] variables; private final Map<String, Interval> intervals; - private IntervalPrinter(LIR lir, RiRegisterConfig registerConfig, DataFlowAnalysis dataFlow, LocationMap[] blockEndLocations) { + private IntervalPrinter(LIR lir, CiRegisterConfig registerConfig, DataFlowAnalysis dataFlow, LocationMap[] blockEndLocations) { this.lir = lir; this.registerConfig = registerConfig; this.dataFlow = dataFlow; @@ -113,7 +111,7 @@ this.intervals = new HashMap<>(); } - private boolean isAllocatableRegister(CiValue value) { + private boolean isAllocatableRegister(RiValue value) { return isRegister(value) && registerConfig.getAttributesMap()[asRegister(value).number].isAllocatable; } @@ -121,7 +119,7 @@ private String curUseKind; public Interval[] execute() { - ValueProcedure varProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return var(value); } }; + ValueProcedure varProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return var(value); } }; for (Block block : lir.linearScanOrder()) { for (LIRInstruction op : block.lir) { @@ -129,8 +127,8 @@ } } - ValueProcedure useProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return use(value, mode, flags); } }; - ValueProcedure defProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return def(value, flags); } }; + ValueProcedure useProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return use(value, mode, flags); } }; + ValueProcedure defProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return def(value, flags); } }; intervals.put("call", new Interval(-2, "call", "", "call", "hasCall")); intervals.put("st", new Interval(-1, "st", "", "st", "hasState")); @@ -192,7 +190,7 @@ return intervalsArray; } - public CiValue var(CiValue value) { + public RiValue var(RiValue value) { if (isLocation(value)) { variables[asLocation(value).variable.index] = asLocation(value).variable; } else if (isVariable(value)) { @@ -201,7 +199,7 @@ return value; } - private Interval findInterval(CiValue value) { + private Interval findInterval(RiValue value) { Interval interval; if (isLocation(value)) { Interval parent = findInterval(asLocation(value).variable); @@ -237,7 +235,7 @@ } } - private CiValue use(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { + private RiValue use(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { Interval interval = findInterval(value); if (interval != null) { if (interval.uses.size() == 0 || interval.uses.get(interval.uses.size() - 1).pos != curOpId) { @@ -250,7 +248,7 @@ return value; } - private CiValue def(CiValue value, EnumSet<OperandFlag> flags) { + private RiValue def(RiValue value, EnumSet<OperandFlag> flags) { Interval interval = findInterval(value); if (interval != null) { interval.uses.add(new UsePosition(curOpId, useKind(flags))); @@ -264,7 +262,7 @@ return value; } - private CiValue out(CiValue value) { + private RiValue out(RiValue value) { Interval interval = findInterval(value); if (interval != null) { interval.lastTo = curOpId;
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/Location.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/Location.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,16 +22,16 @@ */ package com.oracle.graal.alloc.util; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.lir.*; -public class Location extends CiValue { +public class Location extends RiValue { private static final long serialVersionUID = -1786677729152726126L; public final Variable variable; - public final CiValue location; + public final RiValue location; - public Location(Variable variable, CiValue location) { + public Location(Variable variable, RiValue location) { super(variable.kind); this.variable = variable; this.location = location;
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/LocationMap.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/LocationMap.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,7 +26,7 @@ import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.LIRInstruction.*; @@ -57,7 +57,7 @@ public void forEachLocation(ValueProcedure proc) { for (int i = 0; i < locations.length; i++) { if (locations[i] != null) { - CiValue newValue = proc.doValue(locations[i], null, null); + RiValue newValue = proc.doValue(locations[i], null, null); assert newValue == null || asLocation(newValue).variable == locations[i].variable; locations[i] = (Location) newValue; }
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/LocationUtil.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/LocationUtil.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,17 +22,17 @@ */ package com.oracle.graal.alloc.util; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.lir.*; public class LocationUtil extends ValueUtil { - public static boolean isLocation(CiValue value) { + public static boolean isLocation(RiValue value) { assert value != null; return value instanceof Location; } - public static Location asLocation(CiValue value) { + public static Location asLocation(RiValue value) { assert value != null; return (Location) value; }
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/MoveResolver.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/MoveResolver.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,11 @@ */ package com.oracle.graal.alloc.util; -import static com.oracle.max.cri.ci.CiValueUtil.*; import static com.oracle.graal.alloc.util.LocationUtil.*; - import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; @@ -36,8 +35,8 @@ private final LIR lir; private final FrameMap frameMap; private final int[] registersBlocked; - private final Map<CiValue, Integer> valuesBlocked; - private final List<CiValue> mappingFrom; + private final Map<RiValue, Integer> valuesBlocked; + private final List<RiValue> mappingFrom; private final List<Location> mappingTo; private final LIRInsertionBuffer insertionBuffer; private int insertPos; @@ -70,7 +69,7 @@ assert checkValid(); } - public void add(CiValue from, Location to) { + public void add(RiValue from, Location to) { assert checkValid(); assert isLocation(from) || isConstant(from); assert from != to; @@ -120,14 +119,14 @@ // Block all registers and stack slots that are used as inputs of a move. // When a register is blocked, no move to this register is emitted. // This is necessary for detecting cycles in moves. - for (CiValue from : mappingFrom) { + for (RiValue from : mappingFrom) { block(from); } while (mappingFrom.size() > 0) { boolean processed = false; for (int i = mappingFrom.size() - 1; i >= 0; i--) { - CiValue from = mappingFrom.get(i); + RiValue from = mappingFrom.get(i); Location to = mappingTo.get(i); if (safeToProcessMove(from, to)) { @@ -153,19 +152,19 @@ int exchangeOther = -1; for (int i = mappingFrom.size() - 1; i >= 0; i--) { - CiValue from = mappingFrom.get(i); + RiValue from = mappingFrom.get(i); Location to = mappingTo.get(i); assert !safeToProcessMove(from, to) : "would not be in this code otherwise"; if (isConstant(from)) { continue; } - CiValue fromLoc = asLocation(from).location; + RiValue fromLoc = asLocation(from).location; // Check if we can insert an exchange to save us from spilling. if (isRegister(fromLoc) && isRegister(to) && asRegister(fromLoc) != asRegister(to) && blockedCount(to) == 1) { for (int j = mappingFrom.size() - 1; j >= 0; j--) { - CiValue possibleOther = mappingFrom.get(j); + RiValue possibleOther = mappingFrom.get(j); if (isLocation(possibleOther)) { if (asLocation(possibleOther).location == to.location) { assert exchangeCandidate == -1 : "must not find twice because of blocked check above"; @@ -220,9 +219,9 @@ } } - private void block(CiValue value) { + private void block(RiValue value) { if (isLocation(value)) { - CiValue location = asLocation(value).location; + RiValue location = asLocation(value).location; if (isRegister(location)) { registersBlocked[asRegister(location).number]++; } else { @@ -232,10 +231,10 @@ } } - private void unblock(CiValue value) { + private void unblock(RiValue value) { if (isLocation(value)) { assert blockedCount(asLocation(value)) > 0; - CiValue location = asLocation(value).location; + RiValue location = asLocation(value).location; if (isRegister(location)) { registersBlocked[asRegister(location).number]--; } else { @@ -248,7 +247,7 @@ } private int blockedCount(Location value) { - CiValue location = asLocation(value).location; + RiValue location = asLocation(value).location; if (isRegister(location)) { return registersBlocked[asRegister(location).number]; } else { @@ -257,7 +256,7 @@ } } - private boolean safeToProcessMove(CiValue from, Location to) { + private boolean safeToProcessMove(RiValue from, Location to) { int count = blockedCount(to); return count == 0 || (count == 1 && isLocation(from) && asLocation(from).location == to.location); } @@ -269,17 +268,17 @@ throw GraalInternalError.unimplemented(); } - private void insertMove(CiValue src, Location dst) { + private void insertMove(RiValue src, Location dst) { if (isStackSlot(dst.location) && isLocation(src) && isStackSlot(asLocation(src).location)) { // Move between two stack slots. We need a temporary registers. If the allocator can give // us a free register, we need two moves: src->scratch, scratch->dst // If the allocator cannot give us a free register (it returns a Location in this case), // we need to spill the scratch register first, so we need four moves in total. - CiValue scratch = scratchRegister(dst.variable); + RiValue scratch = scratchRegister(dst.variable); Location scratchSaved = null; - CiValue scratchRegister = scratch; + RiValue scratchRegister = scratch; if (isLocation(scratch)) { scratchSaved = new Location(asLocation(scratch).variable, frameMap.allocateSpillSlot(scratch.kind)); insertMove(scratch, scratchSaved); @@ -306,7 +305,7 @@ * {@link CiRegisterValue}, the register can be overwritten without precautions. If the * returned value is a {@link Location}, it needs to be spilled and rescued itself. */ - protected abstract CiValue scratchRegister(Variable spilled); + protected abstract RiValue scratchRegister(Variable spilled); private boolean checkEmpty() { assert insertPos == -1; @@ -327,7 +326,7 @@ assert insertionBuffer.initialized() && insertPos != -1; for (int i = 0; i < mappingTo.size(); i++) { - CiValue from = mappingFrom.get(i); + RiValue from = mappingFrom.get(i); Location to = mappingTo.get(i); assert from.kind.stackKind() == to.kind;
--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/RegisterVerifier.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/util/RegisterVerifier.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,11 @@ */ package com.oracle.graal.alloc.util; -import static com.oracle.max.cri.ci.CiValueUtil.*; import static com.oracle.graal.alloc.util.LocationUtil.*; - import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; @@ -49,7 +48,7 @@ * value that is currently contained in there ({@link Location} for operands that were variables; {@link CiRegisterValue} or * {@link CiStackSlot} for operands that used fixed registers or stack slots). */ - private final Map<Object, CiValue>[] blockStates; + private final Map<Object, RiValue>[] blockStates; private void addToWorkList(Block block) { if (!workList.contains(block)) { @@ -57,15 +56,15 @@ } } - private Map<Object, CiValue> stateFor(Block block) { + private Map<Object, RiValue> stateFor(Block block) { return blockStates[block.getId()]; } - private void setStateFor(Block block, Map<Object, CiValue> savedState) { + private void setStateFor(Block block, Map<Object, RiValue> savedState) { blockStates[block.getId()] = savedState; } - private static Map<Object, CiValue> copy(Map<Object, CiValue> inputState) { + private static Map<Object, RiValue> copy(Map<Object, RiValue> inputState) { return new HashMap<>(inputState); } @@ -82,12 +81,12 @@ this.blockStates = new Map[lir.linearScanOrder().size()]; } - private Map<Object, CiValue> curInputState; + private Map<Object, RiValue> curInputState; private void verify(Block startBlock) { - ValueProcedure useProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return use(value, flags); } }; - ValueProcedure tempProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return temp(value); } }; - ValueProcedure outputProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value) { return output(value); } }; + ValueProcedure useProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return use(value, flags); } }; + ValueProcedure tempProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return temp(value); } }; + ValueProcedure outputProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value) { return output(value); } }; curInputState = new HashMap<>(); setStateFor(startBlock, curInputState); @@ -125,7 +124,7 @@ } private void processSuccessor(Block succ) { - Map<Object, CiValue> savedState = stateFor(succ); + Map<Object, RiValue> savedState = stateFor(succ); if (savedState == null) { // Block was not processed before, so set initial inputState. Debug.log(" successor %s: initial visit", succ); @@ -136,11 +135,11 @@ // This block was already processed before. // Check if new inputState is consistent with savedState. Debug.log(" successor %s: state present", succ); - Iterator<Map.Entry<Object, CiValue>> iter = savedState.entrySet().iterator(); + Iterator<Map.Entry<Object, RiValue>> iter = savedState.entrySet().iterator(); while (iter.hasNext()) { - Map.Entry<Object, CiValue> entry = iter.next(); - CiValue savedValue = entry.getValue(); - CiValue inputValue = curInputState.get(entry.getKey()); + Map.Entry<Object, RiValue> entry = iter.next(); + RiValue savedValue = entry.getValue(); + RiValue inputValue = curInputState.get(entry.getKey()); if (savedValue != inputValue) { // Current inputState and previous savedState assume a different value in this register. @@ -171,7 +170,7 @@ * include the kind of the value because we do not want to distinguish between the same register with * different kinds. */ - private Object key(CiValue value) { + private Object key(RiValue value) { if (isLocation(value)) { return key(asLocation(value).location); } else if (isRegister(value)) { @@ -183,13 +182,13 @@ } } - private boolean isIgnoredRegister(CiValue value) { + private boolean isIgnoredRegister(RiValue value) { return isRegister(value) && !frameMap.registerConfig.getAttributesMap()[asRegister(value).number].isAllocatable; } - private CiValue use(CiValue value, EnumSet<OperandFlag> flags) { - if (!isConstant(value) && value != CiValue.IllegalValue && !isIgnoredRegister(value)) { - CiValue actual = curInputState.get(key(value)); + private RiValue use(RiValue value, EnumSet<OperandFlag> flags) { + if (!isConstant(value) && value != RiValue.IllegalValue && !isIgnoredRegister(value)) { + RiValue actual = curInputState.get(key(value)); if (actual == null && flags.contains(OperandFlag.Uninitialized)) { // OK, since uninitialized values are allowed explicitly. } else if (value != actual) { @@ -201,16 +200,16 @@ return value; } - private CiValue temp(CiValue value) { - if (!isConstant(value) && value != CiValue.IllegalValue && !isIgnoredRegister(value)) { + private RiValue temp(RiValue value) { + if (!isConstant(value) && value != RiValue.IllegalValue && !isIgnoredRegister(value)) { Debug.log(" temp %s -> remove key %s", value, key(value)); curInputState.remove(key(value)); } return value; } - private CiValue output(CiValue value) { - if (value != CiValue.IllegalValue && !isIgnoredRegister(value)) { + private RiValue output(RiValue value) { + if (value != RiValue.IllegalValue && !isIgnoredRegister(value)) { Debug.log(" output %s -> set key %s", value, key(value)); curInputState.put(key(value), value); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiAddress.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,177 @@ +/* + * Copyright (c) 2010, 2012, 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.api.code; + +import static com.oracle.graal.api.code.CiValueUtil.*; + +import com.oracle.graal.api.meta.*; + +/** + * Represents an address in target machine memory, specified via some combination of a base register, an index register, + * a displacement and a scale. Note that the base and index registers may be a variable that will get a register assigned + * later by the register allocator. + */ +public final class CiAddress extends RiValue { + private static final long serialVersionUID = -1003772042519945089L; + + /** + * A sentinel value used as a place holder in an instruction stream for an address that will be patched. + */ + public static final CiAddress Placeholder = new CiAddress(RiKind.Illegal, RiValue.IllegalValue); + + /** + * Base register that defines the start of the address computation. + * If not present, is denoted by {@link RiValue#IllegalValue}. + */ + public RiValue base; + + /** + * Index register, the value of which (possibly scaled by {@link #scale}) is added to {@link #base}. + * If not present, is denoted by {@link RiValue#IllegalValue}. + */ + public RiValue index; + + /** + * Scaling factor for indexing, dependent on target operand size. + */ + public final Scale scale; + + /** + * Optional additive displacement. + */ + public final int displacement; + + /** + * Creates a {@code CiAddress} with given base register, no scaling and no displacement. + * @param kind the kind of the value being addressed + * @param base the base register + */ + public CiAddress(RiKind kind, RiValue base) { + this(kind, base, IllegalValue, Scale.Times1, 0); + } + + /** + * Creates a {@code CiAddress} with given base register, no scaling and a given displacement. + * @param kind the kind of the value being addressed + * @param base the base register + * @param displacement the displacement + */ + public CiAddress(RiKind kind, RiValue base, int displacement) { + this(kind, base, IllegalValue, Scale.Times1, displacement); + } + + /** + * Creates a {@code CiAddress} with given base and index registers, scaling and displacement. + * This is the most general constructor.. + * @param kind the kind of the value being addressed + * @param base the base register + * @param index the index register + * @param scale the scaling factor + * @param displacement the displacement + */ + public CiAddress(RiKind kind, RiValue base, RiValue index, Scale scale, int displacement) { + super(kind); + this.base = base; + this.index = index; + this.scale = scale; + this.displacement = displacement; + + assert !isConstant(base) && !isStackSlot(base); + assert !isConstant(index) && !isStackSlot(index); + } + + /** + * A scaling factor used in complex addressing modes such as those supported by x86 platforms. + */ + public enum Scale { + Times1(1, 0), + Times2(2, 1), + Times4(4, 2), + Times8(8, 3); + + private Scale(int value, int log2) { + this.value = value; + this.log2 = log2; + } + + /** + * The value (or multiplier) of this scale. + */ + public final int value; + + /** + * The {@linkplain #value value} of this scale log 2. + */ + public final int log2; + + public static Scale fromInt(int scale) { + switch (scale) { + case 1: return Times1; + case 2: return Times2; + case 4: return Times4; + case 8: return Times8; + default: throw new IllegalArgumentException(String.valueOf(scale)); + } + } + } + + @Override + public String toString() { + if (this == Placeholder) { + return "[<placeholder>]"; + } + + StringBuilder s = new StringBuilder(); + s.append(kind.javaName).append("["); + String sep = ""; + if (isLegal(base)) { + s.append(base); + sep = " + "; + } + if (isLegal(index)) { + s.append(sep).append(index).append(" * ").append(scale.value); + sep = " + "; + } + if (displacement < 0) { + s.append(" - ").append(-displacement); + } else if (displacement > 0) { + s.append(sep).append(displacement); + } + s.append("]"); + return s.toString(); + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof CiAddress) { + CiAddress addr = (CiAddress) obj; + return kind == addr.kind && displacement == addr.displacement && base.equals(addr.base) && scale == addr.scale && index.equals(addr.index); + } + return false; + } + + @Override + public int hashCode() { + return base.hashCode() ^ index.hashCode() ^ (displacement << 4) ^ (scale.value << 8) ^ (kind.ordinal() << 12); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiArchitecture.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2009, 2011, 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.api.code; + +import java.util.*; + +import com.oracle.graal.api.code.CiRegister.*; + + +/** + * Represents a CPU architecture, including information such as its endianness, CPU + * registers, word width, etc. + */ +public abstract class CiArchitecture { + + /** + * The endianness of the architecture. + */ + public static enum ByteOrder { + LittleEndian, + BigEndian + } + + /** + * The number of bits required in a bit map covering all the registers that may store references. + * The bit position of a register in the map is the register's {@linkplain CiRegister#number number}. + */ + public final int registerReferenceMapBitCount; + + /** + * Represents the natural size of words (typically registers and pointers) of this architecture, in bytes. + */ + public final int wordSize; + + /** + * The name of this architecture (e.g. "AMD64", "SPARCv9"). + */ + public final String name; + + /** + * Array of all available registers on this architecture. The index of each register in this + * array is equal to its {@linkplain CiRegister#number number}. + */ + public final CiRegister[] registers; + + /** + * Map of all registers keyed by their {@linkplain CiRegister#name names}. + */ + public final HashMap<String, CiRegister> registersByName; + + /** + * The byte ordering can be either little or big endian. + */ + public final ByteOrder byteOrder; + + /** + * Mask of the barrier constants defined in {@link MemoryBarriers} denoting the barriers that + * are not required to be explicitly inserted under this architecture. + */ + public final int implicitMemoryBarriers; + + /** + * Determines the barriers in a given barrier mask that are explicitly required on this architecture. + * + * @param barriers a mask of the barrier constants defined in {@link MemoryBarriers} + * @return the value of {@code barriers} minus the barriers unnecessary on this architecture + */ + public final int requiredBarriers(int barriers) { + return barriers & ~implicitMemoryBarriers; + } + + /** + * Offset in bytes from the beginning of a call instruction to the displacement. + */ + public final int machineCodeCallDisplacementOffset; + + /** + * The size of the return address pushed to the stack by a call instruction. + * A value of 0 denotes that call linkage uses registers instead (e.g. SPARC). + */ + public final int returnAddressSize; + + private final EnumMap<RegisterFlag, CiRegister[]> registersByTypeAndEncoding; + + /** + * Gets the register for a given {@linkplain CiRegister#encoding encoding} and type. + * + * @param encoding a register value as used in a machine instruction + * @param type the type of the register + */ + public CiRegister registerFor(int encoding, RegisterFlag type) { + CiRegister[] regs = registersByTypeAndEncoding.get(type); + assert encoding >= 0 && encoding < regs.length; + CiRegister reg = regs[encoding]; + assert reg != null; + return reg; + } + + protected CiArchitecture(String name, + int wordSize, + ByteOrder byteOrder, + CiRegister[] registers, + int implicitMemoryBarriers, + int nativeCallDisplacementOffset, + int registerReferenceMapBitCount, + int returnAddressSize) { + this.name = name; + this.registers = registers; + this.wordSize = wordSize; + this.byteOrder = byteOrder; + this.implicitMemoryBarriers = implicitMemoryBarriers; + this.machineCodeCallDisplacementOffset = nativeCallDisplacementOffset; + this.registerReferenceMapBitCount = registerReferenceMapBitCount; + this.returnAddressSize = returnAddressSize; + + registersByName = new HashMap<>(registers.length); + for (CiRegister register : registers) { + registersByName.put(register.name, register); + assert registers[register.number] == register; + } + + registersByTypeAndEncoding = new EnumMap<>(RegisterFlag.class); + EnumMap<RegisterFlag, CiRegister[]> categorizedRegs = CiRegister.categorize(registers); + for (RegisterFlag type : RegisterFlag.values()) { + CiRegister[] regs = categorizedRegs.get(type); + int max = CiRegister.maxRegisterEncoding(regs); + CiRegister[] regsByEnc = new CiRegister[max + 1]; + for (CiRegister reg : regs) { + regsByEnc[reg.encoding] = reg; + } + registersByTypeAndEncoding.put(type, regsByEnc); + } + } + + /** + * Converts this architecture to a string. + * @return the string representation of this architecture + */ + @Override + public final String toString() { + return name.toLowerCase(); + } + + /** + * Checks whether this is a 32-bit architecture. + * @return {@code true} if this architecture is 32-bit + */ + public final boolean is32bit() { + return wordSize == 4; + } + + /** + * Checks whether this is a 64-bit architecture. + * @return {@code true} if this architecture is 64-bit + */ + public final boolean is64bit() { + return wordSize == 8; + } + + // The following methods are architecture specific and not dependent on state + // stored in this class. They have convenient default implementations. + + /** + * Checks whether this architecture's normal arithmetic instructions use a two-operand form + * (e.g. x86 which overwrites one operand register with the result when adding). + * @return {@code true} if this architecture uses two-operand mode + */ + public boolean twoOperandMode() { + return false; + } + + // TODO: Why enumerate the concrete subclasses here rather + // than use instanceof comparisons in code that cares? + + /** + * Checks whether the architecture is x86. + * @return {@code true} if the architecture is x86 + */ + public boolean isX86() { + return false; + } + + /** + * Checks whether the architecture is SPARC. + * @return {@code true} if the architecture is SPARC + */ + public boolean isSPARC() { + return false; + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiAssumptions.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,262 @@ +/* + * Copyright (c) 2011, 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.api.code; + +import java.io.*; +import java.util.*; + +import com.oracle.graal.api.meta.*; + +/** + * Class for recording optimistic assumptions made during compilation. + * Recorded assumption can be visited for subsequent processing using + * an implementation of the {@link CiAssumptionProcessor} interface. + */ +public final class CiAssumptions implements Serializable, Iterable<CiAssumptions.Assumption> { + + private static final long serialVersionUID = 5152062717588239131L; + + public abstract static class Assumption implements Serializable { + + private static final long serialVersionUID = -1936652569665112915L; + } + + /** + * An assumption about a unique subtype of a given type. + */ + public static final class ConcreteSubtype extends Assumption { + + private static final long serialVersionUID = -1457173265437676252L; + + /** + * Type the assumption is made about. + */ + public final RiResolvedType context; + + /** + * Assumed unique concrete sub-type of the context type. + */ + public final RiResolvedType subtype; + + public ConcreteSubtype(RiResolvedType context, RiResolvedType subtype) { + this.context = context; + this.subtype = subtype; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + context.hashCode(); + result = prime * result + subtype.hashCode(); + return result; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof ConcreteSubtype) { + ConcreteSubtype other = (ConcreteSubtype) obj; + return other.context == context && other.subtype == subtype; + } + return false; + } + } + + /** + * An assumption about a unique implementation of a virtual method. + */ + public static final class ConcreteMethod extends Assumption { + + private static final long serialVersionUID = -7636746737947390059L; + + /** + * A virtual (or interface) method whose unique implementation for the receiver type + * in {@link #context} is {@link #impl}. + */ + public final RiResolvedMethod method; + + /** + * A receiver type. + */ + public final RiResolvedType context; + + /** + * The unique implementation of {@link #method} for {@link #context}. + */ + public final RiResolvedMethod impl; + + public ConcreteMethod(RiResolvedMethod method, RiResolvedType context, RiResolvedMethod impl) { + this.method = method; + this.context = context; + this.impl = impl; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + method.hashCode(); + result = prime * result + context.hashCode(); + result = prime * result + impl.hashCode(); + return result; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof ConcreteMethod) { + ConcreteMethod other = (ConcreteMethod) obj; + return other.method == method && other.context == context && other.impl == impl; + } + return false; + } + } + + /** + * An assumption that specified that a method was used during the compilation. + */ + public static final class MethodContents extends Assumption { + + private static final long serialVersionUID = -4821594103928571659L; + + public final RiResolvedMethod method; + + public MethodContents(RiResolvedMethod method) { + this.method = method; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + method.hashCode(); + return result; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof ConcreteMethod) { + ConcreteMethod other = (ConcreteMethod) obj; + return other.method == method; + } + return false; + } + } + + /** + * Array with the assumptions. This field is directly accessed from C++ code in the Graal/HotSpot implementation. + */ + private Assumption[] list; + + private int count; + + /** + * Returns whether any assumptions have been registered. + * @return {@code true} if at least one assumption has been registered, {@code false} otherwise. + */ + public boolean isEmpty() { + return count == 0; + } + + @Override + public Iterator<Assumption> iterator() { + return new Iterator<CiAssumptions.Assumption>() { + int index; + public void remove() { + throw new UnsupportedOperationException(); + } + public Assumption next() { + if (index >= count) { + throw new NoSuchElementException(); + } + return list[index++]; + } + public boolean hasNext() { + return index < count; + } + }; + } + + /** + * Records an assumption that the specified type has no finalizable subclasses. + * + * @param receiverType the type that is assumed to have no finalizable subclasses + * @return {@code true} if the assumption was recorded and can be assumed; {@code false} otherwise + */ + @SuppressWarnings("static-method") + public boolean recordNoFinalizableSubclassAssumption(RiResolvedType receiverType) { + // TODO (thomaswue): Record that assumption correctly. + return false; + } + + /** + * Records that {@code subtype} is the only concrete subtype in the class hierarchy below {@code context}. + * @param context the root of the subtree of the class hierarchy that this assumptions is about + * @param subtype the one concrete subtype + */ + public void recordConcreteSubtype(RiResolvedType context, RiResolvedType subtype) { + record(new ConcreteSubtype(context, subtype)); + } + + /** + * Records that {@code impl} is the only possible concrete target for a virtual call to + * {@code method} with a receiver of type {@code context}. + * + * @param method a method that is the target of a virtual call + * @param context the receiver type of a call to {@code method} + * @param impl the concrete method that is the only possible target for the virtual call + */ + public void recordConcreteMethod(RiResolvedMethod method, RiResolvedType context, RiResolvedMethod impl) { + record(new ConcreteMethod(method, context, impl)); + } + + /** + * Records that {@code method} was used during the compilation. + * + * @param method a method whose contents were used + */ + public void recordMethodContents(RiResolvedMethod method) { + record(new MethodContents(method)); + } + + private void record(Assumption assumption) { + if (list == null) { + list = new Assumption[4]; + } else { + for (int i = 0; i < count; ++i) { + if (assumption.equals(list[i])) { + return; + } + } + } + if (list.length == count) { + Assumption[] newList = new Assumption[list.length * 2]; + for (int i = 0; i < list.length; ++i) { + newList[i] = list[i]; + } + list = newList; + } + list[count] = assumption; + count++; + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiBailout.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2009, 2011, 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.api.code; + +import java.util.*; + +/** + * {@code CiBailout} is thrown when the compiler refuses to compile a method because of problems with the method. + * e.g. bytecode wouldn't verify, too big, JSR/ret too complicated, etc. This exception is <i>not</i> + * meant to indicate problems with the compiler itself. + */ +public class CiBailout extends RuntimeException { + + public static final long serialVersionUID = 8974598793458772L; + + /** + * Create a new {@code CiBailout}. + * @param reason a message indicating the reason + */ + public CiBailout(String reason) { + super(reason); + } + + /** + * Create a new {@code CiBailout}. + * @param reason a message indicating the reason with a String.format - syntax + * @param args parameters to the formatter + */ + public CiBailout(String format, Object... args) { + this(String.format(Locale.ENGLISH, format, args)); + } + + /** + * Create a new {@code CiBailout} t due to an internal exception being thrown. + * @param reason a message indicating the reason + * @param cause the throwable that was the cause of the bailout + */ + public CiBailout(String reason, Throwable cause) { + super(reason); + initCause(cause); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiCalleeSaveLayout.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,178 @@ +/* + * Copyright (c) 2010, 2011, 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.api.code; + +import java.util.*; + + +/** + * The callee save area (CSA) is a contiguous space in a stack frame + * used to save (and restore) the values of the caller's registers. + * This class describes the layout of a CSA in terms of its + * {@linkplain #size size}, {@linkplain #slotSize slot size} and + * the {@linkplain #registers callee save registers} covered by the CSA. + */ +public class CiCalleeSaveLayout { + + /** + * The size (in bytes) of the CSA. + */ + public final int size; + + /** + * The size (in bytes) of an {@linkplain #registerAtIndex(int) indexable} slot in the CSA. + */ + public final int slotSize; + + /** + * Map from {@linkplain CiRegister#number register numbers} to slot indexes in the CSA. + */ + private final int[] regNumToIndex; + + private final CiRegister[] indexToReg; + + /** + * The list of registers {@linkplain #contains(CiRegister) contained} by this CSA. + */ + public final CiRegister[] registers; + + /** + * The offset from the frame pointer to the CSA. If this is not known, then this field + * will have the value {@link Integer#MAX_VALUE}. + */ + public final int frameOffsetToCSA; + + /** + * Creates a CSA layout. + * + * @param size size (in bytes) of the CSA. If this is {@code -1}, then the CSA size will be computed from {@code registers}. + * @param slotSize the size (in bytes) of an {@linkplain #registerAtIndex(int) indexable} slot in the CSA + * @param registers the registers that can be saved in the CSA + */ + public CiCalleeSaveLayout(int frameOffsetToCSA, int size, int slotSize, CiRegister... registers) { + this.frameOffsetToCSA = frameOffsetToCSA; + assert slotSize == 0 || CiUtil.isPowerOf2(slotSize); + this.slotSize = slotSize; + int maxRegNum = -1; + int maxOffset = 0; + this.registers = registers; + int offset = 0; + for (CiRegister reg : registers) { + assert offset % slotSize == 0; + assert reg.number >= 0; + if (reg.number > maxRegNum) { + maxRegNum = reg.number; + } + if (offset > maxOffset) { + maxOffset = offset; + } + offset += reg.spillSlotSize; + } + if (size == -1) { + this.size = offset; + } else { + assert offset <= size; + this.size = size; + } + + this.regNumToIndex = new int[maxRegNum + 1]; + this.indexToReg = offset == 0 ? new CiRegister[0] : new CiRegister[offset / slotSize]; + Arrays.fill(regNumToIndex, -1); + offset = 0; + for (CiRegister reg : registers) { + int index = offset / slotSize; + regNumToIndex[reg.number] = index; + indexToReg[index] = reg; + offset += reg.spillSlotSize; + } + } + + /** + * Gets the offset of a given register in the CSA. + * + * @return the offset (in bytes) of {@code reg} in the CSA + * @throws IllegalArgumentException if {@code reg} does not have a slot in the CSA + */ + public int offsetOf(int reg) { + return indexOf(reg) * slotSize; + } + + /** + * Gets the index of a given register in the CSA. + * + * @return the index of {@code reg} in the CSA + * @throws IllegalArgumentException if {@code reg} does not have a slot in the CSA + */ + public int indexOf(int reg) { + if (!contains(reg)) { + throw new IllegalArgumentException(String.valueOf(reg)); + } + return regNumToIndex[reg]; + } + + /** + * Gets the offset of a given register in the CSA. + * + * @return the offset (in bytes) of {@code reg} in the CSA + * @throws IllegalArgumentException if {@code reg} does not have a slot in the CSA + */ + public int offsetOf(CiRegister reg) { + return offsetOf(reg.number); + } + + /** + * Determines if the CSA includes a slot for a given register. + * + * @param reg the register to test + * @return true if the CSA contains a slot for {@code reg} + */ + public boolean contains(int reg) { + return reg >= 0 && reg < regNumToIndex.length && regNumToIndex[reg] != -1; + } + + /** + * Gets the register whose slot in the CSA is at a given index. + * + * @param index an index of a slot in the CSA + * @return the register whose slot in the CSA is at {@code index} or {@code null} if {@code index} does not denote a + * slot in the CSA aligned with a register + */ + public CiRegister registerAt(int index) { + if (index < 0 || index >= indexToReg.length) { + return null; + } + return indexToReg[index]; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("["); + for (CiRegister reg : registers) { + if (sb.length() != 1) { + sb.append(", "); + } + sb.append(reg).append("{+").append(offsetOf(reg)).append('}'); + } + return sb.append("] size=").append(size).toString(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiCallingConvention.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2009, 2012, 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.api.code; + +import static com.oracle.graal.api.code.CiValueUtil.*; + +import com.oracle.graal.api.meta.*; + + +/** + * A calling convention describes the locations in which the arguments for a call are placed. + */ +public class CiCallingConvention { + + /** + * Constants denoting the type of a call for which a calling convention is + * {@linkplain CiRegisterConfig#getCallingConvention(Type, CiKind[], CiTarget, boolean) requested}. + */ + public enum Type { + /** + * A request for the outgoing argument locations at a call site to Java code. + */ + JavaCall(true), + + /** + * A request for the incoming argument locations. + */ + JavaCallee(false), + + /** + * A request for the outgoing argument locations at a call site to the runtime (which may be Java or native code). + */ + RuntimeCall(true), + + /** + * A request for the outgoing argument locations at a call site to + * external native code that complies with the platform ABI. + */ + NativeCall(true); + + /** + * Determines if this is a request for the outgoing argument locations at a call site. + */ + public final boolean out; + + public static final Type[] VALUES = values(); + + private Type(boolean out) { + this.out = out; + } + } + + /** + * The amount of stack space (in bytes) required for the stack-based arguments of the call. + */ + public final int stackSize; + + /** + * The locations in which the arguments are placed. This array ordered by argument index. + */ + public final RiValue[] locations; + + public CiCallingConvention(RiValue[] locations, int stackSize) { + this.locations = locations; + this.stackSize = stackSize; + assert verify(); + } + + @Override + public String toString() { + StringBuilder result = new StringBuilder(); + result.append("CallingConvention["); + for (RiValue op : locations) { + result.append(op.toString()).append(" "); + } + result.append("]"); + return result.toString(); + } + + private boolean verify() { + for (int i = 0; i < locations.length; i++) { + RiValue location = locations[i]; + assert isStackSlot(location) || isRegister(location); + } + return true; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiCodePos.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2009, 2011, 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.api.code; + +import java.io.*; + +import com.oracle.graal.api.meta.*; + +/** + * Represents a code position, that is, a chain of inlined methods with bytecode + * locations, that is communicated from the compiler to the runtime system. A code position + * can be used by the runtime system to reconstruct a source-level stack trace + * for exceptions and to create {@linkplain CiFrame frames} for deoptimization. + */ +public abstract class CiCodePos implements Serializable { + + private static final long serialVersionUID = 8633885274526033515L; + + /** + * The position where this position has been called, {@code null} if none. + */ + public final CiCodePos caller; + + /** + * The runtime interface method for this position. + */ + public final RiResolvedMethod method; + + /** + * The location within the method, as a bytecode index. The constant + * {@code -1} may be used to indicate the location is unknown, for example + * within code synthesized by the compiler. + */ + public final int bci; + + /** + * Constructs a new object representing a given parent/caller, a given method, and a given BCI. + * + * @param caller the parent position + * @param method the method + * @param bci a BCI within the method + */ + public CiCodePos(CiCodePos caller, RiResolvedMethod method, int bci) { + assert method != null; + this.caller = caller; + this.method = method; + this.bci = bci; + } + + /** + * Converts this code position to a string representation. + * @return a string representation of this code position + */ + @Override + public String toString() { + return CiUtil.append(new StringBuilder(100), this).toString(); + } + + /** + * Deep equality test. + */ + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (obj instanceof CiCodePos) { + CiCodePos other = (CiCodePos) obj; + if (other.method.equals(method) && other.bci == bci) { + if (caller == null) { + return other.caller == null; + } + return caller.equals(other.caller); + } + } + return false; + } + + @Override + public int hashCode() { + return bci; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiCompilationStatistics.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2012, 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.api.code; + +import java.io.*; +import java.lang.annotation.*; +import java.lang.reflect.*; +import java.util.*; +import java.util.concurrent.*; + +import com.oracle.graal.api.meta.*; + +@SuppressWarnings("unused") +public final class CiCompilationStatistics { + + private static final long RESOLUTION = 100000000; + private static final boolean TIMELINE_ENABLED = System.getProperty("stats.timeline.file") != null; + private static final boolean COMPILATIONSTATS_ENABLED = System.getProperty("stats.compilations.file") != null; + private static final boolean ENABLED = TIMELINE_ENABLED || COMPILATIONSTATS_ENABLED; + + private static final CiCompilationStatistics DUMMY = new CiCompilationStatistics(null); + + private static ConcurrentLinkedDeque<CiCompilationStatistics> list = new ConcurrentLinkedDeque<>(); + + private static final ThreadLocal<Deque<CiCompilationStatistics>> current = new ThreadLocal<Deque<CiCompilationStatistics>>() { + + @Override + protected Deque<CiCompilationStatistics> initialValue() { + return new ArrayDeque<>(); + } + }; + + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.FIELD) + private static @interface AbsoluteTimeValue { + } + + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.FIELD) + private static @interface TimeValue { + } + + private static long zeroTime = System.nanoTime(); + + private final String holder; + private final String name; + private final String signature; + @AbsoluteTimeValue + private final long startTime; + @TimeValue + private long duration; + private int startInvCount; + private int endInvCount; + private int bytecodeCount; + private int codeSize; + private int deoptCount; + + private CiCompilationStatistics(RiResolvedMethod method) { + if (method != null) { + holder = CiUtil.format("%H", method); + name = method.name(); + signature = CiUtil.format("%p", method); + startTime = System.nanoTime(); + startInvCount = method.invocationCount(); + bytecodeCount = method.codeSize(); + } else { + holder = ""; + name = ""; + signature = ""; + startTime = 0; + } + } + + public void finish(RiResolvedMethod method) { + if (ENABLED) { + duration = System.nanoTime() - startTime; + endInvCount = method.invocationCount(); + codeSize = method.compiledCodeSize(); + if (current.get().getLast() != this) { + throw new RuntimeException("mismatch in finish()"); + } + current.get().removeLast(); + } + } + + public static CiCompilationStatistics current() { + return current.get().isEmpty() ? null : current.get().getLast(); + } + + public static CiCompilationStatistics create(RiResolvedMethod method) { + if (ENABLED) { + CiCompilationStatistics stats = new CiCompilationStatistics(method); + list.add(stats); + current.get().addLast(stats); + return stats; + } else { + return DUMMY; + } + } + + @SuppressWarnings("deprecation") + public static void clear(String dumpName) { + if (!ENABLED) { + return; + } + try { + ConcurrentLinkedDeque<CiCompilationStatistics> snapshot = list; + long snapshotZeroTime = zeroTime; + + list = new ConcurrentLinkedDeque<>(); + zeroTime = System.nanoTime(); + + Date now = new Date(); + String dateString = (now.getYear() + 1900) + "_" + (now.getMonth() + 1) + "_" + now.getDate() + " " + now.getHours() + "_" + now.getMinutes() + "_" + now.getSeconds(); + try (PrintStream out = new PrintStream("compilations " + dateString + " " + dumpName + ".csv")) { + // output the list of all compilations + + Field[] declaredFields = CiCompilationStatistics.class.getDeclaredFields(); + ArrayList<Field> fields = new ArrayList<>(); + for (Field field : declaredFields) { + if (!Modifier.isStatic(field.getModifiers())) { + fields.add(field); + } + } + for (Field field : fields) { + out.print(field.getName() + ";"); + } + out.println(); + for (CiCompilationStatistics stats : snapshot) { + for (Field field : fields) { + if (field.isAnnotationPresent(AbsoluteTimeValue.class)) { + double value = (field.getLong(stats) - snapshotZeroTime) / 1000000d; + out.print(String.format(Locale.ENGLISH, "%.3f", value) + ";"); + } else if (field.isAnnotationPresent(TimeValue.class)) { + double value = field.getLong(stats) / 1000000d; + out.print(String.format(Locale.ENGLISH, "%.3f", value) + ";"); + } else { + out.print(field.get(stats) + ";"); + } + } + out.println(); + } + } + + String timelineFile = System.getProperty("stats.timeline.file"); + if (timelineFile == null || timelineFile.isEmpty()) { + timelineFile = "timeline " + dateString; + } + try (FileOutputStream fos = new FileOutputStream(timelineFile + " " + dumpName + ".csv", true); PrintStream out = new PrintStream(fos)) { + + long[] timeSpent = new long[10000]; + int maxTick = 0; + for (CiCompilationStatistics stats : snapshot) { + long start = stats.startTime - snapshotZeroTime; + long duration = stats.duration; + if (start < 0) { + duration -= -start; + start = 0; + } + + int tick = (int) (start / RESOLUTION); + long timeLeft = RESOLUTION - (start % RESOLUTION); + + while (tick < timeSpent.length && duration > 0) { + if (tick > maxTick) { + maxTick = tick; + } + timeSpent[tick] += Math.min(timeLeft, duration); + duration -= timeLeft; + tick++; + timeLeft = RESOLUTION; + } + } + String timelineName = System.getProperty("stats.timeline.name"); + if (timelineName != null && !timelineName.isEmpty()) { + out.print(timelineName + ";"); + } + for (int i = 0; i <= maxTick; i++) { + out.print((timeSpent[i] * 100 / RESOLUTION) + ";"); + } + out.println(); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public void setDeoptCount(int count) { + this.deoptCount = count; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiDebugInfo.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2009, 2011, 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.api.code; + +import java.io.*; + +import com.oracle.graal.api.meta.*; + +/** + * Represents the debugging information for a particular place in the code, + * which includes the code position, a reference map, and deoptimization information. + */ +public class CiDebugInfo implements Serializable { + + private static final long serialVersionUID = -6047206624915812516L; + + /** + * The code position (including all inlined methods) of this debug info. + * If this is a {@link CiFrame} instance, then it is also the deoptimization information for each inlined frame. + */ + public final CiCodePos codePos; + + /** + * The reference map for the registers at this point. The reference map is <i>packed</i> in that + * for bit {@code k} in byte {@code n}, it refers to the register whose + * {@linkplain CiRegister#number number} is {@code (k + n * 8)}. + */ + public final RiBitMap registerRefMap; + + /** + * The reference map for the stack frame at this point. A set bit at {@code k} in the map + * represents stack slot number {@code k}. + */ + public final RiBitMap frameRefMap; + + /** + * Creates a new {@code CiDebugInfo} from the given values. + * + * @param codePos the {@linkplain CiCodePos code position} or {@linkplain CiFrame frame} info + * @param registerRefMap the register map + * @param frameRefMap the reference map for {@code frame}, which may be {@code null} + */ + public CiDebugInfo(CiCodePos codePos, RiBitMap registerRefMap, RiBitMap frameRefMap) { + this.codePos = codePos; + this.registerRefMap = registerRefMap; + this.frameRefMap = frameRefMap; + } + + /** + * @return {@code true} if this debug information has a frame + */ + public boolean hasFrame() { + return codePos instanceof CiFrame; + } + + /** + * @return {@code true} if this debug info has a reference map for the registers + */ + public boolean hasRegisterRefMap() { + return registerRefMap != null && registerRefMap.size() > 0; + } + + /** + * @return {@code true} if this debug info has a reference map for the stack + */ + public boolean hasStackRefMap() { + return frameRefMap != null && frameRefMap.size() > 0; + } + + + /** + * Gets the deoptimization information for each inlined frame (if available). + * + * @return {@code null} if no frame de-opt info is {@linkplain #hasDebugFrame available} + */ + public CiFrame frame() { + if (hasFrame()) { + return (CiFrame) codePos; + } + return null; + } + + @Override + public String toString() { + return CiUtil.append(new StringBuilder(100), this, null).toString(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiDeoptAction.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2012, 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.api.code; + + +public enum CiDeoptAction { + None, // just interpret, do not invalidate nmethod + RecompileIfTooManyDeopts, // recompile the nmethod; need not invalidate + InvalidateReprofile, // invalidate the nmethod, reset IC, maybe recompile + InvalidateRecompile, // invalidate the nmethod, recompile (probably) + InvalidateStopCompiling; // invalidate the nmethod and do not compile +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiExceptionHandler.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2009, 2011, 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.api.code; + +import com.oracle.graal.api.meta.*; + +/** + * An implementation of the {@link RiExceptionHandler} interface. + */ +public class CiExceptionHandler implements RiExceptionHandler { + + public static final CiExceptionHandler[] NONE = {}; + + public final int startBCI; + public final int endBCI; + public final int handlerBCI; + public final int catchTypeCPI; + public final RiType catchType; + + /** + * Creates a new exception handler with the specified ranges. + * @param startBCI the start index of the protected range + * @param endBCI the end index of the protected range + * @param catchBCI the index of the handler + * @param catchTypeCPI the index of the throwable class in the constant pool + * @param catchType the type caught by this exception handler + */ + public CiExceptionHandler(int startBCI, int endBCI, int catchBCI, int catchTypeCPI, RiType catchType) { + this.startBCI = startBCI; + this.endBCI = endBCI; + this.handlerBCI = catchBCI; + this.catchTypeCPI = catchTypeCPI; + this.catchType = catchType; + } + + public int startBCI() { + return startBCI; + } + + public int endBCI() { + return endBCI; + } + + public int handlerBCI() { + return handlerBCI; + } + + public int catchTypeCPI() { + return catchTypeCPI; + } + + public boolean isCatchAll() { + return catchTypeCPI == 0; + } + + public RiType catchType() { + return catchType; + } + + @Override + public String toString() { + return new StringBuilder(20). + append('['). + append(startBCI). + append(" - "). + append(endBCI). + append(") -> "). + append(handlerBCI). + append(" type="). + append(catchType == null ? "*any*" : catchType.name()). + toString(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiFrame.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2009, 2012, 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.api.code; + +import java.io.*; + +import com.oracle.graal.api.meta.*; + +/** + * Represents the Java bytecode frame state(s) at a given position + * including {@link RiValue locations} where to find the local variables, + * operand stack values and locked objects of the bytecode frame(s). + */ +public class CiFrame extends CiCodePos implements Serializable { + private static final long serialVersionUID = -345025397165977565L; + + /** + * An array of values representing how to reconstruct the state of the Java frame. + * This is array is partitioned as follows: + * <p> + * <table border="1" cellpadding="5" frame="void", rules="all"> + * <tr><th>Start index (inclusive)</th><th>End index (exclusive)</th><th>Description</th></tr> + * <tr><td>0</td> <td>numLocals</td> <td>Local variables</td></tr> + * <tr><td>numLocals</td> <td>numLocals + numStack</td><td>Operand stack</td></tr> + * <tr><td>numLocals + numStack</td><td>values.length</td> <td>Locked objects</td></tr> + * </table> + * <p> + * Note that the number of locals and the number of stack slots may be smaller than the + * maximum number of locals and stack slots as specified in the compiled method. + */ + public final RiValue[] values; + + /** + * The number of locals in the values array. + */ + public final int numLocals; + + /** + * The number of stack slots in the values array. + */ + public final int numStack; + + /** + * The number of locks in the values array. + */ + public final int numLocks; + + /** + * In case this frame state belongs to a deoptimization, the leafGraphId will contain the StructuredGraph.graphId() of the graph that originally introduced this deoptimization point. + * This id is later on used by the runtime system to evict graphs from the graph cache when deoptimizations originating from them have been hit. + */ + public final long leafGraphId; + + public final boolean rethrowException; + + public final boolean duringCall; + + /** + * Creates a new frame object. + * + * @param caller the caller frame (which may be {@code null}) + * @param method the method + * @param bci a BCI within the method + * @param rethrowException specifies if the VM should re-throw the pending exception when deopt'ing using this frame + * @param values the frame state {@link #values} + * @param numLocals the number of local variables + * @param numStack the depth of the stack + * @param numLocks the number of locked objects + */ + public CiFrame(CiFrame caller, RiResolvedMethod method, int bci, boolean rethrowException, boolean duringCall, RiValue[] values, int numLocals, int numStack, int numLocks, long leafGraphId) { + super(caller, method, bci); + assert values != null; + this.rethrowException = rethrowException; + this.duringCall = duringCall; + this.values = values; + this.numLocals = numLocals; + this.numStack = numStack; + this.numLocks = numLocks; + this.leafGraphId = leafGraphId; + assert !rethrowException || numStack == 1 : "must have exception on top of the stack"; + } + + /** + * Gets the value representing the specified local variable. + * @param i the local variable index + * @return the value that can be used to reconstruct the local's current value + */ + public RiValue getLocalValue(int i) { + return values[i]; + } + + /** + * Gets the value representing the specified stack slot. + * @param i the stack index + * @return the value that can be used to reconstruct the stack slot's current value + */ + public RiValue getStackValue(int i) { + return values[i + numLocals]; + } + + /** + * Gets the value representing the specified lock. + * @param i the lock index + * @return the value that can be used to reconstruct the lock's current value + */ + public RiValue getLockValue(int i) { + return values[i + numLocals + numStack]; + } + + /** + * Gets the caller of this frame. + * + * @return {@code null} if this frame has no caller + */ + public CiFrame caller() { + return (CiFrame) caller; + } + + @Override + public String toString() { + return CiUtil.append(new StringBuilder(100), this).toString(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiGenericCallback.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2011, 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.api.code; + +/** + * This interface is used for {@link CiRuntimeCall#GenericCallback} runtime calls. + */ +public abstract class CiGenericCallback { + + @SuppressWarnings("unused") + private Object callbackInternal(Object arg) { + try { + return callback(arg); + } catch (Throwable t) { + t.printStackTrace(); + return null; + } + } + + public abstract Object callback(Object arg); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiMonitorValue.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2011, 2012, 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.api.code; + +import com.oracle.graal.api.meta.*; + +public final class CiMonitorValue extends RiValue { + private static final long serialVersionUID = 8241681800464483691L; + + public RiValue owner; + public final RiValue lockData; + public final boolean eliminated; + + public CiMonitorValue(RiValue owner, RiValue lockData, boolean eliminated) { + super(RiKind.Illegal); + this.owner = owner; + this.lockData = lockData; + this.eliminated = eliminated; + } + + @Override + public String toString() { + return "monitor[" + owner + (lockData != null ? ", " + lockData : "") + (eliminated ? ", eliminated" : "") + "]"; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiRegister.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,256 @@ +/* + * Copyright (c) 2009, 2011, 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.api.code; + +import java.io.*; +import java.util.*; + +import com.oracle.graal.api.meta.*; + +/** + * Represents a target machine register. + */ +public final class CiRegister implements Comparable<CiRegister>, Serializable { + + private static final long serialVersionUID = -7213269157816016300L; + + /** + * Invalid register. + */ + public static final CiRegister None = new CiRegister(-1, -1, 0, "noreg"); + + /** + * Frame pointer of the current method. All spill slots and outgoing stack-based arguments + * are addressed relative to this register. + */ + public static final CiRegister Frame = new CiRegister(-2, -2, 0, "framereg", RegisterFlag.CPU); + + public static final CiRegister CallerFrame = new CiRegister(-3, -3, 0, "callerframereg", RegisterFlag.CPU); + + /** + * The identifier for this register that is unique across all the registers in a {@link CiArchitecture}. + * A valid register has {@code number > 0}. + */ + public final int number; + + /** + * The mnemonic of this register. + */ + public final String name; + + /** + * The actual encoding in a target machine instruction for this register, which may or + * may not be the same as {@link #number}. + */ + public final int encoding; + + /** + * The size of the stack slot used to spill the value of this register. + */ + public final int spillSlotSize; + + /** + * The set of {@link RegisterFlag} values associated with this register. + */ + private final int flags; + + /** + * An array of {@link CiRegisterValue} objects, for this register, with one entry + * per {@link RiKind}, indexed by {@link RiKind#ordinal}. + */ + private final CiRegisterValue[] values; + + /** + * Attributes that characterize a register in a useful way. + * + */ + public enum RegisterFlag { + /** + * Denotes an integral (i.e. non floating point) register. + */ + CPU, + + /** + * Denotes a register whose lowest order byte can be addressed separately. + */ + Byte, + + /** + * Denotes a floating point register. + */ + FPU; + + public final int mask = 1 << (ordinal() + 1); + } + + /** + * Creates a {@code CiRegister} instance. + * + * @param number unique identifier for the register + * @param encoding the target machine encoding for the register + * @param spillSlotSize the size of the stack slot used to spill the value of the register + * @param name the mnemonic name for the register + * @param flags the set of {@link RegisterFlag} values for the register + */ + public CiRegister(int number, int encoding, int spillSlotSize, String name, RegisterFlag... flags) { + this.number = number; + this.name = name; + this.spillSlotSize = spillSlotSize; + this.flags = createMask(flags); + this.encoding = encoding; + + values = new CiRegisterValue[RiKind.VALUES.length]; + for (RiKind kind : RiKind.VALUES) { + values[kind.ordinal()] = new CiRegisterValue(kind, this); + } + } + + private static int createMask(RegisterFlag... flags) { + int result = 0; + for (RegisterFlag f : flags) { + result |= f.mask; + } + return result; + } + + public boolean isSet(RegisterFlag f) { + return (flags & f.mask) != 0; + } + + /** + * Gets this register as a {@linkplain CiRegisterValue value} with a specified kind. + * @param kind the specified kind + * @return the {@link CiRegisterValue} + */ + public CiRegisterValue asValue(RiKind kind) { + return values[kind.ordinal()]; + } + + /** + * Gets this register as a {@linkplain CiRegisterValue value} with no particular kind. + * @return a {@link CiRegisterValue} with {@link RiKind#Illegal} kind. + */ + public CiRegisterValue asValue() { + return asValue(RiKind.Illegal); + } + + /** + * Determines if this is a valid register. + * @return {@code true} iff this register is valid + */ + public boolean isValid() { + return number >= 0; + } + + /** + * Determines if this a floating point register. + */ + public boolean isFpu() { + return isSet(RegisterFlag.FPU); + } + + /** + * Determines if this a general purpose register. + */ + public boolean isCpu() { + return isSet(RegisterFlag.CPU); + } + + /** + * Determines if this register has the {@link RegisterFlag#Byte} attribute set. + * @return {@code true} iff this register has the {@link RegisterFlag#Byte} attribute set. + */ + public boolean isByte() { + return isSet(RegisterFlag.Byte); + } + + /** + * Categorizes a set of registers by {@link RegisterFlag}. + * + * @param registers a list of registers to be categorized + * @return a map from each {@link RegisterFlag} constant to the list of registers for which the flag is + * {@linkplain #isSet(RegisterFlag) set} + */ + public static EnumMap<RegisterFlag, CiRegister[]> categorize(CiRegister[] registers) { + EnumMap<RegisterFlag, CiRegister[]> result = new EnumMap<>(RegisterFlag.class); + for (RegisterFlag flag : RegisterFlag.values()) { + ArrayList<CiRegister> list = new ArrayList<>(); + for (CiRegister r : registers) { + if (r.isSet(flag)) { + list.add(r); + } + } + result.put(flag, list.toArray(new CiRegister[list.size()])); + } + return result; + } + + /** + * Gets the maximum register {@linkplain #number number} in a given set of registers. + * + * @param registers the set of registers to process + * @return the maximum register number for any register in {@code registers} + */ + public static int maxRegisterNumber(CiRegister[] registers) { + int max = Integer.MIN_VALUE; + for (CiRegister r : registers) { + if (r.number > max) { + max = r.number; + } + } + return max; + } + + /** + * Gets the maximum register {@linkplain #encoding encoding} in a given set of registers. + * + * @param registers the set of registers to process + * @return the maximum register encoding for any register in {@code registers} + */ + public static int maxRegisterEncoding(CiRegister[] registers) { + int max = Integer.MIN_VALUE; + for (CiRegister r : registers) { + if (r.encoding > max) { + max = r.encoding; + } + } + return max; + } + + @Override + public String toString() { + return name; + } + + @Override + public int compareTo(CiRegister o) { + if (number < o.number) { + return -1; + } + if (number > o.number) { + return 1; + } + return 0; + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiRegisterAttributes.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2010, 2011, 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.api.code; + +import java.util.*; + +/** + * A collection of register attributes. The specific attribute values for a register may be + * local to a compilation context. For example, a {@link CiRegisterConfig} in use during + * a compilation will determine which registers are callee saved. + */ +public class CiRegisterAttributes { + + /** + * Denotes a register whose value preservation (if required) across a call is the responsibility of the caller. + */ + public final boolean isCallerSave; + + /** + * Denotes a register whose value preservation (if required) across a call is the responsibility of the callee. + */ + public final boolean isCalleeSave; + + /** + * Denotes a register that is available for use by a register allocator. + */ + public final boolean isAllocatable; + + /** + * Denotes a register guaranteed to be non-zero if read in compiled Java code. + * For example, a register dedicated to holding the current thread. + */ + public boolean isNonZero; + + public CiRegisterAttributes(boolean isCallerSave, boolean isCalleeSave, boolean isAllocatable) { + this.isCallerSave = isCallerSave; + this.isCalleeSave = isCalleeSave; + this.isAllocatable = isAllocatable; + } + + public static final CiRegisterAttributes NONE = new CiRegisterAttributes(false, false, false); + + /** + * Creates a map from register {@linkplain CiRegister#number numbers} to register + * {@linkplain CiRegisterAttributes attributes} for a given register configuration and set of + * registers. + * + * @param registerConfig a register configuration + * @param registers a set of registers + * @return an array whose length is the max register number in {@code registers} plus 1. An element at index i holds + * the attributes of the register whose number is i. + */ + public static CiRegisterAttributes[] createMap(CiRegisterConfig registerConfig, CiRegister[] registers) { + CiRegisterAttributes[] map = new CiRegisterAttributes[registers.length]; + for (CiRegister reg : registers) { + if (reg != null) { + CiCalleeSaveLayout csl = registerConfig.getCalleeSaveLayout(); + CiRegisterAttributes attr = new CiRegisterAttributes( + Arrays.asList(registerConfig.getCallerSaveRegisters()).contains(reg), + csl == null ? false : Arrays.asList(csl.registers).contains(reg), + Arrays.asList(registerConfig.getAllocatableRegisters()).contains(reg)); + if (map.length <= reg.number) { + map = Arrays.copyOf(map, reg.number + 1); + } + map[reg.number] = attr; + } + } + for (int i = 0; i < map.length; i++) { + if (map[i] == null) { + map[i] = NONE; + } + } + return map; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiRegisterConfig.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2009, 2011, 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.api.code; + +import java.util.*; + +import com.oracle.graal.api.code.CiCallingConvention.*; +import com.oracle.graal.api.code.CiRegister.*; +import com.oracle.graal.api.meta.*; + +/** + * A register configuration binds roles and {@linkplain CiRegisterAttributes attributes} + * to physical registers. + */ +public interface CiRegisterConfig { + + /** + * Gets the register to be used for returning a value of a given kind. + */ + CiRegister getReturnRegister(RiKind kind); + + /** + * Gets the register to which {@link CiRegister#Frame} and {@link CiRegister#CallerFrame} are bound. + */ + CiRegister getFrameRegister(); + + CiRegister getScratchRegister(); + + /** + * Gets the calling convention describing how arguments are passed. + * + * @param type the type of calling convention being requested + * @param parameters the types of the arguments of the call + * @param target the target platform + * @param stackOnly ignore registers + */ + CiCallingConvention getCallingConvention(Type type, RiKind[] parameters, CiTarget target, boolean stackOnly); + + /** + * Gets the ordered set of registers that are can be used to pass parameters + * according to a given calling convention. + * + * @param type the type of calling convention + * @param flag specifies whether registers for {@linkplain RegisterFlag#CPU integral} or + * {@linkplain} RegisterFlag#FPU floating point} parameters are being requested + * @return the ordered set of registers that may be used to pass parameters in a call conforming to {@code type} + */ + CiRegister[] getCallingConventionRegisters(Type type, RegisterFlag flag); + + /** + * Gets the set of registers that can be used by the register allocator. + */ + CiRegister[] getAllocatableRegisters(); + + /** + * Gets the set of registers that can be used by the register allocator, + * {@linkplain CiRegister#categorize(CiRegister[]) categorized} by register {@linkplain RegisterFlag flags}. + * + * @return a map from each {@link RegisterFlag} constant to the list of {@linkplain #getAllocatableRegisters() + * allocatable} registers for which the flag is {@linkplain #isSet(RegisterFlag) set} + * + */ + EnumMap<RegisterFlag, CiRegister[]> getCategorizedAllocatableRegisters(); + + /** + * Gets the registers whose values must be preserved by a method across any call it makes. + */ + CiRegister[] getCallerSaveRegisters(); + + /** + * Gets the layout of the callee save area of this register configuration. + * + * @return {@code null} if there is no callee save area + */ + CiCalleeSaveLayout getCalleeSaveLayout(); + + /** + * Gets a map from register {@linkplain CiRegister#number numbers} to register + * {@linkplain CiRegisterAttributes attributes} for this register configuration. + * + * @return an array where an element at index i holds the attributes of the register whose number is i + * @see CiRegister#categorize(CiRegister[]) + */ + CiRegisterAttributes[] getAttributesMap(); + + /** + * Gets the register corresponding to a runtime-defined role. + * + * @param id the identifier of a runtime-defined register role + * @return the register playing the role specified by {@code id} + */ + CiRegister getRegisterForRole(int id); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiRegisterConfigImpl.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,298 @@ +/* + * Copyright (c) 2010, 2012, 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.api.code; + +import java.util.*; + +import com.oracle.graal.api.code.CiCallingConvention.*; +import com.oracle.graal.api.code.CiRegister.*; +import com.oracle.graal.api.meta.*; + +/** + * A default implementation of {@link CiRegisterConfig}. + */ +public class CiRegisterConfigImpl implements CiRegisterConfig { + + /** + * The object describing the callee save area of this register configuration. + */ + public CiCalleeSaveLayout csl; + + /** + * The minimum register role identifier. + */ + public final int minRole; + + /** + * The map from register role IDs to registers. + */ + public final CiRegister[] registersRoleMap; + + /** + * The set of registers that can be used by the register allocator. + */ + public final CiRegister[] allocatable; + + /** + * The set of registers that can be used by the register allocator, + * {@linkplain CiRegister#categorize(CiRegister[]) categorized} by register + * {@linkplain RegisterFlag flags}. + */ + public final EnumMap<RegisterFlag, CiRegister[]> categorized; + + /** + * The ordered set of registers used to pass integral arguments. + */ + public final CiRegister[] cpuParameters; + + /** + * The ordered set of registers used to pass floating point arguments. + */ + public final CiRegister[] fpuParameters; + + /** + * The caller saved registers. + */ + public final CiRegister[] callerSave; + + /** + * The register to which {@link CiRegister#Frame} and {@link CiRegister#CallerFrame} are bound. + */ + public final CiRegister frame; + + /** + * Register for returning an integral value. + */ + public final CiRegister integralReturn; + + /** + * Register for returning a floating point value. + */ + public final CiRegister floatingPointReturn; + + /** + * The map from register {@linkplain CiRegister#number numbers} to register + * {@linkplain CiRegisterAttributes attributes} for this register configuration. + */ + public final CiRegisterAttributes[] attributesMap; + + /** + * The scratch register. + */ + public final CiRegister scratch; + + /** + * The frame offset of the first stack argument for each calling convention {@link CiCallingConvention.Type}. + */ + public final int[] stackArg0Offsets = new int[CiCallingConvention.Type.VALUES.length]; + + public CiRegisterConfigImpl( + CiRegister frame, + CiRegister integralReturn, + CiRegister floatingPointReturn, + CiRegister scratch, + CiRegister[] allocatable, + CiRegister[] callerSave, + CiRegister[] parameters, + CiCalleeSaveLayout csl, + CiRegister[] allRegisters, + Map<Integer, CiRegister> roles) { + this.frame = frame; + this.csl = csl; + this.allocatable = allocatable; + this.callerSave = callerSave; + assert !Arrays.asList(allocatable).contains(scratch); + this.scratch = scratch; + EnumMap<RegisterFlag, CiRegister[]> categorizedParameters = CiRegister.categorize(parameters); + this.cpuParameters = categorizedParameters.get(RegisterFlag.CPU); + this.fpuParameters = categorizedParameters.get(RegisterFlag.FPU); + categorized = CiRegister.categorize(allocatable); + attributesMap = CiRegisterAttributes.createMap(this, allRegisters); + this.floatingPointReturn = floatingPointReturn; + this.integralReturn = integralReturn; + int minRoleId = Integer.MAX_VALUE; + int maxRoleId = Integer.MIN_VALUE; + for (Map.Entry<Integer, CiRegister> e : roles.entrySet()) { + int id = e.getKey(); + assert id >= 0; + if (minRoleId > id) { + minRoleId = id; + } + if (maxRoleId < id) { + maxRoleId = id; + } + } + registersRoleMap = new CiRegister[(maxRoleId - minRoleId) + 1]; + for (Map.Entry<Integer, CiRegister> e : roles.entrySet()) { + int id = e.getKey(); + registersRoleMap[id] = e.getValue(); + } + minRole = minRoleId; + } + + public CiRegisterConfigImpl(CiRegisterConfigImpl src, CiCalleeSaveLayout csl) { + this.frame = src.frame; + this.csl = csl; + this.allocatable = src.allocatable; + this.callerSave = src.callerSave; + this.scratch = src.scratch; + this.cpuParameters = src.cpuParameters; + this.fpuParameters = src.fpuParameters; + this.categorized = src.categorized; + this.attributesMap = src.attributesMap; + this.floatingPointReturn = src.floatingPointReturn; + this.integralReturn = src.integralReturn; + this.registersRoleMap = src.registersRoleMap; + this.minRole = src.minRole; + System.arraycopy(src.stackArg0Offsets, 0, stackArg0Offsets, 0, stackArg0Offsets.length); + } + + public CiRegister getReturnRegister(RiKind kind) { + if (kind.isDouble() || kind.isFloat()) { + return floatingPointReturn; + } + return integralReturn; + } + + public CiRegister getFrameRegister() { + return frame; + } + + public CiRegister getScratchRegister() { + return scratch; + } + + /** + * {@inheritDoc} + * + * This implementation assigns all available registers to parameters before assigning + * any stack slots to parameters. + */ + public CiCallingConvention getCallingConvention(Type type, RiKind[] parameters, CiTarget target, boolean stackOnly) { + RiValue[] locations = new RiValue[parameters.length]; + + int currentGeneral = 0; + int currentXMM = 0; + int currentStackOffset = stackArg0Offsets[type.ordinal()]; + + for (int i = 0; i < parameters.length; i++) { + final RiKind kind = parameters[i]; + + switch (kind) { + case Byte: + case Boolean: + case Short: + case Char: + case Int: + case Long: + case Object: + if (!stackOnly && currentGeneral < cpuParameters.length) { + CiRegister register = cpuParameters[currentGeneral++]; + locations[i] = register.asValue(kind); + } + break; + + case Float: + case Double: + if (!stackOnly && currentXMM < fpuParameters.length) { + CiRegister register = fpuParameters[currentXMM++]; + locations[i] = register.asValue(kind); + } + break; + + default: + throw new InternalError("Unexpected parameter kind: " + kind); + } + + if (locations[i] == null) { + locations[i] = CiStackSlot.get(kind.stackKind(), currentStackOffset, !type.out); + currentStackOffset += Math.max(target.sizeInBytes(kind), target.wordSize); + } + } + + return new CiCallingConvention(locations, currentStackOffset); + } + + public CiRegister[] getCallingConventionRegisters(Type type, RegisterFlag flag) { + if (flag == RegisterFlag.CPU) { + return cpuParameters; + } + assert flag == RegisterFlag.FPU; + return fpuParameters; + } + + public CiRegister[] getAllocatableRegisters() { + return allocatable; + } + + public EnumMap<RegisterFlag, CiRegister[]> getCategorizedAllocatableRegisters() { + return categorized; + } + + public CiRegister[] getCallerSaveRegisters() { + return callerSave; + } + + public CiCalleeSaveLayout getCalleeSaveLayout() { + return csl; + } + + public CiRegisterAttributes[] getAttributesMap() { + return attributesMap; + } + + public CiRegister getRegisterForRole(int id) { + return registersRoleMap[id - minRole]; + } + + @Override + public String toString() { + StringBuilder roleMap = new StringBuilder(); + for (int i = 0; i < registersRoleMap.length; ++i) { + CiRegister reg = registersRoleMap[i]; + if (reg != null) { + if (roleMap.length() != 0) { + roleMap.append(", "); + } + roleMap.append(i + minRole).append(" -> ").append(reg); + } + } + StringBuilder stackArg0OffsetsMap = new StringBuilder(); + for (Type t : Type.VALUES) { + if (stackArg0OffsetsMap.length() != 0) { + stackArg0OffsetsMap.append(", "); + } + stackArg0OffsetsMap.append(t).append(" -> ").append(stackArg0Offsets[t.ordinal()]); + } + String res = String.format( + "Allocatable: " + Arrays.toString(getAllocatableRegisters()) + "%n" + + "CallerSave: " + Arrays.toString(getCallerSaveRegisters()) + "%n" + + "CalleeSave: " + getCalleeSaveLayout() + "%n" + + "CPU Params: " + Arrays.toString(cpuParameters) + "%n" + + "FPU Params: " + Arrays.toString(fpuParameters) + "%n" + + "VMRoles: " + roleMap + "%n" + + "stackArg0: " + stackArg0OffsetsMap + "%n" + + "Scratch: " + getScratchRegister() + "%n"); + return res; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiRegisterValue.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2009, 2012, 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.api.code; + +import com.oracle.graal.api.meta.*; + +/** + * Denotes a register that stores a value of a fixed kind. There is exactly one (canonical) instance of {@code + * CiRegisterValue} for each ({@link CiRegister}, {@link RiKind}) pair. Use {@link CiRegister#asValue(RiKind)} to + * retrieve the canonical {@link CiRegisterValue} instance for a given (register,kind) pair. + */ +public final class CiRegisterValue extends RiValue { + private static final long serialVersionUID = 7999341472196897163L; + + /** + * The register. + */ + public final CiRegister reg; + + /** + * Should only be called from {@link CiRegister#CiRegister} to ensure canonicalization. + */ + protected CiRegisterValue(RiKind kind, CiRegister register) { + super(kind); + this.reg = register; + } + + @Override + public int hashCode() { + return (reg.number << 4) ^ kind.ordinal(); + } + + @Override + public String toString() { + return reg.name + kindSuffix(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiRuntimeCall.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2009, 2011, 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.api.code; + +import static com.oracle.graal.api.meta.RiKind.*; + +import com.oracle.graal.api.meta.*; + +/** + * Enumerates the calls that must be provided by the runtime system. The compiler + * may generate code that calls the runtime services for unresolved and slow cases of some + * bytecodes. + */ +public enum CiRuntimeCall { + UnwindException(Void, Object), + Deoptimize(Void), + RegisterFinalizer(Void, Object), + SetDeoptInfo(Void, Object), + CreateNullPointerException(Object), + CreateOutOfBoundsException(Object, Int), + JavaTimeMillis(Long), + JavaTimeNanos(Long), + Debug(Void), + ArithmeticFrem(Float, Float, Float), + ArithmeticDrem(Double, Double, Double), + ArithmeticCos(Double, Double), + ArithmeticTan(Double, Double), + ArithmeticSin(Double, Double), + GenericCallback(Object, Object, Object); + + public final RiKind resultKind; + public final RiKind[] arguments; + + private CiRuntimeCall(RiKind resultKind, RiKind... args) { + this.resultKind = resultKind; + this.arguments = args; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiStackSlot.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,175 @@ +/* + * Copyright (c) 2010, 2012, 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.api.code; + +import static com.oracle.graal.api.meta.RiKind.*; + +import com.oracle.graal.api.meta.*; + +/** + * Represents a compiler spill slot or an outgoing stack-based argument in a method's frame + * or an incoming stack-based argument in a method's {@linkplain #inCallerFrame() caller's frame}. + */ +public final class CiStackSlot extends RiValue { + private static final long serialVersionUID = -7725071921307318433L; + + private final int offset; + private final boolean addFrameSize; + + /** + * Gets a {@link CiStackSlot} instance representing a stack slot at a given index + * holding a value of a given kind. + * + * @param kind The kind of the value stored in the stack slot. + * @param offset The offset of the stack slot (in bytes) + * @param inCallerFrame Specifies if the offset is relative to the stack pointer, + * or the beginning of the frame (stack pointer + total frame size). + */ + public static CiStackSlot get(RiKind kind, int offset, boolean addFrameSize) { + assert kind.stackKind() == kind; + assert addFrameSize || offset >= 0; + + if (offset % CACHE_GRANULARITY == 0) { + CiStackSlot[][] cache; + int index = offset / CACHE_GRANULARITY; + if (!addFrameSize) { + cache = OUT_CACHE; + } else if (offset >= 0) { + cache = IN_CACHE; + } else { + cache = SPILL_CACHE; + index = -index; + } + CiStackSlot[] slots = cache[kind.ordinal()]; + if (index < slots.length) { + CiStackSlot slot = slots[index]; + assert slot.kind == kind && slot.offset == offset && slot.addFrameSize == addFrameSize; + return slot; + } + } + return new CiStackSlot(kind, offset, addFrameSize); + } + + /** + * Private constructor to enforce use of {@link #get()} so that a cache can be used. + */ + private CiStackSlot(RiKind kind, int offset, boolean addFrameSize) { + super(kind); + this.offset = offset; + this.addFrameSize = addFrameSize; + } + + /** + * Gets the offset of this stack slot, relative to the stack pointer. + * @return The offset of this slot (in bytes). + */ + public int offset(int totalFrameSize) { + assert totalFrameSize > 0 || !addFrameSize; + int result = offset + (addFrameSize ? totalFrameSize : 0); + assert result >= 0; + return result; + } + + public boolean inCallerFrame() { + return addFrameSize && offset >= 0; + } + + public int rawOffset() { + return offset; + } + + public boolean rawAddFrameSize() { + return addFrameSize; + } + + @Override + public int hashCode() { + return kind.ordinal() ^ (offset << 4) ^ (addFrameSize ? 15 : 0); + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o instanceof CiStackSlot) { + CiStackSlot l = (CiStackSlot) o; + return l.kind == kind && l.offset == offset && l.addFrameSize == addFrameSize; + } + return false; + } + + @Override + public String toString() { + if (!addFrameSize) { + return "out:" + offset + kindSuffix(); + } else if (offset >= 0) { + return "in:" + offset + kindSuffix(); + } else { + return "stack:" + (-offset) + kindSuffix(); + } + } + + /** + * Gets this stack slot used to pass an argument from the perspective of a caller. + */ + public CiStackSlot asOutArg() { + assert offset >= 0; + if (addFrameSize) { + return get(kind, offset, false); + } + return this; + } + + /** + * Gets this stack slot used to pass an argument from the perspective of a callee. + */ + public CiStackSlot asInArg() { + assert offset >= 0; + if (!addFrameSize) { + return get(kind, offset, true); + } + return this; + } + + + private static final int CACHE_GRANULARITY = 8; + private static final int SPILL_CACHE_PER_KIND_SIZE = 100; + private static final int PARAM_CACHE_PER_KIND_SIZE = 10; + + private static final CiStackSlot[][] SPILL_CACHE = makeCache(SPILL_CACHE_PER_KIND_SIZE, -1, true); + private static final CiStackSlot[][] IN_CACHE = makeCache(PARAM_CACHE_PER_KIND_SIZE, 1, true); + private static final CiStackSlot[][] OUT_CACHE = makeCache(PARAM_CACHE_PER_KIND_SIZE, 1, false); + + private static CiStackSlot[][] makeCache(int cachePerKindSize, int sign, boolean addFrameSize) { + CiStackSlot[][] cache = new CiStackSlot[RiKind.VALUES.length][]; + for (RiKind kind : new RiKind[] {Illegal, Int, Long, Float, Double, Object, Jsr}) { + CiStackSlot[] slots = new CiStackSlot[cachePerKindSize]; + for (int i = 0; i < cachePerKindSize; i++) { + slots[i] = new CiStackSlot(kind, sign * i * CACHE_GRANULARITY, addFrameSize); + } + cache[kind.ordinal()] = slots; + } + return cache; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiTarget.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2009, 2012, 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.api.code; + +import com.oracle.graal.api.meta.*; + + +/** + * Represents the target machine for a compiler, including the CPU architecture, the size of pointers and references, + * alignment of stacks, caches, etc. + */ +public class CiTarget { + public final CiArchitecture arch; + + /** + * The OS page size. + */ + public final int pageSize; + + /** + * Specifies if this is a multi-processor system. + */ + public final boolean isMP; + + /** + * Specifies if this target supports encoding objects inline in the machine code. + */ + public final boolean inlineObjects; + + /** + * The machine word size on this target. + */ + public final int wordSize; + + /** + * The CiKind to be used for representing raw pointers and CPU registers. + */ + public final RiKind wordKind; + + /** + * The stack alignment requirement of the platform. For example, + * from Appendix D of <a href="http://www.intel.com/Assets/PDF/manual/248966.pdf">Intel 64 and IA-32 Architectures Optimization Reference Manual</a>: + * <pre> + * "It is important to ensure that the stack frame is aligned to a + * 16-byte boundary upon function entry to keep local __m128 data, + * parameters, and XMM register spill locations aligned throughout + * a function invocation." + * </pre> + */ + public final int stackAlignment; + + /** + * @see http://docs.sun.com/app/docs/doc/806-0477/6j9r2e2b9?a=view + */ + public final int stackBias; + + /** + * The cache alignment. + */ + public final int cacheAlignment; + + /** + * Specifies how {@code long} and {@code double} constants are to be stored + * in {@linkplain CiFrame frames}. This is useful for VMs such as HotSpot + * where convention the interpreter uses is that the second local + * holds the first raw word of the native long or double representation. + * This is actually reasonable, since locals and stack arrays + * grow downwards in all implementations. + * If, on some machine, the interpreter's Java locals or stack + * were to grow upwards, the embedded doubles would be word-swapped.) + */ + public final boolean debugInfoDoubleWordsInSecondSlot; + + /** + * Temporary flag to distinguish between the semantics necessary for HotSpot and Maxine. + */ + // TODO This should go away when XIR goes away, and the logic be part of the VM-specific lowering. + public final boolean invokeSnippetAfterArguments; + + public CiTarget(CiArchitecture arch, + boolean isMP, + int stackAlignment, + int pageSize, + int cacheAlignment, + boolean inlineObjects, + boolean debugInfoDoubleWordsInSecondSlot, + boolean invokeSnippetAfterArguments) { + this.arch = arch; + this.pageSize = pageSize; + this.isMP = isMP; + this.wordSize = arch.wordSize; + if (wordSize == 8) { + this.wordKind = RiKind.Long; + } else { + this.wordKind = RiKind.Int; + } + this.stackAlignment = stackAlignment; + this.stackBias = 0; // TODO: configure with param once SPARC port exists + this.cacheAlignment = cacheAlignment; + this.inlineObjects = inlineObjects; + this.debugInfoDoubleWordsInSecondSlot = debugInfoDoubleWordsInSecondSlot; + this.invokeSnippetAfterArguments = invokeSnippetAfterArguments; + } + + /** + * Gets the size in bytes of the specified kind for this target. + * + * @param kind the kind for which to get the size + * @return the size in bytes of {@code kind} + */ + public int sizeInBytes(RiKind kind) { + // Checkstyle: stop + switch (kind) { + case Boolean: return 1; + case Byte: return 1; + case Char: return 2; + case Short: return 2; + case Int: return 4; + case Long: return 8; + case Float: return 4; + case Double: return 8; + case Object: return wordSize; + case Jsr: return 4; + default: return 0; + } + // Checkstyle: resume + } + + /** + * Aligns the given frame size (without return instruction pointer) to the stack + * alignment size and return the aligned size (without return instruction pointer). + * @param frameSize the initial frame size to be aligned + * @return the aligned frame size + */ + public int alignFrameSize(int frameSize) { + int x = frameSize + arch.returnAddressSize + (stackAlignment - 1); + return (x / stackAlignment) * stackAlignment - arch.returnAddressSize; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiTargetMethod.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,555 @@ +/* + * Copyright (c) 2009, 2011, 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.api.code; + +import java.io.*; +import java.util.*; + +import com.oracle.graal.api.meta.*; + +/** + * Represents the output from compiling a method, including the compiled machine code, associated data and references, + * relocation information, deoptimization information, etc. It is the essential component of a {@link CiResult}, which also includes + * {@linkplain CiStatistics compilation statistics} and {@linkplain CiBailout failure information}. + */ +public class CiTargetMethod implements Serializable { + + private static final long serialVersionUID = -1319947729753702434L; + + /** + * Represents a code position with associated additional information. + */ + public abstract static class Site implements Serializable { + private static final long serialVersionUID = -8214214947651979102L; + /** + * The position (or offset) of this site with respect to the start of the target method. + */ + public final int pcOffset; + + public Site(int pos) { + this.pcOffset = pos; + } + } + + /** + * Represents a safepoint with associated debug info. + */ + public static class Safepoint extends Site implements Comparable<Safepoint> { + private static final long serialVersionUID = 2479806696381720162L; + public final CiDebugInfo debugInfo; + + Safepoint(int pcOffset, CiDebugInfo debugInfo) { + super(pcOffset); + this.debugInfo = debugInfo; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(pcOffset); + sb.append("[<safepoint>]"); + appendDebugInfo(sb, debugInfo); + return sb.toString(); + } + + @Override + public int compareTo(Safepoint o) { + if (pcOffset < o.pcOffset) { + return -1; + } else if (pcOffset > o.pcOffset) { + return 1; + } + return 0; + } + } + + /** + * Represents a call in the code. + */ + public static final class Call extends Safepoint { + private static final long serialVersionUID = 1440741241631046954L; + + /** + * The target of the call. + */ + public final Object target; + + /** + * The size of the call instruction. + */ + public final int size; + + /** + * Specifies if this call is direct or indirect. A direct call has an immediate operand encoding + * the absolute or relative (to the call itself) address of the target. An indirect call has a + * register or memory operand specifying the target address of the call. + */ + public final boolean direct; + + Call(Object target, int pcOffset, int size, boolean direct, CiDebugInfo debugInfo) { + super(pcOffset, debugInfo); + this.size = size; + this.target = target; + this.direct = direct; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(pcOffset); + sb.append('['); + sb.append(target); + sb.append(']'); + + if (debugInfo != null) { + appendDebugInfo(sb, debugInfo); + } + + return sb.toString(); + } + } + + /** + * Represents a reference to data from the code. The associated data can be any constant. + */ + public static final class DataPatch extends Site { + private static final long serialVersionUID = 5771730331604867476L; + public final RiConstant constant; + public final int alignment; + + DataPatch(int pcOffset, RiConstant data, int alignment) { + super(pcOffset); + this.constant = data; + this.alignment = alignment; + } + + @Override + public String toString() { + return String.format("%d[<data patch referring to data %s>]", pcOffset, constant); + } + } + + /** + * Provides extra information about instructions or data at specific positions in {@link CiTargetMethod#targetCode()}. + * This is optional information that can be used to enhance a disassembly of the code. + */ + public abstract static class CodeAnnotation implements Serializable { + private static final long serialVersionUID = -7903959680749520748L; + public final int position; + + public CodeAnnotation(int position) { + this.position = position; + } + } + + /** + * A string comment about one or more instructions at a specific position in the code. + */ + public static final class CodeComment extends CodeAnnotation { + /** + * + */ + private static final long serialVersionUID = 6802287188701961401L; + public final String value; + public CodeComment(int position, String comment) { + super(position); + this.value = comment; + } + + @Override + public String toString() { + return getClass().getSimpleName() + "@" + position + ": " + value; + } + } + + /** + * Labels some inline data in the code. + */ + public static final class InlineData extends CodeAnnotation { + private static final long serialVersionUID = 305997507263827108L; + public final int size; + public InlineData(int position, int size) { + super(position); + this.size = size; + } + + @Override + public String toString() { + return getClass().getSimpleName() + "@" + position + ": size=" + size; + } + } + + /** + * Describes a table of signed offsets embedded in the code. The offsets are relative to the starting + * address of the table. This type of table maybe generated when translating a multi-way branch + * based on a key value from a dense value set (e.g. the {@code tableswitch} JVM instruction). + * + * The table is indexed by the contiguous range of integers from {@link #low} to {@link #high} inclusive. + */ + public static final class JumpTable extends CodeAnnotation { + private static final long serialVersionUID = 2222194398353801831L; + + /** + * The low value in the key range (inclusive). + */ + public final int low; + + /** + * The high value in the key range (inclusive). + */ + public final int high; + + /** + * The size (in bytes) of each table entry. + */ + public final int entrySize; + + public JumpTable(int position, int low, int high, int entrySize) { + super(position); + this.low = low; + this.high = high; + this.entrySize = entrySize; + } + + @Override + public String toString() { + return getClass().getSimpleName() + "@" + position + ": [" + low + " .. " + high + "]"; + } + } + + /** + * Describes a table of key and offset pairs. The offset in each table entry is relative to the address of + * the table. This type of table maybe generated when translating a multi-way branch + * based on a key value from a sparse value set (e.g. the {@code lookupswitch} JVM instruction). + */ + public static final class LookupTable extends CodeAnnotation { + private static final long serialVersionUID = 8367952567559116160L; + + /** + * The number of entries in the table. + */ + public final int npairs; + + /** + * The size (in bytes) of entry's key. + */ + public final int keySize; + + /** + * The size (in bytes) of entry's offset value. + */ + public final int offsetSize; + + public LookupTable(int position, int npairs, int keySize, int offsetSize) { + super(position); + this.npairs = npairs; + this.keySize = keySize; + this.offsetSize = offsetSize; + } + + @Override + public String toString() { + return getClass().getSimpleName() + "@" + position + ": [npairs=" + npairs + ", keySize=" + keySize + ", offsetSize=" + offsetSize + "]"; + } + } + + /** + * Represents exception handler information for a specific code position. It includes the catch code position as + * well as the caught exception type. + */ + public static final class ExceptionHandler extends Site { + private static final long serialVersionUID = 4897339464722665281L; + public final int handlerPos; + + ExceptionHandler(int pcOffset, int handlerPos) { + super(pcOffset); + this.handlerPos = handlerPos; + } + + @Override + public String toString() { + return String.format("%d[<exception edge to %d>]", pcOffset, handlerPos); + } + } + + public static final class Mark extends Site { + private static final long serialVersionUID = 3612943150662354844L; + public final Object id; + public final Mark[] references; + + Mark(int pcOffset, Object id, Mark[] references) { + super(pcOffset); + this.id = id; + this.references = references; + } + + @Override + public String toString() { + if (id == null) { + return String.format("%d[<mark with %d references>]", pcOffset, references.length); + } else if (id instanceof Integer) { + return String.format("%d[<mark with %d references and id %s>]", pcOffset, references.length, Integer.toHexString((Integer) id)); + } else { + return String.format("%d[<mark with %d references and id %s>]", pcOffset, references.length, id.toString()); + } + } + } + + /** + * List of safepoints, sorted by {@link Site#pcOffset}. + */ + public final List<Safepoint> safepoints = new ArrayList<>(); + + /** + * List of data references. + */ + public final List<DataPatch> dataReferences = new ArrayList<>(); + + /** + * List of exception handlers. + */ + public final List<ExceptionHandler> exceptionHandlers = new ArrayList<>(); + + /** + * List of marks. + */ + public final List<Mark> marks = new ArrayList<>(); + + private int frameSize = -1; + private int customStackAreaOffset = -1; + private int registerRestoreEpilogueOffset = -1; + /** + * The buffer containing the emitted machine code. + */ + private byte[] targetCode; + + /** + * The leading number of bytes in {@link #targetCode} containing the emitted machine code. + */ + private int targetCodeSize; + + private ArrayList<CodeAnnotation> annotations; + + private CiAssumptions assumptions; + + /** + * Constructs a new target method. + */ + public CiTargetMethod() { + } + + public void setAssumptions(CiAssumptions assumptions) { + this.assumptions = assumptions; + } + + public CiAssumptions assumptions() { + return assumptions; + } + + /** + * Sets the frame size in bytes. Does not include the return address pushed onto the + * stack, if any. + * + * @param size the size of the frame in bytes + */ + public void setFrameSize(int size) { + frameSize = size; + } + + /** + * Sets the machine that has been generated by the compiler. + * + * @param code the machine code generated + * @param size the size of the machine code + */ + public void setTargetCode(byte[] code, int size) { + targetCode = code; + targetCodeSize = size; + } + + /** + * Records a reference to the data section in the code section (e.g. to load an integer or floating point constant). + * + * @param codePos the position in the code where the data reference occurs + * @param data the data that is referenced + * @param alignment the alignment requirement of the data or 0 if there is no alignment requirement + */ + public void recordDataReference(int codePos, RiConstant data, int alignment) { + assert codePos >= 0 && data != null; + dataReferences.add(new DataPatch(codePos, data, alignment)); + } + + /** + * Records a call in the code array. + * + * @param codePos the position of the call in the code array + * @param size the size of the call instruction + * @param target the {@link RiRuntime#asCallTarget(Object) target} being called + * @param debugInfo the debug info for the call + * @param direct specifies if this is a {@linkplain Call#direct direct} call + */ + public void recordCall(int codePos, int size, Object target, CiDebugInfo debugInfo, boolean direct) { + final Call call = new Call(target, codePos, size, direct, debugInfo); + addSafepoint(call); + } + + /** + * Records an exception handler for this method. + * + * @param codePos the position in the code that is covered by the handler + * @param handlerPos the position of the handler + * @param throwableType the type of exceptions handled by the handler + */ + public void recordExceptionHandler(int codePos, int handlerPos) { + exceptionHandlers.add(new ExceptionHandler(codePos, handlerPos)); + } + + /** + * Records a safepoint in the code array. + * + * @param codePos the position of the safepoint in the code array + * @param debugInfo the debug info for the safepoint + */ + public void recordSafepoint(int codePos, CiDebugInfo debugInfo) { + addSafepoint(new Safepoint(codePos, debugInfo)); + } + + private void addSafepoint(Safepoint safepoint) { + // The safepoints list must always be sorted + if (!safepoints.isEmpty() && safepoints.get(safepoints.size() - 1).pcOffset >= safepoint.pcOffset) { + // This re-sorting should be very rare + Collections.sort(safepoints); + } + safepoints.add(safepoint); + } + + /** + * Records an instruction mark within this method. + * + * @param codePos the position in the code that is covered by the handler + * @param id the identifier for this mark + * @param references an array of other marks that this mark references + */ + public Mark recordMark(int codePos, Object id, Mark[] references) { + Mark mark = new Mark(codePos, id, references); + marks.add(mark); + return mark; + } + + /** + * Allows a method to specify the offset of the epilogue that restores the callee saved registers. Must be called + * iff the method is a callee saved method and stores callee registers on the stack. + * + * @param registerRestoreEpilogueOffset the offset in the machine code where the epilogue begins + */ + public void setRegisterRestoreEpilogueOffset(int registerRestoreEpilogueOffset) { + assert this.registerRestoreEpilogueOffset == -1; + this.registerRestoreEpilogueOffset = registerRestoreEpilogueOffset; + } + + /** + * The frame size of the method in bytes. + * + * @return the frame size + */ + public int frameSize() { + assert frameSize != -1 : "frame size not yet initialized!"; + return frameSize; + } + + /** + * @return the code offset of the start of the epilogue that restores all callee saved registers, or -1 if this is + * not a callee saved method + */ + public int registerRestoreEpilogueOffset() { + return registerRestoreEpilogueOffset; + } + + /** + * Offset in bytes for the custom stack area (relative to sp). + * @return the offset in bytes + */ + public int customStackAreaOffset() { + return customStackAreaOffset; + } + + /** + * @see #customStackAreaOffset() + * @param offset + */ + public void setCustomStackAreaOffset(int offset) { + customStackAreaOffset = offset; + } + + /** + * @return the machine code generated for this method + */ + public byte[] targetCode() { + return targetCode; + } + + /** + * @return the size of the machine code generated for this method + */ + public int targetCodeSize() { + return targetCodeSize; + } + + /** + * @return the code annotations or {@code null} if there are none + */ + public List<CodeAnnotation> annotations() { + return annotations; + } + + public void addAnnotation(CodeAnnotation annotation) { + assert annotation != null; + if (annotations == null) { + annotations = new ArrayList<>(); + } + annotations.add(annotation); + } + + private static void appendDebugInfo(StringBuilder sb, CiDebugInfo info) { + if (info != null) { + appendRefMap(sb, "stackMap", info.frameRefMap); + appendRefMap(sb, "registerMap", info.registerRefMap); + CiCodePos codePos = info.codePos; + if (codePos != null) { + CiUtil.appendLocation(sb.append(" "), codePos.method, codePos.bci); + if (info.hasFrame()) { + sb.append(" #locals=").append(info.frame().numLocals).append(" #expr=").append(info.frame().numStack); + if (info.frame().numLocks > 0) { + sb.append(" #locks=").append(info.frame().numLocks); + } + } + } + } + } + + private static void appendRefMap(StringBuilder sb, String name, RiBitMap map) { + if (map != null) { + sb.append(' ').append(name).append('[').append(map.toBinaryString()).append(']'); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiUtil.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,705 @@ +/* + * Copyright (c) 2010, 2011, 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.api.code; + +import static java.lang.reflect.Modifier.*; + +import java.lang.annotation.*; +import java.util.*; + +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiTypeProfile.*; + +/** + * Miscellaneous collection of utility methods used in the {@code CRI} project. + */ +public class CiUtil { + + public static final String NEW_LINE = String.format("%n"); + + /** + * Gets the annotation of a particular type for a formal parameter of a given method. + * + * @param annotationClass the Class object corresponding to the annotation type + * @param parameterIndex the index of a formal parameter of {@code method} + * @param method the method for which a parameter annotation is being requested + * @return the annotation of type {@code annotationClass} for the formal parameter present, else null + * @throws IndexOutOfBoundsException if {@code parameterIndex} does not denote a formal parameter + */ + public static <T extends Annotation> T getParameterAnnotation(Class<T> annotationClass, int parameterIndex, RiResolvedMethod method) { + if (parameterIndex >= 0) { + Annotation[][] parameterAnnotations = method.getParameterAnnotations(); + for (Annotation a : parameterAnnotations[parameterIndex]) { + if (a.annotationType() == annotationClass) { + return annotationClass.cast(a); + } + } + } + return null; + } + + public static final int K = 1024; + public static final int M = 1024 * 1024; + + public static boolean isOdd(int n) { + return (n & 1) == 1; + } + + public static boolean isEven(int n) { + return (n & 1) == 0; + } + + /** + * Checks whether the specified integer is a power of two. + * + * @param val the value to check + * @return {@code true} if the value is a power of two; {@code false} otherwise + */ + public static boolean isPowerOf2(int val) { + return val != 0 && (val & val - 1) == 0; + } + + /** + * Checks whether the specified long is a power of two. + * + * @param val the value to check + * @return {@code true} if the value is a power of two; {@code false} otherwise + */ + public static boolean isPowerOf2(long val) { + return val != 0 && (val & val - 1) == 0; + } + + /** + * Computes the log (base 2) of the specified integer, rounding down. (E.g {@code log2(8) = 3}, {@code log2(21) = 4} + * ) + * + * @param val the value + * @return the log base 2 of the value + */ + public static int log2(int val) { + assert val > 0 && isPowerOf2(val); + return 31 - Integer.numberOfLeadingZeros(val); + } + + /** + * Computes the log (base 2) of the specified long, rounding down. (E.g {@code log2(8) = 3}, {@code log2(21) = 4}) + * + * @param val the value + * @return the log base 2 of the value + */ + public static int log2(long val) { + assert val > 0 && isPowerOf2(val); + return 63 - Long.numberOfLeadingZeros(val); + } + + public static int align(int size, int align) { + assert isPowerOf2(align); + return (size + align - 1) & ~(align - 1); + } + + /** + * Gets a word with the nth bit set. + * + * @param n the nth bit to set + * @return an integer value with the nth bit set + */ + public static int nthBit(int n) { + return n >= Integer.SIZE ? 0 : 1 << n; + } + + /** + * Gets a word with the right-most n bits set. + * + * @param n the number of right most bits to set + * @return an integer value with the right-most n bits set + */ + public static int rightNBits(int n) { + return nthBit(n) - 1; + } + + /** + * Gets a string for a given method formatted according to a given format specification. A format specification is + * composed of characters that are to be copied verbatim to the result and specifiers that denote an attribute of + * the method that is to be copied to the result. A specifier is a single character preceded by a '%' character. The + * accepted specifiers and the method attributes they denote are described below: + * + * <pre> + * Specifier | Description | Example(s) + * ----------+------------------------------------------------------------------------------------------ + * 'R' | Qualified return type | "int" "java.lang.String" + * 'r' | Unqualified return type | "int" "String" + * 'H' | Qualified holder | "java.util.Map.Entry" + * 'h' | Unqualified holder | "Entry" + * 'n' | Method name | "add" + * 'P' | Qualified parameter types, separated by ', ' | "int, java.lang.String" + * 'p' | Unqualified parameter types, separated by ', ' | "int, String" + * 'f' | Indicator if method is unresolved, static or virtual | "unresolved" "static" "virtual" + * '%' | A '%' character | "%" + * </pre> + * + * @param format a format specification + * @param method the method to be formatted + * @param kinds if {@code true} then the types in {@code method}'s signature are printed in the + * {@linkplain RiKind#jniName JNI} form of their {@linkplain RiKind kind} + * @return the result of formatting this method according to {@code format} + * @throws IllegalFormatException if an illegal specifier is encountered in {@code format} + */ + public static String format(String format, RiMethod method) throws IllegalFormatException { + final StringBuilder sb = new StringBuilder(); + int index = 0; + RiSignature sig = null; + while (index < format.length()) { + final char ch = format.charAt(index++); + if (ch == '%') { + if (index >= format.length()) { + throw new UnknownFormatConversionException("An unquoted '%' character cannot terminate a method format specification"); + } + final char specifier = format.charAt(index++); + boolean qualified = false; + switch (specifier) { + case 'R': + qualified = true; + // fall through + case 'r': { + if (sig == null) { + sig = method.signature(); + } + sb.append(RiUtil.toJavaName(sig.returnType(null), qualified)); + break; + } + case 'H': + qualified = true; + // fall through + case 'h': { + sb.append(RiUtil.toJavaName(method.holder(), qualified)); + break; + } + case 'n': { + sb.append(method.name()); + break; + } + case 'P': + qualified = true; + // fall through + case 'p': { + if (sig == null) { + sig = method.signature(); + } + for (int i = 0; i < sig.argumentCount(false); i++) { + if (i != 0) { + sb.append(", "); + } + sb.append(RiUtil.toJavaName(sig.argumentTypeAt(i, null), qualified)); + } + break; + } + case 'f': { + sb.append(!(method instanceof RiResolvedMethod) ? "unresolved" : isStatic(((RiResolvedMethod) method).accessFlags()) ? "static" : "virtual"); + break; + } + case '%': { + sb.append('%'); + break; + } + default: { + throw new UnknownFormatConversionException(String.valueOf(specifier)); + } + } + } else { + sb.append(ch); + } + } + return sb.toString(); + } + + /** + * Gets a string for a given field formatted according to a given format specification. A format specification is + * composed of characters that are to be copied verbatim to the result and specifiers that denote an attribute of + * the field that is to be copied to the result. A specifier is a single character preceded by a '%' character. The + * accepted specifiers and the field attributes they denote are described below: + * + * <pre> + * Specifier | Description | Example(s) + * ----------+------------------------------------------------------------------------------------------ + * 'T' | Qualified type | "int" "java.lang.String" + * 't' | Unqualified type | "int" "String" + * 'H' | Qualified holder | "java.util.Map.Entry" + * 'h' | Unqualified holder | "Entry" + * 'n' | Field name | "age" + * 'f' | Indicator if field is unresolved, static or instance | "unresolved" "static" "instance" + * '%' | A '%' character | "%" + * </pre> + * + * @param format a format specification + * @param field the field to be formatted + * @param kinds if {@code true} then {@code field}'s type is printed in the {@linkplain RiKind#jniName JNI} form of + * its {@linkplain RiKind kind} + * @return the result of formatting this field according to {@code format} + * @throws IllegalFormatException if an illegal specifier is encountered in {@code format} + */ + public static String format(String format, RiField field) throws IllegalFormatException { + final StringBuilder sb = new StringBuilder(); + int index = 0; + RiType type = field.type(); + while (index < format.length()) { + final char ch = format.charAt(index++); + if (ch == '%') { + if (index >= format.length()) { + throw new UnknownFormatConversionException("An unquoted '%' character cannot terminate a field format specification"); + } + final char specifier = format.charAt(index++); + boolean qualified = false; + switch (specifier) { + case 'T': + qualified = true; + // fall through + case 't': { + sb.append(RiUtil.toJavaName(type, qualified)); + break; + } + case 'H': + qualified = true; + // fall through + case 'h': { + sb.append(RiUtil.toJavaName(field.holder(), qualified)); + break; + } + case 'n': { + sb.append(field.name()); + break; + } + case 'f': { + sb.append(!(field instanceof RiResolvedField) ? "unresolved" : isStatic(((RiResolvedField) field).accessFlags()) ? "static" : "instance"); + break; + } + case '%': { + sb.append('%'); + break; + } + default: { + throw new UnknownFormatConversionException(String.valueOf(specifier)); + } + } + } else { + sb.append(ch); + } + } + return sb.toString(); + } + + /** + * Converts a Java source-language class name into the internal form. + * + * @param className the class name + * @return the internal name form of the class name + */ + public static String toInternalName(String className) { + return "L" + className.replace('.', '/') + ";"; + } + + /** + * Creates a set that uses reference-equality instead of {@link Object#equals(Object)} when comparing values. + * + * @param <T> the type of elements in the set + * @return a set based on reference-equality + */ + public static <T> Set<T> newIdentityHashSet() { + return Collections.newSetFromMap(new IdentityHashMap<T, Boolean>()); + } + + /** + * Prepends the String {@code indentation} to every line in String {@code lines}, including a possibly non-empty + * line following the final newline. + */ + public static String indent(String lines, String indentation) { + if (lines.length() == 0) { + return lines; + } + final String newLine = "\n"; + if (lines.endsWith(newLine)) { + return indentation + (lines.substring(0, lines.length() - 1)).replace(newLine, newLine + indentation) + newLine; + } + return indentation + lines.replace(newLine, newLine + indentation); + } + + /** + * Formats the values in a frame as a tabulated string. + * + * @param frame + * @return the values in {@code frame} as a tabulated string + */ + public static String tabulateValues(CiFrame frame) { + int cols = Math.max(frame.numLocals, Math.max(frame.numStack, frame.numLocks)); + assert cols > 0; + ArrayList<Object> cells = new ArrayList<>(); + cells.add(""); + for (int i = 0; i < cols; i++) { + cells.add(i); + } + cols++; + if (frame.numLocals != 0) { + cells.add("locals:"); + cells.addAll(Arrays.asList(frame.values).subList(0, frame.numLocals)); + cells.addAll(Collections.nCopies(cols - frame.numLocals - 1, "")); + } + if (frame.numStack != 0) { + cells.add("stack:"); + cells.addAll(Arrays.asList(frame.values).subList(frame.numLocals, frame.numLocals + frame.numStack)); + cells.addAll(Collections.nCopies(cols - frame.numStack - 1, "")); + } + if (frame.numLocks != 0) { + cells.add("locks:"); + cells.addAll(Arrays.asList(frame.values).subList(frame.numLocals + frame.numStack, frame.values.length)); + cells.addAll(Collections.nCopies(cols - frame.numLocks - 1, "")); + } + Object[] cellArray = cells.toArray(); + for (int i = 0; i < cellArray.length; i++) { + if ((i % cols) != 0) { + cellArray[i] = "|" + cellArray[i]; + } + } + return CiUtil.tabulate(cellArray, cols, 1, 1); + } + + /** + * Formats a given table as a string. The value of each cell is produced by {@link String#valueOf(Object)}. + * + * @param cells the cells of the table in row-major order + * @param cols the number of columns per row + * @param lpad the number of space padding inserted before each formatted cell value + * @param rpad the number of space padding inserted after each formatted cell value + * @return a string with one line per row and each column left-aligned + */ + public static String tabulate(Object[] cells, int cols, int lpad, int rpad) { + int rows = (cells.length + (cols - 1)) / cols; + int[] colWidths = new int[cols]; + for (int col = 0; col < cols; col++) { + for (int row = 0; row < rows; row++) { + int index = col + (row * cols); + if (index < cells.length) { + Object cell = cells[index]; + colWidths[col] = Math.max(colWidths[col], String.valueOf(cell).length()); + } + } + } + StringBuilder sb = new StringBuilder(); + String nl = NEW_LINE; + for (int row = 0; row < rows; row++) { + for (int col = 0; col < cols; col++) { + int index = col + (row * cols); + if (index < cells.length) { + for (int i = 0; i < lpad; i++) { + sb.append(' '); + } + Object cell = cells[index]; + String s = String.valueOf(cell); + int w = s.length(); + sb.append(s); + while (w < colWidths[col]) { + sb.append(' '); + w++; + } + for (int i = 0; i < rpad; i++) { + sb.append(' '); + } + } + } + sb.append(nl); + } + return sb.toString(); + } + + /** + * Convenient shortcut for calling {@link #appendLocation(StringBuilder, RiMethod, int)} without having to supply a + * a {@link StringBuilder} instance and convert the result to a string. + */ + public static String toLocation(RiResolvedMethod method, int bci) { + return appendLocation(new StringBuilder(), method, bci).toString(); + } + + /** + * Appends a string representation of a location specified by a given method and bci to a given + * {@link StringBuilder}. If a stack trace element with a non-null file name and non-negative line number is + * {@linkplain RiMethod#toStackTraceElement(int) available} for the given method, then the string returned is the + * {@link StackTraceElement#toString()} value of the stack trace element, suffixed by the bci location. For example: + * + * <pre> + * java.lang.String.valueOf(String.java:2930) [bci: 12] + * </pre> + * + * Otherwise, the string returned is the value of {@code CiUtil.format("%H.%n(%p)"}, suffixed by the bci location. + * For example: + * + * <pre> + * java.lang.String.valueOf(int) [bci: 12] + * </pre> + * + * @param sb + * @param method + * @param bci + * @return + */ + public static StringBuilder appendLocation(StringBuilder sb, RiResolvedMethod method, int bci) { + if (method != null) { + StackTraceElement ste = method.toStackTraceElement(bci); + if (ste.getFileName() != null && ste.getLineNumber() > 0) { + sb.append(ste); + } else { + sb.append(CiUtil.format("%H.%n(%p)", method)); + } + } else { + sb.append("Null method"); + } + return sb.append(" [bci: ").append(bci).append(']'); + } + + /** + * Appends a formatted code position to a {@link StringBuilder}. + * + * @param sb the {@link StringBuilder} to append to + * @param pos the code position to format and append to {@code sb} + * @return the value of {@code sb} + */ + public static StringBuilder append(StringBuilder sb, CiCodePos pos) { + appendLocation(sb.append("at "), pos.method, pos.bci); + if (pos.caller != null) { + sb.append(NEW_LINE); + append(sb, pos.caller); + } + return sb; + } + + /** + * Appends a formatted frame to a {@link StringBuilder}. + * + * @param sb the {@link StringBuilder} to append to + * @param frame the frame to format and append to {@code sb} + * @return the value of {@code sb} + */ + public static StringBuilder append(StringBuilder sb, CiFrame frame) { + appendLocation(sb.append("at "), frame.method, frame.bci); + if (frame.values != null && frame.values.length > 0) { + sb.append(NEW_LINE); + String table = tabulateValues(frame); + String[] rows = table.split(NEW_LINE); + for (int i = 0; i < rows.length; i++) { + String row = rows[i]; + if (!row.trim().isEmpty()) { + sb.append(" ").append(row); + if (i != rows.length - 1) { + sb.append(NEW_LINE); + } + } + } + } + if (frame.caller() != null) { + sb.append(NEW_LINE); + append(sb, frame.caller()); + } else if (frame.caller != null) { + sb.append(NEW_LINE); + append(sb, frame.caller); + } + return sb; + } + + /** + * Formats a location present in a register or frame reference map. + */ + public static class RefMapFormatter { + + /** + * The size of a stack slot. + */ + public final int slotSize; + + /** + * The register used as the frame pointer. + */ + public final CiRegister fp; + + public final CiArchitecture arch; + + /** + * The offset (in bytes) from the slot pointed to by {@link #fp} to the slot corresponding to bit 0 in the frame + * reference map. + */ + public final int refMapToFPOffset; + + public RefMapFormatter(CiArchitecture arch, int slotSize, CiRegister fp, int refMapToFPOffset) { + this.arch = arch; + this.slotSize = slotSize; + this.fp = fp; + this.refMapToFPOffset = refMapToFPOffset; + } + + public String formatStackSlot(int frameRefMapIndex) { + int refMapOffset = frameRefMapIndex * slotSize; + int fpOffset = refMapOffset + refMapToFPOffset; + if (fpOffset >= 0) { + return fp + "+" + fpOffset; + } + return fp.name + fpOffset; + } + + public String formatRegister(int regRefMapIndex) { + return arch.registers[regRefMapIndex].toString(); + } + } + + /** + * Appends a formatted debug info to a {@link StringBuilder}. + * + * @param sb the {@link StringBuilder} to append to + * @param info the debug info to format and append to {@code sb} + * @return the value of {@code sb} + */ + public static StringBuilder append(StringBuilder sb, CiDebugInfo info, RefMapFormatter formatter) { + String nl = NEW_LINE; + if (info.hasRegisterRefMap()) { + sb.append(" reg-ref-map:"); + RiBitMap bm = info.registerRefMap; + if (formatter != null) { + for (int reg = bm.nextSetBit(0); reg >= 0; reg = bm.nextSetBit(reg + 1)) { + sb.append(" " + formatter.formatRegister(reg)); + } + } + sb.append(' ').append(bm).append(nl); + } + if (info.hasStackRefMap()) { + sb.append("frame-ref-map:"); + RiBitMap bm = info.frameRefMap; + if (formatter != null) { + for (int i = bm.nextSetBit(0); i >= 0; i = bm.nextSetBit(i + 1)) { + sb.append(" " + formatter.formatStackSlot(i)); + } + } + sb.append(' ').append(bm).append(nl); + } + CiFrame frame = info.frame(); + if (frame != null) { + append(sb, frame); + } else if (info.codePos != null) { + append(sb, info.codePos); + } + return sb; + } + + public static RiKind[] signatureToKinds(RiResolvedMethod method) { + RiKind receiver = isStatic(method.accessFlags()) ? null : method.holder().kind(true); + return signatureToKinds(method.signature(), receiver); + } + + public static RiKind[] signatureToKinds(RiSignature signature, RiKind receiverKind) { + int args = signature.argumentCount(false); + RiKind[] result; + int i = 0; + if (receiverKind != null) { + result = new RiKind[args + 1]; + result[0] = receiverKind; + i = 1; + } else { + result = new RiKind[args]; + } + for (int j = 0; j < args; j++) { + result[i + j] = signature.argumentKindAt(j, true); + } + return result; + } + + public static Class< ? >[] signatureToTypes(RiSignature signature, RiResolvedType accessingClass) { + int count = signature.argumentCount(false); + Class< ? >[] result = new Class< ? >[count]; + for (int i = 0; i < result.length; ++i) { + result[i] = signature.argumentTypeAt(i, accessingClass).resolve(accessingClass).toJava(); + } + return result; + } + + /** + * Formats some profiling information associated as a string. + * + * @param info the profiling info to format + * @param method an optional method that augments the profile string returned + * @param sep the separator to use for each separate profile record + */ + public static String profileToString(RiProfilingInfo info, RiResolvedMethod method, String sep) { + StringBuilder buf = new StringBuilder(100); + if (method != null) { + buf.append(String.format("canBeStaticallyBound: %b%s", method.canBeStaticallyBound(), sep)). + append(String.format("invocationCount: %d%s", method.invocationCount(), sep)); + } + for (int i = 0; i < info.codeSize(); i++) { + if (info.getExecutionCount(i) != -1) { + buf.append(String.format("executionCount@%d: %d%s", i, info.getExecutionCount(i), sep)); + } + + if (info.getBranchTakenProbability(i) != -1) { + buf.append(String.format("branchProbability@%d: %.3f%s", i, info.getBranchTakenProbability(i), sep)); + } + + double[] switchProbabilities = info.getSwitchProbabilities(i); + if (switchProbabilities != null) { + buf.append(String.format("switchProbabilities@%d:", i)); + for (int j = 0; j < switchProbabilities.length; j++) { + buf.append(String.format(" %.3f", switchProbabilities[j])); + } + buf.append(sep); + } + + if (info.getExceptionSeen(i) != RiExceptionSeen.FALSE) { + buf.append(String.format("exceptionSeen@%d: %s%s", i, info.getExceptionSeen(i).name(), sep)); + } + + RiTypeProfile typeProfile = info.getTypeProfile(i); + if (typeProfile != null) { + ProfiledType[] ptypes = typeProfile.getTypes(); + if (ptypes != null) { + buf.append(String.format("types@%d:", i)); + for (int j = 0; j < ptypes.length; j++) { + ProfiledType ptype = ptypes[j]; + buf.append(String.format(" %.3f (%s)%s", ptype.probability, ptype.type, sep)); + } + buf.append(String.format(" %.3f <not recorded>%s", typeProfile.getNotRecordedProbability(), sep)); + } + } + } + + boolean firstDeoptReason = true; + for (RiDeoptReason reason: RiDeoptReason.values()) { + int count = info.getDeoptimizationCount(reason); + if (count > 0) { + if (firstDeoptReason) { + buf.append("deoptimization history").append(sep); + firstDeoptReason = false; + } + buf.append(String.format(" %s: %d%s", reason.name(), count, sep)); + } + } + if (buf.length() == 0) { + return ""; + } + String s = buf.toString(); + assert s.endsWith(sep); + return s.substring(0, s.length() - sep.length()); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiValueUtil.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2012, 2012, 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.api.code; + +import com.oracle.graal.api.meta.*; + +public class CiValueUtil { + public static boolean isIllegal(RiValue value) { + assert value != null; + return value == RiValue.IllegalValue; + } + + public static boolean isLegal(RiValue value) { + return !isIllegal(value); + } + + public static boolean isVirtualObject(RiValue value) { + assert value != null; + return value instanceof CiVirtualObject; + } + + public static CiVirtualObject asVirtualObject(RiValue value) { + assert value != null; + return (CiVirtualObject) value; + } + + public static boolean isConstant(RiValue value) { + assert value != null; + return value instanceof RiConstant; + } + + public static RiConstant asConstant(RiValue value) { + assert value != null; + return (RiConstant) value; + } + + + public static boolean isStackSlot(RiValue value) { + assert value != null; + return value instanceof CiStackSlot; + } + + public static CiStackSlot asStackSlot(RiValue value) { + assert value != null; + return (CiStackSlot) value; + } + + public static boolean isAddress(RiValue value) { + assert value != null; + return value instanceof CiAddress; + } + + public static CiAddress asAddress(RiValue value) { + assert value != null; + return (CiAddress) value; + } + + + public static boolean isRegister(RiValue value) { + assert value != null; + return value instanceof CiRegisterValue; + } + + public static CiRegister asRegister(RiValue value) { + assert value != null; + return ((CiRegisterValue) value).reg; + } + + public static CiRegister asIntReg(RiValue value) { + assert value.kind == RiKind.Int || value.kind == RiKind.Jsr; + return asRegister(value); + } + + public static CiRegister asLongReg(RiValue value) { + assert value.kind == RiKind.Long : value.kind; + return asRegister(value); + } + + public static CiRegister asObjectReg(RiValue value) { + assert value.kind == RiKind.Object; + return asRegister(value); + } + + public static CiRegister asFloatReg(RiValue value) { + assert value.kind == RiKind.Float; + return asRegister(value); + } + + public static CiRegister asDoubleReg(RiValue value) { + assert value.kind == RiKind.Double; + return asRegister(value); + } + + + public static boolean sameRegister(RiValue v1, RiValue v2) { + return isRegister(v1) && isRegister(v2) && asRegister(v1) == asRegister(v2); + } + + public static boolean sameRegister(RiValue v1, RiValue v2, RiValue v3) { + return sameRegister(v1, v2) && sameRegister(v1, v3); + } + + public static boolean differentRegisters(RiValue v1, RiValue v2) { + return !isRegister(v1) || !isRegister(v2) || asRegister(v1) != asRegister(v2); + } + + public static boolean differentRegisters(RiValue v1, RiValue v2, RiValue v3) { + return differentRegisters(v1, v2) && differentRegisters(v1, v3) && differentRegisters(v2, v3); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiVirtualObject.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2010, 2012, 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.api.code; + +import com.oracle.graal.api.meta.*; + +/** + * An instance of this class represents an object whose allocation was removed by escape analysis. The information stored in the {@link CiVirtualObject} is used during + * deoptimization to recreate the object. + */ +public final class CiVirtualObject extends RiValue { + private static final long serialVersionUID = -2907197776426346021L; + + private final RiType type; + private RiValue[] values; + private final int id; + + /** + * Creates a new CiVirtualObject for the given type, with the given fields. If the type is an instance class then the values array needs to have one entry for each field, ordered in + * like the fields returned by {@link RiResolvedType#declaredFields()}. If the type is an array then the length of the values array determines the reallocated array length. + * @param type the type of the object whose allocation was removed during compilation. This can be either an instance of an array type. + * @param values an array containing all the values to be stored into the object when it is recreated. + * @param id a unique id that identifies the object within the debug information for one position in the compiled code. + * @return a new CiVirtualObject instance. + */ + public static CiVirtualObject get(RiType type, RiValue[] values, int id) { + return new CiVirtualObject(type, values, id); + } + + private CiVirtualObject(RiType type, RiValue[] values, int id) { + super(RiKind.Object); + this.type = type; + this.values = values; + this.id = id; + } + + @Override + public String toString() { + return "vobject:" + id; + } + + /** + * @return the type of the object whose allocation was removed during compilation. This can be either an instance of an array type. + */ + public RiType type() { + return type; + } + + /** + * @return an array containing all the values to be stored into the object when it is recreated. + */ + public RiValue[] values() { + return values; + } + + /** + * @return the unique id that identifies the object within the debug information for one position in the compiled code. + */ + public int id() { + return id; + } + + /** + * Overwrites the current set of values with a new one. + * @param values an array containing all the values to be stored into the object when it is recreated. + */ + public void setValues(RiValue[] values) { + this.values = values; + } + + @Override + public int hashCode() { + return kind.ordinal() + type.hashCode(); + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o instanceof CiVirtualObject) { + CiVirtualObject l = (CiVirtualObject) o; + if (l.type != type || l.values.length != values.length) { + return false; + } + for (int i = 0; i < values.length; i++) { + if (values[i] != l.values[i]) { + return false; + } + } + return true; + } + return false; + } + + /** + * This is a helper class used to create virtual objects for a number of different JDK classes. + */ + public static class CiVirtualObjectFactory { + private int nextId = 0; + private final RiRuntime runtime; + + public CiVirtualObjectFactory(RiRuntime runtime) { + this.runtime = runtime; + } + + public CiVirtualObject constantProxy(RiKind kind, RiValue objectValue, RiValue primitiveValue) { + RiConstant cKind = RiConstant.forObject(kind); + // TODO: here the ordering is hard coded... we should query RiType.fields() and act accordingly + return new CiVirtualObject(runtime.getType(RiConstant.class), new RiValue[] {cKind, primitiveValue, RiValue.IllegalValue, objectValue}, nextId++); + } + + public RiValue proxy(RiValue ciValue) { + switch (ciValue.kind) { + case Boolean: + return new CiVirtualObject(runtime.getType(Boolean.class), new RiValue[] {ciValue}, nextId++); + case Byte: + return new CiVirtualObject(runtime.getType(Byte.class), new RiValue[] {ciValue}, nextId++); + case Char: + return new CiVirtualObject(runtime.getType(Character.class), new RiValue[] {ciValue}, nextId++); + case Double: + return new CiVirtualObject(runtime.getType(Double.class), new RiValue[] {ciValue, RiValue.IllegalValue}, nextId++); + case Float: + return new CiVirtualObject(runtime.getType(Float.class), new RiValue[] {ciValue}, nextId++); + case Int: + return new CiVirtualObject(runtime.getType(Integer.class), new RiValue[] {ciValue}, nextId++); + case Long: + return new CiVirtualObject(runtime.getType(Long.class), new RiValue[] {ciValue, RiValue.IllegalValue}, nextId++); + case Object: + return ciValue; + case Short: + return new CiVirtualObject(runtime.getType(Short.class), new RiValue[] {ciValue}, nextId++); + default: + assert false : ciValue.kind; + return null; + } + } + + public CiVirtualObject arrayProxy(RiType arrayType, RiValue[] values) { + return new CiVirtualObject(arrayType, values, nextId++); + } + + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeCacheProvider.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2012, 2012, 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.api.code; + + +public interface CodeCacheProvider { + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationQueue.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2011, 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.api.code; + +import com.oracle.graal.api.meta.*; + + +public interface CompilationQueue { + boolean enqueue(final RiResolvedMethod method, final int entryBCI, boolean blocking, int priority) throws Throwable; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RiRuntime.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2009, 2012, 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.api.code; + +import java.lang.reflect.*; + +import com.oracle.graal.api.meta.*; + +/** + * Encapsulates the main functionality of the runtime for the compiler, including access + * to constant pools, OSR frames, inlining requirements, and runtime calls such as checkcast. +s */ +public interface RiRuntime { + + /** + * Get the size in bytes for locking information on the stack. + */ + int sizeOfLockData(); + + /** + * Returns a disassembly of the given installed code. + * + * @param code the code that should be disassembled + * @return a disassembly. This will be of length 0 if the runtime does not support disassembling. + */ + String disassemble(RiCodeInfo code, CiTargetMethod tm); + + /** + * Returns the disassembly of the given method in a {@code javap}-like format. + * + * @param method the method that should be disassembled + * @return the disassembly. This will be of length 0 if the runtime does not support disassembling. + */ + String disassemble(RiResolvedMethod method); + + /** + * Returns the RiType object representing the base type for the given kind. + */ + RiResolvedType asRiType(RiKind kind); + + /** + * Returns the type of the given constant object. + * + * @return {@code null} if {@code constant.isNull() || !constant.kind.isObject()} + */ + RiResolvedType getTypeOf(RiConstant constant); + + + RiResolvedType getType(Class<?> clazz); + + /** + * Used by the canonicalizer to compare objects, since a given runtime might not want to expose the real objects to the compiler. + * + * @return true if the two parameters represent the same runtime object, false otherwise + */ + boolean areConstantObjectsEqual(RiConstant x, RiConstant y); + + /** + * Gets the register configuration to use when compiling a given method. + * + * @param method the top level method of a compilation + */ + CiRegisterConfig getRegisterConfig(RiMethod method); + + CiRegisterConfig getGlobalStubRegisterConfig(); + + /** + * Custom area on the stack of each compiled method that the VM can use for its own purposes. + * @return the size of the custom area in bytes + */ + int getCustomStackAreaSize(); + + /** + * Minimum size of the stack area reserved for outgoing parameters. This area is reserved in all cases, even when + * the compiled method has no regular call instructions. + * @return the minimum size of the outgoing parameter area in bytes + */ + int getMinimumOutgoingSize(); + + /** + * Gets the length of the array that is wrapped in a CiConstant object. + */ + int getArrayLength(RiConstant array); + + /** + * Performs any runtime-specific conversion on the object used to describe the target of a call. + */ + Object asCallTarget(Object target); + + /** + * Returns the maximum absolute offset of a runtime call target from any position in the code cache or -1 + * when not known or not applicable. Intended for determining the required size of address/offset fields. + */ + long getMaxCallTargetOffset(CiRuntimeCall rtcall); + + /** + * Provides the {@link RiMethod} for a {@link Method} obtained via reflection. + */ + RiResolvedMethod getRiMethod(Method reflectionMethod); + + /** + * Adds the given machine code as an implementation of the given method without making it the default implementation. + * @param method a method to which the executable code is begin added + * @param code the code to be added + * @param info the object into which details of the installed code will be written. + * Ignored if null, otherwise the info is written to index 0 of this array. + * @return a reference to the compiled and ready-to-run code + */ + RiCompiledMethod addMethod(RiResolvedMethod method, CiTargetMethod code, RiCodeInfo[] info); + + /** + * Encodes a deoptimization action and a deoptimization reason in an integer value. + * @return the encoded value as an integer + */ + int encodeDeoptActionAndReason(CiDeoptAction action, RiDeoptReason reason); + + /** + * Converts a RiDeoptReason into an integer value. + * @return An integer value representing the given RiDeoptReason. + */ + int convertDeoptReason(RiDeoptReason reason); + + /** + * Converts a RiDeoptAction into an integer value. + * @return An integer value representing the given RiDeoptAction. + */ + int convertDeoptAction(CiDeoptAction action); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/package-info.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2010, 2012, 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. + */ +/** + * The compiler-provided part of the bi-directional interface between the compiler and the runtime system of a virtual machine for the instruction set defined in + * {@link com.oracle.graal.compiler.graphbuilder.Bytecodes}. + * + * The target hardware architecture is represented by {@link com.oracle.graal.api.code.CiArchitecture} and the specific target machine + * environment for a compiler instance is represented by {@link com.oracle.graal.api.code.CiTarget}. + * <p> + * A {@code CiResult} encapsulates + * {@linkplain com.oracle.max.cri.ci.CiStatistics compilation statistics}, possible {@linkplain com.oracle.graal.api.code.CiBailout error state} + * and the {@linkplain com.oracle.graal.api.code.CiTargetMethod compiled code and metadata}. + * {@link com.oracle.graal.api.code.CiCodePos} and {@link com.oracle.graal.api.code.CiDebugInfo} provide detailed information to the + * runtime to support debugging and deoptimization of the compiled code. + * <p> + * The compiler manipulates {@link com.oracle.graal.api.meta.RiValue} instances that have a {@link com.oracle.graal.api.meta.RiKind}, and are + * immutable. A concrete {@link com.oracle.graal.api.meta.RiValue value} is one of the following subclasses: + * <ul> + * <li>{@link com.oracle.graal.api.meta.RiConstant}: a constant value. + * <li>{@link com.oracle.graal.api.code.CiRegisterValue}: a value stored in a {@linkplain com.oracle.graal.api.code.CiRegister target machine register}. + * <li>{@link com.oracle.graal.api.code.CiStackSlot}: a spill slot or an outgoing stack-based argument in a method's frame. + * <li>{@link com.oracle.graal.api.code.CiAddress}: an address in target machine memory. + * <li>{@link com.oracle.graal.compiler.lir.CiVariable}: a value (cf. virtual register) that is yet to be bound to a target machine location (physical register or memory address). + *</ul> + */ +package com.oracle.graal.api.code; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.interpreter/src/com/oracle/graal/api/interpreter/Interpreter.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2012, 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.api.interpreter; + +import com.oracle.graal.api.meta.*; + +public interface Interpreter extends VirtualMachineComponent { + Object execute(RiResolvedMethod method, Object... arguments); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaAccessProvider.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2012, 2012, 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.api.meta; + + +public interface MetaAccessProvider { + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiBitMap.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,686 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +import java.io.*; +import java.util.*; + +/** + * Implements a bitmap that stores a single bit for a range of integers (0-n). + */ +public final class RiBitMap implements Serializable { + + private static final long serialVersionUID = 2471441272241401105L; + private static final int ADDRESS_BITS_PER_WORD = 6; + private static final int BITS_PER_WORD = 1 << ADDRESS_BITS_PER_WORD; + private static final int BIT_INDEX_MASK = BITS_PER_WORD - 1; + + public static final int DEFAULT_LENGTH = BITS_PER_WORD; + + public static int roundUpLength(int length) { + return ((length + (BITS_PER_WORD - 1)) >> ADDRESS_BITS_PER_WORD) << ADDRESS_BITS_PER_WORD; + } + + private int size; + private long low; + private long[] extra; + + /** + * Constructs a new bit map with the {@linkplain #DEFAULT_LENGTH default length}. + */ + public RiBitMap() { + this(DEFAULT_LENGTH); + } + + /** + * Constructs a new bit map from a byte array encoded bit map. + * + * @param bitmap the bit map to convert + */ + public RiBitMap(byte[] bitmap) { + this(bitmap, 0, bitmap.length); + } + + /** + * Constructs a copy of the given bit map. + * + * @param bitmap the bit map to copy. + */ + public RiBitMap(RiBitMap bitmap) { + this.size = bitmap.size; + this.low = bitmap.low; + if (bitmap.extra != null) { + this.extra = Arrays.copyOf(bitmap.extra, bitmap.extra.length); + } + } + + /** + * Constructs a new bit map from a byte array encoded bit map. + * + * @param arr the byte array containing the bit map to convert + * @param off the byte index in {@code arr} at which the bit map starts + * @param numberOfBytes the number of bytes worth of bits to copy from {@code arr} + */ + public RiBitMap(byte[] arr, int off, int numberOfBytes) { + this(numberOfBytes * 8); + int byteIndex = off; + int end = off + numberOfBytes; + assert end <= arr.length; + while (byteIndex < end && (byteIndex - off) < 8) { + long bite = (long) arr[byteIndex] & 0xff; + low |= bite << ((byteIndex - off) * 8); + byteIndex++; + } + if (byteIndex < end) { + assert (byteIndex - off) == 8; + int remBytes = end - byteIndex; + int remWords = (remBytes + 7) / 8; + for (int word = 0; word < remWords; word++) { + long w = 0L; + for (int i = 0; i < 8 && byteIndex < end; i++) { + long bite = (long) arr[byteIndex] & 0xff; + w |= bite << (i * 8); + byteIndex++; + } + extra[word] = w; + } + } + } + + /** + * Converts a {@code long} to a {@link RiBitMap}. + */ + public static RiBitMap fromLong(long bitmap) { + RiBitMap bm = new RiBitMap(64); + bm.low = bitmap; + return bm; + } + + /** + * Constructs a new bit map with the specified length. + * + * @param length the length of the bitmap + */ + public RiBitMap(int length) { + assert length >= 0; + this.size = length; + if (length > BITS_PER_WORD) { + extra = new long[length >> ADDRESS_BITS_PER_WORD]; + } + } + + /** + * Sets the bit at the specified index. + * + * @param i the index of the bit to set + */ + public void set(int i) { + if (checkIndex(i) < BITS_PER_WORD) { + low |= 1L << i; + } else { + int pos = wordIndex(i); + int index = bitInWord(i); + extra[pos] |= 1L << index; + } + } + + /** + * Grows this bitmap to a new size, appending necessary zero bits. + * + * @param newLength the new length of the bitmap + */ + public void grow(int newLength) { + if (newLength > size) { + // grow this bitmap to the new length + int newSize = newLength >> ADDRESS_BITS_PER_WORD; + if (newLength > 0) { + if (extra == null) { + // extra just needs to be allocated now + extra = new long[newSize]; + } else { + if (extra.length < newSize) { + // extra needs to be copied + long[] newExtra = new long[newSize]; + for (int i = 0; i < extra.length; i++) { + newExtra[i] = extra[i]; + } + extra = newExtra; + } else { + // nothing to do, extra is already the right size + } + } + } + size = newLength; + } + } + + private static int bitInWord(int i) { + return i & BIT_INDEX_MASK; + } + + private static int wordIndex(int i) { + return (i >> ADDRESS_BITS_PER_WORD) - 1; + } + + /** + * Clears the bit at the specified index. + * @param i the index of the bit to clear + */ + public void clear(int i) { + if (checkIndex(i) < BITS_PER_WORD) { + low &= ~(1L << i); + } else { + int pos = wordIndex(i); + int index = bitInWord(i); + extra[pos] &= ~(1L << index); + } + } + + /** + * Sets all the bits in this bitmap. + */ + public void setAll() { + low = -1; + if (extra != null) { + for (int i = 0; i < extra.length; i++) { + extra[i] = -1; + } + } + } + + /** + * Clears all the bits in this bitmap. + */ + public void clearAll() { + low = 0; + if (extra != null) { + for (int i = 0; i < extra.length; i++) { + extra[i] = 0; + } + } + } + + /** + * Gets the value of the bit at the specified index. + * + * @param i the index of the bit to get + * @return {@code true} if the bit at the specified position is {@code 1} + */ + public boolean get(int i) { + if (checkIndex(i) < BITS_PER_WORD) { + return ((low >> i) & 1) != 0; + } + int pos = wordIndex(i); + int index = bitInWord(i); + long bits = extra[pos]; + return ((bits >> index) & 1) != 0; + } + + /** + * Gets the value of the bit at the specified index, returning {@code false} if the + * bitmap does not cover the specified index. + * + * @param i the index of the bit to get + * @return {@code true} if the bit at the specified position is {@code 1} + */ + public boolean getDefault(int i) { + if (i < 0 || i >= size) { + return false; + } + if (i < BITS_PER_WORD) { + return ((low >> i) & 1) != 0; + } + int pos = wordIndex(i); + int index = bitInWord(i); + long bits = extra[pos]; + return ((bits >> index) & 1) != 0; + } + + /** + * Performs the union operation on this bitmap with the specified bitmap. That is, all bits set in either of the two + * bitmaps will be set in this bitmap following this operation. + * + * @param other the other bitmap for the union operation + */ + public void setUnion(RiBitMap other) { + low |= other.low; + if (extra != null && other.extra != null) { + for (int i = 0; i < extra.length && i < other.extra.length; i++) { + extra[i] |= other.extra[i]; + } + } + } + + /** + * Performs the union operation on this bitmap with the specified bitmap. That is, a bit is set in this + * bitmap if and only if it is set in both this bitmap and the specified bitmap. + * + * @param other the other bitmap for this operation + * @return {@code true} if any bits were cleared as a result of this operation + */ + public boolean setIntersect(RiBitMap other) { + boolean same = true; + long intx = low & other.low; + if (low != intx) { + same = false; + low = intx; + } + long[] oxtra = other.extra; + if (extra != null && oxtra != null) { + for (int i = 0; i < extra.length; i++) { + long a = extra[i]; + if (i < oxtra.length) { + // zero bits out of this map + long ax = a & oxtra[i]; + if (a != ax) { + same = false; + extra[i] = ax; + } + } else { + // this bitmap is larger than the specified bitmap; zero remaining bits + if (a != 0) { + same = false; + extra[i] = 0; + } + } + } + } + return !same; + } + + /** + * Gets the number of addressable bits in this bitmap. + * + * @return the size of this bitmap + */ + public int size() { + return size; + } + + private int checkIndex(int i) { + if (i < 0 || i >= size) { + throw new IndexOutOfBoundsException(); + } + return i; + } + + public void setFrom(RiBitMap other) { + assert this.size == other.size : "must have same size"; + + low = other.low; + if (extra != null) { + for (int i = 0; i < extra.length; i++) { + extra[i] = other.extra[i]; + } + } + } + + public void setDifference(RiBitMap other) { + assert this.size == other.size : "must have same size"; + + low &= ~other.low; + if (extra != null) { + for (int i = 0; i < extra.length; i++) { + extra[i] &= ~other.extra[i]; + } + } + } + + public boolean isSame(RiBitMap other) { + if (this.size != other.size || this.low != other.low) { + return false; + } + + if (extra != null) { + for (int i = 0; i < extra.length; i++) { + if (extra[i] != other.extra[i]) { + return false; + } + } + } + + return true; + } + + /** + * Returns the index of the first set bit that occurs on or after a specified start index. + * If no such bit exists then -1 is returned. + * <p> + * To iterate over the set bits in a {@code BitMap}, use the following loop: + * + * <pre> + * for (int i = bitMap.nextSetBit(0); i >= 0; i = bitMap.nextSetBit(i + 1)) { + * // operate on index i here + * } + * </pre> + * + * @param fromIndex the index to start checking from (inclusive) + * @return the index of the lowest set bit between {@code [fromIndex .. size())} or -1 if there is no set bit in this range + * @throws IndexOutOfBoundsException if the specified index is negative. + */ + public int nextSetBit(int fromIndex) { + return nextSetBit(fromIndex, size()); + } + + /** + * Returns the index of the first set bit that occurs on or after a specified start index + * and before a specified end index. If no such bit exists then -1 is returned. + * <p> + * To iterate over the set bits in a {@code BitMap}, use the following loop: + * + * <pre> + * for (int i = bitMap.nextSetBit(0, bitMap.size()); i >= 0; i = bitMap.nextSetBit(i + 1, bitMap.size())) { + * // operate on index i here + * } + * </pre> + * + * @param fromIndex the index to start checking from (inclusive) + * @param toIndex the index at which to stop checking (exclusive) + * @return the index of the lowest set bit between {@code [fromIndex .. toIndex)} or -1 if there is no set bit in this range + * @throws IndexOutOfBoundsException if the specified index is negative. + */ + public int nextSetBit(int fromIndex, int toIndex) { + assert fromIndex <= size() : "index out of bounds"; + assert toIndex <= size() : "index out of bounds"; + assert fromIndex <= toIndex : "fromIndex > toIndex"; + + if (fromIndex == toIndex) { + return -1; + } + int fromWordIndex = wordIndex(fromIndex); + int toWordIndex = wordIndex(toIndex - 1) + 1; + int resultIndex = fromIndex; + + // check bits including and to the left_ of offset's position + int pos = bitInWord(resultIndex); + long res = map(fromWordIndex) >> pos; + if (res != 0) { + resultIndex += Long.numberOfTrailingZeros(res); + assert resultIndex >= fromIndex && resultIndex < toIndex : "just checking"; + if (resultIndex < toIndex) { + return resultIndex; + } + return -1; + } + // skip over all word length 0-bit runs + for (fromWordIndex++; fromWordIndex < toWordIndex; fromWordIndex++) { + res = map(fromWordIndex); + if (res != 0) { + // found a 1, return the offset + resultIndex = bitIndex(fromWordIndex) + Long.numberOfTrailingZeros(res); + assert resultIndex >= fromIndex : "just checking"; + if (resultIndex < toIndex) { + return resultIndex; + } + return -1; + } + } + return -1; + } + + private static int bitIndex(int index) { + return (index + 1) << ADDRESS_BITS_PER_WORD; + } + + private long map(int index) { + if (index == -1) { + return low; + } + return extra[index]; + } + + private static boolean allZeros(int start, long[] arr) { + for (int i = start; i < arr.length; i++) { + if (arr[i] != 0) { + return false; + } + } + return true; + } + + /** + * Compares this object against the specified object. + * The result is {@code true} if and only if {@code obj} is + * not {@code null} and is a {@code CiBitMap} object that has + * exactly the same set of bits set to {@code true} as this bit + * set. + * + * @param obj the object to compare with. + */ + @Override + public boolean equals(Object obj) { + if (obj instanceof RiBitMap) { + RiBitMap bm = (RiBitMap) obj; + if (bm.low == low) { + if (bm.extra == null) { + if (extra == null) { + // Common case + return true; + } + return allZeros(0, extra); + } + if (extra == null) { + return allZeros(0, bm.extra); + } + // both 'extra' array non null: + int i = 0; + int length = Math.min(extra.length, bm.extra.length); + while (i < length) { + if (extra[i] != bm.extra[i]) { + return false; + } + i++; + } + if (extra.length > bm.extra.length) { + return allZeros(length, extra); + } + if (extra.length < bm.extra.length) { + return allZeros(length, bm.extra); + } + return true; + } + } + return false; + } + + @Override + public int hashCode() { + return (int) low ^ size; + } + + /** + * Returns a string representation of this bit map + * that is the same as the string returned by {@link BitSet#toString()} + * for a bit set with the same bits set as this bit map. + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(size * 2); + sb.append('{'); + + int bit = nextSetBit(0); + if (bit != -1) { + sb.append(bit); + for (bit = nextSetBit(bit + 1); bit >= 0; bit = nextSetBit(bit + 1)) { + sb.append(", ").append(bit); + } + } + + sb.append('}'); + return sb.toString(); + } + + public static int highestOneBitIndex(long value) { + int bit = Long.numberOfTrailingZeros(Long.highestOneBit(value)); + if (bit == 64) { + return -1; + } + return bit; + } + + /** + * Returns the number of bits set to {@code true} in this bit map. + */ + public int cardinality() { + int sum = Long.bitCount(low); + if (extra != null) { + for (long word : extra) { + sum += Long.bitCount(word); + } + } + return sum; + } + + /** + * Returns the "logical size" of this bit map: the index of + * the highest set bit in the bit map plus one. Returns zero + * if the bit map contains no set bits. + * + * @return the logical size of this bit map + */ + public int length() { + if (extra != null) { + for (int i = extra.length - 1; i >= 0; i--) { + if (extra[i] != 0) { + return (highestOneBitIndex(extra[i]) + ((i + 1) * 64)) + 1; + } + } + } + return highestOneBitIndex(low) + 1; + } + + /** + * Returns a string representation of this bit map with every set bit represented as {@code '1'} + * and every unset bit represented as {@code '0'}. The first character in the returned string represents + * bit 0 in this bit map. + * + * @param length the number of bits represented in the returned string. If {@code length < 0 || length > size()}, + * then the value of {@link #length()} is used. + */ + public String toBinaryString() { + int length = length(); + if (length == 0) { + return ""; + } + StringBuilder sb = new StringBuilder(length); + for (int i = 0; i < length; ++i) { + sb.append(get(i) ? '1' : '0'); + } + return sb.toString(); + } + + static final char[] hexDigits = { + '0', '1', '2', '3', '4', '5', '6', '7', + '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' + }; + + private static int align(int size, int align) { + return (size + align - 1) & ~(align - 1); + } + + /** + * Returns a string representation of this bit map in hex. + */ + public String toHexString() { + if (size == 0) { + return ""; + } + int hexSize = align(this.size, 4); + StringBuilder sb = new StringBuilder(hexSize / 4); + for (int i = 0; i < hexSize; i += 4) { + int nibble = get(i) ? 1 : 0; + if (get(i + 1)) { + nibble |= 2; + } + if (get(i + 2)) { + nibble |= 4; + } + if (get(i + 3)) { + nibble |= 8; + } + + sb.append(hexDigits[nibble]); + } + return sb.toString(); + } + + public RiBitMap copy() { + RiBitMap n = new RiBitMap(BITS_PER_WORD); + n.low = low; + if (extra != null) { + n.extra = Arrays.copyOf(extra, extra.length); + } + n.size = size; + return n; + } + + /** + * Copies this bit map into a given byte array. + * + * @param arr the destination + * @param off the byte index in {@code arr} at which to start writing + * @param numberOfBytes the number of bytes worth of bits to copy from this bit map. + * The number of bits copied is {@code numberOfBytes * 8}. If {@code numberOfBytes} + * is -1, then {@code ((size() + 7) / 8)} is used instead. + * @return the number of bytes written to {@code arr} + */ + public int copyTo(byte[] arr, int off, int numberOfBytes) { + for (int i = 0; i < numberOfBytes; ++i) { + long word = low; + int byteInWord; + if (i >= 8) { + int wordIndex = (i - 8) / 8; + word = extra[wordIndex]; + byteInWord = i & 0x7; + } else { + byteInWord = i; + } + assert byteInWord < 8; + byte b = (byte) (word >> (byteInWord * 8)); + arr[off + i] = b; + } + return numberOfBytes; + } + + /** + * Converts this bit map to a byte array. The length of the returned + * byte array is {@code ((size() + 7) / 8)}. + */ + public byte[] toByteArray() { + byte[] arr = new byte[(size + 7) / 8]; + copyTo(arr, 0, arr.length); + return arr; + } + + /** + * Converts this bit map to a long. + * + * @throws IllegalArgumentException if {@code (size() > 64)} + */ + public long toLong() { + if (size > 64) { + throw new IllegalArgumentException("bit map of size " + size + " cannot be converted to long"); + } + return low; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiCodeInfo.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2012, 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.api.meta; + +/** + * Represents some code installed in the code cache of the runtime. + * This encapsulated details are only for informational purposes. + * At any time, the runtime may invalidate the underlying code (e.g. due to deopt etc). + */ +public interface RiCodeInfo { + + /** + * Gets the start address of this installed code. + */ + long start(); + + /** + * Gets a copy of this installed code. + */ + byte[] code(); + + /** + * Gets the method (if any) from which this installed code was compiled. + */ + RiResolvedMethod method(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiCompiledMethod.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2011, 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.api.meta; + +/** + * Represents a compiled instance of a method. It may have been invalidated or removed in the meantime. + */ +public interface RiCompiledMethod { + + public abstract class MethodInvalidatedException extends RuntimeException { + + private static final long serialVersionUID = -3540232440794244844L; + } + + /** + * Returns the method to which the compiled code belongs. + * @return the method to which the compiled code belongs. + */ + RiResolvedMethod method(); + + /** + * @return true if the code represented by this object is still valid, false otherwise (may happen due to deopt, etc.) + */ + boolean isValid(); + + Object execute(Object arg1, Object arg2, Object arg3); + + Object executeVarargs(Object... args); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiConstant.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,498 @@ +/* + * Copyright (c) 2009, 2012, 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.api.meta; + +/** + * Represents a constant (boxed) value, such as an integer, floating point number, or object reference, + * within the compiler and across the compiler/runtime interface. Exports a set of {@code CiConstant} + * instances that represent frequently used constant values, such as {@link #ZERO}. + */ +public final class RiConstant extends RiValue { + private static final long serialVersionUID = -6355452536852663986L; + + private static final RiConstant[] INT_CONSTANT_CACHE = new RiConstant[100]; + static { + for (int i = 0; i < INT_CONSTANT_CACHE.length; ++i) { + INT_CONSTANT_CACHE[i] = new RiConstant(RiKind.Int, i); + } + } + + public static final RiConstant NULL_OBJECT = new RiConstant(RiKind.Object, null); + public static final RiConstant INT_MINUS_1 = new RiConstant(RiKind.Int, -1); + public static final RiConstant INT_0 = forInt(0); + public static final RiConstant INT_1 = forInt(1); + public static final RiConstant INT_2 = forInt(2); + public static final RiConstant INT_3 = forInt(3); + public static final RiConstant INT_4 = forInt(4); + public static final RiConstant INT_5 = forInt(5); + public static final RiConstant LONG_0 = new RiConstant(RiKind.Long, 0L); + public static final RiConstant LONG_1 = new RiConstant(RiKind.Long, 1L); + public static final RiConstant FLOAT_0 = new RiConstant(RiKind.Float, Float.floatToRawIntBits(0.0F)); + public static final RiConstant FLOAT_1 = new RiConstant(RiKind.Float, Float.floatToRawIntBits(1.0F)); + public static final RiConstant FLOAT_2 = new RiConstant(RiKind.Float, Float.floatToRawIntBits(2.0F)); + public static final RiConstant DOUBLE_0 = new RiConstant(RiKind.Double, Double.doubleToRawLongBits(0.0D)); + public static final RiConstant DOUBLE_1 = new RiConstant(RiKind.Double, Double.doubleToRawLongBits(1.0D)); + public static final RiConstant TRUE = new RiConstant(RiKind.Boolean, 1L); + public static final RiConstant FALSE = new RiConstant(RiKind.Boolean, 0L); + + static { + assert NULL_OBJECT.isDefaultValue(); + assert INT_0.isDefaultValue(); + assert FLOAT_0.isDefaultValue(); + assert DOUBLE_0.isDefaultValue(); + assert FALSE.isDefaultValue(); + + // Ensure difference between 0.0f and -0.0f is preserved + assert FLOAT_0 != forFloat(-0.0F); + assert !forFloat(-0.0F).isDefaultValue(); + + // Ensure difference between 0.0d and -0.0d is preserved + assert DOUBLE_0 != forDouble(-0.0d); + assert !forDouble(-0.0D).isDefaultValue(); + + assert NULL_OBJECT.isNull(); + } + + /** + * The boxed object value. This is ignored iff {@code !kind.isObject()}. + */ + private final Object object; + + /** + * The boxed primitive value as a {@code long}. This is ignored iff {@code kind.isObject()}. + * For {@code float} and {@code double} values, this value is the result of + * {@link Float#floatToRawIntBits(float)} and {@link Double#doubleToRawLongBits(double)} respectively. + */ + private final long primitive; + + /** + * Create a new constant represented by the specified object reference. + * + * @param kind the type of this constant + * @param object the value of this constant + */ + private RiConstant(RiKind kind, Object object) { + super(kind); + this.object = object; + this.primitive = 0L; + } + + /** + * Create a new constant represented by the specified primitive. + * + * @param kind the type of this constant + * @param primitive the value of this constant + */ + public RiConstant(RiKind kind, long primitive) { + super(kind); + this.object = null; + this.primitive = primitive; + } + + /** + * Checks whether this constant is non-null. + * @return {@code true} if this constant is a primitive, or an object constant that is not null + */ + public boolean isNonNull() { + return !kind.isObject() || object != null; + } + + /** + * Checks whether this constant is null. + * @return {@code true} if this constant is the null constant + */ + public boolean isNull() { + return kind.isObject() && object == null; + } + + @Override + public String toString() { + return kind.javaName + "[" + kind.format(boxedValue()) + (kind != RiKind.Object ? "|0x" + Long.toHexString(primitive) : "") + "]"; + } + + /** + * Gets this constant's value as a string. + * + * @return this constant's value as a string + */ + public String valueString() { + if (kind.isPrimitive()) { + return boxedValue().toString(); + } else if (kind.isObject()) { + if (object == null) { + return "null"; + } else if (object instanceof String) { + return "\"" + object + "\""; + } else { + return "<object: " + kind.format(object) + ">"; + } + } else if (kind.isJsr()) { + return "bci:" + boxedValue().toString(); + } else { + return "???"; + } + } + + /** + * Returns the value of this constant as a boxed Java value. + * @return the value of this constant + */ + public Object boxedValue() { + // Checkstyle: stop + switch (kind) { + case Byte: return (byte) asInt(); + case Boolean: return asInt() == 0 ? Boolean.FALSE : Boolean.TRUE; + case Short: return (short) asInt(); + case Char: return (char) asInt(); + case Jsr: return (int) primitive; + case Int: return asInt(); + case Long: return asLong(); + case Float: return asFloat(); + case Double: return asDouble(); + case Object: return object; + } + // Checkstyle: resume + throw new IllegalArgumentException(); + } + + private boolean valueEqual(RiConstant other, boolean ignoreKind) { + // must have equivalent kinds to be equal + if (!ignoreKind && kind != other.kind) { + return false; + } + if (kind.isObject()) { + return object == other.object; + } + return primitive == other.primitive; + } + + /** + * Converts this constant to a primitive int. + * @return the int value of this constant + */ + public int asInt() { + if (kind.stackKind().isInt() || kind.isJsr()) { + return (int) primitive; + } + throw new Error("Constant is not int: " + this); + } + + /** + * Converts this constant to a primitive boolean. + * @return the boolean value of this constant + */ + public boolean asBoolean() { + if (kind == RiKind.Boolean) { + return primitive != 0L; + } + throw new Error("Constant is not boolean: " + this); + } + + /** + * Converts this constant to a primitive long. + * @return the long value of this constant + */ + public long asLong() { + // Checkstyle: stop + switch (kind.stackKind()) { + case Jsr: + case Int: + case Long: return primitive; + case Float: return (long) asFloat(); + case Double: return (long) asDouble(); + default: throw new Error("Constant is not long: " + this); + } + // Checkstyle: resume + } + + /** + * Converts this constant to a primitive float. + * @return the float value of this constant + */ + public float asFloat() { + if (kind.isFloat()) { + return Float.intBitsToFloat((int) primitive); + } + throw new Error("Constant is not float: " + this); + } + + /** + * Converts this constant to a primitive double. + * @return the double value of this constant + */ + public double asDouble() { + if (kind.isFloat()) { + return Float.intBitsToFloat((int) primitive); + } + if (kind.isDouble()) { + return Double.longBitsToDouble(primitive); + } + throw new Error("Constant is not double: " + this); + } + + /** + * Converts this constant to the object reference it represents. + * @return the object which this constant represents + */ + public Object asObject() { + if (kind.isObject()) { + return object; + } + throw new Error("Constant is not object: " + this); + } + + /** + * Converts this constant to the jsr reference it represents. + * @return the object which this constant represents + */ + public int asJsr() { + if (kind.isJsr()) { + return (int) primitive; + } + throw new Error("Constant is not jsr: " + this); + } + + /** + * Unchecked access to a primitive value. + * @return + */ + public long asPrimitive() { + if (kind.isObject()) { + throw new Error("Constant is not primitive: " + this); + } + return primitive; + } + + /** + * Computes the hashcode of this constant. + * @return a suitable hashcode for this constant + */ + @Override + public int hashCode() { + if (kind.isObject()) { + return System.identityHashCode(object); + } + return (int) primitive; + } + + /** + * Checks whether this constant equals another object. This is only + * true if the other object is a constant and has the same value. + * @param o the object to compare equality + * @return {@code true} if this constant is equivalent to the specified object + */ + @Override + public boolean equals(Object o) { + return o == this || o instanceof RiConstant && valueEqual((RiConstant) o, false); + } + + /** + * Checks whether this constant is identical to another constant or has the same value as it. + * @param other the constant to compare for equality against this constant + * @return {@code true} if this constant is equivalent to {@code other} + */ + public boolean equivalent(RiConstant other) { + return other == this || valueEqual(other, false); + } + + /** + * Checks whether this constant is the default value for its type. + * @return {@code true} if the value is the default value for its type; {@code false} otherwise + */ + public boolean isDefaultValue() { + // Checkstyle: stop + switch (kind.stackKind()) { + case Int: return asInt() == 0; + case Long: return asLong() == 0; + case Float: return this == FLOAT_0; + case Double: return this == DOUBLE_0; + case Object: return object == null; + } + // Checkstyle: resume + throw new IllegalArgumentException("Cannot det default CiConstant for kind " + kind); + } + + /** + * Gets the default value for a given kind. + * + * @return the default value for {@code kind}'s {@linkplain RiKind#stackKind() stack kind} + */ + public static RiConstant defaultValue(RiKind kind) { + // Checkstyle: stop + switch (kind.stackKind()) { + case Int: return INT_0; + case Long: return LONG_0; + case Float: return FLOAT_0; + case Double: return DOUBLE_0; + case Object: return NULL_OBJECT; + } + // Checkstyle: resume + throw new IllegalArgumentException("Cannot get default CiConstant for kind " + kind); + } + + /** + * Creates a boxed double constant. + * @param d the double value to box + * @return a boxed copy of {@code value} + */ + public static RiConstant forDouble(double d) { + if (Double.compare(0.0D, d) == 0) { + return DOUBLE_0; + } + if (Double.compare(d, 1.0D) == 0) { + return DOUBLE_1; + } + return new RiConstant(RiKind.Double, Double.doubleToRawLongBits(d)); + } + + /** + * Creates a boxed float constant. + * @param f the float value to box + * @return a boxed copy of {@code value} + */ + public static RiConstant forFloat(float f) { + if (Float.compare(f, 0.0F) == 0) { + return FLOAT_0; + } + if (Float.compare(f, 1.0F) == 0) { + return FLOAT_1; + } + if (Float.compare(f, 2.0F) == 0) { + return FLOAT_2; + } + return new RiConstant(RiKind.Float, Float.floatToRawIntBits(f)); + } + + /** + * Creates a boxed long constant. + * @param i the long value to box + * @return a boxed copy of {@code value} + */ + public static RiConstant forLong(long i) { + return i == 0 ? LONG_0 : i == 1 ? LONG_1 : new RiConstant(RiKind.Long, i); + } + + /** + * Creates a boxed integer constant. + * @param i the integer value to box + * @return a boxed copy of {@code value} + */ + public static RiConstant forInt(int i) { + if (i == -1) { + return INT_MINUS_1; + } + if (i >= 0 && i < INT_CONSTANT_CACHE.length) { + return INT_CONSTANT_CACHE[i]; + } + return new RiConstant(RiKind.Int, i); + } + + /** + * Creates a boxed byte constant. + * @param i the byte value to box + * @return a boxed copy of {@code value} + */ + public static RiConstant forByte(byte i) { + return new RiConstant(RiKind.Byte, i); + } + + /** + * Creates a boxed boolean constant. + * @param i the boolean value to box + * @return a boxed copy of {@code value} + */ + public static RiConstant forBoolean(boolean i) { + return i ? TRUE : FALSE; + } + + /** + * Creates a boxed char constant. + * @param i the char value to box + * @return a boxed copy of {@code value} + */ + public static RiConstant forChar(char i) { + return new RiConstant(RiKind.Char, i); + } + + /** + * Creates a boxed short constant. + * @param i the short value to box + * @return a boxed copy of {@code value} + */ + public static RiConstant forShort(short i) { + return new RiConstant(RiKind.Short, i); + } + + /** + * Creates a boxed address (jsr/ret address) constant. + * @param i the address value to box + * @return a boxed copy of {@code value} + */ + public static RiConstant forJsr(int i) { + return new RiConstant(RiKind.Jsr, i); + } + + /** + * Creates a boxed object constant. + * @param o the object value to box + * @return a boxed copy of {@code value} + */ + public static RiConstant forObject(Object o) { + if (o == null) { + return NULL_OBJECT; + } + return new RiConstant(RiKind.Object, o); + } + + /** + * Creates a boxed constant for the given kind from an Object. + * The object needs to be of the Java boxed type corresponding to the kind. + * @param kind the kind of the constant to create + * @param value the Java boxed value: a Byte instance for CiKind Byte, etc. + * @return the boxed copy of {@code value} + */ + public static RiConstant forBoxed(RiKind kind, Object value) { + switch (kind) { + case Boolean: + return forBoolean((Boolean) value); + case Byte: + return forByte((Byte) value); + case Char: + return forChar((Character) value); + case Short: + return forShort((Short) value); + case Int: + return forInt((Integer) value); + case Long: + return forLong((Long) value); + case Float: + return forFloat((Float) value); + case Double: + return forDouble((Double) value); + case Object: + return forObject(value); + default: + throw new RuntimeException("cannot create CiConstant for boxed " + kind + " value"); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiConstantPool.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +/** + * Represents the runtime representation of the constant pool that is + * used by the compiler when parsing bytecode. The {@code lookupXXX} methods look up a constant + * pool entry without performing resolution, and are used during compilation. + */ +public interface RiConstantPool { + + /** + * Makes sure that the type referenced by the specified constant pool entry is loaded and + * initialized. This can be used to compile time resolve a type. It works for field, method, + * or type constant pool entries. + * @param cpi the index of the constant pool entry that references the type + * @param opcode the opcode of the instruction that references the type + */ + void loadReferencedType(int cpi, int opcode); + + /** + * Looks up a reference to a field. If {@code opcode} is non-negative, then resolution checks + * specific to the JVM instruction it denotes are performed if the field is already resolved. + * Should any of these checks fail, an {@linkplain RiField#isResolved() unresolved} + * field reference is returned. + * + * @param cpi the constant pool index + * @param opcode the opcode of the instruction for which the lookup is being performed or {@code -1} + * @return a reference to the field at {@code cpi} in this pool + * @throws ClassFormatError if the entry at {@code cpi} is not a field + */ + RiField lookupField(int cpi, int opcode); + + /** + * Looks up a reference to a method. If {@code opcode} is non-negative, then resolution checks + * specific to the JVM instruction it denotes are performed if the method is already resolved. + * Should any of these checks fail, an {@linkplain RiMethod#isResolved() unresolved} + * method reference is returned. + * + * @param cpi the constant pool index + * @param opcode the opcode of the instruction for which the lookup is being performed or {@code -1} + * @return a reference to the method at {@code cpi} in this pool + * @throws ClassFormatError if the entry at {@code cpi} is not a method + */ + RiMethod lookupMethod(int cpi, int opcode); + + /** + * Looks up a reference to a type. If {@code opcode} is non-negative, then resolution checks + * specific to the JVM instruction it denotes are performed if the type is already resolved. + * Should any of these checks fail, an {@linkplain RiType#isResolved() unresolved} + * type reference is returned. + * + * @param cpi the constant pool index + * @param opcode the opcode of the instruction for which the lookup is being performed or {@code -1} + * @return a reference to the compiler interface type + */ + RiType lookupType(int cpi, int opcode); + + /** + * Looks up a method signature. + * + * @param cpi the constant pool index + * @return the method signature at index {@code cpi} in this constant pool + */ + RiSignature lookupSignature(int cpi); + + /** + * Looks up a constant at the specified index. + * @param cpi the constant pool index + * @return the {@code CiConstant} instance representing the constant + */ + Object lookupConstant(int cpi); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiDeoptReason.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2012, 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.api.meta; + + +public enum RiDeoptReason { + None, + NullCheckException, + BoundsCheckException, + ClassCastException, + ArrayStoreException, + UnreachedCode, + TypeCheckedInliningViolated, + OptimizedTypeCheckViolated, + NotCompiledExceptionHandler, + Unresolved, + JavaSubroutineMismatch, + ArithmeticException, + RuntimeConstraint; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiExceptionHandler.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +/** + * Represents an exception handler within the bytecode. + */ +public interface RiExceptionHandler { + + /** + * Gets the start bytecode index of the protected range of this handler. + * @return the start bytecode index + */ + int startBCI(); + + /** + * Gets the end bytecode index of the protected range of this handler. + * @return the end bytecode index + */ + int endBCI(); + + /** + * Gets the bytecode index of the handler block of this handler. + * @return the handler block bytecode index + */ + int handlerBCI(); + + /** + * Gets the index into the constant pool representing the type of exception + * caught by this handler. + * @return the constant pool index of the catch type + */ + int catchTypeCPI(); + + /** + * Checks whether this handler catches all exceptions. + * @return {@code true} if this handler catches all exceptions + */ + boolean isCatchAll(); + + /** + * The type of exception caught by this exception handler. + * + * @return the exception type + */ + RiType catchType(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiExceptionSeen.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2012, 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.api.meta; + + +/** + * Represents the three possibilities that an exception was seen at a specific BCI. + */ +public enum RiExceptionSeen { + TRUE, + FALSE, + NOT_SUPPORTED; + + public static RiExceptionSeen get(boolean value) { + return value ? TRUE : FALSE; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiField.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +/** + * Represents a reference to a field, including both resolved and unresolved fields. Fields, like methods and types, are + * resolved through {@link RiConstantPool constant pools}, and their actual implementation is provided by the + * {@link RiRuntime runtime} to the compiler. + */ +public interface RiField { + /** + * Gets the name of this field as a string. + * @return the name of this field + */ + String name(); + + /** + * Gets the type of this field as a compiler-runtime interface type. + * @return the type of this field + */ + RiType type(); + + /** + * Gets the kind of this field. + * @param architecture When true, the architecture-specific kind used for emitting machine code is returned. + * When false, the kind according to the Java specification is returned. + * @return the kind + */ + RiKind kind(boolean architecture); + + /** + * Gets the holder of this field as a compiler-runtime interface type. + * @return the holder of this field + */ + RiType holder(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiKind.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,465 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +import static com.oracle.graal.api.meta.RiKind.Flags.*; + +import java.lang.reflect.*; + +import sun.misc.*; + +/** + * Denotes the basic kinds of types in CRI, including the all the Java primitive types, + * for example, {@link RiKind#Int} for {@code int} and {@link RiKind#Object} + * for all object types. + * A kind has a single character short name, a Java name, and a set of flags + * further describing its behavior. + */ +public enum RiKind { + Boolean('z', "boolean", FIELD_TYPE | RETURN_TYPE | PRIMITIVE | STACK_INT), + Byte ('b', "byte", FIELD_TYPE | RETURN_TYPE | PRIMITIVE | STACK_INT), + Short ('s', "short", FIELD_TYPE | RETURN_TYPE | PRIMITIVE | STACK_INT), + Char ('c', "char", FIELD_TYPE | RETURN_TYPE | PRIMITIVE | STACK_INT), + Int ('i', "int", FIELD_TYPE | RETURN_TYPE | PRIMITIVE | STACK_INT), + Float ('f', "float", FIELD_TYPE | RETURN_TYPE | PRIMITIVE), + Long ('j', "long", FIELD_TYPE | RETURN_TYPE | PRIMITIVE), + Double ('d', "double", FIELD_TYPE | RETURN_TYPE | PRIMITIVE), + Object ('a', "Object", FIELD_TYPE | RETURN_TYPE), + Void ('v', "void", RETURN_TYPE), + /** Denote a bytecode address in a {@code JSR} bytecode. */ + Jsr ('r', "jsr", 0), + /** The non-type. */ + Illegal('-', "illegal", 0); + + public static final RiKind[] VALUES = values(); + public static final RiKind[] JAVA_VALUES = new RiKind[] {RiKind.Boolean, RiKind.Byte, RiKind.Short, RiKind.Char, RiKind.Int, RiKind.Float, RiKind.Long, RiKind.Double, RiKind.Object}; + + RiKind(char ch, String name, int flags) { + this.typeChar = ch; + this.javaName = name; + this.flags = flags; + } + + static class Flags { + /** + * Can be an object field type. + */ + public static final int FIELD_TYPE = 0x0001; + /** + * Can be result type of a method. + */ + public static final int RETURN_TYPE = 0x0002; + /** + * Behaves as an integer when on Java evaluation stack. + */ + public static final int STACK_INT = 0x0004; + /** + * Represents a Java primitive type. + */ + public static final int PRIMITIVE = 0x0008; + } + + /** + * The flags for this kind. + */ + private final int flags; + + /** + * The name of the kind as a single character. + */ + public final char typeChar; + + /** + * The name of this kind which will also be it Java programming language name if + * it is {@linkplain #isPrimitive() primitive} or {@code void}. + */ + public final String javaName; + + /** + * Checks whether this kind is valid as the type of a field. + * @return {@code true} if this kind is valid as the type of a Java field + */ + public boolean isValidFieldType() { + return (flags & FIELD_TYPE) != 0; + } + + /** + * Checks whether this kind is valid as the return type of a method. + * @return {@code true} if this kind is valid as the return type of a Java method + */ + public boolean isValidReturnType() { + return (flags & RETURN_TYPE) != 0; + } + + /** + * Checks whether this type is valid as an {@code int} on the Java operand stack. + * @return {@code true} if this type is represented by an {@code int} on the operand stack + */ + public boolean isInt() { + return (flags & STACK_INT) != 0; + } + + /** + * Checks whether this type is a Java primitive type. + * @return {@code true} if this is {@link #Boolean}, {@link #Byte}, {@link #Char}, {@link #Short}, + * {@link #Int}, {@link #Long}, {@link #Float} or {@link #Double}. + */ + public boolean isPrimitive() { + return (flags & PRIMITIVE) != 0; + } + + /** + * Gets the kind that represents this kind when on the Java operand stack. + * @return the kind used on the operand stack + */ + public RiKind stackKind() { + if (isInt()) { + return Int; + } + return this; + } + + public static RiKind fromTypeString(String typeString) { + assert typeString.length() > 0; + final char first = typeString.charAt(0); + if (first == '[' || first == 'L') { + return RiKind.Object; + } + return RiKind.fromPrimitiveOrVoidTypeChar(first); + } + + /** + * Gets the kind from the character describing a primitive or void. + * @param ch the character + * @return the kind + */ + public static RiKind fromPrimitiveOrVoidTypeChar(char ch) { + // Checkstyle: stop + switch (ch) { + case 'Z': return Boolean; + case 'C': return Char; + case 'F': return Float; + case 'D': return Double; + case 'B': return Byte; + case 'S': return Short; + case 'I': return Int; + case 'J': return Long; + case 'V': return Void; + } + // Checkstyle: resume + throw new IllegalArgumentException("unknown primitive or void type character: " + ch); + } + + public Class< ? > toJavaClass() { + // Checkstyle: stop + switch(this) { + case Void: return java.lang.Void.TYPE; + case Long: return java.lang.Long.TYPE; + case Int: return java.lang.Integer.TYPE; + case Byte: return java.lang.Byte.TYPE; + case Char: return java.lang.Character.TYPE; + case Double: return java.lang.Double.TYPE; + case Float: return java.lang.Float.TYPE; + case Short: return java.lang.Short.TYPE; + case Boolean: return java.lang.Boolean.TYPE; + default: return null; + } + // Checkstyle: resume + } + + public Class< ? > toBoxedJavaClass() { + // Checkstyle: stop + switch(this) { + case Void: return null; + case Long: return java.lang.Long.class; + case Int: return java.lang.Integer.class; + case Byte: return java.lang.Byte.class; + case Char: return java.lang.Character.class; + case Double: return java.lang.Double.class; + case Float: return java.lang.Float.class; + case Short: return java.lang.Short.class; + case Boolean: return java.lang.Boolean.class; + default: return null; + } + // Checkstyle: resume + } + + /** + * Checks whether this value type is void. + * @return {@code true} if this type is void + */ + public final boolean isVoid() { + return this == RiKind.Void; + } + + /** + * Checks whether this value type is long. + * @return {@code true} if this type is long + */ + public final boolean isLong() { + return this == RiKind.Long; + } + + /** + * Checks whether this value type is float. + * @return {@code true} if this type is float + */ + public final boolean isFloat() { + return this == RiKind.Float; + } + + /** + * Checks whether this value type is double. + * @return {@code true} if this type is double + */ + public final boolean isDouble() { + return this == RiKind.Double; + } + + /** + * Checks whether this value type is float or double. + * @return {@code true} if this type is float or double + */ + public final boolean isFloatOrDouble() { + return this == RiKind.Double || this == RiKind.Float; + } + + /** + * Checks whether this value type is an object type. + * @return {@code true} if this type is an object + */ + public final boolean isObject() { + return this == RiKind.Object; + } + + /** + * Checks whether this value type is an address type. + * @return {@code true} if this type is an address + */ + public boolean isJsr() { + return this == RiKind.Jsr; + } + + /** + * Converts this value type to a string. + */ + @Override + public String toString() { + return javaName; + } + + /** + * Marker interface for types that should be {@linkplain RiKind#format(Object) formatted} + * with their {@link Object#toString()} value. + */ + public interface FormatWithToString {} + + /** + * Gets a formatted string for a given value of this kind. + * + * @param value a value of this kind + * @return a formatted string for {@code value} based on this kind + */ + public String format(Object value) { + if (isObject()) { + if (value == null) { + return "null"; + } else { + if (value instanceof String) { + String s = (String) value; + if (s.length() > 50) { + return "\"" + s.substring(0, 30) + "...\""; + } else { + return " \"" + s + '"'; + } + } else if (value instanceof RiType) { + return "class " + RiUtil.toJavaName((RiType) value); + } else if (value instanceof Enum || value instanceof FormatWithToString) { + return String.valueOf(value); + } else if (value instanceof Class< ? >) { + return ((Class< ? >) value).getName() + ".class"; + } else if (value.getClass().isArray()) { + return formatArray(value); + } else { + return RiUtil.getSimpleName(value.getClass(), true) + "@" + System.identityHashCode(value); + } + } + } else { + return value.toString(); + } + } + + private static final int MAX_FORMAT_ARRAY_LENGTH = Integer.getInteger("maxFormatArrayLength", 5); + + private static String formatArray(Object array) { + Class< ? > componentType = array.getClass().getComponentType(); + assert componentType != null; + int arrayLength = Array.getLength(array); + StringBuilder buf = new StringBuilder(RiUtil.getSimpleName(componentType, true)). + append('['). + append(arrayLength). + append("]{"); + int length = Math.min(MAX_FORMAT_ARRAY_LENGTH, arrayLength); + boolean primitive = componentType.isPrimitive(); + for (int i = 0; i < length; i++) { + if (primitive) { + buf.append(Array.get(array, i)); + } else { + Object o = ((Object[]) array)[i]; + buf.append(RiKind.Object.format(o)); + } + if (i != length - 1) { + buf.append(", "); + } + } + if (arrayLength != length) { + buf.append(", ..."); + } + return buf.append('}').toString(); + } + + public final char signatureChar() { + return Character.toUpperCase(typeChar); + } + + public final int arrayBaseOffset() { + switch(this) { + case Boolean: + return Unsafe.ARRAY_BOOLEAN_BASE_OFFSET; + case Byte: + return Unsafe.ARRAY_BYTE_BASE_OFFSET; + case Char: + return Unsafe.ARRAY_CHAR_BASE_OFFSET; + case Short: + return Unsafe.ARRAY_SHORT_BASE_OFFSET; + case Int: + return Unsafe.ARRAY_INT_BASE_OFFSET; + case Long: + return Unsafe.ARRAY_LONG_BASE_OFFSET; + case Float: + return Unsafe.ARRAY_FLOAT_BASE_OFFSET; + case Double: + return Unsafe.ARRAY_DOUBLE_BASE_OFFSET; + case Object: + return Unsafe.ARRAY_OBJECT_BASE_OFFSET; + default: + assert false : "unexpected kind: " + this; + return -1; + } + } + + public final int arrayIndexScale() { + switch(this) { + case Boolean: + return Unsafe.ARRAY_BOOLEAN_INDEX_SCALE; + case Byte: + return Unsafe.ARRAY_BYTE_INDEX_SCALE; + case Char: + return Unsafe.ARRAY_CHAR_INDEX_SCALE; + case Short: + return Unsafe.ARRAY_SHORT_INDEX_SCALE; + case Int: + return Unsafe.ARRAY_INT_INDEX_SCALE; + case Long: + return Unsafe.ARRAY_LONG_INDEX_SCALE; + case Float: + return Unsafe.ARRAY_FLOAT_INDEX_SCALE; + case Double: + return Unsafe.ARRAY_DOUBLE_INDEX_SCALE; + case Object: + return Unsafe.ARRAY_OBJECT_INDEX_SCALE; + default: + assert false : "unexpected kind: " + this; + return -1; + } + } + + public RiConstant readUnsafeConstant(Object value, long displacement) { + assert value != null; + Unsafe u = Unsafe.getUnsafe(); + switch(this) { + case Boolean: + return RiConstant.forBoolean(u.getBoolean(value, displacement)); + case Byte: + return RiConstant.forByte(u.getByte(value, displacement)); + case Char: + return RiConstant.forChar(u.getChar(value, displacement)); + case Short: + return RiConstant.forShort(u.getShort(value, displacement)); + case Int: + return RiConstant.forInt(u.getInt(value, displacement)); + case Long: + return RiConstant.forLong(u.getLong(value, displacement)); + case Float: + return RiConstant.forFloat(u.getFloat(value, displacement)); + case Double: + return RiConstant.forDouble(u.getDouble(value, displacement)); + case Object: + return RiConstant.forObject(u.getObject(value, displacement)); + default: + assert false : "unexpected kind: " + this; + return null; + } + } + + public long minValue() { + switch (this) { + case Boolean: + return 0; + case Byte: + return java.lang.Byte.MIN_VALUE; + case Char: + return java.lang.Character.MIN_VALUE; + case Short: + return java.lang.Short.MIN_VALUE; + case Jsr: + case Int: + return java.lang.Integer.MIN_VALUE; + case Long: + return java.lang.Long.MIN_VALUE; + default: + throw new IllegalArgumentException("illegal call to minValue on " + this); + } + } + + public long maxValue() { + switch (this) { + case Boolean: + return 1; + case Byte: + return java.lang.Byte.MAX_VALUE; + case Char: + return java.lang.Character.MAX_VALUE; + case Short: + return java.lang.Short.MAX_VALUE; + case Jsr: + case Int: + return java.lang.Integer.MAX_VALUE; + case Long: + return java.lang.Long.MAX_VALUE; + default: + throw new IllegalArgumentException("illegal call to maxValue on " + this); + } + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiMethod.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +/** + * Represents resolved and unresolved methods. Methods, like fields and types, are resolved through + * {@link RiConstantPool constant pools}, and their actual implementation is provided by the {@link RiRuntime runtime} + * to the compiler. + */ +public interface RiMethod { + + /** + * Gets the name of the method as a string. + * @return the name of the method + */ + String name(); + + /** + * Gets the type in which this method is declared. + * @return the type in which this method is declared + */ + RiType holder(); + + /** + * Gets the signature of the method. + * @return the signature of the method + */ + RiSignature signature(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiProfilingInfo.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2012, 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.api.meta; + +/** + * Provides access to the profiling information of one specific method. + * Every accessor method returns the information that is available at the time of invocation. + * If a method is invoked multiple times, it may return significantly different results for every invocation + * as the profiling information may be changed by other Java threads at any time. + */ +public interface RiProfilingInfo { + + /** + * Gets the length of the code associated with this profile. + */ + int codeSize(); + + /** + * Returns an estimate of how often the branch at the given byte code was taken. + * @return The estimated probability, with 0.0 meaning never and 1.0 meaning always, or -1 if this information is not available. + */ + double getBranchTakenProbability(int bci); + + /** + * Returns an estimate of how often the switch cases are taken at the given BCI. + * The default case is stored as the last entry. + * @return A double value that contains the estimated probabilities, with 0.0 meaning never and 1.0 meaning always, + * or -1 if this information is not available. + */ + double[] getSwitchProbabilities(int bci); + + /** + * Returns the TypeProfile for the given BCI. + * @return Returns an RiTypeProfile object, or null if not available. + */ + RiTypeProfile getTypeProfile(int bci); + + /** + * Returns information if the given BCI did ever throw an exception. + * @return {@link RiExceptionSeen#TRUE} if the instruction has thrown an exception at least once, + * {@link RiExceptionSeen#FALSE} if it never threw an exception, and {@link RiExceptionSeen#NOT_SUPPORTED} + * if this information was not recorded. + */ + RiExceptionSeen getExceptionSeen(int bci); + + /** + * Returns an estimate how often the current BCI was executed. Avoid comparing execution counts to each other, + * as the returned value highly depends on the time of invocation. + * @return the estimated execution count or -1 if not available. + */ + int getExecutionCount(int bci); + + /** + * Returns how frequently a method was deoptimized for the given deoptimization reason. This only indicates how + * often the method did fall back to the interpreter for the execution and does not indicate how often it was recompiled. + * @param reason the reason for which the number of deoptimizations should be queried + * @return the number of times the compiled method deoptimized for the given reason. + */ + int getDeoptimizationCount(RiDeoptReason reason); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiResolvedField.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +import java.lang.annotation.*; +import java.lang.reflect.*; + +/** + * Represents a reference to a resolved field. Fields, like methods and types, are + * resolved through {@link RiConstantPool constant pools}, and their actual implementation is provided by the + * {@link RiRuntime runtime} to the compiler. + */ +public interface RiResolvedField extends RiField { + + /** + * Gets the access flags for this field. Only the flags specified in the JVM specification + * will be included in the returned mask. The utility methods in the {@link Modifier} class + * should be used to query the returned mask for the presence/absence of individual flags. + * @return the mask of JVM defined field access flags defined for this field + */ + int accessFlags(); + + /** + * Gets the constant value of this field if available. + * @param receiver object from which this field's value is to be read. This value is ignored if this field is static. + * @return the constant value of this field or {@code null} if the constant value is not available + */ + RiConstant constantValue(RiConstant receiver); + + /** + * Gets the holder of this field as a compiler-runtime interface type. + * @return the holder of this field + */ + RiResolvedType holder(); + + /** + * Returns this field's annotation of a specified type. + * + * @param annotationClass the Class object corresponding to the annotation type + * @return the annotation of type {@code annotationClass} for this field if present, else null + */ + <T extends Annotation> T getAnnotation(Class<T> annotationClass); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiResolvedMethod.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,224 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +import java.lang.annotation.*; +import java.lang.reflect.*; +import java.util.*; + +/** + * Represents resolved methods. Methods, like fields and types, are resolved through + * {@link RiConstantPool constant pools}, and their actual implementation is provided by the {@link RiRuntime runtime} + * to the compiler. + */ +public interface RiResolvedMethod extends RiMethod { + + /** + * Gets the bytecode of the method, if the method {@linkplain #isResolved()} and has code. + * The returned byte array does not contain breakpoints or non-Java bytecodes. + * @return the bytecode of the method or {@code null} if none is available + */ + byte[] code(); + + /** + * Gets the size of the bytecode of the method, if the method {@linkplain #isResolved()} and has code. + * @return the size of the bytecode in bytes, or 0 if no bytecode is available + */ + int codeSize(); + + /** + * Gets the size of the compiled machine code. + * @return the size of the compiled machine code in bytes, or 0 if no compiled code exists. + */ + int compiledCodeSize(); + + /** + * Gets an estimate how complex it is to compile this method. + * @return A value >= 0, where higher means more complex. + */ + int compilationComplexity(); + + /** + * Gets the symbol used to link this method if it is native, otherwise {@code null}. + */ + String jniSymbol(); + + /** + * Gets the type in which this method is declared. + * @return the type in which this method is declared + */ + RiResolvedType holder(); + + /** + * Gets the maximum number of locals used in this method's bytecode. + * @return the maximum number of locals + */ + int maxLocals(); + + /** + * Gets the maximum number of stack slots used in this method's bytecode. + * @return the maximum number of stack slots + */ + int maxStackSize(); + + /** + * Checks whether this method has balanced monitor operations. + * @return {@code true} if the method has balanced monitor operations + */ + boolean hasBalancedMonitors(); + + /** + * Gets the access flags for this method. Only the flags specified in the JVM specification + * will be included in the returned mask. The utility methods in the {@link Modifier} class + * should be used to query the returned mask for the presence/absence of individual flags. + * @return the mask of JVM defined method access flags defined for this method + */ + int accessFlags(); + + /** + * Checks whether this method is a leaf method. + * @return {@code true} if the method is a leaf method (that is, is final or private) + */ + boolean isLeafMethod(); + + /** + * Checks whether this method is a class initializer. + * @return {@code true} if the method is a class initializer + */ + boolean isClassInitializer(); + + /** + * Checks whether this method is a constructor. + * @return {@code true} if the method is a constructor + */ + boolean isConstructor(); + + /** + * Checks whether this method has been overridden. Decisions made based + * on a method being overridden must be registered as dependencies. + * @return {@code true} if the method has been overridden + */ + boolean isOverridden(); + + /** + * Checks whether the compiler can insert safepoint polls in this method. + * @return {@code true} if the method cannot have safepoint polls inserted + */ + boolean noSafepointPolls(); + + /** + * Gets a map from bytecode indexes to bit maps denoting the live locals at that position. + * If a non-null array is return, its length is guaranteed to be equal to {@code code().length}. + * + * @return the liveness map if it is available; {@code null} otherwise + */ + RiBitMap[] livenessMap(); + + /** + * Checks whether this method can be statically bound (that is, it is final or private or static). + * @return {@code true} if this method can be statically bound + */ + boolean canBeStaticallyBound(); + + /** + * Gets the list of exception handlers for this method. + * @return the list of exception handlers + */ + RiExceptionHandler[] exceptionHandlers(); + + /** + * Gets a stack trace element for this method and a given bytecode index. + */ + StackTraceElement toStackTraceElement(int bci); + + /** + * Temporary work-around to support the @ACCESSOR Maxine annotation. + * Non-Maxine VMs should just return {@code null}. + */ + RiResolvedType accessor(); + + /** + * Gets the intrinsic id of this method. + */ + String intrinsic(); + + /** + * Provides an estimate of how often this method has been executed. + * @return The number of invocations, or -1 if this information isn't available. + */ + int invocationCount(); + + /** + * Returns an object that provides access to the method's profiling information. + * @return The profiling information recorded for this method. + */ + RiProfilingInfo profilingInfo(); + + /** + * Returns a map that the compiler can use to store objects that should survive the current compilation. + */ + Map<Object, Object> compilerStorage(); + + /** + * Returns a pointer to the method's constant pool. + * @return the constant pool + */ + RiConstantPool getConstantPool(); + + /** + * Returns this method's annotation of a specified type. + * + * @param annotationClass the Class object corresponding to the annotation type + * @return the annotation of type {@code annotationClass} for this method if present, else null + */ + <T extends Annotation> T getAnnotation(Class<T> annotationClass); + + /** + * Returns an array of arrays that represent the annotations on the formal + * parameters, in declaration order, of this method. + * + * @see Method#getParameterAnnotations() + * @see CiUtil#getParameterAnnotation(int, RiResolvedMethod) + */ + Annotation[][] getParameterAnnotations(); + + /** + * Returns an array of {@link Type} objects that represent the formal + * parameter types, in declaration order, of this method. + * + * @see Method#getGenericParameterTypes() + */ + Type[] getGenericParameterTypes(); + + /** + * Returns a {@link Type} object that represents the formal return type of this method. + * + * @see Method#getGenericReturnType() + */ + Type getGenericReturnType(); + + /** + * @return {@code true} if this method can be inlined + */ + boolean canBeInlined(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiResolvedType.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,188 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +import java.lang.annotation.*; +import java.lang.reflect.*; + +/** + * Represents a resolved in the compiler-runtime interface. Types include primitives, objects, {@code void}, + * and arrays thereof. Types, like fields and methods, are resolved through {@link RiConstantPool constant pools}, and + * their actual implementation is provided by the {@link RiRuntime runtime} to the compiler. + */ +public interface RiResolvedType extends RiType { + + /** + * Gets the encoding of (that is, a constant representing the value of) the specified part of this type. + * @param r the part of the this type + * @return a constant representing a reference to the specified part of this type + */ + RiConstant getEncoding(Representation r); + + /** + * Checks whether this type has any subclasses so far. Any decisions + * based on this information require the registration of a dependency, since + * this information may change. + * @return {@code true} if this class has subclasses + */ + boolean hasSubclass(); + + /** + * Checks whether this type has a finalizer method. + * @return {@code true} if this class has a finalizer + */ + boolean hasFinalizer(); + + /** + * Checks whether this type has any finalizable subclasses so far. Any decisions + * based on this information require the registration of a dependency, since + * this information may change. + * @return {@code true} if this class has any subclasses with finalizers + */ + boolean hasFinalizableSubclass(); + + /** + * Checks whether this type is an interface. + * @return {@code true} if this type is an interface + */ + boolean isInterface(); + + /** + * Checks whether this type is an instance class. + * @return {@code true} if this type is an instance class + */ + boolean isInstanceClass(); + + /** + * Checks whether this type is an array class. + * @return {@code true} if this type is an array class + */ + boolean isArrayClass(); + + /** + * Gets the access flags for this type. Only the flags specified in the JVM specification + * will be included in the returned mask. The utility methods in the {@link Modifier} class + * should be used to query the returned mask for the presence/absence of individual flags. + * @return the mask of JVM defined class access flags defined for this type + */ + int accessFlags(); + + /** + * Checks whether this type is initialized. + * @return {@code true} if this type is initialized + */ + boolean isInitialized(); + + /** + * Checks whether this type is a subtype of another type. + * @param other the type to test + * @return {@code true} if this type a subtype of the specified type + */ + boolean isSubtypeOf(RiResolvedType other); + + /** + * Checks whether the specified object is an instance of this type. + * @param obj the object to test + * @return {@code true} if the object is an instance of this type + */ + boolean isInstance(RiConstant obj); + + /** + * Attempts to get an exact type for this type. Final classes, + * arrays of final classes, and primitive types all have exact types. + * @return the exact type of this type, if it exists; {@code null} otherwise + */ + RiResolvedType exactType(); + + /** + * Gets the super type of this type or {@code null} if no such type exists. + */ + RiResolvedType superType(); + + /** + * Walks the class hierarchy upwards and returns the least common type that is a super type of both + * the current and the given type. + * @return the least common type that is a super type of both the current and the given type, or null if primitive types are involved. + */ + RiResolvedType leastCommonAncestor(RiResolvedType otherType); + + /** + * Attempts to get the unique concrete subtype of this type. + * @return the exact type of this type, if it exists; {@code null} otherwise + */ + RiResolvedType uniqueConcreteSubtype(); + + /** + * For array types, gets the type of the components. + * @return the component type of this array type + */ + RiResolvedType componentType(); + + /** + * Gets the type representing an array with elements of this type. + * @return a new compiler interface type representing an array of this type + */ + RiResolvedType arrayOf(); + + /** + * Resolves the method implementation for virtual dispatches on objects + * of this dynamic type. + * @param method the method to select the implementation of + * @return the method implementation that would be selected at runtime + */ + RiResolvedMethod resolveMethodImpl(RiResolvedMethod method); + + /** + * Given an RiMethod a, returns a concrete RiMethod b that is the only possible + * unique target for a virtual call on a(). Returns {@code null} if either no + * such concrete method or more than one such method exists. Returns the method a + * if a is a concrete method that is not overridden. If the compiler uses the + * result of this method for its compilation, it must register an assumption + * (see {@link CiAssumptions}), because dynamic class loading can invalidate + * the result of this method. + * @param method the method a for which a unique concrete target is searched + * @return the unique concrete target or {@code null} if no such target exists + * or assumptions are not supported by this runtime + */ + RiResolvedMethod uniqueConcreteMethod(RiResolvedMethod method); + + /** + * Returns the instance fields declared in this class sorted by field offset. + * @return an array of instance fields + */ + RiResolvedField[] declaredFields(); + + /** + * Returns this type's annotation of a specified type. + * + * @param annotationClass the Class object corresponding to the annotation type + * @return the annotation of type {@code annotationClass} for this type if present, else null + */ + <T extends Annotation> T getAnnotation(Class<T> annotationClass); + + /** + * Returns the java.lang.Class object representing this RiType instance or {@code null} if none exists. + * @return the java.lang.Class object + */ + Class<?> toJava(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiSignature.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +/** + * Represents a method signature provided by the runtime. + * + * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#7035">Method Descriptors</a> + */ +public interface RiSignature { + /** + * Gets the number of arguments in this signature, adding 1 for a receiver if requested. + * + * @param receiver true if 1 is to be added to the result for a receiver + * @return the number of arguments + 1 iff {@code receiver == true} + */ + int argumentCount(boolean receiver); + + /** + * Gets the argument type at the specified position. This method will return a + * {@linkplain RiType#isResolved() resolved} type if possible but without + * triggering any class loading or resolution. + * + * @param index the index into the parameters, with {@code 0} indicating the first parameter + * @param accessingClass the context of the type lookup. If accessing class is resolved, its class loader + * is used to retrieve an existing resolved type. This value can be {@code null} if the caller does + * not care for a resolved type. + * @return the {@code index}'th argument type + */ + RiType argumentTypeAt(int index, RiResolvedType accessingClass); + + /** + * Gets the argument kind at the specified position. + * @param index the index into the parameters, with {@code 0} indicating the first parameter + * @param architecture When true, the architecture-specific kind used for emitting machine code is returned. + * When false, the kind according to the Java specification is returned. + * @return the kind of the argument at the specified position + */ + RiKind argumentKindAt(int index, boolean architecture); + + /** + * Gets the return type of this signature. This method will return a + * {@linkplain RiResolvedType resolved} type if possible but without + * triggering any class loading or resolution. + * + * @param accessingClass the context of the type lookup. If accessing class is resolved, its class loader + * is used to retrieve an existing resolved type. This value can be {@code null} if the caller does + * not care for a resolved type. + * @return the compiler interface type representing the return type + */ + RiType returnType(RiType accessingClass); + + /** + * Gets the return kind of this signature. + * @param architectureSpecific When true, the architecture-specific kind used for emitting machine code is returned. + * When false, the kind according to the Java specification is returned. + * @return the return kind + */ + RiKind returnKind(boolean architectureSpecific); + + /** + * Converts this signature to a string. + * @return the signature as a string + */ + String asString(); + + /** + * Gets the size, in Java slots, of the arguments to this signature. + * @param withReceiver {@code true} if to add a slot for a receiver object; {@code false} not to include the receiver + * @return the size of the arguments in slots + */ + int argumentSlots(boolean withReceiver); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiType.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2009, 2011, 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.api.meta; + +/** + * Represents a resolved or unresolved type in the compiler-runtime interface. Types include primitives, objects, {@code void}, + * and arrays thereof. + */ +public interface RiType { + + /** + * Represents each of the several different parts of the runtime representation of + * a type which compiled code may need to reference individually. These may or may not be + * different objects or data structures, depending on the runtime system. + */ + public enum Representation { + /** + * The runtime representation of the data structure containing the static fields of this type. + */ + StaticFields, + + /** + * The runtime representation of the Java class object of this type. + */ + JavaClass, + + /** + * The runtime representation of the "hub" of this type--that is, the closest part of the type + * representation which is typically stored in the object header. + */ + ObjectHub + } + + /** + * Gets the name of this type in internal form. The following are examples of strings returned by this method: + * <pre> + * "Ljava/lang/Object;" + * "I" + * "[[B" + * </pre> + * + * @return the name of this type in internal form + */ + String name(); + + /** + * For array types, gets the type of the components. + * @return the component type of this array type + */ + RiType componentType(); + + /** + * Gets the type representing an array with elements of this type. + * @return a new compiler interface type representing an array of this type + */ + RiType arrayOf(); + + /** + * Gets the kind of this compiler interface type. + * @param architecture When true, the architecture-specific kind used for emitting machine code is returned. + * When false, the kind according to the Java specification is returned. + * @return the kind + */ + RiKind kind(boolean architecture); + + /** + * Gets the kind used to represent the specified part of this type. + * @param r the part of the this type + * @return the kind of constants for the specified part of the type + */ + RiKind getRepresentationKind(Representation r); + + RiResolvedType resolve(RiResolvedType accessingClass); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiTypeProfile.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2011, 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.api.meta; + +import java.io.*; + +/** + * This profile object represents the type profile at a specific BCI. The precision of the supplied values may vary, + * but a runtime that provides this information should be aware that it will be used to guide performance-critical + * decisions like speculative inlining, etc. + */ +public final class RiTypeProfile implements Serializable { + + private static final long serialVersionUID = -6877016333706838441L; + + /** + * A profiled type that has a probability. Profiled types are naturally sorted in + * descending order of their probabilities. + */ + public static class ProfiledType implements Comparable<ProfiledType>, Serializable { + private static final long serialVersionUID = 7838575753661305744L; + public final RiResolvedType type; + public final double probability; + + public ProfiledType(RiResolvedType type, double probability) { + assert type != null; + assert probability >= 0.0D && probability <= 1.0D; + this.type = type; + this.probability = probability; + } + + @Override + public int compareTo(ProfiledType o) { + if (probability > o.probability) { + return -1; + } else if (probability < o.probability) { + return 1; + } + return 0; + } + } + + private final double notRecordedProbability; + private final ProfiledType[] ptypes; + + /** + * Determines if an array of profiled types are sorted in descending order of their probabilities. + */ + public static boolean isSorted(ProfiledType[] ptypes) { + for (int i = 1; i < ptypes.length; i++) { + if (ptypes[i - 1].probability < ptypes[i].probability) { + return false; + } + } + return true; + } + + public RiTypeProfile(double notRecordedProbability, ProfiledType... ptypes) { + this.ptypes = ptypes; + this.notRecordedProbability = notRecordedProbability; + assert isSorted(ptypes); + } + + /** + * Returns the estimated probability of all types that could not be recorded due to profiling limitations. + * @return double value >= 0.0 and <= 1.0 + */ + public double getNotRecordedProbability() { + return notRecordedProbability; + } + + /** + * A list of types for which the runtime has recorded probability information. + */ + public ProfiledType[] getTypes() { + return ptypes; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiUtil.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,133 @@ +/* + * Copyright (c) 2012, 2012, 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.api.meta; + + +public class RiUtil { + + + + /** + * Extends the functionality of {@link Class#getSimpleName()} to include a non-empty string for anonymous and local + * classes. + * + * @param clazz the class for which the simple name is being requested + * @param withEnclosingClass specifies if the returned name should be qualified with the name(s) of the enclosing + * class/classes of {@code clazz} (if any). This option is ignored if {@code clazz} denotes an anonymous + * or local class. + * @return the simple name + */ + public static String getSimpleName(Class< ? > clazz, boolean withEnclosingClass) { + final String simpleName = clazz.getSimpleName(); + if (simpleName.length() != 0) { + if (withEnclosingClass) { + String prefix = ""; + Class< ? > enclosingClass = clazz; + while ((enclosingClass = enclosingClass.getEnclosingClass()) != null) { + prefix = prefix + enclosingClass.getSimpleName() + "."; + } + return prefix + simpleName; + } + return simpleName; + } + // Must be an anonymous or local class + final String name = clazz.getName(); + int index = name.indexOf('$'); + if (index == -1) { + return name; + } + index = name.lastIndexOf('.', index); + if (index == -1) { + return name; + } + return name.substring(index + 1); + } + + + /** + * Converts a given type to its Java programming language name. The following are examples of strings returned by + * this method: + * + * <pre> + * qualified == true: + * java.lang.Object + * int + * boolean[][] + * qualified == false: + * Object + * int + * boolean[][] + * </pre> + * + * @param riType the type to be converted to a Java name + * @param qualified specifies if the package prefix of the type should be included in the returned name + * @return the Java name corresponding to {@code riType} + */ + public static String toJavaName(RiType riType, boolean qualified) { + RiKind kind = riType.kind(false); + if (kind.isPrimitive() || kind == RiKind.Void) { + return kind.javaName; + } + return internalNameToJava(riType.name(), qualified); + } + + /** + * Converts a given type to its Java programming language name. The following are examples of strings returned by + * this method: + * + * <pre> + * java.lang.Object + * int + * boolean[][] + * </pre> + * + * @param riType the type to be converted to a Java name + * @return the Java name corresponding to {@code riType} + */ + public static String toJavaName(RiType riType) { + return (riType == null) ? null : internalNameToJava(riType.name(), true); + } + + public static String internalNameToJava(String name, boolean qualified) { + switch (name.charAt(0)) { + case 'L': { + String result = name.substring(1, name.length() - 1).replace('/', '.'); + if (!qualified) { + final int lastDot = result.lastIndexOf('.'); + if (lastDot != -1) { + result = result.substring(lastDot + 1); + } + } + return result; + + } + case '[': + return internalNameToJava(name.substring(1), qualified) + "[]"; + default: + if (name.length() != 1) { + throw new IllegalArgumentException("Illegal internal name: " + name); + } + return RiKind.fromPrimitiveOrVoidTypeChar(name.charAt(0)).javaName; + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiValue.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2009, 2012, 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.api.meta; + +import java.io.*; + +/** + * Abstract base class for values manipulated by the compiler. All values have a {@linkplain RiKind kind} and are immutable. + */ +public abstract class RiValue implements Serializable { + private static final long serialVersionUID = -6909397188697766469L; + + @SuppressWarnings("serial") + public static RiValue IllegalValue = new RiValue(RiKind.Illegal) { + @Override + public String toString() { + return "-"; + } + }; + + /** + * The kind of this value. + */ + public final RiKind kind; + + /** + * Initializes a new value of the specified kind. + * @param kind the kind + */ + protected RiValue(RiKind kind) { + this.kind = kind; + } + + /** + * String representation of the kind, which should be the end of all {@link #toString()} implementation of subclasses. + */ + protected final String kindSuffix() { + return "|" + kind.typeChar; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/VirtualMachineComponent.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2012, 2012, 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.api.meta; + + +public interface VirtualMachineComponent { + void setOption(String name, String value); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/package-info.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2009, 2011, 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. + */ +/** + * The runtime-provided part of the bi-directional interface between the compiler and the runtime system of a virtual machine for the + * instruction set defined in {@link com.oracle.graal.compiler.graphbuilder.Bytecodes}. + * <p> + * Unlike the {@link com.oracle.max.cri.ci compiler-provided interface}, the runtime-provided interface is specified largely + * using interfaces, that must be implemented by classes provided by a specific runtime implementation. + * <p> + * {@link com.oracle.max.cri.ri.RiRuntime} encapsulates the main functionality of the runtime for the compiler. + * <p> + * Types (i.e., primitives, classes and interfaces}, fields and methods are represented by {@link com.oracle.graal.api.meta.RiType}, + * {@link com.oracle.graal.api.meta.RiField} and {@link com.oracle.graal.api.meta.RiMethod}, respectively, with additional support from + * {@link com.oracle.graal.api.meta.RiSignature} and {@link com.oracle.graal.api.meta.RiExceptionHandler}. Access to the runtime constant pool + * is through {@link com.oracle.graal.api.meta.RiConstantPool}. + */ +package com.oracle.graal.api.meta;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api/src/com/oracle/graal/api/Graal.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2012, 2012, 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.api; + + +public class Graal { + + private static GraalRuntime runtime; + private static volatile boolean initialized; + + private static native GraalRuntime initializeRuntime(); + + public static GraalRuntime getRuntime() { + ensureInitialized(); + return runtime; + } + + public static boolean hasRuntime() { + return getRuntime() != null; + } + + private static void ensureInitialized() { + boolean wasInitialized = initialized; + if (!wasInitialized) { + synchronized (Graal.class) { + if (!initialized) { + try { + runtime = initializeRuntime(); + } catch (UnsatisfiedLinkError e) { + runtime = null; + } + initialized = true; + } + } + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.api/src/com/oracle/graal/api/GraalRuntime.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2012, 2012, 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.api; + + +public interface GraalRuntime { + String getName(); + <T> T getCapability(Class<T> clazz); +}
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Fri Jun 08 15:17:43 2012 +0200 @@ -27,6 +27,8 @@ import java.util.concurrent.*; import com.oracle.graal.alloc.simple.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.alloc.*; import com.oracle.graal.compiler.gen.*; import com.oracle.graal.compiler.phases.*; @@ -40,8 +42,6 @@ import com.oracle.graal.lir.asm.*; import com.oracle.graal.lir.cfg.*; import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.cri.xir.*; public class GraalCompiler { @@ -54,7 +54,7 @@ /** * The runtime that this compiler has been configured for. */ - public final GraalRuntime runtime; + public final ExtendedRiRuntime runtime; /** * The XIR generator that lowers Java operations to machine operations. @@ -66,7 +66,7 @@ */ public final Backend backend; - public GraalCompiler(GraalRuntime runtime, CiTarget target, Backend backend, RiXirGenerator xirGen) { + public GraalCompiler(ExtendedRiRuntime runtime, CiTarget target, Backend backend, RiXirGenerator xirGen) { this.runtime = runtime; this.target = target; this.xir = xirGen;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/OptimisticOptimizations.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/OptimisticOptimizations.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,9 +24,9 @@ import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/Interval.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/Interval.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,8 +26,9 @@ import java.util.*; -import com.oracle.max.cri.ci.*; import com.oracle.max.criutils.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.util.*; import com.oracle.graal.graph.*; @@ -401,17 +402,17 @@ /** * The {@linkplain CiRegisterValue register} or {@linkplain Variable variable} for this interval prior to register allocation. */ - public final CiValue operand; + public final RiValue operand; /** - * The {@linkplain OperandPool#operandNumber(CiValue) operand number} for this interval's {@linkplain #operand operand}. + * The {@linkplain OperandPool#operandNumber(RiValue) operand number} for this interval's {@linkplain #operand operand}. */ public final int operandNumber; /** * The {@linkplain CiRegisterValue register}, {@linkplain CiStackSlot spill slot} or {@linkplain CiAddress address} assigned to this interval. */ - private CiValue location; + private RiValue location; /** * The stack slot to which all splits of this interval are spilled if necessary. @@ -422,7 +423,7 @@ * The kind of this interval. * Only valid if this is a {@linkplain #xxisVariable() variable}. */ - private CiKind kind; + private RiKind kind; /** * The head of the list of ranges describing this interval. This list is sorted by {@linkplain LIRInstruction#id instruction ids}. @@ -486,17 +487,17 @@ */ private Interval locationHint; - void assignLocation(CiValue newLocation) { + void assignLocation(RiValue newLocation) { if (isRegister(newLocation)) { assert this.location == null : "cannot re-assign location for " + this; - if (newLocation.kind == CiKind.Illegal && kind != CiKind.Illegal) { + if (newLocation.kind == RiKind.Illegal && kind != RiKind.Illegal) { this.location = asRegister(newLocation).asValue(kind); return; } } else { assert this.location == null || isRegister(this.location) : "cannot re-assign location for " + this; assert isStackSlot(newLocation); - assert newLocation.kind != CiKind.Illegal; + assert newLocation.kind != RiKind.Illegal; assert newLocation.kind == this.kind; } this.location = newLocation; @@ -505,18 +506,18 @@ /** * Gets the {@linkplain CiRegisterValue register}, {@linkplain CiStackSlot spill slot} or {@linkplain CiAddress address} assigned to this interval. */ - public CiValue location() { + public RiValue location() { return location; } - public CiKind kind() { + public RiKind kind() { assert !isRegister(operand) : "cannot access type for fixed interval"; return kind; } - void setKind(CiKind kind) { - assert isRegister(operand) || this.kind() == CiKind.Illegal || this.kind() == kind : "overwriting existing type"; - assert kind == kind.stackKind() || kind == CiKind.Short : "these kinds should have int type registers"; + void setKind(RiKind kind) { + assert isRegister(operand) || this.kind() == RiKind.Illegal || this.kind() == kind : "overwriting existing type"; + assert kind == kind.stackKind() || kind == RiKind.Short : "these kinds should have int type registers"; this.kind = kind; } @@ -658,9 +659,9 @@ /** * Sentinel interval to denote the end of an interval list. */ - static final Interval EndMarker = new Interval(CiValue.IllegalValue, -1); + static final Interval EndMarker = new Interval(RiValue.IllegalValue, -1); - Interval(CiValue operand, int operandNumber) { + Interval(RiValue operand, int operandNumber) { assert operand != null; this.operand = operand; this.operandNumber = operandNumber; @@ -669,7 +670,7 @@ } else { assert isIllegal(operand) || isVariable(operand); } - this.kind = CiKind.Illegal; + this.kind = RiKind.Illegal; this.first = Range.EndMarker; this.usePosList = new UsePosList(4); this.current = Range.EndMarker;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,15 +22,13 @@ */ package com.oracle.graal.compiler.alloc; -import static com.oracle.max.cri.ci.CiUtil.*; -import static com.oracle.max.cri.ci.CiValueUtil.*; import static com.oracle.graal.alloc.util.LocationUtil.*; - +import static com.oracle.graal.api.code.CiUtil.*; import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.alloc.Interval.RegisterBinding; import com.oracle.graal.compiler.alloc.Interval.RegisterPriority; @@ -56,7 +54,7 @@ final LIR ir; final LIRGenerator gen; final FrameMap frameMap; - final RiRegisterAttributes[] registerAttributes; + final CiRegisterAttributes[] registerAttributes; final CiRegister[] registers; private static final int INITIAL_SPLIT_INTERVALS_CAPACITY = 32; @@ -66,7 +64,7 @@ * Bit map specifying which {@linkplain OperandPool operands} are live upon entry to this block. * These are values used in this block or any of its successors where such value are not defined * in this block. - * The bit index of an operand is its {@linkplain OperandPool#operandNumber(com.sun.cri.ci.CiValue) operand number}. + * The bit index of an operand is its {@linkplain OperandPool#operandNumber(com.oracle.max.cri.ri.RiValue.ci.CiValue) operand number}. */ public BitMap liveIn; @@ -74,20 +72,20 @@ * Bit map specifying which {@linkplain OperandPool operands} are live upon exit from this block. * These are values used in a successor block that are either defined in this block or were live * upon entry to this block. - * The bit index of an operand is its {@linkplain OperandPool#operandNumber(com.sun.cri.ci.CiValue) operand number}. + * The bit index of an operand is its {@linkplain OperandPool#operandNumber(com.oracle.max.cri.ri.RiValue.ci.CiValue) operand number}. */ public BitMap liveOut; /** * Bit map specifying which {@linkplain OperandPool operands} are used (before being defined) in this block. * That is, these are the values that are live upon entry to the block. - * The bit index of an operand is its {@linkplain OperandPool#operandNumber(com.sun.cri.ci.CiValue) operand number}. + * The bit index of an operand is its {@linkplain OperandPool#operandNumber(com.oracle.max.cri.ri.RiValue.ci.CiValue) operand number}. */ public BitMap liveGen; /** * Bit map specifying which {@linkplain OperandPool operands} are defined/overwritten in this block. - * The bit index of an operand is its {@linkplain OperandPool#operandNumber(com.sun.cri.ci.CiValue) operand number}. + * The bit index of an operand is its {@linkplain OperandPool#operandNumber(com.oracle.max.cri.ri.RiValue.ci.CiValue) operand number}. */ public BitMap liveKill; } @@ -100,7 +98,7 @@ final Block[] sortedBlocks; /** - * Map from {@linkplain #operandNumber(CiValue) operand numbers} to intervals. + * Map from {@linkplain #operandNumber(RiValue) operand numbers} to intervals. */ Interval[] intervals; @@ -139,15 +137,15 @@ BitMap2D intervalInLoop; /** - * The variable operands allocated from this pool. The {@linkplain #operandNumber(CiValue) number} + * The variable operands allocated from this pool. The {@linkplain #operandNumber(RiValue) number} * of the first variable operand in this pool is one greater than the number of the last * register operand in the pool. */ private final ArrayList<Variable> variables; /** - * The {@linkplain #operandNumber(CiValue) number} of the first variable operand - * {@linkplain #newVariable(CiKind) allocated} from this pool. + * The {@linkplain #operandNumber(RiValue) number} of the first variable operand + * {@linkplain #newVariable(RiKind) allocated} from this pool. */ private final int firstVariableNumber; @@ -167,7 +165,7 @@ this.blockData = new BlockMap<>(ir.cfg); } - public static boolean isVariableOrRegister(CiValue value) { + public static boolean isVariableOrRegister(RiValue value) { return isVariable(value) || isRegister(value); } @@ -177,7 +175,7 @@ * {@linkplain Variable variables} and {@linkplain CiRegisterValue registers} being processed by this * allocator. */ - private int operandNumber(CiValue operand) { + private int operandNumber(RiValue operand) { if (isRegister(operand)) { int number = asRegister(operand).number; assert number < firstVariableNumber; @@ -190,7 +188,7 @@ /** * Gets the operand denoted by a given operand number. */ - private CiValue operandFor(int operandNumber) { + private RiValue operandFor(int operandNumber) { if (operandNumber < firstVariableNumber) { assert operandNumber >= 0; return registers[operandNumber].asValue(); @@ -233,14 +231,14 @@ static final IntervalPredicate IS_OOP_INTERVAL = new IntervalPredicate() { @Override public boolean apply(Interval i) { - return !isRegister(i.operand) && i.kind() == CiKind.Object; + return !isRegister(i.operand) && i.kind() == RiKind.Object; } }; /** * Gets an object describing the attributes of a given register according to this register configuration. */ - RiRegisterAttributes attributes(CiRegister reg) { + CiRegisterAttributes attributes(CiRegister reg) { return registerAttributes[reg.number]; } @@ -262,7 +260,7 @@ * @param operand the operand for the interval * @return the created interval */ - Interval createInterval(CiValue operand) { + Interval createInterval(RiValue operand) { assert isProcessed(operand); assert isLegal(operand); int operandNumber = operandNumber(operand); @@ -324,7 +322,7 @@ return intervalInLoop.at(interval, loop); } - Interval intervalFor(CiValue operand) { + Interval intervalFor(RiValue operand) { int operandNumber = operandNumber(operand); assert operandNumber < intervalsSize; return intervals[operandNumber]; @@ -526,8 +524,8 @@ insertionBuffer.init(block.lir); } - CiValue fromLocation = interval.location(); - CiValue toLocation = canonicalSpillOpr(interval); + RiValue fromLocation = interval.location(); + RiValue toLocation = canonicalSpillOpr(interval); assert isRegister(fromLocation) : "from operand must be a register but is: " + fromLocation + " toLocation=" + toLocation + " spillState=" + interval.spillState(); assert isStackSlot(toLocation) : "to operand must be a stack slot"; @@ -582,7 +580,7 @@ void numberInstructions() { ValueProcedure setVariableProc = new ValueProcedure() { @Override - public CiValue doValue(CiValue value) { + public RiValue doValue(RiValue value) { if (isVariable(value)) { int variableIdx = asVariable(value).index; while (variables.size() <= variableIdx) { @@ -666,7 +664,7 @@ ValueProcedure useProc = new ValueProcedure() { @Override - protected CiValue doValue(CiValue operand) { + protected RiValue doValue(RiValue operand) { if (isVariable(operand)) { int operandNum = operandNumber(operand); if (!liveKill.get(operandNum)) { @@ -688,7 +686,7 @@ }; ValueProcedure stateProc = new ValueProcedure() { @Override - public CiValue doValue(CiValue operand) { + public RiValue doValue(RiValue operand) { int operandNum = operandNumber(operand); if (!liveKill.get(operandNum)) { liveGen.set(operandNum); @@ -701,7 +699,7 @@ }; ValueProcedure defProc = new ValueProcedure() { @Override - public CiValue doValue(CiValue operand) { + public RiValue doValue(RiValue operand) { if (isVariable(operand)) { int varNum = operandNumber(operand); liveKill.set(varNum); @@ -740,7 +738,7 @@ } // end of block iteration } - private void verifyTemp(BitMap liveKill, CiValue operand) { + private void verifyTemp(BitMap liveKill, RiValue operand) { // fixed intervals are never live at block boundaries, so // they need not be processed in live sets // process them only in debug mode so that this can be checked @@ -751,7 +749,7 @@ } } - private void verifyInput(Block block, BitMap liveKill, CiValue operand) { + private void verifyInput(Block block, BitMap liveKill, RiValue operand) { // fixed intervals are never live at block boundaries, so // they need not be processed in live sets. // this is checked by these assertions to be sure about it. @@ -859,7 +857,7 @@ // print some additional information to simplify debugging for (int operandNum = 0; operandNum < blockData.get(ir.cfg.getStartBlock()).liveIn.size(); operandNum++) { if (blockData.get(ir.cfg.getStartBlock()).liveIn.get(operandNum)) { - CiValue operand = operandFor(operandNum); + RiValue operand = operandFor(operandNum); TTY.println(" var %d; operand=%s; node=%s", operandNum, operand.toString(), gen.valueForOperand(operand)); for (int j = 0; j < numBlocks; j++) { @@ -872,7 +870,7 @@ if (info != null) { info.forEachState(new ValueProcedure() { @Override - public CiValue doValue(CiValue liveStateOperand) { + public RiValue doValue(RiValue liveStateOperand) { TTY.println(" operand=" + liveStateOperand); return liveStateOperand; } @@ -912,7 +910,7 @@ TTY.println(blockData.get(block).liveOut.toString()); } - void addUse(CiValue operand, int from, int to, RegisterPriority registerPriority, CiKind kind) { + void addUse(RiValue operand, int from, int to, RegisterPriority registerPriority, RiKind kind) { if (!isProcessed(operand)) { return; } @@ -925,7 +923,7 @@ interval = createInterval(operand); } - if (kind != CiKind.Illegal) { + if (kind != RiKind.Illegal) { interval.setKind(kind); } @@ -935,7 +933,7 @@ interval.addUsePos(to & ~1, registerPriority); } - void addTemp(CiValue operand, int tempPos, RegisterPriority registerPriority, CiKind kind) { + void addTemp(RiValue operand, int tempPos, RegisterPriority registerPriority, RiKind kind) { if (!isProcessed(operand)) { return; } @@ -947,7 +945,7 @@ interval = createInterval(operand); } - if (kind != CiKind.Illegal) { + if (kind != RiKind.Illegal) { interval.setKind(kind); } @@ -955,11 +953,11 @@ interval.addUsePos(tempPos, registerPriority); } - boolean isProcessed(CiValue operand) { + boolean isProcessed(RiValue operand) { return !isRegister(operand) || attributes(asRegister(operand)).isAllocatable; } - void addDef(CiValue operand, int defPos, RegisterPriority registerPriority, CiKind kind) { + void addDef(RiValue operand, int defPos, RegisterPriority registerPriority, RiKind kind) { if (!isProcessed(operand)) { return; } @@ -969,7 +967,7 @@ Interval interval = intervalFor(operand); if (interval != null) { - if (kind != CiKind.Illegal) { + if (kind != RiKind.Illegal) { interval.setKind(kind); } @@ -994,7 +992,7 @@ // Dead value - make vacuous interval // also add register priority for dead intervals interval = createInterval(operand); - if (kind != CiKind.Illegal) { + if (kind != RiKind.Illegal) { interval.setKind(kind); } @@ -1019,7 +1017,7 @@ static RegisterPriority registerPriorityOfOutputOperand(LIRInstruction op) { if (op instanceof MoveOp) { MoveOp move = (MoveOp) op; - if (isStackSlot(move.getInput()) && move.getInput().kind != CiKind.Object) { + if (isStackSlot(move.getInput()) && move.getInput().kind != RiKind.Object) { // method argument (condition must be equal to handleMethodArguments) return RegisterPriority.None; } @@ -1049,7 +1047,7 @@ void handleMethodArguments(LIRInstruction op) { if (op instanceof MoveOp) { MoveOp move = (MoveOp) op; - if (isStackSlot(move.getInput()) && move.getInput().kind != CiKind.Object) { + if (isStackSlot(move.getInput()) && move.getInput().kind != RiKind.Object) { CiStackSlot slot = (CiStackSlot) move.getInput(); if (GraalOptions.DetailedAsserts) { assert op.id() > 0 : "invalid id"; @@ -1068,12 +1066,12 @@ } } - void addRegisterHint(final LIRInstruction op, final CiValue targetValue, OperandMode mode, EnumSet<OperandFlag> flags) { + void addRegisterHint(final LIRInstruction op, final RiValue targetValue, OperandMode mode, EnumSet<OperandFlag> flags) { if (flags.contains(OperandFlag.RegisterHint) && isVariableOrRegister(targetValue)) { op.forEachRegisterHint(targetValue, mode, new ValueProcedure() { @Override - protected CiValue doValue(CiValue registerHint) { + protected RiValue doValue(RiValue registerHint) { if (isVariableOrRegister(registerHint)) { Interval from = intervalFor(registerHint); Interval to = intervalFor(targetValue); @@ -1112,12 +1110,12 @@ BitMap live = blockData.get(block).liveOut; for (int operandNum = live.nextSetBit(0); operandNum >= 0; operandNum = live.nextSetBit(operandNum + 1)) { assert live.get(operandNum) : "should not stop here otherwise"; - CiValue operand = operandFor(operandNum); + RiValue operand = operandFor(operandNum); if (GraalOptions.TraceLinearScanLevel >= 2) { TTY.println("live in %s to %d", operand, blockTo + 2); } - addUse(operand, blockFrom, blockTo + 2, RegisterPriority.None, CiKind.Illegal); + addUse(operand, blockFrom, blockTo + 2, RegisterPriority.None, RiKind.Illegal); // add special use positions for loop-end blocks when the // interval is used anywhere inside this loop. It's possible @@ -1140,7 +1138,7 @@ if (op.hasCall()) { for (CiRegister r : callerSaveRegs) { if (attributes(r).isAllocatable) { - addTemp(r.asValue(), opId, RegisterPriority.None, CiKind.Illegal); + addTemp(r.asValue(), opId, RegisterPriority.None, RiKind.Illegal); } } if (GraalOptions.TraceLinearScanLevel >= 4) { @@ -1150,7 +1148,7 @@ op.forEachOutput(new ValueProcedure() { @Override - public CiValue doValue(CiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { + public RiValue doValue(RiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { if (isVariableOrRegister(operand)) { addDef(operand, opId, registerPriorityOfOutputOperand(op), operand.kind.stackKind()); addRegisterHint(op, operand, mode, flags); @@ -1160,7 +1158,7 @@ }); op.forEachTemp(new ValueProcedure() { @Override - public CiValue doValue(CiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { + public RiValue doValue(RiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { if (isVariableOrRegister(operand)) { addTemp(operand, opId, RegisterPriority.MustHaveRegister, operand.kind.stackKind()); addRegisterHint(op, operand, mode, flags); @@ -1170,7 +1168,7 @@ }); op.forEachAlive(new ValueProcedure() { @Override - public CiValue doValue(CiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { + public RiValue doValue(RiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { if (isVariableOrRegister(operand)) { RegisterPriority p = registerPriorityOfInputOperand(flags); addUse(operand, blockFrom, opId + 1, p, operand.kind.stackKind()); @@ -1181,7 +1179,7 @@ }); op.forEachInput(new ValueProcedure() { @Override - public CiValue doValue(CiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { + public RiValue doValue(RiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { if (isVariableOrRegister(operand)) { RegisterPriority p = registerPriorityOfInputOperand(flags); addUse(operand, blockFrom, opId, p, operand.kind.stackKind()); @@ -1197,7 +1195,7 @@ // to a call site, the value would be in a register at the call otherwise) op.forEachState(new ValueProcedure() { @Override - public CiValue doValue(CiValue operand) { + public RiValue doValue(RiValue operand) { addUse(operand, blockFrom, opId + 1, RegisterPriority.None, operand.kind.stackKind()); return operand; } @@ -1398,21 +1396,21 @@ throw new CiBailout("LinearScan: interval is null"); } - Interval intervalAtBlockBegin(Block block, CiValue operand) { + Interval intervalAtBlockBegin(Block block, RiValue operand) { assert isVariable(operand) : "register number out of bounds"; assert intervalFor(operand) != null : "no interval found"; return splitChildAtOpId(intervalFor(operand), block.getFirstLirInstructionId(), LIRInstruction.OperandMode.Output); } - Interval intervalAtBlockEnd(Block block, CiValue operand) { + Interval intervalAtBlockEnd(Block block, RiValue operand) { assert isVariable(operand) : "register number out of bounds"; assert intervalFor(operand) != null : "no interval found"; return splitChildAtOpId(intervalFor(operand), block.getLastLirInstructionId() + 1, LIRInstruction.OperandMode.Output); } - Interval intervalAtOpId(CiValue operand, int opId) { + Interval intervalAtOpId(RiValue operand, int opId) { assert isVariable(operand) : "register number out of bounds"; assert intervalFor(operand) != null : "no interval found"; @@ -1430,7 +1428,7 @@ assert operandNum < numOperands : "live information set for not exisiting interval"; assert blockData.get(fromBlock).liveOut.get(operandNum) && blockData.get(toBlock).liveIn.get(operandNum) : "interval not live at this edge"; - CiValue liveOperand = operandFor(operandNum); + RiValue liveOperand = operandFor(operandNum); Interval fromInterval = intervalAtBlockEnd(fromBlock, liveOperand); Interval toInterval = intervalAtBlockBegin(toBlock, liveOperand); @@ -1551,8 +1549,8 @@ // * Phase 7: assign register numbers back to LIR // (includes computation of debug information and oop maps) - boolean verifyAssignedLocation(Interval interval, CiValue location) { - CiKind kind = interval.kind(); + boolean verifyAssignedLocation(Interval interval, RiValue location) { + RiKind kind = interval.kind(); assert isRegister(location) || isStackSlot(location); @@ -1607,7 +1605,7 @@ * @param mode the usage mode for {@code operand} by the instruction * @return the location assigned for the operand */ - private CiValue colorLirOperand(Variable operand, int opId, OperandMode mode) { + private RiValue colorLirOperand(Variable operand, int opId, OperandMode mode) { Interval interval = intervalFor(operand); assert interval != null : "interval must exist"; @@ -1645,13 +1643,13 @@ // intervals that have no oops inside need not to be processed. // to ensure a walking until the last instruction id, add a dummy interval // with a high operation id - nonOopIntervals = new Interval(CiValue.IllegalValue, -1); + nonOopIntervals = new Interval(RiValue.IllegalValue, -1); nonOopIntervals.addRange(Integer.MAX_VALUE - 2, Integer.MAX_VALUE - 1); return new IntervalWalker(this, oopIntervals, nonOopIntervals); } - void computeOopMap(IntervalWalker iw, LIRInstruction op, CiBitMap registerRefMap, CiBitMap frameRefMap) { + void computeOopMap(IntervalWalker iw, LIRInstruction op, RiBitMap registerRefMap, RiBitMap frameRefMap) { if (GraalOptions.TraceLinearScanLevel >= 3) { TTY.println("creating oop map at opId %d", op.id()); } @@ -1663,7 +1661,7 @@ // Iterate through active intervals for (Interval interval = iw.activeLists.get(RegisterBinding.Fixed); interval != Interval.EndMarker; interval = interval.next) { - CiValue operand = interval.operand; + RiValue operand = interval.operand; assert interval.currentFrom() <= op.id() && op.id() <= interval.currentTo() : "interval should not be active otherwise"; assert isVariable(interval.operand) : "fixed interval found"; @@ -1692,7 +1690,7 @@ } } - private boolean isCallerSave(CiValue operand) { + private boolean isCallerSave(RiValue operand) { return attributes(asRegister(operand)).isCallerSave; } @@ -1711,13 +1709,13 @@ private void computeDebugInfo(IntervalWalker iw, final LIRInstruction op, LIRDebugInfo info) { - CiBitMap registerRefMap = op.hasCall() ? null : frameMap.initRegisterRefMap(); - CiBitMap frameRefMap = frameMap.initFrameRefMap(); + RiBitMap registerRefMap = op.hasCall() ? null : frameMap.initRegisterRefMap(); + RiBitMap frameRefMap = frameMap.initFrameRefMap(); computeOopMap(iw, op, registerRefMap, frameRefMap); info.forEachState(new ValueProcedure() { @Override - public CiValue doValue(CiValue operand) { + public RiValue doValue(RiValue operand) { int tempOpId = op.id(); OperandMode mode = OperandMode.Input; Block block = blockForId(tempOpId); @@ -1739,7 +1737,7 @@ // Get current location of operand // The operand must be live because debug information is considered when building the intervals // if the interval is not live, colorLirOperand will cause an assert on failure - CiValue result = colorLirOperand((Variable) operand, tempOpId, mode); + RiValue result = colorLirOperand((Variable) operand, tempOpId, mode); assert !hasCall(tempOpId) || isStackSlot(result) || !isCallerSave(result) : "cannot have caller-save register operands at calls"; return result; } @@ -1761,7 +1759,7 @@ ValueProcedure assignProc = new ValueProcedure() { @Override - public CiValue doValue(CiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { + public RiValue doValue(RiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { if (isVariable(operand)) { return colorLirOperand((Variable) operand, op.id(), mode); } @@ -1954,7 +1952,7 @@ throw new GraalInternalError(""); } - if (isVariable(i1.operand) && i1.kind() == CiKind.Illegal) { + if (isVariable(i1.operand) && i1.kind() == RiKind.Illegal) { TTY.println("Interval %d has no type assigned", i1.operandNumber); TTY.println(i1.logString(this)); throw new GraalInternalError(""); @@ -2000,8 +1998,8 @@ if (i2.from() == 1 && i2.to() == 2) { continue; } - CiValue l1 = i1.location(); - CiValue l2 = i2.location(); + RiValue l1 = i1.location(); + RiValue l2 = i2.location(); if (i1.intersects(i2) && (l1.equals(l2))) { if (GraalOptions.DetailedAsserts) { TTY.println("Intervals %d and %d overlap and have the same register assigned", i1.operandNumber, i2.operandNumber); @@ -2019,7 +2017,7 @@ Interval curInterval; @Override - protected CiValue doValue(CiValue operand) { + protected RiValue doValue(RiValue operand) { if (isRegister(operand)) { if (intervalFor(operand) == curInterval) { ok = true; @@ -2037,7 +2035,7 @@ fixedIntervals = createUnhandledLists(IS_PRECOLORED_INTERVAL, null).first; // to ensure a walking until the last instruction id, add a dummy interval // with a high operation id - otherIntervals = new Interval(CiValue.IllegalValue, -1); + otherIntervals = new Interval(RiValue.IllegalValue, -1); otherIntervals.addRange(Integer.MAX_VALUE - 2, Integer.MAX_VALUE - 1); IntervalWalker iw = new IntervalWalker(this, fixedIntervals, otherIntervals); @@ -2090,7 +2088,7 @@ if (GraalOptions.TraceLinearScanLevel >= 4) { TTY.println("checking interval %d of block B%d", operandNum, block.getId()); } - CiValue operand = operandFor(operandNum); + RiValue operand = operandFor(operandNum); assert isVariable(operand) : "value must have variable operand"; // TKR assert value.asConstant() == null || value.isPinned() : // "only pinned constants can be alive accross block boundaries";
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScanWalker.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScanWalker.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.compiler.alloc; -import static com.oracle.max.cri.ci.CiUtil.*; import static com.oracle.graal.alloc.util.LocationUtil.*; +import static com.oracle.graal.api.code.CiUtil.*; import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiRegister.RegisterFlag; import com.oracle.max.criutils.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiRegister.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.alloc.Interval.RegisterBinding; import com.oracle.graal.compiler.alloc.Interval.RegisterPriority; @@ -94,7 +95,7 @@ } void excludeFromUse(Interval i) { - CiValue location = i.location(); + RiValue location = i.location(); int i1 = asRegister(location).number; if (i1 >= availableRegs[0].number && i1 <= availableRegs[availableRegs.length - 1].number) { usePos[i1] = 0; @@ -674,7 +675,7 @@ return true; } - CiRegister findLockedRegister(int regNeededUntil, int intervalTo, CiValue ignoreReg, boolean[] needSplit) { + CiRegister findLockedRegister(int regNeededUntil, int intervalTo, RiValue ignoreReg, boolean[] needSplit) { int maxReg = -1; CiRegister ignore = isRegister(ignoreReg) ? asRegister(ignoreReg) : null; @@ -905,7 +906,7 @@ TTY.println(" splitParent: %s, insertMoveWhenActivated: %b", interval.splitParent().operandNumber, interval.insertMoveWhenActivated()); } - final CiValue operand = interval.operand; + final RiValue operand = interval.operand; if (interval.location() != null && isStackSlot(interval.location())) { // activating an interval that has a stack slot assigned . split it at first use position // used for method parameters
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/MoveResolver.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/MoveResolver.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.compiler.alloc; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; -import com.oracle.max.cri.ci.*; import com.oracle.max.criutils.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.lir.*; @@ -41,7 +42,7 @@ private LIRInsertionBuffer insertionBuffer; // buffer where moves are inserted private final List<Interval> mappingFrom; - private final List<CiValue> mappingFromOpr; + private final List<RiValue> mappingFromOpr; private final List<Interval> mappingTo; private boolean multipleReadsAllowed; private final int[] registerBlocked; @@ -106,7 +107,7 @@ } } - HashSet<CiValue> usedRegs = new HashSet<>(); + HashSet<RiValue> usedRegs = new HashSet<>(); if (!multipleReadsAllowed) { for (i = 0; i < mappingFrom.size(); i++) { Interval interval = mappingFrom.get(i); @@ -141,7 +142,7 @@ // mark assignedReg and assignedRegHi of the interval as blocked private void blockRegisters(Interval interval) { - CiValue location = interval.location(); + RiValue location = interval.location(); if (isRegister(location)) { int reg = asRegister(location).number; assert multipleReadsAllowed || registerBlocked(reg) == 0 : "register already marked as used"; @@ -151,7 +152,7 @@ // mark assignedReg and assignedRegHi of the interval as unblocked private void unblockRegisters(Interval interval) { - CiValue location = interval.location(); + RiValue location = interval.location(); if (isRegister(location)) { int reg = asRegister(location).number; assert registerBlocked(reg) > 0 : "register already marked as unused"; @@ -164,9 +165,9 @@ * or is only blocked by {@code from}. */ private boolean safeToProcessMove(Interval from, Interval to) { - CiValue fromReg = from != null ? from.location() : null; + RiValue fromReg = from != null ? from.location() : null; - CiValue reg = to.location(); + RiValue reg = to.location(); if (isRegister(reg)) { if (registerBlocked(asRegister(reg).number) > 1 || (registerBlocked(asRegister(reg).number) == 1 && reg != fromReg)) { return false; @@ -195,8 +196,8 @@ assert fromInterval.kind() == toInterval.kind() : "move between different types"; assert insertIdx != -1 : "must setup insert position first"; - CiValue fromOpr = fromInterval.operand; - CiValue toOpr = toInterval.operand; + RiValue fromOpr = fromInterval.operand; + RiValue toOpr = toInterval.operand; insertionBuffer.append(insertIdx, allocator.ir.spillMoveFactory.createMove(toOpr, fromOpr)); @@ -205,11 +206,11 @@ } } - private void insertMove(CiValue fromOpr, Interval toInterval) { + private void insertMove(RiValue fromOpr, Interval toInterval) { assert fromOpr.kind == toInterval.kind() : "move between different types"; assert insertIdx != -1 : "must setup insert position first"; - CiValue toOpr = toInterval.operand; + RiValue toOpr = toInterval.operand; insertionBuffer.append(insertIdx, allocator.ir.spillMoveFactory.createMove(toOpr, fromOpr)); if (GraalOptions.TraceLinearScanLevel >= 4) { @@ -332,11 +333,11 @@ assert fromInterval.operand != toInterval.operand : "from and to interval equal: " + fromInterval; assert fromInterval.kind() == toInterval.kind(); mappingFrom.add(fromInterval); - mappingFromOpr.add(CiValue.IllegalValue); + mappingFromOpr.add(RiValue.IllegalValue); mappingTo.add(toInterval); } - void addMapping(CiValue fromOpr, Interval toInterval) { + void addMapping(RiValue fromOpr, Interval toInterval) { if (GraalOptions.TraceLinearScanLevel >= 4) { TTY.println("MoveResolver: adding mapping from %s to %d (%s)", fromOpr, toInterval.operandNumber, toInterval.location()); }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/RegisterVerifier.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/RegisterVerifier.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.compiler.alloc; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; -import com.oracle.max.cri.ci.*; import com.oracle.max.criutils.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.util.*; import com.oracle.graal.graph.*; @@ -44,7 +45,7 @@ ArrayMap<Interval[]> savedStates; // saved information of previous check // simplified access to methods of LinearScan - Interval intervalAt(CiValue operand) { + Interval intervalAt(RiValue operand) { return allocator.intervalFor(operand); } @@ -177,7 +178,7 @@ return inputState.clone(); } - static void statePut(Interval[] inputState, CiValue location, Interval interval) { + static void statePut(Interval[] inputState, RiValue location, Interval interval) { if (location != null && isRegister(location)) { CiRegister reg = asRegister(location); int regNum = reg.number; @@ -195,7 +196,7 @@ } } - static boolean checkState(Interval[] inputState, CiValue reg, Interval interval) { + static boolean checkState(Interval[] inputState, RiValue reg, Interval interval) { if (reg != null && isRegister(reg)) { if (inputState[asRegister(reg).number] != interval) { throw new GraalInternalError("!! Error in register allocation: register %s does not contain interval %s but interval %s", reg, interval.operand, inputState[asRegister(reg).number]); @@ -215,7 +216,7 @@ ValueProcedure useProc = new ValueProcedure() { @Override - public CiValue doValue(CiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { + public RiValue doValue(RiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { if (LinearScan.isVariableOrRegister(operand) && allocator.isProcessed(operand)) { Interval interval = intervalAt(operand); if (op.id() != -1) { @@ -230,7 +231,7 @@ ValueProcedure defProc = new ValueProcedure() { @Override - public CiValue doValue(CiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { + public RiValue doValue(RiValue operand, OperandMode mode, EnumSet<OperandFlag> flags) { if (LinearScan.isVariableOrRegister(operand) && allocator.isProcessed(operand)) { Interval interval = intervalAt(operand); if (op.id() != -1) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,7 +25,8 @@ import java.util.*; import java.util.Map.Entry; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.gen.LIRGenerator.LockScope; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; @@ -35,9 +36,9 @@ import com.oracle.graal.nodes.virtual.*; public class DebugInfoBuilder { - private final NodeMap<CiValue> nodeOperands; + private final NodeMap<RiValue> nodeOperands; - public DebugInfoBuilder(NodeMap<CiValue> nodeOperands) { + public DebugInfoBuilder(NodeMap<RiValue> nodeOperands) { this.nodeOperands = nodeOperands; } @@ -80,9 +81,9 @@ VirtualObjectNode vobj = entry.getKey(); if (vobj instanceof BoxedVirtualObjectNode) { BoxedVirtualObjectNode boxedVirtualObjectNode = (BoxedVirtualObjectNode) vobj; - entry.getValue().setValues(new CiValue[]{toCiValue(boxedVirtualObjectNode.getUnboxedValue())}); + entry.getValue().setValues(new RiValue[]{toCiValue(boxedVirtualObjectNode.getUnboxedValue())}); } else { - CiValue[] values = new CiValue[vobj.fieldsCount()]; + RiValue[] values = new RiValue[vobj.fieldsCount()]; entry.getValue().setValues(values); if (values.length > 0) { changed = true; @@ -118,7 +119,7 @@ int numStack = state.stackSize(); int numLocks = (locks != null && locks.callerState == state.outerFrameState()) ? locks.stateDepth + 1 : 0; - CiValue[] values = new CiValue[numLocals + numStack + numLocks]; + RiValue[] values = new RiValue[numLocals + numStack + numLocks]; for (int i = 0; i < numLocals; i++) { values[i] = toCiValue(state.localAt(i)); } @@ -130,8 +131,8 @@ for (int i = numLocks - 1; i >= 0; i--) { assert locks != null && nextLock.callerState == state.outerFrameState() && nextLock.stateDepth == i; - CiValue owner = toCiValue(nextLock.monitor.object()); - CiValue lockData = nextLock.lockData; + RiValue owner = toCiValue(nextLock.monitor.object()); + RiValue lockData = nextLock.lockData; boolean eliminated = nextLock.monitor.eliminated(); values[numLocals + numStack + nextLock.stateDepth] = new CiMonitorValue(owner, lockData, eliminated); @@ -151,7 +152,7 @@ return frame; } - private CiValue toCiValue(ValueNode value) { + private RiValue toCiValue(ValueNode value) { if (value instanceof VirtualObjectNode) { VirtualObjectNode obj = (VirtualObjectNode) value; CiVirtualObject ciObj = virtualObjects.get(value); @@ -168,14 +169,14 @@ } else if (value != null) { Debug.metric("StateVariables").increment(); - CiValue operand = nodeOperands.get(value); - assert operand != null && (operand instanceof Variable || operand instanceof CiConstant); + RiValue operand = nodeOperands.get(value); + assert operand != null && (operand instanceof Variable || operand instanceof RiConstant); return operand; } else { // return a dummy value because real value not needed Debug.metric("StateIllegals").increment(); - return CiValue.IllegalValue; + return RiValue.IllegalValue; } } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,13 +22,17 @@ */ package com.oracle.graal.compiler.gen; +import static com.oracle.graal.api.code.CiCallingConvention.Type.*; +import static com.oracle.graal.api.meta.RiValue.*; import static com.oracle.graal.lir.ValueUtil.*; -import static com.oracle.max.cri.ci.CiCallingConvention.Type.*; -import static com.oracle.max.cri.ci.CiValue.*; import java.util.*; import java.util.Map.Entry; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiTargetMethod.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiType.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.util.*; import com.oracle.graal.debug.*; @@ -49,10 +53,6 @@ import com.oracle.graal.nodes.type.*; import com.oracle.graal.nodes.virtual.*; import com.oracle.max.asm.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiTargetMethod.Mark; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiType.Representation; import com.oracle.max.cri.xir.CiXirAssembler.XirConstant; import com.oracle.max.cri.xir.CiXirAssembler.XirInstruction; import com.oracle.max.cri.xir.CiXirAssembler.XirMark; @@ -72,7 +72,7 @@ protected final CiTarget target; protected final RiResolvedMethod method; protected final FrameMap frameMap; - public final NodeMap<CiValue> nodeOperands; + public final NodeMap<RiValue> nodeOperands; protected final LIR lir; protected final XirSupport xirSupport; @@ -168,15 +168,15 @@ * @param node A node that produces a result value. */ @Override - public CiValue operand(ValueNode node) { + public RiValue operand(ValueNode node) { if (nodeOperands == null) { return null; } return nodeOperands.get(node); } - public ValueNode valueForOperand(CiValue value) { - for (Entry<Node, CiValue> entry : nodeOperands.entries()) { + public ValueNode valueForOperand(RiValue value) { + for (Entry<Node, RiValue> entry : nodeOperands.entries()) { if (entry.getValue() == value) { return (ValueNode) entry.getKey(); } @@ -190,8 +190,8 @@ * @return a new variable */ @Override - public Variable newVariable(CiKind kind) { - CiKind stackKind = kind.stackKind(); + public Variable newVariable(RiKind kind) { + RiKind stackKind = kind.stackKind(); switch (stackKind) { case Jsr: case Int: @@ -207,7 +207,7 @@ } @Override - public CiValue setResult(ValueNode x, CiValue operand) { + public RiValue setResult(ValueNode x, RiValue operand) { assert (isVariable(operand) && x.kind() == operand.kind) || (isConstant(operand) && x.kind() == operand.kind.stackKind()) : operand.kind + " for node " + x; assert operand(x) == null : "operand cannot be set twice"; @@ -219,27 +219,27 @@ } @Override - public abstract Variable emitMove(CiValue input); + public abstract Variable emitMove(RiValue input); - public Variable load(CiValue value) { + public Variable load(RiValue value) { if (!isVariable(value)) { return emitMove(value); } return (Variable) value; } - public CiValue loadNonConst(CiValue value) { - if (isConstant(value) && !canInlineConstant((CiConstant) value)) { + public RiValue loadNonConst(RiValue value) { + if (isConstant(value) && !canInlineConstant((RiConstant) value)) { return emitMove(value); } return value; } - public CiValue loadForStore(CiValue value, CiKind storeKind) { - if (isConstant(value) && canStoreConstant((CiConstant) value)) { + public RiValue loadForStore(RiValue value, RiKind storeKind) { + if (isConstant(value) && canStoreConstant((RiConstant) value)) { return value; } - if (storeKind == CiKind.Byte || storeKind == CiKind.Boolean) { + if (storeKind == RiKind.Byte || storeKind == RiKind.Boolean) { Variable tempVar = new Variable(value.kind, lir.nextVariable(), CiRegister.RegisterFlag.Byte); emitMove(value, tempVar); return tempVar; @@ -279,8 +279,8 @@ * @param kind the kind of value being returned * @return the operand representing the ABI defined location used return a value of kind {@code kind} */ - public CiValue resultOperandFor(CiKind kind) { - if (kind == CiKind.Void) { + public RiValue resultOperandFor(RiKind kind) { + if (kind == RiKind.Void) { return IllegalValue; } return frameMap.registerConfig.getReturnRegister(kind).asValue(kind); @@ -316,12 +316,12 @@ MergeNode merge = (MergeNode) block.getBeginNode(); for (PhiNode phi : merge.phis()) { if (phi.type() == PhiType.Value) { - CiValue phiValue = newVariable(phi.kind()); + RiValue phiValue = newVariable(phi.kind()); setResult(phi, phiValue); phiValues.add(phiValue); } } - append(new PhiLabelOp(new Label(), block.align, phiValues.toArray(new CiValue[phiValues.size()]))); + append(new PhiLabelOp(new Label(), block.align, phiValues.toArray(new RiValue[phiValues.size()]))); phiValues.clear(); } else { append(new LabelOp(new Label(), block.align)); @@ -505,7 +505,7 @@ protected void emitPrologue() { CiCallingConvention incomingArguments = frameMap.registerConfig.getCallingConvention(JavaCallee, CiUtil.signatureToKinds(method), target, false); - CiValue[] params = new CiValue[incomingArguments.locations.length]; + RiValue[] params = new RiValue[incomingArguments.locations.length]; for (int i = 0; i < params.length; i++) { params[i] = toStackKind(incomingArguments.locations[i]); if (CiValueUtil.isStackSlot(params[i])) { @@ -519,7 +519,7 @@ append(new ParametersOp(params)); for (LocalNode local : graph.getNodes(LocalNode.class)) { - CiValue param = params[local.index()]; + RiValue param = params[local.index()]; assert param.kind == local.kind().stackKind(); setResult(local, emitMove(param)); } @@ -593,7 +593,7 @@ @Override public void visitNewObjectArray(NewObjectArrayNode x) { XirArgument length = toXirArgument(x.length()); - XirSnippet snippet = xir.genNewArray(site(x), length, CiKind.Object, x.elementType(), x.elementType().arrayOf()); + XirSnippet snippet = xir.genNewArray(site(x), length, RiKind.Object, x.elementType(), x.elementType().arrayOf()); emitXir(snippet, x, state(), true); } @@ -609,7 +609,7 @@ @Override public void visitReturn(ReturnNode x) { - CiValue operand = CiValue.IllegalValue; + RiValue operand = RiValue.IllegalValue; if (!x.kind().isVoid()) { operand = resultOperandFor(x.kind()); emitMove(operand(x.result()), operand); @@ -617,7 +617,7 @@ emitReturn(operand); } - protected abstract void emitReturn(CiValue input); + protected abstract void emitReturn(RiValue input); @Override public void visitMerge(MergeNode x) { @@ -635,7 +635,7 @@ public void visitLoopEnd(LoopEndNode x) { } - private ArrayList<CiValue> phiValues = new ArrayList<>(); + private ArrayList<RiValue> phiValues = new ArrayList<>(); private void moveToPhi(MergeNode merge, EndNode pred) { if (GraalOptions.AllocSSA) { @@ -645,7 +645,7 @@ phiValues.add(operand(phi.valueAt(pred))); } } - append(new PhiJumpOp(getLIRBlock(merge), phiValues.toArray(new CiValue[phiValues.size()]))); + append(new PhiJumpOp(getLIRBlock(merge), phiValues.toArray(new RiValue[phiValues.size()]))); phiValues.clear(); return; } @@ -665,9 +665,9 @@ append(new JumpOp(getLIRBlock(merge), null)); } - private CiValue operandForPhi(PhiNode phi) { + private RiValue operandForPhi(PhiNode phi) { assert phi.type() == PhiType.Value : "wrong phi type: " + phi; - CiValue result = operand(phi); + RiValue result = operand(phi); if (result == null) { // allocate a variable for this phi Variable newOperand = newVariable(phi.kind()); @@ -685,7 +685,7 @@ } @Override - public void emitGuardCheck(BooleanNode comp, RiDeoptReason deoptReason, RiDeoptAction action, boolean negated, long leafGraphId) { + public void emitGuardCheck(BooleanNode comp, RiDeoptReason deoptReason, CiDeoptAction action, boolean negated, long leafGraphId) { if (comp instanceof IsNullNode && negated) { emitNullCheckGuard(((IsNullNode) comp).object(), leafGraphId); } else if (comp instanceof ConstantNode && (comp.asConstant().asBoolean() != negated)) { @@ -723,12 +723,12 @@ private void emitNullCheckBranch(IsNullNode node, LabelRef trueSuccessor, LabelRef falseSuccessor, LIRDebugInfo info) { if (falseSuccessor != null) { - emitBranch(operand(node.object()), CiConstant.NULL_OBJECT, Condition.NE, false, falseSuccessor, info); + emitBranch(operand(node.object()), RiConstant.NULL_OBJECT, Condition.NE, false, falseSuccessor, info); if (trueSuccessor != null) { emitJump(trueSuccessor, null); } } else { - emitBranch(operand(node.object()), CiConstant.NULL_OBJECT, Condition.EQ, false, trueSuccessor, info); + emitBranch(operand(node.object()), RiConstant.NULL_OBJECT, Condition.EQ, false, trueSuccessor, info); } } @@ -768,12 +768,12 @@ @Override public void emitConditional(ConditionalNode conditional) { - CiValue tVal = operand(conditional.trueValue()); - CiValue fVal = operand(conditional.falseValue()); + RiValue tVal = operand(conditional.trueValue()); + RiValue fVal = operand(conditional.falseValue()); setResult(conditional, emitConditional(conditional.condition(), tVal, fVal)); } - public Variable emitConditional(BooleanNode node, CiValue trueValue, CiValue falseValue) { + public Variable emitConditional(BooleanNode node, RiValue trueValue, RiValue falseValue) { if (node instanceof IsNullNode) { return emitNullCheckConditional((IsNullNode) node, trueValue, falseValue); } else if (node instanceof CompareNode) { @@ -787,11 +787,11 @@ } } - private Variable emitNullCheckConditional(IsNullNode node, CiValue trueValue, CiValue falseValue) { - return emitCMove(operand(node.object()), CiConstant.NULL_OBJECT, Condition.EQ, false, trueValue, falseValue); + private Variable emitNullCheckConditional(IsNullNode node, RiValue trueValue, RiValue falseValue) { + return emitCMove(operand(node.object()), RiConstant.NULL_OBJECT, Condition.EQ, false, trueValue, falseValue); } - private Variable emitInstanceOfConditional(InstanceOfNode x, CiValue trueValue, CiValue falseValue) { + private Variable emitInstanceOfConditional(InstanceOfNode x, RiValue trueValue, RiValue falseValue) { XirArgument obj = toXirArgument(x.object()); XirArgument trueArg = toXirArgument(trueValue); XirArgument falseArg = toXirArgument(falseValue); @@ -799,19 +799,19 @@ return (Variable) emitXir(snippet, null, null, false); } - private Variable emitConstantConditional(boolean value, CiValue trueValue, CiValue falseValue) { + private Variable emitConstantConditional(boolean value, RiValue trueValue, RiValue falseValue) { return emitMove(value ? trueValue : falseValue); } - private Variable emitCompareConditional(CompareNode compare, CiValue trueValue, CiValue falseValue) { + private Variable emitCompareConditional(CompareNode compare, RiValue trueValue, RiValue falseValue) { return emitCMove(operand(compare.x()), operand(compare.y()), compare.condition(), compare.unorderedIsTrue(), trueValue, falseValue); } public abstract void emitLabel(Label label, boolean align); public abstract void emitJump(LabelRef label, LIRDebugInfo info); - public abstract void emitBranch(CiValue left, CiValue right, Condition cond, boolean unorderedIsTrue, LabelRef label, LIRDebugInfo info); - public abstract Variable emitCMove(CiValue leftVal, CiValue right, Condition cond, boolean unorderedIsTrue, CiValue trueValue, CiValue falseValue); + public abstract void emitBranch(RiValue left, RiValue right, Condition cond, boolean unorderedIsTrue, LabelRef label, LIRDebugInfo info); + public abstract Variable emitCMove(RiValue leftVal, RiValue right, Condition cond, boolean unorderedIsTrue, RiValue trueValue, RiValue falseValue); protected FrameState stateBeforeCallWithArguments(FrameState stateAfter, MethodCallTargetNode call, int bci) { return stateAfter.duplicateModified(bci, stateAfter.rethrowException(), call.returnKind(), toJVMArgumentStack(call.targetMethod().signature(), call.isStatic(), call.arguments())); @@ -827,7 +827,7 @@ if (stackIndex == 0 && !isStatic) { // Current argument is receiver. - stackIndex += stackSlots(CiKind.Object); + stackIndex += stackSlots(RiKind.Object); } else { stackIndex += stackSlots(signature.argumentKindAt(argumentIndex, false)); argumentIndex++; @@ -837,13 +837,13 @@ } - public static int stackSlots(CiKind kind) { + public static int stackSlots(RiKind kind) { return isTwoSlot(kind) ? 2 : 1; } - public static boolean isTwoSlot(CiKind kind) { - assert kind != CiKind.Void && kind != CiKind.Illegal; - return kind == CiKind.Long || kind == CiKind.Double; + public static boolean isTwoSlot(RiKind kind) { + assert kind != RiKind.Void && kind != RiKind.Illegal; + return kind == RiKind.Long || kind == RiKind.Double; } @Override @@ -862,18 +862,18 @@ snippet = xir.genInvokeSpecial(site(x.node(), callTarget.receiver()), receiver, targetMethod); break; case Virtual: - assert callTarget.receiver().kind() == CiKind.Object : callTarget + ": " + callTarget.targetMethod().toString(); + assert callTarget.receiver().kind() == RiKind.Object : callTarget + ": " + callTarget.targetMethod().toString(); receiver = toXirArgument(callTarget.receiver()); snippet = xir.genInvokeVirtual(site(x.node(), callTarget.receiver()), receiver, targetMethod, x.isMegamorphic()); break; case Interface: - assert callTarget.receiver().kind() == CiKind.Object : callTarget; + assert callTarget.receiver().kind() == RiKind.Object : callTarget; receiver = toXirArgument(callTarget.receiver()); snippet = xir.genInvokeInterface(site(x.node(), callTarget.receiver()), receiver, targetMethod); break; } - CiValue destinationAddress = null; + RiValue destinationAddress = null; if (!target().invokeSnippetAfterArguments) { // This is the version currently necessary for Maxine: since the invokeinterface-snippet uses a division, it // destroys rdx, which is also used to pass a parameter. Therefore, the snippet must be before the parameters are assigned to their locations. @@ -881,12 +881,12 @@ destinationAddress = emitXir(snippet, x.node(), addrInfo, false); } - CiValue resultOperand = resultOperandFor(x.node().kind()); + RiValue resultOperand = resultOperandFor(x.node().kind()); - CiKind[] signature = CiUtil.signatureToKinds(callTarget.targetMethod().signature(), callTarget.isStatic() ? null : callTarget.targetMethod().holder().kind(true)); + RiKind[] signature = CiUtil.signatureToKinds(callTarget.targetMethod().signature(), callTarget.isStatic() ? null : callTarget.targetMethod().holder().kind(true)); CiCallingConvention cc = frameMap.registerConfig.getCallingConvention(JavaCall, signature, target(), false); frameMap.callsMethod(cc, JavaCall); - List<CiValue> argList = visitInvokeArguments(cc, callTarget.arguments()); + List<RiValue> argList = visitInvokeArguments(cc, callTarget.arguments()); if (target().invokeSnippetAfterArguments) { // This is the version currently active for HotSpot. @@ -902,10 +902,10 @@ } } - protected abstract void emitCall(Object targetMethod, CiValue result, List<CiValue> arguments, CiValue targetAddress, LIRDebugInfo info, Map<XirMark, Mark> marks); + protected abstract void emitCall(Object targetMethod, RiValue result, List<RiValue> arguments, RiValue targetAddress, LIRDebugInfo info, Map<XirMark, Mark> marks); - private static CiValue toStackKind(CiValue value) { + private static RiValue toStackKind(RiValue value) { if (value.kind.stackKind() != value.kind) { // We only have stack-kinds in the LIR, so convert the operand kind for values from the calling convention. if (isRegister(value)) { @@ -919,13 +919,13 @@ return value; } - public List<CiValue> visitInvokeArguments(CiCallingConvention cc, Iterable<ValueNode> arguments) { + public List<RiValue> visitInvokeArguments(CiCallingConvention cc, Iterable<ValueNode> arguments) { // for each argument, load it into the correct location - List<CiValue> argList = new ArrayList<>(); + List<RiValue> argList = new ArrayList<>(); int j = 0; for (ValueNode arg : arguments) { if (arg != null) { - CiValue operand = toStackKind(cc.locations[j++]); + RiValue operand = toStackKind(cc.locations[j++]); emitMove(operand(arg), operand); argList.add(operand); @@ -937,23 +937,23 @@ } - protected abstract LabelRef createDeoptStub(RiDeoptAction action, RiDeoptReason reason, LIRDebugInfo info, Object deoptInfo); + protected abstract LabelRef createDeoptStub(CiDeoptAction action, RiDeoptReason reason, LIRDebugInfo info, Object deoptInfo); @Override - public Variable emitCall(@SuppressWarnings("hiding") Object target, CiKind result, CiKind[] arguments, boolean canTrap, CiValue... args) { + public Variable emitCall(@SuppressWarnings("hiding") Object target, RiKind result, RiKind[] arguments, boolean canTrap, RiValue... args) { LIRDebugInfo info = canTrap ? state() : null; - CiValue physReg = resultOperandFor(result); + RiValue physReg = resultOperandFor(result); - List<CiValue> argumentList; + List<RiValue> argumentList; if (arguments.length > 0) { // move the arguments into the correct location CiCallingConvention cc = frameMap.registerConfig.getCallingConvention(RuntimeCall, arguments, target(), false); frameMap.callsMethod(cc, RuntimeCall); assert cc.locations.length == args.length : "argument count mismatch"; for (int i = 0; i < args.length; i++) { - CiValue arg = args[i]; - CiValue loc = cc.locations[i]; + RiValue arg = args[i]; + RiValue loc = cc.locations[i]; emitMove(arg, loc); } argumentList = Arrays.asList(cc.locations); @@ -963,7 +963,7 @@ argumentList = Collections.emptyList(); } - emitCall(target, physReg, argumentList, CiConstant.forLong(0), info, null); + emitCall(target, physReg, argumentList, RiConstant.forLong(0), info, null); if (isLegal(physReg)) { return emitMove(physReg); @@ -976,10 +976,10 @@ public void emitRuntimeCall(RuntimeCallNode x) { // TODO Merge with emitCallToRuntime() method above. - CiValue resultOperand = resultOperandFor(x.kind()); + RiValue resultOperand = resultOperandFor(x.kind()); CiCallingConvention cc = frameMap.registerConfig.getCallingConvention(RuntimeCall, x.call().arguments, target(), false); frameMap.callsMethod(cc, RuntimeCall); - List<CiValue> argList = visitInvokeArguments(cc, x.arguments()); + List<RiValue> argList = visitInvokeArguments(cc, x.arguments()); LIRDebugInfo info = null; FrameState stateAfter = x.stateAfter(); @@ -998,7 +998,7 @@ info = stateFor(stateBeforeReturn, -1); } - emitCall(x.call(), resultOperand, argList, CiConstant.forLong(0), info, null); + emitCall(x.call(), resultOperand, argList, RiConstant.forLong(0), info, null); if (isLegal(resultOperand)) { setResult(x, emitMove(resultOperand)); @@ -1011,7 +1011,7 @@ if (x.numberOfCases() == 0 || x.numberOfCases() < GraalOptions.SequentialSwitchLimit) { int len = x.numberOfCases(); for (int i = 0; i < len; i++) { - emitBranch(tag, CiConstant.forInt(x.keyAt(i)), Condition.EQ, false, getLIRBlock(x.blockSuccessor(i)), null); + emitBranch(tag, RiConstant.forInt(x.keyAt(i)), Condition.EQ, false, getLIRBlock(x.blockSuccessor(i)), null); } emitJump(getLIRBlock(x.defaultSuccessor()), null); } else { @@ -1027,7 +1027,7 @@ int loKey = x.lowKey(); int len = x.numberOfCases(); for (int i = 0; i < len; i++) { - emitBranch(value, CiConstant.forInt(i + loKey), Condition.EQ, false, getLIRBlock(x.blockSuccessor(i)), null); + emitBranch(value, RiConstant.forInt(i + loKey), Condition.EQ, false, getLIRBlock(x.blockSuccessor(i)), null); } emitJump(getLIRBlock(x.defaultSuccessor()), null); } else { @@ -1045,7 +1045,7 @@ } } - protected abstract void emitTableSwitch(int lowKey, LabelRef defaultTarget, LabelRef[] targets, CiValue index); + protected abstract void emitTableSwitch(int lowKey, LabelRef defaultTarget, LabelRef[] targets, RiValue index); // the range of values in a lookupswitch or tableswitch statement private static final class SwitchRange { @@ -1101,14 +1101,14 @@ int highKey = oneRange.highKey; LabelRef dest = oneRange.sux; if (lowKey == highKey) { - emitBranch(value, CiConstant.forInt(lowKey), Condition.EQ, false, dest, null); + emitBranch(value, RiConstant.forInt(lowKey), Condition.EQ, false, dest, null); } else if (highKey - lowKey == 1) { - emitBranch(value, CiConstant.forInt(lowKey), Condition.EQ, false, dest, null); - emitBranch(value, CiConstant.forInt(highKey), Condition.EQ, false, dest, null); + emitBranch(value, RiConstant.forInt(lowKey), Condition.EQ, false, dest, null); + emitBranch(value, RiConstant.forInt(highKey), Condition.EQ, false, dest, null); } else { Label l = new Label(); - emitBranch(value, CiConstant.forInt(lowKey), Condition.LT, false, LabelRef.forLabel(l), null); - emitBranch(value, CiConstant.forInt(highKey), Condition.LE, false, dest, null); + emitBranch(value, RiConstant.forInt(lowKey), Condition.LT, false, LabelRef.forLabel(l), null); + emitBranch(value, RiConstant.forInt(highKey), Condition.LE, false, dest, null); emitLabel(l, false); } } @@ -1116,7 +1116,7 @@ } - protected XirArgument toXirArgument(CiValue v) { + protected XirArgument toXirArgument(RiValue v) { if (v == null) { return null; } @@ -1130,7 +1130,7 @@ return XirArgument.forInternalObject(loadNonConst(operand(i))); } - private CiValue allocateOperand(XirSnippet snippet, XirOperand op) { + private RiValue allocateOperand(XirSnippet snippet, XirOperand op) { if (op instanceof XirParameter) { XirParameter param = (XirParameter) op; return allocateOperand(snippet.arguments[param.parameterIndex], op, param.canBeConstant); @@ -1145,17 +1145,17 @@ } } - private CiValue allocateOperand(XirArgument arg, XirOperand var, boolean canBeConstant) { + private RiValue allocateOperand(XirArgument arg, XirOperand var, boolean canBeConstant) { if (arg.constant != null) { return arg.constant; } - CiValue value = (CiValue) arg.object; + RiValue value = (RiValue) arg.object; if (canBeConstant) { return value; } Variable variable = load(value); - if (var.kind == CiKind.Byte || var.kind == CiKind.Boolean) { + if (var.kind == RiKind.Byte || var.kind == RiKind.Boolean) { Variable tempVar = new Variable(value.kind, lir.nextVariable(), CiRegister.RegisterFlag.Byte); emitMove(variable, tempVar); variable = tempVar; @@ -1163,26 +1163,26 @@ return variable; } - protected CiValue emitXir(XirSnippet snippet, ValueNode x, LIRDebugInfo info, boolean setInstructionResult) { + protected RiValue emitXir(XirSnippet snippet, ValueNode x, LIRDebugInfo info, boolean setInstructionResult) { return emitXir(snippet, x, info, null, setInstructionResult, null, null); } - protected CiValue emitXir(XirSnippet snippet, ValueNode instruction, LIRDebugInfo info, LIRDebugInfo infoAfter, boolean setInstructionResult, LabelRef trueSuccessor, LabelRef falseSuccessor) { + protected RiValue emitXir(XirSnippet snippet, ValueNode instruction, LIRDebugInfo info, LIRDebugInfo infoAfter, boolean setInstructionResult, LabelRef trueSuccessor, LabelRef falseSuccessor) { if (GraalOptions.PrintXirTemplates) { TTY.println("Emit XIR template " + snippet.template.name); } - final CiValue[] operandsArray = new CiValue[snippet.template.variableCount]; + final RiValue[] operandsArray = new RiValue[snippet.template.variableCount]; frameMap.reserveOutgoing(snippet.template.outgoingStackSize); XirOperand resultOperand = snippet.template.resultOperand; if (snippet.template.allocateResultOperand) { - CiValue outputOperand = IllegalValue; + RiValue outputOperand = IllegalValue; // This snippet has a result that must be separately allocated // Otherwise it is assumed that the result is part of the inputs - if (resultOperand.kind != CiKind.Void && resultOperand.kind != CiKind.Illegal) { + if (resultOperand.kind != RiKind.Void && resultOperand.kind != RiKind.Illegal) { if (setInstructionResult) { outputOperand = newVariable(instruction.kind()); } else { @@ -1214,13 +1214,13 @@ XirOperand[] inputTempOperands = snippet.template.inputTempOperands; XirOperand[] tempOperands = snippet.template.tempOperands; - CiValue[] inputOperandArray = new CiValue[inputOperands.length + inputTempOperands.length]; - CiValue[] tempOperandArray = new CiValue[tempOperands.length]; + RiValue[] inputOperandArray = new RiValue[inputOperands.length + inputTempOperands.length]; + RiValue[] tempOperandArray = new RiValue[tempOperands.length]; int[] inputOperandIndicesArray = new int[inputOperands.length + inputTempOperands.length]; int[] tempOperandIndicesArray = new int[tempOperands.length]; for (int i = 0; i < inputOperands.length; i++) { XirOperand x = inputOperands[i]; - CiValue op = allocateOperand(snippet, x); + RiValue op = allocateOperand(snippet, x); operandsArray[x.index] = op; inputOperandArray[i] = op; inputOperandIndicesArray[i] = x.index; @@ -1233,7 +1233,7 @@ for (int i = 0; i < tempOperands.length; i++) { XirOperand x = tempOperands[i]; - CiValue op = allocateOperand(snippet, x); + RiValue op = allocateOperand(snippet, x); operandsArray[x.index] = op; tempOperandArray[i] = op; tempOperandIndicesArray[i] = x.index; @@ -1242,17 +1242,17 @@ } } - for (CiValue operand : operandsArray) { + for (RiValue operand : operandsArray) { assert operand != null; } - CiValue allocatedResultOperand = operandsArray[resultOperand.index]; + RiValue allocatedResultOperand = operandsArray[resultOperand.index]; if (!isVariable(allocatedResultOperand) && !isRegister(allocatedResultOperand)) { allocatedResultOperand = IllegalValue; } if (setInstructionResult && isLegal(allocatedResultOperand)) { - CiValue operand = operand(instruction); + RiValue operand = operand(instruction); if (operand == null) { setResult(instruction, allocatedResultOperand); } else { @@ -1274,25 +1274,25 @@ return operandsArray[resultOperand.index]; } - protected abstract void emitXir(XirSnippet snippet, CiValue[] operands, CiValue outputOperand, CiValue[] inputs, CiValue[] temps, int[] inputOperandIndices, int[] tempOperandIndices, int outputOperandIndex, + protected abstract void emitXir(XirSnippet snippet, RiValue[] operands, RiValue outputOperand, RiValue[] inputs, RiValue[] temps, int[] inputOperandIndices, int[] tempOperandIndices, int outputOperandIndex, LIRDebugInfo info, LIRDebugInfo infoAfter, LabelRef trueSuccessor, LabelRef falseSuccessor); - protected final CiValue callRuntime(CiRuntimeCall runtimeCall, LIRDebugInfo info, CiValue... args) { + protected final RiValue callRuntime(CiRuntimeCall runtimeCall, LIRDebugInfo info, RiValue... args) { // get a result register - CiKind result = runtimeCall.resultKind; - CiKind[] arguments = runtimeCall.arguments; + RiKind result = runtimeCall.resultKind; + RiKind[] arguments = runtimeCall.arguments; - CiValue physReg = result.isVoid() ? IllegalValue : resultOperandFor(result); + RiValue physReg = result.isVoid() ? IllegalValue : resultOperandFor(result); - List<CiValue> argumentList; + List<RiValue> argumentList; if (arguments.length > 0) { // move the arguments into the correct location CiCallingConvention cc = frameMap.registerConfig.getCallingConvention(RuntimeCall, arguments, target(), false); frameMap.callsMethod(cc, RuntimeCall); assert cc.locations.length == args.length : "argument count mismatch"; for (int i = 0; i < args.length; i++) { - CiValue arg = args[i]; - CiValue loc = cc.locations[i]; + RiValue arg = args[i]; + RiValue loc = cc.locations[i]; emitMove(arg, loc); } argumentList = Arrays.asList(cc.locations); @@ -1302,13 +1302,13 @@ argumentList = Util.uncheckedCast(Collections.emptyList()); } - emitCall(runtimeCall, physReg, argumentList, CiConstant.forLong(0), info, null); + emitCall(runtimeCall, physReg, argumentList, RiConstant.forLong(0), info, null); return physReg; } - protected final Variable callRuntimeWithResult(CiRuntimeCall runtimeCall, LIRDebugInfo info, CiValue... args) { - CiValue location = callRuntime(runtimeCall, info, args); + protected final Variable callRuntimeWithResult(CiRuntimeCall runtimeCall, LIRDebugInfo info, RiValue... args) { + RiValue location = callRuntime(runtimeCall, info, args); return emitMove(location); }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/PhiResolver.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/PhiResolver.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.compiler.gen; -import static com.oracle.max.cri.ci.CiValue.*; +import static com.oracle.graal.api.meta.RiValue.*; import static com.oracle.graal.lir.ValueUtil.*; import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; /** @@ -58,7 +58,7 @@ /** * A source operand whose value flows into the {@linkplain #destinations destination} operands. */ - final CiValue operand; + final RiValue operand; /** * The operands whose values are defined by the {@linkplain #operand source} operand. @@ -80,7 +80,7 @@ */ boolean startNode; - PhiResolverNode(CiValue operand) { + PhiResolverNode(RiValue operand) { this.operand = operand; destinations = new ArrayList<>(4); } @@ -105,7 +105,7 @@ */ private PhiResolverNode loop; - private CiValue temp; + private RiValue temp; private final ArrayList<PhiResolverNode> variableOperands = new ArrayList<>(3); private final ArrayList<PhiResolverNode> otherOperands = new ArrayList<>(3); @@ -113,7 +113,7 @@ /** * Maps operands to nodes. */ - private final HashMap<CiValue, PhiResolverNode> operandToNodeMap = new HashMap<>(); + private final HashMap<RiValue, PhiResolverNode> operandToNodeMap = new HashMap<>(); public PhiResolver(LIRGenerator gen) { this.gen = gen; @@ -141,7 +141,7 @@ } } - public void move(CiValue src, CiValue dest) { + public void move(RiValue src, RiValue dest) { assert isVariable(dest) : "destination must be virtual"; // tty.print("move "); src.print(); tty.print(" to "); dest.print(); tty.cr(); assert isLegal(src) : "source for phi move is illegal"; @@ -151,7 +151,7 @@ srcNode.destinations.add(destNode); } - private PhiResolverNode createNode(CiValue operand, boolean source) { + private PhiResolverNode createNode(RiValue operand, boolean source) { PhiResolverNode node; if (isVariable(operand)) { node = operandToNodeMap.get(operand); @@ -175,11 +175,11 @@ return node; } - private PhiResolverNode destinationNode(CiValue opr) { + private PhiResolverNode destinationNode(RiValue opr) { return createNode(opr, false); } - private void emitMove(CiValue src, CiValue dest) { + private void emitMove(RiValue src, RiValue dest) { assert isLegal(src); assert isLegal(dest); gen.emitMove(src, dest); @@ -217,19 +217,19 @@ } } - private void moveTempTo(CiValue dest) { + private void moveTempTo(RiValue dest) { assert isLegal(temp); emitMove(temp, dest); temp = IllegalValue; } - private void moveToTemp(CiValue src) { + private void moveToTemp(RiValue src) { assert isIllegal(temp); temp = gen.newVariable(src.kind); emitMove(src, temp); } - private PhiResolverNode sourceNode(CiValue opr) { + private PhiResolverNode sourceNode(RiValue opr) { return createNode(opr, true); } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/loop/LoopEx.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/loop/LoopEx.java Fri Jun 08 15:17:43 2012 +0200 @@ -56,11 +56,13 @@ return whole; } + @SuppressWarnings("unused") public LoopFragmentInsideFrom insideFrom(FixedNode point) { // TODO (gd) return null; } + @SuppressWarnings("unused") public LoopFragmentInsideBefore insideBefore(FixedNode point) { // TODO (gd) return null;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/loop/LoopFragmentInside.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/loop/LoopFragmentInside.java Fri Jun 08 15:17:43 2012 +0200 @@ -69,6 +69,7 @@ return (LoopFragmentInside) super.original(); } + @SuppressWarnings("unused") public void appendInside(LoopEx loop) { // TODO (gd) }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BoxingEliminationPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BoxingEliminationPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,14 +26,13 @@ import java.util.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.iterators.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.type.*; import com.oracle.graal.nodes.virtual.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public class BoxingEliminationPhase extends Phase { @@ -63,7 +62,7 @@ } } - private PhiNode getReplacementPhi(PhiNode phiNode, CiKind kind, Map<PhiNode, PhiNode> phiReplacements) { + private PhiNode getReplacementPhi(PhiNode phiNode, RiKind kind, Map<PhiNode, PhiNode> phiReplacements) { if (!phiReplacements.containsKey(phiNode)) { PhiNode result = null; ObjectStamp stamp = phiNode.objectStamp(); @@ -94,7 +93,7 @@ return phiReplacements.get(phiNode); } - private ValueNode unboxedValue(ValueNode n, CiKind kind, Map<PhiNode, PhiNode> phiReplacements) { + private ValueNode unboxedValue(ValueNode n, RiKind kind, Map<PhiNode, PhiNode> phiReplacements) { if (n instanceof BoxNode) { BoxNode boxNode = (BoxNode) n; return boxNode.source();
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/CanonicalizerPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/CanonicalizerPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,6 +22,8 @@ */ package com.oracle.graal.compiler.phases; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.Graph.InputChangedListener; @@ -29,8 +31,6 @@ import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public class CanonicalizerPhase extends Phase { private static final int MAX_ITERATION_PER_NODE = 10; @@ -109,7 +109,7 @@ * Determines if a given constant is an object/array whose current * fields/elements will never change. */ - boolean apply(CiConstant constant); + boolean apply(RiConstant constant); } private void processWorkSet(StructuredGraph graph) { @@ -269,7 +269,7 @@ } @Override - public boolean isImmutable(CiConstant objectConstant) { + public boolean isImmutable(RiConstant objectConstant) { return immutabilityPredicate != null && immutabilityPredicate.apply(objectConstant); } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/CheckCastEliminationPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/CheckCastEliminationPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,6 +24,7 @@ import java.util.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.graph.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; @@ -33,7 +34,6 @@ import com.oracle.graal.nodes.java.*; import com.oracle.graal.nodes.type.*; import com.oracle.graal.nodes.util.*; -import com.oracle.max.cri.ri.*; public class CheckCastEliminationPhase extends Phase {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,8 +24,8 @@ import java.util.*; -import com.oracle.max.cri.ci.*; import com.oracle.max.criutils.*; +import com.oracle.graal.api.code.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.graph.*; import com.oracle.graal.compiler.util.*; @@ -241,13 +241,13 @@ } private final CiTarget target; - private final GraalRuntime runtime; + private final ExtendedRiRuntime runtime; private final CiAssumptions assumptions; private final RiGraphCache cache; private final PhasePlan plan; private final OptimisticOptimizations optimisticOpts; - public EscapeAnalysisPhase(CiTarget target, GraalRuntime runtime, CiAssumptions assumptions, RiGraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { + public EscapeAnalysisPhase(CiTarget target, ExtendedRiRuntime runtime, CiAssumptions assumptions, RiGraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { this.runtime = runtime; this.target = target; this.assumptions = assumptions;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/IdentifyBoxingPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/IdentifyBoxingPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,8 +24,7 @@ import java.lang.reflect.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; @@ -51,15 +50,15 @@ RiResolvedMethod targetMethod = callTarget.targetMethod(); if (pool.isSpecialMethod(targetMethod)) { assert callTarget.arguments().size() == 1 : "boxing/unboxing method must have exactly one argument"; - CiKind returnKind = callTarget.returnKind(); + RiKind returnKind = callTarget.returnKind(); ValueNode sourceValue = callTarget.arguments().get(0); // Check whether this is a boxing or an unboxing. Node newNode = null; - if (returnKind == CiKind.Object) { + if (returnKind == RiKind.Object) { // We have a boxing method here. assert Modifier.isStatic(targetMethod.accessFlags()) : "boxing method must be static"; - CiKind sourceKind = targetMethod.signature().argumentKindAt(0, false); + RiKind sourceKind = targetMethod.signature().argumentKindAt(0, false); newNode = invoke.graph().add(new BoxNode(sourceValue, targetMethod.holder(), sourceKind, invoke.bci())); } else { // We have an unboxing method here.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,6 +26,8 @@ import java.util.*; import java.util.concurrent.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.PhasePlan.PhasePosition; import com.oracle.graal.compiler.util.*; @@ -36,8 +38,6 @@ import com.oracle.graal.debug.internal.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public class InliningPhase extends Phase implements InliningCallback { @@ -48,7 +48,7 @@ */ private final CiTarget target; - private final GraalRuntime runtime; + private final ExtendedRiRuntime runtime; private final Collection<? extends Invoke> hints; @@ -66,7 +66,7 @@ private static final DebugMetric metricInliningConsidered = Debug.metric("InliningConsidered"); private static final DebugMetric metricInliningStoppedByMaxDesiredSize = Debug.metric("InliningStoppedByMaxDesiredSize"); - public InliningPhase(CiTarget target, GraalRuntime runtime, Collection<? extends Invoke> hints, CiAssumptions assumptions, RiGraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { + public InliningPhase(CiTarget target, ExtendedRiRuntime runtime, Collection<? extends Invoke> hints, CiAssumptions assumptions, RiGraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { this.target = target; this.runtime = runtime; this.hints = hints; @@ -365,7 +365,7 @@ if (GraalOptions.InliningBonusPerTransferredValue != 0) { RiSignature signature = info.invoke.callTarget().targetMethod().signature(); int transferredValues = signature.argumentCount(!Modifier.isStatic(info.invoke.callTarget().targetMethod().accessFlags())); - if (signature.returnKind(false) != CiKind.Void) { + if (signature.returnKind(false) != RiKind.Void) { transferredValues++; } maxSize += transferredValues * GraalOptions.InliningBonusPerTransferredValue;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/IntrinsificationPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/IntrinsificationPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.phases; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.util.*; import com.oracle.graal.cri.*; import com.oracle.graal.debug.*; @@ -31,9 +31,9 @@ public class IntrinsificationPhase extends Phase { - private final GraalRuntime runtime; + private final ExtendedRiRuntime runtime; - public IntrinsificationPhase(GraalRuntime runtime) { + public IntrinsificationPhase(ExtendedRiRuntime runtime) { this.runtime = runtime; } @@ -47,18 +47,18 @@ } } - public static boolean canIntrinsify(Invoke invoke, RiResolvedMethod target, GraalRuntime runtime) { + public static boolean canIntrinsify(Invoke invoke, RiResolvedMethod target, ExtendedRiRuntime runtime) { return getIntrinsicGraph(invoke, target, runtime) != null; } - private static void tryIntrinsify(Invoke invoke, GraalRuntime runtime) { + private static void tryIntrinsify(Invoke invoke, ExtendedRiRuntime runtime) { RiResolvedMethod target = invoke.callTarget().targetMethod(); if (target != null) { tryIntrinsify(invoke, target, runtime); } } - private static void tryIntrinsify(Invoke invoke, RiResolvedMethod target, GraalRuntime runtime) { + private static void tryIntrinsify(Invoke invoke, RiResolvedMethod target, ExtendedRiRuntime runtime) { StructuredGraph intrinsicGraph = getIntrinsicGraph(invoke, target, runtime); if (intrinsicGraph != null) { Debug.log(" > Intrinsify %s", target); @@ -66,7 +66,7 @@ } } - private static StructuredGraph getIntrinsicGraph(Invoke invoke, RiResolvedMethod target, GraalRuntime runtime) { + private static StructuredGraph getIntrinsicGraph(Invoke invoke, RiResolvedMethod target, ExtendedRiRuntime runtime) { StructuredGraph intrinsicGraph = (StructuredGraph) target.compilerStorage().get(Graph.class); if (intrinsicGraph == null) { // TODO remove once all intrinsics are available via compilerStorage
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoweringPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoweringPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,6 +22,8 @@ */ package com.oracle.graal.compiler.phases; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.cri.*; import com.oracle.graal.debug.*; @@ -30,8 +32,6 @@ import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * Processes all {@link Lowerable} nodes to do their lowering. @@ -41,7 +41,7 @@ private class LoweringToolBase implements CiLoweringTool { @Override - public GraalRuntime getRuntime() { + public ExtendedRiRuntime getRuntime() { return runtime; } @@ -52,16 +52,16 @@ @Override public ValueNode createNullCheckGuard(ValueNode object, long leafGraphId) { - return createGuard(object.graph().unique(new IsNullNode(object)), RiDeoptReason.NullCheckException, RiDeoptAction.InvalidateReprofile, true, leafGraphId); + return createGuard(object.graph().unique(new IsNullNode(object)), RiDeoptReason.NullCheckException, CiDeoptAction.InvalidateReprofile, true, leafGraphId); } @Override - public ValueNode createGuard(BooleanNode condition, RiDeoptReason deoptReason, RiDeoptAction action, long leafGraphId) { + public ValueNode createGuard(BooleanNode condition, RiDeoptReason deoptReason, CiDeoptAction action, long leafGraphId) { return createGuard(condition, deoptReason, action, false, leafGraphId); } @Override - public ValueNode createGuard(BooleanNode condition, RiDeoptReason deoptReason, RiDeoptAction action, boolean negated, long leafGraphId) { + public ValueNode createGuard(BooleanNode condition, RiDeoptReason deoptReason, CiDeoptAction action, boolean negated, long leafGraphId) { // TODO (thomaswue): Document why this must not be called on floating nodes. throw new UnsupportedOperationException(); } @@ -72,10 +72,10 @@ } } - private final GraalRuntime runtime; + private final ExtendedRiRuntime runtime; private final CiAssumptions assumptions; - public LoweringPhase(GraalRuntime runtime, CiAssumptions assumptions) { + public LoweringPhase(ExtendedRiRuntime runtime, CiAssumptions assumptions) { this.runtime = runtime; this.assumptions = assumptions; } @@ -150,7 +150,7 @@ } @Override - public ValueNode createGuard(BooleanNode condition, RiDeoptReason deoptReason, RiDeoptAction action, boolean negated, long leafGraphId) { + public ValueNode createGuard(BooleanNode condition, RiDeoptReason deoptReason, CiDeoptAction action, boolean negated, long leafGraphId) { FixedNode guardAnchor = (FixedNode) getGuardAnchor(); if (GraalOptions.OptEliminateGuards) { for (Node usage : condition.usages()) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/SnippetIntrinsificationPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/SnippetIntrinsificationPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,6 +25,8 @@ import java.lang.reflect.*; import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.Fold; @@ -33,8 +35,6 @@ import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.java.*; import com.oracle.graal.nodes.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public class SnippetIntrinsificationPhase extends Phase { @@ -86,7 +86,7 @@ } // Call the method - CiConstant constant = callMethod(target.signature().returnKind(false), target.holder().toJava(), target.name(), parameterTypes, receiver, arguments); + RiConstant constant = callMethod(target.signature().returnKind(false), target.holder().toJava(), target.name(), parameterTypes, receiver, arguments); if (constant != null) { // Replace the invoke with the result of the call @@ -120,7 +120,7 @@ if (folding || CiUtil.getParameterAnnotation(ConstantNodeParameter.class, parameterIndex, target) != null) { assert argument instanceof ConstantNode : "parameter " + parameterIndex + " must be a compile time constant for calling " + invoke.callTarget().targetMethod() + ": " + argument; ConstantNode constantNode = (ConstantNode) argument; - CiConstant constant = constantNode.asConstant(); + RiConstant constant = constantNode.asConstant(); Object o = constant.boxedValue(); if (o instanceof Class< ? >) { reflectionCallArguments[i] = runtime.getType((Class< ? >) o); @@ -214,7 +214,7 @@ /** * Calls a Java method via reflection. */ - private static CiConstant callMethod(CiKind returnKind, Class< ? > holder, String name, Class< ? >[] parameterTypes, Object receiver, Object[] arguments) { + private static RiConstant callMethod(RiKind returnKind, Class< ? > holder, String name, Class< ? >[] parameterTypes, Object receiver, Object[] arguments) { Method method; try { method = holder.getDeclaredMethod(name, parameterTypes); @@ -227,14 +227,14 @@ if (result == null) { return null; } - return CiConstant.forBoxed(returnKind, result); + return RiConstant.forBoxed(returnKind, result); } catch (Exception e) { throw new RuntimeException(e); } } public void cleanUpReturnCheckCast(Node newInstance) { - if (newInstance instanceof ValueNode && ((ValueNode) newInstance).kind() != CiKind.Object) { + if (newInstance instanceof ValueNode && ((ValueNode) newInstance).kind() != RiKind.Object) { StructuredGraph graph = (StructuredGraph) newInstance.graph(); for (CheckCastNode checkCastNode : newInstance.usages().filter(CheckCastNode.class).snapshot()) { for (ValueProxyNode vpn : checkCastNode.usages().filter(ValueProxyNode.class).snapshot()) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,13 +24,13 @@ import java.lang.reflect.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.gen.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.asm.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.cri.xir.*; /** @@ -68,7 +68,7 @@ } } - public FrameMap newFrameMap(RiRegisterConfig registerConfig) { + public FrameMap newFrameMap(CiRegisterConfig registerConfig) { return new FrameMap(runtime, target, registerConfig); }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64DeoptimizationStub.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64DeoptimizationStub.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,23 +24,23 @@ import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.amd64.*; import com.oracle.graal.lir.asm.*; import com.oracle.max.asm.*; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public class AMD64DeoptimizationStub extends AMD64Code { public final Label label = new Label(); public final LIRDebugInfo info; - public final RiDeoptAction action; + public final CiDeoptAction action; public final RiDeoptReason reason; public final Object deoptInfo; - public AMD64DeoptimizationStub(RiDeoptAction action, RiDeoptReason reason, LIRDebugInfo info, Object deoptInfo) { + public AMD64DeoptimizationStub(CiDeoptAction action, RiDeoptReason reason, LIRDebugInfo info, Object deoptInfo) { this.action = action; this.reason = reason; this.info = info; @@ -58,7 +58,7 @@ if (GraalOptions.CreateDeoptInfo && deoptInfo != null) { masm.nop(); keepAlive.add(deoptInfo.toString()); - AMD64Move.move(tasm, masm, scratch.asValue(), CiConstant.forObject(deoptInfo)); + AMD64Move.move(tasm, masm, scratch.asValue(), RiConstant.forObject(deoptInfo)); // TODO Make this an explicit calling convention instead of using a scratch register AMD64Call.directCall(tasm, masm, CiRuntimeCall.SetDeoptInfo, info); }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java Fri Jun 08 15:17:43 2012 +0200 @@ -23,7 +23,7 @@ package com.oracle.graal.compiler.target.amd64; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import static com.oracle.graal.lir.amd64.AMD64Arithmetic.*; import static com.oracle.graal.lir.amd64.AMD64Compare.*; @@ -32,11 +32,11 @@ import com.oracle.max.asm.*; import com.oracle.max.asm.target.amd64.*; import com.oracle.max.asm.target.amd64.AMD64Assembler.ConditionFlag; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiTargetMethod.Mark; -import com.oracle.max.cri.ri.*; import com.oracle.max.cri.xir.CiXirAssembler.XirMark; import com.oracle.max.cri.xir.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiTargetMethod.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.gen.*; import com.oracle.graal.compiler.target.*; import com.oracle.graal.compiler.util.*; @@ -79,20 +79,20 @@ */ public abstract class AMD64LIRGenerator extends LIRGenerator { - private static final CiRegisterValue RAX_I = AMD64.rax.asValue(CiKind.Int); - private static final CiRegisterValue RAX_L = AMD64.rax.asValue(CiKind.Long); - private static final CiRegisterValue RDX_I = AMD64.rdx.asValue(CiKind.Int); - private static final CiRegisterValue RDX_L = AMD64.rdx.asValue(CiKind.Long); - private static final CiRegisterValue RCX_I = AMD64.rcx.asValue(CiKind.Int); + private static final CiRegisterValue RAX_I = AMD64.rax.asValue(RiKind.Int); + private static final CiRegisterValue RAX_L = AMD64.rax.asValue(RiKind.Long); + private static final CiRegisterValue RDX_I = AMD64.rdx.asValue(RiKind.Int); + private static final CiRegisterValue RDX_L = AMD64.rdx.asValue(RiKind.Long); + private static final CiRegisterValue RCX_I = AMD64.rcx.asValue(RiKind.Int); public static class AMD64SpillMoveFactory implements LIR.SpillMoveFactory { @Override - public LIRInstruction createMove(CiValue result, CiValue input) { + public LIRInstruction createMove(RiValue result, RiValue input) { return new SpillMoveOp(result, input); } @Override - public LIRInstruction createExchange(CiValue input1, CiValue input2) { + public LIRInstruction createExchange(RiValue input1, RiValue input2) { // TODO (cwimmer) implement XCHG operation for LIR return null; } @@ -113,7 +113,7 @@ } @Override - public boolean canStoreConstant(CiConstant c) { + public boolean canStoreConstant(RiConstant c) { // there is no immediate move of 64-bit constants on Intel switch (c.kind) { case Long: return Util.isInt(c.asLong()); @@ -124,7 +124,7 @@ } @Override - public boolean canInlineConstant(CiConstant c) { + public boolean canInlineConstant(RiConstant c) { switch (c.kind) { case Long: return NumUtil.isInt(c.asLong()); case Object: return c.isNull(); @@ -134,8 +134,8 @@ @Override public CiAddress makeAddress(LocationNode location, ValueNode object) { - CiValue base = operand(object); - CiValue index = CiValue.IllegalValue; + RiValue base = operand(object); + RiValue index = RiValue.IllegalValue; int scale = 1; long displacement = location.displacement(); @@ -143,7 +143,7 @@ if (!asConstant(base).isNull()) { displacement += asConstant(base).asLong(); } - base = CiValue.IllegalValue; + base = RiValue.IllegalValue; } if (location instanceof IndexedLocationNode) { @@ -158,10 +158,10 @@ // only use the constant index if the resulting displacement fits into a 32 bit offset if (NumUtil.isInt(newDisplacement)) { displacement = newDisplacement; - index = CiValue.IllegalValue; + index = RiValue.IllegalValue; } else { // create a temporary variable for the index, the pointer load cannot handle a constant index - CiValue newIndex = newVariable(CiKind.Long); + RiValue newIndex = newVariable(RiKind.Long); emitMove(index, newIndex); index = newIndex; } @@ -172,14 +172,14 @@ } @Override - public Variable emitMove(CiValue input) { + public Variable emitMove(RiValue input) { Variable result = newVariable(input.kind); emitMove(input, result); return result; } @Override - public void emitMove(CiValue src, CiValue dst) { + public void emitMove(RiValue src, RiValue dst) { if (isRegister(src) || isStackSlot(dst)) { append(new MoveFromRegOp(dst, src)); } else { @@ -188,20 +188,20 @@ } @Override - public Variable emitLoad(CiValue loadAddress, boolean canTrap) { + public Variable emitLoad(RiValue loadAddress, boolean canTrap) { Variable result = newVariable(loadAddress.kind); append(new LoadOp(result, loadAddress, canTrap ? state() : null)); return result; } @Override - public void emitStore(CiValue storeAddress, CiValue inputVal, boolean canTrap) { - CiValue input = loadForStore(inputVal, storeAddress.kind); + public void emitStore(RiValue storeAddress, RiValue inputVal, boolean canTrap) { + RiValue input = loadForStore(inputVal, storeAddress.kind); append(new StoreOp(storeAddress, input, canTrap ? state() : null)); } @Override - public Variable emitLea(CiValue address) { + public Variable emitLea(RiValue address) { Variable result = newVariable(target().wordKind); append(new LeaOp(result, address)); return result; @@ -218,7 +218,7 @@ } @Override - public void emitBranch(CiValue left, CiValue right, Condition cond, boolean unorderedIsTrue, LabelRef label, LIRDebugInfo info) { + public void emitBranch(RiValue left, RiValue right, Condition cond, boolean unorderedIsTrue, LabelRef label, LIRDebugInfo info) { boolean mirrored = emitCompare(left, right); Condition finalCondition = mirrored ? cond.mirror() : cond; switch (left.kind.stackKind()) { @@ -232,7 +232,7 @@ } @Override - public Variable emitCMove(CiValue left, CiValue right, Condition cond, boolean unorderedIsTrue, CiValue trueValue, CiValue falseValue) { + public Variable emitCMove(RiValue left, RiValue right, Condition cond, boolean unorderedIsTrue, RiValue trueValue, RiValue falseValue) { boolean mirrored = emitCompare(left, right); Condition finalCondition = mirrored ? cond.mirror() : cond; @@ -255,9 +255,9 @@ * @param b the right operand of the comparison * @return true if the left and right operands were switched, false otherwise */ - private boolean emitCompare(CiValue a, CiValue b) { + private boolean emitCompare(RiValue a, RiValue b) { Variable left; - CiValue right; + RiValue right; boolean mirrored; if (ValueUtil.isVariable(b)) { left = load(b); @@ -281,20 +281,20 @@ } @Override - public Variable emitNegate(CiValue input) { + public Variable emitNegate(RiValue input) { Variable result = newVariable(input.kind); switch (input.kind) { case Int: append(new Op1Stack(INEG, result, input)); break; case Long: append(new Op1Stack(LNEG, result, input)); break; - case Float: append(new Op2Reg(FXOR, result, input, CiConstant.forFloat(Float.intBitsToFloat(0x80000000)))); break; - case Double: append(new Op2Reg(DXOR, result, input, CiConstant.forDouble(Double.longBitsToDouble(0x8000000000000000L)))); break; + case Float: append(new Op2Reg(FXOR, result, input, RiConstant.forFloat(Float.intBitsToFloat(0x80000000)))); break; + case Double: append(new Op2Reg(DXOR, result, input, RiConstant.forDouble(Double.longBitsToDouble(0x8000000000000000L)))); break; default: throw GraalInternalError.shouldNotReachHere(); } return result; } @Override - public Variable emitAdd(CiValue a, CiValue b) { + public Variable emitAdd(RiValue a, RiValue b) { Variable result = newVariable(a.kind); switch(a.kind) { case Int: append(new Op2Stack(IADD, result, a, loadNonConst(b))); break; @@ -307,7 +307,7 @@ } @Override - public Variable emitSub(CiValue a, CiValue b) { + public Variable emitSub(RiValue a, RiValue b) { Variable result = newVariable(a.kind); switch(a.kind) { case Int: append(new Op2Stack(ISUB, result, a, loadNonConst(b))); break; @@ -320,7 +320,7 @@ } @Override - public Variable emitMul(CiValue a, CiValue b) { + public Variable emitMul(RiValue a, RiValue b) { Variable result = newVariable(a.kind); switch(a.kind) { case Int: append(new Op2Reg(IMUL, result, a, loadNonConst(b))); break; @@ -333,7 +333,7 @@ } @Override - public Variable emitDiv(CiValue a, CiValue b) { + public Variable emitDiv(RiValue a, RiValue b) { switch(a.kind) { case Int: emitMove(a, RAX_I); @@ -359,7 +359,7 @@ } @Override - public CiValue emitRem(CiValue a, CiValue b) { + public RiValue emitRem(RiValue a, RiValue b) { switch(a.kind) { case Int: emitMove(a, RAX_I); @@ -379,7 +379,7 @@ } @Override - public Variable emitUDiv(CiValue a, CiValue b) { + public Variable emitUDiv(RiValue a, RiValue b) { switch(a.kind) { case Int: emitMove(a, RAX_I); @@ -395,7 +395,7 @@ } @Override - public Variable emitURem(CiValue a, CiValue b) { + public Variable emitURem(RiValue a, RiValue b) { switch(a.kind) { case Int: emitMove(a, RAX_I); @@ -412,7 +412,7 @@ @Override - public Variable emitAnd(CiValue a, CiValue b) { + public Variable emitAnd(RiValue a, RiValue b) { Variable result = newVariable(a.kind); switch(a.kind) { case Int: append(new Op2Stack(IAND, result, a, loadNonConst(b))); break; @@ -423,7 +423,7 @@ } @Override - public Variable emitOr(CiValue a, CiValue b) { + public Variable emitOr(RiValue a, RiValue b) { Variable result = newVariable(a.kind); switch(a.kind) { case Int: append(new Op2Stack(IOR, result, a, loadNonConst(b))); break; @@ -434,7 +434,7 @@ } @Override - public Variable emitXor(CiValue a, CiValue b) { + public Variable emitXor(RiValue a, RiValue b) { Variable result = newVariable(a.kind); switch(a.kind) { case Int: append(new Op2Stack(IXOR, result, a, loadNonConst(b))); break; @@ -446,7 +446,7 @@ @Override - public Variable emitShl(CiValue a, CiValue b) { + public Variable emitShl(RiValue a, RiValue b) { Variable result = newVariable(a.kind); switch (a.kind) { case Int: append(new ShiftOp(ISHL, result, a, loadShiftCount(b))); break; @@ -457,7 +457,7 @@ } @Override - public Variable emitShr(CiValue a, CiValue b) { + public Variable emitShr(RiValue a, RiValue b) { Variable result = newVariable(a.kind); switch (a.kind) { case Int: append(new ShiftOp(ISHR, result, a, loadShiftCount(b))); break; @@ -468,7 +468,7 @@ } @Override - public Variable emitUShr(CiValue a, CiValue b) { + public Variable emitUShr(RiValue a, RiValue b) { Variable result = newVariable(a.kind); switch (a.kind) { case Int: append(new ShiftOp(IUSHR, result, a, loadShiftCount(b))); break; @@ -478,7 +478,7 @@ return result; } - private CiValue loadShiftCount(CiValue value) { + private RiValue loadShiftCount(RiValue value) { if (isConstant(value)) { return value; } @@ -489,7 +489,7 @@ @Override - public Variable emitConvert(ConvertNode.Op opcode, CiValue inputVal) { + public Variable emitConvert(ConvertNode.Op opcode, RiValue inputVal) { Variable input = load(inputVal); Variable result = newVariable(opcode.to); switch (opcode) { @@ -519,7 +519,7 @@ @Override - public void emitDeoptimizeOnOverflow(RiDeoptAction action, RiDeoptReason reason, Object deoptInfo) { + public void emitDeoptimizeOnOverflow(CiDeoptAction action, RiDeoptReason reason, Object deoptInfo) { LIRDebugInfo info = state(); LabelRef stubEntry = createDeoptStub(action, reason, info, deoptInfo); append(new BranchOp(ConditionFlag.overflow, stubEntry, info)); @@ -527,7 +527,7 @@ @Override - public void emitDeoptimize(RiDeoptAction action, RiDeoptReason reason, Object deoptInfo, long leafGraphId) { + public void emitDeoptimize(CiDeoptAction action, RiDeoptReason reason, Object deoptInfo, long leafGraphId) { LIRDebugInfo info = state(leafGraphId); LabelRef stubEntry = createDeoptStub(action, reason, info, deoptInfo); append(new JumpOp(stubEntry, info)); @@ -542,35 +542,35 @@ } @Override - protected void emitCall(Object targetMethod, CiValue result, List<CiValue> arguments, CiValue targetAddress, LIRDebugInfo info, Map<XirMark, Mark> marks) { + protected void emitCall(Object targetMethod, RiValue result, List<RiValue> arguments, RiValue targetAddress, LIRDebugInfo info, Map<XirMark, Mark> marks) { if (isConstant(targetAddress)) { assert asConstant(targetAddress).isDefaultValue() : "destination address should be zero"; - append(new DirectCallOp(targetMethod, result, arguments.toArray(new CiValue[arguments.size()]), info, marks)); + append(new DirectCallOp(targetMethod, result, arguments.toArray(new RiValue[arguments.size()]), info, marks)); } else { - append(new IndirectCallOp(targetMethod, result, arguments.toArray(new CiValue[arguments.size()]), targetAddress, info, marks)); + append(new IndirectCallOp(targetMethod, result, arguments.toArray(new RiValue[arguments.size()]), targetAddress, info, marks)); } } @Override - protected void emitReturn(CiValue input) { + protected void emitReturn(RiValue input) { append(new ReturnOp(input)); } @Override - protected void emitXir(XirSnippet snippet, CiValue[] operands, CiValue outputOperand, CiValue[] inputs, CiValue[] temps, int[] inputOperandIndices, int[] tempOperandIndices, int outputOperandIndex, + protected void emitXir(XirSnippet snippet, RiValue[] operands, RiValue outputOperand, RiValue[] inputs, RiValue[] temps, int[] inputOperandIndices, int[] tempOperandIndices, int outputOperandIndex, LIRDebugInfo info, LIRDebugInfo infoAfter, LabelRef trueSuccessor, LabelRef falseSuccessor) { append(new AMD64XirOp(snippet, operands, outputOperand, inputs, temps, inputOperandIndices, tempOperandIndices, outputOperandIndex, info, infoAfter, trueSuccessor, falseSuccessor)); } @Override - protected void emitTableSwitch(int lowKey, LabelRef defaultTarget, LabelRef[] targets, CiValue index) { + protected void emitTableSwitch(int lowKey, LabelRef defaultTarget, LabelRef[] targets, RiValue index) { // Making a copy of the switch value is necessary because jump table destroys the input value Variable tmp = emitMove(index); append(new TableSwitchOp(lowKey, defaultTarget, targets, tmp, newVariable(target.wordKind))); } @Override - protected LabelRef createDeoptStub(RiDeoptAction action, RiDeoptReason reason, LIRDebugInfo info, Object deoptInfo) { + protected LabelRef createDeoptStub(CiDeoptAction action, RiDeoptReason reason, LIRDebugInfo info, Object deoptInfo) { assert info.topFrame.bci >= 0 : "invalid bci for deopt framestate"; AMD64DeoptimizationStub stub = new AMD64DeoptimizationStub(action, reason, info, deoptInfo); lir.stubs.add(stub); @@ -586,15 +586,15 @@ @Override public void visitCompareAndSwap(CompareAndSwapNode node) { - CiKind kind = node.newValue().kind(); + RiKind kind = node.newValue().kind(); assert kind == node.expected().kind(); - CiValue expected = loadNonConst(operand(node.expected())); + RiValue expected = loadNonConst(operand(node.expected())); Variable newValue = load(operand(node.newValue())); CiAddress address; int displacement = node.displacement(); - CiValue index = operand(node.offset()); + RiValue index = operand(node.offset()); if (isConstant(index) && NumUtil.isInt(asConstant(index).asLong())) { displacement += (int) asConstant(index).asLong(); address = new CiAddress(kind, load(operand(node.object())), displacement); @@ -607,7 +607,7 @@ append(new CompareAndSwapOp(rax, address, rax, newValue)); Variable result = newVariable(node.kind()); - append(new CondMoveOp(result, Condition.EQ, load(CiConstant.TRUE), CiConstant.FALSE)); + append(new CondMoveOp(result, Condition.EQ, load(RiConstant.TRUE), RiConstant.FALSE)); setResult(node, result); } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64XirAssembler.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64XirAssembler.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,8 +26,9 @@ import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; import com.oracle.max.cri.xir.*; /** @@ -79,11 +80,11 @@ XirOperand xOp = i.x(); if (i.op == XirOp.Div || i.op == XirOp.Mod) { if (fixedRDX == null) { - fixedRDX = createRegisterTemp("divModTemp", CiKind.Int, AMD64.rdx); + fixedRDX = createRegisterTemp("divModTemp", RiKind.Int, AMD64.rdx); } // Special treatment to make sure that the left input of % and / is in RAX if (fixedRAX == null) { - fixedRAX = createRegisterTemp("divModLeftInput", CiKind.Int, AMD64.rax); + fixedRAX = createRegisterTemp("divModLeftInput", RiKind.Int, AMD64.rax); } currentList.add(new XirInstruction(i.x().kind, XirOp.Mov, fixedRAX, i.x())); xOp = fixedRAX; @@ -141,7 +142,7 @@ currentList.add(new XirInstruction(target.wordKind, XirOp.Mov, fixedRSI, i.x())); currentList.add(new XirInstruction(target.wordKind, XirOp.Mov, fixedRDI, i.y())); currentList.add(new XirInstruction(target.wordKind, XirOp.Mov, fixedRCX, i.z())); - currentList.add(new XirInstruction(CiKind.Illegal, i.op, i.result, fixedRSI, fixedRDI, fixedRCX)); + currentList.add(new XirInstruction(RiKind.Illegal, i.op, i.result, fixedRSI, fixedRDI, fixedRCX)); appended = true; break;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64XirOp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64XirOp.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.compiler.target.amd64; -import static com.oracle.max.cri.ci.CiCallingConvention.Type.*; -import static com.oracle.max.cri.ci.CiValue.*; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiCallingConvention.Type.*; +import static com.oracle.graal.api.code.CiValueUtil.*; +import static com.oracle.graal.api.meta.RiValue.*; import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiTargetMethod.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.amd64.*; @@ -35,8 +38,6 @@ import com.oracle.max.asm.*; import com.oracle.max.asm.target.amd64.*; import com.oracle.max.asm.target.amd64.AMD64Assembler.ConditionFlag; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiTargetMethod.Mark; import com.oracle.max.cri.xir.*; import com.oracle.max.cri.xir.CiXirAssembler.RuntimeCallInformation; import com.oracle.max.cri.xir.CiXirAssembler.XirInstruction; @@ -44,7 +45,7 @@ import com.oracle.max.cri.xir.CiXirAssembler.XirMark; public class AMD64XirOp extends LIRXirInstruction { - public AMD64XirOp(XirSnippet snippet, CiValue[] operands, CiValue outputOperand, CiValue[] inputs, CiValue[] temps, int[] inputOperandIndices, int[] tempOperandIndices, int outputOperandIndex, + public AMD64XirOp(XirSnippet snippet, RiValue[] operands, RiValue outputOperand, RiValue[] inputs, RiValue[] temps, int[] inputOperandIndices, int[] tempOperandIndices, int outputOperandIndex, LIRDebugInfo info, LIRDebugInfo infoAfter, LabelRef trueSuccessor, LabelRef falseSuccessor) { super("XIR", snippet, operands, outputOperand, inputs, temps, inputOperandIndices, tempOperandIndices, outputOperandIndex, info, infoAfter, trueSuccessor, falseSuccessor); } @@ -105,7 +106,7 @@ } - protected void emitXirInstructions(TargetMethodAssembler tasm, AMD64MacroAssembler masm, XirInstruction[] instructions, Label[] labels, CiValue[] operands, Map<XirMark, Mark> marks) { + protected void emitXirInstructions(TargetMethodAssembler tasm, AMD64MacroAssembler masm, XirInstruction[] instructions, Label[] labels, RiValue[] operands, Map<XirMark, Mark> marks) { for (XirInstruction inst : instructions) { switch (inst.op) { case Add: @@ -153,15 +154,15 @@ break; case Mov: { - CiValue result = operands[inst.result.index]; - CiValue source = operands[inst.x().index]; + RiValue result = operands[inst.result.index]; + RiValue source = operands[inst.x().index]; AMD64Move.move(tasm, masm, result, source); break; } case PointerLoad: { - CiValue result = operands[inst.result.index]; - CiValue pointer = operands[inst.x().index]; + RiValue result = operands[inst.result.index]; + RiValue pointer = operands[inst.x().index]; CiRegisterValue register = assureInRegister(tasm, masm, pointer); AMD64Move.load(tasm, masm, result, new CiAddress(inst.kind, register), (Boolean) inst.extra ? info : null); @@ -169,8 +170,8 @@ } case PointerStore: { - CiValue value = assureNot64BitConstant(tasm, masm, operands[inst.y().index]); - CiValue pointer = operands[inst.x().index]; + RiValue value = assureNot64BitConstant(tasm, masm, operands[inst.y().index]); + RiValue pointer = operands[inst.x().index]; assert isRegister(pointer); AMD64Move.store(tasm, masm, new CiAddress(inst.kind, pointer), value, (Boolean) inst.extra ? info : null); @@ -184,17 +185,17 @@ CiAddress.Scale scale = addressInformation.scale; int displacement = addressInformation.disp; - CiValue result = operands[inst.result.index]; - CiValue pointer = operands[inst.x().index]; - CiValue index = operands[inst.y().index]; + RiValue result = operands[inst.result.index]; + RiValue pointer = operands[inst.x().index]; + RiValue index = operands[inst.y().index]; pointer = assureInRegister(tasm, masm, pointer); assert isRegister(pointer); CiAddress src; if (isConstant(index)) { - assert index.kind == CiKind.Int; - CiConstant constantIndex = (CiConstant) index; + assert index.kind == RiKind.Int; + RiConstant constantIndex = (RiConstant) index; src = new CiAddress(inst.kind, pointer, constantIndex.asInt() * scale.value + displacement); } else { src = new CiAddress(inst.kind, pointer, index, scale, displacement); @@ -210,13 +211,13 @@ CiAddress.Scale scale = addressInformation.scale; int displacement = addressInformation.disp; - CiValue result = operands[inst.result.index]; - CiValue pointer = operands[inst.x().index]; - CiValue index = operands[inst.y().index]; + RiValue result = operands[inst.result.index]; + RiValue pointer = operands[inst.x().index]; + RiValue index = operands[inst.y().index]; pointer = assureInRegister(tasm, masm, pointer); assert isRegister(pointer); - CiAddress src = new CiAddress(CiKind.Illegal, pointer, index, scale, displacement); + CiAddress src = new CiAddress(RiKind.Illegal, pointer, index, scale, displacement); masm.leaq(asRegister(result), src); break; } @@ -228,17 +229,17 @@ CiAddress.Scale scale = addressInformation.scale; int displacement = addressInformation.disp; - CiValue value = assureNot64BitConstant(tasm, masm, operands[inst.z().index]); - CiValue pointer = operands[inst.x().index]; - CiValue index = operands[inst.y().index]; + RiValue value = assureNot64BitConstant(tasm, masm, operands[inst.z().index]); + RiValue pointer = operands[inst.x().index]; + RiValue index = operands[inst.y().index]; pointer = assureInRegister(tasm, masm, pointer); assert isRegister(pointer); CiAddress dst; if (isConstant(index)) { - assert index.kind == CiKind.Int; - CiConstant constantIndex = (CiConstant) index; + assert index.kind == RiKind.Int; + RiConstant constantIndex = (RiConstant) index; dst = new CiAddress(inst.kind, pointer, IllegalValue, scale, constantIndex.asInt() * scale.value + displacement); } else { dst = new CiAddress(inst.kind, pointer, index, scale, displacement); @@ -265,8 +266,8 @@ case PointerCAS: assert asRegister(operands[inst.x().index]).equals(AMD64.rax) : "wrong input x: " + operands[inst.x().index]; - CiValue exchangedVal = operands[inst.y().index]; - CiValue exchangedAddress = operands[inst.x().index]; + RiValue exchangedVal = operands[inst.y().index]; + RiValue exchangedAddress = operands[inst.x().index]; CiRegisterValue pointerRegister = assureInRegister(tasm, masm, exchangedAddress); CiAddress addr = new CiAddress(tasm.target.wordKind, pointerRegister); @@ -278,15 +279,15 @@ break; case CallRuntime: { - CiKind[] signature = new CiKind[inst.arguments.length]; + RiKind[] signature = new RiKind[inst.arguments.length]; for (int i = 0; i < signature.length; i++) { signature[i] = inst.arguments[i].kind; } CiCallingConvention cc = tasm.frameMap.registerConfig.getCallingConvention(RuntimeCall, signature, tasm.target, false); for (int i = 0; i < inst.arguments.length; i++) { - CiValue argumentLocation = cc.locations[i]; - CiValue argumentSourceLocation = operands[inst.arguments[i].index]; + RiValue argumentLocation = cc.locations[i]; + RiValue argumentSourceLocation = operands[inst.arguments[i].index]; if (argumentLocation != argumentSourceLocation) { AMD64Move.move(tasm, masm, argumentLocation, argumentSourceLocation); } @@ -295,9 +296,9 @@ RuntimeCallInformation runtimeCallInformation = (RuntimeCallInformation) inst.extra; AMD64Call.directCall(tasm, masm, runtimeCallInformation.target, (runtimeCallInformation.useInfoAfter) ? infoAfter : info); - if (inst.result != null && inst.result.kind != CiKind.Illegal && inst.result.kind != CiKind.Void) { + if (inst.result != null && inst.result.kind != RiKind.Illegal && inst.result.kind != RiKind.Void) { CiRegister returnRegister = tasm.frameMap.registerConfig.getReturnRegister(inst.result.kind); - CiValue resultLocation = returnRegister.asValue(inst.result.kind.stackKind()); + RiValue resultLocation = returnRegister.asValue(inst.result.kind.stackKind()); AMD64Move.move(tasm, masm, operands[inst.result.index], resultLocation); } break; @@ -313,11 +314,11 @@ } case DecAndJumpNotZero: { Label label = labels[((XirLabel) inst.extra).index]; - CiValue value = operands[inst.x().index]; - if (value.kind == CiKind.Long) { + RiValue value = operands[inst.x().index]; + if (value.kind == RiKind.Long) { masm.decq(asRegister(value)); } else { - assert value.kind == CiKind.Int; + assert value.kind == RiKind.Int; masm.decl(asRegister(value)); } masm.jcc(ConditionFlag.notZero, label); @@ -366,12 +367,12 @@ case Jbset: { Label label = labels[((XirLabel) inst.extra).index]; - CiValue pointer = operands[inst.x().index]; - CiValue offset = operands[inst.y().index]; - CiValue bit = operands[inst.z().index]; + RiValue pointer = operands[inst.x().index]; + RiValue offset = operands[inst.y().index]; + RiValue bit = operands[inst.z().index]; assert isConstant(offset) && isConstant(bit); - CiConstant constantOffset = (CiConstant) offset; - CiConstant constantBit = (CiConstant) bit; + RiConstant constantOffset = (RiConstant) offset; + RiConstant constantBit = (RiConstant) bit; CiAddress src = new CiAddress(inst.kind, pointer, constantOffset.asInt()); masm.btli(src, constantBit.asInt()); masm.jcc(ConditionFlag.aboveEqual, label); @@ -391,7 +392,7 @@ } case NullCheck: { tasm.recordImplicitException(masm.codeBuffer.position(), info); - CiValue pointer = operands[inst.x().index]; + RiValue pointer = operands[inst.x().index]; masm.nullCheck(asRegister(pointer)); break; } @@ -401,7 +402,7 @@ break; } case Pop: { - CiValue result = operands[inst.result.index]; + RiValue result = operands[inst.result.index]; if (isRegister(result)) { masm.pop(asRegister(result)); } else { @@ -439,7 +440,7 @@ } private static void emitXirViaLir(TargetMethodAssembler tasm, AMD64MacroAssembler masm, AMD64Arithmetic intOp, AMD64Arithmetic longOp, AMD64Arithmetic floatOp, - AMD64Arithmetic doubleOp, CiValue left, CiValue right, CiValue result) { + AMD64Arithmetic doubleOp, RiValue left, RiValue right, RiValue result) { AMD64Arithmetic code; switch (result.kind) { case Int: code = intOp; break; @@ -457,9 +458,9 @@ } } - private static void emitXirCompare(TargetMethodAssembler tasm, AMD64MacroAssembler masm, XirInstruction inst, ConditionFlag cflag, CiValue[] ops, Label label) { - CiValue x = ops[inst.x().index]; - CiValue y = ops[inst.y().index]; + private static void emitXirCompare(TargetMethodAssembler tasm, AMD64MacroAssembler masm, XirInstruction inst, ConditionFlag cflag, RiValue[] ops, Label label) { + RiValue x = ops[inst.x().index]; + RiValue y = ops[inst.y().index]; AMD64Compare code; switch (x.kind) { case Int: code = AMD64Compare.ICMP; break; @@ -473,8 +474,8 @@ masm.jcc(cflag, label); } - private static CiValue assureNot64BitConstant(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue value) { - if (isConstant(value) && (value.kind == CiKind.Long || value.kind == CiKind.Object)) { + private static RiValue assureNot64BitConstant(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue value) { + if (isConstant(value) && (value.kind == RiKind.Long || value.kind == RiKind.Object)) { CiRegisterValue register = tasm.frameMap.registerConfig.getScratchRegister().asValue(value.kind); AMD64Move.move(tasm, masm, register, value); return register; @@ -482,7 +483,7 @@ return value; } - private static CiRegisterValue assureInRegister(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue pointer) { + private static CiRegisterValue assureInRegister(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue pointer) { if (isConstant(pointer)) { CiRegisterValue register = tasm.frameMap.registerConfig.getScratchRegister().asValue(pointer.kind); AMD64Move.move(tasm, masm, register, pointer);
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/NegateObjectTypeFeedback.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/NegateObjectTypeFeedback.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,7 @@ */ package com.oracle.graal.compiler.types; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.types.*; @@ -38,7 +37,7 @@ } @Override - public void constantBound(Condition condition, CiConstant constant) { + public void constantBound(Condition condition, RiConstant constant) { delegate.constantBound(condition.negate(), constant); }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/NegateScalarTypeFeedback.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/NegateScalarTypeFeedback.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.types; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.types.*; @@ -37,7 +37,7 @@ } @Override - public void constantBound(Condition condition, CiConstant constant) { + public void constantBound(Condition condition, RiConstant constant) { delegate.constantBound(condition.negate(), constant); } @@ -47,7 +47,7 @@ } @Override - public void setTranslated(CiConstant delta, ScalarTypeQuery old) { + public void setTranslated(RiConstant delta, ScalarTypeQuery old) { throw new UnsupportedOperationException(); } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PropagateTypeCachePhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PropagateTypeCachePhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,6 +25,7 @@ import java.io.*; import java.util.*; +import com.oracle.graal.api.code.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.compiler.schedule.*; import com.oracle.graal.debug.*; @@ -35,8 +36,6 @@ import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.types.*; import com.oracle.graal.nodes.spi.types.TypeCanonicalizable.Result; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public class PropagateTypeCachePhase extends Phase {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/TypeFeedbackCache.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/TypeFeedbackCache.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,10 +25,10 @@ import java.util.*; import java.util.Map.Entry; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.types.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public class TypeFeedbackCache implements TypeFeedbackTool, Cloneable { @@ -62,7 +62,7 @@ @Override public ScalarTypeFeedbackTool addScalar(ValueNode value) { - assert value.kind() == CiKind.Int || value.kind() == CiKind.Long || value.kind() == CiKind.Float || value.kind() == CiKind.Double; + assert value.kind() == RiKind.Int || value.kind() == RiKind.Long || value.kind() == RiKind.Float || value.kind() == RiKind.Double; ScalarTypeFeedbackStore result = scalarTypeFeedback.get(value); if (result == null) { if (value.stamp().scalarType() != null) { @@ -77,7 +77,7 @@ @Override public ObjectTypeFeedbackTool addObject(ValueNode value) { - assert value.kind() == CiKind.Object; + assert value.kind() == RiKind.Object; ObjectTypeFeedbackStore result = objectTypeFeedback.get(value); if (result == null) { if (value.stamp().objectType() != null) { @@ -168,7 +168,7 @@ // meet the phi nodes for (PhiNode phi : phis) { assert phi.valueCount() == cacheList.length; - if (phi.kind() == CiKind.Int || phi.kind() == CiKind.Long) { + if (phi.kind() == RiKind.Int || phi.kind() == RiKind.Long) { ScalarTypeFeedbackStore[] types = new ScalarTypeFeedbackStore[phi.valueCount()]; for (int i = 0; i < phi.valueCount(); i++) { ScalarTypeFeedbackStore other = cacheList[i].scalarTypeFeedback.get(phi.valueAt(i)); @@ -182,7 +182,7 @@ result.scalarTypeFeedback.put(phi, scalar); // phi.setStamp(StampFactory.forKind(phi.kind(), scalar.query(), null)); } - } else if (phi.kind() == CiKind.Object) { + } else if (phi.kind() == RiKind.Object) { ObjectTypeFeedbackStore[] types = new ObjectTypeFeedbackStore[phi.valueCount()]; for (int i = 0; i < phi.valueCount(); i++) { ObjectTypeFeedbackStore other = cacheList[i].objectTypeFeedback.get(phi.valueAt(i)); @@ -203,7 +203,7 @@ @Override public ScalarTypeQuery queryScalar(ValueNode value) { - assert value.kind() == CiKind.Int || value.kind() == CiKind.Long || value.kind() == CiKind.Float || value.kind() == CiKind.Double; + assert value.kind() == RiKind.Int || value.kind() == RiKind.Long || value.kind() == RiKind.Float || value.kind() == RiKind.Double; if (NO_SCALAR_TYPES) { return new ScalarTypeFeedbackStore(value.kind(), changed).query(); } @@ -221,7 +221,7 @@ @Override public ObjectTypeQuery queryObject(ValueNode value) { assert value != null; - assert value.kind() == CiKind.Object; + assert value.kind() == RiKind.Object; if (NO_OBJECT_TYPES) { return new ObjectTypeFeedbackStore(changed).query(); }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,6 +26,9 @@ import java.util.*; import java.util.concurrent.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiTypeProfile.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.cri.*; @@ -38,9 +41,6 @@ import com.oracle.graal.nodes.java.MethodCallTargetNode.InvokeKind; import com.oracle.graal.nodes.type.*; import com.oracle.graal.nodes.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiTypeProfile.ProfiledType; public class InliningUtil { @@ -124,7 +124,7 @@ * @param runtime * @param callback */ - public abstract void inline(StructuredGraph graph, GraalRuntime runtime, InliningCallback callback); + public abstract void inline(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback); } /** @@ -140,7 +140,7 @@ } @Override - public void inline(StructuredGraph compilerGraph, GraalRuntime runtime, final InliningCallback callback) { + public void inline(StructuredGraph compilerGraph, ExtendedRiRuntime runtime, final InliningCallback callback) { StructuredGraph graph = getGraph(concrete, callback); assert !IntrinsificationPhase.canIntrinsify(invoke, concrete, runtime); callback.recordMethodContentsAssumption(concrete); @@ -183,13 +183,13 @@ } @Override - public void inline(StructuredGraph graph, GraalRuntime runtime, InliningCallback callback) { + public void inline(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback) { // receiver null check must be before the type check InliningUtil.receiverNullCheck(invoke); ValueNode receiver = invoke.callTarget().receiver(); ReadHubNode objectClass = graph.add(new ReadHubNode(receiver)); IsTypeNode isTypeNode = graph.unique(new IsTypeNode(objectClass, type)); - FixedGuardNode guard = graph.add(new FixedGuardNode(isTypeNode, RiDeoptReason.TypeCheckedInliningViolated, RiDeoptAction.InvalidateReprofile, invoke.leafGraphId())); + FixedGuardNode guard = graph.add(new FixedGuardNode(isTypeNode, RiDeoptReason.TypeCheckedInliningViolated, CiDeoptAction.InvalidateReprofile, invoke.leafGraphId())); AnchorNode anchor = graph.add(new AnchorNode()); assert invoke.predecessor() != null; @@ -249,9 +249,9 @@ } @Override - public void inline(StructuredGraph graph, GraalRuntime runtime, InliningCallback callback) { + public void inline(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback) { int numberOfMethods = concretes.size(); - boolean hasReturnValue = invoke.node().kind() != CiKind.Void; + boolean hasReturnValue = invoke.node().kind() != RiKind.Void; // receiver null check must be the first node InliningUtil.receiverNullCheck(invoke); @@ -266,7 +266,7 @@ return notRecordedTypeProbability > 0; } - private void inlineMultipleMethods(StructuredGraph graph, GraalRuntime runtime, InliningCallback callback, int numberOfMethods, boolean hasReturnValue) { + private void inlineMultipleMethods(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback, int numberOfMethods, boolean hasReturnValue) { FixedNode continuation = invoke.next(); // setup merge and phi nodes for results and exceptions @@ -291,8 +291,8 @@ FixedNode exceptionSux = exceptionObject.next(); graph.addBeforeFixed(exceptionSux, exceptionMerge); - exceptionObjectPhi = graph.unique(new PhiNode(CiKind.Object, exceptionMerge)); - exceptionMerge.setStateAfter(exceptionEdge.stateAfter().duplicateModified(invoke.stateAfter().bci, true, CiKind.Void, exceptionObjectPhi)); + exceptionObjectPhi = graph.unique(new PhiNode(RiKind.Object, exceptionMerge)); + exceptionMerge.setStateAfter(exceptionEdge.stateAfter().duplicateModified(invoke.stateAfter().bci, true, RiKind.Void, exceptionObjectPhi)); } // create one separate block for each invoked method @@ -315,7 +315,7 @@ if (shouldFallbackToInvoke()) { unknownTypeNode = createInvocationBlock(graph, invoke, returnMerge, returnValuePhi, exceptionMerge, exceptionObjectPhi, 1, notRecordedTypeProbability, false); } else { - unknownTypeNode = graph.add(new DeoptimizeNode(RiDeoptAction.InvalidateReprofile, RiDeoptReason.TypeCheckedInliningViolated, invoke.leafGraphId())); + unknownTypeNode = graph.add(new DeoptimizeNode(CiDeoptAction.InvalidateReprofile, RiDeoptReason.TypeCheckedInliningViolated, invoke.leafGraphId())); } // replace the invoke exception edge @@ -372,7 +372,7 @@ return commonType; } - private void inlineSingleMethod(StructuredGraph graph, GraalRuntime runtime, InliningCallback callback) { + private void inlineSingleMethod(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback) { assert concretes.size() == 1 && ptypes.length > 1 && !shouldFallbackToInvoke() && notRecordedTypeProbability == 0; MergeNode calleeEntryNode = graph.add(new MergeNode()); @@ -380,7 +380,7 @@ ReadHubNode objectClassNode = graph.add(new ReadHubNode(invoke.callTarget().receiver())); graph.addBeforeFixed(invoke.node(), objectClassNode); - FixedNode unknownTypeNode = graph.add(new DeoptimizeNode(RiDeoptAction.InvalidateReprofile, RiDeoptReason.TypeCheckedInliningViolated, invoke.leafGraphId())); + FixedNode unknownTypeNode = graph.add(new DeoptimizeNode(CiDeoptAction.InvalidateReprofile, RiDeoptReason.TypeCheckedInliningViolated, invoke.leafGraphId())); FixedNode dispatchOnType = createDispatchOnType(graph, objectClassNode, new BeginNode[] {calleeEntryNode}, unknownTypeNode); FixedWithNextNode pred = (FixedWithNextNode) invoke.node().predecessor(); @@ -460,7 +460,7 @@ result.setUseForInlining(useForInlining); result.setProbability(probability); - CiKind kind = invoke.node().kind(); + RiKind kind = invoke.node().kind(); if (!kind.isVoid()) { FrameState stateAfter = invoke.stateAfter(); stateAfter = stateAfter.duplicate(stateAfter.bci); @@ -479,7 +479,7 @@ BeginNode newExceptionEdge = (BeginNode) exceptionEdge.copyWithInputs(); ExceptionObjectNode newExceptionObject = (ExceptionObjectNode) exceptionObject.copyWithInputs(); // set new state (pop old exception object, push new one) - newExceptionObject.setStateAfter(stateAfterException.duplicateModified(stateAfterException.bci, stateAfterException.rethrowException(), CiKind.Object, newExceptionObject)); + newExceptionObject.setStateAfter(stateAfterException.duplicateModified(stateAfterException.bci, stateAfterException.rethrowException(), RiKind.Object, newExceptionObject)); newExceptionEdge.setNext(newExceptionObject); EndNode endNode = graph.add(new EndNode()); @@ -522,7 +522,7 @@ } @Override - public void inline(StructuredGraph graph, GraalRuntime runtime, InliningCallback callback) { + public void inline(StructuredGraph graph, ExtendedRiRuntime runtime, InliningCallback callback) { if (Debug.isLogEnabled()) { String targetName = CiUtil.format("%H.%n(%p):%r", invoke.callTarget().targetMethod()); String concreteName = CiUtil.format("%H.%n(%p):%r", concrete); @@ -552,7 +552,7 @@ * @param callback a callback that is used to determine the weight of a specific inlining * @return an instance of InlineInfo, or null if no inlining is possible at the given invoke */ - public static InlineInfo getInlineInfo(Invoke invoke, int level, GraalRuntime runtime, CiAssumptions assumptions, InliningCallback callback, OptimisticOptimizations optimisticOpts) { + public static InlineInfo getInlineInfo(Invoke invoke, int level, ExtendedRiRuntime runtime, CiAssumptions assumptions, InliningCallback callback, OptimisticOptimizations optimisticOpts) { RiResolvedMethod parent = invoke.stateAfter().method(); MethodCallTargetNode callTarget = invoke.callTarget(); RiResolvedMethod targetMethod = callTarget.targetMethod(); @@ -828,7 +828,7 @@ } else { if (unwindNode != null) { UnwindNode unwindDuplicate = (UnwindNode) duplicates.get(unwindNode); - DeoptimizeNode deoptimizeNode = new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, RiDeoptReason.NotCompiledExceptionHandler, invoke.leafGraphId()); + DeoptimizeNode deoptimizeNode = new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.NotCompiledExceptionHandler, invoke.leafGraphId()); unwindDuplicate.replaceAndDelete(graph.add(deoptimizeNode)); // move the deopt upwards if there is a monitor exit that tries to use the "after exception" frame state // (because there is no "after exception" frame state!) @@ -907,8 +907,8 @@ StructuredGraph graph = (StructuredGraph) invoke.graph(); NodeInputList<ValueNode> parameters = callTarget.arguments(); ValueNode firstParam = parameters.size() <= 0 ? null : parameters.get(0); - if (!callTarget.isStatic() && firstParam.kind() == CiKind.Object && !firstParam.objectStamp().nonNull()) { - graph.addBeforeFixed(invoke.node(), graph.add(new FixedGuardNode(graph.unique(new IsNullNode(firstParam)), RiDeoptReason.ClassCastException, RiDeoptAction.InvalidateReprofile, true, invoke.leafGraphId()))); + if (!callTarget.isStatic() && firstParam.kind() == RiKind.Object && !firstParam.objectStamp().nonNull()) { + graph.addBeforeFixed(invoke.node(), graph.add(new FixedGuardNode(graph.unique(new IsNullNode(firstParam)), RiDeoptReason.ClassCastException, CiDeoptAction.InvalidateReprofile, true, invoke.leafGraphId()))); } } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/Util.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/Util.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,10 +24,10 @@ import java.util.*; +import com.oracle.graal.api.code.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; -import com.oracle.max.cri.ci.*; import com.oracle.max.criutils.*; /**
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,13 +24,13 @@ import java.util.concurrent.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.debug.*; import com.oracle.graal.hotspot.ri.*; import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*; @@ -47,18 +47,18 @@ private volatile boolean cancelled; - private final Compiler compiler; + private final HotSpotCompiler compiler; private final PhasePlan plan; private final HotSpotMethodResolved method; private final OptimisticOptimizations optimisticOpts; private final int id; private final int priority; - public static CompilationTask create(Compiler compiler, PhasePlan plan, OptimisticOptimizations optimisticOpts, HotSpotMethodResolved method, int id, int priority) { + public static CompilationTask create(HotSpotCompiler compiler, PhasePlan plan, OptimisticOptimizations optimisticOpts, HotSpotMethodResolved method, int id, int priority) { return new CompilationTask(compiler, plan, optimisticOpts, method, id, priority); } - private CompilationTask(Compiler compiler, PhasePlan plan, OptimisticOptimizations optimisticOpts, HotSpotMethodResolved method, int id, int priority) { + private CompilationTask(HotSpotCompiler compiler, PhasePlan plan, OptimisticOptimizations optimisticOpts, HotSpotMethodResolved method, int id, int priority) { this.compiler = compiler; this.plan = plan; this.method = method;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/Compiler.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2011, 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; - -import com.oracle.graal.compiler.*; -import com.oracle.graal.hotspot.bridge.*; -import com.oracle.graal.hotspot.ri.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; - -public interface Compiler { - - CompilerToVM getCompilerToVM(); - VMToCompiler getVMToCompiler(); - GraalCompiler getCompiler(); - RiType lookupType(String returnType, HotSpotTypeResolved accessingClass, boolean eagerResolve); - HotSpotVMConfig getConfig(); - HotSpotRuntime getRuntime(); - CiTarget getTarget(); - HotSpotGraphCache getCache(); - void evictDeoptedGraphs(); - -}
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerImpl.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,265 +0,0 @@ -/* - * Copyright (c) 2011, 2012, 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; - -import java.io.*; -import java.lang.reflect.*; -import java.net.*; - -import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.cri.*; -import com.oracle.graal.hotspot.bridge.*; -import com.oracle.graal.hotspot.logging.*; -import com.oracle.graal.hotspot.ri.*; -import com.oracle.graal.hotspot.server.*; -import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.xir.*; - -/** - * Singleton class holding the instance of the GraalCompiler. - */ -public final class CompilerImpl implements Compiler, Remote { - - private static Compiler theInstance; - - public static Compiler getInstance() { - if (theInstance == null) { - initialize(); - } - return theInstance; - } - - public static synchronized void initialize() { - if (theInstance != null) { - return; - } - - String remote = System.getProperty("graal.remote"); - if (remote != null) { - // remote compilation (will not create a local Compiler) - try { - System.out.println("Graal compiler started in client/server mode, server: " + remote); - Socket socket = new Socket(remote, 1199); - ReplacingStreams streams = new ReplacingStreams(socket.getOutputStream(), socket.getInputStream()); - streams.getInvocation().sendResult(new CompilerToVMImpl()); - - theInstance = (Compiler) streams.getInvocation().waitForResult(false); - } catch (IOException e1) { - System.out.println("Connection to compilation server FAILED."); - throw new RuntimeException(e1); - } catch (ClassNotFoundException e2) { - System.out.println("Connection to compilation server FAILED."); - throw new RuntimeException(e2); - } - } else { - // ordinary local compilation - theInstance = new CompilerImpl(null); - } - } - - public static Compiler initializeServer(CompilerToVM entries) { - assert theInstance == null; - theInstance = new CompilerImpl(entries); - return theInstance; - } - - private final CompilerToVM compilerToVm; - private final VMToCompiler vmToCompiler; - - private HotSpotRuntime runtime; - private GraalCompiler compiler; - private CiTarget target; - private volatile HotSpotGraphCache cache; - - private final HotSpotVMConfig config; - - public HotSpotVMConfig getConfig() { - return config; - } - - private CompilerImpl(CompilerToVM initialEntries) { - - CompilerToVM toVM = initialEntries; - // initialize CompilerToVM - if (toVM == null) { - toVM = new CompilerToVMImpl(); - } - - // initialize VmToCompiler - VMToCompiler toCompiler = new VMToCompilerImpl(this); - - // logging, etc. - if (CountingProxy.ENABLED) { - toCompiler = CountingProxy.getProxy(VMToCompiler.class, toCompiler); - toVM = CountingProxy.getProxy(CompilerToVM.class, toVM); - } - if (Logger.ENABLED) { - toCompiler = LoggingProxy.getProxy(VMToCompiler.class, toCompiler); - toVM = LoggingProxy.getProxy(CompilerToVM.class, toVM); - } - - // set the final fields - compilerToVm = toVM; - vmToCompiler = toCompiler; - - // initialize compiler - config = compilerToVm.getConfiguration(); - config.check(); - - if (Boolean.valueOf(System.getProperty("graal.printconfig"))) { - printConfig(config); - } - } - - private static void printConfig(HotSpotVMConfig config) { - Field[] fields = config.getClass().getDeclaredFields(); - for (Field f : fields) { - f.setAccessible(true); - try { - Logger.info(String.format("%9s %-40s = %s", f.getType().getSimpleName(), f.getName(), Logger.pretty(f.get(config)))); - } catch (Exception e) { - } - } - } - - @Override - public CiTarget getTarget() { - if (target == null) { - final int wordSize = 8; - final int stackFrameAlignment = 16; - target = new CiTarget(new AMD64(), true, stackFrameAlignment, config.vmPageSize, wordSize, true, true, true); - } - - return target; - } - - /** - * Factory method for getting a {@link GraalRuntime} instance. This method is called via reflection. - */ - public static GraalRuntime getGraalRuntime() { - return getInstance().getRuntime(); - } - - /** - * Factory method for getting a {@link GraalCompiler} instance. This method is called via reflection. - */ - public static GraalCompiler getGraalCompiler() { - return getInstance().getCompiler(); - } - - @Override - public GraalCompiler getCompiler() { - if (compiler == null) { - // these options are important - graal will not generate correct code without them - GraalOptions.StackShadowPages = config.stackShadowPages; - - RiXirGenerator generator = new HotSpotXirGenerator(config, getTarget(), getRuntime().getGlobalStubRegisterConfig(), this); - if (Logger.ENABLED) { - generator = LoggingProxy.getProxy(RiXirGenerator.class, generator); - } - - Backend backend = Backend.create(runtime, target); - generator.initialize(backend.newXirAssembler()); - - compiler = new GraalCompiler(getRuntime(), getTarget(), backend, generator); - if (GraalOptions.CacheGraphs) { - cache = new HotSpotGraphCache(); - } - } - return compiler; - } - - @Override - public HotSpotGraphCache getCache() { - return cache; - } - - @Override - public CompilerToVM getCompilerToVM() { - return compilerToVm; - } - - @Override - public VMToCompiler getVMToCompiler() { - return vmToCompiler; - } - - @Override - public RiType lookupType(String returnType, HotSpotTypeResolved accessingClass, boolean eagerResolve) { - if (returnType.length() == 1 && vmToCompiler instanceof VMToCompilerImpl) { - VMToCompilerImpl exitsNative = (VMToCompilerImpl) vmToCompiler; - CiKind kind = CiKind.fromPrimitiveOrVoidTypeChar(returnType.charAt(0)); - switch(kind) { - case Boolean: - return exitsNative.typeBoolean; - case Byte: - return exitsNative.typeByte; - case Char: - return exitsNative.typeChar; - case Double: - return exitsNative.typeDouble; - case Float: - return exitsNative.typeFloat; - case Illegal: - break; - case Int: - return exitsNative.typeInt; - case Jsr: - break; - case Long: - return exitsNative.typeLong; - case Object: - break; - case Short: - return exitsNative.typeShort; - case Void: - return exitsNative.typeVoid; - } - } - return compilerToVm.RiSignature_lookupType(returnType, accessingClass, eagerResolve); - } - - @Override - public HotSpotRuntime getRuntime() { - if (runtime == null) { - runtime = new HotSpotRuntime(config, this); - } - return runtime; - } - - public void evictDeoptedGraphs() { - if (cache != null) { - long[] deoptedGraphs = getCompilerToVM().getDeoptedLeafGraphIds(); - if (deoptedGraphs != null) { - if (deoptedGraphs.length == 0) { - cache.clear(); - } else { - cache.removeGraphs(deoptedGraphs); - } - } - } - } -}
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerObject.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerObject.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,7 +24,7 @@ import java.io.*; -import com.oracle.max.cri.ci.CiKind.FormatWithToString; +import com.oracle.graal.api.meta.RiKind.*; /** @@ -32,9 +32,9 @@ */ public abstract class CompilerObject implements Serializable, FormatWithToString { private static final long serialVersionUID = -4551670987101214877L; - protected final Compiler compiler; + protected final HotSpotCompiler compiler; - protected CompilerObject(Compiler compiler) { + protected CompilerObject(HotSpotCompiler compiler) { this.compiler = compiler; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerThread.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerThread.java Fri Jun 08 15:17:43 2012 +0200 @@ -58,7 +58,7 @@ public void run() { if (GraalOptions.Debug) { Debug.enable(); - PrintStream log = CompilerImpl.getInstance().getVMToCompiler().log(); + PrintStream log = HotSpotCompilerImpl.getInstance().getVMToCompiler().log(); HotSpotDebugConfig hotspotDebugConfig = new HotSpotDebugConfig(GraalOptions.Log, GraalOptions.Meter, GraalOptions.Time, GraalOptions.Dump, GraalOptions.MethodFilter, log); Debug.setConfig(hotspotDebugConfig); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCompiler.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011, 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; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.compiler.*; +import com.oracle.graal.hotspot.bridge.*; +import com.oracle.graal.hotspot.ri.*; + +public interface HotSpotCompiler { + + CompilerToVM getCompilerToVM(); + VMToCompiler getVMToCompiler(); + GraalCompiler getCompiler(); + RiType lookupType(String returnType, HotSpotTypeResolved accessingClass, boolean eagerResolve); + HotSpotVMConfig getConfig(); + HotSpotRuntime getRuntime(); + CiTarget getTarget(); + HotSpotGraphCache getCache(); + void evictDeoptedGraphs(); + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCompilerImpl.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,265 @@ +/* + * Copyright (c) 2011, 2012, 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; + +import java.io.*; +import java.lang.reflect.*; +import java.net.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.compiler.*; +import com.oracle.graal.compiler.target.*; +import com.oracle.graal.cri.*; +import com.oracle.graal.hotspot.bridge.*; +import com.oracle.graal.hotspot.logging.*; +import com.oracle.graal.hotspot.ri.*; +import com.oracle.graal.hotspot.server.*; +import com.oracle.max.asm.target.amd64.*; +import com.oracle.max.cri.xir.*; + +/** + * Singleton class holding the instance of the GraalCompiler. + */ +public final class HotSpotCompilerImpl implements HotSpotCompiler, Remote { + + private static HotSpotCompiler theInstance; + + public static HotSpotCompiler getInstance() { + if (theInstance == null) { + initialize(); + } + return theInstance; + } + + public static synchronized void initialize() { + if (theInstance != null) { + return; + } + + String remote = System.getProperty("graal.remote"); + if (remote != null) { + // remote compilation (will not create a local Compiler) + try { + System.out.println("Graal compiler started in client/server mode, server: " + remote); + Socket socket = new Socket(remote, 1199); + ReplacingStreams streams = new ReplacingStreams(socket.getOutputStream(), socket.getInputStream()); + streams.getInvocation().sendResult(new CompilerToVMImpl()); + + theInstance = (HotSpotCompiler) streams.getInvocation().waitForResult(false); + } catch (IOException e1) { + System.out.println("Connection to compilation server FAILED."); + throw new RuntimeException(e1); + } catch (ClassNotFoundException e2) { + System.out.println("Connection to compilation server FAILED."); + throw new RuntimeException(e2); + } + } else { + // ordinary local compilation + theInstance = new HotSpotCompilerImpl(null); + } + } + + public static HotSpotCompiler initializeServer(CompilerToVM entries) { + assert theInstance == null; + theInstance = new HotSpotCompilerImpl(entries); + return theInstance; + } + + private final CompilerToVM compilerToVm; + private final VMToCompiler vmToCompiler; + + private HotSpotRuntime runtime; + private GraalCompiler compiler; + private CiTarget target; + private volatile HotSpotGraphCache cache; + + private final HotSpotVMConfig config; + + public HotSpotVMConfig getConfig() { + return config; + } + + private HotSpotCompilerImpl(CompilerToVM initialEntries) { + + CompilerToVM toVM = initialEntries; + // initialize CompilerToVM + if (toVM == null) { + toVM = new CompilerToVMImpl(); + } + + // initialize VmToCompiler + VMToCompiler toCompiler = new VMToCompilerImpl(this); + + // logging, etc. + if (CountingProxy.ENABLED) { + toCompiler = CountingProxy.getProxy(VMToCompiler.class, toCompiler); + toVM = CountingProxy.getProxy(CompilerToVM.class, toVM); + } + if (Logger.ENABLED) { + toCompiler = LoggingProxy.getProxy(VMToCompiler.class, toCompiler); + toVM = LoggingProxy.getProxy(CompilerToVM.class, toVM); + } + + // set the final fields + compilerToVm = toVM; + vmToCompiler = toCompiler; + + // initialize compiler + config = compilerToVm.getConfiguration(); + config.check(); + + if (Boolean.valueOf(System.getProperty("graal.printconfig"))) { + printConfig(config); + } + } + + private static void printConfig(HotSpotVMConfig config) { + Field[] fields = config.getClass().getDeclaredFields(); + for (Field f : fields) { + f.setAccessible(true); + try { + Logger.info(String.format("%9s %-40s = %s", f.getType().getSimpleName(), f.getName(), Logger.pretty(f.get(config)))); + } catch (Exception e) { + } + } + } + + @Override + public CiTarget getTarget() { + if (target == null) { + final int wordSize = 8; + final int stackFrameAlignment = 16; + target = new CiTarget(new AMD64(), true, stackFrameAlignment, config.vmPageSize, wordSize, true, true, true); + } + + return target; + } + + /** + * Factory method for getting a {@link ExtendedRiRuntime} instance. This method is called via reflection. + */ + public static ExtendedRiRuntime getGraalRuntime() { + return getInstance().getRuntime(); + } + + /** + * Factory method for getting a {@link GraalCompiler} instance. This method is called via reflection. + */ + public static GraalCompiler getGraalCompiler() { + return getInstance().getCompiler(); + } + + @Override + public GraalCompiler getCompiler() { + if (compiler == null) { + // these options are important - graal will not generate correct code without them + GraalOptions.StackShadowPages = config.stackShadowPages; + + RiXirGenerator generator = new HotSpotXirGenerator(config, getTarget(), getRuntime().getGlobalStubRegisterConfig(), this); + if (Logger.ENABLED) { + generator = LoggingProxy.getProxy(RiXirGenerator.class, generator); + } + + Backend backend = Backend.create(runtime, target); + generator.initialize(backend.newXirAssembler()); + + compiler = new GraalCompiler(getRuntime(), getTarget(), backend, generator); + if (GraalOptions.CacheGraphs) { + cache = new HotSpotGraphCache(); + } + } + return compiler; + } + + @Override + public HotSpotGraphCache getCache() { + return cache; + } + + @Override + public CompilerToVM getCompilerToVM() { + return compilerToVm; + } + + @Override + public VMToCompiler getVMToCompiler() { + return vmToCompiler; + } + + @Override + public RiType lookupType(String returnType, HotSpotTypeResolved accessingClass, boolean eagerResolve) { + if (returnType.length() == 1 && vmToCompiler instanceof VMToCompilerImpl) { + VMToCompilerImpl exitsNative = (VMToCompilerImpl) vmToCompiler; + RiKind kind = RiKind.fromPrimitiveOrVoidTypeChar(returnType.charAt(0)); + switch(kind) { + case Boolean: + return exitsNative.typeBoolean; + case Byte: + return exitsNative.typeByte; + case Char: + return exitsNative.typeChar; + case Double: + return exitsNative.typeDouble; + case Float: + return exitsNative.typeFloat; + case Illegal: + break; + case Int: + return exitsNative.typeInt; + case Jsr: + break; + case Long: + return exitsNative.typeLong; + case Object: + break; + case Short: + return exitsNative.typeShort; + case Void: + return exitsNative.typeVoid; + } + } + return compilerToVm.RiSignature_lookupType(returnType, accessingClass, eagerResolve); + } + + @Override + public HotSpotRuntime getRuntime() { + if (runtime == null) { + runtime = new HotSpotRuntime(config, this); + } + return runtime; + } + + public void evictDeoptedGraphs() { + if (cache != null) { + long[] deoptedGraphs = getCompilerToVM().getDeoptedLeafGraphIds(); + if (deoptedGraphs != null) { + if (deoptedGraphs.length == 0) { + cache.clear(); + } else { + cache.removeGraphs(deoptedGraphs); + } + } + } + } +}
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugConfig.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugConfig.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,12 +25,12 @@ import java.io.*; import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.printer.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*; public class HotSpotDebugConfig implements DebugConfig {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotTargetMethod.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotTargetMethod.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,8 +24,8 @@ import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiTargetMethod.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiTargetMethod.*; import com.oracle.graal.hotspot.logging.*; import com.oracle.graal.hotspot.ri.*; @@ -42,7 +42,7 @@ public final Site[] sites; public final ExceptionHandler[] exceptionHandlers; - public HotSpotTargetMethod(Compiler compiler, HotSpotMethodResolved method, CiTargetMethod targetMethod) { + public HotSpotTargetMethod(HotSpotCompiler compiler, HotSpotMethodResolved method, CiTargetMethod targetMethod) { super(compiler); this.method = method; this.targetMethod = targetMethod; @@ -56,7 +56,7 @@ } } - private HotSpotTargetMethod(Compiler compiler, CiTargetMethod targetMethod, String name) { + private HotSpotTargetMethod(HotSpotCompiler compiler, CiTargetMethod targetMethod, String name) { super(compiler); this.method = null; this.targetMethod = targetMethod;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; /** * Used to communicate configuration details, runtime offsets, etc. to graal upon compileMethod. @@ -112,7 +112,7 @@ assert stackShadowPages > 0; } - public int getArrayOffset(CiKind kind) { + public int getArrayOffset(RiKind kind) { return arrayOffsets[kind.ordinal()]; } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/MethodFilter.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/MethodFilter.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,8 +25,7 @@ import java.util.*; import java.util.regex.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; /** * This class implements a method filter that can filter based on class name, method name and parameters. @@ -112,7 +111,7 @@ if (methodName != null && !methodName.matcher(o.name()).matches()) { return false; } - if (clazz != null && !clazz.matcher(CiUtil.toJavaName(o.holder())).matches()) { + if (clazz != null && !clazz.matcher(RiUtil.toJavaName(o.holder())).matches()) { return false; } if (signature != null) { @@ -122,7 +121,7 @@ } for (int i = 0; i < signature.length; i++) { RiType type = sig.argumentTypeAt(i, null); - String javaName = CiUtil.toJavaName(type); + String javaName = RiUtil.toJavaName(type); if (signature[i] != null && !signature[i].matcher(javaName).matches()) { return false; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,8 +25,8 @@ import java.lang.reflect.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.ri.*; @@ -73,7 +73,7 @@ RiType RiType_leastCommonAncestor(HotSpotTypeResolved thisType, HotSpotTypeResolved otherType); - RiType getPrimitiveArrayType(CiKind kind); + RiType getPrimitiveArrayType(RiKind kind); RiType RiType_arrayOf(HotSpotTypeResolved klass); @@ -87,11 +87,11 @@ RiType RiType_superType(HotSpotTypeResolved klass); - int getArrayLength(CiConstant array); + int getArrayLength(RiConstant array); - boolean compareConstantObjects(CiConstant x, CiConstant y); + boolean compareConstantObjects(RiConstant x, RiConstant y); - RiType getRiType(CiConstant constant); + RiType getRiType(RiConstant constant); RiResolvedField[] RiType_fields(HotSpotTypeResolved klass);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVMImpl.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVMImpl.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,8 +25,8 @@ import java.lang.reflect.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.ri.*; import com.oracle.graal.hotspot.server.*; @@ -93,7 +93,7 @@ public native RiType RiType_leastCommonAncestor(HotSpotTypeResolved thisType, HotSpotTypeResolved otherType); @Override - public native RiType getPrimitiveArrayType(CiKind kind); + public native RiType getPrimitiveArrayType(RiKind kind); @Override public native RiType RiType_arrayOf(HotSpotTypeResolved klass); @@ -117,17 +117,17 @@ public native RiType getType(Class<?> javaClass); @Override - public int getArrayLength(CiConstant array) { + public int getArrayLength(RiConstant array) { return Array.getLength(array.asObject()); } @Override - public boolean compareConstantObjects(CiConstant x, CiConstant y) { + public boolean compareConstantObjects(RiConstant x, RiConstant y) { return x.asObject() == y.asObject(); } @Override - public RiType getRiType(CiConstant constant) { + public RiType getRiType(RiConstant constant) { Object o = constant.asObject(); if (o == null) { return null;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompiler.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompiler.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,11 +25,10 @@ import java.io.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.hotspot.ri.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * Calls from HotSpot into Java. @@ -58,13 +57,13 @@ RiType createRiTypeUnresolved(String name); - CiConstant createCiConstant(CiKind kind, long value); + RiConstant createCiConstant(RiKind kind, long value); - CiConstant createCiConstantFloat(float value); + RiConstant createCiConstantFloat(float value); - CiConstant createCiConstantDouble(double value); + RiConstant createCiConstantDouble(double value); - CiConstant createCiConstantObject(Object object); + RiConstant createCiConstantObject(Object object); PhasePlan createPhasePlan(OptimisticOptimizations optimisticOpts); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Fri Jun 08 15:17:43 2012 +0200 @@ -29,21 +29,21 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.compiler.phases.PhasePlan.PhasePosition; import com.oracle.graal.debug.*; import com.oracle.graal.debug.internal.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; import com.oracle.graal.hotspot.counters.*; import com.oracle.graal.hotspot.ri.*; import com.oracle.graal.hotspot.server.*; import com.oracle.graal.hotspot.snippets.*; import com.oracle.graal.java.*; import com.oracle.graal.snippets.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*; /** @@ -51,7 +51,7 @@ */ public class VMToCompilerImpl implements VMToCompiler, Remote { - private final Compiler compiler; + private final HotSpotCompiler compiler; private IntrinsifyArrayCopyPhase intrinsifyArrayCopy; public final HotSpotTypePrimitive typeBoolean; @@ -70,18 +70,18 @@ private PrintStream log = System.out; - public VMToCompilerImpl(Compiler compiler) { + public VMToCompilerImpl(HotSpotCompiler compiler) { this.compiler = compiler; - typeBoolean = new HotSpotTypePrimitive(compiler, CiKind.Boolean); - typeChar = new HotSpotTypePrimitive(compiler, CiKind.Char); - typeFloat = new HotSpotTypePrimitive(compiler, CiKind.Float); - typeDouble = new HotSpotTypePrimitive(compiler, CiKind.Double); - typeByte = new HotSpotTypePrimitive(compiler, CiKind.Byte); - typeShort = new HotSpotTypePrimitive(compiler, CiKind.Short); - typeInt = new HotSpotTypePrimitive(compiler, CiKind.Int); - typeLong = new HotSpotTypePrimitive(compiler, CiKind.Long); - typeVoid = new HotSpotTypePrimitive(compiler, CiKind.Void); + typeBoolean = new HotSpotTypePrimitive(compiler, RiKind.Boolean); + typeChar = new HotSpotTypePrimitive(compiler, RiKind.Char); + typeFloat = new HotSpotTypePrimitive(compiler, RiKind.Float); + typeDouble = new HotSpotTypePrimitive(compiler, RiKind.Double); + typeByte = new HotSpotTypePrimitive(compiler, RiKind.Byte); + typeShort = new HotSpotTypePrimitive(compiler, RiKind.Short); + typeInt = new HotSpotTypePrimitive(compiler, RiKind.Int); + typeLong = new HotSpotTypePrimitive(compiler, RiKind.Long); + typeVoid = new HotSpotTypePrimitive(compiler, RiKind.Void); } public void startCompiler() throws Throwable { @@ -454,37 +454,37 @@ } @Override - public CiConstant createCiConstant(CiKind kind, long value) { - if (kind == CiKind.Long) { - return CiConstant.forLong(value); - } else if (kind == CiKind.Int) { - return CiConstant.forInt((int) value); - } else if (kind == CiKind.Short) { - return CiConstant.forShort((short) value); - } else if (kind == CiKind.Char) { - return CiConstant.forChar((char) value); - } else if (kind == CiKind.Byte) { - return CiConstant.forByte((byte) value); - } else if (kind == CiKind.Boolean) { - return (value == 0) ? CiConstant.FALSE : CiConstant.TRUE; + public RiConstant createCiConstant(RiKind kind, long value) { + if (kind == RiKind.Long) { + return RiConstant.forLong(value); + } else if (kind == RiKind.Int) { + return RiConstant.forInt((int) value); + } else if (kind == RiKind.Short) { + return RiConstant.forShort((short) value); + } else if (kind == RiKind.Char) { + return RiConstant.forChar((char) value); + } else if (kind == RiKind.Byte) { + return RiConstant.forByte((byte) value); + } else if (kind == RiKind.Boolean) { + return (value == 0) ? RiConstant.FALSE : RiConstant.TRUE; } else { throw new IllegalArgumentException(); } } @Override - public CiConstant createCiConstantFloat(float value) { - return CiConstant.forFloat(value); + public RiConstant createCiConstantFloat(float value) { + return RiConstant.forFloat(value); } @Override - public CiConstant createCiConstantDouble(double value) { - return CiConstant.forDouble(value); + public RiConstant createCiConstantDouble(double value) { + return RiConstant.forDouble(value); } @Override - public CiConstant createCiConstantObject(Object object) { - return CiConstant.forObject(object); + public RiConstant createCiConstantObject(Object object) { + return RiConstant.forObject(object); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/counters/MethodEntryCounters.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/counters/MethodEntryCounters.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,24 +22,24 @@ */ package com.oracle.graal.hotspot.counters; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; import sun.misc.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.gen.*; import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; import com.oracle.graal.lir.*; import com.oracle.graal.lir.amd64.*; import com.oracle.graal.lir.asm.*; import com.oracle.max.asm.*; import com.oracle.max.asm.target.amd64.*; import com.oracle.max.asm.target.amd64.AMD64Assembler.ConditionFlag; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*; @@ -69,8 +69,8 @@ protected final Counter counter; - protected AMD64MethodEntryOp(Counter counter, CiValue counterArr, CiValue callerPc) { - super("ENTRY_COUNTER", LIRInstruction.NO_OPERANDS, null, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS, new CiValue[] {counterArr, callerPc}); + protected AMD64MethodEntryOp(Counter counter, RiValue counterArr, RiValue callerPc) { + super("ENTRY_COUNTER", LIRInstruction.NO_OPERANDS, null, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS, new RiValue[] {counterArr, callerPc}); this.counter = counter; } @@ -78,19 +78,19 @@ public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { int start = masm.codeBuffer.position(); - CiValue counterArr = temp(0); - CiValue callerPc = temp(1); + RiValue counterArr = temp(0); + RiValue callerPc = temp(1); int off = Unsafe.getUnsafe().arrayBaseOffset(long[].class); int scale = Unsafe.getUnsafe().arrayIndexScale(long[].class); - AMD64Move.move(tasm, masm, counterArr, CiConstant.forObject(counter.counts)); - AMD64Move.load(tasm, masm, callerPc, new CiAddress(CiKind.Long, AMD64.rbp.asValue(CiKind.Long), 8), null); + AMD64Move.move(tasm, masm, counterArr, RiConstant.forObject(counter.counts)); + AMD64Move.load(tasm, masm, callerPc, new CiAddress(RiKind.Long, AMD64.rbp.asValue(RiKind.Long), 8), null); Label done = new Label(); for (int i = 0; i < counter.counts.length - 2; i += 2) { - CiAddress counterPcAddr = new CiAddress(CiKind.Long, counterArr, i * scale + off); - CiAddress counterValueAddr = new CiAddress(CiKind.Long, counterArr, (i + 1) * scale + off); + CiAddress counterPcAddr = new CiAddress(RiKind.Long, counterArr, i * scale + off); + CiAddress counterValueAddr = new CiAddress(RiKind.Long, counterArr, (i + 1) * scale + off); Label skipClaim = new Label(); masm.cmpq(counterPcAddr, 0); @@ -106,7 +106,7 @@ masm.bind(skipInc); } - CiAddress counterValueAddr = new CiAddress(CiKind.Long, counterArr, (counter.counts.length - 1) * scale + off); + CiAddress counterValueAddr = new CiAddress(RiKind.Long, counterArr, (counter.counts.length - 1) * scale + off); masm.addq(counterValueAddr, 1); masm.bind(done); @@ -131,7 +131,7 @@ if (!GraalOptions.MethodEntryCounters) { return; } - gen.append(new AMD64MethodEntryOp(new Counter(method), gen.newVariable(CiKind.Long), gen.newVariable(CiKind.Long))); + gen.append(new AMD64MethodEntryOp(new Counter(method), gen.newVariable(RiKind.Long), gen.newVariable(RiKind.Long))); } public static int getCodeSize() { @@ -142,7 +142,7 @@ } - public static void printCounters(Compiler compiler) { + public static void printCounters(HotSpotCompiler compiler) { if (!GraalOptions.MethodEntryCounters) { return; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ArrayWriteBarrier.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ArrayWriteBarrier.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.spi.*; @@ -47,7 +47,7 @@ @Override public void generate(LIRGeneratorTool gen) { - CiValue addr = gen.emitLea(gen.makeAddress(location(), object())); + RiValue addr = gen.emitLea(gen.makeAddress(location(), object())); generateBarrier(addr, gen); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentThread.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentThread.java Fri Jun 08 15:17:43 2012 +0200 @@ -23,8 +23,8 @@ package com.oracle.graal.hotspot.nodes; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; @@ -40,7 +40,7 @@ @Override public void generate(LIRGeneratorTool generator) { - generator.setResult(this, generator.emitLoad(new CiAddress(CiKind.Object, AMD64.r15.asValue(generator.target().wordKind), threadObjectOffset), false)); + generator.setResult(this, generator.emitLoad(new CiAddress(RiKind.Object, AMD64.r15.asValue(generator.target().wordKind), threadObjectOffset), false)); } @SuppressWarnings("unused")
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/FieldWriteBarrier.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/FieldWriteBarrier.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -40,7 +40,7 @@ @Override public void generate(LIRGeneratorTool generator) { - CiValue obj = generator.newVariable(generator.target().wordKind); + RiValue obj = generator.newVariable(generator.target().wordKind); generator.emitMove(generator.operand(object()), obj); generateBarrier(obj, generator); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,8 +25,8 @@ import java.lang.reflect.*; import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.gen.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.target.amd64.*; @@ -57,20 +57,20 @@ @Override public void generate(LIRGeneratorTool generator) { LIRGenerator gen = (LIRGenerator) generator; - HotSpotVMConfig config = CompilerImpl.getInstance().getConfig(); + HotSpotVMConfig config = HotSpotCompilerImpl.getInstance().getConfig(); RiResolvedMethod method = frameState.method(); boolean isStatic = Modifier.isStatic(method.accessFlags()); - CiKind[] signature = CiUtil.signatureToKinds(method.signature(), isStatic ? null : method.holder().kind(true)); + RiKind[] signature = CiUtil.signatureToKinds(method.signature(), isStatic ? null : method.holder().kind(true)); CiCallingConvention cc = gen.frameMap().registerConfig.getCallingConvention(CiCallingConvention.Type.JavaCall, signature, gen.target(), false); gen.frameMap().callsMethod(cc, CiCallingConvention.Type.JavaCall); // TODO (aw): I think this is unnecessary for a tail call. List<ValueNode> parameters = new ArrayList<>(); for (int i = 0, slot = 0; i < cc.locations.length; i++, slot += FrameStateBuilder.stackSlots(frameState.localAt(slot).kind())) { parameters.add(frameState.localAt(slot)); } - List<CiValue> argList = gen.visitInvokeArguments(cc, parameters); + List<RiValue> argList = gen.visitInvokeArguments(cc, parameters); - CiValue entry = gen.emitLoad(new CiAddress(CiKind.Long, gen.operand(target), config.nmethodEntryOffset), false); + RiValue entry = gen.emitLoad(new CiAddress(RiKind.Long, gen.operand(target), config.nmethodEntryOffset), false); gen.append(new AMD64TailcallOp(argList, entry, cc.locations)); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/WriteBarrier.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/WriteBarrier.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -34,17 +35,17 @@ super(StampFactory.forVoid()); } - protected void generateBarrier(CiValue adr, LIRGeneratorTool gen) { - HotSpotVMConfig config = CompilerImpl.getInstance().getConfig(); - CiValue base = gen.emitUShr(adr, CiConstant.forInt(config.cardtableShift)); + protected void generateBarrier(RiValue adr, LIRGeneratorTool gen) { + HotSpotVMConfig config = HotSpotCompilerImpl.getInstance().getConfig(); + RiValue base = gen.emitUShr(adr, RiConstant.forInt(config.cardtableShift)); long startAddress = config.cardtableStartAddress; int displacement = 0; if (((int) startAddress) == startAddress) { displacement = (int) startAddress; } else { - base = gen.emitAdd(base, CiConstant.forLong(config.cardtableStartAddress)); + base = gen.emitAdd(base, RiConstant.forLong(config.cardtableStartAddress)); } - gen.emitStore(new CiAddress(CiKind.Boolean, base, displacement), CiConstant.FALSE, false); + gen.emitStore(new CiAddress(RiKind.Boolean, base, displacement), RiConstant.FALSE, false); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCodeInfo.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCodeInfo.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.ri; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.hotspot.HotSpotCompiler; /** * Implementation of {@link RiCodeInfo} for HotSpot. @@ -39,7 +39,7 @@ public final CiTargetMethod targetMethod; private HotSpotMethodResolved method; - public HotSpotCodeInfo(Compiler compiler, CiTargetMethod targetMethod, HotSpotMethodResolved method) { + public HotSpotCodeInfo(HotSpotCompiler compiler, CiTargetMethod targetMethod, HotSpotMethodResolved method) { super(compiler); assert targetMethod != null; this.method = method; @@ -64,11 +64,6 @@ } @Override - public CiTargetMethod targetMethod() { - return targetMethod; - } - - @Override public RiResolvedMethod method() { return method; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCompiledMethod.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCompiledMethod.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,10 +24,10 @@ import java.lang.reflect.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; /** * Implementation of RiCompiledMethod for HotSpot. @@ -42,7 +42,7 @@ private final RiResolvedMethod method; private long nmethod; - public HotSpotCompiledMethod(Compiler compiler, RiResolvedMethod method) { + public HotSpotCompiledMethod(HotSpotCompiler compiler, RiResolvedMethod method) { super(compiler); this.method = method; } @@ -65,14 +65,14 @@ @Override public Object execute(Object arg1, Object arg2, Object arg3) { assert method.signature().argumentCount(!Modifier.isStatic(method.accessFlags())) == 3; - assert method.signature().argumentKindAt(0, false) == CiKind.Object; - assert method.signature().argumentKindAt(1, false) == CiKind.Object; - assert !Modifier.isStatic(method.accessFlags()) || method.signature().argumentKindAt(2, false) == CiKind.Object; + assert method.signature().argumentKindAt(0, false) == RiKind.Object; + assert method.signature().argumentKindAt(1, false) == RiKind.Object; + assert !Modifier.isStatic(method.accessFlags()) || method.signature().argumentKindAt(2, false) == RiKind.Object; return compiler.getCompilerToVM().executeCompiledMethod(this, arg1, arg2, arg3); } private boolean checkArgs(Object... args) { - CiKind[] sig = CiUtil.signatureToKinds(method); + RiKind[] sig = CiUtil.signatureToKinds(method); assert args.length == sig.length : CiUtil.format("%H.%n(%p): expected ", method) + sig.length + " args, got " + args.length; for (int i = 0; i < sig.length; i++) { Object arg = args[i];
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotConstantPool.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotConstantPool.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.ri; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; /** * Implementation of RiConstantPool for HotSpot. @@ -35,7 +35,7 @@ private final HotSpotTypeResolvedImpl type; - public HotSpotConstantPool(Compiler compiler, HotSpotTypeResolvedImpl type) { + public HotSpotConstantPool(HotSpotCompiler compiler, HotSpotTypeResolvedImpl type) { super(compiler); this.type = type; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotExceptionHandler.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotExceptionHandler.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.ri; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotField.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotField.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,12 +26,12 @@ import java.lang.annotation.*; import java.lang.reflect.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiType.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiType.*; import com.oracle.graal.compiler.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; /** * Represents a field in a HotSpot type. @@ -44,9 +44,9 @@ private final RiType type; private final int offset; private final int accessFlags; - private CiConstant constant; // Constant part only valid for static fields. + private RiConstant constant; // Constant part only valid for static fields. - public HotSpotField(Compiler compiler, RiResolvedType holder, String name, RiType type, int offset, int accessFlags) { + public HotSpotField(HotSpotCompiler compiler, RiResolvedType holder, String name, RiType type, int offset, int accessFlags) { super(compiler); this.holder = holder; this.name = name; @@ -62,13 +62,13 @@ } @Override - public CiConstant constantValue(CiConstant receiver) { + public RiConstant constantValue(RiConstant receiver) { if (receiver == null) { assert Modifier.isStatic(accessFlags); if (constant == null) { if (holder.isInitialized() && holder.toJava() != System.class) { if (Modifier.isFinal(accessFlags()) || assumeStaticFieldsFinal(holder.toJava())) { - CiConstant encoding = holder.getEncoding(Representation.StaticFields); + RiConstant encoding = holder.getEncoding(Representation.StaticFields); constant = this.kind(false).readUnsafeConstant(encoding.asObject(), offset); } } @@ -94,7 +94,7 @@ } @Override - public CiKind kind(boolean architecture) { + public RiKind kind(boolean architecture) { return type().kind(architecture); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotGraphCache.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotGraphCache.java Fri Jun 08 15:17:43 2012 +0200 @@ -27,10 +27,10 @@ import java.util.*; import java.util.Map.Entry; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.cri.*; import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ri.*; /** * This class implements the graph caching system for the HotSpot platform.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotKlassOop.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotKlassOop.java Fri Jun 08 15:17:43 2012 +0200 @@ -23,7 +23,7 @@ package com.oracle.graal.hotspot.ri; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; /** * A mechanism for safely conveying a HotSpot klassOop value from the compiler to the C++ code. @@ -40,7 +40,7 @@ */ public final Class javaMirror; - public HotSpotKlassOop(Compiler compiler, Class javaMirror) { + public HotSpotKlassOop(HotSpotCompiler compiler, Class javaMirror) { super(compiler); this.javaMirror = javaMirror; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethod.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethod.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,16 +22,16 @@ */ package com.oracle.graal.hotspot.ri; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; public abstract class HotSpotMethod extends CompilerObject implements RiMethod { private static final long serialVersionUID = 7167491397941960839L; protected String name; - protected HotSpotMethod(Compiler compiler) { + protected HotSpotMethod(HotSpotCompiler compiler) { super(compiler); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodData.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodData.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,11 +26,11 @@ import sun.misc.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiTypeProfile.*; import com.oracle.graal.compiler.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiTypeProfile.*; +import com.oracle.graal.hotspot.HotSpotCompiler; public final class HotSpotMethodData extends CompilerObject { @@ -38,7 +38,7 @@ private static final long serialVersionUID = -8873133496591225071L; static { - config = CompilerImpl.getInstance().getConfig(); + config = HotSpotCompilerImpl.getInstance().getConfig(); } // TODO (chaeubl) use same logic as in NodeClass? @@ -57,7 +57,7 @@ private int normalDataSize; private int extraDataSize; - private HotSpotMethodData(Compiler compiler) { + private HotSpotMethodData(HotSpotCompiler compiler) { super(compiler); throw new IllegalStateException("this constructor is never actually called, because the objects are allocated from within the VM"); } @@ -344,7 +344,7 @@ Object graalMirror = unsafe.getObject(receiverKlassOop, (long) config.graalMirrorKlassOffset); if (graalMirror == null) { Class<?> javaClass = (Class<?>) unsafe.getObject(receiverKlassOop, (long) config.classMirrorOffset); - graalMirror = CompilerImpl.getInstance().getCompilerToVM().getType(javaClass); + graalMirror = HotSpotCompilerImpl.getInstance().getCompilerToVM().getType(javaClass); assert graalMirror != null : "must not return null"; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodDataAccessor.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodDataAccessor.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.ri; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; /** * Interface for accessor objects that encapsulate the logic for accessing the different kinds of data in a HotSpot methodDataOop.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodResolved.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodResolved.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.ri; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.server.*;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodResolvedImpl.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodResolvedImpl.java Fri Jun 08 15:17:43 2012 +0200 @@ -28,12 +28,12 @@ import java.util.*; import java.util.concurrent.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.counters.*; import com.oracle.graal.java.bytecode.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*; /** @@ -141,7 +141,7 @@ throw new UnsupportedOperationException("jniSymbol"); } - public CiBitMap[] livenessMap() { + public RiBitMap[] livenessMap() { return null; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodUnresolved.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodUnresolved.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.ri; -import com.oracle.max.cri.ri.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.hotspot.HotSpotCompiler; /** * Implementation of RiMethod for unresolved HotSpot methods. @@ -33,7 +33,7 @@ private final RiSignature signature; protected RiType holder; - public HotSpotMethodUnresolved(Compiler compiler, String name, String signature, RiType holder) { + public HotSpotMethodUnresolved(HotSpotCompiler compiler, String name, String signature, RiType holder) { super(compiler); this.name = name; this.holder = holder;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotProfilingInfo.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotProfilingInfo.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.hotspot.ri; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; public final class HotSpotProfilingInfo extends CompilerObject implements RiProfilingInfo { @@ -41,7 +41,7 @@ private HotSpotMethodData methodData; private final int codeSize; - public HotSpotProfilingInfo(Compiler compiler, HotSpotMethodData methodData, int codeSize) { + public HotSpotProfilingInfo(HotSpotCompiler compiler, HotSpotMethodData methodData, int codeSize) { super(compiler); this.methodData = methodData; this.codeSize = codeSize;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRegisterConfig.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRegisterConfig.java Fri Jun 08 15:17:43 2012 +0200 @@ -27,14 +27,14 @@ import java.util.*; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiCallingConvention.Type; -import com.oracle.max.cri.ci.CiRegister.RegisterFlag; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiCallingConvention.*; +import com.oracle.graal.api.code.CiRegister.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.hotspot.*; -public class HotSpotRegisterConfig implements RiRegisterConfig { +public class HotSpotRegisterConfig implements CiRegisterConfig { // be careful - the contents of this array are duplicated in graal_CodeInstaller.cpp private final CiRegister[] allocatable = { @@ -45,7 +45,7 @@ private final EnumMap<RegisterFlag, CiRegister[]> categorized = CiRegister.categorize(allocatable); - private final RiRegisterAttributes[] attributesMap; + private final CiRegisterAttributes[] attributesMap; @Override public CiRegister[] getAllocatableRegisters() { @@ -58,7 +58,7 @@ } @Override - public RiRegisterAttributes[] getAttributesMap() { + public CiRegisterAttributes[] getAttributesMap() { return attributesMap; } @@ -92,7 +92,7 @@ csl = new CiCalleeSaveLayout(0, size, 8, regs); } - attributesMap = RiRegisterAttributes.createMap(this, AMD64.allRegisters); + attributesMap = CiRegisterAttributes.createMap(this, AMD64.allRegisters); allParameterRegisters = Arrays.copyOf(generalParameterRegisters, generalParameterRegisters.length + xmmParameterRegisters.length); System.arraycopy(xmmParameterRegisters, 0, allParameterRegisters, generalParameterRegisters.length, xmmParameterRegisters.length); } @@ -108,7 +108,7 @@ } @Override - public CiCallingConvention getCallingConvention(Type type, CiKind[] parameters, CiTarget target, boolean stackOnly) { + public CiCallingConvention getCallingConvention(Type type, RiKind[] parameters, CiTarget target, boolean stackOnly) { if (type == Type.NativeCall) { throw new UnsupportedOperationException(); } @@ -119,15 +119,15 @@ return allParameterRegisters; } - private CiCallingConvention callingConvention(CiKind[] types, Type type, CiTarget target, boolean stackOnly) { - CiValue[] locations = new CiValue[types.length]; + private CiCallingConvention callingConvention(RiKind[] types, Type type, CiTarget target, boolean stackOnly) { + RiValue[] locations = new RiValue[types.length]; int currentGeneral = 0; int currentXMM = 0; int currentStackOffset = 0; for (int i = 0; i < types.length; i++) { - final CiKind kind = types[i]; + final RiKind kind = types[i]; switch (kind) { case Byte: @@ -163,7 +163,7 @@ } @Override - public CiRegister getReturnRegister(CiKind kind) { + public CiRegister getReturnRegister(RiKind kind) { switch (kind) { case Boolean: case Byte:
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Fri Jun 08 15:17:43 2012 +0200 @@ -27,12 +27,17 @@ import java.lang.reflect.*; import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiTargetMethod.*; +import com.oracle.graal.api.code.CiUtil.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiType.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.target.*; import com.oracle.graal.cri.*; import com.oracle.graal.graph.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; import com.oracle.graal.hotspot.nodes.*; import com.oracle.graal.hotspot.snippets.*; import com.oracle.graal.hotspot.target.amd64.*; @@ -42,27 +47,19 @@ import com.oracle.graal.nodes.java.*; import com.oracle.graal.nodes.type.*; import com.oracle.graal.snippets.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiTargetMethod.Call; -import com.oracle.max.cri.ci.CiTargetMethod.DataPatch; -import com.oracle.max.cri.ci.CiTargetMethod.Mark; -import com.oracle.max.cri.ci.CiTargetMethod.Safepoint; -import com.oracle.max.cri.ci.CiUtil.RefMapFormatter; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiType.Representation; import com.oracle.max.criutils.*; /** * CRI runtime implementation for the HotSpot VM. */ -public class HotSpotRuntime implements GraalRuntime { +public class HotSpotRuntime implements ExtendedRiRuntime { public final HotSpotVMConfig config; final HotSpotRegisterConfig regConfig; private final HotSpotRegisterConfig globalStubRegConfig; - private final Compiler compiler; + private final HotSpotCompiler compiler; private CheckCastSnippets.Templates checkcasts; - public HotSpotRuntime(HotSpotVMConfig config, Compiler compiler) { + public HotSpotRuntime(HotSpotVMConfig config, HotSpotCompiler compiler) { this.config = config; this.compiler = compiler; regConfig = new HotSpotRegisterConfig(config, false); @@ -80,16 +77,15 @@ } - public Compiler getCompiler() { + public HotSpotCompiler getCompiler() { return compiler; } @Override - public String disassemble(RiCodeInfo info) { + public String disassemble(RiCodeInfo info, CiTargetMethod tm) { byte[] code = info.code(); CiTarget target = compiler.getTarget(); HexCodeFile hcf = new HexCodeFile(code, info.start(), target.arch.name, target.wordSize * 8); - CiTargetMethod tm = info.targetMethod(); if (tm != null) { HexCodeFile.addAnnotations(hcf, tm.annotations()); addExceptionHandlersComment(tm, hcf); @@ -184,12 +180,12 @@ } @Override - public RiResolvedType asRiType(CiKind kind) { + public RiResolvedType asRiType(RiKind kind) { return (RiResolvedType) compiler.getCompilerToVM().getType(kind.toJavaClass()); } @Override - public RiResolvedType getTypeOf(CiConstant constant) { + public RiResolvedType getTypeOf(RiConstant constant) { return (RiResolvedType) compiler.getCompilerToVM().getRiType(constant); } @@ -200,12 +196,12 @@ } @Override - public boolean areConstantObjectsEqual(CiConstant x, CiConstant y) { + public boolean areConstantObjectsEqual(RiConstant x, RiConstant y) { return compiler.getCompilerToVM().compareConstantObjects(x, y); } @Override - public RiRegisterConfig getRegisterConfig(RiMethod method) { + public CiRegisterConfig getRegisterConfig(RiMethod method) { return regConfig; } @@ -224,7 +220,7 @@ } @Override - public int getArrayLength(CiConstant array) { + public int getArrayLength(RiConstant array) { return compiler.getCompilerToVM().getArrayLength(array); } @@ -239,7 +235,7 @@ } else if (n instanceof LoadFieldNode) { LoadFieldNode field = (LoadFieldNode) n; int displacement = ((HotSpotField) field.field()).offset(); - assert field.kind() != CiKind.Illegal; + assert field.kind() != RiKind.Illegal; ReadNode memoryRead = graph.add(new ReadNode(field.object(), LocationNode.create(field.field(), field.field().kind(true), displacement, graph), field.stamp())); memoryRead.dependencies().add(tool.createNullCheckGuard(field.object(), field.leafGraphId())); graph.replaceFixedWithFixed(field, memoryRead); @@ -258,7 +254,7 @@ graph.replaceFixedWithFixed(storeField, memoryWrite); FixedWithNextNode last = memoryWrite; - if (field.kind(true) == CiKind.Object && !memoryWrite.value().isNullConstant()) { + if (field.kind(true) == RiKind.Object && !memoryWrite.value().isNullConstant()) { FieldWriteBarrier writeBarrier = graph.add(new FieldWriteBarrier(memoryWrite.object())); graph.addAfterFixed(memoryWrite, writeBarrier); last = writeBarrier; @@ -273,7 +269,7 @@ // Separate out GC barrier semantics CompareAndSwapNode cas = (CompareAndSwapNode) n; ValueNode expected = cas.expected(); - if (expected.kind() == CiKind.Object && !cas.newValue().isNullConstant()) { + if (expected.kind() == RiKind.Object && !cas.newValue().isNullConstant()) { RiResolvedType type = cas.object().objectStamp().type(); if (type != null && !type.isArrayClass() && type.toJava() != Object.class) { // Use a field write barrier since it's not an array store @@ -290,7 +286,7 @@ ValueNode boundsCheck = createBoundsCheck(loadIndexed, tool); - CiKind elementKind = loadIndexed.elementKind(); + RiKind elementKind = loadIndexed.elementKind(); LocationNode arrayLocation = createArrayLocation(graph, elementKind, loadIndexed.index()); ReadNode memoryRead = graph.add(new ReadNode(loadIndexed.array(), arrayLocation, loadIndexed.stamp())); memoryRead.dependencies().add(boundsCheck); @@ -299,12 +295,12 @@ StoreIndexedNode storeIndexed = (StoreIndexedNode) n; ValueNode boundsCheck = createBoundsCheck(storeIndexed, tool); - CiKind elementKind = storeIndexed.elementKind(); + RiKind elementKind = storeIndexed.elementKind(); LocationNode arrayLocation = createArrayLocation(graph, elementKind, storeIndexed.index()); ValueNode value = storeIndexed.value(); CheckCastNode checkcast = null; ValueNode array = storeIndexed.array(); - if (elementKind == CiKind.Object && !value.isNullConstant()) { + if (elementKind == RiKind.Object && !value.isNullConstant()) { // Store check! RiResolvedType arrayType = array.objectStamp().type(); if (arrayType != null && array.objectStamp().isExactType()) { @@ -319,9 +315,9 @@ } } else { ValueNode guard = tool.createNullCheckGuard(array, StructuredGraph.INVALID_GRAPH_ID); - FloatingReadNode arrayClass = graph.unique(new FloatingReadNode(array, LocationNode.create(LocationNode.FINAL_LOCATION, CiKind.Object, config.hubOffset, graph), null, StampFactory.objectNonNull())); + FloatingReadNode arrayClass = graph.unique(new FloatingReadNode(array, LocationNode.create(LocationNode.FINAL_LOCATION, RiKind.Object, config.hubOffset, graph), null, StampFactory.objectNonNull())); arrayClass.dependencies().add(guard); - FloatingReadNode arrayElementKlass = graph.unique(new FloatingReadNode(arrayClass, LocationNode.create(LocationNode.FINAL_LOCATION, CiKind.Object, config.arrayClassElementOffset, graph), null, StampFactory.objectNonNull())); + FloatingReadNode arrayElementKlass = graph.unique(new FloatingReadNode(arrayClass, LocationNode.create(LocationNode.FINAL_LOCATION, RiKind.Object, config.arrayClassElementOffset, graph), null, StampFactory.objectNonNull())); checkcast = graph.add(new CheckCastNode(arrayElementKlass, null, value)); graph.addBeforeFixed(storeIndexed, checkcast); value = checkcast; @@ -333,12 +329,12 @@ graph.replaceFixedWithFixed(storeIndexed, memoryWrite); - if (elementKind == CiKind.Object && !value.isNullConstant()) { + if (elementKind == RiKind.Object && !value.isNullConstant()) { graph.addAfterFixed(memoryWrite, graph.add(new ArrayWriteBarrier(array, arrayLocation))); } } else if (n instanceof UnsafeLoadNode) { UnsafeLoadNode load = (UnsafeLoadNode) n; - assert load.kind() != CiKind.Illegal; + assert load.kind() != RiKind.Illegal; IndexedLocationNode location = IndexedLocationNode.create(LocationNode.ANY_LOCATION, load.loadKind(), load.displacement(), load.offset(), graph, false); ReadNode memoryRead = graph.add(new ReadNode(load.object(), location, load.stamp())); memoryRead.dependencies().add(tool.createNullCheckGuard(load.object(), StructuredGraph.INVALID_GRAPH_ID)); @@ -349,13 +345,13 @@ WriteNode write = graph.add(new WriteNode(store.object(), store.value(), location)); write.setStateAfter(store.stateAfter()); graph.replaceFixedWithFixed(store, write); - if (write.value().kind() == CiKind.Object && !write.value().isNullConstant()) { + if (write.value().kind() == RiKind.Object && !write.value().isNullConstant()) { FieldWriteBarrier barrier = graph.add(new FieldWriteBarrier(write.object())); graph.addBeforeFixed(write, barrier); } } else if (n instanceof ReadHubNode) { ReadHubNode objectClassNode = (ReadHubNode) n; - LocationNode location = LocationNode.create(LocationNode.FINAL_LOCATION, CiKind.Object, config.hubOffset, graph); + LocationNode location = LocationNode.create(LocationNode.FINAL_LOCATION, RiKind.Object, config.hubOffset, graph); ReadNode memoryRead = graph.add(new ReadNode(objectClassNode.object(), location, StampFactory.objectNonNull())); memoryRead.dependencies().add(tool.createNullCheckGuard(objectClassNode.object(), StructuredGraph.INVALID_GRAPH_ID)); graph.replaceFixed(objectClassNode, memoryRead); @@ -380,18 +376,18 @@ return false; } - private IndexedLocationNode createArrayLocation(Graph graph, CiKind elementKind, ValueNode index) { + private IndexedLocationNode createArrayLocation(Graph graph, RiKind elementKind, ValueNode index) { return IndexedLocationNode.create(LocationNode.getArrayLocation(elementKind), elementKind, config.getArrayOffset(elementKind), index, graph, true); } private SafeReadNode safeReadArrayLength(ValueNode array, long leafGraphId) { - return safeRead(array.graph(), CiKind.Int, array, config.arrayLengthOffset, StampFactory.positiveInt(), leafGraphId); + return safeRead(array.graph(), RiKind.Int, array, config.arrayLengthOffset, StampFactory.positiveInt(), leafGraphId); } private static ValueNode createBoundsCheck(AccessIndexedNode n, CiLoweringTool tool) { StructuredGraph graph = (StructuredGraph) n.graph(); ArrayLengthNode arrayLength = graph.add(new ArrayLengthNode(n.array())); - ValueNode guard = tool.createGuard(graph.unique(new IntegerBelowThanNode(n.index(), arrayLength)), RiDeoptReason.BoundsCheckException, RiDeoptAction.InvalidateReprofile, n.leafGraphId()); + ValueNode guard = tool.createGuard(graph.unique(new IntegerBelowThanNode(n.index(), arrayLength)), RiDeoptReason.BoundsCheckException, CiDeoptAction.InvalidateReprofile, n.leafGraphId()); graph.addBeforeFixed(n, arrayLength); return guard; @@ -417,7 +413,7 @@ LocalNode receiver = graph.unique(new LocalNode(0, StampFactory.objectNonNull())); SafeReadNode klassOop = safeReadHub(graph, receiver, StructuredGraph.INVALID_GRAPH_ID); Stamp resultStamp = StampFactory.declaredNonNull(getType(Class.class)); - FloatingReadNode result = graph.unique(new FloatingReadNode(klassOop, LocationNode.create(LocationNode.FINAL_LOCATION, CiKind.Object, config.classMirrorOffset, graph), null, resultStamp)); + FloatingReadNode result = graph.unique(new FloatingReadNode(klassOop, LocationNode.create(LocationNode.FINAL_LOCATION, RiKind.Object, config.classMirrorOffset, graph), null, resultStamp)); ReturnNode ret = graph.add(new ReturnNode(result)); graph.start().setNext(klassOop); klassOop.setNext(ret); @@ -427,10 +423,10 @@ if (fullName.equals("getModifiers()I")) { StructuredGraph graph = new StructuredGraph(); LocalNode receiver = graph.unique(new LocalNode(0, StampFactory.objectNonNull())); - SafeReadNode klassOop = safeRead(graph, CiKind.Object, receiver, config.klassOopOffset, StampFactory.objectNonNull(), StructuredGraph.INVALID_GRAPH_ID); + SafeReadNode klassOop = safeRead(graph, RiKind.Object, receiver, config.klassOopOffset, StampFactory.objectNonNull(), StructuredGraph.INVALID_GRAPH_ID); graph.start().setNext(klassOop); // TODO(thomaswue): Care about primitive classes! Crashes for primitive classes at the moment (klassOop == null) - FloatingReadNode result = graph.unique(new FloatingReadNode(klassOop, LocationNode.create(LocationNode.FINAL_LOCATION, CiKind.Int, config.klassModifierFlagsOffset, graph), null, StampFactory.intValue())); + FloatingReadNode result = graph.unique(new FloatingReadNode(klassOop, LocationNode.create(LocationNode.FINAL_LOCATION, RiKind.Int, config.klassModifierFlagsOffset, graph), null, StampFactory.intValue())); ReturnNode ret = graph.add(new ReturnNode(result)); klassOop.setNext(ret); return graph; @@ -447,10 +443,10 @@ } private SafeReadNode safeReadHub(Graph graph, ValueNode value, long leafGraphId) { - return safeRead(graph, CiKind.Object, value, config.hubOffset, StampFactory.objectNonNull(), leafGraphId); + return safeRead(graph, RiKind.Object, value, config.hubOffset, StampFactory.objectNonNull(), leafGraphId); } - private static SafeReadNode safeRead(Graph graph, CiKind kind, ValueNode value, int offset, Stamp stamp, long leafGraphId) { + private static SafeReadNode safeRead(Graph graph, RiKind kind, ValueNode value, int offset, Stamp stamp, long leafGraphId) { return graph.add(new SafeReadNode(value, LocationNode.create(LocationNode.FINAL_LOCATION, kind, offset, graph), stamp, leafGraphId)); } @@ -479,7 +475,6 @@ return hsInfo; } - @Override public void installMethod(RiResolvedMethod method, CiTargetMethod code, RiCodeInfo[] info) { HotSpotCodeInfo hsInfo = makeInfo(method, code, info); compiler.getCompilerToVM().installMethod(new HotSpotTargetMethod(compiler, (HotSpotMethodResolved) method, code), true, hsInfo); @@ -492,7 +487,7 @@ } @Override - public RiRegisterConfig getGlobalStubRegisterConfig() { + public CiRegisterConfig getGlobalStubRegisterConfig() { return globalStubRegConfig; } @@ -503,7 +498,7 @@ } @Override - public int encodeDeoptActionAndReason(RiDeoptAction action, RiDeoptReason reason) { + public int encodeDeoptActionAndReason(CiDeoptAction action, RiDeoptReason reason) { final int actionShift = 0; final int reasonShift = 3; @@ -513,7 +508,7 @@ } @Override - public int convertDeoptAction(RiDeoptAction action) { + public int convertDeoptAction(CiDeoptAction action) { switch(action) { case None: return 0; case RecompileIfTooManyDeopts: return 1;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotSignature.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotSignature.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,10 +24,9 @@ import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; import com.oracle.graal.java.*; /** @@ -42,7 +41,7 @@ private RiType[] argumentTypes; private RiType returnTypeCache; - public HotSpotSignature(Compiler compiler, String signature) { + public HotSpotSignature(HotSpotCompiler compiler, String signature) { super(compiler); assert signature.length() > 0; this.originalString = signature; @@ -100,8 +99,8 @@ } @Override - public CiKind argumentKindAt(int index, boolean architecture) { - return CiKind.fromTypeString(arguments.get(index)); + public RiKind argumentKindAt(int index, boolean architecture) { + return RiKind.fromTypeString(arguments.get(index)); } @Override @@ -132,8 +131,8 @@ } @Override - public CiKind returnKind(boolean architecture) { - return CiKind.fromTypeString(returnType); + public RiKind returnKind(boolean architecture) { + return RiKind.fromTypeString(returnType); } @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotType.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotType.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.ri; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; /** * Common interface for all HotSpot RiType-implementations. @@ -33,7 +33,7 @@ private static final long serialVersionUID = -4252886265301910771L; protected String name; - protected HotSpotType(Compiler compiler) { + protected HotSpotType(HotSpotCompiler compiler) { super(compiler); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypePrimitive.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypePrimitive.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,10 +25,9 @@ import java.lang.annotation.*; import java.lang.reflect.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; /** * Implementation of RiType for primitive HotSpot types. @@ -36,10 +35,10 @@ public final class HotSpotTypePrimitive extends HotSpotType implements RiResolvedType { private static final long serialVersionUID = -6208552348908071473L; - private CiKind kind; + private RiKind kind; private final HotSpotKlassOop klassOop; - public HotSpotTypePrimitive(Compiler compiler, CiKind kind) { + public HotSpotTypePrimitive(HotSpotCompiler compiler, RiKind kind) { super(compiler); this.kind = kind; this.name = String.valueOf(Character.toUpperCase(kind.typeChar)); @@ -78,12 +77,12 @@ } @Override - public CiConstant getEncoding(Representation r) { + public RiConstant getEncoding(Representation r) { throw GraalInternalError.unimplemented("HotSpotTypePrimitive.getEncoding"); } @Override - public CiKind getRepresentationKind(Representation r) { + public RiKind getRepresentationKind(Representation r) { return kind; } @@ -113,7 +112,7 @@ } @Override - public boolean isInstance(CiConstant obj) { + public boolean isInstance(RiConstant obj) { return false; } @@ -133,7 +132,7 @@ } @Override - public CiKind kind(boolean architecture) { + public RiKind kind(boolean architecture) { return kind; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeResolved.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeResolved.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.ri; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.server.*; public interface HotSpotTypeResolved extends RiResolvedType, Remote {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeResolvedImpl.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeResolvedImpl.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,9 +26,8 @@ import java.lang.reflect.*; import java.util.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * Implementation of RiType for resolved non-primitive HotSpot classes. @@ -115,22 +114,22 @@ } @Override - public CiConstant getEncoding(Representation r) { + public RiConstant getEncoding(Representation r) { switch (r) { case JavaClass: - return CiConstant.forObject(javaMirror); + return RiConstant.forObject(javaMirror); case ObjectHub: - return CiConstant.forObject(klassOop()); + return RiConstant.forObject(klassOop()); case StaticFields: - return CiConstant.forObject(javaMirror); + return RiConstant.forObject(javaMirror); default: return null; } } @Override - public CiKind getRepresentationKind(Representation r) { - return CiKind.Object; + public RiKind getRepresentationKind(Representation r) { + return RiKind.Object; } @Override @@ -162,7 +161,7 @@ } @Override - public boolean isInstance(CiConstant obj) { + public boolean isInstance(RiConstant obj) { return javaMirror.isInstance(obj); } @@ -186,8 +185,8 @@ } @Override - public CiKind kind(boolean architecture) { - return CiKind.Object; + public RiKind kind(boolean architecture) { + return RiKind.Object; } @Override @@ -277,7 +276,7 @@ return klassOopCache; } - private static final int SECONDARY_SUPER_CACHE_OFFSET = CompilerImpl.getInstance().getConfig().secondarySuperCacheOffset; + private static final int SECONDARY_SUPER_CACHE_OFFSET = HotSpotCompilerImpl.getInstance().getConfig().secondarySuperCacheOffset; public boolean isPrimaryType() { return SECONDARY_SUPER_CACHE_OFFSET != superCheckOffset;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeUnresolved.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeUnresolved.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,10 +22,9 @@ */ package com.oracle.graal.hotspot.ri; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; /** * Implementation of RiType for unresolved HotSpot classes. @@ -39,7 +38,7 @@ /** * Creates a new unresolved type for a specified type descriptor. */ - public HotSpotTypeUnresolved(Compiler compiler, String name) { + public HotSpotTypeUnresolved(HotSpotCompiler compiler, String name) { super(compiler); assert name.length() > 0 : "name cannot be empty"; @@ -63,7 +62,7 @@ this.dimensions = dims; } - public HotSpotTypeUnresolved(Compiler compiler, String name, int dimensions) { + public HotSpotTypeUnresolved(HotSpotCompiler compiler, String name, int dimensions) { super(compiler); assert dimensions >= 0; this.simpleName = name; @@ -92,8 +91,8 @@ } @Override - public CiKind kind(boolean architecture) { - return CiKind.Object; + public RiKind kind(boolean architecture) { + return RiKind.Object; } @Override @@ -112,8 +111,8 @@ } @Override - public CiKind getRepresentationKind(RiType.Representation r) { - return CiKind.Object; + public RiKind getRepresentationKind(RiType.Representation r) { + return RiKind.Object; } @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.ri; +import static com.oracle.graal.api.code.CiValueUtil.*; import static com.oracle.graal.hotspot.ri.TemplateFlag.*; -import static com.oracle.max.cri.ci.CiValueUtil.*; import java.io.*; import java.util.*; @@ -31,14 +31,14 @@ import sun.misc.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiAddress.*; +import com.oracle.graal.api.code.CiRegister.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.CiAddress.Scale; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiRegister.RegisterFlag; -import com.oracle.max.cri.ri.*; import com.oracle.max.cri.xir.*; import com.oracle.max.cri.xir.CiXirAssembler.XirConstant; import com.oracle.max.cri.xir.CiXirAssembler.XirLabel; @@ -75,13 +75,13 @@ private final HotSpotVMConfig config; private final CiTarget target; - private final RiRegisterConfig registerConfig; - private final Compiler compiler; + private final CiRegisterConfig registerConfig; + private final HotSpotCompiler compiler; private CiXirAssembler globalAsm; - public HotSpotXirGenerator(HotSpotVMConfig config, CiTarget target, RiRegisterConfig registerConfig, Compiler compiler) { + public HotSpotXirGenerator(HotSpotVMConfig config, CiTarget target, CiRegisterConfig registerConfig, HotSpotCompiler compiler) { this.config = config; this.target = target; this.registerConfig = registerConfig; @@ -89,19 +89,19 @@ } private XirConstant wordConst(CiXirAssembler asm, long value) { - if (target.wordKind == CiKind.Long) { - return asm.createConstant(CiConstant.forLong(value)); + if (target.wordKind == RiKind.Long) { + return asm.createConstant(RiConstant.forLong(value)); } else { - assert target.wordKind == CiKind.Int; - return asm.createConstant(CiConstant.forInt((int) value)); + assert target.wordKind == RiKind.Int; + return asm.createConstant(RiConstant.forInt((int) value)); } } private XirArgument wordArg(long value) { - if (target.wordKind == CiKind.Long) { + if (target.wordKind == RiKind.Long) { return XirArgument.forLong(value); } else { - assert target.wordKind == CiKind.Int; + assert target.wordKind == RiKind.Int; return XirArgument.forInt((int) value); } } @@ -111,17 +111,17 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags) { asm.restart(); - XirParameter receiver = asm.createInputParameter("receiver", CiKind.Object); + XirParameter receiver = asm.createInputParameter("receiver", RiKind.Object); XirParameter addr = asm.createConstantInputParameter("addr", target.wordKind); XirOperand temp = asm.createRegisterTemp("temp", target.wordKind, AMD64.rax); - XirOperand tempO = asm.createRegister("tempO", CiKind.Object, AMD64.rax); + XirOperand tempO = asm.createRegister("tempO", RiKind.Object, AMD64.rax); if (is(NULL_CHECK, flags)) { asm.mark(MARK_IMPLICIT_NULL); asm.pload(target.wordKind, temp, receiver, true); } asm.mark(MARK_INVOKEINTERFACE); - asm.mov(tempO, asm.createConstant(CiConstant.forObject(HotSpotProxy.DUMMY_CONSTANT_OBJ))); + asm.mov(tempO, asm.createConstant(RiConstant.forObject(HotSpotProxy.DUMMY_CONSTANT_OBJ))); return asm.finishTemplate(addr, "invokeinterface"); } @@ -132,17 +132,17 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags) { asm.restart(); - XirParameter receiver = asm.createInputParameter("receiver", CiKind.Object); + XirParameter receiver = asm.createInputParameter("receiver", RiKind.Object); XirParameter addr = asm.createConstantInputParameter("addr", target.wordKind); XirOperand temp = asm.createRegisterTemp("temp", target.wordKind, AMD64.rax); - XirOperand tempO = asm.createRegister("tempO", CiKind.Object, AMD64.rax); + XirOperand tempO = asm.createRegister("tempO", RiKind.Object, AMD64.rax); if (is(NULL_CHECK, flags)) { asm.mark(MARK_IMPLICIT_NULL); asm.pload(target.wordKind, temp, receiver, true); } asm.mark(MARK_INVOKEVIRTUAL); - asm.mov(tempO, asm.createConstant(CiConstant.forObject(HotSpotProxy.DUMMY_CONSTANT_OBJ))); + asm.mov(tempO, asm.createConstant(RiConstant.forObject(HotSpotProxy.DUMMY_CONSTANT_OBJ))); return asm.finishTemplate(addr, "invokevirtual"); } @@ -153,9 +153,9 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags, int vtableEntryOffset) { asm.restart(); - XirParameter receiver = asm.createInputParameter("receiver", CiKind.Object); + XirParameter receiver = asm.createInputParameter("receiver", RiKind.Object); XirOperand temp = asm.createRegisterTemp("temp", target.wordKind, AMD64.rax); - XirOperand method = asm.createRegisterTemp("method", CiKind.Object, AMD64.rbx); + XirOperand method = asm.createRegisterTemp("method", RiKind.Object, AMD64.rbx); // load class from receiver if (is(NULL_CHECK, flags)) { @@ -178,7 +178,7 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags) { asm.restart(); - XirParameter receiver = asm.createInputParameter("receiver", CiKind.Object); + XirParameter receiver = asm.createInputParameter("receiver", RiKind.Object); XirParameter addr = asm.createConstantInputParameter("addr", target.wordKind); XirOperand temp = asm.createRegisterTemp("temp", target.wordKind, AMD64.rax); XirLabel stub = asm.createOutOfLineLabel("call stub"); @@ -229,8 +229,8 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags) { - asm.restart(CiKind.Void); - XirParameter object = asm.createInputParameter("object", CiKind.Object); + asm.restart(RiKind.Void); + XirParameter object = asm.createInputParameter("object", RiKind.Object); XirParameter lock = asm.createInputParameter("lock", target.wordKind); if (is(NULL_CHECK, flags)) { @@ -251,7 +251,7 @@ } else { asm.reserveOutgoingStack(target.wordSize * 2); XirOperand rsp = asm.createRegister("rsp", target.wordKind, asRegister(AMD64.RSP)); - asm.pstore(CiKind.Object, rsp, asm.i(target.wordSize), object, false); + asm.pstore(RiKind.Object, rsp, asm.i(target.wordSize), object, false); asm.pstore(target.wordKind, rsp, asm.i(0), lock, false); asm.callRuntime(config.monitorEnterStub, null, useInfoAfter); } @@ -268,8 +268,8 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags) { - asm.restart(CiKind.Void); - XirParameter object = asm.createInputParameter("object", CiKind.Object); + asm.restart(RiKind.Void); + XirParameter object = asm.createInputParameter("object", RiKind.Object); XirParameter lock = asm.createInputParameter("lock", target.wordKind); if (config.useFastLocking) { @@ -292,18 +292,18 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags, int size) { XirOperand result = asm.restart(target.wordKind); - XirOperand hub = asm.createInputParameter("hub", CiKind.Object); + XirOperand hub = asm.createInputParameter("hub", RiKind.Object); XirOperand temp1 = asm.createRegisterTemp("temp1", target.wordKind, AMD64.rcx); - XirOperand temp1o = asm.createRegister("temp1o", CiKind.Object, AMD64.rcx); + XirOperand temp1o = asm.createRegister("temp1o", RiKind.Object, AMD64.rcx); XirOperand temp2 = asm.createRegisterTemp("temp2", target.wordKind, AMD64.rbx); - XirOperand temp2i = asm.createRegister("temp2i", CiKind.Int, AMD64.rbx); + XirOperand temp2i = asm.createRegister("temp2i", RiKind.Int, AMD64.rbx); useRegisters(asm, AMD64.rsi); XirLabel tlabFull = asm.createOutOfLineLabel("tlab full"); XirLabel resume = asm.createInlineLabel("resume"); // check if the class is already initialized - asm.pload(CiKind.Int, temp2i, hub, asm.i(config.klassStateOffset), false); + asm.pload(RiKind.Int, temp2i, hub, asm.i(config.klassStateOffset), false); asm.jneq(tlabFull, temp2i, asm.i(config.klassStateFullyInitialized)); XirOperand thread = asm.createRegisterTemp("thread", target.wordKind, AMD64.r15); @@ -319,7 +319,7 @@ asm.pload(target.wordKind, temp1, hub, asm.i(config.instanceHeaderPrototypeOffset), false); asm.pstore(target.wordKind, result, temp1, false); asm.mov(temp1o, hub); // need a temporary register since Intel cannot store 64-bit constants to memory - asm.pstore(CiKind.Object, result, asm.i(config.hubOffset), temp1o, false); + asm.pstore(RiKind.Object, result, asm.i(config.hubOffset), temp1o, false); if (size > 2 * target.wordSize) { asm.mov(temp1, wordConst(asm, 0)); @@ -330,7 +330,7 @@ // -- out of line ------------------------------------------------------- asm.bindOutOfLine(tlabFull); - XirOperand arg = asm.createRegisterTemp("runtime call argument", CiKind.Object, AMD64.rdx); + XirOperand arg = asm.createRegisterTemp("runtime call argument", RiKind.Object, AMD64.rdx); asm.mov(arg, hub); useRegisters(asm, AMD64.rax); asm.callRuntime(config.newInstanceStub, result); @@ -344,28 +344,28 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags) { - emitNewTypeArray(asm, CiKind.Object, config.useFastNewObjectArray, config.newObjectArrayStub); + emitNewTypeArray(asm, RiKind.Object, config.useFastNewObjectArray, config.newObjectArrayStub); return asm.finishTemplate("newObjectArray"); } }; - private void emitNewTypeArray(CiXirAssembler asm, CiKind kind, boolean useFast, long slowPathStub) { + private void emitNewTypeArray(CiXirAssembler asm, RiKind kind, boolean useFast, long slowPathStub) { XirOperand result = asm.restart(target.wordKind); - XirParameter lengthParam = asm.createInputParameter("length", CiKind.Int, true); + XirParameter lengthParam = asm.createInputParameter("length", RiKind.Int, true); - XirOperand length = asm.createRegisterTemp("length", CiKind.Int, AMD64.rbx); - XirOperand hub = asm.createRegisterTemp("hub", CiKind.Object, AMD64.rdx); + XirOperand length = asm.createRegisterTemp("length", RiKind.Int, AMD64.rbx); + XirOperand hub = asm.createRegisterTemp("hub", RiKind.Object, AMD64.rdx); // Registers rsi, rcx, rdi, and rax are needed by the runtime call. // Hub needs to be on rdx, length on rbx. XirOperand temp1 = asm.createRegisterTemp("temp1", target.wordKind, AMD64.rcx); - XirOperand temp1o = asm.createRegister("temp1o", CiKind.Object, AMD64.rcx); + XirOperand temp1o = asm.createRegister("temp1o", RiKind.Object, AMD64.rcx); XirOperand temp2 = asm.createRegisterTemp("temp2", target.wordKind, AMD64.rax); XirOperand temp3 = asm.createRegisterTemp("temp3", target.wordKind, AMD64.rdi); - XirOperand size = asm.createRegisterTemp("size", CiKind.Int, AMD64.rsi); + XirOperand size = asm.createRegisterTemp("size", RiKind.Int, AMD64.rsi); - asm.mov(hub, asm.createConstantInputParameter("hub", CiKind.Object)); + asm.mov(hub, asm.createConstantInputParameter("hub", RiKind.Object)); asm.mov(length, lengthParam); if (useFast) { @@ -405,10 +405,10 @@ asm.pload(target.wordKind, temp1, hub, asm.i(config.instanceHeaderPrototypeOffset), false); asm.pstore(target.wordKind, result, temp1, false); asm.mov(temp1o, hub); // need a temporary register since Intel cannot store 64-bit constants to memory - asm.pstore(CiKind.Object, result, asm.i(config.hubOffset), temp1o, false); + asm.pstore(RiKind.Object, result, asm.i(config.hubOffset), temp1o, false); // Store array length - asm.pstore(CiKind.Int, result, asm.i(arrayLengthOffset), length, false); + asm.pstore(RiKind.Int, result, asm.i(arrayLengthOffset), length, false); // Initialize with 0 XirLabel top = asm.createInlineLabel("top"); @@ -433,7 +433,7 @@ private KindTemplates newTypeArrayTemplates = new KindTemplates() { @Override - protected XirTemplate create(CiXirAssembler asm, long flags, CiKind kind) { + protected XirTemplate create(CiXirAssembler asm, long flags, RiKind kind) { emitNewTypeArray(asm, kind, config.useFastNewTypeArray, config.newTypeArrayStub); return asm.finishTemplate("newTypeArray<" + kind.toString() + ">"); } @@ -443,19 +443,19 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags, int dimensions) { - XirOperand result = asm.restart(CiKind.Object); + XirOperand result = asm.restart(RiKind.Object); - XirOperand hub = asm.createRegisterTemp("hub", CiKind.Object, AMD64.rax); - XirOperand rank = asm.createRegisterTemp("rank", CiKind.Int, AMD64.rbx); - XirOperand sizes = asm.createRegisterTemp("sizes", CiKind.Long, AMD64.rcx); - XirOperand thread = asm.createRegisterTemp("thread", CiKind.Long, AMD64.r15); + XirOperand hub = asm.createRegisterTemp("hub", RiKind.Object, AMD64.rax); + XirOperand rank = asm.createRegisterTemp("rank", RiKind.Int, AMD64.rbx); + XirOperand sizes = asm.createRegisterTemp("sizes", RiKind.Long, AMD64.rcx); + XirOperand thread = asm.createRegisterTemp("thread", RiKind.Long, AMD64.r15); asm.add(sizes, thread, asm.l(config.threadMultiNewArrayStorage)); for (int i = 0; i < dimensions; i++) { - XirParameter length = asm.createInputParameter("length" + i, CiKind.Int, true); - asm.pstore(CiKind.Int, sizes, asm.i(i * target.sizeInBytes(CiKind.Int)), length, false); + XirParameter length = asm.createInputParameter("length" + i, RiKind.Int, true); + asm.pstore(RiKind.Int, sizes, asm.i(i * target.sizeInBytes(RiKind.Int)), length, false); } - asm.mov(hub, asm.createConstantInputParameter("hub", CiKind.Object)); + asm.mov(hub, asm.createConstantInputParameter("hub", RiKind.Object)); asm.mov(rank, asm.i(dimensions)); // not necessary because we already have a temp in rax: useRegisters(asm, AMD64.rax); @@ -491,21 +491,21 @@ int disp = Unsafe.getUnsafe().arrayBaseOffset(long[].class); Scale scale = Scale.fromInt(Unsafe.getUnsafe().arrayIndexScale(long[].class)); XirConstant index = asm.i(offset.ordinal()); - asm.pload(CiKind.Long, counter, counters, index, disp, scale, false); + asm.pload(RiKind.Long, counter, counters, index, disp, scale, false); asm.add(counter, counter, asm.i(1)); - asm.pstore(CiKind.Long, counters, index, counter, disp, scale, false); + asm.pstore(RiKind.Long, counters, index, counter, disp, scale, false); } @Override protected XirTemplate create(CiXirAssembler asm, long flags, int hintCount) { - asm.restart(CiKind.Void); + asm.restart(RiKind.Void); boolean exact = is(EXACT_HINTS, flags); - XirParameter counters = GraalOptions.CheckcastCounters ? asm.createConstantInputParameter("counters", CiKind.Object) : null; - XirParameter object = asm.createInputParameter("object", CiKind.Object); - final XirOperand hub = exact ? null : asm.createConstantInputParameter("hub", CiKind.Object); + XirParameter counters = GraalOptions.CheckcastCounters ? asm.createConstantInputParameter("counters", RiKind.Object) : null; + XirParameter object = asm.createInputParameter("object", RiKind.Object); + final XirOperand hub = exact ? null : asm.createConstantInputParameter("hub", RiKind.Object); - XirOperand objHub = asm.createTemp("objHub", CiKind.Object); - XirOperand counter = counters != null ? asm.createTemp("counter", CiKind.Long) : null; + XirOperand objHub = asm.createTemp("objHub", RiKind.Object); + XirOperand counter = counters != null ? asm.createTemp("counter", RiKind.Long) : null; XirLabel success = asm.createInlineLabel("success"); XirLabel slowPath = asm.createOutOfLineLabel("slow path"); @@ -524,7 +524,7 @@ } - asm.pload(CiKind.Object, objHub, object, asm.i(config.hubOffset), false); + asm.pload(RiKind.Object, objHub, object, asm.i(config.hubOffset), false); if (hintCount == 0) { assert !exact; if (counters != null) { @@ -547,10 +547,10 @@ asm.bindOutOfLine(slowPath); } else { XirLabel hintsSuccess = counters == null ? success : asm.createInlineLabel("hintsSuccess"); - XirOperand scratchObject = asm.createRegisterTemp("scratch", CiKind.Object, AMD64.r10); + XirOperand scratchObject = asm.createRegisterTemp("scratch", RiKind.Object, AMD64.r10); // if we get an exact match: succeed immediately for (int i = 0; i < hintCount; i++) { - XirParameter hintHub = asm.createConstantInputParameter("hintHub" + i, CiKind.Object); + XirParameter hintHub = asm.createConstantInputParameter("hintHub" + i, RiKind.Object); asm.mov(scratchObject, hintHub); if (i < hintCount - 1) { asm.jeq(hintsSuccess, objHub, scratchObject); @@ -582,7 +582,7 @@ } RiDeoptReason deoptReason = exact ? RiDeoptReason.OptimizedTypeCheckViolated : RiDeoptReason.ClassCastException; XirOperand scratch = asm.createRegisterTemp("scratch", target.wordKind, AMD64.r10); - asm.mov(scratch, wordConst(asm, compiler.getRuntime().encodeDeoptActionAndReason(RiDeoptAction.InvalidateReprofile, deoptReason))); + asm.mov(scratch, wordConst(asm, compiler.getRuntime().encodeDeoptActionAndReason(CiDeoptAction.InvalidateReprofile, deoptReason))); asm.callRuntime(CiRuntimeCall.Deoptimize, null); asm.shouldNotReachHere(); @@ -594,11 +594,11 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags, int hintCount) { - asm.restart(CiKind.Void); - XirParameter object = asm.createInputParameter("object", CiKind.Object); - final XirOperand hub = is(EXACT_HINTS, flags) ? null : asm.createConstantInputParameter("hub", CiKind.Object); + asm.restart(RiKind.Void); + XirParameter object = asm.createInputParameter("object", RiKind.Object); + final XirOperand hub = is(EXACT_HINTS, flags) ? null : asm.createConstantInputParameter("hub", RiKind.Object); - XirOperand objHub = asm.createTemp("objHub", CiKind.Object); + XirOperand objHub = asm.createTemp("objHub", RiKind.Object); XirLabel trueSucc = asm.createInlineLabel(XirLabel.TrueSuccessor); XirLabel falseSucc = asm.createInlineLabel(XirLabel.FalseSuccessor); @@ -608,7 +608,7 @@ asm.jeq(falseSucc, object, asm.o(null)); } - asm.pload(CiKind.Object, objHub, object, asm.i(config.hubOffset), false); + asm.pload(RiKind.Object, objHub, object, asm.i(config.hubOffset), false); if (hintCount == 0) { assert !is(EXACT_HINTS, flags); checkSubtype(asm, objHub, objHub, hub); @@ -616,11 +616,11 @@ asm.jmp(trueSucc); } else { XirLabel slowPath = null; - XirOperand scratchObject = asm.createRegisterTemp("scratch", CiKind.Object, AMD64.r10); + XirOperand scratchObject = asm.createRegisterTemp("scratch", RiKind.Object, AMD64.r10); // if we get an exact match: succeed immediately for (int i = 0; i < hintCount; i++) { - XirParameter hintHub = asm.createConstantInputParameter("hintHub" + i, CiKind.Object); + XirParameter hintHub = asm.createConstantInputParameter("hintHub" + i, RiKind.Object); asm.mov(scratchObject, hintHub); if (i < hintCount - 1) { asm.jeq(trueSucc, objHub, scratchObject); @@ -653,13 +653,13 @@ @Override protected XirTemplate create(CiXirAssembler asm, long flags, int hintCount) { - XirOperand result = asm.restart(CiKind.Int); - XirParameter object = asm.createInputParameter("object", CiKind.Object); - final XirOperand hub = is(EXACT_HINTS, flags) ? null : asm.createConstantInputParameter("hub", CiKind.Object); - XirOperand trueValue = asm.createInputParameter("trueValue", CiKind.Int); - XirOperand falseValue = asm.createInputParameter("falseValue", CiKind.Int); + XirOperand result = asm.restart(RiKind.Int); + XirParameter object = asm.createInputParameter("object", RiKind.Object); + final XirOperand hub = is(EXACT_HINTS, flags) ? null : asm.createConstantInputParameter("hub", RiKind.Object); + XirOperand trueValue = asm.createInputParameter("trueValue", RiKind.Int); + XirOperand falseValue = asm.createInputParameter("falseValue", RiKind.Int); - XirOperand objHub = asm.createTemp("objHub", CiKind.Object); + XirOperand objHub = asm.createTemp("objHub", RiKind.Object); XirLabel end = asm.createInlineLabel("end"); XirLabel falseSucc = asm.createInlineLabel("ko"); @@ -669,7 +669,7 @@ asm.jeq(falseSucc, object, asm.o(null)); } - asm.pload(CiKind.Object, objHub, object, asm.i(config.hubOffset), false); + asm.pload(RiKind.Object, objHub, object, asm.i(config.hubOffset), false); asm.mov(result, trueValue); if (hintCount == 0) { @@ -681,11 +681,11 @@ asm.bindInline(end); } else { XirLabel slowPath = null; - XirOperand scratchObject = asm.createRegisterTemp("scratch", CiKind.Object, AMD64.r10); + XirOperand scratchObject = asm.createRegisterTemp("scratch", RiKind.Object, AMD64.r10); // if we get an exact match: succeed immediately for (int i = 0; i < hintCount; i++) { - XirParameter hintHub = asm.createConstantInputParameter("hintHub" + i, CiKind.Object); + XirParameter hintHub = asm.createConstantInputParameter("hintHub" + i, RiKind.Object); asm.mov(scratchObject, hintHub); if (i < hintCount - 1) { asm.jeq(end, objHub, scratchObject); @@ -719,12 +719,12 @@ private SimpleTemplates typeCheckTemplates = new SimpleTemplates(NULL_CHECK) { @Override protected XirTemplate create(CiXirAssembler asm, long flags) { - asm.restart(CiKind.Void); - XirParameter objHub = asm.createInputParameter("objectHub", CiKind.Object); - XirOperand hub = asm.createConstantInputParameter("hub", CiKind.Object); + asm.restart(RiKind.Void); + XirParameter objHub = asm.createInputParameter("objectHub", RiKind.Object); + XirOperand hub = asm.createConstantInputParameter("hub", RiKind.Object); XirLabel falseSucc = asm.createInlineLabel(XirLabel.FalseSuccessor); - XirOperand checkHub = asm.createTemp("checkHub", CiKind.Object); + XirOperand checkHub = asm.createTemp("checkHub", RiKind.Object); if (is(NULL_CHECK, flags)) { asm.mark(MARK_IMPLICIT_NULL); @@ -788,8 +788,8 @@ } @Override - public XirSnippet genNewArray(XirSite site, XirArgument length, CiKind elementKind, RiType componentType, RiType arrayType) { - if (elementKind == CiKind.Object) { + public XirSnippet genNewArray(XirSite site, XirArgument length, RiKind elementKind, RiType componentType, RiType arrayType) { + if (elementKind == RiKind.Object) { assert arrayType instanceof RiResolvedType; return new XirSnippet(newObjectArrayTemplates.get(site), length, XirArgument.forObject(((HotSpotType) arrayType).klassOop())); } else { @@ -907,7 +907,7 @@ private static void useRegisters(CiXirAssembler asm, CiRegister... registers) { if (registers != null) { for (CiRegister register : registers) { - asm.createRegisterTemp("reg", CiKind.Illegal, register); + asm.createRegisterTemp("reg", RiKind.Illegal, register); } } } @@ -999,12 +999,12 @@ @Override protected final XirTemplate create(CiXirAssembler asm, long flags) { - return create(asm, flags & FLAGS_MASK, CiKind.VALUES[(int) (flags & INDEX_MASK)]); + return create(asm, flags & FLAGS_MASK, RiKind.VALUES[(int) (flags & INDEX_MASK)]); } - protected abstract XirTemplate create(CiXirAssembler asm, long flags, CiKind kind); + protected abstract XirTemplate create(CiXirAssembler asm, long flags, RiKind kind); - public XirTemplate get(XirSite site, CiKind kind, TemplateFlag... flags) { + public XirTemplate get(XirSite site, RiKind kind, TemplateFlag... flags) { return getInternal(getBits(kind.ordinal(), site, flags)); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/server/CompilationServer.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/server/CompilationServer.java Fri Jun 08 15:17:43 2012 +0200 @@ -29,7 +29,7 @@ import javax.net.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.Compiler; +import com.oracle.graal.hotspot.HotSpotCompiler; import com.oracle.graal.hotspot.bridge.*; import com.oracle.graal.hotspot.logging.*; @@ -44,9 +44,9 @@ public interface ConnectionObserver { - void connectionStarted(Compiler compiler); + void connectionStarted(HotSpotCompiler compiler); - void connectionFinished(Compiler compiler); + void connectionFinished(HotSpotCompiler compiler); } private final boolean multiple; @@ -92,7 +92,7 @@ CompilerToVM toVM = (CompilerToVM) streams.getInvocation().waitForResult(false); // return the initialized compiler to the client - Compiler compiler = CompilerImpl.initializeServer(toVM); + HotSpotCompiler compiler = HotSpotCompilerImpl.initializeServer(toVM); compiler.getCompiler(); streams.getInvocation().sendResult(compiler);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/server/ReplacingStreams.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/server/ReplacingStreams.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,7 +26,7 @@ import java.lang.reflect.*; import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.*; public class ReplacingStreams { @@ -46,7 +46,7 @@ input = new ReplacingInputStream(new BufferedInputStream(inputStream)); invocation = new InvocationSocket(output, input); - addStaticObject(CiValue.IllegalValue); + addStaticObject(RiValue.IllegalValue); addStaticObject(HotSpotProxy.DUMMY_CONSTANT_OBJ); } @@ -165,9 +165,9 @@ } // is the object a constant of object type? - if (obj.getClass() == CiConstant.class) { - CiConstant constant = (CiConstant) obj; - if (constant.kind != CiKind.Object) { + if (obj.getClass() == RiConstant.class) { + RiConstant constant = (RiConstant) obj; + if (constant.kind != RiKind.Object) { return obj; } Object contents = constant.asObject(); @@ -180,12 +180,12 @@ } placeholder = objectMap.get(contents); if (placeholder != null) { - return CiConstant.forObject(placeholder); + return RiConstant.forObject(placeholder); } if (contents instanceof Remote) { - return CiConstant.forObject(createRemoteCallPlaceholder(contents)); + return RiConstant.forObject(createRemoteCallPlaceholder(contents)); } - return CiConstant.forObject(createDummyPlaceholder(contents)); + return RiConstant.forObject(createDummyPlaceholder(contents)); } return obj; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ArrayCopySnippets.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ArrayCopySnippets.java Fri Jun 08 15:17:43 2012 +0200 @@ -21,6 +21,7 @@ * questions. */ package com.oracle.graal.hotspot.snippets; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.Node.Fold; import com.oracle.graal.hotspot.*; import com.oracle.graal.nodes.*; @@ -28,7 +29,6 @@ import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; import com.oracle.graal.snippets.*; -import com.oracle.max.cri.ci.*; @SuppressWarnings("unused") @@ -221,14 +221,14 @@ if (srcPos < 0 || destPos < 0 || length < 0 || srcPos + length > src.length || destPos + length > dest.length) { throw new IndexOutOfBoundsException(); } - final int scale = arrayIndexScale(CiKind.Object); + final int scale = arrayIndexScale(RiKind.Object); if (src == dest && srcPos < destPos) { // bad aliased case copyObjectsDown(src, srcPos * scale, dest, destPos * scale, length); } else { copyObjectsUp(src, srcPos * scale, dest, destPos * scale, length); } if (length > 0) { - int header = arrayBaseOffset(CiKind.Object); + int header = arrayBaseOffset(RiKind.Object); int cardShift = cardTableShift(); long cardStart = cardTableStart(); long dstAddr = GetObjectAddressNode.get(dest); @@ -243,47 +243,47 @@ @Snippet public static void copyBytesDown(Object src, int srcPos, Object dest, int destPos, int length) { - int header = arrayBaseOffset(CiKind.Byte); + int header = arrayBaseOffset(RiKind.Byte); for (long i = length - 1; i >= 0; i--) { - Byte a = UnsafeLoadNode.load(src, header, i + srcPos, CiKind.Byte); - UnsafeStoreNode.store(dest, header, i + destPos, a.byteValue(), CiKind.Byte); + Byte a = UnsafeLoadNode.load(src, header, i + srcPos, RiKind.Byte); + UnsafeStoreNode.store(dest, header, i + destPos, a.byteValue(), RiKind.Byte); } } @Snippet public static void copyShortsDown(Object src, long srcOffset, Object dest, long destOffset, int length) { - int header = arrayBaseOffset(CiKind.Short); + int header = arrayBaseOffset(RiKind.Short); for (long i = (length - 1) * 2; i >= 0; i -= 2) { - Character a = UnsafeLoadNode.load(src, header, i + srcOffset, CiKind.Short); - UnsafeStoreNode.store(dest, header, i + destOffset, a.charValue(), CiKind.Short); + Character a = UnsafeLoadNode.load(src, header, i + srcOffset, RiKind.Short); + UnsafeStoreNode.store(dest, header, i + destOffset, a.charValue(), RiKind.Short); } } @Snippet public static void copyIntsDown(Object src, long srcOffset, Object dest, long destOffset, int length) { - int header = arrayBaseOffset(CiKind.Int); + int header = arrayBaseOffset(RiKind.Int); for (long i = (length - 1) * 4; i >= 0; i -= 4) { - Integer a = UnsafeLoadNode.load(src, header, i + srcOffset, CiKind.Int); - UnsafeStoreNode.store(dest, header, i + destOffset, a.intValue(), CiKind.Int); + Integer a = UnsafeLoadNode.load(src, header, i + srcOffset, RiKind.Int); + UnsafeStoreNode.store(dest, header, i + destOffset, a.intValue(), RiKind.Int); } } @Snippet public static void copyLongsDown(Object src, long srcOffset, Object dest, long destOffset, int length) { - int header = arrayBaseOffset(CiKind.Long); + int header = arrayBaseOffset(RiKind.Long); for (long i = (length - 1) * 8; i >= 0; i -= 8) { - Long a = UnsafeLoadNode.load(src, header, i + srcOffset, CiKind.Long); - UnsafeStoreNode.store(dest, header, i + destOffset, a.longValue(), CiKind.Long); + Long a = UnsafeLoadNode.load(src, header, i + srcOffset, RiKind.Long); + UnsafeStoreNode.store(dest, header, i + destOffset, a.longValue(), RiKind.Long); } } // Does NOT perform store checks @Snippet public static void copyObjectsDown(Object src, long srcOffset, Object dest, long destOffset, int length) { - int header = arrayBaseOffset(CiKind.Object); - final int scale = arrayIndexScale(CiKind.Object); + int header = arrayBaseOffset(RiKind.Object); + final int scale = arrayIndexScale(RiKind.Object); for (long i = (length - 1) * scale; i >= 0; i -= scale) { - Object a = UnsafeLoadNode.load(src, header, i + srcOffset, CiKind.Object); + Object a = UnsafeLoadNode.load(src, header, i + srcOffset, RiKind.Object); DirectObjectStoreNode.store(dest, header, i + destOffset, a); } } @@ -297,10 +297,10 @@ */ @Snippet public static void copyBytesUp(Object src, int srcPos, Object dest, int destPos, int length) { - int header = arrayBaseOffset(CiKind.Byte); + int header = arrayBaseOffset(RiKind.Byte); for (long i = 0; i < length; i++) { - Byte a = UnsafeLoadNode.load(src, header, i + srcPos, CiKind.Byte); - UnsafeStoreNode.store(dest, header, i + destPos, a.byteValue(), CiKind.Byte); + Byte a = UnsafeLoadNode.load(src, header, i + srcPos, RiKind.Byte); + UnsafeStoreNode.store(dest, header, i + destPos, a.byteValue(), RiKind.Byte); } } @@ -314,70 +314,70 @@ */ @Snippet public static void copyShortsUp(Object src, long srcOffset, Object dest, long destOffset, int length) { - int header = arrayBaseOffset(CiKind.Short); + int header = arrayBaseOffset(RiKind.Short); for (long i = 0; i < length * 2L; i += 2) { - Character a = UnsafeLoadNode.load(src, header, i + srcOffset, CiKind.Short); - UnsafeStoreNode.store(dest, header, i + destOffset, a.charValue(), CiKind.Short); + Character a = UnsafeLoadNode.load(src, header, i + srcOffset, RiKind.Short); + UnsafeStoreNode.store(dest, header, i + destOffset, a.charValue(), RiKind.Short); } } @Snippet public static void copyIntsUp(Object src, long srcOffset, Object dest, long destOffset, int length) { - int header = arrayBaseOffset(CiKind.Int); + int header = arrayBaseOffset(RiKind.Int); for (long i = 0; i < length * 4L; i += 4) { - Integer a = UnsafeLoadNode.load(src, header, i + srcOffset, CiKind.Int); - UnsafeStoreNode.store(dest, header, i + destOffset, a.intValue(), CiKind.Int); + Integer a = UnsafeLoadNode.load(src, header, i + srcOffset, RiKind.Int); + UnsafeStoreNode.store(dest, header, i + destOffset, a.intValue(), RiKind.Int); } } @Snippet public static void copyLongsUp(Object src, long srcOffset, Object dest, long destOffset, int length) { - int header = arrayBaseOffset(CiKind.Long); + int header = arrayBaseOffset(RiKind.Long); for (long i = 0; i < length * 8L; i += 8) { - Long a = UnsafeLoadNode.load(src, header, i + srcOffset, CiKind.Long); - UnsafeStoreNode.store(dest, header, i + destOffset, a.longValue(), CiKind.Long); + Long a = UnsafeLoadNode.load(src, header, i + srcOffset, RiKind.Long); + UnsafeStoreNode.store(dest, header, i + destOffset, a.longValue(), RiKind.Long); } } // Does NOT perform store checks @Snippet public static void copyObjectsUp(Object src, long srcOffset, Object dest, long destOffset, int length) { - int header = arrayBaseOffset(CiKind.Object); - final int scale = arrayIndexScale(CiKind.Object); + int header = arrayBaseOffset(RiKind.Object); + final int scale = arrayIndexScale(RiKind.Object); for (long i = 0; i < length * scale; i += scale) { - Object a = UnsafeLoadNode.load(src, header, i + srcOffset, CiKind.Object); + Object a = UnsafeLoadNode.load(src, header, i + srcOffset, RiKind.Object); DirectObjectStoreNode.store(dest, header, i + destOffset, a); } } @Fold - static int arrayBaseOffset(CiKind elementKind) { + static int arrayBaseOffset(RiKind elementKind) { return elementKind.arrayBaseOffset(); } @Fold - static int arrayIndexScale(CiKind elementKind) { + static int arrayIndexScale(RiKind elementKind) { return elementKind.arrayIndexScale(); } static { - assert arrayIndexScale(CiKind.Byte) == 1; - assert arrayIndexScale(CiKind.Boolean) == 1; - assert arrayIndexScale(CiKind.Char) == 2; - assert arrayIndexScale(CiKind.Short) == 2; - assert arrayIndexScale(CiKind.Int) == 4; - assert arrayIndexScale(CiKind.Long) == 8; - assert arrayIndexScale(CiKind.Float) == 4; - assert arrayIndexScale(CiKind.Double) == 8; + assert arrayIndexScale(RiKind.Byte) == 1; + assert arrayIndexScale(RiKind.Boolean) == 1; + assert arrayIndexScale(RiKind.Char) == 2; + assert arrayIndexScale(RiKind.Short) == 2; + assert arrayIndexScale(RiKind.Int) == 4; + assert arrayIndexScale(RiKind.Long) == 8; + assert arrayIndexScale(RiKind.Float) == 4; + assert arrayIndexScale(RiKind.Double) == 8; } @Fold private static int cardTableShift() { - return CompilerImpl.getInstance().getConfig().cardtableShift; + return HotSpotCompilerImpl.getInstance().getConfig().cardtableShift; } @Fold private static long cardTableStart() { - return CompilerImpl.getInstance().getConfig().cardtableStartAddress; + return HotSpotCompilerImpl.getInstance().getConfig().cardtableStartAddress; } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/CheckCastSnippets.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/CheckCastSnippets.java Fri Jun 08 15:17:43 2012 +0200 @@ -31,6 +31,8 @@ import sun.misc.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.cri.*; @@ -49,8 +51,6 @@ import com.oracle.graal.snippets.SnippetTemplate.Cache; import com.oracle.graal.snippets.SnippetTemplate.Key; import com.oracle.graal.snippets.nodes.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*; /** @@ -74,7 +74,7 @@ Object objectHub = UnsafeLoadNode.loadObject(object, 0, hubOffset(), true); if (objectHub != exactHub) { exactMiss.inc(); - DeoptimizeNode.deopt(RiDeoptAction.InvalidateReprofile, RiDeoptReason.ClassCastException); + DeoptimizeNode.deopt(CiDeoptAction.InvalidateReprofile, RiDeoptReason.ClassCastException); } exactHit.inc(); return object; @@ -96,7 +96,7 @@ Object objectHub = UnsafeLoadNode.loadObject(object, 0, hubOffset(), true); if (UnsafeLoadNode.loadObject(objectHub, 0, superCheckOffset, true) != hub) { displayMiss.inc(); - DeoptimizeNode.deopt(RiDeoptAction.InvalidateReprofile, RiDeoptReason.ClassCastException); + DeoptimizeNode.deopt(CiDeoptAction.InvalidateReprofile, RiDeoptReason.ClassCastException); } displayHit.inc(); return object; @@ -122,7 +122,7 @@ } } if (!checkSecondarySubType(hub, objectHub)) { - DeoptimizeNode.deopt(RiDeoptAction.InvalidateReprofile, RiDeoptReason.ClassCastException); + DeoptimizeNode.deopt(CiDeoptAction.InvalidateReprofile, RiDeoptReason.ClassCastException); } return object; } @@ -148,14 +148,14 @@ } } if (!checkUnknownSubType(hub, objectHub)) { - DeoptimizeNode.deopt(RiDeoptAction.InvalidateReprofile, RiDeoptReason.ClassCastException); + DeoptimizeNode.deopt(CiDeoptAction.InvalidateReprofile, RiDeoptReason.ClassCastException); } return object; } //This is used instead of a Java array read to avoid the array bounds check. static Object loadNonNullObjectElement(Object array, int index) { - return UnsafeLoadNode.loadObject(array, arrayBaseOffset(CiKind.Object), index * arrayIndexScale(CiKind.Object), true); + return UnsafeLoadNode.loadObject(array, arrayBaseOffset(RiKind.Object), index * arrayIndexScale(RiKind.Object), true); } static boolean checkSecondarySubType(Object t, Object s) { @@ -187,7 +187,7 @@ static boolean checkUnknownSubType(Object t, Object s) { // int off = T.offset - int superCheckOffset = UnsafeLoadNode.load(t, 0, superCheckOffsetOffset(), CiKind.Int); + int superCheckOffset = UnsafeLoadNode.load(t, 0, superCheckOffsetOffset(), RiKind.Int); boolean primary = superCheckOffset != secondarySuperCacheOffset(); // if (T = S[off]) return true @@ -276,22 +276,22 @@ @Fold private static int superCheckOffsetOffset() { - return CompilerImpl.getInstance().getConfig().superCheckOffsetOffset; + return HotSpotCompilerImpl.getInstance().getConfig().superCheckOffsetOffset; } @Fold private static int secondarySuperCacheOffset() { - return CompilerImpl.getInstance().getConfig().secondarySuperCacheOffset; + return HotSpotCompilerImpl.getInstance().getConfig().secondarySuperCacheOffset; } @Fold private static int secondarySupersOffset() { - return CompilerImpl.getInstance().getConfig().secondarySupersOffset; + return HotSpotCompilerImpl.getInstance().getConfig().secondarySupersOffset; } @Fold private static int hubOffset() { - return CompilerImpl.getInstance().getConfig().hubOffset; + return HotSpotCompilerImpl.getInstance().getConfig().hubOffset; } public static void printCounter(PrintStream out, Counter c, long total) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/DirectStoreNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/DirectStoreNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.hotspot.snippets; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; /** * A special purpose store node that differs from {@link UnsafeStoreNode} in that @@ -56,7 +57,7 @@ @Override public void generate(LIRGeneratorTool gen) { - CiValue v = gen.operand(value); + RiValue v = gen.operand(value); gen.emitStore(new CiAddress(v.kind, gen.operand(address)), v, false); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/GetObjectAddressNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/GetObjectAddressNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.snippets; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; /** * Intrinsification for getting the address of an object. @@ -37,7 +37,7 @@ @Input private ValueNode object; public GetObjectAddressNode(ValueNode obj) { - super(StampFactory.forKind(CiKind.Long)); + super(StampFactory.forKind(RiKind.Long)); this.object = obj; } @@ -49,7 +49,7 @@ @Override public void generate(LIRGeneratorTool gen) { - CiValue obj = gen.newVariable(gen.target().wordKind); + RiValue obj = gen.newVariable(gen.target().wordKind); gen.emitMove(gen.operand(object), obj); gen.setResult(this, obj); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/IntrinsifyArrayCopyPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/IntrinsifyArrayCopyPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,8 +24,8 @@ import java.lang.reflect.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.compiler.util.*; @@ -36,7 +36,7 @@ import com.oracle.graal.nodes.java.*; public class IntrinsifyArrayCopyPhase extends Phase { - private final GraalRuntime runtime; + private final ExtendedRiRuntime runtime; private RiResolvedMethod arrayCopy; private RiResolvedMethod byteArrayCopy; private RiResolvedMethod shortArrayCopy; @@ -47,7 +47,7 @@ private RiResolvedMethod doubleArrayCopy; private RiResolvedMethod objectArrayCopy; - public IntrinsifyArrayCopyPhase(GraalRuntime runtime) { + public IntrinsifyArrayCopyPhase(ExtendedRiRuntime runtime) { this.runtime = runtime; try { byteArrayCopy = getArrayCopySnippet(runtime, byte.class); @@ -87,26 +87,26 @@ && srcType.isArrayClass() && destType != null && destType.isArrayClass()) { - CiKind componentKind = srcType.componentType().kind(false); + RiKind componentKind = srcType.componentType().kind(false); if (srcType.componentType() == destType.componentType()) { - if (componentKind == CiKind.Int) { + if (componentKind == RiKind.Int) { snippetMethod = intArrayCopy; - } else if (componentKind == CiKind.Char) { + } else if (componentKind == RiKind.Char) { snippetMethod = charArrayCopy; - } else if (componentKind == CiKind.Long) { + } else if (componentKind == RiKind.Long) { snippetMethod = longArrayCopy; - } else if (componentKind == CiKind.Byte) { + } else if (componentKind == RiKind.Byte) { snippetMethod = byteArrayCopy; - } else if (componentKind == CiKind.Short) { + } else if (componentKind == RiKind.Short) { snippetMethod = shortArrayCopy; - } else if (componentKind == CiKind.Float) { + } else if (componentKind == RiKind.Float) { snippetMethod = floatArrayCopy; - } else if (componentKind == CiKind.Double) { + } else if (componentKind == RiKind.Double) { snippetMethod = doubleArrayCopy; - } else if (componentKind == CiKind.Object) { + } else if (componentKind == RiKind.Object) { snippetMethod = objectArrayCopy; } - } else if (componentKind == CiKind.Object + } else if (componentKind == RiKind.Object && srcType.componentType().isSubtypeOf(destType.componentType())) { snippetMethod = objectArrayCopy; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/SystemSnippets.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/SystemSnippets.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.snippets; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.snippets.*;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/UnsafeSnippets.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/UnsafeSnippets.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.snippets; -import com.oracle.max.cri.ci.*; import com.oracle.max.cri.util.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.java.*; import com.oracle.graal.snippets.*; @@ -47,7 +47,7 @@ } public Object getObject(Object o, long offset) { - return UnsafeLoadNode.load(o, 0, offset, CiKind.Object); + return UnsafeLoadNode.load(o, 0, offset, RiKind.Object); } public Object getObjectVolatile(Object o, long offset) { @@ -58,7 +58,7 @@ } public void putObject(Object o, long offset, Object x) { - UnsafeStoreNode.store(o, 0, offset, x, CiKind.Object); + UnsafeStoreNode.store(o, 0, offset, x, RiKind.Object); } public void putObjectVolatile(Object o, long offset, Object x) { @@ -68,7 +68,7 @@ } public int getInt(Object o, long offset) { - Integer value = UnsafeLoadNode.load(o, 0, offset, CiKind.Int); + Integer value = UnsafeLoadNode.load(o, 0, offset, RiKind.Int); return value; } @@ -80,7 +80,7 @@ } public void putInt(Object o, long offset, int x) { - UnsafeStoreNode.store(o, 0, offset, x, CiKind.Int); + UnsafeStoreNode.store(o, 0, offset, x, RiKind.Int); } public void putIntVolatile(Object o, long offset, int x) { @@ -91,7 +91,7 @@ public boolean getBoolean(Object o, long offset) { @JavacBug(id = 6995200) - Boolean result = UnsafeLoadNode.load(o, 0, offset, CiKind.Boolean); + Boolean result = UnsafeLoadNode.load(o, 0, offset, RiKind.Boolean); return result; } @@ -103,7 +103,7 @@ } public void putBoolean(Object o, long offset, boolean x) { - UnsafeStoreNode.store(o, 0, offset, x, CiKind.Boolean); + UnsafeStoreNode.store(o, 0, offset, x, RiKind.Boolean); } public void putBooleanVolatile(Object o, long offset, boolean x) { @@ -114,7 +114,7 @@ public byte getByte(Object o, long offset) { @JavacBug(id = 6995200) - Byte result = UnsafeLoadNode.load(o, 0, offset, CiKind.Byte); + Byte result = UnsafeLoadNode.load(o, 0, offset, RiKind.Byte); return result; } @@ -126,7 +126,7 @@ } public void putByte(Object o, long offset, byte x) { - UnsafeStoreNode.store(o, 0, offset, x, CiKind.Byte); + UnsafeStoreNode.store(o, 0, offset, x, RiKind.Byte); } public void putByteVolatile(Object o, long offset, byte x) { @@ -137,7 +137,7 @@ public short getShort(Object o, long offset) { @JavacBug(id = 6995200) - Short result = UnsafeLoadNode.load(o, 0, offset, CiKind.Short); + Short result = UnsafeLoadNode.load(o, 0, offset, RiKind.Short); return result; } @@ -149,7 +149,7 @@ } public void putShort(Object o, long offset, short x) { - UnsafeStoreNode.store(o, 0, offset, x, CiKind.Short); + UnsafeStoreNode.store(o, 0, offset, x, RiKind.Short); } public void putShortVolatile(Object o, long offset, short x) { @@ -160,7 +160,7 @@ public char getChar(Object o, long offset) { @JavacBug(id = 6995200) - Character result = UnsafeLoadNode.load(o, 0, offset, CiKind.Char); + Character result = UnsafeLoadNode.load(o, 0, offset, RiKind.Char); return result; } @@ -172,7 +172,7 @@ } public void putChar(Object o, long offset, char x) { - UnsafeStoreNode.store(o, 0, offset, x, CiKind.Char); + UnsafeStoreNode.store(o, 0, offset, x, RiKind.Char); } public void putCharVolatile(Object o, long offset, char x) { @@ -183,7 +183,7 @@ public long getLong(Object o, long offset) { @JavacBug(id = 6995200) - Long result = UnsafeLoadNode.load(o, 0, offset, CiKind.Long); + Long result = UnsafeLoadNode.load(o, 0, offset, RiKind.Long); return result; } @@ -195,7 +195,7 @@ } public void putLong(Object o, long offset, long x) { - UnsafeStoreNode.store(o, 0, offset, x, CiKind.Long); + UnsafeStoreNode.store(o, 0, offset, x, RiKind.Long); } public void putLongVolatile(Object o, long offset, long x) { @@ -206,7 +206,7 @@ public float getFloat(Object o, long offset) { @JavacBug(id = 6995200) - Float result = UnsafeLoadNode.load(o, 0, offset, CiKind.Float); + Float result = UnsafeLoadNode.load(o, 0, offset, RiKind.Float); return result; } @@ -218,7 +218,7 @@ } public void putFloat(Object o, long offset, float x) { - UnsafeStoreNode.store(o, 0, offset, x, CiKind.Float); + UnsafeStoreNode.store(o, 0, offset, x, RiKind.Float); } public void putFloatVolatile(Object o, long offset, float x) { @@ -229,7 +229,7 @@ public double getDouble(Object o, long offset) { @JavacBug(id = 6995200) - Double result = UnsafeLoadNode.load(o, 0, offset, CiKind.Double); + Double result = UnsafeLoadNode.load(o, 0, offset, RiKind.Double); return result; } @@ -241,7 +241,7 @@ } public void putDouble(Object o, long offset, double x) { - UnsafeStoreNode.store(o, 0, offset, x, CiKind.Double); + UnsafeStoreNode.store(o, 0, offset, x, RiKind.Double); } public void putDoubleVolatile(Object o, long offset, double x) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/AMD64SafepointOp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/AMD64SafepointOp.java Fri Jun 08 15:17:43 2012 +0200 @@ -27,13 +27,13 @@ import java.util.*; +import com.oracle.graal.api.code.*; import com.oracle.graal.graph.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.amd64.*; import com.oracle.graal.lir.asm.*; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; /** * Emits a safepoint poll.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/AMD64TailcallOp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/AMD64TailcallOp.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.hotspot.target.amd64; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.amd64.*; @@ -38,7 +38,7 @@ */ public class AMD64TailcallOp extends AMD64LIRInstruction { - public AMD64TailcallOp(List<CiValue> parameters, CiValue target, CiValue[] callingConvention) { + public AMD64TailcallOp(List<RiValue> parameters, RiValue target, RiValue[] callingConvention) { super("TAILCALL", LIRInstruction.NO_OPERANDS, null, toArray(parameters, target), LIRInstruction.NO_OPERANDS, callingConvention.clone()); assert inputs.length == temps.length + 1; @@ -48,8 +48,8 @@ } } - private static CiValue[] toArray(List<CiValue> parameters, CiValue target) { - CiValue[] result = new CiValue[parameters.size() + 1]; + private static RiValue[] toArray(List<RiValue> parameters, RiValue target) { + RiValue[] result = new RiValue[parameters.size() + 1]; parameters.toArray(result); result[parameters.size()] = target; return result;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.hotspot.target.amd64; +import static com.oracle.graal.api.code.CiCallingConvention.Type.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import static com.oracle.graal.hotspot.ri.HotSpotXirGenerator.*; import static com.oracle.max.asm.target.amd64.AMD64.*; -import static com.oracle.max.cri.ci.CiCallingConvention.Type.*; -import static com.oracle.max.cri.ci.CiValueUtil.*; import java.lang.reflect.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.gen.*; import com.oracle.graal.compiler.target.*; @@ -45,8 +47,6 @@ import com.oracle.max.asm.*; import com.oracle.max.asm.target.amd64.AMD64Assembler.ConditionFlag; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.cri.xir.*; public class HotSpotAMD64Backend extends Backend { @@ -69,11 +69,11 @@ public void visitExceptionObject(ExceptionObjectNode x) { HotSpotVMConfig config = ((HotSpotRuntime) runtime).config; CiRegisterValue thread = r15.asValue(); - CiAddress exceptionAddress = new CiAddress(CiKind.Object, thread, config.threadExceptionOopOffset); - CiAddress pcAddress = new CiAddress(CiKind.Long, thread, config.threadExceptionPcOffset); - CiValue exception = emitLoad(exceptionAddress, false); - emitStore(exceptionAddress, CiConstant.NULL_OBJECT, false); - emitStore(pcAddress, CiConstant.LONG_0, false); + CiAddress exceptionAddress = new CiAddress(RiKind.Object, thread, config.threadExceptionOopOffset); + CiAddress pcAddress = new CiAddress(RiKind.Long, thread, config.threadExceptionPcOffset); + RiValue exception = emitLoad(exceptionAddress, false); + emitStore(exceptionAddress, RiConstant.NULL_OBJECT, false); + emitStore(pcAddress, RiConstant.LONG_0, false); setResult(x, exception); } @@ -105,7 +105,7 @@ if (GraalOptions.ZapStackOnMethodEntry) { final int intSize = 4; for (int i = 0; i < frameSize / intSize; ++i) { - asm.movl(new CiAddress(CiKind.Int, rsp.asValue(), i * intSize), 0xC1C1C1C1); + asm.movl(new CiAddress(RiKind.Int, rsp.asValue(), i * intSize), 0xC1C1C1C1); } } CiCalleeSaveLayout csl = frameMap.registerConfig.getCalleeSaveLayout(); @@ -121,7 +121,7 @@ int frameSize = tasm.frameMap.frameSize(); AMD64MacroAssembler asm = (AMD64MacroAssembler) tasm.asm; CiCalleeSaveLayout csl = tasm.frameMap.registerConfig.getCalleeSaveLayout(); - RiRegisterConfig regConfig = tasm.frameMap.registerConfig; + CiRegisterConfig regConfig = tasm.frameMap.registerConfig; if (csl != null && csl.size != 0) { tasm.targetMethod.setRegisterRestoreEpilogueOffset(asm.codeBuffer.position()); @@ -178,7 +178,7 @@ public void emitCode(TargetMethodAssembler tasm, RiResolvedMethod method, LIR lir) { AMD64MacroAssembler asm = (AMD64MacroAssembler) tasm.asm; FrameMap frameMap = tasm.frameMap; - RiRegisterConfig regConfig = frameMap.registerConfig; + CiRegisterConfig regConfig = frameMap.registerConfig; HotSpotVMConfig config = ((HotSpotRuntime) runtime).config; Label unverifiedStub = new Label(); @@ -188,7 +188,7 @@ boolean isStatic = Modifier.isStatic(method.accessFlags()); if (!isStatic) { tasm.recordMark(MARK_UNVERIFIED_ENTRY); - CiCallingConvention cc = regConfig.getCallingConvention(JavaCallee, new CiKind[] {CiKind.Object}, target, false); + CiCallingConvention cc = regConfig.getCallingConvention(JavaCallee, new RiKind[] {RiKind.Object}, target, false); CiRegister inlineCacheKlass = rax; // see definition of IC_Klass in c1_LIRAssembler_x86.cpp CiRegister receiver = asRegister(cc.locations[0]); CiAddress src = new CiAddress(target.wordKind, receiver.asValue(), config.hubOffset);
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,13 +26,13 @@ import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.java.bytecode.*; import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * Builds a mapping between bytecodes and basic blocks and builds a conservative control flow graph (CFG).
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Fri Jun 08 15:17:43 2012 +0200 @@ -28,14 +28,13 @@ import java.util.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.Node.Verbosity; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.PhiNode.PhiType; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public class FrameStateBuilder { private final RiResolvedMethod method; @@ -71,9 +70,9 @@ if (eagerResolve) { type = type.resolve(accessingClass); } - CiKind kind = type.kind(false).stackKind(); + RiKind kind = type.kind(false).stackKind(); Stamp stamp; - if (kind == CiKind.Object && type instanceof RiResolvedType) { + if (kind == RiKind.Object && type instanceof RiResolvedType) { stamp = StampFactory.declared((RiResolvedType) type); } else { stamp = StampFactory.forKind(kind); @@ -343,14 +342,14 @@ } /** - * Stores a given local variable at the specified index. If the value is a {@linkplain CiKind#isDoubleWord() double word}, + * Stores a given local variable at the specified index. If the value is a {@linkplain RiKind#isDoubleWord() double word}, * then the next local variable index is also overwritten. * * @param i the index at which to store * @param x the instruction which produces the value for the local */ public void storeLocal(int i, ValueNode x) { - assert x == null || x.kind() != CiKind.Void && x.kind() != CiKind.Illegal : "unexpected value: " + x; + assert x == null || x.kind() != RiKind.Void && x.kind() != RiKind.Illegal : "unexpected value: " + x; locals[i] = x; if (x != null && isTwoSlot(x.kind())) { // if this is a double word, then kill i+1 @@ -375,8 +374,8 @@ * @param kind the type expected for this instruction * @param x the instruction to push onto the stack */ - public void push(CiKind kind, ValueNode x) { - assert !x.isDeleted() && x.kind() != CiKind.Void && x.kind() != CiKind.Illegal; + public void push(RiKind kind, ValueNode x) { + assert !x.isDeleted() && x.kind() != RiKind.Void && x.kind() != RiKind.Illegal; xpush(assertKind(kind, x)); if (isTwoSlot(kind)) { xpush(null); @@ -388,7 +387,7 @@ * @param x the instruction to push onto the stack */ public void xpush(ValueNode x) { - assert x == null || (!x.isDeleted() && x.kind() != CiKind.Void && x.kind() != CiKind.Illegal); + assert x == null || (!x.isDeleted() && x.kind() != RiKind.Void && x.kind() != RiKind.Illegal); stack[stackSize++] = x; } @@ -443,8 +442,8 @@ xpush(null); } - public void pushReturn(CiKind kind, ValueNode x) { - if (kind != CiKind.Void) { + public void pushReturn(RiKind kind, ValueNode x) { + if (kind != RiKind.Void) { push(kind.stackKind(), x); } } @@ -454,8 +453,8 @@ * @param kind the expected type * @return the instruction on the top of the stack */ - public ValueNode pop(CiKind kind) { - assert kind != CiKind.Void; + public ValueNode pop(RiKind kind) { + assert kind != RiKind.Void; if (isTwoSlot(kind)) { xpop(); } @@ -567,13 +566,13 @@ stackSize = 0; } - public static int stackSlots(CiKind kind) { + public static int stackSlots(RiKind kind) { return isTwoSlot(kind) ? 2 : 1; } - public static boolean isTwoSlot(CiKind kind) { - assert kind != CiKind.Void && kind != CiKind.Illegal; - return kind == CiKind.Long || kind == CiKind.Double; + public static boolean isTwoSlot(RiKind kind) { + assert kind != RiKind.Void && kind != RiKind.Illegal; + return kind == RiKind.Long || kind == RiKind.Double; } public boolean contains(ValueNode value) {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderConfiguration.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderConfiguration.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.java; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.phases.*; -import com.oracle.max.cri.ri.*; public class GraphBuilderConfiguration {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Fri Jun 08 15:17:43 2012 +0200 @@ -28,6 +28,10 @@ import java.lang.reflect.*; import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiType.*; +import com.oracle.graal.api.meta.RiTypeProfile.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.compiler.util.*; @@ -43,10 +47,6 @@ import com.oracle.graal.nodes.java.MethodCallTargetNode.InvokeKind; import com.oracle.graal.nodes.type.*; import com.oracle.graal.nodes.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiType.Representation; -import com.oracle.max.cri.ri.RiTypeProfile.ProfiledType; import com.oracle.max.criutils.*; /** @@ -225,11 +225,11 @@ return stream.currentBCI(); } - private void loadLocal(int index, CiKind kind) { + private void loadLocal(int index, RiKind kind) { frameState.push(kind, frameState.loadLocal(index)); } - private void storeLocal(CiKind kind, int index) { + private void storeLocal(RiKind kind, int index) { frameState.storeLocal(index, frameState.pop(kind)); } @@ -284,20 +284,20 @@ // this is a load of class constant which might be unresolved RiType riType = (RiType) con; if (riType instanceof RiResolvedType) { - frameState.push(CiKind.Object, append(ConstantNode.forCiConstant(((RiResolvedType) riType).getEncoding(Representation.JavaClass), runtime, currentGraph))); + frameState.push(RiKind.Object, append(ConstantNode.forCiConstant(((RiResolvedType) riType).getEncoding(Representation.JavaClass), runtime, currentGraph))); } else { - append(currentGraph.add(new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); - frameState.push(CiKind.Object, append(ConstantNode.forObject(null, runtime, currentGraph))); + append(currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); + frameState.push(RiKind.Object, append(ConstantNode.forObject(null, runtime, currentGraph))); } - } else if (con instanceof CiConstant) { - CiConstant constant = (CiConstant) con; + } else if (con instanceof RiConstant) { + RiConstant constant = (RiConstant) con; frameState.push(constant.kind.stackKind(), appendConstant(constant)); } else { throw new Error("lookupConstant returned an object of incorrect type"); } } - private void genLoadIndexed(CiKind kind) { + private void genLoadIndexed(RiKind kind) { emitExplicitExceptions(frameState.peek(1), frameState.peek(0)); ValueNode index = frameState.ipop(); @@ -306,7 +306,7 @@ frameState.push(kind.stackKind(), v); } - private void genStoreIndexed(CiKind kind) { + private void genStoreIndexed(RiKind kind) { emitExplicitExceptions(frameState.peek(2), frameState.peek(1)); ValueNode value = frameState.pop(kind.stackKind()); @@ -397,7 +397,7 @@ } - private void genArithmeticOp(CiKind result, int opcode, boolean canTrap) { + private void genArithmeticOp(RiKind result, int opcode, boolean canTrap) { ValueNode y = frameState.pop(result); ValueNode x = frameState.pop(result); boolean isStrictFP = isStrict(method.accessFlags()); @@ -433,11 +433,11 @@ frameState.push(result, result1); } - private void genNegateOp(CiKind kind) { + private void genNegateOp(RiKind kind) { frameState.push(kind, append(currentGraph.unique(new NegateNode(frameState.pop(kind))))); } - private void genShiftOp(CiKind kind, int opcode) { + private void genShiftOp(RiKind kind, int opcode) { ValueNode s = frameState.ipop(); ValueNode x = frameState.pop(kind); ShiftNode v; @@ -454,7 +454,7 @@ frameState.push(kind, append(currentGraph.unique(v))); } - private void genLogicOp(CiKind kind, int opcode) { + private void genLogicOp(RiKind kind, int opcode) { ValueNode y = frameState.pop(kind); ValueNode x = frameState.pop(kind); LogicNode v; @@ -471,7 +471,7 @@ frameState.push(kind, append(currentGraph.unique(v))); } - private void genCompareOp(CiKind kind, boolean isUnorderedLess) { + private void genCompareOp(RiKind kind, boolean isUnorderedLess) { ValueNode y = frameState.pop(kind); ValueNode x = frameState.pop(kind); frameState.ipush(append(currentGraph.unique(new NormalizeCompareNode(x, y, isUnorderedLess)))); @@ -487,7 +487,7 @@ int delta = stream().readIncrement(); ValueNode x = frameState.loadLocal(index); ValueNode y = append(ConstantNode.forInt(delta, currentGraph)); - frameState.storeLocal(index, append(currentGraph.unique(new IntegerAddNode(CiKind.Int, x, y)))); + frameState.storeLocal(index, append(currentGraph.unique(new IntegerAddNode(RiKind.Int, x, y)))); } private void genGoto() { @@ -526,13 +526,13 @@ CompareNode condition; assert !a.kind().isFloatOrDouble(); if (cond == Condition.EQ || cond == Condition.NE) { - if (a.kind() == CiKind.Object) { + if (a.kind() == RiKind.Object) { condition = new ObjectEqualsNode(a, b); } else { condition = new IntegerEqualsNode(a, b); } } else { - assert a.kind() != CiKind.Object && !cond.isUnsigned(); + assert a.kind() != RiKind.Object && !cond.isUnsigned(); condition = new IntegerLessThanNode(a, b); } condition = currentGraph.unique(condition); @@ -545,18 +545,18 @@ } private void genIfZero(Condition cond) { - ValueNode y = appendConstant(CiConstant.INT_0); + ValueNode y = appendConstant(RiConstant.INT_0); ValueNode x = frameState.ipop(); ifNode(x, cond, y); } private void genIfNull(Condition cond) { - ValueNode y = appendConstant(CiConstant.NULL_OBJECT); + ValueNode y = appendConstant(RiConstant.NULL_OBJECT); ValueNode x = frameState.apop(); ifNode(x, cond, y); } - private void genIfSame(CiKind kind, Condition cond) { + private void genIfSame(RiKind kind, Condition cond) { ValueNode y = frameState.pop(kind); ValueNode x = frameState.pop(kind); assert !x.isDeleted() && !y.isDeleted(); @@ -565,7 +565,7 @@ private void genThrow() { ValueNode exception = frameState.apop(); - FixedGuardNode node = currentGraph.add(new FixedGuardNode(currentGraph.unique(new IsNullNode(exception)), RiDeoptReason.NullCheckException, RiDeoptAction.InvalidateReprofile, true, graphId)); + FixedGuardNode node = currentGraph.add(new FixedGuardNode(currentGraph.unique(new IsNullNode(exception)), RiDeoptReason.NullCheckException, CiDeoptAction.InvalidateReprofile, true, graphId)); append(node); append(handleException(exception, bci())); } @@ -635,8 +635,8 @@ frameState.apush(checkCast); } else { ValueNode object = frameState.apop(); - append(currentGraph.add(new FixedGuardNode(currentGraph.unique(new IsNullNode(object)), RiDeoptReason.Unresolved, RiDeoptAction.InvalidateRecompile, graphId))); - frameState.apush(appendConstant(CiConstant.NULL_OBJECT)); + append(currentGraph.add(new FixedGuardNode(currentGraph.unique(new IsNullNode(object)), RiDeoptReason.Unresolved, CiDeoptAction.InvalidateRecompile, graphId))); + frameState.apush(appendConstant(RiConstant.NULL_OBJECT)); } } @@ -651,11 +651,11 @@ frameState.ipush(append(MaterializeNode.create(currentGraph.unique(instanceOfNode), currentGraph))); } else { BlockPlaceholderNode successor = currentGraph.add(new BlockPlaceholderNode()); - DeoptimizeNode deopt = currentGraph.add(new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId)); + DeoptimizeNode deopt = currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId)); IfNode ifNode = currentGraph.add(new IfNode(currentGraph.unique(new IsNullNode(object)), successor, deopt, 0)); append(ifNode); lastInstr = successor; - frameState.ipush(appendConstant(CiConstant.INT_0)); + frameState.ipush(appendConstant(RiConstant.INT_0)); } } @@ -665,8 +665,8 @@ NewInstanceNode n = currentGraph.add(new NewInstanceNode((RiResolvedType) type)); frameState.apush(append(n)); } else { - append(currentGraph.add(new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); - frameState.apush(appendConstant(CiConstant.NULL_OBJECT)); + append(currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); + frameState.apush(appendConstant(RiConstant.NULL_OBJECT)); } } @@ -676,24 +676,24 @@ * @param code the array type code * @return the kind from the array type code */ - public static CiKind arrayTypeCodeToKind(int code) { + public static RiKind arrayTypeCodeToKind(int code) { // Checkstyle: stop switch (code) { - case 4: return CiKind.Boolean; - case 5: return CiKind.Char; - case 6: return CiKind.Float; - case 7: return CiKind.Double; - case 8: return CiKind.Byte; - case 9: return CiKind.Short; - case 10: return CiKind.Int; - case 11: return CiKind.Long; + case 4: return RiKind.Boolean; + case 5: return RiKind.Char; + case 6: return RiKind.Float; + case 7: return RiKind.Double; + case 8: return RiKind.Byte; + case 9: return RiKind.Short; + case 10: return RiKind.Int; + case 11: return RiKind.Long; default: throw new IllegalArgumentException("unknown array type code: " + code); } // Checkstyle: resume } private void genNewTypeArray(int typeCode) { - CiKind kind = arrayTypeCodeToKind(typeCode); + RiKind kind = arrayTypeCodeToKind(typeCode); RiResolvedType elementType = runtime.asRiType(kind); NewTypeArrayNode nta = currentGraph.add(new NewTypeArrayNode(frameState.ipop(), elementType)); frameState.apush(append(nta)); @@ -706,8 +706,8 @@ NewArrayNode n = currentGraph.add(new NewObjectArrayNode((RiResolvedType) type, length)); frameState.apush(append(n)); } else { - append(currentGraph.add(new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); - frameState.apush(appendConstant(CiConstant.NULL_OBJECT)); + append(currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); + frameState.apush(appendConstant(RiConstant.NULL_OBJECT)); } } @@ -723,21 +723,21 @@ FixedWithNextNode n = currentGraph.add(new NewMultiArrayNode((RiResolvedType) type, dims)); frameState.apush(append(n)); } else { - append(currentGraph.add(new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); - frameState.apush(appendConstant(CiConstant.NULL_OBJECT)); + append(currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); + frameState.apush(appendConstant(RiConstant.NULL_OBJECT)); } } private void genGetField(RiField field) { emitExplicitExceptions(frameState.peek(0), null); - CiKind kind = field.kind(false); + RiKind kind = field.kind(false); ValueNode receiver = frameState.apop(); if ((field instanceof RiResolvedField) && ((RiResolvedField) field).holder().isInitialized()) { LoadFieldNode load = currentGraph.add(new LoadFieldNode(receiver, (RiResolvedField) field, graphId)); appendOptimizedLoadField(kind, load); } else { - append(currentGraph.add(new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); + append(currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); frameState.push(kind.stackKind(), append(ConstantNode.defaultForKind(kind, currentGraph))); } } @@ -814,14 +814,14 @@ StoreFieldNode store = currentGraph.add(new StoreFieldNode(receiver, (RiResolvedField) field, value, graphId)); appendOptimizedStoreField(store); } else { - append(currentGraph.add(new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); + append(currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); } } private void genGetStatic(RiField field) { RiType holder = field.holder(); boolean isInitialized = (field instanceof RiResolvedField) && ((RiResolvedType) holder).isInitialized(); - CiConstant constantValue = null; + RiConstant constantValue = null; if (isInitialized) { constantValue = ((RiResolvedField) field).constantValue(null); } @@ -829,7 +829,7 @@ frameState.push(constantValue.kind.stackKind(), appendConstant(constantValue)); } else { ValueNode container = genTypeOrDeopt(RiType.Representation.StaticFields, holder, isInitialized); - CiKind kind = field.kind(false); + RiKind kind = field.kind(false); if (container != null) { LoadFieldNode load = currentGraph.add(new LoadFieldNode(container, (RiResolvedField) field, graphId)); appendOptimizedLoadField(kind, load); @@ -856,7 +856,7 @@ if (initialized) { return appendConstant(((RiResolvedType) holder).getEncoding(representation)); } else { - append(currentGraph.add(new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); + append(currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); return null; } } @@ -865,7 +865,7 @@ append(store); } - private void appendOptimizedLoadField(CiKind kind, LoadFieldNode load) { + private void appendOptimizedLoadField(RiKind kind, LoadFieldNode load) { // append the load to the instruction ValueNode optimized = append(load); frameState.push(kind.stackKind(), optimized); @@ -917,10 +917,10 @@ } private void genInvokeDeopt(RiMethod unresolvedTarget, boolean withReceiver) { - append(currentGraph.add(new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); + append(currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); frameState.popArguments(unresolvedTarget.signature().argumentSlots(withReceiver), unresolvedTarget.signature().argumentCount(withReceiver)); - CiKind kind = unresolvedTarget.signature().returnKind(false); - if (kind != CiKind.Void) { + RiKind kind = unresolvedTarget.signature().returnKind(false); + if (kind != RiKind.Void) { frameState.push(kind.stackKind(), append(ConstantNode.defaultForKind(kind, currentGraph))); } } @@ -955,9 +955,9 @@ } private void appendInvoke(InvokeKind invokeKind, RiResolvedMethod targetMethod, ValueNode[] args) { - CiKind resultType = targetMethod.signature().returnKind(false); + RiKind resultType = targetMethod.signature().returnKind(false); if (GraalOptions.DeoptALot) { - DeoptimizeNode deoptimize = currentGraph.add(new DeoptimizeNode(RiDeoptAction.None, RiDeoptReason.RuntimeConstraint, graphId)); + DeoptimizeNode deoptimize = currentGraph.add(new DeoptimizeNode(CiDeoptAction.None, RiDeoptReason.RuntimeConstraint, graphId)); deoptimize.setMessage("invoke " + targetMethod.name()); append(deoptimize); frameState.pushReturn(resultType, ConstantNode.defaultForKind(resultType, currentGraph)); @@ -1020,7 +1020,7 @@ if (successor.jsrScope.nextReturnAddress() != stream().nextBCI()) { throw new JsrNotSupportedBailout("unstructured control flow (internal limitation)"); } - frameState.push(CiKind.Jsr, ConstantNode.forJsr(stream().nextBCI(), currentGraph)); + frameState.push(RiKind.Jsr, ConstantNode.forJsr(stream().nextBCI(), currentGraph)); appendGoto(createTarget(successor, frameState)); } @@ -1029,7 +1029,7 @@ ValueNode local = frameState.loadLocal(localIndex); JsrScope scope = currentBlock.jsrScope; int retAddress = scope.nextReturnAddress(); - append(currentGraph.add(new FixedGuardNode(currentGraph.unique(new IntegerEqualsNode(local, ConstantNode.forJsr(retAddress, currentGraph))), RiDeoptReason.JavaSubroutineMismatch, RiDeoptAction.InvalidateReprofile, graphId))); + append(currentGraph.add(new FixedGuardNode(currentGraph.unique(new IntegerEqualsNode(local, ConstantNode.forJsr(retAddress, currentGraph))), RiDeoptReason.JavaSubroutineMismatch, CiDeoptAction.InvalidateReprofile, graphId))); if (!successor.jsrScope.equals(scope.pop())) { throw new JsrNotSupportedBailout("unstructured control flow (ret leaves more than one scope)"); } @@ -1096,7 +1096,7 @@ append(lookupSwitch); } - private ConstantNode appendConstant(CiConstant constant) { + private ConstantNode appendConstant(RiConstant constant) { return ConstantNode.forCiConstant(constant, runtime, currentGraph); } @@ -1186,7 +1186,7 @@ private FixedNode createTarget(double probability, Block block, FrameStateBuilder stateAfter) { assert probability >= 0 && probability <= 1; if (probability == 0 && optimisticOpts.removeNeverExecutedCode()) { - return currentGraph.add(new DeoptimizeNode(RiDeoptAction.InvalidateReprofile, RiDeoptReason.UnreachedCode, graphId)); + return currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateReprofile, RiDeoptReason.UnreachedCode, graphId)); } else { return createTarget(block, stateAfter); } @@ -1345,8 +1345,8 @@ if (method.isConstructor() && method.holder().superType() == null) { callRegisterFinalizer(); } - CiKind returnKind = method.signature().returnKind(false).stackKind(); - ValueNode x = returnKind == CiKind.Void ? null : frameState.pop(returnKind); + RiKind returnKind = method.signature().returnKind(false).stackKind(); + ValueNode x = returnKind == RiKind.Void ? null : frameState.pop(returnKind); assert frameState.stackSize() == 0; // TODO (gdub) remove this when FloatingRead can handle this case @@ -1514,92 +1514,92 @@ // Checkstyle: stop switch (opcode) { case NOP : /* nothing to do */ break; - case ACONST_NULL : frameState.apush(appendConstant(CiConstant.NULL_OBJECT)); break; - case ICONST_M1 : frameState.ipush(appendConstant(CiConstant.INT_MINUS_1)); break; - case ICONST_0 : frameState.ipush(appendConstant(CiConstant.INT_0)); break; - case ICONST_1 : frameState.ipush(appendConstant(CiConstant.INT_1)); break; - case ICONST_2 : frameState.ipush(appendConstant(CiConstant.INT_2)); break; - case ICONST_3 : frameState.ipush(appendConstant(CiConstant.INT_3)); break; - case ICONST_4 : frameState.ipush(appendConstant(CiConstant.INT_4)); break; - case ICONST_5 : frameState.ipush(appendConstant(CiConstant.INT_5)); break; - case LCONST_0 : frameState.lpush(appendConstant(CiConstant.LONG_0)); break; - case LCONST_1 : frameState.lpush(appendConstant(CiConstant.LONG_1)); break; - case FCONST_0 : frameState.fpush(appendConstant(CiConstant.FLOAT_0)); break; - case FCONST_1 : frameState.fpush(appendConstant(CiConstant.FLOAT_1)); break; - case FCONST_2 : frameState.fpush(appendConstant(CiConstant.FLOAT_2)); break; - case DCONST_0 : frameState.dpush(appendConstant(CiConstant.DOUBLE_0)); break; - case DCONST_1 : frameState.dpush(appendConstant(CiConstant.DOUBLE_1)); break; - case BIPUSH : frameState.ipush(appendConstant(CiConstant.forInt(stream.readByte()))); break; - case SIPUSH : frameState.ipush(appendConstant(CiConstant.forInt(stream.readShort()))); break; + case ACONST_NULL : frameState.apush(appendConstant(RiConstant.NULL_OBJECT)); break; + case ICONST_M1 : frameState.ipush(appendConstant(RiConstant.INT_MINUS_1)); break; + case ICONST_0 : frameState.ipush(appendConstant(RiConstant.INT_0)); break; + case ICONST_1 : frameState.ipush(appendConstant(RiConstant.INT_1)); break; + case ICONST_2 : frameState.ipush(appendConstant(RiConstant.INT_2)); break; + case ICONST_3 : frameState.ipush(appendConstant(RiConstant.INT_3)); break; + case ICONST_4 : frameState.ipush(appendConstant(RiConstant.INT_4)); break; + case ICONST_5 : frameState.ipush(appendConstant(RiConstant.INT_5)); break; + case LCONST_0 : frameState.lpush(appendConstant(RiConstant.LONG_0)); break; + case LCONST_1 : frameState.lpush(appendConstant(RiConstant.LONG_1)); break; + case FCONST_0 : frameState.fpush(appendConstant(RiConstant.FLOAT_0)); break; + case FCONST_1 : frameState.fpush(appendConstant(RiConstant.FLOAT_1)); break; + case FCONST_2 : frameState.fpush(appendConstant(RiConstant.FLOAT_2)); break; + case DCONST_0 : frameState.dpush(appendConstant(RiConstant.DOUBLE_0)); break; + case DCONST_1 : frameState.dpush(appendConstant(RiConstant.DOUBLE_1)); break; + case BIPUSH : frameState.ipush(appendConstant(RiConstant.forInt(stream.readByte()))); break; + case SIPUSH : frameState.ipush(appendConstant(RiConstant.forInt(stream.readShort()))); break; case LDC : // fall through case LDC_W : // fall through case LDC2_W : genLoadConstant(stream.readCPI(), opcode); break; - case ILOAD : loadLocal(stream.readLocalIndex(), CiKind.Int); break; - case LLOAD : loadLocal(stream.readLocalIndex(), CiKind.Long); break; - case FLOAD : loadLocal(stream.readLocalIndex(), CiKind.Float); break; - case DLOAD : loadLocal(stream.readLocalIndex(), CiKind.Double); break; - case ALOAD : loadLocal(stream.readLocalIndex(), CiKind.Object); break; + case ILOAD : loadLocal(stream.readLocalIndex(), RiKind.Int); break; + case LLOAD : loadLocal(stream.readLocalIndex(), RiKind.Long); break; + case FLOAD : loadLocal(stream.readLocalIndex(), RiKind.Float); break; + case DLOAD : loadLocal(stream.readLocalIndex(), RiKind.Double); break; + case ALOAD : loadLocal(stream.readLocalIndex(), RiKind.Object); break; case ILOAD_0 : // fall through case ILOAD_1 : // fall through case ILOAD_2 : // fall through - case ILOAD_3 : loadLocal(opcode - ILOAD_0, CiKind.Int); break; + case ILOAD_3 : loadLocal(opcode - ILOAD_0, RiKind.Int); break; case LLOAD_0 : // fall through case LLOAD_1 : // fall through case LLOAD_2 : // fall through - case LLOAD_3 : loadLocal(opcode - LLOAD_0, CiKind.Long); break; + case LLOAD_3 : loadLocal(opcode - LLOAD_0, RiKind.Long); break; case FLOAD_0 : // fall through case FLOAD_1 : // fall through case FLOAD_2 : // fall through - case FLOAD_3 : loadLocal(opcode - FLOAD_0, CiKind.Float); break; + case FLOAD_3 : loadLocal(opcode - FLOAD_0, RiKind.Float); break; case DLOAD_0 : // fall through case DLOAD_1 : // fall through case DLOAD_2 : // fall through - case DLOAD_3 : loadLocal(opcode - DLOAD_0, CiKind.Double); break; + case DLOAD_3 : loadLocal(opcode - DLOAD_0, RiKind.Double); break; case ALOAD_0 : // fall through case ALOAD_1 : // fall through case ALOAD_2 : // fall through - case ALOAD_3 : loadLocal(opcode - ALOAD_0, CiKind.Object); break; - case IALOAD : genLoadIndexed(CiKind.Int ); break; - case LALOAD : genLoadIndexed(CiKind.Long ); break; - case FALOAD : genLoadIndexed(CiKind.Float ); break; - case DALOAD : genLoadIndexed(CiKind.Double); break; - case AALOAD : genLoadIndexed(CiKind.Object); break; - case BALOAD : genLoadIndexed(CiKind.Byte ); break; - case CALOAD : genLoadIndexed(CiKind.Char ); break; - case SALOAD : genLoadIndexed(CiKind.Short ); break; - case ISTORE : storeLocal(CiKind.Int, stream.readLocalIndex()); break; - case LSTORE : storeLocal(CiKind.Long, stream.readLocalIndex()); break; - case FSTORE : storeLocal(CiKind.Float, stream.readLocalIndex()); break; - case DSTORE : storeLocal(CiKind.Double, stream.readLocalIndex()); break; - case ASTORE : storeLocal(CiKind.Object, stream.readLocalIndex()); break; + case ALOAD_3 : loadLocal(opcode - ALOAD_0, RiKind.Object); break; + case IALOAD : genLoadIndexed(RiKind.Int ); break; + case LALOAD : genLoadIndexed(RiKind.Long ); break; + case FALOAD : genLoadIndexed(RiKind.Float ); break; + case DALOAD : genLoadIndexed(RiKind.Double); break; + case AALOAD : genLoadIndexed(RiKind.Object); break; + case BALOAD : genLoadIndexed(RiKind.Byte ); break; + case CALOAD : genLoadIndexed(RiKind.Char ); break; + case SALOAD : genLoadIndexed(RiKind.Short ); break; + case ISTORE : storeLocal(RiKind.Int, stream.readLocalIndex()); break; + case LSTORE : storeLocal(RiKind.Long, stream.readLocalIndex()); break; + case FSTORE : storeLocal(RiKind.Float, stream.readLocalIndex()); break; + case DSTORE : storeLocal(RiKind.Double, stream.readLocalIndex()); break; + case ASTORE : storeLocal(RiKind.Object, stream.readLocalIndex()); break; case ISTORE_0 : // fall through case ISTORE_1 : // fall through case ISTORE_2 : // fall through - case ISTORE_3 : storeLocal(CiKind.Int, opcode - ISTORE_0); break; + case ISTORE_3 : storeLocal(RiKind.Int, opcode - ISTORE_0); break; case LSTORE_0 : // fall through case LSTORE_1 : // fall through case LSTORE_2 : // fall through - case LSTORE_3 : storeLocal(CiKind.Long, opcode - LSTORE_0); break; + case LSTORE_3 : storeLocal(RiKind.Long, opcode - LSTORE_0); break; case FSTORE_0 : // fall through case FSTORE_1 : // fall through case FSTORE_2 : // fall through - case FSTORE_3 : storeLocal(CiKind.Float, opcode - FSTORE_0); break; + case FSTORE_3 : storeLocal(RiKind.Float, opcode - FSTORE_0); break; case DSTORE_0 : // fall through case DSTORE_1 : // fall through case DSTORE_2 : // fall through - case DSTORE_3 : storeLocal(CiKind.Double, opcode - DSTORE_0); break; + case DSTORE_3 : storeLocal(RiKind.Double, opcode - DSTORE_0); break; case ASTORE_0 : // fall through case ASTORE_1 : // fall through case ASTORE_2 : // fall through - case ASTORE_3 : storeLocal(CiKind.Object, opcode - ASTORE_0); break; - case IASTORE : genStoreIndexed(CiKind.Int ); break; - case LASTORE : genStoreIndexed(CiKind.Long ); break; - case FASTORE : genStoreIndexed(CiKind.Float ); break; - case DASTORE : genStoreIndexed(CiKind.Double); break; - case AASTORE : genStoreIndexed(CiKind.Object); break; - case BASTORE : genStoreIndexed(CiKind.Byte ); break; - case CASTORE : genStoreIndexed(CiKind.Char ); break; - case SASTORE : genStoreIndexed(CiKind.Short ); break; + case ASTORE_3 : storeLocal(RiKind.Object, opcode - ASTORE_0); break; + case IASTORE : genStoreIndexed(RiKind.Int ); break; + case LASTORE : genStoreIndexed(RiKind.Long ); break; + case FASTORE : genStoreIndexed(RiKind.Float ); break; + case DASTORE : genStoreIndexed(RiKind.Double); break; + case AASTORE : genStoreIndexed(RiKind.Object); break; + case BASTORE : genStoreIndexed(RiKind.Byte ); break; + case CASTORE : genStoreIndexed(RiKind.Char ); break; + case SASTORE : genStoreIndexed(RiKind.Short ); break; case POP : // fall through case POP2 : // fall through case DUP : // fall through @@ -1611,40 +1611,40 @@ case SWAP : stackOp(opcode); break; case IADD : // fall through case ISUB : // fall through - case IMUL : genArithmeticOp(CiKind.Int, opcode, false); break; + case IMUL : genArithmeticOp(RiKind.Int, opcode, false); break; case IDIV : // fall through - case IREM : genArithmeticOp(CiKind.Int, opcode, true); break; + case IREM : genArithmeticOp(RiKind.Int, opcode, true); break; case LADD : // fall through case LSUB : // fall through - case LMUL : genArithmeticOp(CiKind.Long, opcode, false); break; + case LMUL : genArithmeticOp(RiKind.Long, opcode, false); break; case LDIV : // fall through - case LREM : genArithmeticOp(CiKind.Long, opcode, true); break; + case LREM : genArithmeticOp(RiKind.Long, opcode, true); break; case FADD : // fall through case FSUB : // fall through case FMUL : // fall through case FDIV : // fall through - case FREM : genArithmeticOp(CiKind.Float, opcode, false); break; + case FREM : genArithmeticOp(RiKind.Float, opcode, false); break; case DADD : // fall through case DSUB : // fall through case DMUL : // fall through case DDIV : // fall through - case DREM : genArithmeticOp(CiKind.Double, opcode, false); break; - case INEG : genNegateOp(CiKind.Int); break; - case LNEG : genNegateOp(CiKind.Long); break; - case FNEG : genNegateOp(CiKind.Float); break; - case DNEG : genNegateOp(CiKind.Double); break; + case DREM : genArithmeticOp(RiKind.Double, opcode, false); break; + case INEG : genNegateOp(RiKind.Int); break; + case LNEG : genNegateOp(RiKind.Long); break; + case FNEG : genNegateOp(RiKind.Float); break; + case DNEG : genNegateOp(RiKind.Double); break; case ISHL : // fall through case ISHR : // fall through - case IUSHR : genShiftOp(CiKind.Int, opcode); break; + case IUSHR : genShiftOp(RiKind.Int, opcode); break; case IAND : // fall through case IOR : // fall through - case IXOR : genLogicOp(CiKind.Int, opcode); break; + case IXOR : genLogicOp(RiKind.Int, opcode); break; case LSHL : // fall through case LSHR : // fall through - case LUSHR : genShiftOp(CiKind.Long, opcode); break; + case LUSHR : genShiftOp(RiKind.Long, opcode); break; case LAND : // fall through case LOR : // fall through - case LXOR : genLogicOp(CiKind.Long, opcode); break; + case LXOR : genLogicOp(RiKind.Long, opcode); break; case IINC : genIncrement(); break; case I2L : genConvert(ConvertNode.Op.I2L); break; case I2F : genConvert(ConvertNode.Op.I2F); break; @@ -1661,25 +1661,25 @@ case I2B : genConvert(ConvertNode.Op.I2B); break; case I2C : genConvert(ConvertNode.Op.I2C); break; case I2S : genConvert(ConvertNode.Op.I2S); break; - case LCMP : genCompareOp(CiKind.Long, false); break; - case FCMPL : genCompareOp(CiKind.Float, true); break; - case FCMPG : genCompareOp(CiKind.Float, false); break; - case DCMPL : genCompareOp(CiKind.Double, true); break; - case DCMPG : genCompareOp(CiKind.Double, false); break; + case LCMP : genCompareOp(RiKind.Long, false); break; + case FCMPL : genCompareOp(RiKind.Float, true); break; + case FCMPG : genCompareOp(RiKind.Float, false); break; + case DCMPL : genCompareOp(RiKind.Double, true); break; + case DCMPG : genCompareOp(RiKind.Double, false); break; case IFEQ : genIfZero(Condition.EQ); break; case IFNE : genIfZero(Condition.NE); break; case IFLT : genIfZero(Condition.LT); break; case IFGE : genIfZero(Condition.GE); break; case IFGT : genIfZero(Condition.GT); break; case IFLE : genIfZero(Condition.LE); break; - case IF_ICMPEQ : genIfSame(CiKind.Int, Condition.EQ); break; - case IF_ICMPNE : genIfSame(CiKind.Int, Condition.NE); break; - case IF_ICMPLT : genIfSame(CiKind.Int, Condition.LT); break; - case IF_ICMPGE : genIfSame(CiKind.Int, Condition.GE); break; - case IF_ICMPGT : genIfSame(CiKind.Int, Condition.GT); break; - case IF_ICMPLE : genIfSame(CiKind.Int, Condition.LE); break; - case IF_ACMPEQ : genIfSame(CiKind.Object, Condition.EQ); break; - case IF_ACMPNE : genIfSame(CiKind.Object, Condition.NE); break; + case IF_ICMPEQ : genIfSame(RiKind.Int, Condition.EQ); break; + case IF_ICMPNE : genIfSame(RiKind.Int, Condition.NE); break; + case IF_ICMPLT : genIfSame(RiKind.Int, Condition.LT); break; + case IF_ICMPGE : genIfSame(RiKind.Int, Condition.GE); break; + case IF_ICMPGT : genIfSame(RiKind.Int, Condition.GT); break; + case IF_ICMPLE : genIfSame(RiKind.Int, Condition.LE); break; + case IF_ACMPEQ : genIfSame(RiKind.Object, Condition.EQ); break; + case IF_ACMPNE : genIfSame(RiKind.Object, Condition.NE); break; case GOTO : genGoto(); break; case JSR : genJsr(stream.readBranchDest()); break; case RET : genRet(stream.readLocalIndex()); break;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/JsrNotSupportedBailout.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/JsrNotSupportedBailout.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.java; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; public class JsrNotSupportedBailout extends CiBailout{
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Arithmetic.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Arithmetic.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.lir.amd64; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; import com.oracle.max.asm.*; import com.oracle.max.asm.target.amd64.*; import com.oracle.max.asm.target.amd64.AMD64Assembler.ConditionFlag; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.asm.*; @@ -48,14 +48,14 @@ public static class Op1Reg extends AMD64LIRInstruction { - public Op1Reg(AMD64Arithmetic opcode, CiValue result, CiValue x) { - super(opcode, new CiValue[] {result}, null, new CiValue[] {x}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public Op1Reg(AMD64Arithmetic opcode, RiValue result, RiValue x) { + super(opcode, new RiValue[] {result}, null, new RiValue[] {x}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { - CiValue result = output(0); - CiValue x = input(0); + RiValue result = output(0); + RiValue x = input(0); emit(tasm, masm, (AMD64Arithmetic) code, result, x, null); } @@ -72,14 +72,14 @@ } public static class Op1Stack extends AMD64LIRInstruction { - public Op1Stack(AMD64Arithmetic opcode, CiValue result, CiValue x) { - super(opcode, new CiValue[] {result}, null, new CiValue[] {x}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public Op1Stack(AMD64Arithmetic opcode, RiValue result, RiValue x) { + super(opcode, new RiValue[] {result}, null, new RiValue[] {x}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { - CiValue result = output(0); - CiValue x = input(0); + RiValue result = output(0); + RiValue x = input(0); AMD64Move.move(tasm, masm, result, x); emit(tasm, masm, (AMD64Arithmetic) code, result); @@ -97,15 +97,15 @@ } public static class Op2Stack extends AMD64LIRInstruction { - public Op2Stack(AMD64Arithmetic opcode, CiValue result, CiValue x, CiValue y) { - super(opcode, new CiValue[] {result}, null, new CiValue[] {x}, new CiValue[] {y}, LIRInstruction.NO_OPERANDS); + public Op2Stack(AMD64Arithmetic opcode, RiValue result, RiValue x, RiValue y) { + super(opcode, new RiValue[] {result}, null, new RiValue[] {x}, new RiValue[] {y}, LIRInstruction.NO_OPERANDS); } @Override public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { - CiValue result = output(0); - CiValue x = input(0); - CiValue y = alive(0); + RiValue result = output(0); + RiValue x = input(0); + RiValue y = alive(0); AMD64Move.move(tasm, masm, result, x); emit(tasm, masm, (AMD64Arithmetic) code, result, y, null); @@ -125,9 +125,9 @@ @Override public void verify() { - CiValue result = output(0); - CiValue x = input(0); - CiValue y = alive(0); + RiValue result = output(0); + RiValue x = input(0); + RiValue y = alive(0); super.verify(); assert differentRegisters(result, y) || sameRegister(x, y); @@ -136,15 +136,15 @@ } public static class Op2Reg extends AMD64LIRInstruction { - public Op2Reg(AMD64Arithmetic opcode, CiValue result, CiValue x, CiValue y) { - super(opcode, new CiValue[] {result}, null, new CiValue[] {x}, new CiValue[] {y}, LIRInstruction.NO_OPERANDS); + public Op2Reg(AMD64Arithmetic opcode, RiValue result, RiValue x, RiValue y) { + super(opcode, new RiValue[] {result}, null, new RiValue[] {x}, new RiValue[] {y}, LIRInstruction.NO_OPERANDS); } @Override public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { - CiValue result = output(0); - CiValue x = input(0); - CiValue y = alive(0); + RiValue result = output(0); + RiValue x = input(0); + RiValue y = alive(0); AMD64Move.move(tasm, masm, result, x); emit(tasm, masm, (AMD64Arithmetic) code, result, y, null); @@ -164,9 +164,9 @@ @Override public void verify() { - CiValue result = output(0); - CiValue x = input(0); - CiValue y = alive(0); + RiValue result = output(0); + RiValue x = input(0); + RiValue y = alive(0); super.verify(); assert differentRegisters(result, y) || sameRegister(x, y); @@ -175,15 +175,15 @@ } public static class Op2RegCommutative extends AMD64LIRInstruction { - public Op2RegCommutative(AMD64Arithmetic opcode, CiValue result, CiValue x, CiValue y) { - super(opcode, new CiValue[] {result}, null, new CiValue[] {x, y}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public Op2RegCommutative(AMD64Arithmetic opcode, RiValue result, RiValue x, RiValue y) { + super(opcode, new RiValue[] {result}, null, new RiValue[] {x, y}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { - CiValue result = output(0); - CiValue x = input(0); - CiValue y = input(1); + RiValue result = output(0); + RiValue x = input(0); + RiValue y = input(1); if (sameRegister(result, y)) { emit(tasm, masm, (AMD64Arithmetic) code, result, x, null); @@ -207,9 +207,9 @@ @Override protected void verify() { - CiValue result = output(0); - CiValue x = input(0); - CiValue y = input(1); + RiValue result = output(0); + RiValue x = input(0); + RiValue y = input(1); super.verify(); verifyKind((AMD64Arithmetic) code, result, x, y); @@ -217,15 +217,15 @@ } public static class ShiftOp extends AMD64LIRInstruction { - public ShiftOp(AMD64Arithmetic opcode, CiValue result, CiValue x, CiValue y) { - super(opcode, new CiValue[] {result}, null, new CiValue[] {x}, new CiValue[] {y}, LIRInstruction.NO_OPERANDS); + public ShiftOp(AMD64Arithmetic opcode, RiValue result, RiValue x, RiValue y) { + super(opcode, new RiValue[] {result}, null, new RiValue[] {x}, new RiValue[] {y}, LIRInstruction.NO_OPERANDS); } @Override public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { - CiValue result = output(0); - CiValue x = input(0); - CiValue y = alive(0); + RiValue result = output(0); + RiValue x = input(0); + RiValue y = alive(0); AMD64Move.move(tasm, masm, result, x); emit(tasm, masm, (AMD64Arithmetic) code, result, y, null); @@ -245,27 +245,27 @@ @Override public void verify() { - CiValue result = output(0); - CiValue x = input(0); - CiValue y = alive(0); + RiValue result = output(0); + RiValue x = input(0); + RiValue y = alive(0); super.verify(); assert isConstant(y) || asRegister(y) == AMD64.rcx; assert differentRegisters(result, y) || sameRegister(x, y); verifyKind((AMD64Arithmetic) code, result, x, x); - assert y.kind.stackKind() == CiKind.Int; + assert y.kind.stackKind() == RiKind.Int; } } public static class DivOp extends AMD64LIRInstruction { - public DivOp(AMD64Arithmetic opcode, CiValue result, CiValue x, CiValue y, LIRDebugInfo info) { - super(opcode, new CiValue[] {result}, info, new CiValue[] {x}, new CiValue[] {y}, new CiValue[] {asRegister(result) == AMD64.rax ? AMD64.rdx.asValue(result.kind) : AMD64.rax.asValue(result.kind)}); + public DivOp(AMD64Arithmetic opcode, RiValue result, RiValue x, RiValue y, LIRDebugInfo info) { + super(opcode, new RiValue[] {result}, info, new RiValue[] {x}, new RiValue[] {y}, new RiValue[] {asRegister(result) == AMD64.rax ? AMD64.rdx.asValue(result.kind) : AMD64.rax.asValue(result.kind)}); } @Override public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { - CiValue result = output(0); - CiValue y = alive(0); + RiValue result = output(0); + RiValue y = alive(0); emit(tasm, masm, (AMD64Arithmetic) code, result, y, info); } @@ -286,9 +286,9 @@ @Override protected void verify() { - CiValue result = output(0); - CiValue x = input(0); - CiValue y = alive(0); + RiValue result = output(0); + RiValue x = input(0); + RiValue y = alive(0); super.verify(); // left input in rax, right input in any register but rax and rdx, result quotient in rax, result remainder in rdx @@ -301,7 +301,7 @@ @SuppressWarnings("unused") - protected static void emit(TargetMethodAssembler tasm, AMD64MacroAssembler masm, AMD64Arithmetic opcode, CiValue result) { + protected static void emit(TargetMethodAssembler tasm, AMD64MacroAssembler masm, AMD64Arithmetic opcode, RiValue result) { switch (opcode) { case INEG: masm.negl(asIntReg(result)); break; case LNEG: masm.negq(asLongReg(result)); break; @@ -313,7 +313,7 @@ } } - public static void emit(TargetMethodAssembler tasm, AMD64MacroAssembler masm, AMD64Arithmetic opcode, CiValue dst, CiValue src, LIRDebugInfo info) { + public static void emit(TargetMethodAssembler tasm, AMD64MacroAssembler masm, AMD64Arithmetic opcode, RiValue dst, RiValue src, LIRDebugInfo info) { int exceptionOffset = -1; if (isRegister(src)) { switch (opcode) { @@ -498,12 +498,12 @@ } } - private static void emitConvertFixup(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue result, CiValue x) { + private static void emitConvertFixup(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue result, RiValue x) { ConvertSlowPath slowPath = new ConvertSlowPath(result, x); tasm.stubs.add(slowPath); switch (result.kind) { case Int: masm.cmpl(asIntReg(result), Integer.MIN_VALUE); break; - case Long: masm.cmpq(asLongReg(result), tasm.asLongConstRef(CiConstant.forLong(java.lang.Long.MIN_VALUE))); break; + case Long: masm.cmpq(asLongReg(result), tasm.asLongConstRef(RiConstant.forLong(java.lang.Long.MIN_VALUE))); break; default: throw GraalInternalError.shouldNotReachHere(); } masm.jcc(ConditionFlag.equal, slowPath.start); @@ -513,10 +513,10 @@ private static class ConvertSlowPath extends AMD64Code { public final Label start = new Label(); public final Label continuation = new Label(); - private final CiValue result; - private final CiValue x; + private final RiValue result; + private final RiValue x; - public ConvertSlowPath(CiValue result, CiValue x) { + public ConvertSlowPath(RiValue result, RiValue x) { this.result = result; this.x = x; } @@ -525,8 +525,8 @@ public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { masm.bind(start); switch (x.kind) { - case Float: masm.ucomiss(asFloatReg(x), tasm.asFloatConstRef(CiConstant.FLOAT_0)); break; - case Double: masm.ucomisd(asDoubleReg(x), tasm.asDoubleConstRef(CiConstant.DOUBLE_0)); break; + case Float: masm.ucomiss(asFloatReg(x), tasm.asFloatConstRef(RiConstant.FLOAT_0)); break; + case Double: masm.ucomisd(asDoubleReg(x), tasm.asDoubleConstRef(RiConstant.DOUBLE_0)); break; default: throw GraalInternalError.shouldNotReachHere(); } Label nan = new Label(); @@ -555,10 +555,10 @@ } - private static void verifyKind(AMD64Arithmetic opcode, CiValue result, CiValue x, CiValue y) { - assert (opcode.name().startsWith("I") && result.kind == CiKind.Int && x.kind.stackKind() == CiKind.Int && y.kind.stackKind() == CiKind.Int) - || (opcode.name().startsWith("L") && result.kind == CiKind.Long && x.kind == CiKind.Long && y.kind == CiKind.Long) - || (opcode.name().startsWith("F") && result.kind == CiKind.Float && x.kind == CiKind.Float && y.kind == CiKind.Float) - || (opcode.name().startsWith("D") && result.kind == CiKind.Double && x.kind == CiKind.Double && y.kind == CiKind.Double); + private static void verifyKind(AMD64Arithmetic opcode, RiValue result, RiValue x, RiValue y) { + assert (opcode.name().startsWith("I") && result.kind == RiKind.Int && x.kind.stackKind() == RiKind.Int && y.kind.stackKind() == RiKind.Int) + || (opcode.name().startsWith("L") && result.kind == RiKind.Long && x.kind == RiKind.Long && y.kind == RiKind.Long) + || (opcode.name().startsWith("F") && result.kind == RiKind.Float && x.kind == RiKind.Float && y.kind == RiKind.Float) + || (opcode.name().startsWith("D") && result.kind == RiKind.Double && x.kind == RiKind.Double && y.kind == RiKind.Double); } }
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.lir.amd64; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiTargetMethod.Mark; import com.oracle.max.cri.xir.CiXirAssembler.XirMark; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiTargetMethod.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.asm.*; @@ -40,8 +41,8 @@ private final Object targetMethod; private final Map<XirMark, Mark> marks; - public DirectCallOp(Object targetMethod, CiValue result, CiValue[] parameters, LIRDebugInfo info, Map<XirMark, Mark> marks) { - super("CALL_DIRECT", new CiValue[] {result}, info, parameters, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public DirectCallOp(Object targetMethod, RiValue result, RiValue[] parameters, LIRDebugInfo info, Map<XirMark, Mark> marks) { + super("CALL_DIRECT", new RiValue[] {result}, info, parameters, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); this.targetMethod = targetMethod; this.marks = marks; } @@ -70,19 +71,19 @@ private final Object targetMethod; private final Map<XirMark, Mark> marks; - private static CiValue[] concat(CiValue[] parameters, CiValue targetAddress) { - CiValue[] result = Arrays.copyOf(parameters, parameters.length + 1); + private static RiValue[] concat(RiValue[] parameters, RiValue targetAddress) { + RiValue[] result = Arrays.copyOf(parameters, parameters.length + 1); result[result.length - 1] = targetAddress; return result; } - public IndirectCallOp(Object targetMethod, CiValue result, CiValue[] parameters, CiValue targetAddress, LIRDebugInfo info, Map<XirMark, Mark> marks) { - super("CALL_INDIRECT", new CiValue[] {result}, info, concat(parameters, targetAddress), LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public IndirectCallOp(Object targetMethod, RiValue result, RiValue[] parameters, RiValue targetAddress, LIRDebugInfo info, Map<XirMark, Mark> marks) { + super("CALL_INDIRECT", new RiValue[] {result}, info, concat(parameters, targetAddress), LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); this.targetMethod = targetMethod; this.marks = marks; } - private CiValue targetAddress() { + private RiValue targetAddress() { return input(inputs.length - 1); }
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Compare.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Compare.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.lir.amd64; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.asm.*; @@ -36,14 +36,14 @@ ICMP, LCMP, ACMP, FCMP, DCMP; public static class CompareOp extends AMD64LIRInstruction { - public CompareOp(AMD64Compare opcode, CiValue x, CiValue y) { - super(opcode, LIRInstruction.NO_OPERANDS, null, new CiValue[] {x, y}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public CompareOp(AMD64Compare opcode, RiValue x, RiValue y) { + super(opcode, LIRInstruction.NO_OPERANDS, null, new RiValue[] {x, y}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { - CiValue x = input(0); - CiValue y = input(1); + RiValue x = input(0); + RiValue y = input(1); emit(tasm, masm, (AMD64Compare) code, x, y); } @@ -59,20 +59,20 @@ @Override protected void verify() { - CiValue x = input(0); - CiValue y = input(1); + RiValue x = input(0); + RiValue y = input(1); super.verify(); - assert (name().startsWith("I") && x.kind == CiKind.Int && y.kind.stackKind() == CiKind.Int) - || (name().startsWith("I") && x.kind == CiKind.Jsr && y.kind == CiKind.Jsr) - || (name().startsWith("L") && x.kind == CiKind.Long && y.kind == CiKind.Long) - || (name().startsWith("A") && x.kind == CiKind.Object && y.kind == CiKind.Object) - || (name().startsWith("F") && x.kind == CiKind.Float && y.kind == CiKind.Float) - || (name().startsWith("D") && x.kind == CiKind.Double && y.kind == CiKind.Double); + assert (name().startsWith("I") && x.kind == RiKind.Int && y.kind.stackKind() == RiKind.Int) + || (name().startsWith("I") && x.kind == RiKind.Jsr && y.kind == RiKind.Jsr) + || (name().startsWith("L") && x.kind == RiKind.Long && y.kind == RiKind.Long) + || (name().startsWith("A") && x.kind == RiKind.Object && y.kind == RiKind.Object) + || (name().startsWith("F") && x.kind == RiKind.Float && y.kind == RiKind.Float) + || (name().startsWith("D") && x.kind == RiKind.Double && y.kind == RiKind.Double); } } - public static void emit(TargetMethodAssembler tasm, AMD64MacroAssembler masm, AMD64Compare opcode, CiValue x, CiValue y) { + public static void emit(TargetMethodAssembler tasm, AMD64MacroAssembler masm, AMD64Compare opcode, RiValue x, RiValue y) { if (isRegister(y)) { switch (opcode) { case ICMP: masm.cmpl(asIntReg(x), asIntReg(y)); break; @@ -87,7 +87,7 @@ case ICMP: masm.cmpl(asIntReg(x), tasm.asIntConst(y)); break; case LCMP: masm.cmpq(asLongReg(x), tasm.asIntConst(y)); break; case ACMP: - if (((CiConstant) y).isNull()) { + if (((RiConstant) y).isNull()) { masm.cmpq(asObjectReg(x), 0); break; } else { throw GraalInternalError.shouldNotReachHere("Only null object constants are allowed in comparisons");
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ControlFlow.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ControlFlow.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.lir.amd64; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; import com.oracle.max.asm.*; import com.oracle.max.asm.target.amd64.*; import com.oracle.max.asm.target.amd64.AMD64Assembler.ConditionFlag; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiAddress.Scale; -import com.oracle.max.cri.ci.CiTargetMethod.JumpTable; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiAddress.*; +import com.oracle.graal.api.code.CiTargetMethod.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.asm.*; @@ -40,8 +41,8 @@ public class AMD64ControlFlow { public static class ReturnOp extends AMD64LIRInstruction { - public ReturnOp(CiValue input) { - super("RETURN", LIRInstruction.NO_OPERANDS, null, new CiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public ReturnOp(RiValue input) { + super("RETURN", LIRInstruction.NO_OPERANDS, null, new RiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override @@ -136,7 +137,7 @@ private final LabelRef[] targets; public TableSwitchOp(final int lowKey, final LabelRef defaultTarget, final LabelRef[] targets, Variable index, Variable scratch) { - super("TABLE_SWITCH", LIRInstruction.NO_OPERANDS, null, LIRInstruction.NO_OPERANDS, new CiValue[] {index}, new CiValue[] {scratch}); + super("TABLE_SWITCH", LIRInstruction.NO_OPERANDS, null, LIRInstruction.NO_OPERANDS, new RiValue[] {index}, new RiValue[] {scratch}); this.lowKey = lowKey; this.defaultTarget = defaultTarget; this.targets = targets; @@ -174,8 +175,8 @@ public static class CondMoveOp extends AMD64LIRInstruction { private final ConditionFlag condition; - public CondMoveOp(Variable result, Condition condition, Variable trueValue, CiValue falseValue) { - super("CMOVE", new CiValue[] {result}, null, new CiValue[] {falseValue}, new CiValue[] {trueValue}, LIRInstruction.NO_OPERANDS); + public CondMoveOp(Variable result, Condition condition, Variable trueValue, RiValue falseValue) { + super("CMOVE", new RiValue[] {result}, null, new RiValue[] {falseValue}, new RiValue[] {trueValue}, LIRInstruction.NO_OPERANDS); this.condition = intCond(condition); } @@ -208,7 +209,7 @@ private final boolean unorderedIsTrue; public FloatCondMoveOp(Variable result, Condition condition, boolean unorderedIsTrue, Variable trueValue, Variable falseValue) { - super("FLOAT_CMOVE", new CiValue[] {result}, null, LIRInstruction.NO_OPERANDS, new CiValue[] {trueValue, falseValue}, LIRInstruction.NO_OPERANDS); + super("FLOAT_CMOVE", new RiValue[] {result}, null, LIRInstruction.NO_OPERANDS, new RiValue[] {trueValue, falseValue}, LIRInstruction.NO_OPERANDS); this.condition = floatCond(condition); this.unorderedIsTrue = unorderedIsTrue; } @@ -258,7 +259,7 @@ int afterLea = buf.position(); // Load jump table entry into scratch and jump to it - masm.movslq(value, new CiAddress(CiKind.Int, scratch.asValue(), value.asValue(), Scale.Times4, 0)); + masm.movslq(value, new CiAddress(RiKind.Int, scratch.asValue(), value.asValue(), Scale.Times4, 0)); masm.addq(scratch, value); masm.jmp(scratch); @@ -304,7 +305,7 @@ masm.bind(endLabel); } - private static void cmove(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue result, boolean isFloat, ConditionFlag condition, boolean unorderedIsTrue, CiValue trueValue, CiValue falseValue) { + private static void cmove(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue result, boolean isFloat, ConditionFlag condition, boolean unorderedIsTrue, RiValue trueValue, RiValue falseValue) { // check that we don't overwrite an input operand before it is used. assert !result.equals(trueValue); @@ -320,7 +321,7 @@ } } - private static void cmove(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue result, ConditionFlag cond, CiValue other) { + private static void cmove(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue result, ConditionFlag cond, RiValue other) { if (isRegister(other)) { assert asRegister(other) != asRegister(result) : "other already overwritten by previous move"; switch (other.kind) {
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64LIRInstruction.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64LIRInstruction.java Fri Jun 08 15:17:43 2012 +0200 @@ -23,7 +23,7 @@ package com.oracle.graal.lir.amd64; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.asm.*; @@ -32,7 +32,7 @@ */ public abstract class AMD64LIRInstruction extends LIRInstruction { - public AMD64LIRInstruction(Object opcode, CiValue[] outputs, LIRDebugInfo info, CiValue[] inputs, CiValue[] alives, CiValue[] temps) { + public AMD64LIRInstruction(Object opcode, RiValue[] outputs, LIRDebugInfo info, RiValue[] inputs, RiValue[] alives, RiValue[] temps) { super(opcode, outputs, info, inputs, alives, temps); }
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.amd64; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import static java.lang.Double.*; import static java.lang.Float.*; @@ -30,7 +30,8 @@ import com.oracle.max.asm.*; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.StandardOp.*; @@ -39,8 +40,8 @@ public class AMD64Move { public static class SpillMoveOp extends AMD64LIRInstruction implements MoveOp { - public SpillMoveOp(CiValue result, CiValue input) { - super("MOVE", new CiValue[] {result}, null, new CiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public SpillMoveOp(RiValue result, RiValue input) { + super("MOVE", new RiValue[] {result}, null, new RiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override @@ -49,11 +50,11 @@ } @Override - public CiValue getInput() { + public RiValue getInput() { return input(0); } @Override - public CiValue getResult() { + public RiValue getResult() { return output(0); } @@ -70,8 +71,8 @@ public static class MoveToRegOp extends AMD64LIRInstruction implements MoveOp { - public MoveToRegOp(CiValue result, CiValue input) { - super("MOVE", new CiValue[] {result}, null, new CiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public MoveToRegOp(RiValue result, RiValue input) { + super("MOVE", new RiValue[] {result}, null, new RiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override @@ -80,11 +81,11 @@ } @Override - public CiValue getInput() { + public RiValue getInput() { return input(0); } @Override - public CiValue getResult() { + public RiValue getResult() { return output(0); } @@ -101,8 +102,8 @@ public static class MoveFromRegOp extends AMD64LIRInstruction implements MoveOp { - public MoveFromRegOp(CiValue result, CiValue input) { - super("MOVE", new CiValue[] {result}, null, new CiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public MoveFromRegOp(RiValue result, RiValue input) { + super("MOVE", new RiValue[] {result}, null, new RiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override @@ -111,11 +112,11 @@ } @Override - public CiValue getInput() { + public RiValue getInput() { return input(0); } @Override - public CiValue getResult() { + public RiValue getResult() { return output(0); } @@ -132,8 +133,8 @@ public static class LoadOp extends AMD64LIRInstruction { - public LoadOp(CiValue result, CiValue address, LIRDebugInfo info) { - super("LOAD", new CiValue[] {result}, info, new CiValue[] {address}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public LoadOp(RiValue result, RiValue address, LIRDebugInfo info) { + super("LOAD", new RiValue[] {result}, info, new RiValue[] {address}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override @@ -154,8 +155,8 @@ public static class StoreOp extends AMD64LIRInstruction { - public StoreOp(CiValue address, CiValue input, LIRDebugInfo info) { - super("STORE", LIRInstruction.NO_OPERANDS, info, new CiValue[] {address, input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public StoreOp(RiValue address, RiValue input, LIRDebugInfo info) { + super("STORE", LIRInstruction.NO_OPERANDS, info, new RiValue[] {address, input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override @@ -176,8 +177,8 @@ public static class LeaOp extends AMD64LIRInstruction { - public LeaOp(CiValue result, CiValue address) { - super("LEA", new CiValue[] {result}, null, new CiValue[] {address}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public LeaOp(RiValue result, RiValue address) { + super("LEA", new RiValue[] {result}, null, new RiValue[] {address}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override @@ -219,7 +220,7 @@ public static class NullCheckOp extends AMD64LIRInstruction { public NullCheckOp(Variable input, LIRDebugInfo info) { - super("NULL_CHECK", LIRInstruction.NO_OPERANDS, info, new CiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + super("NULL_CHECK", LIRInstruction.NO_OPERANDS, info, new RiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override @@ -239,8 +240,8 @@ public static class CompareAndSwapOp extends AMD64LIRInstruction { - public CompareAndSwapOp(CiValue result, CiAddress address, CiValue cmpValue, CiValue newValue) { - super("CAS", new CiValue[] {result}, null, new CiValue[] {address, cmpValue, newValue}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public CompareAndSwapOp(RiValue result, CiAddress address, RiValue cmpValue, RiValue newValue) { + super("CAS", new RiValue[] {result}, null, new RiValue[] {address, cmpValue, newValue}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override @@ -264,7 +265,7 @@ } - public static void move(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue result, CiValue input) { + public static void move(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue result, RiValue input) { if (isRegister(input)) { if (isRegister(result)) { reg2reg(masm, result, input); @@ -281,9 +282,9 @@ } } else if (isConstant(input)) { if (isRegister(result)) { - const2reg(tasm, masm, result, (CiConstant) input); + const2reg(tasm, masm, result, (RiConstant) input); } else if (isStackSlot(result)) { - const2stack(tasm, masm, result, (CiConstant) input); + const2stack(tasm, masm, result, (RiConstant) input); } else { throw GraalInternalError.shouldNotReachHere(); } @@ -292,7 +293,7 @@ } } - private static void reg2reg(AMD64MacroAssembler masm, CiValue result, CiValue input) { + private static void reg2reg(AMD64MacroAssembler masm, RiValue result, RiValue input) { if (input.equals(result)) { return; } @@ -307,7 +308,7 @@ } } - private static void reg2stack(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue result, CiValue input) { + private static void reg2stack(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue result, RiValue input) { switch (input.kind) { case Jsr: case Int: masm.movl(tasm.asAddress(result), asRegister(input)); break; @@ -319,7 +320,7 @@ } } - private static void stack2reg(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue result, CiValue input) { + private static void stack2reg(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue result, RiValue input) { switch (input.kind) { case Jsr: case Int: masm.movl(asRegister(result), tasm.asAddress(input)); break; @@ -331,7 +332,7 @@ } } - private static void const2reg(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue result, CiConstant input) { + private static void const2reg(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue result, RiConstant input) { // Note: we use the kind of the input operand (and not the kind of the result operand) because they don't match // in all cases. For example, an object constant can be loaded to a long register when unsafe casts occurred (e.g., // for a write barrier where arithmetic operations are then performed on the pointer). @@ -383,7 +384,7 @@ } } - private static void const2stack(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue result, CiConstant input) { + private static void const2stack(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue result, RiConstant input) { switch (input.kind.stackKind()) { case Jsr: case Int: masm.movl(tasm.asAddress(result), input.asInt()); break; @@ -403,7 +404,7 @@ } - public static void load(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue result, CiAddress loadAddr, LIRDebugInfo info) { + public static void load(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue result, CiAddress loadAddr, LIRDebugInfo info) { if (info != null) { tasm.recordImplicitException(masm.codeBuffer.position(), info); } @@ -421,7 +422,7 @@ } } - public static void store(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiAddress storeAddr, CiValue input, LIRDebugInfo info) { + public static void store(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiAddress storeAddr, RiValue input, LIRDebugInfo info) { if (info != null) { tasm.recordImplicitException(masm.codeBuffer.position(), info); } @@ -440,7 +441,7 @@ default: throw GraalInternalError.shouldNotReachHere(); } } else if (isConstant(input)) { - CiConstant c = (CiConstant) input; + RiConstant c = (RiConstant) input; switch (storeAddr.kind) { case Boolean: case Byte: masm.movb(storeAddr, c.asInt() & 0xFF); break; @@ -473,7 +474,7 @@ } } - protected static void compareAndSwap(TargetMethodAssembler tasm, AMD64MacroAssembler masm, CiValue result, CiAddress address, CiValue cmpValue, CiValue newValue) { + protected static void compareAndSwap(TargetMethodAssembler tasm, AMD64MacroAssembler masm, RiValue result, CiAddress address, RiValue cmpValue, RiValue newValue) { assert asRegister(cmpValue) == AMD64.rax && asRegister(result) == AMD64.rax; if (tasm.target.isMP) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMap.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMap.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.lir; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiCallingConvention.*; +import com.oracle.graal.api.meta.*; import com.oracle.max.asm.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiCallingConvention.Type; -import com.oracle.max.cri.ri.*; /** * This class is used to build the stack frame layout for a compiled method. @@ -82,7 +82,7 @@ public final class FrameMap { public final RiRuntime runtime; public final CiTarget target; - public final RiRegisterConfig registerConfig; + public final CiRegisterConfig registerConfig; /** * The initial frame size, not including the size of the return address. @@ -125,7 +125,7 @@ /** * Creates a new frame map for the specified method. */ - public FrameMap(RiRuntime runtime, CiTarget target, RiRegisterConfig registerConfig) { + public FrameMap(RiRuntime runtime, CiTarget target, CiRegisterConfig registerConfig) { this.runtime = runtime; this.target = target; this.registerConfig = registerConfig; @@ -241,7 +241,7 @@ outgoingSize = Math.max(outgoingSize, argsSize); } - private CiStackSlot getSlot(CiKind kind, int additionalOffset) { + private CiStackSlot getSlot(RiKind kind, int additionalOffset) { return CiStackSlot.get(kind, -spillSize + additionalOffset, true); } @@ -251,7 +251,7 @@ * @param kind The kind of the spill slot to be reserved. * @return A spill slot denoting the reserved memory area. */ - public CiStackSlot allocateSpillSlot(CiKind kind) { + public CiStackSlot allocateSpillSlot(RiKind kind) { assert frameSize == -1 : "frame size must not yet be fixed"; int size = target.sizeInBytes(kind); spillSize = NumUtil.roundUp(spillSize + size, size); @@ -276,10 +276,10 @@ if (refs) { assert size % target.wordSize == 0; - CiStackSlot result = getSlot(CiKind.Object, 0); + CiStackSlot result = getSlot(RiKind.Object, 0); objectStackBlocks.add(result); for (int i = target.wordSize; i < size; i += target.wordSize) { - objectStackBlocks.add(getSlot(CiKind.Object, i)); + objectStackBlocks.add(getSlot(RiKind.Object, i)); } return result; @@ -297,8 +297,8 @@ /** * Initializes a reference map that covers all registers of the target architecture. */ - public CiBitMap initRegisterRefMap() { - return new CiBitMap(target.arch.registerReferenceMapBitCount); + public RiBitMap initRegisterRefMap() { + return new RiBitMap(target.arch.registerReferenceMapBitCount); } /** @@ -306,8 +306,8 @@ * slots in the frame. If the method has incoming reference arguments on the stack, * the reference map might grow later when such a reference is set. */ - public CiBitMap initFrameRefMap() { - CiBitMap frameRefMap = new CiBitMap(frameSize() / target.wordSize); + public RiBitMap initFrameRefMap() { + RiBitMap frameRefMap = new RiBitMap(frameSize() / target.wordSize); for (CiStackSlot slot : objectStackBlocks) { setReference(slot, null, frameRefMap); } @@ -317,14 +317,14 @@ /** * Marks the specified location as a reference in the reference map of the debug information. * The tracked location can be a {@link CiRegisterValue} or a {@link CiStackSlot}. Note that a - * {@link CiConstant} is automatically tracked. + * {@link RiConstant} is automatically tracked. * * @param location The location to be added to the reference map. * @param registerRefMap A register reference map, as created by {@link #initRegisterRefMap()}. * @param frameRefMap A frame reference map, as created by {@link #initFrameRefMap()}. */ - public void setReference(CiValue location, CiBitMap registerRefMap, CiBitMap frameRefMap) { - if (location.kind == CiKind.Object) { + public void setReference(RiValue location, RiBitMap registerRefMap, RiBitMap frameRefMap) { + if (location.kind == RiKind.Object) { if (isRegister(location)) { assert registerRefMap.size() == target.arch.registerReferenceMapBitCount; registerRefMap.set(asRegister(location).number); @@ -341,14 +341,14 @@ /** * Clears the specified location as a reference in the reference map of the debug information. * The tracked location can be a {@link CiRegisterValue} or a {@link CiStackSlot}. Note that a - * {@link CiConstant} is automatically tracked. + * {@link RiConstant} is automatically tracked. * * @param location The location to be removed from the reference map. * @param registerRefMap A register reference map, as created by {@link #initRegisterRefMap()}. * @param frameRefMap A frame reference map, as created by {@link #initFrameRefMap()}. */ - public void clearReference(CiValue location, CiBitMap registerRefMap, CiBitMap frameRefMap) { - if (location.kind == CiKind.Object) { + public void clearReference(RiValue location, RiBitMap registerRefMap, RiBitMap frameRefMap) { + if (location.kind == RiKind.Object) { if (location instanceof CiRegisterValue) { assert registerRefMap.size() == target.arch.registerReferenceMapBitCount; registerRefMap.clear(asRegister(location).number);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,7 +24,7 @@ import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.asm.*; @@ -65,8 +65,8 @@ public SpillMoveFactory spillMoveFactory; public interface SpillMoveFactory { - LIRInstruction createMove(CiValue result, CiValue input); - LIRInstruction createExchange(CiValue input1, CiValue input2); + LIRInstruction createMove(RiValue result, RiValue input); + LIRInstruction createExchange(RiValue input1, RiValue input2); } private boolean hasArgInCallerFrame;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRDebugInfo.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRDebugInfo.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.lir; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.LIRInstruction.ValueProcedure; @@ -78,9 +79,9 @@ */ private static final EnumSet<OperandFlag> STATE_FLAGS = EnumSet.of(OperandFlag.Register, OperandFlag.Stack); - private void processValues(CiValue[] values, ValueProcedure proc) { + private void processValues(RiValue[] values, ValueProcedure proc) { for (int i = 0; i < values.length; i++) { - CiValue value = values[i]; + RiValue value = values[i]; if (value instanceof CiMonitorValue) { CiMonitorValue monitor = (CiMonitorValue) value; if (processed(monitor.owner)) { @@ -93,7 +94,7 @@ } } - private boolean processed(CiValue value) { + private boolean processed(RiValue value) { if (isIllegal(value)) { // Ignore dead local variables. return false; @@ -109,7 +110,7 @@ } - public void finish(CiBitMap registerRefMap, CiBitMap frameRefMap, FrameMap frameMap) { + public void finish(RiBitMap registerRefMap, RiBitMap frameRefMap, FrameMap frameMap) { debugInfo = new CiDebugInfo(topFrame, registerRefMap, frameRefMap); // Add additional stack slots for outgoing method parameters.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.lir; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.asm.*; @@ -35,7 +36,7 @@ */ public abstract class LIRInstruction { - public static final CiValue[] NO_OPERANDS = {}; + public static final RiValue[] NO_OPERANDS = {}; /** * Iterator for iterating over a list of values. Subclasses must overwrite one of the doValue methods. @@ -49,7 +50,7 @@ * @param value The value that is iterated. * @return The new value to replace the value that was passed in. */ - protected CiValue doValue(CiValue value) { + protected RiValue doValue(RiValue value) { throw GraalInternalError.shouldNotReachHere("One of the doValue() methods must be overwritten"); } @@ -62,7 +63,7 @@ * @param flags A set of flags for the value. * @return The new value to replace the value that was passed in. */ - public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { + public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return doValue(value); } } @@ -163,22 +164,22 @@ /** * The output operands for this instruction (modified by the register allocator). */ - protected CiValue[] outputs; + protected RiValue[] outputs; /** * The input operands for this instruction (modified by the register allocator). */ - protected CiValue[] inputs; + protected RiValue[] inputs; /** * The alive operands for this instruction (modified by the register allocator). */ - protected CiValue[] alives; + protected RiValue[] alives; /** * The temp operands for this instruction (modified by the register allocator). */ - protected CiValue[] temps; + protected RiValue[] temps; /** * Used to emit debug information. @@ -199,7 +200,7 @@ * @param inputs the input operands for the instruction. * @param temps the temp operands for the instruction. */ - public LIRInstruction(Object opcode, CiValue[] outputs, LIRDebugInfo info, CiValue[] inputs, CiValue[] alives, CiValue[] temps) { + public LIRInstruction(Object opcode, RiValue[] outputs, LIRDebugInfo info, RiValue[] inputs, RiValue[] alives, RiValue[] temps) { this.code = opcode; this.outputs = outputs; this.inputs = inputs; @@ -226,7 +227,7 @@ * @param index the index of the operand requested. * @return the {@code index}'th input operand. */ - protected final CiValue input(int index) { + protected final RiValue input(int index) { return inputs[index]; } @@ -236,7 +237,7 @@ * @param index the index of the operand requested. * @return the {@code index}'th alive operand. */ - protected final CiValue alive(int index) { + protected final RiValue alive(int index) { return alives[index]; } @@ -246,7 +247,7 @@ * @param index the index of the operand requested. * @return the {@code index}'th temp operand. */ - protected final CiValue temp(int index) { + protected final RiValue temp(int index) { return temps[index]; } @@ -255,7 +256,7 @@ * * @return return the result operand */ - protected final CiValue output(int index) { + protected final RiValue output(int index) { return outputs[index]; } @@ -272,11 +273,11 @@ private static final EnumSet<OperandFlag> ADDRESS_FLAGS = EnumSet.of(OperandFlag.Register, OperandFlag.Illegal); - private void forEach(CiValue[] values, OperandMode mode, ValueProcedure proc) { + private void forEach(RiValue[] values, OperandMode mode, ValueProcedure proc) { for (int i = 0; i < values.length; i++) { assert ALLOWED_FLAGS.get(mode).containsAll(flagsFor(mode, i)); - CiValue value = values[i]; + RiValue value = values[i]; if (isAddress(value)) { assert flagsFor(mode, i).contains(OperandFlag.Address); CiAddress address = asAddress(value); @@ -337,8 +338,8 @@ * and the value is returned by this method, i.e., clients can stop the iteration once a suitable hint has been found. * @return The non-null value returned by the procedure, or null. */ - public CiValue forEachRegisterHint(CiValue value, OperandMode mode, ValueProcedure proc) { - CiValue[] hints; + public RiValue forEachRegisterHint(RiValue value, OperandMode mode, ValueProcedure proc) { + RiValue[] hints; if (mode == OperandMode.Input) { hints = outputs; } else if (mode == OperandMode.Output) { @@ -348,7 +349,7 @@ } for (int i = 0; i < hints.length; i++) { - CiValue result = proc.doValue(hints[i], null, null); + RiValue result = proc.doValue(hints[i], null, null); if (result != null) { return result; } @@ -385,7 +386,7 @@ if (outputs.length > 1) { buf.append("("); } - for (CiValue output : outputs) { + for (RiValue output : outputs) { buf.append(sep).append(output); sep = ", "; } @@ -400,11 +401,11 @@ buf.append("("); } sep = ""; - for (CiValue input : inputs) { + for (RiValue input : inputs) { buf.append(sep).append(input); sep = ", "; } - for (CiValue input : alives) { + for (RiValue input : alives) { buf.append(sep).append(input).append(" ~"); sep = ", "; } @@ -416,7 +417,7 @@ buf.append(" ["); } sep = ""; - for (CiValue temp : temps) { + for (RiValue temp : temps) { buf.append(sep).append(temp); sep = ", "; }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRVerifier.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRVerifier.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.lir; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import static com.oracle.graal.lir.ValueUtil.*; import java.util.*; -import com.oracle.max.cri.ci.*; import com.oracle.max.criutils.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.LIRInstruction.*; import com.oracle.graal.lir.cfg.*; @@ -53,12 +54,12 @@ return frameMap.target.arch.registers.length; } - private boolean isAllocatableRegister(CiValue value) { + private boolean isAllocatableRegister(RiValue value) { return isRegister(value) && frameMap.registerConfig.getAttributesMap()[asRegister(value).number].isAllocatable; } public static boolean verify(final LIRInstruction op) { - ValueProcedure allowedProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return allowed(op, value, mode, flags); } }; + ValueProcedure allowedProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return allowed(op, value, mode, flags); } }; op.forEachInput(allowedProc); op.forEachAlive(allowedProc); @@ -86,21 +87,21 @@ } private BitSet curVariablesLive; - private CiValue[] curRegistersLive; + private RiValue[] curRegistersLive; private Block curBlock; private Object curInstruction; private BitSet curRegistersDefined; private void verify() { - ValueProcedure useProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return use(value, mode, flags); } }; - ValueProcedure defProc = new ValueProcedure() { @Override public CiValue doValue(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return def(value, mode, flags); } }; + ValueProcedure useProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return use(value, mode, flags); } }; + ValueProcedure defProc = new ValueProcedure() { @Override public RiValue doValue(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { return def(value, mode, flags); } }; curRegistersDefined = new BitSet(); for (Block block : lir.linearScanOrder()) { curBlock = block; curVariablesLive = new BitSet(); - curRegistersLive = new CiValue[maxRegisterNum()]; + curRegistersLive = new RiValue[maxRegisterNum()]; if (block.getDominator() != null) { curVariablesLive.or(liveOutFor(block.getDominator())); @@ -109,7 +110,7 @@ assert block.lir.get(0) instanceof StandardOp.LabelOp : "block must start with label"; if (block.numberOfPreds() > 1) { assert block.lir.get(0) instanceof StandardOp.PhiLabelOp : "phi mapping required for multiple predecessors"; - CiValue[] phiDefinitions = ((StandardOp.PhiLabelOp) block.lir.get(0)).getPhiDefinitions(); + RiValue[] phiDefinitions = ((StandardOp.PhiLabelOp) block.lir.get(0)).getPhiDefinitions(); if (!beforeRegisterAllocation) { assert phiDefinitions.length == 0; } @@ -117,7 +118,7 @@ assert pred.numberOfSux() == 1; LIRInstruction last = pred.lir.get(pred.lir.size() - 1); assert last instanceof StandardOp.PhiJumpOp : "phi mapping required for multiple successors"; - CiValue[] phiUses = ((StandardOp.PhiJumpOp) last).getPhiInputs(); + RiValue[] phiUses = ((StandardOp.PhiJumpOp) last).getPhiInputs(); if (!beforeRegisterAllocation) { assert phiUses.length == 0; } @@ -151,7 +152,7 @@ } } - private CiValue use(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { + private RiValue use(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { allowed(curInstruction, value, mode, flags); if (isVariable(value)) { @@ -184,7 +185,7 @@ return value; } - private CiValue def(CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { + private RiValue def(RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { allowed(curInstruction, value, mode, flags); if (isVariable(value)) { @@ -225,7 +226,7 @@ return value; } - private static CiValue allowed(Object op, CiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { + private static RiValue allowed(Object op, RiValue value, OperandMode mode, EnumSet<OperandFlag> flags) { if ((isVariable(value) && flags.contains(OperandFlag.Register)) || (isRegister(value) && flags.contains(OperandFlag.Register)) || (isStackSlot(value) && flags.contains(OperandFlag.Stack)) ||
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRXirInstruction.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRXirInstruction.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,17 +22,17 @@ */ package com.oracle.graal.lir; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; -import com.oracle.max.cri.ci.*; import com.oracle.max.cri.xir.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; public abstract class LIRXirInstruction extends LIRInstruction { - public final CiValue[] originalOperands; + public final RiValue[] originalOperands; public final int outputOperandIndex; public final int[] inputOperandIndices; public final int[] tempOperandIndices; @@ -43,9 +43,9 @@ public LIRXirInstruction(Object opcode, XirSnippet snippet, - CiValue[] originalOperands, - CiValue outputOperand, - CiValue[] inputs, CiValue[] temps, + RiValue[] originalOperands, + RiValue outputOperand, + RiValue[] inputs, RiValue[] temps, int[] inputOperandIndices, int[] tempOperandIndices, int outputOperandIndex, LIRDebugInfo info, @@ -54,7 +54,7 @@ LabelRef falseSuccessor) { // Note that we register the XIR input operands as Alive, because the XIR specification allows that input operands // are used at any time, even when the temp operands and the actual output operands have already be assigned. - super(opcode, isLegal(outputOperand) ? new CiValue[] {outputOperand} : LIRInstruction.NO_OPERANDS, info, LIRInstruction.NO_OPERANDS, inputs, temps); + super(opcode, isLegal(outputOperand) ? new RiValue[] {outputOperand} : LIRInstruction.NO_OPERANDS, info, LIRInstruction.NO_OPERANDS, inputs, temps); this.infoAfter = infoAfter; this.snippet = snippet; this.inputOperandIndices = inputOperandIndices; @@ -76,7 +76,7 @@ throw GraalInternalError.shouldNotReachHere(); } - public CiValue[] getOperands() { + public RiValue[] getOperands() { for (int i = 0; i < inputOperandIndices.length; i++) { originalOperands[inputOperandIndices[i]] = alive(i); }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,7 +25,7 @@ import java.util.*; import com.oracle.max.asm.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.asm.*; @@ -35,7 +35,7 @@ */ public class StandardOp { - private static CiValue[] EMPTY = new CiValue[0]; + private static RiValue[] EMPTY = new RiValue[0]; /** * LIR operation that defines the position of a label. @@ -45,7 +45,7 @@ private final Label label; private final boolean align; - protected LabelOp(Object opcode, CiValue[] outputs, LIRDebugInfo info, CiValue[] inputs, CiValue[] alives, CiValue[] temps, Label label, boolean align) { + protected LabelOp(Object opcode, RiValue[] outputs, LIRDebugInfo info, RiValue[] inputs, RiValue[] alives, RiValue[] temps, Label label, boolean align) { super(opcode, outputs, info, inputs, alives, temps); this.label = label; this.align = align; @@ -79,7 +79,7 @@ } public static class PhiLabelOp extends LabelOp { - public PhiLabelOp(Label label, boolean align, CiValue[] phiDefinitions) { + public PhiLabelOp(Label label, boolean align, RiValue[] phiDefinitions) { super("PHI_LABEL", phiDefinitions, null, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS, label, align); } @@ -95,7 +95,7 @@ outputs = EMPTY; } - public CiValue[] getPhiDefinitions() { + public RiValue[] getPhiDefinitions() { return outputs; } } @@ -110,7 +110,7 @@ public static class JumpOp extends LIRInstruction { private final LabelRef destination; - protected JumpOp(Object opcode, CiValue[] outputs, LIRDebugInfo info, CiValue[] inputs, CiValue[] alives, CiValue[] temps, LabelRef destination) { + protected JumpOp(Object opcode, RiValue[] outputs, LIRDebugInfo info, RiValue[] inputs, RiValue[] alives, RiValue[] temps, LabelRef destination) { super(opcode, outputs, info, inputs, alives, temps); this.destination = destination; } @@ -140,7 +140,7 @@ } public static class PhiJumpOp extends JumpOp { - public PhiJumpOp(LabelRef destination, CiValue[] phiInputs) { + public PhiJumpOp(LabelRef destination, RiValue[] phiInputs) { super("PHI_JUMP", LIRInstruction.NO_OPERANDS, null, LIRInstruction.NO_OPERANDS, phiInputs, LIRInstruction.NO_OPERANDS, destination); } @@ -156,7 +156,7 @@ alives = EMPTY; } - public CiValue[] getPhiInputs() { + public RiValue[] getPhiInputs() { return alives; } } @@ -174,8 +174,8 @@ * Marker interface for a LIR operation that moves a value from {@link #getInput()} to {@link #getResult()}. */ public interface MoveOp { - CiValue getInput(); - CiValue getResult(); + RiValue getInput(); + RiValue getResult(); } /** @@ -191,7 +191,7 @@ * In particular, it is not the actual method prologue. */ public static final class ParametersOp extends LIRInstruction { - public ParametersOp(CiValue[] params) { + public ParametersOp(RiValue[] params) { super("PARAMS", params, null, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueUtil.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueUtil.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.lir; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; public class ValueUtil extends CiValueUtil { - public static boolean isVariable(CiValue value) { + public static boolean isVariable(RiValue value) { assert value != null; return value instanceof Variable; } - public static Variable asVariable(CiValue value) { + public static Variable asVariable(RiValue value) { assert value != null; return (Variable) value; }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/Variable.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/Variable.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.lir; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; /** * Represents a value that is yet to be bound to a machine location (such as * a {@link CiRegisterValue} or {@link CiStackSlot}) by a register allocator. */ -public final class Variable extends CiValue { +public final class Variable extends RiValue { private static final long serialVersionUID = 4507578431686109809L; /** @@ -46,7 +47,7 @@ * @param kind * @param index */ - public Variable(CiKind kind, int index, CiRegister.RegisterFlag flag) { + public Variable(RiKind kind, int index, CiRegister.RegisterFlag flag) { super(kind); assert kind == kind.stackKind() : "Variables can be only created for stack kinds"; assert index >= 0;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,17 +22,17 @@ */ package com.oracle.graal.lir.asm; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.LIR.Code; import com.oracle.max.asm.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public class TargetMethodAssembler { @@ -202,7 +202,7 @@ targetMethod.recordSafepoint(pos, debugInfo); } - public CiAddress recordDataReferenceInCode(CiConstant data, int alignment) { + public CiAddress recordDataReferenceInCode(RiConstant data, int alignment) { assert data != null; int pos = asm.codeBuffer.position(); Debug.log("Data reference in code: pos = %d, data = %s", pos, data.toString()); @@ -219,9 +219,9 @@ * Returns the integer value of any constants that can be represented by a 32-bit integer value, * including long constants that fit into the 32-bit range. */ - public int asIntConst(CiValue value) { - assert (value.kind.stackKind() == CiKind.Int || value.kind == CiKind.Jsr || value.kind == CiKind.Long) && isConstant(value); - long c = ((CiConstant) value).asLong(); + public int asIntConst(RiValue value) { + assert (value.kind.stackKind() == RiKind.Int || value.kind == RiKind.Jsr || value.kind == RiKind.Long) && isConstant(value); + long c = ((RiConstant) value).asLong(); if (!(NumUtil.isInt(c))) { throw GraalInternalError.shouldNotReachHere(); } @@ -231,61 +231,61 @@ /** * Returns the address of a float constant that is embedded as a data references into the code. */ - public CiAddress asFloatConstRef(CiValue value) { + public CiAddress asFloatConstRef(RiValue value) { return asFloatConstRef(value, 4); } - public CiAddress asFloatConstRef(CiValue value, int alignment) { - assert value.kind == CiKind.Float && isConstant(value); - return recordDataReferenceInCode((CiConstant) value, alignment); + public CiAddress asFloatConstRef(RiValue value, int alignment) { + assert value.kind == RiKind.Float && isConstant(value); + return recordDataReferenceInCode((RiConstant) value, alignment); } /** * Returns the address of a double constant that is embedded as a data references into the code. */ - public CiAddress asDoubleConstRef(CiValue value) { + public CiAddress asDoubleConstRef(RiValue value) { return asDoubleConstRef(value, 8); } - public CiAddress asDoubleConstRef(CiValue value, int alignment) { - assert value.kind == CiKind.Double && isConstant(value); - return recordDataReferenceInCode((CiConstant) value, alignment); + public CiAddress asDoubleConstRef(RiValue value, int alignment) { + assert value.kind == RiKind.Double && isConstant(value); + return recordDataReferenceInCode((RiConstant) value, alignment); } /** * Returns the address of a long constant that is embedded as a data references into the code. */ - public CiAddress asLongConstRef(CiValue value) { - assert value.kind == CiKind.Long && isConstant(value); - return recordDataReferenceInCode((CiConstant) value, 8); + public CiAddress asLongConstRef(RiValue value) { + assert value.kind == RiKind.Long && isConstant(value); + return recordDataReferenceInCode((RiConstant) value, 8); } - public CiAddress asIntAddr(CiValue value) { - assert value.kind == CiKind.Int; + public CiAddress asIntAddr(RiValue value) { + assert value.kind == RiKind.Int; return asAddress(value); } - public CiAddress asLongAddr(CiValue value) { - assert value.kind == CiKind.Long; + public CiAddress asLongAddr(RiValue value) { + assert value.kind == RiKind.Long; return asAddress(value); } - public CiAddress asObjectAddr(CiValue value) { - assert value.kind == CiKind.Object; + public CiAddress asObjectAddr(RiValue value) { + assert value.kind == RiKind.Object; return asAddress(value); } - public CiAddress asFloatAddr(CiValue value) { - assert value.kind == CiKind.Float; + public CiAddress asFloatAddr(RiValue value) { + assert value.kind == RiKind.Float; return asAddress(value); } - public CiAddress asDoubleAddr(CiValue value) { - assert value.kind == CiKind.Double; + public CiAddress asDoubleAddr(RiValue value) { + assert value.kind == RiKind.Double; return asAddress(value); } - public CiAddress asAddress(CiValue value) { + public CiAddress asAddress(RiValue value) { if (isStackSlot(value)) { CiStackSlot slot = (CiStackSlot) value; return new CiAddress(slot.kind, frameMap.registerConfig.getFrameRegister().asValue(), frameMap.offsetForStackSlot(slot));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/CiLoweringTool.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/CiLoweringTool.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,16 +22,16 @@ */ package com.oracle.graal.cri; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public interface CiLoweringTool { - GraalRuntime getRuntime(); + ExtendedRiRuntime getRuntime(); ValueNode getGuardAnchor(); ValueNode createNullCheckGuard(ValueNode object, long leafGraphId); - ValueNode createGuard(BooleanNode condition, RiDeoptReason deoptReason, RiDeoptAction action, long leafGraphId); - ValueNode createGuard(BooleanNode condition, RiDeoptReason deoptReason, RiDeoptAction action, boolean negated, long leafGraphId); + ValueNode createGuard(BooleanNode condition, RiDeoptReason deoptReason, CiDeoptAction action, long leafGraphId); + ValueNode createGuard(BooleanNode condition, RiDeoptReason deoptReason, CiDeoptAction action, boolean negated, long leafGraphId); CiAssumptions assumptions(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/ExtendedRiRuntime.java Fri Jun 08 15:17:43 2012 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011, 2011, 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.cri; + +import java.util.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.graph.*; +import com.oracle.graal.nodes.*; + +/** + * Graal-specific extensions for the runtime interface that must be implemented by the VM. + */ +public interface ExtendedRiRuntime extends RiRuntime { + + void lower(Node n, CiLoweringTool tool); + + StructuredGraph intrinsicGraph(RiResolvedMethod caller, int bci, RiResolvedMethod method, List<? extends Node> parameters); + + CiTargetMethod compile(RiResolvedMethod method, StructuredGraph graph); + +}
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/GraalRuntime.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2011, 2011, 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.cri; - -import java.util.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; - -/** - * Graal-specific extensions for the runtime interface that must be implemented by the VM. - */ -public interface GraalRuntime extends RiRuntime { - - void lower(Node n, CiLoweringTool tool); - - StructuredGraph intrinsicGraph(RiResolvedMethod caller, int bci, RiResolvedMethod method, List<? extends Node> parameters); - - CiTargetMethod compile(RiResolvedMethod method, StructuredGraph graph); - -}
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/RiGraphCache.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/RiGraphCache.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.cri; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ri.*; public interface RiGraphCache {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,7 @@ */ package com.oracle.graal.nodes; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; @@ -42,7 +41,7 @@ public abstract RiType returnType(); - public abstract CiKind returnKind(); + public abstract RiKind returnKind(); @Override public void generate(LIRGeneratorTool gen) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.iterators.*; import com.oracle.graal.nodes.spi.*; @@ -36,9 +36,9 @@ @NodeInfo(shortName = "Const") public class ConstantNode extends BooleanNode implements LIRLowerable { - public final CiConstant value; + public final RiConstant value; - protected ConstantNode(CiConstant value) { + protected ConstantNode(RiConstant value) { super(StampFactory.forConstant(value)); this.value = value; } @@ -47,7 +47,7 @@ * Constructs a new ConstantNode representing the specified constant. * @param value the constant */ - protected ConstantNode(CiConstant value, RiRuntime runtime) { + protected ConstantNode(RiConstant value, RiRuntime runtime) { super(StampFactory.forConstant(value, runtime)); this.value = value; } @@ -65,8 +65,8 @@ return usages().filter(NodePredicates.isNotA(FrameState.class)).isEmpty(); } - public static ConstantNode forCiConstant(CiConstant constant, RiRuntime runtime, Graph graph) { - if (constant.kind == CiKind.Object) { + public static ConstantNode forCiConstant(RiConstant constant, RiRuntime runtime, Graph graph) { + if (constant.kind == RiKind.Object) { return graph.unique(new ConstantNode(constant, runtime)); } else { return graph.unique(new ConstantNode(constant)); @@ -80,7 +80,7 @@ * @return a node for a double constant */ public static ConstantNode forDouble(double d, Graph graph) { - return graph.unique(new ConstantNode(CiConstant.forDouble(d))); + return graph.unique(new ConstantNode(RiConstant.forDouble(d))); } /** @@ -90,7 +90,7 @@ * @return a node for a float constant */ public static ConstantNode forFloat(float f, Graph graph) { - return graph.unique(new ConstantNode(CiConstant.forFloat(f))); + return graph.unique(new ConstantNode(RiConstant.forFloat(f))); } /** @@ -100,7 +100,7 @@ * @return a node for an long constant */ public static ConstantNode forLong(long i, Graph graph) { - return graph.unique(new ConstantNode(CiConstant.forLong(i))); + return graph.unique(new ConstantNode(RiConstant.forLong(i))); } /** @@ -110,7 +110,7 @@ * @return a node for an integer constant */ public static ConstantNode forInt(int i, Graph graph) { - return graph.unique(new ConstantNode(CiConstant.forInt(i))); + return graph.unique(new ConstantNode(RiConstant.forInt(i))); } /** @@ -120,7 +120,7 @@ * @return a node representing the boolean */ public static ConstantNode forBoolean(boolean i, Graph graph) { - return graph.unique(new ConstantNode(CiConstant.forBoolean(i))); + return graph.unique(new ConstantNode(RiConstant.forBoolean(i))); } /** @@ -130,7 +130,7 @@ * @return a node representing the byte */ public static ConstantNode forByte(byte i, Graph graph) { - return graph.unique(new ConstantNode(CiConstant.forByte(i))); + return graph.unique(new ConstantNode(RiConstant.forByte(i))); } /** @@ -140,7 +140,7 @@ * @return a node representing the char */ public static ConstantNode forChar(char i, Graph graph) { - return graph.unique(new ConstantNode(CiConstant.forChar(i))); + return graph.unique(new ConstantNode(RiConstant.forChar(i))); } /** @@ -150,7 +150,7 @@ * @return a node representing the short */ public static ConstantNode forShort(short i, Graph graph) { - return graph.unique(new ConstantNode(CiConstant.forShort(i))); + return graph.unique(new ConstantNode(RiConstant.forShort(i))); } /** @@ -160,7 +160,7 @@ * @return a node representing the address */ public static ConstantNode forJsr(int i, Graph graph) { - return graph.unique(new ConstantNode(CiConstant.forJsr(i))); + return graph.unique(new ConstantNode(RiConstant.forJsr(i))); } /** @@ -170,10 +170,10 @@ * @return a node representing the object */ public static ConstantNode forObject(Object o, RiRuntime runtime, Graph graph) { - return graph.unique(new ConstantNode(CiConstant.forObject(o), runtime)); + return graph.unique(new ConstantNode(RiConstant.forObject(o), runtime)); } - public static ConstantNode forIntegerKind(CiKind kind, long value, Graph graph) { + public static ConstantNode forIntegerKind(RiKind kind, long value, Graph graph) { switch (kind) { case Byte: case Short: @@ -186,7 +186,7 @@ } } - public static ConstantNode forFloatingKind(CiKind kind, double value, Graph graph) { + public static ConstantNode forFloatingKind(RiKind kind, double value, Graph graph) { switch (kind) { case Float: return ConstantNode.forFloat((float) value, graph); @@ -197,7 +197,7 @@ } } - public static ConstantNode defaultForKind(CiKind kind, Graph graph) { + public static ConstantNode defaultForKind(RiKind kind, Graph graph) { switch(kind) { case Boolean: return ConstantNode.forBoolean(false, graph);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,25 +22,26 @@ */ package com.oracle.graal.nodes; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ri.*; @NodeInfo(shortName = "Deopt") public class DeoptimizeNode extends FixedNode implements Node.IterableNodeType, LIRLowerable { private String message; - private final RiDeoptAction action; + private final CiDeoptAction action; private final RiDeoptReason reason; private final long leafGraphId; - public DeoptimizeNode(RiDeoptAction action, RiDeoptReason reason) { + public DeoptimizeNode(CiDeoptAction action, RiDeoptReason reason) { this(action, reason, -1); } - public DeoptimizeNode(RiDeoptAction action, RiDeoptReason reason, long leafGraphId) { + public DeoptimizeNode(CiDeoptAction action, RiDeoptReason reason, long leafGraphId) { super(StampFactory.forVoid()); this.action = action; this.reason = reason; @@ -55,7 +56,7 @@ return message; } - public RiDeoptAction action() { + public CiDeoptAction action() { return action; } @@ -74,7 +75,7 @@ @SuppressWarnings("unused") @NodeIntrinsic - public static void deopt(@ConstantNodeParameter RiDeoptAction action, @ConstantNodeParameter RiDeoptReason reason) { + public static void deopt(@ConstantNodeParameter CiDeoptAction action, @ConstantNodeParameter RiDeoptReason reason) { throw new UnsupportedOperationException(); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,17 +22,18 @@ */ package com.oracle.graal.nodes; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ri.*; public final class FixedGuardNode extends FixedWithNextNode implements Simplifiable, Lowerable, LIRLowerable, Node.IterableNodeType, Negatable { @Input private BooleanNode condition; private final RiDeoptReason deoptReason; - private final RiDeoptAction action; + private final CiDeoptAction action; private boolean negated; private final long leafGraphId; @@ -45,11 +46,11 @@ condition = x; } - public FixedGuardNode(BooleanNode condition, RiDeoptReason deoptReason, RiDeoptAction action, long leafGraphId) { + public FixedGuardNode(BooleanNode condition, RiDeoptReason deoptReason, CiDeoptAction action, long leafGraphId) { this(condition, deoptReason, action, false, leafGraphId); } - public FixedGuardNode(BooleanNode condition, RiDeoptReason deoptReason, RiDeoptAction action, boolean negated, long leafGraphId) { + public FixedGuardNode(BooleanNode condition, RiDeoptReason deoptReason, CiDeoptAction action, boolean negated, long leafGraphId) { super(StampFactory.forVoid()); this.action = action; this.negated = negated; @@ -83,7 +84,7 @@ if (next != null) { tool.deleteBranch(next); } - setNext(graph().add(new DeoptimizeNode(RiDeoptAction.InvalidateRecompile, deoptReason, leafGraphId))); + setNext(graph().add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, deoptReason, leafGraphId))); return; } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,8 +24,8 @@ import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.iterators.*; import com.oracle.graal.nodes.spi.*; @@ -208,9 +208,9 @@ * values in pushedValues pushed on the stack. The pushedValues are expected to be in slot encoding: a long * or double is followed by a null slot. */ - public FrameState duplicateModified(int newBci, boolean newRethrowException, CiKind popKind, ValueNode... pushedValues) { + public FrameState duplicateModified(int newBci, boolean newRethrowException, RiKind popKind, ValueNode... pushedValues) { int popSlots = 0; - if (popKind != CiKind.Void) { + if (popKind != RiKind.Void) { if (stackAt(stackSize() - 1) == null) { popSlots = 2; } else { @@ -344,7 +344,7 @@ public boolean verify() { for (ValueNode value : values) { assert assertTrue(value == null || !value.isDeleted(), "frame state must not contain deleted nodes"); - assert assertTrue(value == null || value instanceof VirtualObjectNode || (value.kind() != CiKind.Void && value.kind() != CiKind.Illegal), "unexpected value: %s", value); + assert assertTrue(value == null || value instanceof VirtualObjectNode || (value.kind() != RiKind.Void && value.kind() != RiKind.Illegal), "unexpected value: %s", value); } return super.verify(); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.nodes; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.spi.types.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ri.*; /** * A guard is a node that deoptimizes based on a conditional expression. Guards are not attached to a certain frame @@ -45,7 +46,7 @@ @Input private BooleanNode condition; @Input(notDataflow = true) private FixedNode anchor; private final RiDeoptReason reason; - private final RiDeoptAction action; + private final CiDeoptAction action; private boolean negated; private final long leafGraphId; @@ -78,11 +79,11 @@ return reason; } - public RiDeoptAction action() { + public CiDeoptAction action() { return action; } - public GuardNode(BooleanNode condition, FixedNode anchor, RiDeoptReason reason, RiDeoptAction action, boolean negated, long leafGraphId) { + public GuardNode(BooleanNode condition, FixedNode anchor, RiDeoptReason reason, CiDeoptAction action, boolean negated, long leafGraphId) { super(StampFactory.dependency()); this.condition = condition; this.anchor = anchor;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,7 +24,7 @@ import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.spi.types.*; import com.oracle.graal.nodes.type.*; @@ -135,7 +135,7 @@ if (trueValue.kind() != falseValue.kind()) { return; } - if (trueValue.kind() != CiKind.Int && trueValue.kind() != CiKind.Long) { + if (trueValue.kind() != RiKind.Int && trueValue.kind() != RiKind.Long) { return; } if (trueValue.isConstant() && falseValue.isConstant()) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,7 +24,8 @@ import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.java.*; @@ -141,7 +142,7 @@ stateSplit.setStateAfter(stateAfter); } if (node == null) { - assert kind() == CiKind.Void && usages().isEmpty(); + assert kind() == RiKind.Void && usages().isEmpty(); ((StructuredGraph) graph()).removeFixed(this); } else { if (node instanceof FixedWithNextNode) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,7 +24,8 @@ import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.java.*; @@ -182,7 +183,7 @@ stateSplit.setStateAfter(state); } if (node == null) { - assert kind() == CiKind.Void && usages().isEmpty(); + assert kind() == RiKind.Void && usages().isEmpty(); ((StructuredGraph) graph()).removeSplit(this, NORMAL_EDGE); } else if (node instanceof DeoptimizeNode) { this.replaceAtPredecessor(node);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; @@ -55,7 +55,7 @@ * @param kind the kind of the value * @param merge the merge that the new phi belongs to */ - public PhiNode(CiKind kind, MergeNode merge) { + public PhiNode(RiKind kind, MergeNode merge) { super(StampFactory.forKind(kind)); this.type = PhiType.Value; this.merge = merge;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,7 +25,7 @@ import java.util.*; import java.util.concurrent.atomic.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.java.*;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.nodes; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; @@ -40,7 +41,7 @@ public UnwindNode(ValueNode exception) { super(StampFactory.forVoid()); - assert exception == null || exception.kind() == CiKind.Object; + assert exception == null || exception.kind() == RiKind.Object; this.exception = exception; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,10 +24,10 @@ import java.util.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.type.*; import com.oracle.graal.nodes.type.GenericStamp.*; -import com.oracle.max.cri.ci.*; /** * This class represents a value within the graph, including local variables, phis, and @@ -36,8 +36,8 @@ public abstract class ValueNode extends ScheduledNode implements StampProvider { /** - * The kind of this value. This is {@link CiKind#Void} for instructions that produce no value. - * This kind is guaranteed to be a {@linkplain CiKind#stackKind() stack kind}. + * The kind of this value. This is {@link RiKind#Void} for instructions that produce no value. + * This kind is guaranteed to be a {@linkplain RiKind#stackKind() stack kind}. */ private Stamp stamp; @@ -76,7 +76,7 @@ this.stamp = stamp; } - public CiKind kind() { + public RiKind kind() { return stamp.kind(); } @@ -98,10 +98,10 @@ /** * Convert this value to a constant if it is a constant, otherwise return null. - * @return the {@link CiConstant} represented by this value if it is a constant; {@code null} + * @return the {@link RiConstant} represented by this value if it is a constant; {@code null} * otherwise */ - public final CiConstant asConstant() { + public final RiConstant asConstant() { if (this instanceof ConstantNode) { return ((ConstantNode) this).value; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueUtil.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueUtil.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,15 +24,15 @@ import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.Node.Verbosity; public class ValueUtil { - public static ValueNode assertKind(CiKind kind, ValueNode x) { - assert x != null && ((x.kind() == kind) || (x.kind() == CiKind.Jsr && kind == CiKind.Object)) : "kind=" + kind + ", value=" + x + ((x == null) ? "" : ", value.kind=" + x.kind()); + public static ValueNode assertKind(RiKind kind, ValueNode x) { + assert x != null && ((x.kind() == kind) || (x.kind() == RiKind.Jsr && kind == RiKind.Object)) : "kind=" + kind + ", value=" + x + ((x == null) ? "" : ", value.kind=" + x.kind()); return x; } @@ -45,32 +45,32 @@ } public static ValueNode assertLong(ValueNode x) { - assert x != null && (x.kind() == CiKind.Long); + assert x != null && (x.kind() == RiKind.Long); return x; } public static ValueNode assertJsr(ValueNode x) { - assert x != null && (x.kind() == CiKind.Jsr); + assert x != null && (x.kind() == RiKind.Jsr); return x; } public static ValueNode assertInt(ValueNode x) { - assert x != null && (x.kind() == CiKind.Int); + assert x != null && (x.kind() == RiKind.Int); return x; } public static ValueNode assertFloat(ValueNode x) { - assert x != null && (x.kind() == CiKind.Float); + assert x != null && (x.kind() == RiKind.Float); return x; } public static ValueNode assertObject(ValueNode x) { - assert x != null && (x.kind() == CiKind.Object); + assert x != null && (x.kind() == RiKind.Object); return x; } public static ValueNode assertDouble(ValueNode x) { - assert x != null && (x.kind() == CiKind.Double); + assert x != null && (x.kind() == RiKind.Double); return x; } @@ -96,7 +96,7 @@ /** * Converts a given instruction to a value string. The representation of an node as - * a value is formed by concatenating the {@linkplain com.oracle.max.cri.ci.CiKind#typeChar character} denoting its + * a value is formed by concatenating the {@linkplain com.oracle.graal.api.meta.RiKind#typeChar character} denoting its * {@linkplain ValueNode#kind kind} and its {@linkplain Node#id()}. For example, {@code "i13"}. * * @param value the instruction to convert to a value string. If {@code value == null}, then "-" is returned.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = "&") public final class AndNode extends LogicNode implements Canonicalizable, LIRLowerable { - public AndNode(CiKind kind, ValueNode x, ValueNode y) { + public AndNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -43,14 +43,14 @@ return graph().unique(new AndNode(kind(), y(), x())); } if (x().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() & y().asConstant().asInt(), graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() & y().asConstant().asLong(), graph()); } } else if (y().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { int c = y().asConstant().asInt(); if (c == -1) { return x(); @@ -59,7 +59,7 @@ return ConstantNode.forInt(0, graph()); } } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; long c = y().asConstant().asLong(); if (c == -1) { return x();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ArithmeticNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ArithmeticNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; /** @@ -39,7 +39,7 @@ * @param y the second input instruction * @param isStrictFP indicates this operation has strict rounding semantics */ - public ArithmeticNode(CiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { + public ArithmeticNode(RiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { super(kind, x, y); this.isStrictFP = isStrictFP; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.type.*; @@ -48,7 +48,7 @@ * @param x the first input instruction * @param y the second input instruction */ - public BinaryNode(CiKind kind, ValueNode x, ValueNode y) { + public BinaryNode(RiKind kind, ValueNode x, ValueNode y) { super(StampFactory.forKind(kind)); this.x = x; this.y = y;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.nodes.calc; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /* TODO (thomaswue/gdub) For high-level optimization purpose the compare node should be a boolean *value* (it is currently only a helper node) * But in the back-end the comparison should not always be materialized (for example in x86 the comparison result will not be in a register but in a flag) @@ -80,9 +80,9 @@ } - private ValueNode optimizeMaterialize(CiConstant constant, MaterializeNode materializeNode, RiRuntime runtime, Condition cond) { - CiConstant trueConstant = materializeNode.trueValue().asConstant(); - CiConstant falseConstant = materializeNode.falseValue().asConstant(); + private ValueNode optimizeMaterialize(RiConstant constant, MaterializeNode materializeNode, RiRuntime runtime, Condition cond) { + RiConstant trueConstant = materializeNode.trueValue().asConstant(); + RiConstant falseConstant = materializeNode.falseValue().asConstant(); if (falseConstant != null && trueConstant != null) { Boolean trueResult = cond.foldCondition(trueConstant, constant, runtime, unorderedIsTrue()); @@ -109,7 +109,7 @@ return this; } - protected ValueNode optimizeNormalizeCmp(CiConstant constant, NormalizeCompareNode normalizeNode, boolean mirrored) { + protected ValueNode optimizeNormalizeCmp(RiConstant constant, NormalizeCompareNode normalizeNode, boolean mirrored) { throw new GraalInternalError("NormalizeCompareNode connected to %s (%s %s %s)", this, constant, normalizeNode, mirrored); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/Condition.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/Condition.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.calc; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.cri.util.*; /** @@ -246,7 +246,7 @@ * @return {@link Boolean#TRUE} if the comparison is known to be true, * {@link Boolean#FALSE} if the comparison is known to be false */ - public boolean foldCondition(CiConstant lt, CiConstant rt, RiRuntime runtime) { + public boolean foldCondition(RiConstant lt, RiConstant rt, RiRuntime runtime) { assert !lt.kind.isFloatOrDouble() && !rt.kind.isFloatOrDouble(); return foldCondition(lt, rt, runtime, false); } @@ -259,7 +259,7 @@ * @param unorderedIsTrue true if an undecided float comparison should result in "true" * @return true if the comparison is known to be true, false if the comparison is known to be false */ - public boolean foldCondition(CiConstant lt, CiConstant rt, RiRuntime runtime, boolean unorderedIsTrue) { + public boolean foldCondition(RiConstant lt, RiConstant rt, RiRuntime runtime, boolean unorderedIsTrue) { switch (lt.kind) { case Boolean: case Byte:
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.calc; -import static com.oracle.max.cri.ci.CiKind.*; +import static com.oracle.graal.api.meta.RiKind.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; @@ -55,10 +55,10 @@ MOV_F2I(Float, Int), MOV_D2L(Double, Long); - public final CiKind from; - public final CiKind to; + public final RiKind from; + public final RiKind to; - private Op(CiKind from, CiKind to) { + private Op(RiKind from, RiKind to) { this.from = from; this.to = to; } @@ -89,7 +89,7 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { if (value instanceof ConstantNode) { - CiConstant c = ((ConstantNode) value).asConstant(); + RiConstant c = ((ConstantNode) value).asConstant(); switch (opcode) { case I2L: return ConstantNode.forLong(c.asInt(), graph()); case L2I: return ConstantNode.forInt((int) c.asLong(), graph());
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = "+") public final class FloatAddNode extends FloatArithmeticNode implements Canonicalizable, LIRLowerable { - public FloatAddNode(CiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { + public FloatAddNode(RiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { super(kind, x, y, isStrictFP); } @@ -40,20 +40,20 @@ return graph().unique(new FloatAddNode(kind(), y(), x(), isStrictFP())); } if (x().isConstant()) { - if (kind() == CiKind.Float) { + if (kind() == RiKind.Float) { return ConstantNode.forFloat(x().asConstant().asFloat() + y().asConstant().asFloat(), graph()); } else { - assert kind() == CiKind.Double; + assert kind() == RiKind.Double; return ConstantNode.forDouble(x().asConstant().asDouble() + y().asConstant().asDouble(), graph()); } } else if (y().isConstant()) { - if (kind() == CiKind.Float) { + if (kind() == RiKind.Float) { float c = y().asConstant().asFloat(); if (c == 0.0f) { return x(); } } else { - assert kind() == CiKind.Double; + assert kind() == RiKind.Double; double c = y().asConstant().asDouble(); if (c == 0.0) { return x(); @@ -65,10 +65,10 @@ @Override public void generate(LIRGeneratorTool gen) { - CiValue op1 = gen.operand(x()); - CiValue op2 = gen.operand(y()); + RiValue op1 = gen.operand(x()); + RiValue op2 = gen.operand(y()); if (!y().isConstant() && !livesLonger(this, y(), gen)) { - CiValue op = op1; + RiValue op = op1; op1 = op2; op2 = op; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatArithmeticNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatArithmeticNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; public abstract class FloatArithmeticNode extends ArithmeticNode { - public FloatArithmeticNode(CiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { + public FloatArithmeticNode(RiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { super(kind, x, y, isStrictFP); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,19 +30,19 @@ @NodeInfo(shortName = "/") public final class FloatDivNode extends FloatArithmeticNode implements Canonicalizable, LIRLowerable { - public FloatDivNode(CiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { + public FloatDivNode(RiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { super(kind, x, y, isStrictFP); } @Override public ValueNode canonical(CanonicalizerTool tool) { if (x().isConstant() && y().isConstant()) { - if (kind() == CiKind.Float) { + if (kind() == RiKind.Float) { if (y().asConstant().asFloat() != 0) { return ConstantNode.forFloat(x().asConstant().asFloat() / y().asConstant().asFloat(), graph()); } } else { - assert kind() == CiKind.Double; + assert kind() == RiKind.Double; if (y().asConstant().asDouble() != 0) { return ConstantNode.forDouble(x().asConstant().asDouble() / y().asConstant().asDouble(), graph()); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = "*") public final class FloatMulNode extends FloatArithmeticNode implements Canonicalizable, LIRLowerable { - public FloatMulNode(CiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { + public FloatMulNode(RiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { super(kind, x, y, isStrictFP); } @@ -40,10 +40,10 @@ return graph().unique(new FloatMulNode(kind(), y(), x(), isStrictFP())); } if (x().isConstant()) { - if (kind() == CiKind.Float) { + if (kind() == RiKind.Float) { return ConstantNode.forFloat(x().asConstant().asFloat() * y().asConstant().asFloat(), graph()); } else { - assert kind() == CiKind.Double; + assert kind() == RiKind.Double; return ConstantNode.forDouble(x().asConstant().asDouble() * y().asConstant().asDouble(), graph()); } } @@ -52,10 +52,10 @@ @Override public void generate(LIRGeneratorTool gen) { - CiValue op1 = gen.operand(x()); - CiValue op2 = gen.operand(y()); + RiValue op1 = gen.operand(x()); + RiValue op2 = gen.operand(y()); if (!y().isConstant() && !FloatAddNode.livesLonger(this, y(), gen)) { - CiValue op = op1; + RiValue op = op1; op1 = op2; op2 = op; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,17 +30,17 @@ @NodeInfo(shortName = "%") public final class FloatRemNode extends FloatArithmeticNode implements Canonicalizable, LIRLowerable { - public FloatRemNode(CiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { + public FloatRemNode(RiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { super(kind, x, y, isStrictFP); } @Override public ValueNode canonical(CanonicalizerTool tool) { if (x().isConstant() && y().isConstant()) { - if (kind() == CiKind.Float) { + if (kind() == RiKind.Float) { return ConstantNode.forFloat(x().asConstant().asFloat() % y().asConstant().asFloat(), graph()); } else { - assert kind() == CiKind.Double; + assert kind() == RiKind.Double; return ConstantNode.forDouble(x().asConstant().asDouble() % y().asConstant().asDouble(), graph()); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = "-") public final class FloatSubNode extends FloatArithmeticNode implements Canonicalizable, LIRLowerable { - public FloatSubNode(CiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { + public FloatSubNode(RiKind kind, ValueNode x, ValueNode y, boolean isStrictFP) { super(kind, x, y, isStrictFP); } @@ -40,21 +40,21 @@ return ConstantNode.forFloatingKind(kind(), 0.0f, graph()); } if (x().isConstant() && y().isConstant()) { - if (kind() == CiKind.Float) { + if (kind() == RiKind.Float) { return ConstantNode.forFloat(x().asConstant().asFloat() - y().asConstant().asFloat(), graph()); } else { - assert kind() == CiKind.Double; + assert kind() == RiKind.Double; return ConstantNode.forDouble(x().asConstant().asDouble() - y().asConstant().asDouble(), graph()); } } else if (y().isConstant()) { - if (kind() == CiKind.Float) { + if (kind() == RiKind.Float) { float c = y().asConstant().asFloat(); if (c == 0.0f) { return x(); } return graph().unique(new FloatAddNode(kind(), x(), ConstantNode.forFloat(-c, graph()), isStrictFP())); } else { - assert kind() == CiKind.Double; + assert kind() == RiKind.Double; double c = y().asConstant().asDouble(); if (c == 0.0) { return x();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerAddNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerAddNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -31,7 +31,7 @@ @NodeInfo(shortName = "+") public class IntegerAddNode extends IntegerArithmeticNode implements Canonicalizable, LIRLowerable, TypeFeedbackProvider { - public IntegerAddNode(CiKind kind, ValueNode x, ValueNode y) { + public IntegerAddNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -41,20 +41,20 @@ return graph().unique(new IntegerAddNode(kind(), y(), x())); } if (x().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() + y().asConstant().asInt(), graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() + y().asConstant().asLong(), graph()); } } else if (y().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { int c = y().asConstant().asInt(); if (c == 0) { return x(); } } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; long c = y().asConstant().asLong(); if (c == 0) { return x(); @@ -65,10 +65,10 @@ IntegerAddNode other = (IntegerAddNode) x(); if (other.y().isConstant()) { ConstantNode sum; - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { sum = ConstantNode.forInt(y().asConstant().asInt() + other.y().asConstant().asInt(), graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; sum = ConstantNode.forLong(y().asConstant().asLong() + other.y().asConstant().asLong(), graph()); } return graph().unique(new IntegerAddNode(kind(), other.x(), sum)); @@ -79,7 +79,7 @@ } public static boolean isIntegerAddition(ValueNode result, ValueNode a, ValueNode b) { - CiKind kind = result.kind(); + RiKind kind = result.kind(); if (kind != a.kind() || kind != b.kind() || !(kind.isInt() || kind.isLong())) { return false; } @@ -98,11 +98,11 @@ @Override public void generate(LIRGeneratorTool gen) { - CiValue op1 = gen.operand(x()); + RiValue op1 = gen.operand(x()); assert op1 != null : x() + ", this=" + this; - CiValue op2 = gen.operand(y()); + RiValue op2 = gen.operand(y()); if (!y().isConstant() && !FloatAddNode.livesLonger(this, y(), gen)) { - CiValue op = op1; + RiValue op = op1; op1 = op2; op2 = op; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerArithmeticNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerArithmeticNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,16 +22,16 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; public abstract class IntegerArithmeticNode extends ArithmeticNode { - public IntegerArithmeticNode(CiKind kind, ValueNode x, ValueNode y) { + public IntegerArithmeticNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y, false); - assert kind == CiKind.Int || kind == CiKind.Long; + assert kind == RiKind.Int || kind == RiKind.Long; } public static IntegerAddNode add(ValueNode v1, ValueNode v2) { @@ -39,9 +39,9 @@ Graph graph = v1.graph(); switch(v1.kind()) { case Int: - return graph.unique(new IntegerAddNode(CiKind.Int, v1, v2)); + return graph.unique(new IntegerAddNode(RiKind.Int, v1, v2)); case Long: - return graph.unique(new IntegerAddNode(CiKind.Long, v1, v2)); + return graph.unique(new IntegerAddNode(RiKind.Long, v1, v2)); default: throw ValueUtil.shouldNotReachHere(); } @@ -52,9 +52,9 @@ Graph graph = v1.graph(); switch(v1.kind()) { case Int: - return graph.unique(new IntegerMulNode(CiKind.Int, v1, v2)); + return graph.unique(new IntegerMulNode(RiKind.Int, v1, v2)); case Long: - return graph.unique(new IntegerMulNode(CiKind.Long, v1, v2)); + return graph.unique(new IntegerMulNode(RiKind.Long, v1, v2)); default: throw ValueUtil.shouldNotReachHere(); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowThanNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowThanNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.calc; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; @NodeInfo(shortName = "|<|") public final class IntegerBelowThanNode extends CompareNode { @@ -39,8 +39,8 @@ */ public IntegerBelowThanNode(ValueNode x, ValueNode y) { super(x, y); - assert !x.kind().isFloatOrDouble() && x.kind() != CiKind.Object; - assert !y.kind().isFloatOrDouble() && y.kind() != CiKind.Object; + assert !x.kind().isFloatOrDouble() && x.kind() != RiKind.Object; + assert !y.kind().isFloatOrDouble() && y.kind() != RiKind.Object; } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = "/") public final class IntegerDivNode extends IntegerArithmeticNode implements Canonicalizable, LIRLowerable { - public IntegerDivNode(CiKind kind, ValueNode x, ValueNode y) { + public IntegerDivNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -41,10 +41,10 @@ if (yConst == 0) { return this; // this will trap, can not canonicalize } - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() / (int) yConst, graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() / yConst, graph()); } } else if (y().isConstant()) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.calc; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; -import com.oracle.max.cri.ci.*; @NodeInfo(shortName = "==") public final class IntegerEqualsNode extends CompareNode { @@ -38,8 +38,8 @@ */ public IntegerEqualsNode(ValueNode x, ValueNode y) { super(x, y); - assert !x.kind().isFloatOrDouble() && x.kind() != CiKind.Object; - assert !y.kind().isFloatOrDouble() && y.kind() != CiKind.Object; + assert !x.kind().isFloatOrDouble() && x.kind() != RiKind.Object; + assert !y.kind().isFloatOrDouble() && y.kind() != RiKind.Object; } @Override @@ -53,8 +53,8 @@ } @Override - protected ValueNode optimizeNormalizeCmp(CiConstant constant, NormalizeCompareNode normalizeNode, boolean mirrored) { - if (constant.kind == CiKind.Int && constant.asInt() == 0) { + protected ValueNode optimizeNormalizeCmp(RiConstant constant, NormalizeCompareNode normalizeNode, boolean mirrored) { + if (constant.kind == RiKind.Int && constant.asInt() == 0) { ValueNode a = mirrored ? normalizeNode.y() : normalizeNode.x(); ValueNode b = mirrored ? normalizeNode.x() : normalizeNode.y();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.calc; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; -import com.oracle.max.cri.ci.*; @NodeInfo(shortName = "<") public final class IntegerLessThanNode extends CompareNode { @@ -38,8 +38,8 @@ */ public IntegerLessThanNode(ValueNode x, ValueNode y) { super(x, y); - assert !x.kind().isFloatOrDouble() && x.kind() != CiKind.Object; - assert !y.kind().isFloatOrDouble() && y.kind() != CiKind.Object; + assert !x.kind().isFloatOrDouble() && x.kind() != RiKind.Object; + assert !y.kind().isFloatOrDouble() && y.kind() != RiKind.Object; } @Override @@ -53,9 +53,9 @@ } @Override - protected ValueNode optimizeNormalizeCmp(CiConstant constant, NormalizeCompareNode normalizeNode, boolean mirrored) { + protected ValueNode optimizeNormalizeCmp(RiConstant constant, NormalizeCompareNode normalizeNode, boolean mirrored) { assert condition() == Condition.LT; - if (constant.kind == CiKind.Int && constant.asInt() == 0) { + if (constant.kind == RiKind.Int && constant.asInt() == 0) { ValueNode a = mirrored ? normalizeNode.y() : normalizeNode.x(); ValueNode b = mirrored ? normalizeNode.x() : normalizeNode.y();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerMulNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerMulNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +31,7 @@ @NodeInfo(shortName = "*") public final class IntegerMulNode extends IntegerArithmeticNode implements Canonicalizable, LIRLowerable { - public IntegerMulNode(CiKind kind, ValueNode x, ValueNode y) { + public IntegerMulNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -40,10 +41,10 @@ return graph().unique(new IntegerMulNode(kind(), y(), x())); } if (x().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() * y().asConstant().asInt(), graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() * y().asConstant().asLong(), graph()); } } else if (y().isConstant()) { @@ -62,10 +63,10 @@ IntegerMulNode other = (IntegerMulNode) x(); if (other.y().isConstant()) { ConstantNode sum; - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { sum = ConstantNode.forInt(y().asConstant().asInt() * other.y().asConstant().asInt(), graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; sum = ConstantNode.forLong(y().asConstant().asLong() * other.y().asConstant().asLong(), graph()); } return graph().unique(new IntegerMulNode(kind(), other.x(), sum)); @@ -77,10 +78,10 @@ @Override public void generate(LIRGeneratorTool gen) { - CiValue op1 = gen.operand(x()); - CiValue op2 = gen.operand(y()); + RiValue op1 = gen.operand(x()); + RiValue op2 = gen.operand(y()); if (!y().isConstant() && !FloatAddNode.livesLonger(this, y(), gen)) { - CiValue op = op1; + RiValue op = op1; op1 = op2; op2 = op; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = "%") public final class IntegerRemNode extends IntegerArithmeticNode implements Canonicalizable, LIRLowerable { - public IntegerRemNode(CiKind kind, ValueNode x, ValueNode y) { + public IntegerRemNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -41,10 +41,10 @@ if (yConst == 0) { return this; // this will trap, can not canonicalize } - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() % (int) yConst, graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() % yConst, graph()); } } else if (y().isConstant()) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerSubNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerSubNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = "-") public final class IntegerSubNode extends IntegerArithmeticNode implements Canonicalizable, LIRLowerable { - public IntegerSubNode(CiKind kind, ValueNode x, ValueNode y) { + public IntegerSubNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -40,10 +40,10 @@ return ConstantNode.forIntegerKind(kind(), 0, graph()); } if (x().isConstant() && y().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() - y().asConstant().asInt(), graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() - y().asConstant().asLong(), graph()); } } else if (y().isConstant()) { @@ -51,10 +51,10 @@ if (c == 0) { return x(); } - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return graph().unique(new IntegerAddNode(kind(), x(), ConstantNode.forInt((int) -c, graph()))); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return graph().unique(new IntegerAddNode(kind(), x(), ConstantNode.forLong(-c, graph()))); } } else if (x().isConstant()) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.calc; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; /** * An IsNullNode will be true if the supplied value is null, and false if it is non-null. @@ -45,7 +45,7 @@ */ public IsNullNode(ValueNode object) { super(StampFactory.condition()); - assert object.kind() == CiKind.Object : object.kind(); + assert object.kind() == RiKind.Object : object.kind(); this.object = object; } @@ -63,9 +63,9 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { - CiConstant constant = object().asConstant(); + RiConstant constant = object().asConstant(); if (constant != null) { - assert constant.kind == CiKind.Object; + assert constant.kind == RiKind.Object; return ConstantNode.forBoolean(constant.isNull(), graph()); } if (object.objectStamp().nonNull()) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = "<<") public final class LeftShiftNode extends ShiftNode implements Canonicalizable, LIRLowerable { - public LeftShiftNode(CiKind kind, ValueNode x, ValueNode y) { + public LeftShiftNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -40,18 +40,18 @@ int amount = y().asConstant().asInt(); int originalAmout = amount; int mask; - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { mask = 0x1f; } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; mask = 0x3f; } amount &= mask; if (x().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() << amount, graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() << amount, graph()); } } @@ -69,10 +69,10 @@ } return graph().unique(new LeftShiftNode(kind(), other.x(), ConstantNode.forInt(total, graph()))); } else if ((other instanceof RightShiftNode || other instanceof UnsignedRightShiftNode) && otherAmount == amount) { - if (kind() == CiKind.Long) { + if (kind() == RiKind.Long) { return graph().unique(new AndNode(kind(), other.x(), ConstantNode.forLong(-1L << amount, graph()))); } else { - assert kind() == CiKind.Int; + assert kind() == RiKind.Int; return graph().unique(new AndNode(kind(), other.x(), ConstantNode.forInt(-1 << amount, graph()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LogicNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LogicNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; /** @@ -35,7 +35,7 @@ * @param x the first input into this node * @param y the second input into this node */ - public LogicNode(CiKind kind, ValueNode x, ValueNode y) { + public LogicNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -41,7 +41,7 @@ * @param isUnorderedLess true when an unordered floating point comparison is interpreted as less, false when greater. */ public NormalizeCompareNode(ValueNode x, ValueNode y, boolean isUnorderedLess) { - super(CiKind.Int, x, y); + super(RiKind.Int, x, y); this.isUnorderedLess = isUnorderedLess; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.calc; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; -import com.oracle.max.cri.ci.*; @NodeInfo(shortName = "==") public final class ObjectEqualsNode extends CompareNode { @@ -38,8 +38,8 @@ */ public ObjectEqualsNode(ValueNode x, ValueNode y) { super(x, y); - assert x.kind() == CiKind.Object; - assert y.kind() == CiKind.Object; + assert x.kind() == RiKind.Object; + assert y.kind() == RiKind.Object; } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = "|") public final class OrNode extends LogicNode implements Canonicalizable, LIRLowerable { - public OrNode(CiKind kind, ValueNode x, ValueNode y) { + public OrNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -43,14 +43,14 @@ return graph().unique(new OrNode(kind(), y(), x())); } if (x().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() | y().asConstant().asInt(), graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() | y().asConstant().asLong(), graph()); } } else if (y().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { int c = y().asConstant().asInt(); if (c == -1) { return ConstantNode.forInt(-1, graph()); @@ -59,7 +59,7 @@ return x(); } } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; long c = y().asConstant().asLong(); if (c == -1) { return ConstantNode.forLong(-1, graph());
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = ">>") public final class RightShiftNode extends ShiftNode implements Canonicalizable, LIRLowerable { - public RightShiftNode(CiKind kind, ValueNode x, ValueNode y) { + public RightShiftNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -40,18 +40,18 @@ int amount = y().asConstant().asInt(); int originalAmout = amount; int mask; - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { mask = 0x1f; } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; mask = 0x3f; } amount &= mask; if (x().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() >> amount, graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() >> amount, graph()); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ShiftNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ShiftNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; /** @@ -35,7 +35,7 @@ * @param x the first input value * @param s the second input value */ - public ShiftNode(CiKind kind, ValueNode x, ValueNode s) { + public ShiftNode(RiKind kind, ValueNode x, ValueNode s) { super(kind, x, s); // TODO (cwimmer) Why check for null here - what is a shift with no left operand? assert x == null || x.kind() == kind;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = ">>>") public final class UnsignedRightShiftNode extends ShiftNode implements Canonicalizable, LIRLowerable { - public UnsignedRightShiftNode(CiKind kind, ValueNode x, ValueNode y) { + public UnsignedRightShiftNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -40,18 +40,18 @@ int amount = y().asConstant().asInt(); int originalAmout = amount; int mask; - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { mask = 0x1f; } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; mask = 0x3f; } amount &= mask; if (x().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() >>> amount, graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() >>> amount, graph()); } } @@ -69,10 +69,10 @@ } return graph().unique(new UnsignedRightShiftNode(kind(), other.x(), ConstantNode.forInt(total, graph()))); } else if (other instanceof LeftShiftNode && otherAmount == amount) { - if (kind() == CiKind.Long) { + if (kind() == RiKind.Long) { return graph().unique(new AndNode(kind(), other.x(), ConstantNode.forLong(-1L >>> amount, graph()))); } else { - assert kind() == CiKind.Int; + assert kind() == RiKind.Int; return graph().unique(new AndNode(kind(), other.x(), ConstantNode.forInt(-1 >>> amount, graph()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -30,7 +30,7 @@ @NodeInfo(shortName = "^") public final class XorNode extends LogicNode implements Canonicalizable, LIRLowerable { - public XorNode(CiKind kind, ValueNode x, ValueNode y) { + public XorNode(RiKind kind, ValueNode x, ValueNode y) { super(kind, x, y); } @@ -43,20 +43,20 @@ return graph().unique(new XorNode(kind(), y(), x())); } if (x().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { return ConstantNode.forInt(x().asConstant().asInt() ^ y().asConstant().asInt(), graph()); } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; return ConstantNode.forLong(x().asConstant().asLong() ^ y().asConstant().asLong(), graph()); } } else if (y().isConstant()) { - if (kind() == CiKind.Int) { + if (kind() == RiKind.Int) { int c = y().asConstant().asInt(); if (c == 0) { return x(); } } else { - assert kind() == CiKind.Long; + assert kind() == RiKind.Long; long c = y().asConstant().asLong(); if (c == 0) { return x();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,27 +22,26 @@ */ package com.oracle.graal.nodes.extended; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; import com.oracle.graal.nodes.java.MethodCallTargetNode.InvokeKind; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public final class BoxNode extends AbstractStateSplit implements StateSplit, Node.IterableNodeType { @Input private ValueNode source; private int bci; - private CiKind sourceKind; + private RiKind sourceKind; - public BoxNode(ValueNode value, RiResolvedType type, CiKind sourceKind, int bci) { + public BoxNode(ValueNode value, RiResolvedType type, RiKind sourceKind, int bci) { super(StampFactory.exactNonNull(type)); this.source = value; this.bci = bci; this.sourceKind = sourceKind; - assert value.kind() != CiKind.Object : "can only box from primitive type"; + assert value.kind() != RiKind.Object : "can only box from primitive type"; } public ValueNode source() { @@ -50,7 +49,7 @@ } - public CiKind getSourceKind() { + public RiKind getSourceKind() { return sourceKind; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxingMethodPool.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxingMethodPool.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,16 +24,16 @@ import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; public class BoxingMethodPool { private final Set<RiMethod> specialMethods = new HashSet<>(); private final RiRuntime runtime; - private final RiResolvedMethod[] boxingMethods = new RiResolvedMethod[CiKind.values().length]; - private final RiResolvedMethod[] unboxingMethods = new RiResolvedMethod[CiKind.values().length]; - private final RiResolvedField[] boxFields = new RiResolvedField[CiKind.values().length]; + private final RiResolvedMethod[] boxingMethods = new RiResolvedMethod[RiKind.values().length]; + private final RiResolvedMethod[] unboxingMethods = new RiResolvedMethod[RiKind.values().length]; + private final RiResolvedField[] boxFields = new RiResolvedField[RiKind.values().length]; public BoxingMethodPool(RiRuntime runtime) { this.runtime = runtime; @@ -42,14 +42,14 @@ private void initialize() { try { - initialize(CiKind.Boolean, Boolean.class, "booleanValue"); - initialize(CiKind.Byte, Byte.class, "byteValue"); - initialize(CiKind.Char, Character.class, "charValue"); - initialize(CiKind.Short, Short.class, "shortValue"); - initialize(CiKind.Int, Integer.class, "intValue"); - initialize(CiKind.Long, Long.class, "longValue"); - initialize(CiKind.Float, Float.class, "floatValue"); - initialize(CiKind.Double, Double.class, "doubleValue"); + initialize(RiKind.Boolean, Boolean.class, "booleanValue"); + initialize(RiKind.Byte, Byte.class, "byteValue"); + initialize(RiKind.Char, Character.class, "charValue"); + initialize(RiKind.Short, Short.class, "shortValue"); + initialize(RiKind.Int, Integer.class, "intValue"); + initialize(RiKind.Long, Long.class, "longValue"); + initialize(RiKind.Float, Float.class, "floatValue"); + initialize(RiKind.Double, Double.class, "doubleValue"); } catch (SecurityException e) { throw new RuntimeException(e); } catch (NoSuchMethodException e) { @@ -57,7 +57,7 @@ } } - private void initialize(CiKind kind, Class<?> type, String unboxMethod) throws SecurityException, NoSuchMethodException { + private void initialize(RiKind kind, Class<?> type, String unboxMethod) throws SecurityException, NoSuchMethodException { // Get boxing method from runtime. RiResolvedMethod boxingMethod = runtime.getRiMethod(type.getDeclaredMethod("valueOf", kind.toJavaClass())); @@ -81,22 +81,22 @@ } public boolean isBoxingMethod(RiResolvedMethod method) { - return isSpecialMethod(method) && method.signature().returnKind(false) == CiKind.Object; + return isSpecialMethod(method) && method.signature().returnKind(false) == RiKind.Object; } public boolean isUnboxingMethod(RiResolvedMethod method) { - return isSpecialMethod(method) && method.signature().returnKind(false) != CiKind.Object; + return isSpecialMethod(method) && method.signature().returnKind(false) != RiKind.Object; } - public RiResolvedMethod getBoxingMethod(CiKind kind) { + public RiResolvedMethod getBoxingMethod(RiKind kind) { return boxingMethods[kind.ordinal()]; } - public RiResolvedMethod getUnboxingMethod(CiKind kind) { + public RiResolvedMethod getUnboxingMethod(RiKind kind) { return unboxingMethods[kind.ordinal()]; } - public RiResolvedField getBoxField(CiKind kind) { + public RiResolvedField getBoxField(RiKind kind) { return boxFields[kind.ordinal()]; } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,12 +24,12 @@ import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * A floating read of a value from memory specified in terms of an object base and an object relative location. @@ -61,12 +61,12 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { RiRuntime runtime = tool.runtime(); - if (runtime != null && object() != null && object().isConstant() && object().kind() == CiKind.Object) { + if (runtime != null && object() != null && object().isConstant() && object().kind() == RiKind.Object) { if (this.location() == LocationNode.FINAL_LOCATION && location().getClass() == LocationNode.class) { Object value = object().asConstant().asObject(); long displacement = location().displacement(); - CiKind kind = location().kind(); - CiConstant constant = kind.readUnsafeConstant(value, displacement); + RiKind kind = location().kind(); + RiConstant constant = kind.readUnsafeConstant(value, displacement); if (constant != null) { return ConstantNode.forCiConstant(constant, runtime, graph()); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -45,7 +45,7 @@ return index; } - public static Object getArrayLocation(CiKind elementKind) { + public static Object getArrayLocation(RiKind elementKind) { return elementKind; } @@ -56,11 +56,11 @@ return indexScalingEnabled; } - public static IndexedLocationNode create(Object identity, CiKind kind, int displacement, ValueNode index, Graph graph, boolean indexScalingEnabled) { + public static IndexedLocationNode create(Object identity, RiKind kind, int displacement, ValueNode index, Graph graph, boolean indexScalingEnabled) { return graph.unique(new IndexedLocationNode(identity, kind, index, displacement, indexScalingEnabled)); } - private IndexedLocationNode(Object identity, CiKind kind, ValueNode index, int displacement, boolean indexScalingEnabled) { + private IndexedLocationNode(Object identity, RiKind kind, ValueNode index, int displacement, boolean indexScalingEnabled) { super(identity, kind, displacement); this.index = index; this.indexScalingEnabled = indexScalingEnabled; @@ -68,7 +68,7 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { - CiConstant constantIndex = index.asConstant(); + RiConstant constantIndex = index.asConstant(); if (constantIndex != null && constantIndex.kind.stackKind().isInt()) { long constantIndexLong = constantIndex.asInt(); if (indexScalingEnabled) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.Node.ValueNumberable; import com.oracle.graal.nodes.calc.*; @@ -36,7 +36,7 @@ public class LocationNode extends FloatingNode implements LIRLowerable, ValueNumberable { private int displacement; - private CiKind valueKind; + private RiKind valueKind; private Object locationIdentity; public static final Object ANY_LOCATION = new Object() { @@ -52,7 +52,7 @@ } }; - public static Object getArrayLocation(CiKind elementKind) { + public static Object getArrayLocation(RiKind elementKind) { return elementKind; } @@ -60,19 +60,19 @@ return displacement; } - public static LocationNode create(Object identity, CiKind kind, int displacement, Graph graph) { + public static LocationNode create(Object identity, RiKind kind, int displacement, Graph graph) { return graph.unique(new LocationNode(identity, kind, displacement)); } - protected LocationNode(Object identity, CiKind kind, int displacement) { + protected LocationNode(Object identity, RiKind kind, int displacement) { super(StampFactory.extension()); - assert kind != CiKind.Illegal && kind != CiKind.Void; + assert kind != RiKind.Illegal && kind != RiKind.Void; this.displacement = displacement; this.valueKind = kind; this.locationIdentity = identity; } - public CiKind getValueKind() { + public RiKind getValueKind() { return valueKind; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadHubNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadHubNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.nodes.extended; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiType.*; import com.oracle.graal.cri.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiType.*; // TODO (chaeubl) this should be a FloatingNode but Lowering is not possible in that case public final class ReadHubNode extends FixedWithNextNode implements Lowerable, Canonicalizable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -44,12 +44,12 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { RiRuntime runtime = tool.runtime(); - if (runtime != null && object() != null && object().isConstant() && object().kind() == CiKind.Object) { + if (runtime != null && object() != null && object().isConstant() && object().kind() == RiKind.Object) { if (location() == LocationNode.FINAL_LOCATION && location().getClass() == LocationNode.class) { Object value = object().asConstant().asObject(); long displacement = location().displacement(); - CiKind kind = location().kind(); - CiConstant constant = kind.readUnsafeConstant(value, displacement); + RiKind kind = location().kind(); + RiConstant constant = kind.readUnsafeConstant(value, displacement); if (constant != null) { return ConstantNode.forCiConstant(constant, runtime, graph()); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/RuntimeCallNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/RuntimeCallNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,7 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; @@ -34,21 +33,21 @@ public final class UnboxNode extends FixedWithNextNode implements Node.IterableNodeType, Canonicalizable { @Input private ValueNode source; - private CiKind destinationKind; + private RiKind destinationKind; - public UnboxNode(CiKind kind, ValueNode source) { + public UnboxNode(RiKind kind, ValueNode source) { super(StampFactory.forKind(kind)); this.source = source; this.destinationKind = kind; - assert kind != CiKind.Object : "can only unbox to primitive"; - assert source.kind() == CiKind.Object : "can only unbox objects"; + assert kind != RiKind.Object : "can only unbox to primitive"; + assert source.kind() == RiKind.Object : "can only unbox objects"; } public ValueNode source() { return source; } - public CiKind destinationKind() { + public RiKind destinationKind() { return destinationKind; } @@ -62,7 +61,7 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { if (source.isConstant()) { - CiConstant constant = source.asConstant(); + RiConstant constant = source.asConstant(); Object o = constant.asObject(); if (o != null) { switch (destinationKind) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.extended; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; /** * Load of a value from a location specified as an offset relative to an object. @@ -36,7 +36,7 @@ @Input private ValueNode object; @Input private ValueNode offset; private final int displacement; - private final CiKind loadKind; + private final RiKind loadKind; public ValueNode object() { return object; @@ -55,10 +55,10 @@ this.object = object; this.displacement = displacement; this.offset = offset; - this.loadKind = CiKind.Object; + this.loadKind = RiKind.Object; } - public UnsafeLoadNode(ValueNode object, int displacement, ValueNode offset, CiKind kind) { + public UnsafeLoadNode(ValueNode object, int displacement, ValueNode offset, RiKind kind) { super(StampFactory.forKind(kind.stackKind())); this.object = object; this.displacement = displacement; @@ -66,7 +66,7 @@ this.loadKind = kind; } - public CiKind loadKind() { + public RiKind loadKind() { return loadKind; } @@ -77,7 +77,7 @@ @SuppressWarnings("unused") @NodeIntrinsic - public static <T> T load(Object object, @ConstantNodeParameter int displacement, long offset, @ConstantNodeParameter CiKind kind) { + public static <T> T load(Object object, @ConstantNodeParameter int displacement, long offset, @ConstantNodeParameter RiKind kind) { throw new UnsupportedOperationException("This method may only be compiled with the Graal compiler"); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.extended; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; /** * Store of a value at a location specified as an offset relative to an object. @@ -37,7 +37,7 @@ @Input private ValueNode offset; @Input private ValueNode value; private final int displacement; - private final CiKind storeKind; + private final RiKind storeKind; @Input(notDataflow = true) private FrameState stateAfter; public FrameState stateAfter() { @@ -54,9 +54,9 @@ return true; } - public UnsafeStoreNode(ValueNode object, int displacement, ValueNode offset, ValueNode value, CiKind kind) { + public UnsafeStoreNode(ValueNode object, int displacement, ValueNode offset, ValueNode value, RiKind kind) { super(StampFactory.forVoid()); - assert kind != CiKind.Void && kind != CiKind.Illegal; + assert kind != RiKind.Void && kind != RiKind.Illegal; this.object = object; this.displacement = displacement; this.offset = offset; @@ -80,7 +80,7 @@ return value; } - public CiKind storeKind() { + public RiKind storeKind() { return storeKind; } @@ -92,55 +92,55 @@ // specialized on value type until boxing/unboxing is sorted out in intrinsification @SuppressWarnings("unused") @NodeIntrinsic - public static void store(Object object, @ConstantNodeParameter int displacement, long offset, Object value, @ConstantNodeParameter CiKind kind) { + public static void store(Object object, @ConstantNodeParameter int displacement, long offset, Object value, @ConstantNodeParameter RiKind kind) { throw new UnsupportedOperationException(); } @SuppressWarnings("unused") @NodeIntrinsic - public static void store(Object object, @ConstantNodeParameter int displacement, long offset, boolean value, @ConstantNodeParameter CiKind kind) { + public static void store(Object object, @ConstantNodeParameter int displacement, long offset, boolean value, @ConstantNodeParameter RiKind kind) { throw new UnsupportedOperationException(); } @SuppressWarnings("unused") @NodeIntrinsic - public static void store(Object object, @ConstantNodeParameter int displacement, long offset, byte value, @ConstantNodeParameter CiKind kind) { + public static void store(Object object, @ConstantNodeParameter int displacement, long offset, byte value, @ConstantNodeParameter RiKind kind) { throw new UnsupportedOperationException(); } @SuppressWarnings("unused") @NodeIntrinsic - public static void store(Object object, @ConstantNodeParameter int displacement, long offset, char value, @ConstantNodeParameter CiKind kind) { + public static void store(Object object, @ConstantNodeParameter int displacement, long offset, char value, @ConstantNodeParameter RiKind kind) { throw new UnsupportedOperationException(); } @SuppressWarnings("unused") @NodeIntrinsic - public static void store(Object object, @ConstantNodeParameter int displacement, long offset, double value, @ConstantNodeParameter CiKind kind) { + public static void store(Object object, @ConstantNodeParameter int displacement, long offset, double value, @ConstantNodeParameter RiKind kind) { throw new UnsupportedOperationException(); } @SuppressWarnings("unused") @NodeIntrinsic - public static void store(Object object, @ConstantNodeParameter int displacement, long offset, float value, @ConstantNodeParameter CiKind kind) { + public static void store(Object object, @ConstantNodeParameter int displacement, long offset, float value, @ConstantNodeParameter RiKind kind) { throw new UnsupportedOperationException(); } @SuppressWarnings("unused") @NodeIntrinsic - public static void store(Object object, @ConstantNodeParameter int displacement, long offset, int value, @ConstantNodeParameter CiKind kind) { + public static void store(Object object, @ConstantNodeParameter int displacement, long offset, int value, @ConstantNodeParameter RiKind kind) { throw new UnsupportedOperationException(); } @SuppressWarnings("unused") @NodeIntrinsic - public static void store(Object object, @ConstantNodeParameter int displacement, long offset, long value, @ConstantNodeParameter CiKind kind) { + public static void store(Object object, @ConstantNodeParameter int displacement, long offset, long value, @ConstantNodeParameter RiKind kind) { throw new UnsupportedOperationException(); } @SuppressWarnings("unused") @NodeIntrinsic - public static void store(Object object, @ConstantNodeParameter int displacement, long offset, short value, @ConstantNodeParameter CiKind kind) { + public static void store(Object object, @ConstantNodeParameter int displacement, long offset, short value, @ConstantNodeParameter RiKind kind) { throw new UnsupportedOperationException(); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,12 +24,12 @@ import static com.oracle.graal.graph.iterators.NodePredicates.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; /** * The ValueAnchor instruction keeps non-CFG (floating) nodes above a certain point in the graph. @@ -69,7 +69,7 @@ if (node instanceof IntegerDivNode || node instanceof IntegerRemNode) { ArithmeticNode arithmeticNode = (ArithmeticNode) node; if (arithmeticNode.y().isConstant()) { - CiConstant constant = arithmeticNode.y().asConstant(); + RiConstant constant = arithmeticNode.y().asConstant(); assert constant.kind == arithmeticNode.kind() : constant.kind + " != " + arithmeticNode.kind(); if (constant.asLong() != 0) { continue;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,12 +25,12 @@ import java.lang.reflect.*; import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * The base class of all instructions that access fields.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.java; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.types.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; /** * The {@code AccessIndexedNode} class is the base class of instructions that read or write @@ -35,7 +35,7 @@ public abstract class AccessIndexedNode extends AccessArrayNode implements TypeFeedbackProvider { @Input private ValueNode index; - private final CiKind elementType; + private final RiKind elementType; private final long leafGraphId; public ValueNode index() { @@ -49,7 +49,7 @@ * @param index the instruction producing the index * @param elementKind the type of the elements of the array */ - protected AccessIndexedNode(Stamp stamp, ValueNode array, ValueNode index, CiKind elementKind, long leafGraphId) { + protected AccessIndexedNode(Stamp stamp, ValueNode array, ValueNode index, RiKind elementKind, long leafGraphId) { super(stamp, array); this.index = index; this.elementType = elementKind; @@ -60,7 +60,7 @@ * Gets the element type of the array. * @return the element type */ - public CiKind elementKind() { + public RiKind elementKind() { return elementType; } @@ -70,6 +70,6 @@ @Override public void typeFeedback(TypeFeedbackTool tool) { - tool.addScalar(index()).constantBound(Condition.GE, CiConstant.INT_0); + tool.addScalar(index()).constantBound(Condition.GE, RiConstant.INT_0); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,6 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.max.cri.ci.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.type.*;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -54,7 +54,7 @@ } RiRuntime runtime = tool.runtime(); if (runtime != null && array().isConstant() && !array().isNullConstant()) { - CiConstant constantValue = array().asConstant(); + RiConstant constantValue = array().asConstant(); if (constantValue != null && constantValue.isNonNull()) { return ConstantNode.forInt(runtime.getArrayLength(constantValue), graph()); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,6 +22,7 @@ */ package com.oracle.graal.nodes.java; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; @@ -29,8 +30,6 @@ import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.spi.types.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * Implements a type check that results in a {@link ClassCastException} if it fails. @@ -53,7 +52,7 @@ } public CheckCastNode(ValueNode targetClassInstruction, RiResolvedType targetClass, ValueNode object, RiTypeProfile profile) { - super(targetClass == null ? StampFactory.forKind(CiKind.Object) : StampFactory.declared(targetClass)); + super(targetClass == null ? StampFactory.forKind(RiKind.Object) : StampFactory.declared(targetClass)); this.targetClassInstruction = targetClassInstruction; this.targetClass = targetClass; this.object = object; @@ -82,9 +81,9 @@ } } - CiConstant constant = object().asConstant(); + RiConstant constant = object().asConstant(); if (constant != null) { - assert constant.kind == CiKind.Object; + assert constant.kind == RiKind.Object; if (constant.isNull()) { return object(); } @@ -102,7 +101,7 @@ @Override public Result canonical(TypeFeedbackTool tool) { ObjectTypeQuery query = tool.queryObject(object()); - if (query.constantBound(Condition.EQ, CiConstant.NULL_OBJECT)) { + if (query.constantBound(Condition.EQ, RiConstant.NULL_OBJECT)) { return new Result(object(), query); } else if (targetClass() != null) { if (query.declaredType(targetClass())) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.nodes.java; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; /** * Represents an atomic compare-and-swap operation @@ -62,7 +62,7 @@ } public CompareAndSwapNode(ValueNode object, int displacement, ValueNode offset, ValueNode expected, ValueNode newValue) { - super(StampFactory.forKind(CiKind.Boolean.stackKind())); + super(StampFactory.forKind(RiKind.Boolean.stackKind())); assert expected.kind() == newValue.kind(); this.object = object; this.offset = offset;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.java; +import com.oracle.graal.api.code.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ri.*; /** * The {@code ExceptionObject} instruction represents the incoming exception object to an exception handler.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,13 +22,12 @@ */ package com.oracle.graal.nodes.java; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.spi.types.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * The {@code InstanceOfNode} represents an instanceof test. @@ -105,9 +104,9 @@ } } - CiConstant constant = object().asConstant(); + RiConstant constant = object().asConstant(); if (constant != null) { - assert constant.kind == CiKind.Object; + assert constant.kind == RiKind.Object; if (constant.isNull()) { return ConstantNode.forBoolean(false, graph()); } else { @@ -125,13 +124,13 @@ @Override public Result canonical(TypeFeedbackTool tool) { ObjectTypeQuery query = tool.queryObject(object()); - if (query.constantBound(Condition.EQ, CiConstant.NULL_OBJECT)) { + if (query.constantBound(Condition.EQ, RiConstant.NULL_OBJECT)) { return new Result(ConstantNode.forBoolean(false, graph()), query); } else if (targetClass() != null) { if (query.notDeclaredType(targetClass())) { return new Result(ConstantNode.forBoolean(false, graph()), query); } - if (query.constantBound(Condition.NE, CiConstant.NULL_OBJECT)) { + if (query.constantBound(Condition.NE, RiConstant.NULL_OBJECT)) { if (query.declaredType(targetClass())) { return new Result(ConstantNode.forBoolean(true, graph()), query); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/IsTypeNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/IsTypeNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,13 +22,12 @@ */ package com.oracle.graal.nodes.java; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiType.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiType.Representation; public final class IsTypeNode extends BooleanNode implements Canonicalizable, LIRLowerable { @@ -47,7 +46,7 @@ */ public IsTypeNode(ValueNode objectClass, RiResolvedType type) { super(StampFactory.condition()); - assert objectClass == null || objectClass.kind() == CiKind.Object; + assert objectClass == null || objectClass.kind() == RiKind.Object; this.type = type; this.objectClass = objectClass; } @@ -64,8 +63,8 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { if (objectClass().isConstant()) { - CiConstant constant = objectClass().asConstant(); - CiConstant typeHub = type.getEncoding(Representation.ObjectHub); + RiConstant constant = objectClass().asConstant(); + RiConstant typeHub = type.getEncoding(Representation.ObjectHub); assert constant.kind == typeHub.kind; return ConstantNode.forBoolean(constant.equivalent(typeHub), graph()); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -45,8 +45,8 @@ } private static Stamp createStamp(RiResolvedField field) { - CiKind kind = field.kind(false); - if (kind == CiKind.Object && field.type() instanceof RiResolvedType) { + RiKind kind = field.kind(false); + if (kind == RiKind.Object && field.type() instanceof RiResolvedType) { return StampFactory.declared((RiResolvedType) field.type()); } else { return StampFactory.forKind(kind); @@ -57,7 +57,7 @@ public ValueNode canonical(CanonicalizerTool tool) { RiRuntime runtime = tool.runtime(); if (runtime != null) { - CiConstant constant = null; + RiConstant constant = null; if (isStatic()) { constant = field().constantValue(null); } else if (object().isConstant() && !object().isNullConstant()) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,13 +24,13 @@ import java.lang.reflect.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * The {@code LoadIndexedNode} represents a read from an element of an array. @@ -43,12 +43,12 @@ * @param index the instruction producing the index * @param elementKind the element type */ - public LoadIndexedNode(ValueNode array, ValueNode index, CiKind elementKind, long leafGraphId) { + public LoadIndexedNode(ValueNode array, ValueNode index, RiKind elementKind, long leafGraphId) { super(createStamp(array, elementKind), array, index, elementKind, leafGraphId); } - private static Stamp createStamp(ValueNode array, CiKind kind) { - if (kind == CiKind.Object && array.objectStamp().type() != null) { + private static Stamp createStamp(ValueNode array, RiKind kind) { + if (kind == RiKind.Object && array.objectStamp().type() != null) { return StampFactory.declared(array.objectStamp().type().componentType()); } else { return StampFactory.forKind(kind); @@ -64,7 +64,7 @@ public ValueNode canonical(CanonicalizerTool tool) { RiRuntime runtime = tool.runtime(); if (runtime != null && index().isConstant() && array().isConstant() && !array().isNullConstant()) { - CiConstant arrayConst = array().asConstant(); + RiConstant arrayConst = array().asConstant(); if (tool.isImmutable(arrayConst)) { int index = index().asConstant().asInt(); Object array = arrayConst.asObject();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,7 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -94,7 +93,7 @@ } @Override - public CiKind returnKind() { + public RiKind returnKind() { return targetMethod().signature().returnKind(false); } @@ -139,8 +138,8 @@ } public Stamp returnStamp() { - CiKind returnKind = targetMethod.signature().returnKind(false); - if (returnKind == CiKind.Object && returnType instanceof RiResolvedType) { + RiKind returnKind = targetMethod.signature().returnKind(false); + if (returnKind == RiKind.Object && returnType instanceof RiResolvedType) { return StampFactory.declared((RiResolvedType) returnType); } else { return StampFactory.forKind(returnKind);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,8 +24,7 @@ import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; @@ -79,8 +78,8 @@ @Override public void typeFeedback(TypeFeedbackTool tool) { - assert length.kind() == CiKind.Int; - tool.addScalar(length).constantBound(Condition.GE, CiConstant.INT_0); + assert length.kind() == RiKind.Int; + tool.addScalar(length).constantBound(Condition.GE, RiConstant.INT_0); } public EscapeOp getEscapeOp() { @@ -92,7 +91,7 @@ @Override public boolean canAnalyze(Node node) { NewArrayNode x = (NewArrayNode) node; - CiConstant length = x.dimension(0).asConstant(); + RiConstant length = x.dimension(0).asConstant(); return length != null && length.asInt() >= 0 && length.asInt() < MaximumEscapeAnalysisArrayLength; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,7 +24,7 @@ import java.util.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,7 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; @@ -74,8 +73,8 @@ @Override public void typeFeedback(TypeFeedbackTool tool) { for (ValueNode length : dimensions) { - assert length.kind() == CiKind.Int; - tool.addScalar(length).constantBound(Condition.GE, CiConstant.INT_0); + assert length.kind() == RiKind.Int; + tool.addScalar(length).constantBound(Condition.GE, RiConstant.INT_0); } } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewObjectArrayNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewObjectArrayNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewTypeArrayNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewTypeArrayNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.java; +import com.oracle.graal.api.code.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; /** * This node is used to perform the finalizer registration at the end of the java.lang.Object constructor.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreFieldNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreFieldNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.java; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ri.*; /** * The {@code StoreFieldNode} represents a write to a static or instance field.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.java; +import com.oracle.graal.api.meta.*; import com.oracle.graal.cri.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ci.*; /** * The {@code StoreIndexedNode} represents a write to an array element. @@ -61,7 +61,7 @@ * @param elementKind the element type * @param value the value to store into the array */ - public StoreIndexedNode(ValueNode array, ValueNode index, CiKind elementKind, ValueNode value, long leafGraphId) { + public StoreIndexedNode(ValueNode array, ValueNode index, RiKind elementKind, ValueNode value, long leafGraphId) { super(StampFactory.forVoid(), array, index, elementKind, leafGraphId); this.value = value; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/CanonicalizerTool.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/CanonicalizerTool.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.spi; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; public interface CanonicalizerTool { @@ -35,5 +35,5 @@ * Determines if a given constant is an object/array whose current * fields/elements will never change. */ - boolean isImmutable(CiConstant objectConstant); + boolean isImmutable(RiConstant objectConstant); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/EscapeField.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/EscapeField.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.spi; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; public class EscapeField {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/EscapeOp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/EscapeOp.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,7 +24,7 @@ import java.util.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; @@ -94,9 +94,9 @@ } public static boolean isValidConstantIndex(AccessIndexedNode x) { - CiConstant index = x.index().asConstant(); + RiConstant index = x.index().asConstant(); if (x.array() instanceof NewArrayNode) { - CiConstant length = ((NewArrayNode) x.array()).dimension(0).asConstant(); + RiConstant length = ((NewArrayNode) x.array()).dimension(0).asConstant(); return index != null && length != null && index.asInt() >= 0 && index.asInt() < length.asInt(); } else { return false;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.nodes.spi; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.java.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public abstract class LIRGeneratorTool { public abstract CiTarget target(); @@ -38,7 +38,7 @@ * @param c The constant to check. * @return True if the constant can be used directly, false if the constant needs to be in a register. */ - public abstract boolean canInlineConstant(CiConstant c); + public abstract boolean canInlineConstant(RiConstant c); /** * Checks whether the supplied constant can be used without loading it into a register @@ -46,49 +46,49 @@ * @param c The constant to check. * @return True if the constant can be used directly, false if the constant needs to be in a register. */ - public abstract boolean canStoreConstant(CiConstant c); + public abstract boolean canStoreConstant(RiConstant c); - public abstract CiValue operand(ValueNode object); - public abstract CiValue newVariable(CiKind kind); - public abstract CiValue setResult(ValueNode x, CiValue operand); + public abstract RiValue operand(ValueNode object); + public abstract RiValue newVariable(RiKind kind); + public abstract RiValue setResult(ValueNode x, RiValue operand); public abstract CiAddress makeAddress(LocationNode location, ValueNode object); - public abstract CiValue emitMove(CiValue input); - public abstract void emitMove(CiValue src, CiValue dst); - public abstract CiValue emitLoad(CiValue loadAddress, boolean canTrap); - public abstract void emitStore(CiValue storeAddress, CiValue input, boolean canTrap); - public abstract CiValue emitLea(CiValue address); + public abstract RiValue emitMove(RiValue input); + public abstract void emitMove(RiValue src, RiValue dst); + public abstract RiValue emitLoad(RiValue loadAddress, boolean canTrap); + public abstract void emitStore(RiValue storeAddress, RiValue input, boolean canTrap); + public abstract RiValue emitLea(RiValue address); - public abstract CiValue emitNegate(CiValue input); - public abstract CiValue emitAdd(CiValue a, CiValue b); - public abstract CiValue emitSub(CiValue a, CiValue b); - public abstract CiValue emitMul(CiValue a, CiValue b); - public abstract CiValue emitDiv(CiValue a, CiValue b); - public abstract CiValue emitRem(CiValue a, CiValue b); - public abstract CiValue emitUDiv(CiValue a, CiValue b); - public abstract CiValue emitURem(CiValue a, CiValue b); + public abstract RiValue emitNegate(RiValue input); + public abstract RiValue emitAdd(RiValue a, RiValue b); + public abstract RiValue emitSub(RiValue a, RiValue b); + public abstract RiValue emitMul(RiValue a, RiValue b); + public abstract RiValue emitDiv(RiValue a, RiValue b); + public abstract RiValue emitRem(RiValue a, RiValue b); + public abstract RiValue emitUDiv(RiValue a, RiValue b); + public abstract RiValue emitURem(RiValue a, RiValue b); - public abstract CiValue emitAnd(CiValue a, CiValue b); - public abstract CiValue emitOr(CiValue a, CiValue b); - public abstract CiValue emitXor(CiValue a, CiValue b); + public abstract RiValue emitAnd(RiValue a, RiValue b); + public abstract RiValue emitOr(RiValue a, RiValue b); + public abstract RiValue emitXor(RiValue a, RiValue b); - public abstract CiValue emitShl(CiValue a, CiValue b); - public abstract CiValue emitShr(CiValue a, CiValue b); - public abstract CiValue emitUShr(CiValue a, CiValue b); + public abstract RiValue emitShl(RiValue a, RiValue b); + public abstract RiValue emitShr(RiValue a, RiValue b); + public abstract RiValue emitUShr(RiValue a, RiValue b); - public abstract CiValue emitConvert(ConvertNode.Op opcode, CiValue inputVal); + public abstract RiValue emitConvert(ConvertNode.Op opcode, RiValue inputVal); public abstract void emitMembar(int barriers); - public abstract void emitDeoptimizeOnOverflow(RiDeoptAction action, RiDeoptReason reason, Object deoptInfo); - public abstract void emitDeoptimize(RiDeoptAction action, RiDeoptReason reason, Object deoptInfo, long leafGraphId); - public abstract CiValue emitCall(Object target, CiKind result, CiKind[] arguments, boolean canTrap, CiValue... args); - public final CiValue emitCall(CiRuntimeCall runtimeCall, boolean canTrap, CiValue... args) { + public abstract void emitDeoptimizeOnOverflow(CiDeoptAction action, RiDeoptReason reason, Object deoptInfo); + public abstract void emitDeoptimize(CiDeoptAction action, RiDeoptReason reason, Object deoptInfo, long leafGraphId); + public abstract RiValue emitCall(Object target, RiKind result, RiKind[] arguments, boolean canTrap, RiValue... args); + public final RiValue emitCall(CiRuntimeCall runtimeCall, boolean canTrap, RiValue... args) { return emitCall(runtimeCall, runtimeCall.resultKind, runtimeCall.arguments, canTrap, args); } public abstract void emitIf(IfNode i); public abstract void emitConditional(ConditionalNode i); - public abstract void emitGuardCheck(BooleanNode comp, RiDeoptReason deoptReason, RiDeoptAction deoptAction, boolean negated, long leafGraphId); + public abstract void emitGuardCheck(BooleanNode comp, RiDeoptReason deoptReason, CiDeoptAction deoptAction, boolean negated, long leafGraphId); public abstract void emitLookupSwitch(LookupSwitchNode i); public abstract void emitTableSwitch(TableSwitchNode i);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeFeedbackStore.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeFeedbackStore.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,8 +24,7 @@ import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; @@ -45,7 +44,7 @@ } @Override - public boolean constantBound(Condition condition, final CiConstant constant) { + public boolean constantBound(Condition condition, final RiConstant constant) { assert condition == Condition.EQ || condition == Condition.NE; if (condition == Condition.EQ) { return store.prove(Equals.class, new BooleanPredicate<Equals>() { @@ -150,9 +149,9 @@ } private static final class Equals extends Info { - public final CiConstant constant; + public final RiConstant constant; - public Equals(CiConstant constant) { + public Equals(RiConstant constant) { this.constant = constant; } @@ -163,9 +162,9 @@ } private static final class NotEquals extends Info { - public final CiConstant constant; + public final RiConstant constant; - public NotEquals(CiConstant constant) { + public NotEquals(RiConstant constant) { this.constant = constant; } @@ -291,7 +290,7 @@ } @Override - public void constantBound(Condition condition, CiConstant constant) { + public void constantBound(Condition condition, RiConstant constant) { assert condition == Condition.EQ || condition == Condition.NE; if (condition == Condition.EQ) { @@ -358,7 +357,7 @@ if (typeInfo.type == type && index == 0) { if (index == 0) { if (nonNull) { - constantBound(Condition.NE, CiConstant.NULL_OBJECT); + constantBound(Condition.NE, RiConstant.NULL_OBJECT); } return; } else { @@ -370,7 +369,7 @@ infos.add(new ObjectTypeDeclared(type)); updateDependency(); if (nonNull) { - constantBound(Condition.NE, CiConstant.NULL_OBJECT); + constantBound(Condition.NE, RiConstant.NULL_OBJECT); } } @@ -385,7 +384,7 @@ ObjectTypeExact typeInfo = (ObjectTypeExact) info; if (typeInfo.type == type && index == 0) { if (index == 0) { - constantBound(Condition.NE, CiConstant.NULL_OBJECT); + constantBound(Condition.NE, RiConstant.NULL_OBJECT); return; } else { iter.remove(); @@ -395,7 +394,7 @@ } infos.add(new ObjectTypeExact(type)); updateDependency(); - constantBound(Condition.NE, CiConstant.NULL_OBJECT); + constantBound(Condition.NE, RiConstant.NULL_OBJECT); } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeFeedbackTool.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeFeedbackTool.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,13 @@ */ package com.oracle.graal.nodes.spi.types; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; public interface ObjectTypeFeedbackTool { - void constantBound(Condition condition, CiConstant constant); + void constantBound(Condition condition, RiConstant constant); void valueBound(Condition condition, ValueNode otherValue);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeQuery.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeQuery.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,13 @@ */ package com.oracle.graal.nodes.spi.types; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; public interface ObjectTypeQuery extends TypeQuery { - boolean constantBound(Condition condition, CiConstant constant); + boolean constantBound(Condition condition, RiConstant constant); boolean valueBound(Condition condition, ValueNode otherValue);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ScalarTypeFeedbackStore.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ScalarTypeFeedbackStore.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,9 +24,9 @@ import java.util.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; -import com.oracle.max.cri.ci.*; public class ScalarTypeFeedbackStore extends TypeFeedbackStore<ScalarTypeFeedbackStore> implements ScalarTypeFeedbackTool, CloneableTypeFeedback { @@ -39,8 +39,8 @@ } @Override - public boolean constantBound(Condition condition, CiConstant constant) { - if (constant.kind == CiKind.Int || constant.kind == CiKind.Long) { + public boolean constantBound(Condition condition, RiConstant constant) { + if (constant.kind == RiKind.Int || constant.kind == RiKind.Long) { switch (condition) { case EQ: return store.constantBounds.lowerBound == constant.asLong() && store.constantBounds.upperBound == constant.asLong(); @@ -117,7 +117,7 @@ } } - private final CiKind kind; + private final RiKind kind; private final ConstantBound constantBounds; private final TypeFeedbackChanged changed; private ValueNode dependency; @@ -127,11 +127,11 @@ dependency = changed.node; } - public ScalarTypeFeedbackStore(CiKind kind, TypeFeedbackChanged changed) { + public ScalarTypeFeedbackStore(RiKind kind, TypeFeedbackChanged changed) { this.kind = kind; - if (kind == CiKind.Int) { + if (kind == RiKind.Int) { constantBounds = new ConstantBound(Integer.MIN_VALUE, Integer.MAX_VALUE); - } else if (kind == CiKind.Long) { + } else if (kind == RiKind.Long) { constantBounds = new ConstantBound(Long.MIN_VALUE, Long.MAX_VALUE); } else { constantBounds = null; @@ -156,7 +156,7 @@ } @Override - public void constantBound(Condition condition, CiConstant constant) { + public void constantBound(Condition condition, RiConstant constant) { ConstantBound newBound = createBounds(condition, constant); if (newBound != null) { if (constantBounds.join(newBound)) { @@ -165,9 +165,9 @@ } } - private static ConstantBound createBounds(Condition condition, CiConstant constant) { + private static ConstantBound createBounds(Condition condition, RiConstant constant) { ConstantBound newBound; - if (constant.kind == CiKind.Int || constant.kind == CiKind.Long) { + if (constant.kind == RiKind.Int || constant.kind == RiKind.Long) { switch (condition) { case EQ: newBound = new ConstantBound(constant.asLong(), constant.asLong()); @@ -236,39 +236,39 @@ case LE: case LT: simpleValueBound(condition, otherValue); - constantBound(condition, new CiConstant(kind, other.constantBounds.upperBound)); + constantBound(condition, new RiConstant(kind, other.constantBounds.upperBound)); break; case GE: case GT: simpleValueBound(condition, otherValue); - constantBound(condition, new CiConstant(kind, other.constantBounds.lowerBound)); + constantBound(condition, new RiConstant(kind, other.constantBounds.lowerBound)); break; case BT: if (other.constantBounds.lowerBound >= 0) { simpleValueBound(Condition.LT, otherValue); - constantBound(Condition.GE, new CiConstant(kind, 0)); - constantBound(Condition.LT, new CiConstant(kind, other.constantBounds.upperBound)); + constantBound(Condition.GE, new RiConstant(kind, 0)); + constantBound(Condition.LT, new RiConstant(kind, other.constantBounds.upperBound)); } break; case BE: if (other.constantBounds.lowerBound >= 0) { simpleValueBound(Condition.LE, otherValue); - constantBound(Condition.GE, new CiConstant(kind, 0)); - constantBound(Condition.LE, new CiConstant(kind, other.constantBounds.upperBound)); + constantBound(Condition.GE, new RiConstant(kind, 0)); + constantBound(Condition.LE, new RiConstant(kind, other.constantBounds.upperBound)); } break; case AT: if (other.constantBounds.upperBound < 0) { simpleValueBound(Condition.GT, otherValue); - constantBound(Condition.LT, new CiConstant(kind, 0)); - constantBound(Condition.GT, new CiConstant(kind, other.constantBounds.lowerBound)); + constantBound(Condition.LT, new RiConstant(kind, 0)); + constantBound(Condition.GT, new RiConstant(kind, other.constantBounds.lowerBound)); } break; case AE: if (other.constantBounds.upperBound < 0) { simpleValueBound(Condition.GE, otherValue); - constantBound(Condition.LT, new CiConstant(kind, 0)); - constantBound(Condition.GE, new CiConstant(kind, other.constantBounds.lowerBound)); + constantBound(Condition.LT, new RiConstant(kind, 0)); + constantBound(Condition.GE, new RiConstant(kind, other.constantBounds.lowerBound)); } break; } @@ -357,20 +357,20 @@ } @Override - public void setTranslated(CiConstant deltaConstant, ScalarTypeQuery old) { + public void setTranslated(RiConstant deltaConstant, ScalarTypeQuery old) { assert deltaConstant.kind == kind; ScalarTypeFeedbackStore other = old.store(); assert other.kind == kind; long lower = other.constantBounds.lowerBound; long upper = other.constantBounds.upperBound; - if (kind == CiKind.Int) { + if (kind == RiKind.Int) { int delta = deltaConstant.asInt(); int newLower = (int) lower + delta; int newUpper = (int) upper + delta; if ((newLower <= lower && newUpper <= upper) || (newLower > lower && newUpper > upper)) { constantBounds.join(new ConstantBound(newLower, newUpper)); } - } else if (kind == CiKind.Long) { + } else if (kind == RiKind.Long) { long delta = deltaConstant.asLong(); long newLower = lower + delta; long newUpper = upper + delta; @@ -386,20 +386,20 @@ return constantBounds.lowerBound == minValue(kind) && constantBounds.upperBound == maxValue(kind) && (valueBounds == null || valueBounds.isEmpty()); } - private static long minValue(CiKind kind) { - if (kind == CiKind.Int) { + private static long minValue(RiKind kind) { + if (kind == RiKind.Int) { return Integer.MIN_VALUE; - } else if (kind == CiKind.Long) { + } else if (kind == RiKind.Long) { return Long.MIN_VALUE; } else { throw new UnsupportedOperationException(); } } - private static long maxValue(CiKind kind) { - if (kind == CiKind.Int) { + private static long maxValue(RiKind kind) { + if (kind == RiKind.Int) { return Integer.MAX_VALUE; - } else if (kind == CiKind.Long) { + } else if (kind == RiKind.Long) { return Long.MAX_VALUE; } else { throw new UnsupportedOperationException();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ScalarTypeFeedbackTool.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ScalarTypeFeedbackTool.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,15 +22,15 @@ */ package com.oracle.graal.nodes.spi.types; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; public interface ScalarTypeFeedbackTool { - void constantBound(Condition condition, CiConstant constant); + void constantBound(Condition condition, RiConstant constant); void valueBound(Condition condition, ValueNode otherValue, ScalarTypeQuery type); - void setTranslated(CiConstant delta, ScalarTypeQuery old); + void setTranslated(RiConstant delta, ScalarTypeQuery old); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ScalarTypeQuery.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ScalarTypeQuery.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.nodes.spi.types; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; public interface ScalarTypeQuery extends TypeQuery { - boolean constantBound(Condition condition, CiConstant constant); + boolean constantBound(Condition condition, RiConstant constant); boolean valueBound(Condition condition, ValueNode otherValue);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/TypeFeedbackTool.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/TypeFeedbackTool.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.spi.types; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; import com.oracle.graal.nodes.*; public interface TypeFeedbackTool {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/FloatStamp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/FloatStamp.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.nodes.type; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; public class FloatStamp extends Stamp { - protected FloatStamp(CiKind kind) { + protected FloatStamp(RiKind kind) { super(kind); - assert kind == CiKind.Float || kind == CiKind.Double; + assert kind == RiKind.Float || kind == RiKind.Double; } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/GenericStamp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/GenericStamp.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.type; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; public final class GenericStamp extends Stamp { @@ -33,7 +33,7 @@ private final GenericStampType type; protected GenericStamp(GenericStampType type) { - super(CiKind.Void); + super(RiKind.Void); this.type = type; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/IntegerStamp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/IntegerStamp.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.type; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; public class IntegerStamp extends Stamp { @@ -30,11 +30,11 @@ private final long lowerBound; private final long upperBound; - public IntegerStamp(CiKind kind) { + public IntegerStamp(RiKind kind) { this(kind, kind.minValue(), kind.maxValue()); } - public IntegerStamp(CiKind kind, long lowerBound, long upperBound) { + public IntegerStamp(RiKind kind, long lowerBound, long upperBound) { super(kind); assert lowerBound <= upperBound; this.lowerBound = lowerBound;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/ObjectStamp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/ObjectStamp.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,7 @@ */ package com.oracle.graal.nodes.type; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; public class ObjectStamp extends Stamp { @@ -33,7 +32,7 @@ private final boolean nonNull; public ObjectStamp(RiResolvedType type, boolean exactType, boolean nonNull) { - super(CiKind.Object); + super(RiKind.Object); assert !exactType || type != null; this.type = type; this.exactType = exactType;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/Stamp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/Stamp.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,20 +22,19 @@ */ package com.oracle.graal.nodes.type; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.spi.types.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public abstract class Stamp { - private final CiKind kind; + private final RiKind kind; - protected Stamp(CiKind kind) { + protected Stamp(RiKind kind) { this.kind = kind; } - public CiKind kind() { + public RiKind kind() { return kind; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampFactory.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampFactory.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,15 +24,15 @@ import java.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.type.GenericStamp.GenericStampType; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; public class StampFactory { - private static final Stamp[] stampCache = new Stamp[CiKind.values().length]; + private static final Stamp[] stampCache = new Stamp[RiKind.values().length]; private static final Stamp objectStamp = new ObjectStamp(null, false, false); private static final Stamp objectNonNullStamp = new ObjectStamp(null, false, true); private static final Stamp dependencyStamp = new GenericStamp(GenericStampType.Dependency); @@ -43,28 +43,28 @@ private static final Stamp positiveInt = forInt(0, Integer.MAX_VALUE); - private static void setCache(CiKind kind, Stamp stamp) { + private static void setCache(RiKind kind, Stamp stamp) { stampCache[kind.ordinal()] = stamp; } static { - setCache(CiKind.Boolean, new IntegerStamp(CiKind.Boolean)); - setCache(CiKind.Byte, new IntegerStamp(CiKind.Byte)); - setCache(CiKind.Short, new IntegerStamp(CiKind.Short)); - setCache(CiKind.Char, new IntegerStamp(CiKind.Char)); - setCache(CiKind.Int, new IntegerStamp(CiKind.Int)); - setCache(CiKind.Long, new IntegerStamp(CiKind.Long)); + setCache(RiKind.Boolean, new IntegerStamp(RiKind.Boolean)); + setCache(RiKind.Byte, new IntegerStamp(RiKind.Byte)); + setCache(RiKind.Short, new IntegerStamp(RiKind.Short)); + setCache(RiKind.Char, new IntegerStamp(RiKind.Char)); + setCache(RiKind.Int, new IntegerStamp(RiKind.Int)); + setCache(RiKind.Long, new IntegerStamp(RiKind.Long)); - setCache(CiKind.Float, new FloatStamp(CiKind.Float)); - setCache(CiKind.Double, new FloatStamp(CiKind.Double)); + setCache(RiKind.Float, new FloatStamp(RiKind.Float)); + setCache(RiKind.Double, new FloatStamp(RiKind.Double)); - setCache(CiKind.Jsr, new IntegerStamp(CiKind.Jsr)); + setCache(RiKind.Jsr, new IntegerStamp(RiKind.Jsr)); - setCache(CiKind.Object, objectStamp); - setCache(CiKind.Void, voidStamp); + setCache(RiKind.Object, objectStamp); + setCache(RiKind.Void, voidStamp); } - public static Stamp forKind(CiKind kind) { + public static Stamp forKind(RiKind kind) { assert stampCache[kind.stackKind().ordinal()] != null : "unexpected forKind(" + kind + ")"; return stampCache[kind.stackKind().ordinal()]; } @@ -74,7 +74,7 @@ } public static Stamp intValue() { - return forKind(CiKind.Int); + return forKind(RiKind.Int); } public static Stamp dependency() { @@ -98,30 +98,30 @@ } public static Stamp forInt(int lowerBound, int upperBound) { - return new IntegerStamp(CiKind.Int, lowerBound, upperBound); + return new IntegerStamp(RiKind.Int, lowerBound, upperBound); } public static Stamp forLong(long lowerBound, long upperBound) { - return new IntegerStamp(CiKind.Long, lowerBound, upperBound); + return new IntegerStamp(RiKind.Long, lowerBound, upperBound); } - public static Stamp forConstant(CiConstant value) { - assert value.kind != CiKind.Object; - if (value.kind == CiKind.Object) { + public static Stamp forConstant(RiConstant value) { + assert value.kind != RiKind.Object; + if (value.kind == RiKind.Object) { throw new GraalInternalError("unexpected kind: %s", value.kind); } else { - if (value.kind == CiKind.Int) { + if (value.kind == RiKind.Int) { return forInt(value.asInt(), value.asInt()); - } else if (value.kind == CiKind.Long) { + } else if (value.kind == RiKind.Long) { return forLong(value.asLong(), value.asLong()); } return forKind(value.kind.stackKind()); } } - public static Stamp forConstant(CiConstant value, RiRuntime runtime) { - assert value.kind == CiKind.Object; - if (value.kind == CiKind.Object) { + public static Stamp forConstant(RiConstant value, RiRuntime runtime) { + assert value.kind == RiKind.Object; + if (value.kind == RiKind.Object) { RiResolvedType type = value.isNull() ? null : runtime.getTypeOf(value); return new ObjectStamp(type, value.isNonNull(), value.isNonNull()); } else { @@ -147,7 +147,7 @@ public static Stamp declared(RiResolvedType type, boolean nonNull) { assert type != null; - assert type.kind(false) == CiKind.Object; + assert type.kind(false) == RiKind.Object; RiResolvedType exact = type.exactType(); if (exact != null) { return new ObjectStamp(exact, true, nonNull);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/BoxedVirtualObjectNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/BoxedVirtualObjectNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.virtual; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.virtual; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -import com.oracle.max.cri.ri.*; public class VirtualObjectNode extends ValueNode implements LIRLowerable {
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.printer; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.io.*; import java.util.*; -import com.oracle.max.cri.ci.*; import com.oracle.max.criutils.*; import com.oracle.graal.alloc.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.alloc.*; import com.oracle.graal.compiler.alloc.Interval.UsePosList; import com.oracle.graal.compiler.gen.*; @@ -307,7 +308,7 @@ out.print("tid ").print(nodeToString(node)).println(COLUMN_END); if (lirGenerator != null) { - CiValue operand = lirGenerator.nodeOperands.get(node); + RiValue operand = lirGenerator.nodeOperands.get(node); if (operand != null) { out.print("result ").print(operand.toString()).println(COLUMN_END); } @@ -406,7 +407,7 @@ private String stateValueToString(ValueNode value) { String result = nodeToString(value); if (lirGenerator != null && lirGenerator.nodeOperands != null && value != null) { - CiValue operand = lirGenerator.nodeOperands.get(value); + RiValue operand = lirGenerator.nodeOperands.get(value); if (operand != null) { result += ": " + operand; } @@ -462,7 +463,7 @@ prefix = "B"; } else if (node instanceof ValueNode) { ValueNode value = (ValueNode) node; - if (value.kind() == CiKind.Illegal) { + if (value.kind() == RiKind.Illegal) { prefix = "v"; } else { prefix = String.valueOf(value.kind().typeChar);
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinterObserver.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinterObserver.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,10 +25,10 @@ import java.io.*; import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*; import com.oracle.graal.alloc.util.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.alloc.*; import com.oracle.graal.compiler.gen.*; @@ -141,22 +141,19 @@ final CiTargetMethod tm = (CiTargetMethod) object; final byte[] code = Arrays.copyOf(tm.targetCode(), tm.targetCodeSize()); RiCodeInfo info = new RiCodeInfo() { - public CiTargetMethod targetMethod() { - return tm; + public RiResolvedMethod method() { + return null; } public long start() { return 0L; } - public RiResolvedMethod method() { - return null; - } public byte[] code() { return code; } }; - cfgPrinter.printMachineCode(runtime.disassemble(info), message); + cfgPrinter.printMachineCode(runtime.disassemble(info, tm), message); } else if (object instanceof RiCodeInfo) { - cfgPrinter.printMachineCode(runtime.disassemble((RiCodeInfo) object), message); + cfgPrinter.printMachineCode(runtime.disassemble((RiCodeInfo) object, null), message); } else if (object instanceof Interval[]) { cfgPrinter.printIntervals(message, (Interval[]) object);
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,7 +26,7 @@ import java.util.*; import java.util.Map.Entry; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.schedule.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.Node.Verbosity;
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinterDumpHandler.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinterDumpHandler.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,9 +26,9 @@ import java.net.*; import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.*;
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/GraalIntrinsics.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/GraalIntrinsics.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,15 +22,15 @@ */ package com.oracle.graal.snippets; +import com.oracle.graal.api.code.*; import com.oracle.graal.compiler.*; import com.oracle.graal.cri.*; -import com.oracle.max.cri.ci.*; /** * Definition of the snippets that are VM-independent and can be intrinsified by Graal in any VM. */ public class GraalIntrinsics { - public static void installIntrinsics(GraalRuntime runtime, CiTarget target) { + public static void installIntrinsics(ExtendedRiRuntime runtime, CiTarget target) { if (GraalOptions.Intrinsify) { Snippets.install(runtime, target, new MathSnippetsX86()); Snippets.install(runtime, target, new DoubleSnippets());
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/MathSnippetsX86.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/MathSnippetsX86.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.snippets; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.snippets.nodes.*; import com.oracle.graal.snippets.nodes.MathIntrinsicNode.Operation;
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/NodeClassSnippets.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/NodeClassSnippets.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.snippets; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.extended.*; @@ -38,19 +38,19 @@ public class NodeClassSnippets implements SnippetsInterface { private static Node getNode(Node node, long offset) { - return UnsafeCastNode.cast(UnsafeLoadNode.load(node, 0, offset, CiKind.Object), Node.class); + return UnsafeCastNode.cast(UnsafeLoadNode.load(node, 0, offset, RiKind.Object), Node.class); } private static NodeList<Node> getNodeList(Node node, long offset) { - return UnsafeCastNode.cast(UnsafeLoadNode.load(node, 0, offset, CiKind.Object), NodeList.class); + return UnsafeCastNode.cast(UnsafeLoadNode.load(node, 0, offset, RiKind.Object), NodeList.class); } private static void putNode(Node node, long offset, Node value) { - UnsafeStoreNode.store(node, 0, offset, value, CiKind.Object); + UnsafeStoreNode.store(node, 0, offset, value, RiKind.Object); } private static void putNodeList(Node node, long offset, NodeList value) { - UnsafeStoreNode.store(node, 0, offset, value, CiKind.Object); + UnsafeStoreNode.store(node, 0, offset, value, RiKind.Object); } }
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetTemplate.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetTemplate.java Fri Jun 08 15:17:43 2012 +0200 @@ -27,6 +27,8 @@ import java.util.Map.Entry; import java.util.concurrent.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.loop.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.debug.*; @@ -40,8 +42,6 @@ import com.oracle.graal.snippets.Snippet.Multiple; import com.oracle.graal.snippets.Snippet.Parameter; import com.oracle.graal.snippets.nodes.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * A snippet template is a graph created by parsing a snippet method and then @@ -195,9 +195,9 @@ String name = c.value(); Object arg = key.get(name); assert arg != null : method + ": requires a constant named " + name; - CiKind kind = signature.argumentKindAt(i, false); + RiKind kind = signature.argumentKindAt(i, false); assert checkConstantArgument(method, signature, i, name, arg, kind); - replacements.put(snippetGraph.getLocal(i), ConstantNode.forCiConstant(CiConstant.forBoxed(kind, arg), runtime, snippetCopy)); + replacements.put(snippetGraph.getLocal(i), ConstantNode.forCiConstant(RiConstant.forBoxed(kind, arg), runtime, snippetCopy)); } else { Parameter p = CiUtil.getParameterAnnotation(Parameter.class, i, method); assert p != null : method + ": parameter " + i + " must be annotated with either @Constant or @Parameter"; @@ -324,7 +324,7 @@ return true; } - private static boolean checkConstantArgument(final RiResolvedMethod method, RiSignature signature, int i, String name, Object arg, CiKind kind) { + private static boolean checkConstantArgument(final RiResolvedMethod method, RiSignature signature, int i, String name, Object arg, RiKind kind) { if (kind.isObject()) { Class<?> type = signature.argumentTypeAt(i, method.holder()).resolve(method.holder()).toJava(); assert type.isInstance(arg) : @@ -384,8 +384,8 @@ if (argument instanceof ValueNode) { replacements.put((LocalNode) parameter, (ValueNode) argument); } else { - CiKind kind = ((LocalNode) parameter).kind(); - CiConstant constant = CiConstant.forBoxed(kind, argument); + RiKind kind = ((LocalNode) parameter).kind(); + RiConstant constant = RiConstant.forBoxed(kind, argument); replacements.put((LocalNode) parameter, ConstantNode.forCiConstant(constant, runtime, replaceeGraph)); } } else { @@ -398,7 +398,7 @@ for (int j = 0; j < length; j++) { LocalNode local = locals[j]; assert local != null; - CiConstant constant = CiConstant.forBoxed(local.kind(), Array.get(array, j)); + RiConstant constant = RiConstant.forBoxed(local.kind(), Array.get(array, j)); ConstantNode element = ConstantNode.forCiConstant(constant, runtime, replaceeGraph); replacements.put(local, element); }
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Snippets.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Snippets.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,6 +25,8 @@ import java.lang.reflect.*; import java.util.concurrent.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.compiler.util.*; @@ -35,15 +37,13 @@ import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.java.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * Utilities for snippet installation and management. */ public class Snippets { - public static void install(GraalRuntime runtime, CiTarget target, SnippetsInterface obj) { + public static void install(ExtendedRiRuntime runtime, CiTarget target, SnippetsInterface obj) { Class<? extends SnippetsInterface> clazz = obj.getClass(); BoxingMethodPool pool = new BoxingMethodPool(runtime); if (clazz.isAnnotationPresent(ClassSubstitution.class)) { @@ -53,7 +53,7 @@ } } - private static void installSnippets(GraalRuntime runtime, CiTarget target, Class< ? extends SnippetsInterface> clazz, BoxingMethodPool pool) { + private static void installSnippets(ExtendedRiRuntime runtime, CiTarget target, Class< ? extends SnippetsInterface> clazz, BoxingMethodPool pool) { for (Method method : clazz.getDeclaredMethods()) { if (method.getAnnotation(Snippet.class) != null) { Method snippet = method; @@ -69,7 +69,7 @@ } } - private static void installSubstitution(GraalRuntime runtime, CiTarget target, Class< ? extends SnippetsInterface> clazz, + private static void installSubstitution(ExtendedRiRuntime runtime, CiTarget target, Class< ? extends SnippetsInterface> clazz, BoxingMethodPool pool, Class<?> original) throws GraalInternalError { for (Method snippet : clazz.getDeclaredMethods()) { try { @@ -90,7 +90,7 @@ } } - private static StructuredGraph buildSnippetGraph(final RiResolvedMethod snippetRiMethod, final GraalRuntime runtime, final CiTarget target, final BoxingMethodPool pool) { + private static StructuredGraph buildSnippetGraph(final RiResolvedMethod snippetRiMethod, final ExtendedRiRuntime runtime, final CiTarget target, final BoxingMethodPool pool) { final StructuredGraph graph = new StructuredGraph(snippetRiMethod); return Debug.scope("BuildSnippetGraph", new Object[] {snippetRiMethod, graph}, new Callable<StructuredGraph>() { @Override
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/MathIntrinsicNode.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/MathIntrinsicNode.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,6 +24,7 @@ import static com.oracle.graal.lir.amd64.AMD64Arithmetic.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.gen.*; import com.oracle.graal.compiler.target.*; import com.oracle.graal.graph.*; @@ -34,7 +35,6 @@ import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; import com.oracle.graal.snippets.target.amd64.*; -import com.oracle.max.cri.ci.*; public class MathIntrinsicNode extends FloatingNode implements Canonicalizable, LIRGenLowerable { @@ -55,7 +55,7 @@ public MathIntrinsicNode(ValueNode x, Operation op) { super(StampFactory.forKind(x.kind())); - assert x.kind() == CiKind.Double; + assert x.kind() == RiKind.Double; this.x = x; this.operation = op; } @@ -65,7 +65,7 @@ Variable input = gen.load(gen.operand(x())); Variable result = gen.newVariable(kind()); switch (operation()) { - case ABS: gen.append(new Op2Reg(DAND, result, input, CiConstant.forDouble(Double.longBitsToDouble(0x7FFFFFFFFFFFFFFFL)))); break; + case ABS: gen.append(new Op2Reg(DAND, result, input, RiConstant.forDouble(Double.longBitsToDouble(0x7FFFFFFFFFFFFFFFL)))); break; case SQRT: gen.append(new AMD64MathIntrinsicOp(AMD64MathIntrinsicOp.Opcode.SQRT, result, input)); break; case LOG: gen.append(new AMD64MathIntrinsicOp(AMD64MathIntrinsicOp.Opcode.LOG, result, input)); break; case LOG10: gen.append(new AMD64MathIntrinsicOp(AMD64MathIntrinsicOp.Opcode.LOG10, result, input)); break;
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/target/amd64/AMD64MathIntrinsicOp.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/target/amd64/AMD64MathIntrinsicOp.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.snippets.target.amd64; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.util.*; import com.oracle.max.asm.target.amd64.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.amd64.*; @@ -40,15 +40,15 @@ LOG, LOG10; } - public AMD64MathIntrinsicOp(Opcode opcode, CiValue result, CiValue input) { - super(opcode, new CiValue[] {result}, null, new CiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); + public AMD64MathIntrinsicOp(Opcode opcode, RiValue result, RiValue input) { + super(opcode, new RiValue[] {result}, null, new RiValue[] {input}, LIRInstruction.NO_OPERANDS, LIRInstruction.NO_OPERANDS); } @Override public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) { Opcode opcode = (Opcode) code; - CiValue result = output(0); - CiValue input = input(0); + RiValue result = output(0); + RiValue input = input(0); switch (opcode) { case SQRT: masm.sqrtsd(asDoubleReg(result), asDoubleReg(input)); break;
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/CheckCastTest.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/CheckCastTest.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,9 +24,9 @@ import org.junit.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; -import com.oracle.max.cri.ri.*; /** * Tests the implementation of checkcast, allowing profiling information to
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/CompiledMethodTest.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/CompiledMethodTest.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,14 +26,13 @@ import org.junit.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiCompiledMethod.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.graph.*; import com.oracle.graal.java.*; import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiCompiledMethod.MethodInvalidatedException; /** * In the following tests, the usages of local variable "a" are replaced with the integer constant 0. Then @@ -61,7 +60,7 @@ for (Node node : graph.getNodes()) { if (node instanceof ConstantNode) { ConstantNode constant = (ConstantNode) node; - if (constant.kind() == CiKind.Object && " ".equals(constant.value.asObject())) { + if (constant.kind() == RiKind.Object && " ".equals(constant.value.asObject())) { graph.replaceFloating(constant, ConstantNode.forObject("-", runtime, graph)); } } @@ -118,7 +117,7 @@ for (Node node : graph.getNodes()) { if (node instanceof ConstantNode) { ConstantNode constant = (ConstantNode) node; - if (constant.kind() == CiKind.Object && "1 ".equals(constant.value.asObject())) { + if (constant.kind() == RiKind.Object && "1 ".equals(constant.value.asObject())) { graph.replaceFloating(constant, ConstantNode.forObject("1-", runtime, graph)); } }
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/ConditionTest.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/ConditionTest.java Fri Jun 08 15:17:43 2012 +0200 @@ -28,7 +28,7 @@ import org.junit.*; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.calc.*; @@ -42,8 +42,8 @@ boolean implies = c1.implies(c2); if (implies) { for (int i = 0; i < 1000; i++) { - CiConstant a = CiConstant.forInt(rand.nextInt()); - CiConstant b = CiConstant.forInt(i < 100 ? a.asInt() : rand.nextInt()); + RiConstant a = RiConstant.forInt(rand.nextInt()); + RiConstant b = RiConstant.forInt(i < 100 ? a.asInt() : rand.nextInt()); boolean result1 = c1.foldCondition(a, b, null, false); boolean result2 = c2.foldCondition(a, b, null, false); if (result1 && implies) { @@ -64,8 +64,8 @@ assertTrue(join == c2.join(c1)); if (join != null) { for (int i = 0; i < 1000; i++) { - CiConstant a = CiConstant.forInt(rand.nextInt()); - CiConstant b = CiConstant.forInt(i < 100 ? a.asInt() : rand.nextInt()); + RiConstant a = RiConstant.forInt(rand.nextInt()); + RiConstant b = RiConstant.forInt(i < 100 ? a.asInt() : rand.nextInt()); boolean result1 = c1.foldCondition(a, b, null, false); boolean result2 = c2.foldCondition(a, b, null, false); boolean resultJoin = join.foldCondition(a, b, null, false); @@ -87,8 +87,8 @@ assertTrue(meet == c2.meet(c1)); if (meet != null) { for (int i = 0; i < 1000; i++) { - CiConstant a = CiConstant.forInt(rand.nextInt()); - CiConstant b = CiConstant.forInt(i < 100 ? a.asInt() : rand.nextInt()); + RiConstant a = RiConstant.forInt(rand.nextInt()); + RiConstant b = RiConstant.forInt(i < 100 ? a.asInt() : rand.nextInt()); boolean result1 = c1.foldCondition(a, b, null, false); boolean result2 = c2.foldCondition(a, b, null, false); boolean resultMeet = meet.foldCondition(a, b, null, false);
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/EscapeAnalysisTest.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/EscapeAnalysisTest.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,12 +26,12 @@ import org.junit.Test; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.debug.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; -import com.oracle.max.cri.ci.*; /** * In these test cases the probability of all invokes is set to a high value, such that an InliningPhase should inline them all. @@ -41,7 +41,7 @@ @Test public void test1() { - test("test1Snippet", CiConstant.forInt(101)); + test("test1Snippet", RiConstant.forInt(101)); } @SuppressWarnings("all") @@ -52,7 +52,7 @@ @Test public void test2() { - test("test2Snippet", CiConstant.forInt(0)); + test("test2Snippet", RiConstant.forInt(0)); } @SuppressWarnings("all") @@ -63,7 +63,7 @@ @Test public void test3() { - test("test3Snippet", CiConstant.forObject(null)); + test("test3Snippet", RiConstant.forObject(null)); } @SuppressWarnings("all") @@ -74,7 +74,7 @@ @Test public void testMonitor() { - test("testMonitorSnippet", CiConstant.forInt(0)); + test("testMonitorSnippet", RiConstant.forInt(0)); } private static native void notInlineable(); @@ -95,7 +95,7 @@ } public void testMonitor2() { - test("testMonitor2Snippet", CiConstant.forInt(0)); + test("testMonitor2Snippet", RiConstant.forInt(0)); } /** @@ -116,7 +116,7 @@ } } - private void test(String snippet, CiConstant expectedResult) { + private void test(String snippet, RiConstant expectedResult) { StructuredGraph graph = parse(snippet); for (Invoke n : graph.getInvokes()) { n.node().setProbability(100000);
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraalAccess.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraalAccess.java Fri Jun 08 15:17:43 2012 +0200 @@ -39,7 +39,7 @@ */ private static Map<String, String> graalAccessClasses = new LinkedHashMap<>(); static { - graalAccessClasses.put("HotSpot", "com.oracle.graal.hotspot.CompilerImpl"); + graalAccessClasses.put("HotSpot", "com.oracle.graal.hotspot.HotSpotCompilerImpl"); graalAccessClasses.put("Maxine", "com.oracle.max.vm.ext.maxri.MaxRuntime"); }
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraphTest.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraphTest.java Fri Jun 08 15:17:43 2012 +0200 @@ -27,6 +27,8 @@ import junit.framework.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.compiler.phases.PhasePlan.PhasePosition; @@ -38,8 +40,6 @@ import com.oracle.graal.java.*; import com.oracle.graal.lir.cfg.*; import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * Base class for Graal compiler unit tests. These are white box tests @@ -60,7 +60,7 @@ public abstract class GraphTest { protected final GraalCompiler graalCompiler; - protected final GraalRuntime runtime; + protected final ExtendedRiRuntime runtime; public GraphTest() { Debug.enable(); @@ -118,7 +118,7 @@ return result.toString(); } - protected GraalRuntime runtime() { + protected ExtendedRiRuntime runtime() { return runtime; }
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/InstanceOfTest.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/InstanceOfTest.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,9 +26,9 @@ import org.junit.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; -import com.oracle.max.cri.ri.*; /** * Tests the implementation of instanceof, allowing profiling information to
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/TypeCheckTest.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/TypeCheckTest.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,9 +26,9 @@ import org.junit.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiTypeProfile.*; import com.oracle.graal.nodes.*; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiTypeProfile.ProfiledType; /** * Base class for checkcast and instanceof test classes.
--- a/graal/com.oracle.max.asm/src/com/oracle/max/asm/AbstractAssembler.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.asm/src/com/oracle/max/asm/AbstractAssembler.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.max.asm; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiArchitecture.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiArchitecture.*; /** * The platform-independent base class for the assembler.
--- a/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/AMD64.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/AMD64.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.max.asm.target.amd64; -import static com.oracle.max.cri.ci.CiKind.*; -import static com.oracle.max.cri.ci.CiRegister.RegisterFlag.*; +import static com.oracle.graal.api.code.CiRegister.RegisterFlag.*; +import static com.oracle.graal.api.meta.RiKind.*; import static com.oracle.max.cri.util.MemoryBarriers.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiRegister.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiRegister.*; /** * Represents the AMD64 architecture.
--- a/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/AMD64Assembler.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/AMD64Assembler.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.max.asm.target.amd64; +import static com.oracle.graal.api.code.CiValueUtil.*; import static com.oracle.max.asm.NumUtil.*; import static com.oracle.max.asm.target.amd64.AMD64.*; -import static com.oracle.max.cri.ci.CiValueUtil.*; import static com.oracle.max.cri.util.MemoryBarriers.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.max.asm.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * This class implements an assembler that can encode most X86 instructions. @@ -38,7 +38,7 @@ /** * The kind for pointers and raw registers. Since we know we are 64 bit here, we can hardcode it. */ - private static final CiKind Word = CiKind.Long; + private static final RiKind Word = RiKind.Long; private static final int MinEncodingNeedsRex = 8; @@ -136,7 +136,7 @@ * {@link CiRegister#CallerFrame} to physical registers. This value can be null if this assembler * instance will not be used to assemble instructions using these logical registers. */ - public AMD64Assembler(CiTarget target, RiRegisterConfig registerConfig) { + public AMD64Assembler(CiTarget target, CiRegisterConfig registerConfig) { super(target); this.frameRegister = registerConfig == null ? null : registerConfig.getFrameRegister(); } @@ -2217,7 +2217,7 @@ } } - private static boolean needsRex(CiValue value) { + private static boolean needsRex(RiValue value) { return isRegister(value) && asRegister(value).encoding >= MinEncodingNeedsRex; }
--- a/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/AMD64MacroAssembler.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.asm/src/com/oracle/max/asm/target/amd64/AMD64MacroAssembler.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,16 +22,16 @@ */ package com.oracle.max.asm.target.amd64; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.max.asm.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; /** * This class implements commonly used X86 code patterns. */ public class AMD64MacroAssembler extends AMD64Assembler { - public AMD64MacroAssembler(CiTarget target, RiRegisterConfig registerConfig) { + public AMD64MacroAssembler(CiTarget target, CiRegisterConfig registerConfig) { super(target, registerConfig); } @@ -317,7 +317,7 @@ public void flog(CiRegister dest, CiRegister value, boolean base10) { assert value.spillSlotSize == dest.spillSlotSize; - CiAddress tmp = new CiAddress(CiKind.Double, AMD64.RSP); + CiAddress tmp = new CiAddress(RiKind.Double, AMD64.RSP); if (base10) { fldlg2(); } else { @@ -347,7 +347,7 @@ private void ftrig(CiRegister dest, CiRegister value, char op) { assert value.spillSlotSize == dest.spillSlotSize; - CiAddress tmp = new CiAddress(CiKind.Double, AMD64.RSP); + CiAddress tmp = new CiAddress(RiKind.Double, AMD64.RSP); subq(AMD64.rsp, value.spillSlotSize); movsd(tmp, value); fld(tmp);
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiAddress.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,175 +0,0 @@ -/* - * Copyright (c) 2010, 2012, 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.max.cri.ci; - -import static com.oracle.max.cri.ci.CiValueUtil.*; - -/** - * Represents an address in target machine memory, specified via some combination of a base register, an index register, - * a displacement and a scale. Note that the base and index registers may be a variable that will get a register assigned - * later by the register allocator. - */ -public final class CiAddress extends CiValue { - private static final long serialVersionUID = -1003772042519945089L; - - /** - * A sentinel value used as a place holder in an instruction stream for an address that will be patched. - */ - public static final CiAddress Placeholder = new CiAddress(CiKind.Illegal, CiValue.IllegalValue); - - /** - * Base register that defines the start of the address computation. - * If not present, is denoted by {@link CiValue#IllegalValue}. - */ - public CiValue base; - - /** - * Index register, the value of which (possibly scaled by {@link #scale}) is added to {@link #base}. - * If not present, is denoted by {@link CiValue#IllegalValue}. - */ - public CiValue index; - - /** - * Scaling factor for indexing, dependent on target operand size. - */ - public final Scale scale; - - /** - * Optional additive displacement. - */ - public final int displacement; - - /** - * Creates a {@code CiAddress} with given base register, no scaling and no displacement. - * @param kind the kind of the value being addressed - * @param base the base register - */ - public CiAddress(CiKind kind, CiValue base) { - this(kind, base, IllegalValue, Scale.Times1, 0); - } - - /** - * Creates a {@code CiAddress} with given base register, no scaling and a given displacement. - * @param kind the kind of the value being addressed - * @param base the base register - * @param displacement the displacement - */ - public CiAddress(CiKind kind, CiValue base, int displacement) { - this(kind, base, IllegalValue, Scale.Times1, displacement); - } - - /** - * Creates a {@code CiAddress} with given base and index registers, scaling and displacement. - * This is the most general constructor.. - * @param kind the kind of the value being addressed - * @param base the base register - * @param index the index register - * @param scale the scaling factor - * @param displacement the displacement - */ - public CiAddress(CiKind kind, CiValue base, CiValue index, Scale scale, int displacement) { - super(kind); - this.base = base; - this.index = index; - this.scale = scale; - this.displacement = displacement; - - assert !isConstant(base) && !isStackSlot(base); - assert !isConstant(index) && !isStackSlot(index); - } - - /** - * A scaling factor used in complex addressing modes such as those supported by x86 platforms. - */ - public enum Scale { - Times1(1, 0), - Times2(2, 1), - Times4(4, 2), - Times8(8, 3); - - private Scale(int value, int log2) { - this.value = value; - this.log2 = log2; - } - - /** - * The value (or multiplier) of this scale. - */ - public final int value; - - /** - * The {@linkplain #value value} of this scale log 2. - */ - public final int log2; - - public static Scale fromInt(int scale) { - switch (scale) { - case 1: return Times1; - case 2: return Times2; - case 4: return Times4; - case 8: return Times8; - default: throw new IllegalArgumentException(String.valueOf(scale)); - } - } - } - - @Override - public String toString() { - if (this == Placeholder) { - return "[<placeholder>]"; - } - - StringBuilder s = new StringBuilder(); - s.append(kind.javaName).append("["); - String sep = ""; - if (isLegal(base)) { - s.append(base); - sep = " + "; - } - if (isLegal(index)) { - s.append(sep).append(index).append(" * ").append(scale.value); - sep = " + "; - } - if (displacement < 0) { - s.append(" - ").append(-displacement); - } else if (displacement > 0) { - s.append(sep).append(displacement); - } - s.append("]"); - return s.toString(); - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof CiAddress) { - CiAddress addr = (CiAddress) obj; - return kind == addr.kind && displacement == addr.displacement && base.equals(addr.base) && scale == addr.scale && index.equals(addr.index); - } - return false; - } - - @Override - public int hashCode() { - return base.hashCode() ^ index.hashCode() ^ (displacement << 4) ^ (scale.value << 8) ^ (kind.ordinal() << 12); - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiArchitecture.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,212 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ci; - -import java.util.*; - -import com.oracle.max.cri.ci.CiRegister.*; -import com.oracle.max.cri.util.*; - - -/** - * Represents a CPU architecture, including information such as its endianness, CPU - * registers, word width, etc. - */ -public abstract class CiArchitecture { - - /** - * The endianness of the architecture. - */ - public static enum ByteOrder { - LittleEndian, - BigEndian - } - - /** - * The number of bits required in a bit map covering all the registers that may store references. - * The bit position of a register in the map is the register's {@linkplain CiRegister#number number}. - */ - public final int registerReferenceMapBitCount; - - /** - * Represents the natural size of words (typically registers and pointers) of this architecture, in bytes. - */ - public final int wordSize; - - /** - * The name of this architecture (e.g. "AMD64", "SPARCv9"). - */ - public final String name; - - /** - * Array of all available registers on this architecture. The index of each register in this - * array is equal to its {@linkplain CiRegister#number number}. - */ - public final CiRegister[] registers; - - /** - * Map of all registers keyed by their {@linkplain CiRegister#name names}. - */ - public final HashMap<String, CiRegister> registersByName; - - /** - * The byte ordering can be either little or big endian. - */ - public final ByteOrder byteOrder; - - /** - * Mask of the barrier constants defined in {@link MemoryBarriers} denoting the barriers that - * are not required to be explicitly inserted under this architecture. - */ - public final int implicitMemoryBarriers; - - /** - * Determines the barriers in a given barrier mask that are explicitly required on this architecture. - * - * @param barriers a mask of the barrier constants defined in {@link MemoryBarriers} - * @return the value of {@code barriers} minus the barriers unnecessary on this architecture - */ - public final int requiredBarriers(int barriers) { - return barriers & ~implicitMemoryBarriers; - } - - /** - * Offset in bytes from the beginning of a call instruction to the displacement. - */ - public final int machineCodeCallDisplacementOffset; - - /** - * The size of the return address pushed to the stack by a call instruction. - * A value of 0 denotes that call linkage uses registers instead (e.g. SPARC). - */ - public final int returnAddressSize; - - private final EnumMap<RegisterFlag, CiRegister[]> registersByTypeAndEncoding; - - /** - * Gets the register for a given {@linkplain CiRegister#encoding encoding} and type. - * - * @param encoding a register value as used in a machine instruction - * @param type the type of the register - */ - public CiRegister registerFor(int encoding, RegisterFlag type) { - CiRegister[] regs = registersByTypeAndEncoding.get(type); - assert encoding >= 0 && encoding < regs.length; - CiRegister reg = regs[encoding]; - assert reg != null; - return reg; - } - - protected CiArchitecture(String name, - int wordSize, - ByteOrder byteOrder, - CiRegister[] registers, - int implicitMemoryBarriers, - int nativeCallDisplacementOffset, - int registerReferenceMapBitCount, - int returnAddressSize) { - this.name = name; - this.registers = registers; - this.wordSize = wordSize; - this.byteOrder = byteOrder; - this.implicitMemoryBarriers = implicitMemoryBarriers; - this.machineCodeCallDisplacementOffset = nativeCallDisplacementOffset; - this.registerReferenceMapBitCount = registerReferenceMapBitCount; - this.returnAddressSize = returnAddressSize; - - registersByName = new HashMap<>(registers.length); - for (CiRegister register : registers) { - registersByName.put(register.name, register); - assert registers[register.number] == register; - } - - registersByTypeAndEncoding = new EnumMap<>(RegisterFlag.class); - EnumMap<RegisterFlag, CiRegister[]> categorizedRegs = CiRegister.categorize(registers); - for (RegisterFlag type : RegisterFlag.values()) { - CiRegister[] regs = categorizedRegs.get(type); - int max = CiRegister.maxRegisterEncoding(regs); - CiRegister[] regsByEnc = new CiRegister[max + 1]; - for (CiRegister reg : regs) { - regsByEnc[reg.encoding] = reg; - } - registersByTypeAndEncoding.put(type, regsByEnc); - } - } - - /** - * Converts this architecture to a string. - * @return the string representation of this architecture - */ - @Override - public final String toString() { - return name.toLowerCase(); - } - - /** - * Checks whether this is a 32-bit architecture. - * @return {@code true} if this architecture is 32-bit - */ - public final boolean is32bit() { - return wordSize == 4; - } - - /** - * Checks whether this is a 64-bit architecture. - * @return {@code true} if this architecture is 64-bit - */ - public final boolean is64bit() { - return wordSize == 8; - } - - // The following methods are architecture specific and not dependent on state - // stored in this class. They have convenient default implementations. - - /** - * Checks whether this architecture's normal arithmetic instructions use a two-operand form - * (e.g. x86 which overwrites one operand register with the result when adding). - * @return {@code true} if this architecture uses two-operand mode - */ - public boolean twoOperandMode() { - return false; - } - - // TODO: Why enumerate the concrete subclasses here rather - // than use instanceof comparisons in code that cares? - - /** - * Checks whether the architecture is x86. - * @return {@code true} if the architecture is x86 - */ - public boolean isX86() { - return false; - } - - /** - * Checks whether the architecture is SPARC. - * @return {@code true} if the architecture is SPARC - */ - public boolean isSPARC() { - return false; - } - -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiAssumptions.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,262 +0,0 @@ -/* - * Copyright (c) 2011, 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.max.cri.ci; - -import java.io.*; -import java.util.*; - -import com.oracle.max.cri.ri.*; - -/** - * Class for recording optimistic assumptions made during compilation. - * Recorded assumption can be visited for subsequent processing using - * an implementation of the {@link CiAssumptionProcessor} interface. - */ -public final class CiAssumptions implements Serializable, Iterable<CiAssumptions.Assumption> { - - private static final long serialVersionUID = 5152062717588239131L; - - public abstract static class Assumption implements Serializable { - - private static final long serialVersionUID = -1936652569665112915L; - } - - /** - * An assumption about a unique subtype of a given type. - */ - public static final class ConcreteSubtype extends Assumption { - - private static final long serialVersionUID = -1457173265437676252L; - - /** - * Type the assumption is made about. - */ - public final RiResolvedType context; - - /** - * Assumed unique concrete sub-type of the context type. - */ - public final RiResolvedType subtype; - - public ConcreteSubtype(RiResolvedType context, RiResolvedType subtype) { - this.context = context; - this.subtype = subtype; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + context.hashCode(); - result = prime * result + subtype.hashCode(); - return result; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof ConcreteSubtype) { - ConcreteSubtype other = (ConcreteSubtype) obj; - return other.context == context && other.subtype == subtype; - } - return false; - } - } - - /** - * An assumption about a unique implementation of a virtual method. - */ - public static final class ConcreteMethod extends Assumption { - - private static final long serialVersionUID = -7636746737947390059L; - - /** - * A virtual (or interface) method whose unique implementation for the receiver type - * in {@link #context} is {@link #impl}. - */ - public final RiResolvedMethod method; - - /** - * A receiver type. - */ - public final RiResolvedType context; - - /** - * The unique implementation of {@link #method} for {@link #context}. - */ - public final RiResolvedMethod impl; - - public ConcreteMethod(RiResolvedMethod method, RiResolvedType context, RiResolvedMethod impl) { - this.method = method; - this.context = context; - this.impl = impl; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + method.hashCode(); - result = prime * result + context.hashCode(); - result = prime * result + impl.hashCode(); - return result; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof ConcreteMethod) { - ConcreteMethod other = (ConcreteMethod) obj; - return other.method == method && other.context == context && other.impl == impl; - } - return false; - } - } - - /** - * An assumption that specified that a method was used during the compilation. - */ - public static final class MethodContents extends Assumption { - - private static final long serialVersionUID = -4821594103928571659L; - - public final RiResolvedMethod method; - - public MethodContents(RiResolvedMethod method) { - this.method = method; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + method.hashCode(); - return result; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof ConcreteMethod) { - ConcreteMethod other = (ConcreteMethod) obj; - return other.method == method; - } - return false; - } - } - - /** - * Array with the assumptions. This field is directly accessed from C++ code in the Graal/HotSpot implementation. - */ - private Assumption[] list; - - private int count; - - /** - * Returns whether any assumptions have been registered. - * @return {@code true} if at least one assumption has been registered, {@code false} otherwise. - */ - public boolean isEmpty() { - return count == 0; - } - - @Override - public Iterator<Assumption> iterator() { - return new Iterator<CiAssumptions.Assumption>() { - int index; - public void remove() { - throw new UnsupportedOperationException(); - } - public Assumption next() { - if (index >= count) { - throw new NoSuchElementException(); - } - return list[index++]; - } - public boolean hasNext() { - return index < count; - } - }; - } - - /** - * Records an assumption that the specified type has no finalizable subclasses. - * - * @param receiverType the type that is assumed to have no finalizable subclasses - * @return {@code true} if the assumption was recorded and can be assumed; {@code false} otherwise - */ - @SuppressWarnings("static-method") - public boolean recordNoFinalizableSubclassAssumption(RiResolvedType receiverType) { - // TODO (thomaswue): Record that assumption correctly. - return false; - } - - /** - * Records that {@code subtype} is the only concrete subtype in the class hierarchy below {@code context}. - * @param context the root of the subtree of the class hierarchy that this assumptions is about - * @param subtype the one concrete subtype - */ - public void recordConcreteSubtype(RiResolvedType context, RiResolvedType subtype) { - record(new ConcreteSubtype(context, subtype)); - } - - /** - * Records that {@code impl} is the only possible concrete target for a virtual call to - * {@code method} with a receiver of type {@code context}. - * - * @param method a method that is the target of a virtual call - * @param context the receiver type of a call to {@code method} - * @param impl the concrete method that is the only possible target for the virtual call - */ - public void recordConcreteMethod(RiResolvedMethod method, RiResolvedType context, RiResolvedMethod impl) { - record(new ConcreteMethod(method, context, impl)); - } - - /** - * Records that {@code method} was used during the compilation. - * - * @param method a method whose contents were used - */ - public void recordMethodContents(RiResolvedMethod method) { - record(new MethodContents(method)); - } - - private void record(Assumption assumption) { - if (list == null) { - list = new Assumption[4]; - } else { - for (int i = 0; i < count; ++i) { - if (assumption.equals(list[i])) { - return; - } - } - } - if (list.length == count) { - Assumption[] newList = new Assumption[list.length * 2]; - for (int i = 0; i < list.length; ++i) { - newList[i] = list[i]; - } - list = newList; - } - list[count] = assumption; - count++; - } - -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiBailout.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ci; - -import java.util.*; - -/** - * {@code CiBailout} is thrown when the compiler refuses to compile a method because of problems with the method. - * e.g. bytecode wouldn't verify, too big, JSR/ret too complicated, etc. This exception is <i>not</i> - * meant to indicate problems with the compiler itself. - */ -public class CiBailout extends RuntimeException { - - public static final long serialVersionUID = 8974598793458772L; - - /** - * Create a new {@code CiBailout}. - * @param reason a message indicating the reason - */ - public CiBailout(String reason) { - super(reason); - } - - /** - * Create a new {@code CiBailout}. - * @param reason a message indicating the reason with a String.format - syntax - * @param args parameters to the formatter - */ - public CiBailout(String format, Object... args) { - this(String.format(Locale.ENGLISH, format, args)); - } - - /** - * Create a new {@code CiBailout} t due to an internal exception being thrown. - * @param reason a message indicating the reason - * @param cause the throwable that was the cause of the bailout - */ - public CiBailout(String reason, Throwable cause) { - super(reason); - initCause(cause); - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiBitMap.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,682 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ci; - -import java.io.*; -import java.util.*; - -/** - * Implements a bitmap that stores a single bit for a range of integers (0-n). - */ -public final class CiBitMap implements Serializable { - - private static final long serialVersionUID = 2471441272241401105L; - private static final int ADDRESS_BITS_PER_WORD = 6; - private static final int BITS_PER_WORD = 1 << ADDRESS_BITS_PER_WORD; - private static final int BIT_INDEX_MASK = BITS_PER_WORD - 1; - - public static final int DEFAULT_LENGTH = BITS_PER_WORD; - - public static int roundUpLength(int length) { - return ((length + (BITS_PER_WORD - 1)) >> ADDRESS_BITS_PER_WORD) << ADDRESS_BITS_PER_WORD; - } - - private int size; - private long low; - private long[] extra; - - /** - * Constructs a new bit map with the {@linkplain #DEFAULT_LENGTH default length}. - */ - public CiBitMap() { - this(DEFAULT_LENGTH); - } - - /** - * Constructs a new bit map from a byte array encoded bit map. - * - * @param bitmap the bit map to convert - */ - public CiBitMap(byte[] bitmap) { - this(bitmap, 0, bitmap.length); - } - - /** - * Constructs a copy of the given bit map. - * - * @param bitmap the bit map to copy. - */ - public CiBitMap(CiBitMap bitmap) { - this.size = bitmap.size; - this.low = bitmap.low; - if (bitmap.extra != null) { - this.extra = Arrays.copyOf(bitmap.extra, bitmap.extra.length); - } - } - - /** - * Constructs a new bit map from a byte array encoded bit map. - * - * @param arr the byte array containing the bit map to convert - * @param off the byte index in {@code arr} at which the bit map starts - * @param numberOfBytes the number of bytes worth of bits to copy from {@code arr} - */ - public CiBitMap(byte[] arr, int off, int numberOfBytes) { - this(numberOfBytes * 8); - int byteIndex = off; - int end = off + numberOfBytes; - assert end <= arr.length; - while (byteIndex < end && (byteIndex - off) < 8) { - long bite = (long) arr[byteIndex] & 0xff; - low |= bite << ((byteIndex - off) * 8); - byteIndex++; - } - if (byteIndex < end) { - assert (byteIndex - off) == 8; - int remBytes = end - byteIndex; - int remWords = (remBytes + 7) / 8; - for (int word = 0; word < remWords; word++) { - long w = 0L; - for (int i = 0; i < 8 && byteIndex < end; i++) { - long bite = (long) arr[byteIndex] & 0xff; - w |= bite << (i * 8); - byteIndex++; - } - extra[word] = w; - } - } - } - - /** - * Converts a {@code long} to a {@link CiBitMap}. - */ - public static CiBitMap fromLong(long bitmap) { - CiBitMap bm = new CiBitMap(64); - bm.low = bitmap; - return bm; - } - - /** - * Constructs a new bit map with the specified length. - * - * @param length the length of the bitmap - */ - public CiBitMap(int length) { - assert length >= 0; - this.size = length; - if (length > BITS_PER_WORD) { - extra = new long[length >> ADDRESS_BITS_PER_WORD]; - } - } - - /** - * Sets the bit at the specified index. - * - * @param i the index of the bit to set - */ - public void set(int i) { - if (checkIndex(i) < BITS_PER_WORD) { - low |= 1L << i; - } else { - int pos = wordIndex(i); - int index = bitInWord(i); - extra[pos] |= 1L << index; - } - } - - /** - * Grows this bitmap to a new size, appending necessary zero bits. - * - * @param newLength the new length of the bitmap - */ - public void grow(int newLength) { - if (newLength > size) { - // grow this bitmap to the new length - int newSize = newLength >> ADDRESS_BITS_PER_WORD; - if (newLength > 0) { - if (extra == null) { - // extra just needs to be allocated now - extra = new long[newSize]; - } else { - if (extra.length < newSize) { - // extra needs to be copied - long[] newExtra = new long[newSize]; - for (int i = 0; i < extra.length; i++) { - newExtra[i] = extra[i]; - } - extra = newExtra; - } else { - // nothing to do, extra is already the right size - } - } - } - size = newLength; - } - } - - private static int bitInWord(int i) { - return i & BIT_INDEX_MASK; - } - - private static int wordIndex(int i) { - return (i >> ADDRESS_BITS_PER_WORD) - 1; - } - - /** - * Clears the bit at the specified index. - * @param i the index of the bit to clear - */ - public void clear(int i) { - if (checkIndex(i) < BITS_PER_WORD) { - low &= ~(1L << i); - } else { - int pos = wordIndex(i); - int index = bitInWord(i); - extra[pos] &= ~(1L << index); - } - } - - /** - * Sets all the bits in this bitmap. - */ - public void setAll() { - low = -1; - if (extra != null) { - for (int i = 0; i < extra.length; i++) { - extra[i] = -1; - } - } - } - - /** - * Clears all the bits in this bitmap. - */ - public void clearAll() { - low = 0; - if (extra != null) { - for (int i = 0; i < extra.length; i++) { - extra[i] = 0; - } - } - } - - /** - * Gets the value of the bit at the specified index. - * - * @param i the index of the bit to get - * @return {@code true} if the bit at the specified position is {@code 1} - */ - public boolean get(int i) { - if (checkIndex(i) < BITS_PER_WORD) { - return ((low >> i) & 1) != 0; - } - int pos = wordIndex(i); - int index = bitInWord(i); - long bits = extra[pos]; - return ((bits >> index) & 1) != 0; - } - - /** - * Gets the value of the bit at the specified index, returning {@code false} if the - * bitmap does not cover the specified index. - * - * @param i the index of the bit to get - * @return {@code true} if the bit at the specified position is {@code 1} - */ - public boolean getDefault(int i) { - if (i < 0 || i >= size) { - return false; - } - if (i < BITS_PER_WORD) { - return ((low >> i) & 1) != 0; - } - int pos = wordIndex(i); - int index = bitInWord(i); - long bits = extra[pos]; - return ((bits >> index) & 1) != 0; - } - - /** - * Performs the union operation on this bitmap with the specified bitmap. That is, all bits set in either of the two - * bitmaps will be set in this bitmap following this operation. - * - * @param other the other bitmap for the union operation - */ - public void setUnion(CiBitMap other) { - low |= other.low; - if (extra != null && other.extra != null) { - for (int i = 0; i < extra.length && i < other.extra.length; i++) { - extra[i] |= other.extra[i]; - } - } - } - - /** - * Performs the union operation on this bitmap with the specified bitmap. That is, a bit is set in this - * bitmap if and only if it is set in both this bitmap and the specified bitmap. - * - * @param other the other bitmap for this operation - * @return {@code true} if any bits were cleared as a result of this operation - */ - public boolean setIntersect(CiBitMap other) { - boolean same = true; - long intx = low & other.low; - if (low != intx) { - same = false; - low = intx; - } - long[] oxtra = other.extra; - if (extra != null && oxtra != null) { - for (int i = 0; i < extra.length; i++) { - long a = extra[i]; - if (i < oxtra.length) { - // zero bits out of this map - long ax = a & oxtra[i]; - if (a != ax) { - same = false; - extra[i] = ax; - } - } else { - // this bitmap is larger than the specified bitmap; zero remaining bits - if (a != 0) { - same = false; - extra[i] = 0; - } - } - } - } - return !same; - } - - /** - * Gets the number of addressable bits in this bitmap. - * - * @return the size of this bitmap - */ - public int size() { - return size; - } - - private int checkIndex(int i) { - if (i < 0 || i >= size) { - throw new IndexOutOfBoundsException(); - } - return i; - } - - public void setFrom(CiBitMap other) { - assert this.size == other.size : "must have same size"; - - low = other.low; - if (extra != null) { - for (int i = 0; i < extra.length; i++) { - extra[i] = other.extra[i]; - } - } - } - - public void setDifference(CiBitMap other) { - assert this.size == other.size : "must have same size"; - - low &= ~other.low; - if (extra != null) { - for (int i = 0; i < extra.length; i++) { - extra[i] &= ~other.extra[i]; - } - } - } - - public boolean isSame(CiBitMap other) { - if (this.size != other.size || this.low != other.low) { - return false; - } - - if (extra != null) { - for (int i = 0; i < extra.length; i++) { - if (extra[i] != other.extra[i]) { - return false; - } - } - } - - return true; - } - - /** - * Returns the index of the first set bit that occurs on or after a specified start index. - * If no such bit exists then -1 is returned. - * <p> - * To iterate over the set bits in a {@code BitMap}, use the following loop: - * - * <pre> - * for (int i = bitMap.nextSetBit(0); i >= 0; i = bitMap.nextSetBit(i + 1)) { - * // operate on index i here - * } - * </pre> - * - * @param fromIndex the index to start checking from (inclusive) - * @return the index of the lowest set bit between {@code [fromIndex .. size())} or -1 if there is no set bit in this range - * @throws IndexOutOfBoundsException if the specified index is negative. - */ - public int nextSetBit(int fromIndex) { - return nextSetBit(fromIndex, size()); - } - - /** - * Returns the index of the first set bit that occurs on or after a specified start index - * and before a specified end index. If no such bit exists then -1 is returned. - * <p> - * To iterate over the set bits in a {@code BitMap}, use the following loop: - * - * <pre> - * for (int i = bitMap.nextSetBit(0, bitMap.size()); i >= 0; i = bitMap.nextSetBit(i + 1, bitMap.size())) { - * // operate on index i here - * } - * </pre> - * - * @param fromIndex the index to start checking from (inclusive) - * @param toIndex the index at which to stop checking (exclusive) - * @return the index of the lowest set bit between {@code [fromIndex .. toIndex)} or -1 if there is no set bit in this range - * @throws IndexOutOfBoundsException if the specified index is negative. - */ - public int nextSetBit(int fromIndex, int toIndex) { - assert fromIndex <= size() : "index out of bounds"; - assert toIndex <= size() : "index out of bounds"; - assert fromIndex <= toIndex : "fromIndex > toIndex"; - - if (fromIndex == toIndex) { - return -1; - } - int fromWordIndex = wordIndex(fromIndex); - int toWordIndex = wordIndex(toIndex - 1) + 1; - int resultIndex = fromIndex; - - // check bits including and to the left_ of offset's position - int pos = bitInWord(resultIndex); - long res = map(fromWordIndex) >> pos; - if (res != 0) { - resultIndex += Long.numberOfTrailingZeros(res); - assert resultIndex >= fromIndex && resultIndex < toIndex : "just checking"; - if (resultIndex < toIndex) { - return resultIndex; - } - return -1; - } - // skip over all word length 0-bit runs - for (fromWordIndex++; fromWordIndex < toWordIndex; fromWordIndex++) { - res = map(fromWordIndex); - if (res != 0) { - // found a 1, return the offset - resultIndex = bitIndex(fromWordIndex) + Long.numberOfTrailingZeros(res); - assert resultIndex >= fromIndex : "just checking"; - if (resultIndex < toIndex) { - return resultIndex; - } - return -1; - } - } - return -1; - } - - private static int bitIndex(int index) { - return (index + 1) << ADDRESS_BITS_PER_WORD; - } - - private long map(int index) { - if (index == -1) { - return low; - } - return extra[index]; - } - - private static boolean allZeros(int start, long[] arr) { - for (int i = start; i < arr.length; i++) { - if (arr[i] != 0) { - return false; - } - } - return true; - } - - /** - * Compares this object against the specified object. - * The result is {@code true} if and only if {@code obj} is - * not {@code null} and is a {@code CiBitMap} object that has - * exactly the same set of bits set to {@code true} as this bit - * set. - * - * @param obj the object to compare with. - */ - @Override - public boolean equals(Object obj) { - if (obj instanceof CiBitMap) { - CiBitMap bm = (CiBitMap) obj; - if (bm.low == low) { - if (bm.extra == null) { - if (extra == null) { - // Common case - return true; - } - return allZeros(0, extra); - } - if (extra == null) { - return allZeros(0, bm.extra); - } - // both 'extra' array non null: - int i = 0; - int length = Math.min(extra.length, bm.extra.length); - while (i < length) { - if (extra[i] != bm.extra[i]) { - return false; - } - i++; - } - if (extra.length > bm.extra.length) { - return allZeros(length, extra); - } - if (extra.length < bm.extra.length) { - return allZeros(length, bm.extra); - } - return true; - } - } - return false; - } - - @Override - public int hashCode() { - return (int) low ^ size; - } - - /** - * Returns a string representation of this bit map - * that is the same as the string returned by {@link BitSet#toString()} - * for a bit set with the same bits set as this bit map. - */ - @Override - public String toString() { - StringBuilder sb = new StringBuilder(size * 2); - sb.append('{'); - - int bit = nextSetBit(0); - if (bit != -1) { - sb.append(bit); - for (bit = nextSetBit(bit + 1); bit >= 0; bit = nextSetBit(bit + 1)) { - sb.append(", ").append(bit); - } - } - - sb.append('}'); - return sb.toString(); - } - - public static int highestOneBitIndex(long value) { - int bit = Long.numberOfTrailingZeros(Long.highestOneBit(value)); - if (bit == 64) { - return -1; - } - return bit; - } - - /** - * Returns the number of bits set to {@code true} in this bit map. - */ - public int cardinality() { - int sum = Long.bitCount(low); - if (extra != null) { - for (long word : extra) { - sum += Long.bitCount(word); - } - } - return sum; - } - - /** - * Returns the "logical size" of this bit map: the index of - * the highest set bit in the bit map plus one. Returns zero - * if the bit map contains no set bits. - * - * @return the logical size of this bit map - */ - public int length() { - if (extra != null) { - for (int i = extra.length - 1; i >= 0; i--) { - if (extra[i] != 0) { - return (highestOneBitIndex(extra[i]) + ((i + 1) * 64)) + 1; - } - } - } - return highestOneBitIndex(low) + 1; - } - - /** - * Returns a string representation of this bit map with every set bit represented as {@code '1'} - * and every unset bit represented as {@code '0'}. The first character in the returned string represents - * bit 0 in this bit map. - * - * @param length the number of bits represented in the returned string. If {@code length < 0 || length > size()}, - * then the value of {@link #length()} is used. - */ - public String toBinaryString() { - int length = length(); - if (length == 0) { - return ""; - } - StringBuilder sb = new StringBuilder(length); - for (int i = 0; i < length; ++i) { - sb.append(get(i) ? '1' : '0'); - } - return sb.toString(); - } - - static final char[] hexDigits = { - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' - }; - - /** - * Returns a string representation of this bit map in hex. - */ - public String toHexString() { - if (size == 0) { - return ""; - } - int hexSize = CiUtil.align(this.size, 4); - StringBuilder sb = new StringBuilder(hexSize / 4); - for (int i = 0; i < hexSize; i += 4) { - int nibble = get(i) ? 1 : 0; - if (get(i + 1)) { - nibble |= 2; - } - if (get(i + 2)) { - nibble |= 4; - } - if (get(i + 3)) { - nibble |= 8; - } - - sb.append(hexDigits[nibble]); - } - return sb.toString(); - } - - public CiBitMap copy() { - CiBitMap n = new CiBitMap(BITS_PER_WORD); - n.low = low; - if (extra != null) { - n.extra = Arrays.copyOf(extra, extra.length); - } - n.size = size; - return n; - } - - /** - * Copies this bit map into a given byte array. - * - * @param arr the destination - * @param off the byte index in {@code arr} at which to start writing - * @param numberOfBytes the number of bytes worth of bits to copy from this bit map. - * The number of bits copied is {@code numberOfBytes * 8}. If {@code numberOfBytes} - * is -1, then {@code ((size() + 7) / 8)} is used instead. - * @return the number of bytes written to {@code arr} - */ - public int copyTo(byte[] arr, int off, int numberOfBytes) { - for (int i = 0; i < numberOfBytes; ++i) { - long word = low; - int byteInWord; - if (i >= 8) { - int wordIndex = (i - 8) / 8; - word = extra[wordIndex]; - byteInWord = i & 0x7; - } else { - byteInWord = i; - } - assert byteInWord < 8; - byte b = (byte) (word >> (byteInWord * 8)); - arr[off + i] = b; - } - return numberOfBytes; - } - - /** - * Converts this bit map to a byte array. The length of the returned - * byte array is {@code ((size() + 7) / 8)}. - */ - public byte[] toByteArray() { - byte[] arr = new byte[(size + 7) / 8]; - copyTo(arr, 0, arr.length); - return arr; - } - - /** - * Converts this bit map to a long. - * - * @throws IllegalArgumentException if {@code (size() > 64)} - */ - public long toLong() { - if (size > 64) { - throw new IllegalArgumentException("bit map of size " + size + " cannot be converted to long"); - } - return low; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiCalleeSaveLayout.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,178 +0,0 @@ -/* - * Copyright (c) 2010, 2011, 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.max.cri.ci; - -import java.util.*; - - -/** - * The callee save area (CSA) is a contiguous space in a stack frame - * used to save (and restore) the values of the caller's registers. - * This class describes the layout of a CSA in terms of its - * {@linkplain #size size}, {@linkplain #slotSize slot size} and - * the {@linkplain #registers callee save registers} covered by the CSA. - */ -public class CiCalleeSaveLayout { - - /** - * The size (in bytes) of the CSA. - */ - public final int size; - - /** - * The size (in bytes) of an {@linkplain #registerAtIndex(int) indexable} slot in the CSA. - */ - public final int slotSize; - - /** - * Map from {@linkplain CiRegister#number register numbers} to slot indexes in the CSA. - */ - private final int[] regNumToIndex; - - private final CiRegister[] indexToReg; - - /** - * The list of registers {@linkplain #contains(CiRegister) contained} by this CSA. - */ - public final CiRegister[] registers; - - /** - * The offset from the frame pointer to the CSA. If this is not known, then this field - * will have the value {@link Integer#MAX_VALUE}. - */ - public final int frameOffsetToCSA; - - /** - * Creates a CSA layout. - * - * @param size size (in bytes) of the CSA. If this is {@code -1}, then the CSA size will be computed from {@code registers}. - * @param slotSize the size (in bytes) of an {@linkplain #registerAtIndex(int) indexable} slot in the CSA - * @param registers the registers that can be saved in the CSA - */ - public CiCalleeSaveLayout(int frameOffsetToCSA, int size, int slotSize, CiRegister... registers) { - this.frameOffsetToCSA = frameOffsetToCSA; - assert slotSize == 0 || CiUtil.isPowerOf2(slotSize); - this.slotSize = slotSize; - int maxRegNum = -1; - int maxOffset = 0; - this.registers = registers; - int offset = 0; - for (CiRegister reg : registers) { - assert offset % slotSize == 0; - assert reg.number >= 0; - if (reg.number > maxRegNum) { - maxRegNum = reg.number; - } - if (offset > maxOffset) { - maxOffset = offset; - } - offset += reg.spillSlotSize; - } - if (size == -1) { - this.size = offset; - } else { - assert offset <= size; - this.size = size; - } - - this.regNumToIndex = new int[maxRegNum + 1]; - this.indexToReg = offset == 0 ? new CiRegister[0] : new CiRegister[offset / slotSize]; - Arrays.fill(regNumToIndex, -1); - offset = 0; - for (CiRegister reg : registers) { - int index = offset / slotSize; - regNumToIndex[reg.number] = index; - indexToReg[index] = reg; - offset += reg.spillSlotSize; - } - } - - /** - * Gets the offset of a given register in the CSA. - * - * @return the offset (in bytes) of {@code reg} in the CSA - * @throws IllegalArgumentException if {@code reg} does not have a slot in the CSA - */ - public int offsetOf(int reg) { - return indexOf(reg) * slotSize; - } - - /** - * Gets the index of a given register in the CSA. - * - * @return the index of {@code reg} in the CSA - * @throws IllegalArgumentException if {@code reg} does not have a slot in the CSA - */ - public int indexOf(int reg) { - if (!contains(reg)) { - throw new IllegalArgumentException(String.valueOf(reg)); - } - return regNumToIndex[reg]; - } - - /** - * Gets the offset of a given register in the CSA. - * - * @return the offset (in bytes) of {@code reg} in the CSA - * @throws IllegalArgumentException if {@code reg} does not have a slot in the CSA - */ - public int offsetOf(CiRegister reg) { - return offsetOf(reg.number); - } - - /** - * Determines if the CSA includes a slot for a given register. - * - * @param reg the register to test - * @return true if the CSA contains a slot for {@code reg} - */ - public boolean contains(int reg) { - return reg >= 0 && reg < regNumToIndex.length && regNumToIndex[reg] != -1; - } - - /** - * Gets the register whose slot in the CSA is at a given index. - * - * @param index an index of a slot in the CSA - * @return the register whose slot in the CSA is at {@code index} or {@code null} if {@code index} does not denote a - * slot in the CSA aligned with a register - */ - public CiRegister registerAt(int index) { - if (index < 0 || index >= indexToReg.length) { - return null; - } - return indexToReg[index]; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder("["); - for (CiRegister reg : registers) { - if (sb.length() != 1) { - sb.append(", "); - } - sb.append(reg).append("{+").append(offsetOf(reg)).append('}'); - } - return sb.append("] size=").append(size).toString(); - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiCallingConvention.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2009, 2012, 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.max.cri.ci; - -import static com.oracle.max.cri.ci.CiValueUtil.*; - -import com.oracle.max.cri.ri.*; - - -/** - * A calling convention describes the locations in which the arguments for a call are placed. - */ -public class CiCallingConvention { - - /** - * Constants denoting the type of a call for which a calling convention is - * {@linkplain RiRegisterConfig#getCallingConvention(Type, CiKind[], CiTarget, boolean) requested}. - */ - public enum Type { - /** - * A request for the outgoing argument locations at a call site to Java code. - */ - JavaCall(true), - - /** - * A request for the incoming argument locations. - */ - JavaCallee(false), - - /** - * A request for the outgoing argument locations at a call site to the runtime (which may be Java or native code). - */ - RuntimeCall(true), - - /** - * A request for the outgoing argument locations at a call site to - * external native code that complies with the platform ABI. - */ - NativeCall(true); - - /** - * Determines if this is a request for the outgoing argument locations at a call site. - */ - public final boolean out; - - public static final Type[] VALUES = values(); - - private Type(boolean out) { - this.out = out; - } - } - - /** - * The amount of stack space (in bytes) required for the stack-based arguments of the call. - */ - public final int stackSize; - - /** - * The locations in which the arguments are placed. This array ordered by argument index. - */ - public final CiValue[] locations; - - public CiCallingConvention(CiValue[] locations, int stackSize) { - this.locations = locations; - this.stackSize = stackSize; - assert verify(); - } - - @Override - public String toString() { - StringBuilder result = new StringBuilder(); - result.append("CallingConvention["); - for (CiValue op : locations) { - result.append(op.toString()).append(" "); - } - result.append("]"); - return result.toString(); - } - - private boolean verify() { - for (int i = 0; i < locations.length; i++) { - CiValue location = locations[i]; - assert isStackSlot(location) || isRegister(location); - } - return true; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiCodePos.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ci; - -import java.io.*; - -import com.oracle.max.cri.ri.*; - -/** - * Represents a code position, that is, a chain of inlined methods with bytecode - * locations, that is communicated from the compiler to the runtime system. A code position - * can be used by the runtime system to reconstruct a source-level stack trace - * for exceptions and to create {@linkplain CiFrame frames} for deoptimization. - */ -public abstract class CiCodePos implements Serializable { - - private static final long serialVersionUID = 8633885274526033515L; - - /** - * The position where this position has been called, {@code null} if none. - */ - public final CiCodePos caller; - - /** - * The runtime interface method for this position. - */ - public final RiResolvedMethod method; - - /** - * The location within the method, as a bytecode index. The constant - * {@code -1} may be used to indicate the location is unknown, for example - * within code synthesized by the compiler. - */ - public final int bci; - - /** - * Constructs a new object representing a given parent/caller, a given method, and a given BCI. - * - * @param caller the parent position - * @param method the method - * @param bci a BCI within the method - */ - public CiCodePos(CiCodePos caller, RiResolvedMethod method, int bci) { - assert method != null; - this.caller = caller; - this.method = method; - this.bci = bci; - } - - /** - * Converts this code position to a string representation. - * @return a string representation of this code position - */ - @Override - public String toString() { - return CiUtil.append(new StringBuilder(100), this).toString(); - } - - /** - * Deep equality test. - */ - @Override - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - if (obj instanceof CiCodePos) { - CiCodePos other = (CiCodePos) obj; - if (other.method.equals(method) && other.bci == bci) { - if (caller == null) { - return other.caller == null; - } - return caller.equals(other.caller); - } - } - return false; - } - - @Override - public int hashCode() { - return bci; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiCompilationStatistics.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,211 +0,0 @@ -/* - * Copyright (c) 2012, 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.max.cri.ci; - -import java.io.*; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; - -import com.oracle.max.cri.ri.*; - -@SuppressWarnings("unused") -public final class CiCompilationStatistics { - - private static final long RESOLUTION = 100000000; - private static final boolean TIMELINE_ENABLED = System.getProperty("stats.timeline.file") != null; - private static final boolean COMPILATIONSTATS_ENABLED = System.getProperty("stats.compilations.file") != null; - private static final boolean ENABLED = TIMELINE_ENABLED || COMPILATIONSTATS_ENABLED; - - private static final CiCompilationStatistics DUMMY = new CiCompilationStatistics(null); - - private static ConcurrentLinkedDeque<CiCompilationStatistics> list = new ConcurrentLinkedDeque<>(); - - private static final ThreadLocal<Deque<CiCompilationStatistics>> current = new ThreadLocal<Deque<CiCompilationStatistics>>() { - - @Override - protected Deque<CiCompilationStatistics> initialValue() { - return new ArrayDeque<>(); - } - }; - - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.FIELD) - private static @interface AbsoluteTimeValue { - } - - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.FIELD) - private static @interface TimeValue { - } - - private static long zeroTime = System.nanoTime(); - - private final String holder; - private final String name; - private final String signature; - @AbsoluteTimeValue - private final long startTime; - @TimeValue - private long duration; - private int startInvCount; - private int endInvCount; - private int bytecodeCount; - private int codeSize; - private int deoptCount; - - private CiCompilationStatistics(RiResolvedMethod method) { - if (method != null) { - holder = CiUtil.format("%H", method); - name = method.name(); - signature = CiUtil.format("%p", method); - startTime = System.nanoTime(); - startInvCount = method.invocationCount(); - bytecodeCount = method.codeSize(); - } else { - holder = ""; - name = ""; - signature = ""; - startTime = 0; - } - } - - public void finish(RiResolvedMethod method) { - if (ENABLED) { - duration = System.nanoTime() - startTime; - endInvCount = method.invocationCount(); - codeSize = method.compiledCodeSize(); - if (current.get().getLast() != this) { - throw new RuntimeException("mismatch in finish()"); - } - current.get().removeLast(); - } - } - - public static CiCompilationStatistics current() { - return current.get().isEmpty() ? null : current.get().getLast(); - } - - public static CiCompilationStatistics create(RiResolvedMethod method) { - if (ENABLED) { - CiCompilationStatistics stats = new CiCompilationStatistics(method); - list.add(stats); - current.get().addLast(stats); - return stats; - } else { - return DUMMY; - } - } - - @SuppressWarnings("deprecation") - public static void clear(String dumpName) { - if (!ENABLED) { - return; - } - try { - ConcurrentLinkedDeque<CiCompilationStatistics> snapshot = list; - long snapshotZeroTime = zeroTime; - - list = new ConcurrentLinkedDeque<>(); - zeroTime = System.nanoTime(); - - Date now = new Date(); - String dateString = (now.getYear() + 1900) + "_" + (now.getMonth() + 1) + "_" + now.getDate() + " " + now.getHours() + "_" + now.getMinutes() + "_" + now.getSeconds(); - try (PrintStream out = new PrintStream("compilations " + dateString + " " + dumpName + ".csv")) { - // output the list of all compilations - - Field[] declaredFields = CiCompilationStatistics.class.getDeclaredFields(); - ArrayList<Field> fields = new ArrayList<>(); - for (Field field : declaredFields) { - if (!Modifier.isStatic(field.getModifiers())) { - fields.add(field); - } - } - for (Field field : fields) { - out.print(field.getName() + ";"); - } - out.println(); - for (CiCompilationStatistics stats : snapshot) { - for (Field field : fields) { - if (field.isAnnotationPresent(AbsoluteTimeValue.class)) { - double value = (field.getLong(stats) - snapshotZeroTime) / 1000000d; - out.print(String.format(Locale.ENGLISH, "%.3f", value) + ";"); - } else if (field.isAnnotationPresent(TimeValue.class)) { - double value = field.getLong(stats) / 1000000d; - out.print(String.format(Locale.ENGLISH, "%.3f", value) + ";"); - } else { - out.print(field.get(stats) + ";"); - } - } - out.println(); - } - } - - String timelineFile = System.getProperty("stats.timeline.file"); - if (timelineFile == null || timelineFile.isEmpty()) { - timelineFile = "timeline " + dateString; - } - try (FileOutputStream fos = new FileOutputStream(timelineFile + " " + dumpName + ".csv", true); PrintStream out = new PrintStream(fos)) { - - long[] timeSpent = new long[10000]; - int maxTick = 0; - for (CiCompilationStatistics stats : snapshot) { - long start = stats.startTime - snapshotZeroTime; - long duration = stats.duration; - if (start < 0) { - duration -= -start; - start = 0; - } - - int tick = (int) (start / RESOLUTION); - long timeLeft = RESOLUTION - (start % RESOLUTION); - - while (tick < timeSpent.length && duration > 0) { - if (tick > maxTick) { - maxTick = tick; - } - timeSpent[tick] += Math.min(timeLeft, duration); - duration -= timeLeft; - tick++; - timeLeft = RESOLUTION; - } - } - String timelineName = System.getProperty("stats.timeline.name"); - if (timelineName != null && !timelineName.isEmpty()) { - out.print(timelineName + ";"); - } - for (int i = 0; i <= maxTick; i++) { - out.print((timeSpent[i] * 100 / RESOLUTION) + ";"); - } - out.println(); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - public void setDeoptCount(int count) { - this.deoptCount = count; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiConstant.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,498 +0,0 @@ -/* - * Copyright (c) 2009, 2012, 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.max.cri.ci; - -/** - * Represents a constant (boxed) value, such as an integer, floating point number, or object reference, - * within the compiler and across the compiler/runtime interface. Exports a set of {@code CiConstant} - * instances that represent frequently used constant values, such as {@link #ZERO}. - */ -public final class CiConstant extends CiValue { - private static final long serialVersionUID = -6355452536852663986L; - - private static final CiConstant[] INT_CONSTANT_CACHE = new CiConstant[100]; - static { - for (int i = 0; i < INT_CONSTANT_CACHE.length; ++i) { - INT_CONSTANT_CACHE[i] = new CiConstant(CiKind.Int, i); - } - } - - public static final CiConstant NULL_OBJECT = new CiConstant(CiKind.Object, null); - public static final CiConstant INT_MINUS_1 = new CiConstant(CiKind.Int, -1); - public static final CiConstant INT_0 = forInt(0); - public static final CiConstant INT_1 = forInt(1); - public static final CiConstant INT_2 = forInt(2); - public static final CiConstant INT_3 = forInt(3); - public static final CiConstant INT_4 = forInt(4); - public static final CiConstant INT_5 = forInt(5); - public static final CiConstant LONG_0 = new CiConstant(CiKind.Long, 0L); - public static final CiConstant LONG_1 = new CiConstant(CiKind.Long, 1L); - public static final CiConstant FLOAT_0 = new CiConstant(CiKind.Float, Float.floatToRawIntBits(0.0F)); - public static final CiConstant FLOAT_1 = new CiConstant(CiKind.Float, Float.floatToRawIntBits(1.0F)); - public static final CiConstant FLOAT_2 = new CiConstant(CiKind.Float, Float.floatToRawIntBits(2.0F)); - public static final CiConstant DOUBLE_0 = new CiConstant(CiKind.Double, Double.doubleToRawLongBits(0.0D)); - public static final CiConstant DOUBLE_1 = new CiConstant(CiKind.Double, Double.doubleToRawLongBits(1.0D)); - public static final CiConstant TRUE = new CiConstant(CiKind.Boolean, 1L); - public static final CiConstant FALSE = new CiConstant(CiKind.Boolean, 0L); - - static { - assert NULL_OBJECT.isDefaultValue(); - assert INT_0.isDefaultValue(); - assert FLOAT_0.isDefaultValue(); - assert DOUBLE_0.isDefaultValue(); - assert FALSE.isDefaultValue(); - - // Ensure difference between 0.0f and -0.0f is preserved - assert FLOAT_0 != forFloat(-0.0F); - assert !forFloat(-0.0F).isDefaultValue(); - - // Ensure difference between 0.0d and -0.0d is preserved - assert DOUBLE_0 != forDouble(-0.0d); - assert !forDouble(-0.0D).isDefaultValue(); - - assert NULL_OBJECT.isNull(); - } - - /** - * The boxed object value. This is ignored iff {@code !kind.isObject()}. - */ - private final Object object; - - /** - * The boxed primitive value as a {@code long}. This is ignored iff {@code kind.isObject()}. - * For {@code float} and {@code double} values, this value is the result of - * {@link Float#floatToRawIntBits(float)} and {@link Double#doubleToRawLongBits(double)} respectively. - */ - private final long primitive; - - /** - * Create a new constant represented by the specified object reference. - * - * @param kind the type of this constant - * @param object the value of this constant - */ - private CiConstant(CiKind kind, Object object) { - super(kind); - this.object = object; - this.primitive = 0L; - } - - /** - * Create a new constant represented by the specified primitive. - * - * @param kind the type of this constant - * @param primitive the value of this constant - */ - public CiConstant(CiKind kind, long primitive) { - super(kind); - this.object = null; - this.primitive = primitive; - } - - /** - * Checks whether this constant is non-null. - * @return {@code true} if this constant is a primitive, or an object constant that is not null - */ - public boolean isNonNull() { - return !kind.isObject() || object != null; - } - - /** - * Checks whether this constant is null. - * @return {@code true} if this constant is the null constant - */ - public boolean isNull() { - return kind.isObject() && object == null; - } - - @Override - public String toString() { - return kind.javaName + "[" + kind.format(boxedValue()) + (kind != CiKind.Object ? "|0x" + Long.toHexString(primitive) : "") + "]"; - } - - /** - * Gets this constant's value as a string. - * - * @return this constant's value as a string - */ - public String valueString() { - if (kind.isPrimitive()) { - return boxedValue().toString(); - } else if (kind.isObject()) { - if (object == null) { - return "null"; - } else if (object instanceof String) { - return "\"" + object + "\""; - } else { - return "<object: " + kind.format(object) + ">"; - } - } else if (kind.isJsr()) { - return "bci:" + boxedValue().toString(); - } else { - return "???"; - } - } - - /** - * Returns the value of this constant as a boxed Java value. - * @return the value of this constant - */ - public Object boxedValue() { - // Checkstyle: stop - switch (kind) { - case Byte: return (byte) asInt(); - case Boolean: return asInt() == 0 ? Boolean.FALSE : Boolean.TRUE; - case Short: return (short) asInt(); - case Char: return (char) asInt(); - case Jsr: return (int) primitive; - case Int: return asInt(); - case Long: return asLong(); - case Float: return asFloat(); - case Double: return asDouble(); - case Object: return object; - } - // Checkstyle: resume - throw new IllegalArgumentException(); - } - - private boolean valueEqual(CiConstant other, boolean ignoreKind) { - // must have equivalent kinds to be equal - if (!ignoreKind && kind != other.kind) { - return false; - } - if (kind.isObject()) { - return object == other.object; - } - return primitive == other.primitive; - } - - /** - * Converts this constant to a primitive int. - * @return the int value of this constant - */ - public int asInt() { - if (kind.stackKind().isInt() || kind.isJsr()) { - return (int) primitive; - } - throw new Error("Constant is not int: " + this); - } - - /** - * Converts this constant to a primitive boolean. - * @return the boolean value of this constant - */ - public boolean asBoolean() { - if (kind == CiKind.Boolean) { - return primitive != 0L; - } - throw new Error("Constant is not boolean: " + this); - } - - /** - * Converts this constant to a primitive long. - * @return the long value of this constant - */ - public long asLong() { - // Checkstyle: stop - switch (kind.stackKind()) { - case Jsr: - case Int: - case Long: return primitive; - case Float: return (long) asFloat(); - case Double: return (long) asDouble(); - default: throw new Error("Constant is not long: " + this); - } - // Checkstyle: resume - } - - /** - * Converts this constant to a primitive float. - * @return the float value of this constant - */ - public float asFloat() { - if (kind.isFloat()) { - return Float.intBitsToFloat((int) primitive); - } - throw new Error("Constant is not float: " + this); - } - - /** - * Converts this constant to a primitive double. - * @return the double value of this constant - */ - public double asDouble() { - if (kind.isFloat()) { - return Float.intBitsToFloat((int) primitive); - } - if (kind.isDouble()) { - return Double.longBitsToDouble(primitive); - } - throw new Error("Constant is not double: " + this); - } - - /** - * Converts this constant to the object reference it represents. - * @return the object which this constant represents - */ - public Object asObject() { - if (kind.isObject()) { - return object; - } - throw new Error("Constant is not object: " + this); - } - - /** - * Converts this constant to the jsr reference it represents. - * @return the object which this constant represents - */ - public int asJsr() { - if (kind.isJsr()) { - return (int) primitive; - } - throw new Error("Constant is not jsr: " + this); - } - - /** - * Unchecked access to a primitive value. - * @return - */ - public long asPrimitive() { - if (kind.isObject()) { - throw new Error("Constant is not primitive: " + this); - } - return primitive; - } - - /** - * Computes the hashcode of this constant. - * @return a suitable hashcode for this constant - */ - @Override - public int hashCode() { - if (kind.isObject()) { - return System.identityHashCode(object); - } - return (int) primitive; - } - - /** - * Checks whether this constant equals another object. This is only - * true if the other object is a constant and has the same value. - * @param o the object to compare equality - * @return {@code true} if this constant is equivalent to the specified object - */ - @Override - public boolean equals(Object o) { - return o == this || o instanceof CiConstant && valueEqual((CiConstant) o, false); - } - - /** - * Checks whether this constant is identical to another constant or has the same value as it. - * @param other the constant to compare for equality against this constant - * @return {@code true} if this constant is equivalent to {@code other} - */ - public boolean equivalent(CiConstant other) { - return other == this || valueEqual(other, false); - } - - /** - * Checks whether this constant is the default value for its type. - * @return {@code true} if the value is the default value for its type; {@code false} otherwise - */ - public boolean isDefaultValue() { - // Checkstyle: stop - switch (kind.stackKind()) { - case Int: return asInt() == 0; - case Long: return asLong() == 0; - case Float: return this == FLOAT_0; - case Double: return this == DOUBLE_0; - case Object: return object == null; - } - // Checkstyle: resume - throw new IllegalArgumentException("Cannot det default CiConstant for kind " + kind); - } - - /** - * Gets the default value for a given kind. - * - * @return the default value for {@code kind}'s {@linkplain CiKind#stackKind() stack kind} - */ - public static CiConstant defaultValue(CiKind kind) { - // Checkstyle: stop - switch (kind.stackKind()) { - case Int: return INT_0; - case Long: return LONG_0; - case Float: return FLOAT_0; - case Double: return DOUBLE_0; - case Object: return NULL_OBJECT; - } - // Checkstyle: resume - throw new IllegalArgumentException("Cannot get default CiConstant for kind " + kind); - } - - /** - * Creates a boxed double constant. - * @param d the double value to box - * @return a boxed copy of {@code value} - */ - public static CiConstant forDouble(double d) { - if (Double.compare(0.0D, d) == 0) { - return DOUBLE_0; - } - if (Double.compare(d, 1.0D) == 0) { - return DOUBLE_1; - } - return new CiConstant(CiKind.Double, Double.doubleToRawLongBits(d)); - } - - /** - * Creates a boxed float constant. - * @param f the float value to box - * @return a boxed copy of {@code value} - */ - public static CiConstant forFloat(float f) { - if (Float.compare(f, 0.0F) == 0) { - return FLOAT_0; - } - if (Float.compare(f, 1.0F) == 0) { - return FLOAT_1; - } - if (Float.compare(f, 2.0F) == 0) { - return FLOAT_2; - } - return new CiConstant(CiKind.Float, Float.floatToRawIntBits(f)); - } - - /** - * Creates a boxed long constant. - * @param i the long value to box - * @return a boxed copy of {@code value} - */ - public static CiConstant forLong(long i) { - return i == 0 ? LONG_0 : i == 1 ? LONG_1 : new CiConstant(CiKind.Long, i); - } - - /** - * Creates a boxed integer constant. - * @param i the integer value to box - * @return a boxed copy of {@code value} - */ - public static CiConstant forInt(int i) { - if (i == -1) { - return INT_MINUS_1; - } - if (i >= 0 && i < INT_CONSTANT_CACHE.length) { - return INT_CONSTANT_CACHE[i]; - } - return new CiConstant(CiKind.Int, i); - } - - /** - * Creates a boxed byte constant. - * @param i the byte value to box - * @return a boxed copy of {@code value} - */ - public static CiConstant forByte(byte i) { - return new CiConstant(CiKind.Byte, i); - } - - /** - * Creates a boxed boolean constant. - * @param i the boolean value to box - * @return a boxed copy of {@code value} - */ - public static CiConstant forBoolean(boolean i) { - return i ? TRUE : FALSE; - } - - /** - * Creates a boxed char constant. - * @param i the char value to box - * @return a boxed copy of {@code value} - */ - public static CiConstant forChar(char i) { - return new CiConstant(CiKind.Char, i); - } - - /** - * Creates a boxed short constant. - * @param i the short value to box - * @return a boxed copy of {@code value} - */ - public static CiConstant forShort(short i) { - return new CiConstant(CiKind.Short, i); - } - - /** - * Creates a boxed address (jsr/ret address) constant. - * @param i the address value to box - * @return a boxed copy of {@code value} - */ - public static CiConstant forJsr(int i) { - return new CiConstant(CiKind.Jsr, i); - } - - /** - * Creates a boxed object constant. - * @param o the object value to box - * @return a boxed copy of {@code value} - */ - public static CiConstant forObject(Object o) { - if (o == null) { - return NULL_OBJECT; - } - return new CiConstant(CiKind.Object, o); - } - - /** - * Creates a boxed constant for the given kind from an Object. - * The object needs to be of the Java boxed type corresponding to the kind. - * @param kind the kind of the constant to create - * @param value the Java boxed value: a Byte instance for CiKind Byte, etc. - * @return the boxed copy of {@code value} - */ - public static CiConstant forBoxed(CiKind kind, Object value) { - switch (kind) { - case Boolean: - return forBoolean((Boolean) value); - case Byte: - return forByte((Byte) value); - case Char: - return forChar((Character) value); - case Short: - return forShort((Short) value); - case Int: - return forInt((Integer) value); - case Long: - return forLong((Long) value); - case Float: - return forFloat((Float) value); - case Double: - return forDouble((Double) value); - case Object: - return forObject(value); - default: - throw new RuntimeException("cannot create CiConstant for boxed " + kind + " value"); - } - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiDebugInfo.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ci; - -import java.io.*; - -/** - * Represents the debugging information for a particular place in the code, - * which includes the code position, a reference map, and deoptimization information. - */ -public class CiDebugInfo implements Serializable { - - private static final long serialVersionUID = -6047206624915812516L; - - /** - * The code position (including all inlined methods) of this debug info. - * If this is a {@link CiFrame} instance, then it is also the deoptimization information for each inlined frame. - */ - public final CiCodePos codePos; - - /** - * The reference map for the registers at this point. The reference map is <i>packed</i> in that - * for bit {@code k} in byte {@code n}, it refers to the register whose - * {@linkplain CiRegister#number number} is {@code (k + n * 8)}. - */ - public final CiBitMap registerRefMap; - - /** - * The reference map for the stack frame at this point. A set bit at {@code k} in the map - * represents stack slot number {@code k}. - */ - public final CiBitMap frameRefMap; - - /** - * Creates a new {@code CiDebugInfo} from the given values. - * - * @param codePos the {@linkplain CiCodePos code position} or {@linkplain CiFrame frame} info - * @param registerRefMap the register map - * @param frameRefMap the reference map for {@code frame}, which may be {@code null} - */ - public CiDebugInfo(CiCodePos codePos, CiBitMap registerRefMap, CiBitMap frameRefMap) { - this.codePos = codePos; - this.registerRefMap = registerRefMap; - this.frameRefMap = frameRefMap; - } - - /** - * @return {@code true} if this debug information has a frame - */ - public boolean hasFrame() { - return codePos instanceof CiFrame; - } - - /** - * @return {@code true} if this debug info has a reference map for the registers - */ - public boolean hasRegisterRefMap() { - return registerRefMap != null && registerRefMap.size() > 0; - } - - /** - * @return {@code true} if this debug info has a reference map for the stack - */ - public boolean hasStackRefMap() { - return frameRefMap != null && frameRefMap.size() > 0; - } - - - /** - * Gets the deoptimization information for each inlined frame (if available). - * - * @return {@code null} if no frame de-opt info is {@linkplain #hasDebugFrame available} - */ - public CiFrame frame() { - if (hasFrame()) { - return (CiFrame) codePos; - } - return null; - } - - @Override - public String toString() { - return CiUtil.append(new StringBuilder(100), this, null).toString(); - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiExceptionHandler.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ci; - -import com.oracle.max.cri.ri.*; - -/** - * An implementation of the {@link RiExceptionHandler} interface. - */ -public class CiExceptionHandler implements RiExceptionHandler { - - public static final CiExceptionHandler[] NONE = {}; - - public final int startBCI; - public final int endBCI; - public final int handlerBCI; - public final int catchTypeCPI; - public final RiType catchType; - - /** - * Creates a new exception handler with the specified ranges. - * @param startBCI the start index of the protected range - * @param endBCI the end index of the protected range - * @param catchBCI the index of the handler - * @param catchTypeCPI the index of the throwable class in the constant pool - * @param catchType the type caught by this exception handler - */ - public CiExceptionHandler(int startBCI, int endBCI, int catchBCI, int catchTypeCPI, RiType catchType) { - this.startBCI = startBCI; - this.endBCI = endBCI; - this.handlerBCI = catchBCI; - this.catchTypeCPI = catchTypeCPI; - this.catchType = catchType; - } - - public int startBCI() { - return startBCI; - } - - public int endBCI() { - return endBCI; - } - - public int handlerBCI() { - return handlerBCI; - } - - public int catchTypeCPI() { - return catchTypeCPI; - } - - public boolean isCatchAll() { - return catchTypeCPI == 0; - } - - public RiType catchType() { - return catchType; - } - - @Override - public String toString() { - return new StringBuilder(20). - append('['). - append(startBCI). - append(" - "). - append(endBCI). - append(") -> "). - append(handlerBCI). - append(" type="). - append(catchType == null ? "*any*" : catchType.name()). - toString(); - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiFrame.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,143 +0,0 @@ -/* - * Copyright (c) 2009, 2012, 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.max.cri.ci; - -import java.io.*; - -import com.oracle.max.cri.ri.*; - -/** - * Represents the Java bytecode frame state(s) at a given position - * including {@link CiValue locations} where to find the local variables, - * operand stack values and locked objects of the bytecode frame(s). - */ -public class CiFrame extends CiCodePos implements Serializable { - private static final long serialVersionUID = -345025397165977565L; - - /** - * An array of values representing how to reconstruct the state of the Java frame. - * This is array is partitioned as follows: - * <p> - * <table border="1" cellpadding="5" frame="void", rules="all"> - * <tr><th>Start index (inclusive)</th><th>End index (exclusive)</th><th>Description</th></tr> - * <tr><td>0</td> <td>numLocals</td> <td>Local variables</td></tr> - * <tr><td>numLocals</td> <td>numLocals + numStack</td><td>Operand stack</td></tr> - * <tr><td>numLocals + numStack</td><td>values.length</td> <td>Locked objects</td></tr> - * </table> - * <p> - * Note that the number of locals and the number of stack slots may be smaller than the - * maximum number of locals and stack slots as specified in the compiled method. - */ - public final CiValue[] values; - - /** - * The number of locals in the values array. - */ - public final int numLocals; - - /** - * The number of stack slots in the values array. - */ - public final int numStack; - - /** - * The number of locks in the values array. - */ - public final int numLocks; - - /** - * In case this frame state belongs to a deoptimization, the leafGraphId will contain the StructuredGraph.graphId() of the graph that originally introduced this deoptimization point. - * This id is later on used by the runtime system to evict graphs from the graph cache when deoptimizations originating from them have been hit. - */ - public final long leafGraphId; - - public final boolean rethrowException; - - public final boolean duringCall; - - /** - * Creates a new frame object. - * - * @param caller the caller frame (which may be {@code null}) - * @param method the method - * @param bci a BCI within the method - * @param rethrowException specifies if the VM should re-throw the pending exception when deopt'ing using this frame - * @param values the frame state {@link #values} - * @param numLocals the number of local variables - * @param numStack the depth of the stack - * @param numLocks the number of locked objects - */ - public CiFrame(CiFrame caller, RiResolvedMethod method, int bci, boolean rethrowException, boolean duringCall, CiValue[] values, int numLocals, int numStack, int numLocks, long leafGraphId) { - super(caller, method, bci); - assert values != null; - this.rethrowException = rethrowException; - this.duringCall = duringCall; - this.values = values; - this.numLocals = numLocals; - this.numStack = numStack; - this.numLocks = numLocks; - this.leafGraphId = leafGraphId; - assert !rethrowException || numStack == 1 : "must have exception on top of the stack"; - } - - /** - * Gets the value representing the specified local variable. - * @param i the local variable index - * @return the value that can be used to reconstruct the local's current value - */ - public CiValue getLocalValue(int i) { - return values[i]; - } - - /** - * Gets the value representing the specified stack slot. - * @param i the stack index - * @return the value that can be used to reconstruct the stack slot's current value - */ - public CiValue getStackValue(int i) { - return values[i + numLocals]; - } - - /** - * Gets the value representing the specified lock. - * @param i the lock index - * @return the value that can be used to reconstruct the lock's current value - */ - public CiValue getLockValue(int i) { - return values[i + numLocals + numStack]; - } - - /** - * Gets the caller of this frame. - * - * @return {@code null} if this frame has no caller - */ - public CiFrame caller() { - return (CiFrame) caller; - } - - @Override - public String toString() { - return CiUtil.append(new StringBuilder(100), this).toString(); - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiGenericCallback.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2011, 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.max.cri.ci; - -/** - * This interface is used for {@link CiRuntimeCall#GenericCallback} runtime calls. - */ -public abstract class CiGenericCallback { - - @SuppressWarnings("unused") - private Object callbackInternal(Object arg) { - try { - return callback(arg); - } catch (Throwable t) { - t.printStackTrace(); - return null; - } - } - - public abstract Object callback(Object arg); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiKind.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,467 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ci; - -import static com.oracle.max.cri.ci.CiKind.Flags.*; - -import java.lang.reflect.*; - -import sun.misc.*; - -import com.oracle.max.cri.ri.*; - -/** - * Denotes the basic kinds of types in CRI, including the all the Java primitive types, - * for example, {@link CiKind#Int} for {@code int} and {@link CiKind#Object} - * for all object types. - * A kind has a single character short name, a Java name, and a set of flags - * further describing its behavior. - */ -public enum CiKind { - Boolean('z', "boolean", FIELD_TYPE | RETURN_TYPE | PRIMITIVE | STACK_INT), - Byte ('b', "byte", FIELD_TYPE | RETURN_TYPE | PRIMITIVE | STACK_INT), - Short ('s', "short", FIELD_TYPE | RETURN_TYPE | PRIMITIVE | STACK_INT), - Char ('c', "char", FIELD_TYPE | RETURN_TYPE | PRIMITIVE | STACK_INT), - Int ('i', "int", FIELD_TYPE | RETURN_TYPE | PRIMITIVE | STACK_INT), - Float ('f', "float", FIELD_TYPE | RETURN_TYPE | PRIMITIVE), - Long ('j', "long", FIELD_TYPE | RETURN_TYPE | PRIMITIVE), - Double ('d', "double", FIELD_TYPE | RETURN_TYPE | PRIMITIVE), - Object ('a', "Object", FIELD_TYPE | RETURN_TYPE), - Void ('v', "void", RETURN_TYPE), - /** Denote a bytecode address in a {@code JSR} bytecode. */ - Jsr ('r', "jsr", 0), - /** The non-type. */ - Illegal('-', "illegal", 0); - - public static final CiKind[] VALUES = values(); - public static final CiKind[] JAVA_VALUES = new CiKind[] {CiKind.Boolean, CiKind.Byte, CiKind.Short, CiKind.Char, CiKind.Int, CiKind.Float, CiKind.Long, CiKind.Double, CiKind.Object}; - - CiKind(char ch, String name, int flags) { - this.typeChar = ch; - this.javaName = name; - this.flags = flags; - } - - static class Flags { - /** - * Can be an object field type. - */ - public static final int FIELD_TYPE = 0x0001; - /** - * Can be result type of a method. - */ - public static final int RETURN_TYPE = 0x0002; - /** - * Behaves as an integer when on Java evaluation stack. - */ - public static final int STACK_INT = 0x0004; - /** - * Represents a Java primitive type. - */ - public static final int PRIMITIVE = 0x0008; - } - - /** - * The flags for this kind. - */ - private final int flags; - - /** - * The name of the kind as a single character. - */ - public final char typeChar; - - /** - * The name of this kind which will also be it Java programming language name if - * it is {@linkplain #isPrimitive() primitive} or {@code void}. - */ - public final String javaName; - - /** - * Checks whether this kind is valid as the type of a field. - * @return {@code true} if this kind is valid as the type of a Java field - */ - public boolean isValidFieldType() { - return (flags & FIELD_TYPE) != 0; - } - - /** - * Checks whether this kind is valid as the return type of a method. - * @return {@code true} if this kind is valid as the return type of a Java method - */ - public boolean isValidReturnType() { - return (flags & RETURN_TYPE) != 0; - } - - /** - * Checks whether this type is valid as an {@code int} on the Java operand stack. - * @return {@code true} if this type is represented by an {@code int} on the operand stack - */ - public boolean isInt() { - return (flags & STACK_INT) != 0; - } - - /** - * Checks whether this type is a Java primitive type. - * @return {@code true} if this is {@link #Boolean}, {@link #Byte}, {@link #Char}, {@link #Short}, - * {@link #Int}, {@link #Long}, {@link #Float} or {@link #Double}. - */ - public boolean isPrimitive() { - return (flags & PRIMITIVE) != 0; - } - - /** - * Gets the kind that represents this kind when on the Java operand stack. - * @return the kind used on the operand stack - */ - public CiKind stackKind() { - if (isInt()) { - return Int; - } - return this; - } - - public static CiKind fromTypeString(String typeString) { - assert typeString.length() > 0; - final char first = typeString.charAt(0); - if (first == '[' || first == 'L') { - return CiKind.Object; - } - return CiKind.fromPrimitiveOrVoidTypeChar(first); - } - - /** - * Gets the kind from the character describing a primitive or void. - * @param ch the character - * @return the kind - */ - public static CiKind fromPrimitiveOrVoidTypeChar(char ch) { - // Checkstyle: stop - switch (ch) { - case 'Z': return Boolean; - case 'C': return Char; - case 'F': return Float; - case 'D': return Double; - case 'B': return Byte; - case 'S': return Short; - case 'I': return Int; - case 'J': return Long; - case 'V': return Void; - } - // Checkstyle: resume - throw new IllegalArgumentException("unknown primitive or void type character: " + ch); - } - - public Class< ? > toJavaClass() { - // Checkstyle: stop - switch(this) { - case Void: return java.lang.Void.TYPE; - case Long: return java.lang.Long.TYPE; - case Int: return java.lang.Integer.TYPE; - case Byte: return java.lang.Byte.TYPE; - case Char: return java.lang.Character.TYPE; - case Double: return java.lang.Double.TYPE; - case Float: return java.lang.Float.TYPE; - case Short: return java.lang.Short.TYPE; - case Boolean: return java.lang.Boolean.TYPE; - default: return null; - } - // Checkstyle: resume - } - - public Class< ? > toBoxedJavaClass() { - // Checkstyle: stop - switch(this) { - case Void: return null; - case Long: return java.lang.Long.class; - case Int: return java.lang.Integer.class; - case Byte: return java.lang.Byte.class; - case Char: return java.lang.Character.class; - case Double: return java.lang.Double.class; - case Float: return java.lang.Float.class; - case Short: return java.lang.Short.class; - case Boolean: return java.lang.Boolean.class; - default: return null; - } - // Checkstyle: resume - } - - /** - * Checks whether this value type is void. - * @return {@code true} if this type is void - */ - public final boolean isVoid() { - return this == CiKind.Void; - } - - /** - * Checks whether this value type is long. - * @return {@code true} if this type is long - */ - public final boolean isLong() { - return this == CiKind.Long; - } - - /** - * Checks whether this value type is float. - * @return {@code true} if this type is float - */ - public final boolean isFloat() { - return this == CiKind.Float; - } - - /** - * Checks whether this value type is double. - * @return {@code true} if this type is double - */ - public final boolean isDouble() { - return this == CiKind.Double; - } - - /** - * Checks whether this value type is float or double. - * @return {@code true} if this type is float or double - */ - public final boolean isFloatOrDouble() { - return this == CiKind.Double || this == CiKind.Float; - } - - /** - * Checks whether this value type is an object type. - * @return {@code true} if this type is an object - */ - public final boolean isObject() { - return this == CiKind.Object; - } - - /** - * Checks whether this value type is an address type. - * @return {@code true} if this type is an address - */ - public boolean isJsr() { - return this == CiKind.Jsr; - } - - /** - * Converts this value type to a string. - */ - @Override - public String toString() { - return javaName; - } - - /** - * Marker interface for types that should be {@linkplain CiKind#format(Object) formatted} - * with their {@link Object#toString()} value. - */ - public interface FormatWithToString {} - - /** - * Gets a formatted string for a given value of this kind. - * - * @param value a value of this kind - * @return a formatted string for {@code value} based on this kind - */ - public String format(Object value) { - if (isObject()) { - if (value == null) { - return "null"; - } else { - if (value instanceof String) { - String s = (String) value; - if (s.length() > 50) { - return "\"" + s.substring(0, 30) + "...\""; - } else { - return " \"" + s + '"'; - } - } else if (value instanceof RiType) { - return "class " + CiUtil.toJavaName((RiType) value); - } else if (value instanceof Enum || value instanceof FormatWithToString) { - return String.valueOf(value); - } else if (value instanceof Class< ? >) { - return ((Class< ? >) value).getName() + ".class"; - } else if (value.getClass().isArray()) { - return formatArray(value); - } else { - return CiUtil.getSimpleName(value.getClass(), true) + "@" + System.identityHashCode(value); - } - } - } else { - return value.toString(); - } - } - - private static final int MAX_FORMAT_ARRAY_LENGTH = Integer.getInteger("maxFormatArrayLength", 5); - - private static String formatArray(Object array) { - Class< ? > componentType = array.getClass().getComponentType(); - assert componentType != null; - int arrayLength = Array.getLength(array); - StringBuilder buf = new StringBuilder(CiUtil.getSimpleName(componentType, true)). - append('['). - append(arrayLength). - append("]{"); - int length = Math.min(MAX_FORMAT_ARRAY_LENGTH, arrayLength); - boolean primitive = componentType.isPrimitive(); - for (int i = 0; i < length; i++) { - if (primitive) { - buf.append(Array.get(array, i)); - } else { - Object o = ((Object[]) array)[i]; - buf.append(CiKind.Object.format(o)); - } - if (i != length - 1) { - buf.append(", "); - } - } - if (arrayLength != length) { - buf.append(", ..."); - } - return buf.append('}').toString(); - } - - public final char signatureChar() { - return Character.toUpperCase(typeChar); - } - - public final int arrayBaseOffset() { - switch(this) { - case Boolean: - return Unsafe.ARRAY_BOOLEAN_BASE_OFFSET; - case Byte: - return Unsafe.ARRAY_BYTE_BASE_OFFSET; - case Char: - return Unsafe.ARRAY_CHAR_BASE_OFFSET; - case Short: - return Unsafe.ARRAY_SHORT_BASE_OFFSET; - case Int: - return Unsafe.ARRAY_INT_BASE_OFFSET; - case Long: - return Unsafe.ARRAY_LONG_BASE_OFFSET; - case Float: - return Unsafe.ARRAY_FLOAT_BASE_OFFSET; - case Double: - return Unsafe.ARRAY_DOUBLE_BASE_OFFSET; - case Object: - return Unsafe.ARRAY_OBJECT_BASE_OFFSET; - default: - assert false : "unexpected kind: " + this; - return -1; - } - } - - public final int arrayIndexScale() { - switch(this) { - case Boolean: - return Unsafe.ARRAY_BOOLEAN_INDEX_SCALE; - case Byte: - return Unsafe.ARRAY_BYTE_INDEX_SCALE; - case Char: - return Unsafe.ARRAY_CHAR_INDEX_SCALE; - case Short: - return Unsafe.ARRAY_SHORT_INDEX_SCALE; - case Int: - return Unsafe.ARRAY_INT_INDEX_SCALE; - case Long: - return Unsafe.ARRAY_LONG_INDEX_SCALE; - case Float: - return Unsafe.ARRAY_FLOAT_INDEX_SCALE; - case Double: - return Unsafe.ARRAY_DOUBLE_INDEX_SCALE; - case Object: - return Unsafe.ARRAY_OBJECT_INDEX_SCALE; - default: - assert false : "unexpected kind: " + this; - return -1; - } - } - - public CiConstant readUnsafeConstant(Object value, long displacement) { - assert value != null; - Unsafe u = Unsafe.getUnsafe(); - switch(this) { - case Boolean: - return CiConstant.forBoolean(u.getBoolean(value, displacement)); - case Byte: - return CiConstant.forByte(u.getByte(value, displacement)); - case Char: - return CiConstant.forChar(u.getChar(value, displacement)); - case Short: - return CiConstant.forShort(u.getShort(value, displacement)); - case Int: - return CiConstant.forInt(u.getInt(value, displacement)); - case Long: - return CiConstant.forLong(u.getLong(value, displacement)); - case Float: - return CiConstant.forFloat(u.getFloat(value, displacement)); - case Double: - return CiConstant.forDouble(u.getDouble(value, displacement)); - case Object: - return CiConstant.forObject(u.getObject(value, displacement)); - default: - assert false : "unexpected kind: " + this; - return null; - } - } - - public long minValue() { - switch (this) { - case Boolean: - return 0; - case Byte: - return java.lang.Byte.MIN_VALUE; - case Char: - return java.lang.Character.MIN_VALUE; - case Short: - return java.lang.Short.MIN_VALUE; - case Jsr: - case Int: - return java.lang.Integer.MIN_VALUE; - case Long: - return java.lang.Long.MIN_VALUE; - default: - throw new IllegalArgumentException("illegal call to minValue on " + this); - } - } - - public long maxValue() { - switch (this) { - case Boolean: - return 1; - case Byte: - return java.lang.Byte.MAX_VALUE; - case Char: - return java.lang.Character.MAX_VALUE; - case Short: - return java.lang.Short.MAX_VALUE; - case Jsr: - case Int: - return java.lang.Integer.MAX_VALUE; - case Long: - return java.lang.Long.MAX_VALUE; - default: - throw new IllegalArgumentException("illegal call to maxValue on " + this); - } - } - -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiMonitorValue.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2011, 2012, 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.max.cri.ci; - -public final class CiMonitorValue extends CiValue { - private static final long serialVersionUID = 8241681800464483691L; - - public CiValue owner; - public final CiValue lockData; - public final boolean eliminated; - - public CiMonitorValue(CiValue owner, CiValue lockData, boolean eliminated) { - super(CiKind.Illegal); - this.owner = owner; - this.lockData = lockData; - this.eliminated = eliminated; - } - - @Override - public String toString() { - return "monitor[" + owner + (lockData != null ? ", " + lockData : "") + (eliminated ? ", eliminated" : "") + "]"; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiRegister.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,254 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ci; - -import java.io.*; -import java.util.*; - -/** - * Represents a target machine register. - */ -public final class CiRegister implements Comparable<CiRegister>, Serializable { - - private static final long serialVersionUID = -7213269157816016300L; - - /** - * Invalid register. - */ - public static final CiRegister None = new CiRegister(-1, -1, 0, "noreg"); - - /** - * Frame pointer of the current method. All spill slots and outgoing stack-based arguments - * are addressed relative to this register. - */ - public static final CiRegister Frame = new CiRegister(-2, -2, 0, "framereg", RegisterFlag.CPU); - - public static final CiRegister CallerFrame = new CiRegister(-3, -3, 0, "callerframereg", RegisterFlag.CPU); - - /** - * The identifier for this register that is unique across all the registers in a {@link CiArchitecture}. - * A valid register has {@code number > 0}. - */ - public final int number; - - /** - * The mnemonic of this register. - */ - public final String name; - - /** - * The actual encoding in a target machine instruction for this register, which may or - * may not be the same as {@link #number}. - */ - public final int encoding; - - /** - * The size of the stack slot used to spill the value of this register. - */ - public final int spillSlotSize; - - /** - * The set of {@link RegisterFlag} values associated with this register. - */ - private final int flags; - - /** - * An array of {@link CiRegisterValue} objects, for this register, with one entry - * per {@link CiKind}, indexed by {@link CiKind#ordinal}. - */ - private final CiRegisterValue[] values; - - /** - * Attributes that characterize a register in a useful way. - * - */ - public enum RegisterFlag { - /** - * Denotes an integral (i.e. non floating point) register. - */ - CPU, - - /** - * Denotes a register whose lowest order byte can be addressed separately. - */ - Byte, - - /** - * Denotes a floating point register. - */ - FPU; - - public final int mask = 1 << (ordinal() + 1); - } - - /** - * Creates a {@code CiRegister} instance. - * - * @param number unique identifier for the register - * @param encoding the target machine encoding for the register - * @param spillSlotSize the size of the stack slot used to spill the value of the register - * @param name the mnemonic name for the register - * @param flags the set of {@link RegisterFlag} values for the register - */ - public CiRegister(int number, int encoding, int spillSlotSize, String name, RegisterFlag... flags) { - this.number = number; - this.name = name; - this.spillSlotSize = spillSlotSize; - this.flags = createMask(flags); - this.encoding = encoding; - - values = new CiRegisterValue[CiKind.VALUES.length]; - for (CiKind kind : CiKind.VALUES) { - values[kind.ordinal()] = new CiRegisterValue(kind, this); - } - } - - private static int createMask(RegisterFlag... flags) { - int result = 0; - for (RegisterFlag f : flags) { - result |= f.mask; - } - return result; - } - - public boolean isSet(RegisterFlag f) { - return (flags & f.mask) != 0; - } - - /** - * Gets this register as a {@linkplain CiRegisterValue value} with a specified kind. - * @param kind the specified kind - * @return the {@link CiRegisterValue} - */ - public CiRegisterValue asValue(CiKind kind) { - return values[kind.ordinal()]; - } - - /** - * Gets this register as a {@linkplain CiRegisterValue value} with no particular kind. - * @return a {@link CiRegisterValue} with {@link CiKind#Illegal} kind. - */ - public CiRegisterValue asValue() { - return asValue(CiKind.Illegal); - } - - /** - * Determines if this is a valid register. - * @return {@code true} iff this register is valid - */ - public boolean isValid() { - return number >= 0; - } - - /** - * Determines if this a floating point register. - */ - public boolean isFpu() { - return isSet(RegisterFlag.FPU); - } - - /** - * Determines if this a general purpose register. - */ - public boolean isCpu() { - return isSet(RegisterFlag.CPU); - } - - /** - * Determines if this register has the {@link RegisterFlag#Byte} attribute set. - * @return {@code true} iff this register has the {@link RegisterFlag#Byte} attribute set. - */ - public boolean isByte() { - return isSet(RegisterFlag.Byte); - } - - /** - * Categorizes a set of registers by {@link RegisterFlag}. - * - * @param registers a list of registers to be categorized - * @return a map from each {@link RegisterFlag} constant to the list of registers for which the flag is - * {@linkplain #isSet(RegisterFlag) set} - */ - public static EnumMap<RegisterFlag, CiRegister[]> categorize(CiRegister[] registers) { - EnumMap<RegisterFlag, CiRegister[]> result = new EnumMap<>(RegisterFlag.class); - for (RegisterFlag flag : RegisterFlag.values()) { - ArrayList<CiRegister> list = new ArrayList<>(); - for (CiRegister r : registers) { - if (r.isSet(flag)) { - list.add(r); - } - } - result.put(flag, list.toArray(new CiRegister[list.size()])); - } - return result; - } - - /** - * Gets the maximum register {@linkplain #number number} in a given set of registers. - * - * @param registers the set of registers to process - * @return the maximum register number for any register in {@code registers} - */ - public static int maxRegisterNumber(CiRegister[] registers) { - int max = Integer.MIN_VALUE; - for (CiRegister r : registers) { - if (r.number > max) { - max = r.number; - } - } - return max; - } - - /** - * Gets the maximum register {@linkplain #encoding encoding} in a given set of registers. - * - * @param registers the set of registers to process - * @return the maximum register encoding for any register in {@code registers} - */ - public static int maxRegisterEncoding(CiRegister[] registers) { - int max = Integer.MIN_VALUE; - for (CiRegister r : registers) { - if (r.encoding > max) { - max = r.encoding; - } - } - return max; - } - - @Override - public String toString() { - return name; - } - - @Override - public int compareTo(CiRegister o) { - if (number < o.number) { - return -1; - } - if (number > o.number) { - return 1; - } - return 0; - } - -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiRegisterConfig.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,298 +0,0 @@ -/* - * Copyright (c) 2010, 2012, 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.max.cri.ci; - -import java.util.*; - -import com.oracle.max.cri.ci.CiCallingConvention.*; -import com.oracle.max.cri.ci.CiRegister.*; -import com.oracle.max.cri.ri.*; - -/** - * A default implementation of {@link RiRegisterConfig}. - */ -public class CiRegisterConfig implements RiRegisterConfig { - - /** - * The object describing the callee save area of this register configuration. - */ - public CiCalleeSaveLayout csl; - - /** - * The minimum register role identifier. - */ - public final int minRole; - - /** - * The map from register role IDs to registers. - */ - public final CiRegister[] registersRoleMap; - - /** - * The set of registers that can be used by the register allocator. - */ - public final CiRegister[] allocatable; - - /** - * The set of registers that can be used by the register allocator, - * {@linkplain CiRegister#categorize(CiRegister[]) categorized} by register - * {@linkplain RegisterFlag flags}. - */ - public final EnumMap<RegisterFlag, CiRegister[]> categorized; - - /** - * The ordered set of registers used to pass integral arguments. - */ - public final CiRegister[] cpuParameters; - - /** - * The ordered set of registers used to pass floating point arguments. - */ - public final CiRegister[] fpuParameters; - - /** - * The caller saved registers. - */ - public final CiRegister[] callerSave; - - /** - * The register to which {@link CiRegister#Frame} and {@link CiRegister#CallerFrame} are bound. - */ - public final CiRegister frame; - - /** - * Register for returning an integral value. - */ - public final CiRegister integralReturn; - - /** - * Register for returning a floating point value. - */ - public final CiRegister floatingPointReturn; - - /** - * The map from register {@linkplain CiRegister#number numbers} to register - * {@linkplain RiRegisterAttributes attributes} for this register configuration. - */ - public final RiRegisterAttributes[] attributesMap; - - /** - * The scratch register. - */ - public final CiRegister scratch; - - /** - * The frame offset of the first stack argument for each calling convention {@link CiCallingConvention.Type}. - */ - public final int[] stackArg0Offsets = new int[CiCallingConvention.Type.VALUES.length]; - - public CiRegisterConfig( - CiRegister frame, - CiRegister integralReturn, - CiRegister floatingPointReturn, - CiRegister scratch, - CiRegister[] allocatable, - CiRegister[] callerSave, - CiRegister[] parameters, - CiCalleeSaveLayout csl, - CiRegister[] allRegisters, - Map<Integer, CiRegister> roles) { - this.frame = frame; - this.csl = csl; - this.allocatable = allocatable; - this.callerSave = callerSave; - assert !Arrays.asList(allocatable).contains(scratch); - this.scratch = scratch; - EnumMap<RegisterFlag, CiRegister[]> categorizedParameters = CiRegister.categorize(parameters); - this.cpuParameters = categorizedParameters.get(RegisterFlag.CPU); - this.fpuParameters = categorizedParameters.get(RegisterFlag.FPU); - categorized = CiRegister.categorize(allocatable); - attributesMap = RiRegisterAttributes.createMap(this, allRegisters); - this.floatingPointReturn = floatingPointReturn; - this.integralReturn = integralReturn; - int minRoleId = Integer.MAX_VALUE; - int maxRoleId = Integer.MIN_VALUE; - for (Map.Entry<Integer, CiRegister> e : roles.entrySet()) { - int id = e.getKey(); - assert id >= 0; - if (minRoleId > id) { - minRoleId = id; - } - if (maxRoleId < id) { - maxRoleId = id; - } - } - registersRoleMap = new CiRegister[(maxRoleId - minRoleId) + 1]; - for (Map.Entry<Integer, CiRegister> e : roles.entrySet()) { - int id = e.getKey(); - registersRoleMap[id] = e.getValue(); - } - minRole = minRoleId; - } - - public CiRegisterConfig(CiRegisterConfig src, CiCalleeSaveLayout csl) { - this.frame = src.frame; - this.csl = csl; - this.allocatable = src.allocatable; - this.callerSave = src.callerSave; - this.scratch = src.scratch; - this.cpuParameters = src.cpuParameters; - this.fpuParameters = src.fpuParameters; - this.categorized = src.categorized; - this.attributesMap = src.attributesMap; - this.floatingPointReturn = src.floatingPointReturn; - this.integralReturn = src.integralReturn; - this.registersRoleMap = src.registersRoleMap; - this.minRole = src.minRole; - System.arraycopy(src.stackArg0Offsets, 0, stackArg0Offsets, 0, stackArg0Offsets.length); - } - - public CiRegister getReturnRegister(CiKind kind) { - if (kind.isDouble() || kind.isFloat()) { - return floatingPointReturn; - } - return integralReturn; - } - - public CiRegister getFrameRegister() { - return frame; - } - - public CiRegister getScratchRegister() { - return scratch; - } - - /** - * {@inheritDoc} - * - * This implementation assigns all available registers to parameters before assigning - * any stack slots to parameters. - */ - public CiCallingConvention getCallingConvention(Type type, CiKind[] parameters, CiTarget target, boolean stackOnly) { - CiValue[] locations = new CiValue[parameters.length]; - - int currentGeneral = 0; - int currentXMM = 0; - int currentStackOffset = stackArg0Offsets[type.ordinal()]; - - for (int i = 0; i < parameters.length; i++) { - final CiKind kind = parameters[i]; - - switch (kind) { - case Byte: - case Boolean: - case Short: - case Char: - case Int: - case Long: - case Object: - if (!stackOnly && currentGeneral < cpuParameters.length) { - CiRegister register = cpuParameters[currentGeneral++]; - locations[i] = register.asValue(kind); - } - break; - - case Float: - case Double: - if (!stackOnly && currentXMM < fpuParameters.length) { - CiRegister register = fpuParameters[currentXMM++]; - locations[i] = register.asValue(kind); - } - break; - - default: - throw new InternalError("Unexpected parameter kind: " + kind); - } - - if (locations[i] == null) { - locations[i] = CiStackSlot.get(kind.stackKind(), currentStackOffset, !type.out); - currentStackOffset += Math.max(target.sizeInBytes(kind), target.wordSize); - } - } - - return new CiCallingConvention(locations, currentStackOffset); - } - - public CiRegister[] getCallingConventionRegisters(Type type, RegisterFlag flag) { - if (flag == RegisterFlag.CPU) { - return cpuParameters; - } - assert flag == RegisterFlag.FPU; - return fpuParameters; - } - - public CiRegister[] getAllocatableRegisters() { - return allocatable; - } - - public EnumMap<RegisterFlag, CiRegister[]> getCategorizedAllocatableRegisters() { - return categorized; - } - - public CiRegister[] getCallerSaveRegisters() { - return callerSave; - } - - public CiCalleeSaveLayout getCalleeSaveLayout() { - return csl; - } - - public RiRegisterAttributes[] getAttributesMap() { - return attributesMap; - } - - public CiRegister getRegisterForRole(int id) { - return registersRoleMap[id - minRole]; - } - - @Override - public String toString() { - StringBuilder roleMap = new StringBuilder(); - for (int i = 0; i < registersRoleMap.length; ++i) { - CiRegister reg = registersRoleMap[i]; - if (reg != null) { - if (roleMap.length() != 0) { - roleMap.append(", "); - } - roleMap.append(i + minRole).append(" -> ").append(reg); - } - } - StringBuilder stackArg0OffsetsMap = new StringBuilder(); - for (Type t : Type.VALUES) { - if (stackArg0OffsetsMap.length() != 0) { - stackArg0OffsetsMap.append(", "); - } - stackArg0OffsetsMap.append(t).append(" -> ").append(stackArg0Offsets[t.ordinal()]); - } - String res = String.format( - "Allocatable: " + Arrays.toString(getAllocatableRegisters()) + "%n" + - "CallerSave: " + Arrays.toString(getCallerSaveRegisters()) + "%n" + - "CalleeSave: " + getCalleeSaveLayout() + "%n" + - "CPU Params: " + Arrays.toString(cpuParameters) + "%n" + - "FPU Params: " + Arrays.toString(fpuParameters) + "%n" + - "VMRoles: " + roleMap + "%n" + - "stackArg0: " + stackArg0OffsetsMap + "%n" + - "Scratch: " + getScratchRegister() + "%n"); - return res; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiRegisterValue.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2009, 2012, 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.max.cri.ci; - -/** - * Denotes a register that stores a value of a fixed kind. There is exactly one (canonical) instance of {@code - * CiRegisterValue} for each ({@link CiRegister}, {@link CiKind}) pair. Use {@link CiRegister#asValue(CiKind)} to - * retrieve the canonical {@link CiRegisterValue} instance for a given (register,kind) pair. - */ -public final class CiRegisterValue extends CiValue { - private static final long serialVersionUID = 7999341472196897163L; - - /** - * The register. - */ - public final CiRegister reg; - - /** - * Should only be called from {@link CiRegister#CiRegister} to ensure canonicalization. - */ - protected CiRegisterValue(CiKind kind, CiRegister register) { - super(kind); - this.reg = register; - } - - @Override - public int hashCode() { - return (reg.number << 4) ^ kind.ordinal(); - } - - @Override - public String toString() { - return reg.name + kindSuffix(); - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiRuntimeCall.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ci; - -import static com.oracle.max.cri.ci.CiKind.*; - -/** - * Enumerates the calls that must be provided by the runtime system. The compiler - * may generate code that calls the runtime services for unresolved and slow cases of some - * bytecodes. - */ -public enum CiRuntimeCall { - UnwindException(Void, Object), - Deoptimize(Void), - RegisterFinalizer(Void, Object), - SetDeoptInfo(Void, Object), - CreateNullPointerException(Object), - CreateOutOfBoundsException(Object, Int), - JavaTimeMillis(Long), - JavaTimeNanos(Long), - Debug(Void), - ArithmeticFrem(Float, Float, Float), - ArithmeticDrem(Double, Double, Double), - ArithmeticCos(Double, Double), - ArithmeticTan(Double, Double), - ArithmeticSin(Double, Double), - GenericCallback(Object, Object, Object); - - public final CiKind resultKind; - public final CiKind[] arguments; - - private CiRuntimeCall(CiKind resultKind, CiKind... args) { - this.resultKind = resultKind; - this.arguments = args; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiStackSlot.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,173 +0,0 @@ -/* - * Copyright (c) 2010, 2012, 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.max.cri.ci; - -import static com.oracle.max.cri.ci.CiKind.*; - -/** - * Represents a compiler spill slot or an outgoing stack-based argument in a method's frame - * or an incoming stack-based argument in a method's {@linkplain #inCallerFrame() caller's frame}. - */ -public final class CiStackSlot extends CiValue { - private static final long serialVersionUID = -7725071921307318433L; - - private final int offset; - private final boolean addFrameSize; - - /** - * Gets a {@link CiStackSlot} instance representing a stack slot at a given index - * holding a value of a given kind. - * - * @param kind The kind of the value stored in the stack slot. - * @param offset The offset of the stack slot (in bytes) - * @param inCallerFrame Specifies if the offset is relative to the stack pointer, - * or the beginning of the frame (stack pointer + total frame size). - */ - public static CiStackSlot get(CiKind kind, int offset, boolean addFrameSize) { - assert kind.stackKind() == kind; - assert addFrameSize || offset >= 0; - - if (offset % CACHE_GRANULARITY == 0) { - CiStackSlot[][] cache; - int index = offset / CACHE_GRANULARITY; - if (!addFrameSize) { - cache = OUT_CACHE; - } else if (offset >= 0) { - cache = IN_CACHE; - } else { - cache = SPILL_CACHE; - index = -index; - } - CiStackSlot[] slots = cache[kind.ordinal()]; - if (index < slots.length) { - CiStackSlot slot = slots[index]; - assert slot.kind == kind && slot.offset == offset && slot.addFrameSize == addFrameSize; - return slot; - } - } - return new CiStackSlot(kind, offset, addFrameSize); - } - - /** - * Private constructor to enforce use of {@link #get()} so that a cache can be used. - */ - private CiStackSlot(CiKind kind, int offset, boolean addFrameSize) { - super(kind); - this.offset = offset; - this.addFrameSize = addFrameSize; - } - - /** - * Gets the offset of this stack slot, relative to the stack pointer. - * @return The offset of this slot (in bytes). - */ - public int offset(int totalFrameSize) { - assert totalFrameSize > 0 || !addFrameSize; - int result = offset + (addFrameSize ? totalFrameSize : 0); - assert result >= 0; - return result; - } - - public boolean inCallerFrame() { - return addFrameSize && offset >= 0; - } - - public int rawOffset() { - return offset; - } - - public boolean rawAddFrameSize() { - return addFrameSize; - } - - @Override - public int hashCode() { - return kind.ordinal() ^ (offset << 4) ^ (addFrameSize ? 15 : 0); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o instanceof CiStackSlot) { - CiStackSlot l = (CiStackSlot) o; - return l.kind == kind && l.offset == offset && l.addFrameSize == addFrameSize; - } - return false; - } - - @Override - public String toString() { - if (!addFrameSize) { - return "out:" + offset + kindSuffix(); - } else if (offset >= 0) { - return "in:" + offset + kindSuffix(); - } else { - return "stack:" + (-offset) + kindSuffix(); - } - } - - /** - * Gets this stack slot used to pass an argument from the perspective of a caller. - */ - public CiStackSlot asOutArg() { - assert offset >= 0; - if (addFrameSize) { - return get(kind, offset, false); - } - return this; - } - - /** - * Gets this stack slot used to pass an argument from the perspective of a callee. - */ - public CiStackSlot asInArg() { - assert offset >= 0; - if (!addFrameSize) { - return get(kind, offset, true); - } - return this; - } - - - private static final int CACHE_GRANULARITY = 8; - private static final int SPILL_CACHE_PER_KIND_SIZE = 100; - private static final int PARAM_CACHE_PER_KIND_SIZE = 10; - - private static final CiStackSlot[][] SPILL_CACHE = makeCache(SPILL_CACHE_PER_KIND_SIZE, -1, true); - private static final CiStackSlot[][] IN_CACHE = makeCache(PARAM_CACHE_PER_KIND_SIZE, 1, true); - private static final CiStackSlot[][] OUT_CACHE = makeCache(PARAM_CACHE_PER_KIND_SIZE, 1, false); - - private static CiStackSlot[][] makeCache(int cachePerKindSize, int sign, boolean addFrameSize) { - CiStackSlot[][] cache = new CiStackSlot[CiKind.VALUES.length][]; - for (CiKind kind : new CiKind[] {Illegal, Int, Long, Float, Double, Object, Jsr}) { - CiStackSlot[] slots = new CiStackSlot[cachePerKindSize]; - for (int i = 0; i < cachePerKindSize; i++) { - slots[i] = new CiStackSlot(kind, sign * i * CACHE_GRANULARITY, addFrameSize); - } - cache[kind.ordinal()] = slots; - } - return cache; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiTarget.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ -/* - * Copyright (c) 2009, 2012, 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.max.cri.ci; - - -/** - * Represents the target machine for a compiler, including the CPU architecture, the size of pointers and references, - * alignment of stacks, caches, etc. - */ -public class CiTarget { - public final CiArchitecture arch; - - /** - * The OS page size. - */ - public final int pageSize; - - /** - * Specifies if this is a multi-processor system. - */ - public final boolean isMP; - - /** - * Specifies if this target supports encoding objects inline in the machine code. - */ - public final boolean inlineObjects; - - /** - * The machine word size on this target. - */ - public final int wordSize; - - /** - * The CiKind to be used for representing raw pointers and CPU registers. - */ - public final CiKind wordKind; - - /** - * The stack alignment requirement of the platform. For example, - * from Appendix D of <a href="http://www.intel.com/Assets/PDF/manual/248966.pdf">Intel 64 and IA-32 Architectures Optimization Reference Manual</a>: - * <pre> - * "It is important to ensure that the stack frame is aligned to a - * 16-byte boundary upon function entry to keep local __m128 data, - * parameters, and XMM register spill locations aligned throughout - * a function invocation." - * </pre> - */ - public final int stackAlignment; - - /** - * @see http://docs.sun.com/app/docs/doc/806-0477/6j9r2e2b9?a=view - */ - public final int stackBias; - - /** - * The cache alignment. - */ - public final int cacheAlignment; - - /** - * Specifies how {@code long} and {@code double} constants are to be stored - * in {@linkplain CiFrame frames}. This is useful for VMs such as HotSpot - * where convention the interpreter uses is that the second local - * holds the first raw word of the native long or double representation. - * This is actually reasonable, since locals and stack arrays - * grow downwards in all implementations. - * If, on some machine, the interpreter's Java locals or stack - * were to grow upwards, the embedded doubles would be word-swapped.) - */ - public final boolean debugInfoDoubleWordsInSecondSlot; - - /** - * Temporary flag to distinguish between the semantics necessary for HotSpot and Maxine. - */ - // TODO This should go away when XIR goes away, and the logic be part of the VM-specific lowering. - public final boolean invokeSnippetAfterArguments; - - public CiTarget(CiArchitecture arch, - boolean isMP, - int stackAlignment, - int pageSize, - int cacheAlignment, - boolean inlineObjects, - boolean debugInfoDoubleWordsInSecondSlot, - boolean invokeSnippetAfterArguments) { - this.arch = arch; - this.pageSize = pageSize; - this.isMP = isMP; - this.wordSize = arch.wordSize; - if (wordSize == 8) { - this.wordKind = CiKind.Long; - } else { - this.wordKind = CiKind.Int; - } - this.stackAlignment = stackAlignment; - this.stackBias = 0; // TODO: configure with param once SPARC port exists - this.cacheAlignment = cacheAlignment; - this.inlineObjects = inlineObjects; - this.debugInfoDoubleWordsInSecondSlot = debugInfoDoubleWordsInSecondSlot; - this.invokeSnippetAfterArguments = invokeSnippetAfterArguments; - } - - /** - * Gets the size in bytes of the specified kind for this target. - * - * @param kind the kind for which to get the size - * @return the size in bytes of {@code kind} - */ - public int sizeInBytes(CiKind kind) { - // Checkstyle: stop - switch (kind) { - case Boolean: return 1; - case Byte: return 1; - case Char: return 2; - case Short: return 2; - case Int: return 4; - case Long: return 8; - case Float: return 4; - case Double: return 8; - case Object: return wordSize; - case Jsr: return 4; - default: return 0; - } - // Checkstyle: resume - } - - /** - * Aligns the given frame size (without return instruction pointer) to the stack - * alignment size and return the aligned size (without return instruction pointer). - * @param frameSize the initial frame size to be aligned - * @return the aligned frame size - */ - public int alignFrameSize(int frameSize) { - int x = frameSize + arch.returnAddressSize + (stackAlignment - 1); - return (x / stackAlignment) * stackAlignment - arch.returnAddressSize; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiTargetMethod.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,555 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ci; - -import java.io.*; -import java.util.*; - -import com.oracle.max.cri.ri.*; - -/** - * Represents the output from compiling a method, including the compiled machine code, associated data and references, - * relocation information, deoptimization information, etc. It is the essential component of a {@link CiResult}, which also includes - * {@linkplain CiStatistics compilation statistics} and {@linkplain CiBailout failure information}. - */ -public class CiTargetMethod implements Serializable { - - private static final long serialVersionUID = -1319947729753702434L; - - /** - * Represents a code position with associated additional information. - */ - public abstract static class Site implements Serializable { - private static final long serialVersionUID = -8214214947651979102L; - /** - * The position (or offset) of this site with respect to the start of the target method. - */ - public final int pcOffset; - - public Site(int pos) { - this.pcOffset = pos; - } - } - - /** - * Represents a safepoint with associated debug info. - */ - public static class Safepoint extends Site implements Comparable<Safepoint> { - private static final long serialVersionUID = 2479806696381720162L; - public final CiDebugInfo debugInfo; - - Safepoint(int pcOffset, CiDebugInfo debugInfo) { - super(pcOffset); - this.debugInfo = debugInfo; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(pcOffset); - sb.append("[<safepoint>]"); - appendDebugInfo(sb, debugInfo); - return sb.toString(); - } - - @Override - public int compareTo(Safepoint o) { - if (pcOffset < o.pcOffset) { - return -1; - } else if (pcOffset > o.pcOffset) { - return 1; - } - return 0; - } - } - - /** - * Represents a call in the code. - */ - public static final class Call extends Safepoint { - private static final long serialVersionUID = 1440741241631046954L; - - /** - * The target of the call. - */ - public final Object target; - - /** - * The size of the call instruction. - */ - public final int size; - - /** - * Specifies if this call is direct or indirect. A direct call has an immediate operand encoding - * the absolute or relative (to the call itself) address of the target. An indirect call has a - * register or memory operand specifying the target address of the call. - */ - public final boolean direct; - - Call(Object target, int pcOffset, int size, boolean direct, CiDebugInfo debugInfo) { - super(pcOffset, debugInfo); - this.size = size; - this.target = target; - this.direct = direct; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(pcOffset); - sb.append('['); - sb.append(target); - sb.append(']'); - - if (debugInfo != null) { - appendDebugInfo(sb, debugInfo); - } - - return sb.toString(); - } - } - - /** - * Represents a reference to data from the code. The associated data can be any constant. - */ - public static final class DataPatch extends Site { - private static final long serialVersionUID = 5771730331604867476L; - public final CiConstant constant; - public final int alignment; - - DataPatch(int pcOffset, CiConstant data, int alignment) { - super(pcOffset); - this.constant = data; - this.alignment = alignment; - } - - @Override - public String toString() { - return String.format("%d[<data patch referring to data %s>]", pcOffset, constant); - } - } - - /** - * Provides extra information about instructions or data at specific positions in {@link CiTargetMethod#targetCode()}. - * This is optional information that can be used to enhance a disassembly of the code. - */ - public abstract static class CodeAnnotation implements Serializable { - private static final long serialVersionUID = -7903959680749520748L; - public final int position; - - public CodeAnnotation(int position) { - this.position = position; - } - } - - /** - * A string comment about one or more instructions at a specific position in the code. - */ - public static final class CodeComment extends CodeAnnotation { - /** - * - */ - private static final long serialVersionUID = 6802287188701961401L; - public final String value; - public CodeComment(int position, String comment) { - super(position); - this.value = comment; - } - - @Override - public String toString() { - return getClass().getSimpleName() + "@" + position + ": " + value; - } - } - - /** - * Labels some inline data in the code. - */ - public static final class InlineData extends CodeAnnotation { - private static final long serialVersionUID = 305997507263827108L; - public final int size; - public InlineData(int position, int size) { - super(position); - this.size = size; - } - - @Override - public String toString() { - return getClass().getSimpleName() + "@" + position + ": size=" + size; - } - } - - /** - * Describes a table of signed offsets embedded in the code. The offsets are relative to the starting - * address of the table. This type of table maybe generated when translating a multi-way branch - * based on a key value from a dense value set (e.g. the {@code tableswitch} JVM instruction). - * - * The table is indexed by the contiguous range of integers from {@link #low} to {@link #high} inclusive. - */ - public static final class JumpTable extends CodeAnnotation { - private static final long serialVersionUID = 2222194398353801831L; - - /** - * The low value in the key range (inclusive). - */ - public final int low; - - /** - * The high value in the key range (inclusive). - */ - public final int high; - - /** - * The size (in bytes) of each table entry. - */ - public final int entrySize; - - public JumpTable(int position, int low, int high, int entrySize) { - super(position); - this.low = low; - this.high = high; - this.entrySize = entrySize; - } - - @Override - public String toString() { - return getClass().getSimpleName() + "@" + position + ": [" + low + " .. " + high + "]"; - } - } - - /** - * Describes a table of key and offset pairs. The offset in each table entry is relative to the address of - * the table. This type of table maybe generated when translating a multi-way branch - * based on a key value from a sparse value set (e.g. the {@code lookupswitch} JVM instruction). - */ - public static final class LookupTable extends CodeAnnotation { - private static final long serialVersionUID = 8367952567559116160L; - - /** - * The number of entries in the table. - */ - public final int npairs; - - /** - * The size (in bytes) of entry's key. - */ - public final int keySize; - - /** - * The size (in bytes) of entry's offset value. - */ - public final int offsetSize; - - public LookupTable(int position, int npairs, int keySize, int offsetSize) { - super(position); - this.npairs = npairs; - this.keySize = keySize; - this.offsetSize = offsetSize; - } - - @Override - public String toString() { - return getClass().getSimpleName() + "@" + position + ": [npairs=" + npairs + ", keySize=" + keySize + ", offsetSize=" + offsetSize + "]"; - } - } - - /** - * Represents exception handler information for a specific code position. It includes the catch code position as - * well as the caught exception type. - */ - public static final class ExceptionHandler extends Site { - private static final long serialVersionUID = 4897339464722665281L; - public final int handlerPos; - - ExceptionHandler(int pcOffset, int handlerPos) { - super(pcOffset); - this.handlerPos = handlerPos; - } - - @Override - public String toString() { - return String.format("%d[<exception edge to %d>]", pcOffset, handlerPos); - } - } - - public static final class Mark extends Site { - private static final long serialVersionUID = 3612943150662354844L; - public final Object id; - public final Mark[] references; - - Mark(int pcOffset, Object id, Mark[] references) { - super(pcOffset); - this.id = id; - this.references = references; - } - - @Override - public String toString() { - if (id == null) { - return String.format("%d[<mark with %d references>]", pcOffset, references.length); - } else if (id instanceof Integer) { - return String.format("%d[<mark with %d references and id %s>]", pcOffset, references.length, Integer.toHexString((Integer) id)); - } else { - return String.format("%d[<mark with %d references and id %s>]", pcOffset, references.length, id.toString()); - } - } - } - - /** - * List of safepoints, sorted by {@link Site#pcOffset}. - */ - public final List<Safepoint> safepoints = new ArrayList<>(); - - /** - * List of data references. - */ - public final List<DataPatch> dataReferences = new ArrayList<>(); - - /** - * List of exception handlers. - */ - public final List<ExceptionHandler> exceptionHandlers = new ArrayList<>(); - - /** - * List of marks. - */ - public final List<Mark> marks = new ArrayList<>(); - - private int frameSize = -1; - private int customStackAreaOffset = -1; - private int registerRestoreEpilogueOffset = -1; - /** - * The buffer containing the emitted machine code. - */ - private byte[] targetCode; - - /** - * The leading number of bytes in {@link #targetCode} containing the emitted machine code. - */ - private int targetCodeSize; - - private ArrayList<CodeAnnotation> annotations; - - private CiAssumptions assumptions; - - /** - * Constructs a new target method. - */ - public CiTargetMethod() { - } - - public void setAssumptions(CiAssumptions assumptions) { - this.assumptions = assumptions; - } - - public CiAssumptions assumptions() { - return assumptions; - } - - /** - * Sets the frame size in bytes. Does not include the return address pushed onto the - * stack, if any. - * - * @param size the size of the frame in bytes - */ - public void setFrameSize(int size) { - frameSize = size; - } - - /** - * Sets the machine that has been generated by the compiler. - * - * @param code the machine code generated - * @param size the size of the machine code - */ - public void setTargetCode(byte[] code, int size) { - targetCode = code; - targetCodeSize = size; - } - - /** - * Records a reference to the data section in the code section (e.g. to load an integer or floating point constant). - * - * @param codePos the position in the code where the data reference occurs - * @param data the data that is referenced - * @param alignment the alignment requirement of the data or 0 if there is no alignment requirement - */ - public void recordDataReference(int codePos, CiConstant data, int alignment) { - assert codePos >= 0 && data != null; - dataReferences.add(new DataPatch(codePos, data, alignment)); - } - - /** - * Records a call in the code array. - * - * @param codePos the position of the call in the code array - * @param size the size of the call instruction - * @param target the {@link RiRuntime#asCallTarget(Object) target} being called - * @param debugInfo the debug info for the call - * @param direct specifies if this is a {@linkplain Call#direct direct} call - */ - public void recordCall(int codePos, int size, Object target, CiDebugInfo debugInfo, boolean direct) { - final Call call = new Call(target, codePos, size, direct, debugInfo); - addSafepoint(call); - } - - /** - * Records an exception handler for this method. - * - * @param codePos the position in the code that is covered by the handler - * @param handlerPos the position of the handler - * @param throwableType the type of exceptions handled by the handler - */ - public void recordExceptionHandler(int codePos, int handlerPos) { - exceptionHandlers.add(new ExceptionHandler(codePos, handlerPos)); - } - - /** - * Records a safepoint in the code array. - * - * @param codePos the position of the safepoint in the code array - * @param debugInfo the debug info for the safepoint - */ - public void recordSafepoint(int codePos, CiDebugInfo debugInfo) { - addSafepoint(new Safepoint(codePos, debugInfo)); - } - - private void addSafepoint(Safepoint safepoint) { - // The safepoints list must always be sorted - if (!safepoints.isEmpty() && safepoints.get(safepoints.size() - 1).pcOffset >= safepoint.pcOffset) { - // This re-sorting should be very rare - Collections.sort(safepoints); - } - safepoints.add(safepoint); - } - - /** - * Records an instruction mark within this method. - * - * @param codePos the position in the code that is covered by the handler - * @param id the identifier for this mark - * @param references an array of other marks that this mark references - */ - public Mark recordMark(int codePos, Object id, Mark[] references) { - Mark mark = new Mark(codePos, id, references); - marks.add(mark); - return mark; - } - - /** - * Allows a method to specify the offset of the epilogue that restores the callee saved registers. Must be called - * iff the method is a callee saved method and stores callee registers on the stack. - * - * @param registerRestoreEpilogueOffset the offset in the machine code where the epilogue begins - */ - public void setRegisterRestoreEpilogueOffset(int registerRestoreEpilogueOffset) { - assert this.registerRestoreEpilogueOffset == -1; - this.registerRestoreEpilogueOffset = registerRestoreEpilogueOffset; - } - - /** - * The frame size of the method in bytes. - * - * @return the frame size - */ - public int frameSize() { - assert frameSize != -1 : "frame size not yet initialized!"; - return frameSize; - } - - /** - * @return the code offset of the start of the epilogue that restores all callee saved registers, or -1 if this is - * not a callee saved method - */ - public int registerRestoreEpilogueOffset() { - return registerRestoreEpilogueOffset; - } - - /** - * Offset in bytes for the custom stack area (relative to sp). - * @return the offset in bytes - */ - public int customStackAreaOffset() { - return customStackAreaOffset; - } - - /** - * @see #customStackAreaOffset() - * @param offset - */ - public void setCustomStackAreaOffset(int offset) { - customStackAreaOffset = offset; - } - - /** - * @return the machine code generated for this method - */ - public byte[] targetCode() { - return targetCode; - } - - /** - * @return the size of the machine code generated for this method - */ - public int targetCodeSize() { - return targetCodeSize; - } - - /** - * @return the code annotations or {@code null} if there are none - */ - public List<CodeAnnotation> annotations() { - return annotations; - } - - public void addAnnotation(CodeAnnotation annotation) { - assert annotation != null; - if (annotations == null) { - annotations = new ArrayList<>(); - } - annotations.add(annotation); - } - - private static void appendDebugInfo(StringBuilder sb, CiDebugInfo info) { - if (info != null) { - appendRefMap(sb, "stackMap", info.frameRefMap); - appendRefMap(sb, "registerMap", info.registerRefMap); - CiCodePos codePos = info.codePos; - if (codePos != null) { - CiUtil.appendLocation(sb.append(" "), codePos.method, codePos.bci); - if (info.hasFrame()) { - sb.append(" #locals=").append(info.frame().numLocals).append(" #expr=").append(info.frame().numStack); - if (info.frame().numLocks > 0) { - sb.append(" #locks=").append(info.frame().numLocks); - } - } - } - } - } - - private static void appendRefMap(StringBuilder sb, String name, CiBitMap map) { - if (map != null) { - sb.append(' ').append(name).append('[').append(map.toBinaryString()).append(']'); - } - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiUtil.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,808 +0,0 @@ -/* - * Copyright (c) 2010, 2011, 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.max.cri.ci; - -import static java.lang.reflect.Modifier.*; - -import java.lang.annotation.*; -import java.util.*; - -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiTypeProfile.ProfiledType; - -/** - * Miscellaneous collection of utility methods used in the {@code CRI} project. - */ -public class CiUtil { - - public static final String NEW_LINE = String.format("%n"); - - /** - * Gets the annotation of a particular type for a formal parameter of a given method. - * - * @param annotationClass the Class object corresponding to the annotation type - * @param parameterIndex the index of a formal parameter of {@code method} - * @param method the method for which a parameter annotation is being requested - * @return the annotation of type {@code annotationClass} for the formal parameter present, else null - * @throws IndexOutOfBoundsException if {@code parameterIndex} does not denote a formal parameter - */ - public static <T extends Annotation> T getParameterAnnotation(Class<T> annotationClass, int parameterIndex, RiResolvedMethod method) { - if (parameterIndex >= 0) { - Annotation[][] parameterAnnotations = method.getParameterAnnotations(); - for (Annotation a : parameterAnnotations[parameterIndex]) { - if (a.annotationType() == annotationClass) { - return annotationClass.cast(a); - } - } - } - return null; - } - - /** - * Extends the functionality of {@link Class#getSimpleName()} to include a non-empty string for anonymous and local - * classes. - * - * @param clazz the class for which the simple name is being requested - * @param withEnclosingClass specifies if the returned name should be qualified with the name(s) of the enclosing - * class/classes of {@code clazz} (if any). This option is ignored if {@code clazz} denotes an anonymous - * or local class. - * @return the simple name - */ - public static String getSimpleName(Class< ? > clazz, boolean withEnclosingClass) { - final String simpleName = clazz.getSimpleName(); - if (simpleName.length() != 0) { - if (withEnclosingClass) { - String prefix = ""; - Class< ? > enclosingClass = clazz; - while ((enclosingClass = enclosingClass.getEnclosingClass()) != null) { - prefix = prefix + enclosingClass.getSimpleName() + "."; - } - return prefix + simpleName; - } - return simpleName; - } - // Must be an anonymous or local class - final String name = clazz.getName(); - int index = name.indexOf('$'); - if (index == -1) { - return name; - } - index = name.lastIndexOf('.', index); - if (index == -1) { - return name; - } - return name.substring(index + 1); - } - - public static final int K = 1024; - public static final int M = 1024 * 1024; - - public static boolean isOdd(int n) { - return (n & 1) == 1; - } - - public static boolean isEven(int n) { - return (n & 1) == 0; - } - - /** - * Checks whether the specified integer is a power of two. - * - * @param val the value to check - * @return {@code true} if the value is a power of two; {@code false} otherwise - */ - public static boolean isPowerOf2(int val) { - return val != 0 && (val & val - 1) == 0; - } - - /** - * Checks whether the specified long is a power of two. - * - * @param val the value to check - * @return {@code true} if the value is a power of two; {@code false} otherwise - */ - public static boolean isPowerOf2(long val) { - return val != 0 && (val & val - 1) == 0; - } - - /** - * Computes the log (base 2) of the specified integer, rounding down. (E.g {@code log2(8) = 3}, {@code log2(21) = 4} - * ) - * - * @param val the value - * @return the log base 2 of the value - */ - public static int log2(int val) { - assert val > 0 && isPowerOf2(val); - return 31 - Integer.numberOfLeadingZeros(val); - } - - /** - * Computes the log (base 2) of the specified long, rounding down. (E.g {@code log2(8) = 3}, {@code log2(21) = 4}) - * - * @param val the value - * @return the log base 2 of the value - */ - public static int log2(long val) { - assert val > 0 && isPowerOf2(val); - return 63 - Long.numberOfLeadingZeros(val); - } - - public static int align(int size, int align) { - assert isPowerOf2(align); - return (size + align - 1) & ~(align - 1); - } - - /** - * Gets a word with the nth bit set. - * - * @param n the nth bit to set - * @return an integer value with the nth bit set - */ - public static int nthBit(int n) { - return n >= Integer.SIZE ? 0 : 1 << n; - } - - /** - * Gets a word with the right-most n bits set. - * - * @param n the number of right most bits to set - * @return an integer value with the right-most n bits set - */ - public static int rightNBits(int n) { - return nthBit(n) - 1; - } - - /** - * Converts a given type to its Java programming language name. The following are examples of strings returned by - * this method: - * - * <pre> - * qualified == true: - * java.lang.Object - * int - * boolean[][] - * qualified == false: - * Object - * int - * boolean[][] - * </pre> - * - * @param riType the type to be converted to a Java name - * @param qualified specifies if the package prefix of the type should be included in the returned name - * @return the Java name corresponding to {@code riType} - */ - public static String toJavaName(RiType riType, boolean qualified) { - CiKind kind = riType.kind(false); - if (kind.isPrimitive() || kind == CiKind.Void) { - return kind.javaName; - } - return internalNameToJava(riType.name(), qualified); - } - - /** - * Converts a given type to its Java programming language name. The following are examples of strings returned by - * this method: - * - * <pre> - * java.lang.Object - * int - * boolean[][] - * </pre> - * - * @param riType the type to be converted to a Java name - * @return the Java name corresponding to {@code riType} - */ - public static String toJavaName(RiType riType) { - return (riType == null) ? null : internalNameToJava(riType.name(), true); - } - - public static String internalNameToJava(String name, boolean qualified) { - switch (name.charAt(0)) { - case 'L': { - String result = name.substring(1, name.length() - 1).replace('/', '.'); - if (!qualified) { - final int lastDot = result.lastIndexOf('.'); - if (lastDot != -1) { - result = result.substring(lastDot + 1); - } - } - return result; - - } - case '[': - return internalNameToJava(name.substring(1), qualified) + "[]"; - default: - if (name.length() != 1) { - throw new IllegalArgumentException("Illegal internal name: " + name); - } - return CiKind.fromPrimitiveOrVoidTypeChar(name.charAt(0)).javaName; - } - } - - /** - * Gets a string for a given method formatted according to a given format specification. A format specification is - * composed of characters that are to be copied verbatim to the result and specifiers that denote an attribute of - * the method that is to be copied to the result. A specifier is a single character preceded by a '%' character. The - * accepted specifiers and the method attributes they denote are described below: - * - * <pre> - * Specifier | Description | Example(s) - * ----------+------------------------------------------------------------------------------------------ - * 'R' | Qualified return type | "int" "java.lang.String" - * 'r' | Unqualified return type | "int" "String" - * 'H' | Qualified holder | "java.util.Map.Entry" - * 'h' | Unqualified holder | "Entry" - * 'n' | Method name | "add" - * 'P' | Qualified parameter types, separated by ', ' | "int, java.lang.String" - * 'p' | Unqualified parameter types, separated by ', ' | "int, String" - * 'f' | Indicator if method is unresolved, static or virtual | "unresolved" "static" "virtual" - * '%' | A '%' character | "%" - * </pre> - * - * @param format a format specification - * @param method the method to be formatted - * @param kinds if {@code true} then the types in {@code method}'s signature are printed in the - * {@linkplain CiKind#jniName JNI} form of their {@linkplain CiKind kind} - * @return the result of formatting this method according to {@code format} - * @throws IllegalFormatException if an illegal specifier is encountered in {@code format} - */ - public static String format(String format, RiMethod method) throws IllegalFormatException { - final StringBuilder sb = new StringBuilder(); - int index = 0; - RiSignature sig = null; - while (index < format.length()) { - final char ch = format.charAt(index++); - if (ch == '%') { - if (index >= format.length()) { - throw new UnknownFormatConversionException("An unquoted '%' character cannot terminate a method format specification"); - } - final char specifier = format.charAt(index++); - boolean qualified = false; - switch (specifier) { - case 'R': - qualified = true; - // fall through - case 'r': { - if (sig == null) { - sig = method.signature(); - } - sb.append(toJavaName(sig.returnType(null), qualified)); - break; - } - case 'H': - qualified = true; - // fall through - case 'h': { - sb.append(toJavaName(method.holder(), qualified)); - break; - } - case 'n': { - sb.append(method.name()); - break; - } - case 'P': - qualified = true; - // fall through - case 'p': { - if (sig == null) { - sig = method.signature(); - } - for (int i = 0; i < sig.argumentCount(false); i++) { - if (i != 0) { - sb.append(", "); - } - sb.append(toJavaName(sig.argumentTypeAt(i, null), qualified)); - } - break; - } - case 'f': { - sb.append(!(method instanceof RiResolvedMethod) ? "unresolved" : isStatic(((RiResolvedMethod) method).accessFlags()) ? "static" : "virtual"); - break; - } - case '%': { - sb.append('%'); - break; - } - default: { - throw new UnknownFormatConversionException(String.valueOf(specifier)); - } - } - } else { - sb.append(ch); - } - } - return sb.toString(); - } - - /** - * Gets a string for a given field formatted according to a given format specification. A format specification is - * composed of characters that are to be copied verbatim to the result and specifiers that denote an attribute of - * the field that is to be copied to the result. A specifier is a single character preceded by a '%' character. The - * accepted specifiers and the field attributes they denote are described below: - * - * <pre> - * Specifier | Description | Example(s) - * ----------+------------------------------------------------------------------------------------------ - * 'T' | Qualified type | "int" "java.lang.String" - * 't' | Unqualified type | "int" "String" - * 'H' | Qualified holder | "java.util.Map.Entry" - * 'h' | Unqualified holder | "Entry" - * 'n' | Field name | "age" - * 'f' | Indicator if field is unresolved, static or instance | "unresolved" "static" "instance" - * '%' | A '%' character | "%" - * </pre> - * - * @param format a format specification - * @param field the field to be formatted - * @param kinds if {@code true} then {@code field}'s type is printed in the {@linkplain CiKind#jniName JNI} form of - * its {@linkplain CiKind kind} - * @return the result of formatting this field according to {@code format} - * @throws IllegalFormatException if an illegal specifier is encountered in {@code format} - */ - public static String format(String format, RiField field) throws IllegalFormatException { - final StringBuilder sb = new StringBuilder(); - int index = 0; - RiType type = field.type(); - while (index < format.length()) { - final char ch = format.charAt(index++); - if (ch == '%') { - if (index >= format.length()) { - throw new UnknownFormatConversionException("An unquoted '%' character cannot terminate a field format specification"); - } - final char specifier = format.charAt(index++); - boolean qualified = false; - switch (specifier) { - case 'T': - qualified = true; - // fall through - case 't': { - sb.append(toJavaName(type, qualified)); - break; - } - case 'H': - qualified = true; - // fall through - case 'h': { - sb.append(toJavaName(field.holder(), qualified)); - break; - } - case 'n': { - sb.append(field.name()); - break; - } - case 'f': { - sb.append(!(field instanceof RiResolvedField) ? "unresolved" : isStatic(((RiResolvedField) field).accessFlags()) ? "static" : "instance"); - break; - } - case '%': { - sb.append('%'); - break; - } - default: { - throw new UnknownFormatConversionException(String.valueOf(specifier)); - } - } - } else { - sb.append(ch); - } - } - return sb.toString(); - } - - /** - * Converts a Java source-language class name into the internal form. - * - * @param className the class name - * @return the internal name form of the class name - */ - public static String toInternalName(String className) { - return "L" + className.replace('.', '/') + ";"; - } - - /** - * Creates a set that uses reference-equality instead of {@link Object#equals(Object)} when comparing values. - * - * @param <T> the type of elements in the set - * @return a set based on reference-equality - */ - public static <T> Set<T> newIdentityHashSet() { - return Collections.newSetFromMap(new IdentityHashMap<T, Boolean>()); - } - - /** - * Prepends the String {@code indentation} to every line in String {@code lines}, including a possibly non-empty - * line following the final newline. - */ - public static String indent(String lines, String indentation) { - if (lines.length() == 0) { - return lines; - } - final String newLine = "\n"; - if (lines.endsWith(newLine)) { - return indentation + (lines.substring(0, lines.length() - 1)).replace(newLine, newLine + indentation) + newLine; - } - return indentation + lines.replace(newLine, newLine + indentation); - } - - /** - * Formats the values in a frame as a tabulated string. - * - * @param frame - * @return the values in {@code frame} as a tabulated string - */ - public static String tabulateValues(CiFrame frame) { - int cols = Math.max(frame.numLocals, Math.max(frame.numStack, frame.numLocks)); - assert cols > 0; - ArrayList<Object> cells = new ArrayList<>(); - cells.add(""); - for (int i = 0; i < cols; i++) { - cells.add(i); - } - cols++; - if (frame.numLocals != 0) { - cells.add("locals:"); - cells.addAll(Arrays.asList(frame.values).subList(0, frame.numLocals)); - cells.addAll(Collections.nCopies(cols - frame.numLocals - 1, "")); - } - if (frame.numStack != 0) { - cells.add("stack:"); - cells.addAll(Arrays.asList(frame.values).subList(frame.numLocals, frame.numLocals + frame.numStack)); - cells.addAll(Collections.nCopies(cols - frame.numStack - 1, "")); - } - if (frame.numLocks != 0) { - cells.add("locks:"); - cells.addAll(Arrays.asList(frame.values).subList(frame.numLocals + frame.numStack, frame.values.length)); - cells.addAll(Collections.nCopies(cols - frame.numLocks - 1, "")); - } - Object[] cellArray = cells.toArray(); - for (int i = 0; i < cellArray.length; i++) { - if ((i % cols) != 0) { - cellArray[i] = "|" + cellArray[i]; - } - } - return CiUtil.tabulate(cellArray, cols, 1, 1); - } - - /** - * Formats a given table as a string. The value of each cell is produced by {@link String#valueOf(Object)}. - * - * @param cells the cells of the table in row-major order - * @param cols the number of columns per row - * @param lpad the number of space padding inserted before each formatted cell value - * @param rpad the number of space padding inserted after each formatted cell value - * @return a string with one line per row and each column left-aligned - */ - public static String tabulate(Object[] cells, int cols, int lpad, int rpad) { - int rows = (cells.length + (cols - 1)) / cols; - int[] colWidths = new int[cols]; - for (int col = 0; col < cols; col++) { - for (int row = 0; row < rows; row++) { - int index = col + (row * cols); - if (index < cells.length) { - Object cell = cells[index]; - colWidths[col] = Math.max(colWidths[col], String.valueOf(cell).length()); - } - } - } - StringBuilder sb = new StringBuilder(); - String nl = NEW_LINE; - for (int row = 0; row < rows; row++) { - for (int col = 0; col < cols; col++) { - int index = col + (row * cols); - if (index < cells.length) { - for (int i = 0; i < lpad; i++) { - sb.append(' '); - } - Object cell = cells[index]; - String s = String.valueOf(cell); - int w = s.length(); - sb.append(s); - while (w < colWidths[col]) { - sb.append(' '); - w++; - } - for (int i = 0; i < rpad; i++) { - sb.append(' '); - } - } - } - sb.append(nl); - } - return sb.toString(); - } - - /** - * Convenient shortcut for calling {@link #appendLocation(StringBuilder, RiMethod, int)} without having to supply a - * a {@link StringBuilder} instance and convert the result to a string. - */ - public static String toLocation(RiResolvedMethod method, int bci) { - return appendLocation(new StringBuilder(), method, bci).toString(); - } - - /** - * Appends a string representation of a location specified by a given method and bci to a given - * {@link StringBuilder}. If a stack trace element with a non-null file name and non-negative line number is - * {@linkplain RiMethod#toStackTraceElement(int) available} for the given method, then the string returned is the - * {@link StackTraceElement#toString()} value of the stack trace element, suffixed by the bci location. For example: - * - * <pre> - * java.lang.String.valueOf(String.java:2930) [bci: 12] - * </pre> - * - * Otherwise, the string returned is the value of {@code CiUtil.format("%H.%n(%p)"}, suffixed by the bci location. - * For example: - * - * <pre> - * java.lang.String.valueOf(int) [bci: 12] - * </pre> - * - * @param sb - * @param method - * @param bci - * @return - */ - public static StringBuilder appendLocation(StringBuilder sb, RiResolvedMethod method, int bci) { - if (method != null) { - StackTraceElement ste = method.toStackTraceElement(bci); - if (ste.getFileName() != null && ste.getLineNumber() > 0) { - sb.append(ste); - } else { - sb.append(CiUtil.format("%H.%n(%p)", method)); - } - } else { - sb.append("Null method"); - } - return sb.append(" [bci: ").append(bci).append(']'); - } - - /** - * Appends a formatted code position to a {@link StringBuilder}. - * - * @param sb the {@link StringBuilder} to append to - * @param pos the code position to format and append to {@code sb} - * @return the value of {@code sb} - */ - public static StringBuilder append(StringBuilder sb, CiCodePos pos) { - appendLocation(sb.append("at "), pos.method, pos.bci); - if (pos.caller != null) { - sb.append(NEW_LINE); - append(sb, pos.caller); - } - return sb; - } - - /** - * Appends a formatted frame to a {@link StringBuilder}. - * - * @param sb the {@link StringBuilder} to append to - * @param frame the frame to format and append to {@code sb} - * @return the value of {@code sb} - */ - public static StringBuilder append(StringBuilder sb, CiFrame frame) { - appendLocation(sb.append("at "), frame.method, frame.bci); - if (frame.values != null && frame.values.length > 0) { - sb.append(NEW_LINE); - String table = tabulateValues(frame); - String[] rows = table.split(NEW_LINE); - for (int i = 0; i < rows.length; i++) { - String row = rows[i]; - if (!row.trim().isEmpty()) { - sb.append(" ").append(row); - if (i != rows.length - 1) { - sb.append(NEW_LINE); - } - } - } - } - if (frame.caller() != null) { - sb.append(NEW_LINE); - append(sb, frame.caller()); - } else if (frame.caller != null) { - sb.append(NEW_LINE); - append(sb, frame.caller); - } - return sb; - } - - /** - * Formats a location present in a register or frame reference map. - */ - public static class RefMapFormatter { - - /** - * The size of a stack slot. - */ - public final int slotSize; - - /** - * The register used as the frame pointer. - */ - public final CiRegister fp; - - public final CiArchitecture arch; - - /** - * The offset (in bytes) from the slot pointed to by {@link #fp} to the slot corresponding to bit 0 in the frame - * reference map. - */ - public final int refMapToFPOffset; - - public RefMapFormatter(CiArchitecture arch, int slotSize, CiRegister fp, int refMapToFPOffset) { - this.arch = arch; - this.slotSize = slotSize; - this.fp = fp; - this.refMapToFPOffset = refMapToFPOffset; - } - - public String formatStackSlot(int frameRefMapIndex) { - int refMapOffset = frameRefMapIndex * slotSize; - int fpOffset = refMapOffset + refMapToFPOffset; - if (fpOffset >= 0) { - return fp + "+" + fpOffset; - } - return fp.name + fpOffset; - } - - public String formatRegister(int regRefMapIndex) { - return arch.registers[regRefMapIndex].toString(); - } - } - - /** - * Appends a formatted debug info to a {@link StringBuilder}. - * - * @param sb the {@link StringBuilder} to append to - * @param info the debug info to format and append to {@code sb} - * @return the value of {@code sb} - */ - public static StringBuilder append(StringBuilder sb, CiDebugInfo info, RefMapFormatter formatter) { - String nl = NEW_LINE; - if (info.hasRegisterRefMap()) { - sb.append(" reg-ref-map:"); - CiBitMap bm = info.registerRefMap; - if (formatter != null) { - for (int reg = bm.nextSetBit(0); reg >= 0; reg = bm.nextSetBit(reg + 1)) { - sb.append(" " + formatter.formatRegister(reg)); - } - } - sb.append(' ').append(bm).append(nl); - } - if (info.hasStackRefMap()) { - sb.append("frame-ref-map:"); - CiBitMap bm = info.frameRefMap; - if (formatter != null) { - for (int i = bm.nextSetBit(0); i >= 0; i = bm.nextSetBit(i + 1)) { - sb.append(" " + formatter.formatStackSlot(i)); - } - } - sb.append(' ').append(bm).append(nl); - } - CiFrame frame = info.frame(); - if (frame != null) { - append(sb, frame); - } else if (info.codePos != null) { - append(sb, info.codePos); - } - return sb; - } - - public static CiKind[] signatureToKinds(RiResolvedMethod method) { - CiKind receiver = isStatic(method.accessFlags()) ? null : method.holder().kind(true); - return signatureToKinds(method.signature(), receiver); - } - - public static CiKind[] signatureToKinds(RiSignature signature, CiKind receiverKind) { - int args = signature.argumentCount(false); - CiKind[] result; - int i = 0; - if (receiverKind != null) { - result = new CiKind[args + 1]; - result[0] = receiverKind; - i = 1; - } else { - result = new CiKind[args]; - } - for (int j = 0; j < args; j++) { - result[i + j] = signature.argumentKindAt(j, true); - } - return result; - } - - public static Class< ? >[] signatureToTypes(RiSignature signature, RiResolvedType accessingClass) { - int count = signature.argumentCount(false); - Class< ? >[] result = new Class< ? >[count]; - for (int i = 0; i < result.length; ++i) { - result[i] = signature.argumentTypeAt(i, accessingClass).resolve(accessingClass).toJava(); - } - return result; - } - - /** - * Formats some profiling information associated as a string. - * - * @param info the profiling info to format - * @param method an optional method that augments the profile string returned - * @param sep the separator to use for each separate profile record - */ - public static String profileToString(RiProfilingInfo info, RiResolvedMethod method, String sep) { - StringBuilder buf = new StringBuilder(100); - if (method != null) { - buf.append(String.format("canBeStaticallyBound: %b%s", method.canBeStaticallyBound(), sep)). - append(String.format("invocationCount: %d%s", method.invocationCount(), sep)); - } - for (int i = 0; i < info.codeSize(); i++) { - if (info.getExecutionCount(i) != -1) { - buf.append(String.format("executionCount@%d: %d%s", i, info.getExecutionCount(i), sep)); - } - - if (info.getBranchTakenProbability(i) != -1) { - buf.append(String.format("branchProbability@%d: %.3f%s", i, info.getBranchTakenProbability(i), sep)); - } - - double[] switchProbabilities = info.getSwitchProbabilities(i); - if (switchProbabilities != null) { - buf.append(String.format("switchProbabilities@%d:", i)); - for (int j = 0; j < switchProbabilities.length; j++) { - buf.append(String.format(" %.3f", switchProbabilities[j])); - } - buf.append(sep); - } - - if (info.getExceptionSeen(i) != RiExceptionSeen.FALSE) { - buf.append(String.format("exceptionSeen@%d: %s%s", i, info.getExceptionSeen(i).name(), sep)); - } - - RiTypeProfile typeProfile = info.getTypeProfile(i); - if (typeProfile != null) { - ProfiledType[] ptypes = typeProfile.getTypes(); - if (ptypes != null) { - buf.append(String.format("types@%d:", i)); - for (int j = 0; j < ptypes.length; j++) { - ProfiledType ptype = ptypes[j]; - buf.append(String.format(" %.3f (%s)%s", ptype.probability, ptype.type, sep)); - } - buf.append(String.format(" %.3f <not recorded>%s", typeProfile.getNotRecordedProbability(), sep)); - } - } - } - - boolean firstDeoptReason = true; - for (RiDeoptReason reason: RiDeoptReason.values()) { - int count = info.getDeoptimizationCount(reason); - if (count > 0) { - if (firstDeoptReason) { - buf.append("deoptimization history").append(sep); - firstDeoptReason = false; - } - buf.append(String.format(" %s: %d%s", reason.name(), count, sep)); - } - } - if (buf.length() == 0) { - return ""; - } - String s = buf.toString(); - assert s.endsWith(sep); - return s.substring(0, s.length() - sep.length()); - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiValue.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2009, 2012, 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.max.cri.ci; - -import java.io.*; - -/** - * Abstract base class for values manipulated by the compiler. All values have a {@linkplain CiKind kind} and are immutable. - */ -public abstract class CiValue implements Serializable { - private static final long serialVersionUID = -6909397188697766469L; - - @SuppressWarnings("serial") - public static CiValue IllegalValue = new CiValue(CiKind.Illegal) { - @Override - public String toString() { - return "-"; - } - }; - - /** - * The kind of this value. - */ - public final CiKind kind; - - /** - * Initializes a new value of the specified kind. - * @param kind the kind - */ - protected CiValue(CiKind kind) { - this.kind = kind; - } - - /** - * String representation of the kind, which should be the end of all {@link #toString()} implementation of subclasses. - */ - protected final String kindSuffix() { - return "|" + kind.typeChar; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiValueUtil.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2012, 2012, 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.max.cri.ci; - -public class CiValueUtil { - public static boolean isIllegal(CiValue value) { - assert value != null; - return value == CiValue.IllegalValue; - } - - public static boolean isLegal(CiValue value) { - return !isIllegal(value); - } - - public static boolean isVirtualObject(CiValue value) { - assert value != null; - return value instanceof CiVirtualObject; - } - - public static CiVirtualObject asVirtualObject(CiValue value) { - assert value != null; - return (CiVirtualObject) value; - } - - public static boolean isConstant(CiValue value) { - assert value != null; - return value instanceof CiConstant; - } - - public static CiConstant asConstant(CiValue value) { - assert value != null; - return (CiConstant) value; - } - - - public static boolean isStackSlot(CiValue value) { - assert value != null; - return value instanceof CiStackSlot; - } - - public static CiStackSlot asStackSlot(CiValue value) { - assert value != null; - return (CiStackSlot) value; - } - - public static boolean isAddress(CiValue value) { - assert value != null; - return value instanceof CiAddress; - } - - public static CiAddress asAddress(CiValue value) { - assert value != null; - return (CiAddress) value; - } - - - public static boolean isRegister(CiValue value) { - assert value != null; - return value instanceof CiRegisterValue; - } - - public static CiRegister asRegister(CiValue value) { - assert value != null; - return ((CiRegisterValue) value).reg; - } - - public static CiRegister asIntReg(CiValue value) { - assert value.kind == CiKind.Int || value.kind == CiKind.Jsr; - return asRegister(value); - } - - public static CiRegister asLongReg(CiValue value) { - assert value.kind == CiKind.Long : value.kind; - return asRegister(value); - } - - public static CiRegister asObjectReg(CiValue value) { - assert value.kind == CiKind.Object; - return asRegister(value); - } - - public static CiRegister asFloatReg(CiValue value) { - assert value.kind == CiKind.Float; - return asRegister(value); - } - - public static CiRegister asDoubleReg(CiValue value) { - assert value.kind == CiKind.Double; - return asRegister(value); - } - - - public static boolean sameRegister(CiValue v1, CiValue v2) { - return isRegister(v1) && isRegister(v2) && asRegister(v1) == asRegister(v2); - } - - public static boolean sameRegister(CiValue v1, CiValue v2, CiValue v3) { - return sameRegister(v1, v2) && sameRegister(v1, v3); - } - - public static boolean differentRegisters(CiValue v1, CiValue v2) { - return !isRegister(v1) || !isRegister(v2) || asRegister(v1) != asRegister(v2); - } - - public static boolean differentRegisters(CiValue v1, CiValue v2, CiValue v3) { - return differentRegisters(v1, v2) && differentRegisters(v1, v3) && differentRegisters(v2, v3); - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiVirtualObject.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,164 +0,0 @@ -/* - * Copyright (c) 2010, 2012, 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.max.cri.ci; - -import com.oracle.max.cri.ri.*; - -/** - * An instance of this class represents an object whose allocation was removed by escape analysis. The information stored in the {@link CiVirtualObject} is used during - * deoptimization to recreate the object. - */ -public final class CiVirtualObject extends CiValue { - private static final long serialVersionUID = -2907197776426346021L; - - private final RiType type; - private CiValue[] values; - private final int id; - - /** - * Creates a new CiVirtualObject for the given type, with the given fields. If the type is an instance class then the values array needs to have one entry for each field, ordered in - * like the fields returned by {@link RiResolvedType#declaredFields()}. If the type is an array then the length of the values array determines the reallocated array length. - * @param type the type of the object whose allocation was removed during compilation. This can be either an instance of an array type. - * @param values an array containing all the values to be stored into the object when it is recreated. - * @param id a unique id that identifies the object within the debug information for one position in the compiled code. - * @return a new CiVirtualObject instance. - */ - public static CiVirtualObject get(RiType type, CiValue[] values, int id) { - return new CiVirtualObject(type, values, id); - } - - private CiVirtualObject(RiType type, CiValue[] values, int id) { - super(CiKind.Object); - this.type = type; - this.values = values; - this.id = id; - } - - @Override - public String toString() { - return "vobject:" + id; - } - - /** - * @return the type of the object whose allocation was removed during compilation. This can be either an instance of an array type. - */ - public RiType type() { - return type; - } - - /** - * @return an array containing all the values to be stored into the object when it is recreated. - */ - public CiValue[] values() { - return values; - } - - /** - * @return the unique id that identifies the object within the debug information for one position in the compiled code. - */ - public int id() { - return id; - } - - /** - * Overwrites the current set of values with a new one. - * @param values an array containing all the values to be stored into the object when it is recreated. - */ - public void setValues(CiValue[] values) { - this.values = values; - } - - @Override - public int hashCode() { - return kind.ordinal() + type.hashCode(); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o instanceof CiVirtualObject) { - CiVirtualObject l = (CiVirtualObject) o; - if (l.type != type || l.values.length != values.length) { - return false; - } - for (int i = 0; i < values.length; i++) { - if (values[i] != l.values[i]) { - return false; - } - } - return true; - } - return false; - } - - /** - * This is a helper class used to create virtual objects for a number of different JDK classes. - */ - public static class CiVirtualObjectFactory { - private int nextId = 0; - private final RiRuntime runtime; - - public CiVirtualObjectFactory(RiRuntime runtime) { - this.runtime = runtime; - } - - public CiVirtualObject constantProxy(CiKind kind, CiValue objectValue, CiValue primitiveValue) { - CiConstant cKind = CiConstant.forObject(kind); - // TODO: here the ordering is hard coded... we should query RiType.fields() and act accordingly - return new CiVirtualObject(runtime.getType(CiConstant.class), new CiValue[] {cKind, primitiveValue, CiValue.IllegalValue, objectValue}, nextId++); - } - - public CiValue proxy(CiValue ciValue) { - switch (ciValue.kind) { - case Boolean: - return new CiVirtualObject(runtime.getType(Boolean.class), new CiValue[] {ciValue}, nextId++); - case Byte: - return new CiVirtualObject(runtime.getType(Byte.class), new CiValue[] {ciValue}, nextId++); - case Char: - return new CiVirtualObject(runtime.getType(Character.class), new CiValue[] {ciValue}, nextId++); - case Double: - return new CiVirtualObject(runtime.getType(Double.class), new CiValue[] {ciValue, CiValue.IllegalValue}, nextId++); - case Float: - return new CiVirtualObject(runtime.getType(Float.class), new CiValue[] {ciValue}, nextId++); - case Int: - return new CiVirtualObject(runtime.getType(Integer.class), new CiValue[] {ciValue}, nextId++); - case Long: - return new CiVirtualObject(runtime.getType(Long.class), new CiValue[] {ciValue, CiValue.IllegalValue}, nextId++); - case Object: - return ciValue; - case Short: - return new CiVirtualObject(runtime.getType(Short.class), new CiValue[] {ciValue}, nextId++); - default: - assert false : ciValue.kind; - return null; - } - } - - public CiVirtualObject arrayProxy(RiType arrayType, CiValue[] values) { - return new CiVirtualObject(arrayType, values, nextId++); - } - - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/package-info.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2010, 2012, 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. - */ -/** - * The compiler-provided part of the bi-directional interface between the compiler and the runtime system of a virtual machine for the instruction set defined in - * {@link com.oracle.graal.compiler.graphbuilder.Bytecodes}. - * - * The target hardware architecture is represented by {@link com.oracle.max.cri.ci.CiArchitecture} and the specific target machine - * environment for a compiler instance is represented by {@link com.oracle.max.cri.ci.CiTarget}. - * <p> - * A {@code CiResult} encapsulates - * {@linkplain com.oracle.max.cri.ci.CiStatistics compilation statistics}, possible {@linkplain com.oracle.max.cri.ci.CiBailout error state} - * and the {@linkplain com.oracle.max.cri.ci.CiTargetMethod compiled code and metadata}. - * {@link com.oracle.max.cri.ci.CiCodePos} and {@link com.oracle.max.cri.ci.CiDebugInfo} provide detailed information to the - * runtime to support debugging and deoptimization of the compiled code. - * <p> - * The compiler manipulates {@link com.oracle.max.cri.ci.CiValue} instances that have a {@link com.oracle.max.cri.ci.CiKind}, and are - * immutable. A concrete {@link com.oracle.max.cri.ci.CiValue value} is one of the following subclasses: - * <ul> - * <li>{@link com.oracle.max.cri.ci.CiConstant}: a constant value. - * <li>{@link com.oracle.max.cri.ci.CiRegisterValue}: a value stored in a {@linkplain com.oracle.max.cri.ci.CiRegister target machine register}. - * <li>{@link com.oracle.max.cri.ci.CiStackSlot}: a spill slot or an outgoing stack-based argument in a method's frame. - * <li>{@link com.oracle.max.cri.ci.CiAddress}: an address in target machine memory. - * <li>{@link com.oracle.graal.compiler.lir.CiVariable}: a value (cf. virtual register) that is yet to be bound to a target machine location (physical register or memory address). - *</ul> - */ -package com.oracle.max.cri.ci; -
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiCodeInfo.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2012, 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.max.cri.ri; - -import com.oracle.max.cri.ci.*; - - -/** - * Represents some code installed in the code cache of the runtime. - * This encapsulated details are only for informational purposes. - * At any time, the runtime may invalidate the underlying code (e.g. due to deopt etc). - */ -public interface RiCodeInfo { - - /** - * Gets the start address of this installed code. - */ - long start(); - - /** - * Gets a copy of this installed code. - */ - byte[] code(); - - /** - * Gets the target method (if any) from which this installed code was produced. - */ - CiTargetMethod targetMethod(); - - /** - * Gets the method (if any) from which this installed code was compiled. - */ - RiResolvedMethod method(); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiCompiledMethod.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2011, 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.max.cri.ri; - -/** - * Represents a compiled instance of a method. It may have been invalidated or removed in the meantime. - */ -public interface RiCompiledMethod { - - public abstract class MethodInvalidatedException extends RuntimeException { - - private static final long serialVersionUID = -3540232440794244844L; - } - - /** - * Returns the method to which the compiled code belongs. - * @return the method to which the compiled code belongs. - */ - RiResolvedMethod method(); - - /** - * @return true if the code represented by this object is still valid, false otherwise (may happen due to deopt, etc.) - */ - boolean isValid(); - - Object execute(Object arg1, Object arg2, Object arg3); - - Object executeVarargs(Object... args); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiConstantPool.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ri; - -/** - * Represents the runtime representation of the constant pool that is - * used by the compiler when parsing bytecode. The {@code lookupXXX} methods look up a constant - * pool entry without performing resolution, and are used during compilation. - */ -public interface RiConstantPool { - - /** - * Makes sure that the type referenced by the specified constant pool entry is loaded and - * initialized. This can be used to compile time resolve a type. It works for field, method, - * or type constant pool entries. - * @param cpi the index of the constant pool entry that references the type - * @param opcode the opcode of the instruction that references the type - */ - void loadReferencedType(int cpi, int opcode); - - /** - * Looks up a reference to a field. If {@code opcode} is non-negative, then resolution checks - * specific to the JVM instruction it denotes are performed if the field is already resolved. - * Should any of these checks fail, an {@linkplain RiField#isResolved() unresolved} - * field reference is returned. - * - * @param cpi the constant pool index - * @param opcode the opcode of the instruction for which the lookup is being performed or {@code -1} - * @return a reference to the field at {@code cpi} in this pool - * @throws ClassFormatError if the entry at {@code cpi} is not a field - */ - RiField lookupField(int cpi, int opcode); - - /** - * Looks up a reference to a method. If {@code opcode} is non-negative, then resolution checks - * specific to the JVM instruction it denotes are performed if the method is already resolved. - * Should any of these checks fail, an {@linkplain RiMethod#isResolved() unresolved} - * method reference is returned. - * - * @param cpi the constant pool index - * @param opcode the opcode of the instruction for which the lookup is being performed or {@code -1} - * @return a reference to the method at {@code cpi} in this pool - * @throws ClassFormatError if the entry at {@code cpi} is not a method - */ - RiMethod lookupMethod(int cpi, int opcode); - - /** - * Looks up a reference to a type. If {@code opcode} is non-negative, then resolution checks - * specific to the JVM instruction it denotes are performed if the type is already resolved. - * Should any of these checks fail, an {@linkplain RiType#isResolved() unresolved} - * type reference is returned. - * - * @param cpi the constant pool index - * @param opcode the opcode of the instruction for which the lookup is being performed or {@code -1} - * @return a reference to the compiler interface type - */ - RiType lookupType(int cpi, int opcode); - - /** - * Looks up a method signature. - * - * @param cpi the constant pool index - * @return the method signature at index {@code cpi} in this constant pool - */ - RiSignature lookupSignature(int cpi); - - /** - * Looks up a constant at the specified index. - * @param cpi the constant pool index - * @return the {@code CiConstant} instance representing the constant - */ - Object lookupConstant(int cpi); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptAction.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2012, 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.max.cri.ri; - - -public enum RiDeoptAction { - None, // just interpret, do not invalidate nmethod - RecompileIfTooManyDeopts, // recompile the nmethod; need not invalidate - InvalidateReprofile, // invalidate the nmethod, reset IC, maybe recompile - InvalidateRecompile, // invalidate the nmethod, recompile (probably) - InvalidateStopCompiling; // invalidate the nmethod and do not compile -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptReason.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2012, 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.max.cri.ri; - - -public enum RiDeoptReason { - None, - NullCheckException, - BoundsCheckException, - ClassCastException, - ArrayStoreException, - UnreachedCode, - TypeCheckedInliningViolated, - OptimizedTypeCheckViolated, - NotCompiledExceptionHandler, - Unresolved, - JavaSubroutineMismatch, - ArithmeticException, - RuntimeConstraint; -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiExceptionHandler.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ri; - -/** - * Represents an exception handler within the bytecode. - */ -public interface RiExceptionHandler { - - /** - * Gets the start bytecode index of the protected range of this handler. - * @return the start bytecode index - */ - int startBCI(); - - /** - * Gets the end bytecode index of the protected range of this handler. - * @return the end bytecode index - */ - int endBCI(); - - /** - * Gets the bytecode index of the handler block of this handler. - * @return the handler block bytecode index - */ - int handlerBCI(); - - /** - * Gets the index into the constant pool representing the type of exception - * caught by this handler. - * @return the constant pool index of the catch type - */ - int catchTypeCPI(); - - /** - * Checks whether this handler catches all exceptions. - * @return {@code true} if this handler catches all exceptions - */ - boolean isCatchAll(); - - /** - * The type of exception caught by this exception handler. - * - * @return the exception type - */ - RiType catchType(); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiExceptionSeen.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2012, 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.max.cri.ri; - - -/** - * Represents the three possibilities that an exception was seen at a specific BCI. - */ -public enum RiExceptionSeen { - TRUE, - FALSE, - NOT_SUPPORTED; - - public static RiExceptionSeen get(boolean value) { - return value ? TRUE : FALSE; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiField.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ri; - - -import com.oracle.max.cri.ci.*; - -/** - * Represents a reference to a field, including both resolved and unresolved fields. Fields, like methods and types, are - * resolved through {@link RiConstantPool constant pools}, and their actual implementation is provided by the - * {@link RiRuntime runtime} to the compiler. - */ -public interface RiField { - /** - * Gets the name of this field as a string. - * @return the name of this field - */ - String name(); - - /** - * Gets the type of this field as a compiler-runtime interface type. - * @return the type of this field - */ - RiType type(); - - /** - * Gets the kind of this field. - * @param architecture When true, the architecture-specific kind used for emitting machine code is returned. - * When false, the kind according to the Java specification is returned. - * @return the kind - */ - CiKind kind(boolean architecture); - - /** - * Gets the holder of this field as a compiler-runtime interface type. - * @return the holder of this field - */ - RiType holder(); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiMethod.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ri; - -/** - * Represents resolved and unresolved methods. Methods, like fields and types, are resolved through - * {@link RiConstantPool constant pools}, and their actual implementation is provided by the {@link RiRuntime runtime} - * to the compiler. - */ -public interface RiMethod { - - /** - * Gets the name of the method as a string. - * @return the name of the method - */ - String name(); - - /** - * Gets the type in which this method is declared. - * @return the type in which this method is declared - */ - RiType holder(); - - /** - * Gets the signature of the method. - * @return the signature of the method - */ - RiSignature signature(); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiProfilingInfo.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2012, 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.max.cri.ri; - - -/** - * Provides access to the profiling information of one specific method. - * Every accessor method returns the information that is available at the time of invocation. - * If a method is invoked multiple times, it may return significantly different results for every invocation - * as the profiling information may be changed by other Java threads at any time. - */ -public interface RiProfilingInfo { - - /** - * Gets the length of the code associated with this profile. - */ - int codeSize(); - - /** - * Returns an estimate of how often the branch at the given byte code was taken. - * @return The estimated probability, with 0.0 meaning never and 1.0 meaning always, or -1 if this information is not available. - */ - double getBranchTakenProbability(int bci); - - /** - * Returns an estimate of how often the switch cases are taken at the given BCI. - * The default case is stored as the last entry. - * @return A double value that contains the estimated probabilities, with 0.0 meaning never and 1.0 meaning always, - * or -1 if this information is not available. - */ - double[] getSwitchProbabilities(int bci); - - /** - * Returns the TypeProfile for the given BCI. - * @return Returns an RiTypeProfile object, or null if not available. - */ - RiTypeProfile getTypeProfile(int bci); - - /** - * Returns information if the given BCI did ever throw an exception. - * @return {@link RiExceptionSeen#TRUE} if the instruction has thrown an exception at least once, - * {@link RiExceptionSeen#FALSE} if it never threw an exception, and {@link RiExceptionSeen#NOT_SUPPORTED} - * if this information was not recorded. - */ - RiExceptionSeen getExceptionSeen(int bci); - - /** - * Returns an estimate how often the current BCI was executed. Avoid comparing execution counts to each other, - * as the returned value highly depends on the time of invocation. - * @return the estimated execution count or -1 if not available. - */ - int getExecutionCount(int bci); - - /** - * Returns how frequently a method was deoptimized for the given deoptimization reason. This only indicates how - * often the method did fall back to the interpreter for the execution and does not indicate how often it was recompiled. - * @param reason the reason for which the number of deoptimizations should be queried - * @return the number of times the compiled method deoptimized for the given reason. - */ - int getDeoptimizationCount(RiDeoptReason reason); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRegisterAttributes.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2010, 2011, 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.max.cri.ri; - -import java.util.*; - -import com.oracle.max.cri.ci.*; - -/** - * A collection of register attributes. The specific attribute values for a register may be - * local to a compilation context. For example, a {@link RiRegisterConfig} in use during - * a compilation will determine which registers are callee saved. - */ -public class RiRegisterAttributes { - - /** - * Denotes a register whose value preservation (if required) across a call is the responsibility of the caller. - */ - public final boolean isCallerSave; - - /** - * Denotes a register whose value preservation (if required) across a call is the responsibility of the callee. - */ - public final boolean isCalleeSave; - - /** - * Denotes a register that is available for use by a register allocator. - */ - public final boolean isAllocatable; - - /** - * Denotes a register guaranteed to be non-zero if read in compiled Java code. - * For example, a register dedicated to holding the current thread. - */ - public boolean isNonZero; - - public RiRegisterAttributes(boolean isCallerSave, boolean isCalleeSave, boolean isAllocatable) { - this.isCallerSave = isCallerSave; - this.isCalleeSave = isCalleeSave; - this.isAllocatable = isAllocatable; - } - - public static final RiRegisterAttributes NONE = new RiRegisterAttributes(false, false, false); - - /** - * Creates a map from register {@linkplain CiRegister#number numbers} to register - * {@linkplain RiRegisterAttributes attributes} for a given register configuration and set of - * registers. - * - * @param registerConfig a register configuration - * @param registers a set of registers - * @return an array whose length is the max register number in {@code registers} plus 1. An element at index i holds - * the attributes of the register whose number is i. - */ - public static RiRegisterAttributes[] createMap(RiRegisterConfig registerConfig, CiRegister[] registers) { - RiRegisterAttributes[] map = new RiRegisterAttributes[registers.length]; - for (CiRegister reg : registers) { - if (reg != null) { - CiCalleeSaveLayout csl = registerConfig.getCalleeSaveLayout(); - RiRegisterAttributes attr = new RiRegisterAttributes( - Arrays.asList(registerConfig.getCallerSaveRegisters()).contains(reg), - csl == null ? false : Arrays.asList(csl.registers).contains(reg), - Arrays.asList(registerConfig.getAllocatableRegisters()).contains(reg)); - if (map.length <= reg.number) { - map = Arrays.copyOf(map, reg.number + 1); - } - map[reg.number] = attr; - } - } - for (int i = 0; i < map.length; i++) { - if (map[i] == null) { - map[i] = NONE; - } - } - return map; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRegisterConfig.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ri; - -import java.util.*; - -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiCallingConvention.*; -import com.oracle.max.cri.ci.CiRegister.*; - -/** - * A register configuration binds roles and {@linkplain RiRegisterAttributes attributes} - * to physical registers. - */ -public interface RiRegisterConfig { - - /** - * Gets the register to be used for returning a value of a given kind. - */ - CiRegister getReturnRegister(CiKind kind); - - /** - * Gets the register to which {@link CiRegister#Frame} and {@link CiRegister#CallerFrame} are bound. - */ - CiRegister getFrameRegister(); - - CiRegister getScratchRegister(); - - /** - * Gets the calling convention describing how arguments are passed. - * - * @param type the type of calling convention being requested - * @param parameters the types of the arguments of the call - * @param target the target platform - * @param stackOnly ignore registers - */ - CiCallingConvention getCallingConvention(Type type, CiKind[] parameters, CiTarget target, boolean stackOnly); - - /** - * Gets the ordered set of registers that are can be used to pass parameters - * according to a given calling convention. - * - * @param type the type of calling convention - * @param flag specifies whether registers for {@linkplain RegisterFlag#CPU integral} or - * {@linkplain} RegisterFlag#FPU floating point} parameters are being requested - * @return the ordered set of registers that may be used to pass parameters in a call conforming to {@code type} - */ - CiRegister[] getCallingConventionRegisters(Type type, RegisterFlag flag); - - /** - * Gets the set of registers that can be used by the register allocator. - */ - CiRegister[] getAllocatableRegisters(); - - /** - * Gets the set of registers that can be used by the register allocator, - * {@linkplain CiRegister#categorize(CiRegister[]) categorized} by register {@linkplain RegisterFlag flags}. - * - * @return a map from each {@link RegisterFlag} constant to the list of {@linkplain #getAllocatableRegisters() - * allocatable} registers for which the flag is {@linkplain #isSet(RegisterFlag) set} - * - */ - EnumMap<RegisterFlag, CiRegister[]> getCategorizedAllocatableRegisters(); - - /** - * Gets the registers whose values must be preserved by a method across any call it makes. - */ - CiRegister[] getCallerSaveRegisters(); - - /** - * Gets the layout of the callee save area of this register configuration. - * - * @return {@code null} if there is no callee save area - */ - CiCalleeSaveLayout getCalleeSaveLayout(); - - /** - * Gets a map from register {@linkplain CiRegister#number numbers} to register - * {@linkplain RiRegisterAttributes attributes} for this register configuration. - * - * @return an array where an element at index i holds the attributes of the register whose number is i - * @see CiRegister#categorize(CiRegister[]) - */ - RiRegisterAttributes[] getAttributesMap(); - - /** - * Gets the register corresponding to a runtime-defined role. - * - * @param id the identifier of a runtime-defined register role - * @return the register playing the role specified by {@code id} - */ - CiRegister getRegisterForRole(int id); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiResolvedField.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ri; - -import java.lang.annotation.*; -import java.lang.reflect.*; - -import com.oracle.max.cri.ci.*; - -/** - * Represents a reference to a resolved field. Fields, like methods and types, are - * resolved through {@link RiConstantPool constant pools}, and their actual implementation is provided by the - * {@link RiRuntime runtime} to the compiler. - */ -public interface RiResolvedField extends RiField { - - /** - * Gets the access flags for this field. Only the flags specified in the JVM specification - * will be included in the returned mask. The utility methods in the {@link Modifier} class - * should be used to query the returned mask for the presence/absence of individual flags. - * @return the mask of JVM defined field access flags defined for this field - */ - int accessFlags(); - - /** - * Gets the constant value of this field if available. - * @param receiver object from which this field's value is to be read. This value is ignored if this field is static. - * @return the constant value of this field or {@code null} if the constant value is not available - */ - CiConstant constantValue(CiConstant receiver); - - /** - * Gets the holder of this field as a compiler-runtime interface type. - * @return the holder of this field - */ - RiResolvedType holder(); - - /** - * Returns this field's annotation of a specified type. - * - * @param annotationClass the Class object corresponding to the annotation type - * @return the annotation of type {@code annotationClass} for this field if present, else null - */ - <T extends Annotation> T getAnnotation(Class<T> annotationClass); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiResolvedMethod.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,227 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ri; - -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; - -import com.oracle.max.cri.ci.*; - - -/** - * Represents resolved methods. Methods, like fields and types, are resolved through - * {@link RiConstantPool constant pools}, and their actual implementation is provided by the {@link RiRuntime runtime} - * to the compiler. - */ -public interface RiResolvedMethod extends RiMethod { - - /** - * Gets the bytecode of the method, if the method {@linkplain #isResolved()} and has code. - * The returned byte array does not contain breakpoints or non-Java bytecodes. - * @return the bytecode of the method or {@code null} if none is available - */ - byte[] code(); - - /** - * Gets the size of the bytecode of the method, if the method {@linkplain #isResolved()} and has code. - * @return the size of the bytecode in bytes, or 0 if no bytecode is available - */ - int codeSize(); - - /** - * Gets the size of the compiled machine code. - * @return the size of the compiled machine code in bytes, or 0 if no compiled code exists. - */ - int compiledCodeSize(); - - /** - * Gets an estimate how complex it is to compile this method. - * @return A value >= 0, where higher means more complex. - */ - int compilationComplexity(); - - /** - * Gets the symbol used to link this method if it is native, otherwise {@code null}. - */ - String jniSymbol(); - - /** - * Gets the type in which this method is declared. - * @return the type in which this method is declared - */ - RiResolvedType holder(); - - /** - * Gets the maximum number of locals used in this method's bytecode. - * @return the maximum number of locals - */ - int maxLocals(); - - /** - * Gets the maximum number of stack slots used in this method's bytecode. - * @return the maximum number of stack slots - */ - int maxStackSize(); - - /** - * Checks whether this method has balanced monitor operations. - * @return {@code true} if the method has balanced monitor operations - */ - boolean hasBalancedMonitors(); - - /** - * Gets the access flags for this method. Only the flags specified in the JVM specification - * will be included in the returned mask. The utility methods in the {@link Modifier} class - * should be used to query the returned mask for the presence/absence of individual flags. - * @return the mask of JVM defined method access flags defined for this method - */ - int accessFlags(); - - /** - * Checks whether this method is a leaf method. - * @return {@code true} if the method is a leaf method (that is, is final or private) - */ - boolean isLeafMethod(); - - /** - * Checks whether this method is a class initializer. - * @return {@code true} if the method is a class initializer - */ - boolean isClassInitializer(); - - /** - * Checks whether this method is a constructor. - * @return {@code true} if the method is a constructor - */ - boolean isConstructor(); - - /** - * Checks whether this method has been overridden. Decisions made based - * on a method being overridden must be registered as dependencies. - * @return {@code true} if the method has been overridden - */ - boolean isOverridden(); - - /** - * Checks whether the compiler can insert safepoint polls in this method. - * @return {@code true} if the method cannot have safepoint polls inserted - */ - boolean noSafepointPolls(); - - /** - * Gets a map from bytecode indexes to bit maps denoting the live locals at that position. - * If a non-null array is return, its length is guaranteed to be equal to {@code code().length}. - * - * @return the liveness map if it is available; {@code null} otherwise - */ - CiBitMap[] livenessMap(); - - /** - * Checks whether this method can be statically bound (that is, it is final or private or static). - * @return {@code true} if this method can be statically bound - */ - boolean canBeStaticallyBound(); - - /** - * Gets the list of exception handlers for this method. - * @return the list of exception handlers - */ - RiExceptionHandler[] exceptionHandlers(); - - /** - * Gets a stack trace element for this method and a given bytecode index. - */ - StackTraceElement toStackTraceElement(int bci); - - /** - * Temporary work-around to support the @ACCESSOR Maxine annotation. - * Non-Maxine VMs should just return {@code null}. - */ - RiResolvedType accessor(); - - /** - * Gets the intrinsic id of this method. - */ - String intrinsic(); - - /** - * Provides an estimate of how often this method has been executed. - * @return The number of invocations, or -1 if this information isn't available. - */ - int invocationCount(); - - /** - * Returns an object that provides access to the method's profiling information. - * @return The profiling information recorded for this method. - */ - RiProfilingInfo profilingInfo(); - - /** - * Returns a map that the compiler can use to store objects that should survive the current compilation. - */ - Map<Object, Object> compilerStorage(); - - /** - * Returns a pointer to the method's constant pool. - * @return the constant pool - */ - RiConstantPool getConstantPool(); - - /** - * Returns this method's annotation of a specified type. - * - * @param annotationClass the Class object corresponding to the annotation type - * @return the annotation of type {@code annotationClass} for this method if present, else null - */ - <T extends Annotation> T getAnnotation(Class<T> annotationClass); - - /** - * Returns an array of arrays that represent the annotations on the formal - * parameters, in declaration order, of this method. - * - * @see Method#getParameterAnnotations() - * @see CiUtil#getParameterAnnotation(int, RiResolvedMethod) - */ - Annotation[][] getParameterAnnotations(); - - /** - * Returns an array of {@link Type} objects that represent the formal - * parameter types, in declaration order, of this method. - * - * @see Method#getGenericParameterTypes() - */ - Type[] getGenericParameterTypes(); - - /** - * Returns a {@link Type} object that represents the formal return type of this method. - * - * @see Method#getGenericReturnType() - */ - Type getGenericReturnType(); - - /** - * @return {@code true} if this method can be inlined - */ - boolean canBeInlined(); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiResolvedType.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ri; - -import java.lang.annotation.*; -import java.lang.reflect.*; - -import com.oracle.max.cri.ci.*; - -/** - * Represents a resolved in the compiler-runtime interface. Types include primitives, objects, {@code void}, - * and arrays thereof. Types, like fields and methods, are resolved through {@link RiConstantPool constant pools}, and - * their actual implementation is provided by the {@link RiRuntime runtime} to the compiler. - */ -public interface RiResolvedType extends RiType { - - /** - * Gets the encoding of (that is, a constant representing the value of) the specified part of this type. - * @param r the part of the this type - * @return a constant representing a reference to the specified part of this type - */ - CiConstant getEncoding(Representation r); - - /** - * Checks whether this type has any subclasses so far. Any decisions - * based on this information require the registration of a dependency, since - * this information may change. - * @return {@code true} if this class has subclasses - */ - boolean hasSubclass(); - - /** - * Checks whether this type has a finalizer method. - * @return {@code true} if this class has a finalizer - */ - boolean hasFinalizer(); - - /** - * Checks whether this type has any finalizable subclasses so far. Any decisions - * based on this information require the registration of a dependency, since - * this information may change. - * @return {@code true} if this class has any subclasses with finalizers - */ - boolean hasFinalizableSubclass(); - - /** - * Checks whether this type is an interface. - * @return {@code true} if this type is an interface - */ - boolean isInterface(); - - /** - * Checks whether this type is an instance class. - * @return {@code true} if this type is an instance class - */ - boolean isInstanceClass(); - - /** - * Checks whether this type is an array class. - * @return {@code true} if this type is an array class - */ - boolean isArrayClass(); - - /** - * Gets the access flags for this type. Only the flags specified in the JVM specification - * will be included in the returned mask. The utility methods in the {@link Modifier} class - * should be used to query the returned mask for the presence/absence of individual flags. - * @return the mask of JVM defined class access flags defined for this type - */ - int accessFlags(); - - /** - * Checks whether this type is initialized. - * @return {@code true} if this type is initialized - */ - boolean isInitialized(); - - /** - * Checks whether this type is a subtype of another type. - * @param other the type to test - * @return {@code true} if this type a subtype of the specified type - */ - boolean isSubtypeOf(RiResolvedType other); - - /** - * Checks whether the specified object is an instance of this type. - * @param obj the object to test - * @return {@code true} if the object is an instance of this type - */ - boolean isInstance(CiConstant obj); - - /** - * Attempts to get an exact type for this type. Final classes, - * arrays of final classes, and primitive types all have exact types. - * @return the exact type of this type, if it exists; {@code null} otherwise - */ - RiResolvedType exactType(); - - /** - * Gets the super type of this type or {@code null} if no such type exists. - */ - RiResolvedType superType(); - - /** - * Walks the class hierarchy upwards and returns the least common type that is a super type of both - * the current and the given type. - * @return the least common type that is a super type of both the current and the given type, or null if primitive types are involved. - */ - RiResolvedType leastCommonAncestor(RiResolvedType otherType); - - /** - * Attempts to get the unique concrete subtype of this type. - * @return the exact type of this type, if it exists; {@code null} otherwise - */ - RiResolvedType uniqueConcreteSubtype(); - - /** - * For array types, gets the type of the components. - * @return the component type of this array type - */ - RiResolvedType componentType(); - - /** - * Gets the type representing an array with elements of this type. - * @return a new compiler interface type representing an array of this type - */ - RiResolvedType arrayOf(); - - /** - * Resolves the method implementation for virtual dispatches on objects - * of this dynamic type. - * @param method the method to select the implementation of - * @return the method implementation that would be selected at runtime - */ - RiResolvedMethod resolveMethodImpl(RiResolvedMethod method); - - /** - * Given an RiMethod a, returns a concrete RiMethod b that is the only possible - * unique target for a virtual call on a(). Returns {@code null} if either no - * such concrete method or more than one such method exists. Returns the method a - * if a is a concrete method that is not overridden. If the compiler uses the - * result of this method for its compilation, it must register an assumption - * (see {@link CiAssumptions}), because dynamic class loading can invalidate - * the result of this method. - * @param method the method a for which a unique concrete target is searched - * @return the unique concrete target or {@code null} if no such target exists - * or assumptions are not supported by this runtime - */ - RiResolvedMethod uniqueConcreteMethod(RiResolvedMethod method); - - /** - * Returns the instance fields declared in this class sorted by field offset. - * @return an array of instance fields - */ - RiResolvedField[] declaredFields(); - - /** - * Returns this type's annotation of a specified type. - * - * @param annotationClass the Class object corresponding to the annotation type - * @return the annotation of type {@code annotationClass} for this type if present, else null - */ - <T extends Annotation> T getAnnotation(Class<T> annotationClass); - - /** - * Returns the java.lang.Class object representing this RiType instance or {@code null} if none exists. - * @return the java.lang.Class object - */ - Class<?> toJava(); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRuntime.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,158 +0,0 @@ -/* - * Copyright (c) 2009, 2012, 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.max.cri.ri; - -import java.lang.reflect.*; - -import com.oracle.max.cri.ci.*; - -/** - * Encapsulates the main functionality of the runtime for the compiler, including access - * to constant pools, OSR frames, inlining requirements, and runtime calls such as checkcast. -s */ -public interface RiRuntime { - - /** - * Get the size in bytes for locking information on the stack. - */ - int sizeOfLockData(); - - /** - * Returns a disassembly of the given installed code. - * - * @param code the code that should be disassembled - * @return a disassembly. This will be of length 0 if the runtime does not support disassembling. - */ - String disassemble(RiCodeInfo code); - - /** - * Returns the disassembly of the given method in a {@code javap}-like format. - * - * @param method the method that should be disassembled - * @return the disassembly. This will be of length 0 if the runtime does not support disassembling. - */ - String disassemble(RiResolvedMethod method); - - /** - * Returns the RiType object representing the base type for the given kind. - */ - RiResolvedType asRiType(CiKind kind); - - /** - * Returns the type of the given constant object. - * - * @return {@code null} if {@code constant.isNull() || !constant.kind.isObject()} - */ - RiResolvedType getTypeOf(CiConstant constant); - - - RiResolvedType getType(Class<?> clazz); - - /** - * Used by the canonicalizer to compare objects, since a given runtime might not want to expose the real objects to the compiler. - * - * @return true if the two parameters represent the same runtime object, false otherwise - */ - boolean areConstantObjectsEqual(CiConstant x, CiConstant y); - - /** - * Gets the register configuration to use when compiling a given method. - * - * @param method the top level method of a compilation - */ - RiRegisterConfig getRegisterConfig(RiMethod method); - - RiRegisterConfig getGlobalStubRegisterConfig(); - - /** - * Custom area on the stack of each compiled method that the VM can use for its own purposes. - * @return the size of the custom area in bytes - */ - int getCustomStackAreaSize(); - - /** - * Minimum size of the stack area reserved for outgoing parameters. This area is reserved in all cases, even when - * the compiled method has no regular call instructions. - * @return the minimum size of the outgoing parameter area in bytes - */ - int getMinimumOutgoingSize(); - - /** - * Gets the length of the array that is wrapped in a CiConstant object. - */ - int getArrayLength(CiConstant array); - - /** - * Performs any runtime-specific conversion on the object used to describe the target of a call. - */ - Object asCallTarget(Object target); - - /** - * Returns the maximum absolute offset of a runtime call target from any position in the code cache or -1 - * when not known or not applicable. Intended for determining the required size of address/offset fields. - */ - long getMaxCallTargetOffset(CiRuntimeCall rtcall); - - /** - * Provides the {@link RiMethod} for a {@link Method} obtained via reflection. - */ - RiResolvedMethod getRiMethod(Method reflectionMethod); - - /** - * Installs some given machine code as the implementation of a given method. - * - * @param method a method whose executable code is being modified - * @param code the code to be executed when {@code method} is called - * @param info the object into which details of the installed code will be written. - * Ignored if null, otherwise the info is written to index 0 of this array. - */ - void installMethod(RiResolvedMethod method, CiTargetMethod code, RiCodeInfo[] info); - - /** - * Adds the given machine code as an implementation of the given method without making it the default implementation. - * @param method a method to which the executable code is begin added - * @param code the code to be added - * @param info the object into which details of the installed code will be written. - * Ignored if null, otherwise the info is written to index 0 of this array. - * @return a reference to the compiled and ready-to-run code - */ - RiCompiledMethod addMethod(RiResolvedMethod method, CiTargetMethod code, RiCodeInfo[] info); - - /** - * Encodes a deoptimization action and a deoptimization reason in an integer value. - * @return the encoded value as an integer - */ - int encodeDeoptActionAndReason(RiDeoptAction action, RiDeoptReason reason); - - /** - * Converts a RiDeoptReason into an integer value. - * @return An integer value representing the given RiDeoptReason. - */ - int convertDeoptReason(RiDeoptReason reason); - - /** - * Converts a RiDeoptAction into an integer value. - * @return An integer value representing the given RiDeoptAction. - */ - int convertDeoptAction(RiDeoptAction action); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiSignature.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ri; - -import com.oracle.max.cri.ci.*; - -/** - * Represents a method signature provided by the runtime. - * - * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#7035">Method Descriptors</a> - */ -public interface RiSignature { - /** - * Gets the number of arguments in this signature, adding 1 for a receiver if requested. - * - * @param receiver true if 1 is to be added to the result for a receiver - * @return the number of arguments + 1 iff {@code receiver == true} - */ - int argumentCount(boolean receiver); - - /** - * Gets the argument type at the specified position. This method will return a - * {@linkplain RiType#isResolved() resolved} type if possible but without - * triggering any class loading or resolution. - * - * @param index the index into the parameters, with {@code 0} indicating the first parameter - * @param accessingClass the context of the type lookup. If accessing class is resolved, its class loader - * is used to retrieve an existing resolved type. This value can be {@code null} if the caller does - * not care for a resolved type. - * @return the {@code index}'th argument type - */ - RiType argumentTypeAt(int index, RiResolvedType accessingClass); - - /** - * Gets the argument kind at the specified position. - * @param index the index into the parameters, with {@code 0} indicating the first parameter - * @param architecture When true, the architecture-specific kind used for emitting machine code is returned. - * When false, the kind according to the Java specification is returned. - * @return the kind of the argument at the specified position - */ - CiKind argumentKindAt(int index, boolean architecture); - - /** - * Gets the return type of this signature. This method will return a - * {@linkplain RiResolvedType resolved} type if possible but without - * triggering any class loading or resolution. - * - * @param accessingClass the context of the type lookup. If accessing class is resolved, its class loader - * is used to retrieve an existing resolved type. This value can be {@code null} if the caller does - * not care for a resolved type. - * @return the compiler interface type representing the return type - */ - RiType returnType(RiType accessingClass); - - /** - * Gets the return kind of this signature. - * @param architectureSpecific When true, the architecture-specific kind used for emitting machine code is returned. - * When false, the kind according to the Java specification is returned. - * @return the return kind - */ - CiKind returnKind(boolean architectureSpecific); - - /** - * Converts this signature to a string. - * @return the signature as a string - */ - String asString(); - - /** - * Gets the size, in Java slots, of the arguments to this signature. - * @param withReceiver {@code true} if to add a slot for a receiver object; {@code false} not to include the receiver - * @return the size of the arguments in slots - */ - int argumentSlots(boolean withReceiver); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiType.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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.max.cri.ri; - -import com.oracle.max.cri.ci.*; - -/** - * Represents a resolved or unresolved type in the compiler-runtime interface. Types include primitives, objects, {@code void}, - * and arrays thereof. - */ -public interface RiType { - - /** - * Represents each of the several different parts of the runtime representation of - * a type which compiled code may need to reference individually. These may or may not be - * different objects or data structures, depending on the runtime system. - */ - public enum Representation { - /** - * The runtime representation of the data structure containing the static fields of this type. - */ - StaticFields, - - /** - * The runtime representation of the Java class object of this type. - */ - JavaClass, - - /** - * The runtime representation of the "hub" of this type--that is, the closest part of the type - * representation which is typically stored in the object header. - */ - ObjectHub - } - - /** - * Gets the name of this type in internal form. The following are examples of strings returned by this method: - * <pre> - * "Ljava/lang/Object;" - * "I" - * "[[B" - * </pre> - * - * @return the name of this type in internal form - */ - String name(); - - /** - * For array types, gets the type of the components. - * @return the component type of this array type - */ - RiType componentType(); - - /** - * Gets the type representing an array with elements of this type. - * @return a new compiler interface type representing an array of this type - */ - RiType arrayOf(); - - /** - * Gets the kind of this compiler interface type. - * @param architecture When true, the architecture-specific kind used for emitting machine code is returned. - * When false, the kind according to the Java specification is returned. - * @return the kind - */ - CiKind kind(boolean architecture); - - /** - * Gets the kind used to represent the specified part of this type. - * @param r the part of the this type - * @return the kind of constants for the specified part of the type - */ - CiKind getRepresentationKind(Representation r); - - RiResolvedType resolve(RiResolvedType accessingClass); -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiTypeProfile.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2011, 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.max.cri.ri; - -import java.io.*; - -/** - * This profile object represents the type profile at a specific BCI. The precision of the supplied values may vary, - * but a runtime that provides this information should be aware that it will be used to guide performance-critical - * decisions like speculative inlining, etc. - */ -public final class RiTypeProfile implements Serializable { - - private static final long serialVersionUID = -6877016333706838441L; - - /** - * A profiled type that has a probability. Profiled types are naturally sorted in - * descending order of their probabilities. - */ - public static class ProfiledType implements Comparable<ProfiledType>, Serializable { - private static final long serialVersionUID = 7838575753661305744L; - public final RiResolvedType type; - public final double probability; - - public ProfiledType(RiResolvedType type, double probability) { - assert type != null; - assert probability >= 0.0D && probability <= 1.0D; - this.type = type; - this.probability = probability; - } - - @Override - public int compareTo(ProfiledType o) { - if (probability > o.probability) { - return -1; - } else if (probability < o.probability) { - return 1; - } - return 0; - } - } - - private final double notRecordedProbability; - private final ProfiledType[] ptypes; - - /** - * Determines if an array of profiled types are sorted in descending order of their probabilities. - */ - public static boolean isSorted(ProfiledType[] ptypes) { - for (int i = 1; i < ptypes.length; i++) { - if (ptypes[i - 1].probability < ptypes[i].probability) { - return false; - } - } - return true; - } - - public RiTypeProfile(double notRecordedProbability, ProfiledType... ptypes) { - this.ptypes = ptypes; - this.notRecordedProbability = notRecordedProbability; - assert isSorted(ptypes); - } - - /** - * Returns the estimated probability of all types that could not be recorded due to profiling limitations. - * @return double value >= 0.0 and <= 1.0 - */ - public double getNotRecordedProbability() { - return notRecordedProbability; - } - - /** - * A list of types for which the runtime has recorded probability information. - */ - public ProfiledType[] getTypes() { - return ptypes; - } -}
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/package-info.java Fri Jun 08 15:11:19 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2009, 2011, 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. - */ -/** - * The runtime-provided part of the bi-directional interface between the compiler and the runtime system of a virtual machine for the - * instruction set defined in {@link com.oracle.graal.compiler.graphbuilder.Bytecodes}. - * <p> - * Unlike the {@link com.oracle.max.cri.ci compiler-provided interface}, the runtime-provided interface is specified largely - * using interfaces, that must be implemented by classes provided by a specific runtime implementation. - * <p> - * {@link com.oracle.max.cri.ri.RiRuntime} encapsulates the main functionality of the runtime for the compiler. - * <p> - * Types (i.e., primitives, classes and interfaces}, fields and methods are represented by {@link com.oracle.max.cri.ri.RiType}, - * {@link com.oracle.max.cri.ri.RiField} and {@link com.oracle.max.cri.ri.RiMethod}, respectively, with additional support from - * {@link com.oracle.max.cri.ri.RiSignature} and {@link com.oracle.max.cri.ri.RiExceptionHandler}. Access to the runtime constant pool - * is through {@link com.oracle.max.cri.ri.RiConstantPool}. - */ -package com.oracle.max.cri.ri;
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/CiXirAssembler.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/CiXirAssembler.java Fri Jun 08 15:17:43 2012 +0200 @@ -26,9 +26,9 @@ import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiAddress.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiAddress.*; +import com.oracle.graal.api.meta.*; /** * Represents an assembler that allows a client such as the runtime system to @@ -153,7 +153,7 @@ */ public abstract static class XirOperand { - public final CiKind kind; + public final RiKind kind; /** * Unique id in range {@code 0} to {@link #variableCount variableCount - 1}. @@ -165,7 +165,7 @@ */ public final Object name; - public XirOperand(CiXirAssembler asm, Object name, CiKind kind) { + public XirOperand(CiXirAssembler asm, Object name, RiKind kind) { this.kind = kind; this.name = name; this.index = asm.variableCount++; @@ -198,7 +198,7 @@ public final boolean canBeConstant; - XirParameter(CiXirAssembler asm, String name, CiKind kind, boolean canBeConstant) { + XirParameter(CiXirAssembler asm, String name, RiKind kind, boolean canBeConstant) { super(asm, name, kind); this.parameterIndex = asm.parameters.size(); this.canBeConstant = canBeConstant; @@ -208,7 +208,7 @@ } public static class XirConstantParameter extends XirParameter implements XirConstantOperand { - XirConstantParameter(CiXirAssembler asm, String name, CiKind kind) { + XirConstantParameter(CiXirAssembler asm, String name, RiKind kind) { super(asm, name, kind, true); } @@ -218,15 +218,15 @@ } public static class XirVariableParameter extends XirParameter { - XirVariableParameter(CiXirAssembler asm, String name, CiKind kind, boolean canBeConstant) { + XirVariableParameter(CiXirAssembler asm, String name, RiKind kind, boolean canBeConstant) { super(asm, name, kind, canBeConstant); } } public static class XirConstant extends XirOperand implements XirConstantOperand { - public final CiConstant value; + public final RiConstant value; - XirConstant(CiXirAssembler asm, CiConstant value) { + XirConstant(CiXirAssembler asm, RiConstant value) { super(asm, value, value.kind); this.value = value; } @@ -239,14 +239,14 @@ public static class XirTemp extends XirOperand { public final boolean reserve; - XirTemp(CiXirAssembler asm, String name, CiKind kind, boolean reserve) { + XirTemp(CiXirAssembler asm, String name, RiKind kind, boolean reserve) { super(asm, name, kind); this.reserve = reserve; } } public static class XirRegister extends XirTemp { - public final CiValue register; + public final RiValue register; XirRegister(CiXirAssembler asm, String name, CiRegisterValue register, boolean reserve) { super(asm, name, register.kind, reserve); @@ -267,7 +267,7 @@ * @param kind the result kind * @return an {@code XirOperand} for the result operand */ - public XirOperand restart(CiKind kind) { + public XirOperand restart(RiKind kind) { reset(); resultOperand = new XirTemp(this, "result", kind, true); allocateResultOperand = true; @@ -292,16 +292,16 @@ } /** - * Represents an XIR instruction, characterized by an {@link XirOp operation}, a {@link CiKind kind}, an optional {@link XirOperand result}, a variable number of {@link XirOperand arguments}, + * Represents an XIR instruction, characterized by an {@link XirOp operation}, a {@link RiKind kind}, an optional {@link XirOperand result}, a variable number of {@link XirOperand arguments}, * and some optional instruction-specific state. The {@link #x}, {@link #y} and {@link #z} methods are convenient ways to access the first, second and third * arguments, respectively. Only the {@link XirOp#CallStub} and {@link XirOp#CallRuntime} instructions can have more than three arguments. * */ public static final class XirInstruction { /** - * The {@link CiKind kind} of values the instruction operates on. + * The {@link RiKind kind} of values the instruction operates on. */ - public final CiKind kind; + public final RiKind kind; /** * The {@link XirOp operation}. */ @@ -319,11 +319,11 @@ */ public final Object extra; - public XirInstruction(CiKind kind, XirOp op, XirOperand result, XirOperand... arguments) { + public XirInstruction(RiKind kind, XirOp op, XirOperand result, XirOperand... arguments) { this(kind, null, op, result, arguments); } - public XirInstruction(CiKind kind, Object extra, XirOp op, XirOperand result, XirOperand... arguments) { + public XirInstruction(RiKind kind, Object extra, XirOp op, XirOperand result, XirOperand... arguments) { this.extra = extra; this.kind = kind; this.op = op; @@ -357,7 +357,7 @@ sb.append(op.name()); - if (kind != CiKind.Void) { + if (kind != RiKind.Void) { sb.append('$'); sb.append(kind.typeChar); } @@ -640,26 +640,26 @@ } public void nullCheck(XirOperand pointer) { - append(new XirInstruction(CiKind.Object, NullCheck, VOID, pointer)); + append(new XirInstruction(RiKind.Object, NullCheck, VOID, pointer)); } - public void pload(CiKind kind, XirOperand result, XirOperand pointer, boolean canTrap) { + public void pload(RiKind kind, XirOperand result, XirOperand pointer, boolean canTrap) { append(new XirInstruction(kind, canTrap, PointerLoad, result, pointer)); } - public void pstore(CiKind kind, XirOperand pointer, XirOperand value, boolean canTrap) { + public void pstore(RiKind kind, XirOperand pointer, XirOperand value, boolean canTrap) { append(new XirInstruction(kind, canTrap, PointerStore, null, pointer, value)); } - public void pload(CiKind kind, XirOperand result, XirOperand pointer, XirOperand offset, boolean canTrap) { + public void pload(RiKind kind, XirOperand result, XirOperand pointer, XirOperand offset, boolean canTrap) { append(new XirInstruction(kind, new AddressAccessInformation(canTrap), PointerLoadDisp, result, pointer, offset)); } - public void pstore(CiKind kind, XirOperand pointer, XirOperand offset, XirOperand value, boolean canTrap) { + public void pstore(RiKind kind, XirOperand pointer, XirOperand offset, XirOperand value, boolean canTrap) { append(new XirInstruction(kind, new AddressAccessInformation(canTrap), PointerStoreDisp, VOID, pointer, offset, value)); } - public void pload(CiKind kind, XirOperand result, XirOperand pointer, XirOperand index, int disp, Scale scale, boolean canTrap) { + public void pload(RiKind kind, XirOperand result, XirOperand pointer, XirOperand index, int disp, Scale scale, boolean canTrap) { append(new XirInstruction(kind, new AddressAccessInformation(canTrap, disp, scale), PointerLoadDisp, result, pointer, index)); } @@ -679,24 +679,24 @@ append(new XirInstruction(target.wordKind, null, RepeatMoveBytes, null, src, dest, length)); } - public void pstore(CiKind kind, XirOperand pointer, XirOperand index, XirOperand value, int disp, Scale scale, boolean canTrap) { + public void pstore(RiKind kind, XirOperand pointer, XirOperand index, XirOperand value, int disp, Scale scale, boolean canTrap) { append(new XirInstruction(kind, new AddressAccessInformation(canTrap, disp, scale), PointerStoreDisp, VOID, pointer, index, value)); } - public void pcas(CiKind kind, XirOperand result, XirOperand pointer, XirOperand newValue, XirOperand oldValue) { + public void pcas(RiKind kind, XirOperand result, XirOperand pointer, XirOperand newValue, XirOperand oldValue) { append(new XirInstruction(kind, null, PointerCAS, result, pointer, newValue, oldValue)); } public void jmp(XirLabel l) { - append(new XirInstruction(CiKind.Void, l, Jmp, null)); + append(new XirInstruction(RiKind.Void, l, Jmp, null)); } public void decAndJumpNotZero(XirLabel l, XirOperand val) { - append(new XirInstruction(CiKind.Void, l, DecAndJumpNotZero, null, val)); + append(new XirInstruction(RiKind.Void, l, DecAndJumpNotZero, null, val)); } public void jmpRuntime(Object rt) { - append(new XirInstruction(CiKind.Void, rt, Jmp, null)); + append(new XirInstruction(RiKind.Void, rt, Jmp, null)); } public void jeq(XirLabel l, XirOperand a, XirOperand b) { @@ -704,7 +704,7 @@ } private void jcc(XirOp op, XirLabel l, XirOperand a, XirOperand b) { - append(new XirInstruction(CiKind.Void, l, op, null, a, b)); + append(new XirInstruction(RiKind.Void, l, op, null, a, b)); } public void jneq(XirLabel l, XirOperand a, XirOperand b) { @@ -732,25 +732,25 @@ } public void jbset(XirLabel l, XirOperand a, XirOperand b, XirOperand c) { - append(new XirInstruction(CiKind.Void, l, Jbset, null, a, b, c)); + append(new XirInstruction(RiKind.Void, l, Jbset, null, a, b, c)); } public void bindInline(XirLabel l) { assert l.inline; - append(new XirInstruction(CiKind.Void, l, Bind, null)); + append(new XirInstruction(RiKind.Void, l, Bind, null)); } public void bindOutOfLine(XirLabel l) { assert !l.inline; - append(new XirInstruction(CiKind.Void, l, Bind, null)); + append(new XirInstruction(RiKind.Void, l, Bind, null)); } public void safepoint() { - append(new XirInstruction(CiKind.Void, null, Safepoint, null)); + append(new XirInstruction(RiKind.Void, null, Safepoint, null)); } public void push(XirOperand value) { - append(new XirInstruction(CiKind.Void, Push, VOID, value)); + append(new XirInstruction(RiKind.Void, Push, VOID, value)); } public void pop(XirOperand result) { @@ -760,20 +760,20 @@ public XirMark mark(Object id, XirMark... references) { XirMark mark = new XirMark(id, references); marks.add(mark); - append(new XirInstruction(CiKind.Void, mark, Mark, null)); + append(new XirInstruction(RiKind.Void, mark, Mark, null)); return mark; } public void nop(int size) { - append(new XirInstruction(CiKind.Void, size, Nop, null)); + append(new XirInstruction(RiKind.Void, size, Nop, null)); } public void shouldNotReachHere() { - append(new XirInstruction(CiKind.Void, null, ShouldNotReachHere, null)); + append(new XirInstruction(RiKind.Void, null, ShouldNotReachHere, null)); } public void shouldNotReachHere(String message) { - append(new XirInstruction(CiKind.Void, message, ShouldNotReachHere, null)); + append(new XirInstruction(RiKind.Void, message, ShouldNotReachHere, null)); } public void callRuntime(Object rt, XirOperand result, XirOperand... args) { @@ -781,7 +781,7 @@ } public void callRuntime(Object rt, XirOperand result, boolean useInfoAfter, XirOperand... args) { - CiKind resultKind = result == null ? CiKind.Void : result.kind; + RiKind resultKind = result == null ? RiKind.Void : result.kind; append(new XirInstruction(resultKind, new RuntimeCallInformation(rt, useInfoAfter), CallRuntime, result, args)); } @@ -795,54 +795,54 @@ } /** - * Creates an {@link XirVariableParameter variable input parameter} of given name and {@link CiKind kind}. + * Creates an {@link XirVariableParameter variable input parameter} of given name and {@link RiKind kind}. * @param name a name for the parameter * @param kind the parameter kind * @return the {@link XirVariableParameter} */ - public XirVariableParameter createInputParameter(String name, CiKind kind, boolean canBeConstant) { + public XirVariableParameter createInputParameter(String name, RiKind kind, boolean canBeConstant) { assert !finished; return new XirVariableParameter(this, name, kind, canBeConstant); } - public XirVariableParameter createInputParameter(String name, CiKind kind) { + public XirVariableParameter createInputParameter(String name, RiKind kind) { return createInputParameter(name, kind, false); } /** - * Creates an {@link XirConstantParameter constant input parameter} of given name and {@link CiKind kind}. + * Creates an {@link XirConstantParameter constant input parameter} of given name and {@link RiKind kind}. * @param name a name for the parameter * @param kind the parameter kind * @return the {@link XirConstantParameter} */ - public XirConstantParameter createConstantInputParameter(String name, CiKind kind) { + public XirConstantParameter createConstantInputParameter(String name, RiKind kind) { assert !finished; return new XirConstantParameter(this, name, kind); } - public XirConstant createConstant(CiConstant constant) { + public XirConstant createConstant(RiConstant constant) { assert !finished; XirConstant temp = new XirConstant(this, constant); constants.add(temp); return temp; } - public XirOperand createTemp(String name, CiKind kind) { + public XirOperand createTemp(String name, RiKind kind) { assert !finished; XirTemp temp = new XirTemp(this, name, kind, true); temps.add(temp); return temp; } - public XirOperand createRegister(String name, CiKind kind, CiRegister register) { + public XirOperand createRegister(String name, RiKind kind, CiRegister register) { return createRegister(name, kind, register, false); } - public XirOperand createRegisterTemp(String name, CiKind kind, CiRegister register) { + public XirOperand createRegisterTemp(String name, RiKind kind, CiRegister register) { return createRegister(name, kind, register, true); } - private XirOperand createRegister(String name, CiKind kind, CiRegister register, boolean reserve) { + private XirOperand createRegister(String name, RiKind kind, CiRegister register, boolean reserve) { assert !finished; XirRegister fixed = new XirRegister(this, name, register.asValue(kind), reserve); temps.add(fixed); @@ -868,19 +868,19 @@ } public XirConstant i(int v) { - return createConstant(CiConstant.forInt(v)); + return createConstant(RiConstant.forInt(v)); } public XirConstant l(long v) { - return createConstant(CiConstant.forLong(v)); + return createConstant(RiConstant.forLong(v)); } public XirConstant b(boolean v) { - return createConstant(CiConstant.forBoolean(v)); + return createConstant(RiConstant.forBoolean(v)); } public XirConstant o(Object obj) { - return createConstant(CiConstant.forObject(obj)); + return createConstant(RiConstant.forObject(obj)); } public void reserveOutgoingStack(int size) {
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/RiXirGenerator.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/RiXirGenerator.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,9 +22,8 @@ */ package com.oracle.max.cri.xir; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiType.Representation; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiType.*; /** * Represents the interface through which the compiler requests the XIR for a given bytecode from the runtime system. @@ -45,7 +44,7 @@ XirSnippet genNewInstance(XirSite site, RiType type); - XirSnippet genNewArray(XirSite site, XirArgument length, CiKind elementKind, RiType componentType, RiType arrayType); + XirSnippet genNewArray(XirSite site, XirArgument length, RiKind elementKind, RiType componentType, RiType arrayType); XirSnippet genNewMultiArray(XirSite site, XirArgument[] lengths, RiType type);
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirArgument.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirArgument.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,18 +22,18 @@ */ package com.oracle.max.cri.xir; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.meta.*; /** * Represents an argument to an {@link XirSnippet}. - * Currently, this is a <i>union </i> type; it is either a {@link CiConstant} or an {@code Object}. + * Currently, this is a <i>union </i> type; it is either a {@link RiConstant} or an {@code Object}. */ public final class XirArgument { - public final CiConstant constant; + public final RiConstant constant; public final Object object; - private XirArgument(CiConstant value) { + private XirArgument(RiConstant value) { this.constant = value; this.object = null; } @@ -48,15 +48,15 @@ } public static XirArgument forInt(int x) { - return new XirArgument(CiConstant.forInt(x)); + return new XirArgument(RiConstant.forInt(x)); } public static XirArgument forLong(long x) { - return new XirArgument(CiConstant.forLong(x)); + return new XirArgument(RiConstant.forLong(x)); } public static XirArgument forObject(Object o) { - return new XirArgument(CiConstant.forObject(o)); + return new XirArgument(RiConstant.forObject(o)); } @Override
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirSite.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirSite.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.max.cri.xir; -import com.oracle.max.cri.ci.*; +import com.oracle.graal.api.code.*; /** * Encapsulates the notion of a site where XIR can be supplied. It is supplied to the {@link RiXirGenerator} by the
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirSnippet.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/xir/XirSnippet.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,8 +24,8 @@ import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiTargetMethod.*; +import com.oracle.graal.api.code.CiTargetMethod.*; +import com.oracle.graal.api.meta.*; import com.oracle.max.cri.xir.CiXirAssembler.*; /** @@ -58,7 +58,7 @@ } private static boolean assertArgumentCorrect(XirParameter param, XirArgument arg) { - if (param.kind == CiKind.Illegal || param.kind == CiKind.Void) { + if (param.kind == RiKind.Illegal || param.kind == RiKind.Void) { if (arg != null) { return false; }
--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseProfilingInfo.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseProfilingInfo.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.max.criutils; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; /**
--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseUnresolvedField.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseUnresolvedField.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.max.criutils; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; /** * A implementation of {@link RiField} for an unresolved field. @@ -48,7 +48,7 @@ return type; } - public CiKind kind(boolean architecture) { + public RiKind kind(boolean architecture) { return type.kind(architecture); }
--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseUnresolvedMethod.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseUnresolvedMethod.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.max.criutils; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; /** * A implementation of {@link RiMethod} for an unresolved method.
--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/CompilationPrinter.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/CompilationPrinter.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.max.criutils; -import static com.oracle.max.cri.ci.CiValueUtil.*; +import static com.oracle.graal.api.code.CiValueUtil.*; import java.io.*; import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; /** * Utility for printing compilation related data structures at various compilation phases. @@ -106,7 +106,7 @@ /** * Formats a given {@linkplain FrameState JVM frame state} as a multi line string. */ - protected String debugInfoToString(CiCodePos codePos, CiBitMap registerRefMap, CiBitMap frameRefMap, CiArchitecture arch) { + protected String debugInfoToString(CiCodePos codePos, RiBitMap registerRefMap, RiBitMap frameRefMap, CiArchitecture arch) { StringBuilder sb = new StringBuilder(); if (registerRefMap != null) { @@ -170,7 +170,7 @@ return sb.toString(); } - protected String valueToString(CiValue value, List<CiVirtualObject> virtualObjects) { + protected String valueToString(RiValue value, List<CiVirtualObject> virtualObjects) { if (value == null) { return "-"; }
--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/HexCodeFile.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/HexCodeFile.java Fri Jun 08 15:17:43 2012 +0200 @@ -27,8 +27,8 @@ import java.util.*; import java.util.regex.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ci.CiTargetMethod.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CiTargetMethod.*; /**
--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/JniMangle.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/JniMangle.java Fri Jun 08 15:17:43 2012 +0200 @@ -22,8 +22,7 @@ */ package com.oracle.max.criutils; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.meta.*; /** * A utility for mangling Java method name and signatures into C function names. @@ -81,7 +80,7 @@ */ public static String mangleMethod(RiResolvedType declaringClass, String name, RiSignature signature, boolean splitSuffix) { final StringBuilder result = new StringBuilder(100); - final String declaringClassName = CiUtil.toJavaName(declaringClass); + final String declaringClassName = RiUtil.toJavaName(declaringClass); result.append("Java_").append(mangle(declaringClassName)).append('_').append(mangle(name)); if (signature != null) { if (splitSuffix) {
--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/SnapshotProfilingInfo.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/SnapshotProfilingInfo.java Fri Jun 08 15:17:43 2012 +0200 @@ -24,8 +24,8 @@ import java.io.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; /** * A profiling info snapshot that can be {@linkplain #save(File, File) saved} to
--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/TypeCheckHints.java Fri Jun 08 15:11:19 2012 +0200 +++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/TypeCheckHints.java Fri Jun 08 15:17:43 2012 +0200 @@ -25,9 +25,9 @@ import java.lang.reflect.*; import java.util.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; -import com.oracle.max.cri.ri.RiTypeProfile.ProfiledType; +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.api.meta.RiTypeProfile.*; /** * Utility for deriving hint types for a type check instruction (e.g. checkcast or instanceof)
--- a/mx/projects Fri Jun 08 15:11:19 2012 +0200 +++ b/mx/projects Fri Jun 08 15:17:43 2012 +0200 @@ -22,10 +22,36 @@ library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0.jar library@DACAPO_SCALA@urls=http://repo.scalabench.org/snapshots/org/scalabench/benchmarks/scala-benchmark-suite/0.1.0-SNAPSHOT/scala-benchmark-suite-0.1.0-20110908.085753-2.jar +# graal.api +project@com.oracle.graal.api@subDir=graal +project@com.oracle.graal.api@sourceDirs=src +project@com.oracle.graal.api@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.api@javaCompliance=1.7 + +# graal.api.meta +project@com.oracle.graal.api.meta@subDir=graal +project@com.oracle.graal.api.meta@sourceDirs=src +project@com.oracle.graal.api.meta@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.api.meta@javaCompliance=1.7 + +# graal.api.code +project@com.oracle.graal.api.code@subDir=graal +project@com.oracle.graal.api.code@sourceDirs=src +project@com.oracle.graal.api.code@dependencies=com.oracle.graal.api.meta +project@com.oracle.graal.api.code@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.api.code@javaCompliance=1.7 + +# graal.api.interpreter +project@com.oracle.graal.api.interpreter@subDir=graal +project@com.oracle.graal.api.interpreter@sourceDirs=src +project@com.oracle.graal.api.interpreter@dependencies=com.oracle.graal.api.meta +project@com.oracle.graal.api.interpreter@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.api.interpreter@javaCompliance=1.7 + # graal.hotspot project@com.oracle.graal.hotspot@subDir=graal project@com.oracle.graal.hotspot@sourceDirs=src -project@com.oracle.graal.hotspot@dependencies=com.oracle.graal.snippets +project@com.oracle.graal.hotspot@dependencies=com.oracle.graal.snippets,com.oracle.graal.api.interpreter,com.oracle.graal.api project@com.oracle.graal.hotspot@checkstyle=com.oracle.graal.graph project@com.oracle.graal.hotspot@javaCompliance=1.7 @@ -127,7 +153,7 @@ # max.cri project@com.oracle.max.cri@subDir=graal project@com.oracle.max.cri@sourceDirs=src -project@com.oracle.max.cri@dependencies= +project@com.oracle.max.cri@dependencies=com.oracle.graal.api.code project@com.oracle.max.cri@checkstyle=com.oracle.graal.graph project@com.oracle.max.cri@javaCompliance=1.7
--- a/src/share/vm/classfile/vmSymbols.hpp Fri Jun 08 15:11:19 2012 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Fri Jun 08 15:17:43 2012 +0200 @@ -282,39 +282,39 @@ template(com_oracle_graal_hotspot_HotSpotKlassOop, "com/oracle/graal/hotspot/ri/HotSpotKlassOop") \ template(com_oracle_graal_hotspot_HotSpotExceptionHandler, "com/oracle/graal/hotspot/ri/HotSpotExceptionHandler") \ template(com_oracle_graal_hotspot_HotSpotProxy, "com/oracle/graal/hotspot/HotSpotProxy") \ - template(com_oracle_graal_hotspot_Compiler, "com/oracle/graal/hotspot/Compiler") \ - template(com_oracle_graal_hotspot_CompilerImpl, "com/oracle/graal/hotspot/CompilerImpl") \ - template(com_oracle_max_cri_ri_RiMethod, "com/oracle/max/cri/ri/RiMethod") \ - template(com_oracle_max_cri_ri_RiResolvedField, "com/oracle/max/cri/ri/RiResolvedField") \ - template(com_oracle_max_cri_ri_RiType, "com/oracle/max/cri/ri/RiType") \ - template(com_oracle_max_cri_ri_RiConstantPool, "com/oracle/max/cri/ri/RiConstantPool") \ - template(com_oracle_max_cri_ri_RiExceptionHandler, "com/oracle/max/cri/ri/RiExceptionHandler") \ - template(com_oracle_max_cri_ci_CiAssumptions, "com/oracle/max/cri/ci/CiAssumptions") \ - template(com_oracle_max_cri_ci_CiAssumptions_MethodContents, "com/oracle/max/cri/ci/CiAssumptions$MethodContents") \ - template(com_oracle_max_cri_ci_CiAssumptions_ConcreteSubtype, "com/oracle/max/cri/ci/CiAssumptions$ConcreteSubtype") \ - template(com_oracle_max_cri_ci_CiAssumptions_ConcreteMethod, "com/oracle/max/cri/ci/CiAssumptions$ConcreteMethod") \ - template(com_oracle_max_cri_ci_CiGenericCallback, "com/oracle/max/cri/ci/CiGenericCallback") \ - template(com_oracle_max_cri_ci_CiTargetMethod, "com/oracle/max/cri/ci/CiTargetMethod") \ - template(com_oracle_max_cri_ci_CiTargetMethod_Site, "com/oracle/max/cri/ci/CiTargetMethod$Site") \ - template(com_oracle_max_cri_ci_CiTargetMethod_Call, "com/oracle/max/cri/ci/CiTargetMethod$Call") \ - template(com_oracle_max_cri_ci_CiTargetMethod_DataPatch, "com/oracle/max/cri/ci/CiTargetMethod$DataPatch") \ - template(com_oracle_max_cri_ci_CiTargetMethod_Safepoint, "com/oracle/max/cri/ci/CiTargetMethod$Safepoint") \ - template(com_oracle_max_cri_ci_CiTargetMethod_ExceptionHandler, "com/oracle/max/cri/ci/CiTargetMethod$ExceptionHandler") \ - template(com_oracle_max_cri_ci_CiTargetMethod_Mark, "com/oracle/max/cri/ci/CiTargetMethod$Mark") \ + template(com_oracle_graal_hotspot_Compiler, "com/oracle/graal/hotspot/HotSpotCompiler") \ + template(com_oracle_graal_hotspot_CompilerImpl, "com/oracle/graal/hotspot/HotSpotCompilerImpl") \ + template(com_oracle_max_cri_ri_RiMethod, "com/oracle/graal/api/meta/RiMethod") \ + template(com_oracle_max_cri_ri_RiResolvedField, "com/oracle/graal/api/meta/RiResolvedField") \ + template(com_oracle_max_cri_ri_RiType, "com/oracle/graal/api/meta/RiType") \ + template(com_oracle_max_cri_ri_RiConstantPool, "com/oracle/graal/api/meta/RiConstantPool") \ + template(com_oracle_max_cri_ri_RiExceptionHandler, "com/oracle/graal/api/meta/RiExceptionHandler") \ + template(com_oracle_max_cri_ci_CiAssumptions, "com/oracle/graal/api/code/CiAssumptions") \ + template(com_oracle_max_cri_ci_CiAssumptions_MethodContents, "com/oracle/graal/api/code/CiAssumptions$MethodContents") \ + template(com_oracle_max_cri_ci_CiAssumptions_ConcreteSubtype, "com/oracle/graal/api/code/CiAssumptions$ConcreteSubtype") \ + template(com_oracle_max_cri_ci_CiAssumptions_ConcreteMethod, "com/oracle/graal/api/code/CiAssumptions$ConcreteMethod") \ + template(com_oracle_max_cri_ci_CiGenericCallback, "com/oracle/graal/api/code/CiGenericCallback") \ + template(com_oracle_max_cri_ci_CiTargetMethod, "com/oracle/graal/api/code/CiTargetMethod") \ + template(com_oracle_max_cri_ci_CiTargetMethod_Site, "com/oracle/graal/api/code/CiTargetMethod$Site") \ + template(com_oracle_max_cri_ci_CiTargetMethod_Call, "com/oracle/graal/api/code/CiTargetMethod$Call") \ + template(com_oracle_max_cri_ci_CiTargetMethod_DataPatch, "com/oracle/graal/api/code/CiTargetMethod$DataPatch") \ + template(com_oracle_max_cri_ci_CiTargetMethod_Safepoint, "com/oracle/graal/api/code/CiTargetMethod$Safepoint") \ + template(com_oracle_max_cri_ci_CiTargetMethod_ExceptionHandler, "com/oracle/graal/api/code/CiTargetMethod$ExceptionHandler") \ + template(com_oracle_max_cri_ci_CiTargetMethod_Mark, "com/oracle/graal/api/code/CiTargetMethod$Mark") \ template(com_oracle_graal_graph_BitMap, "com/oracle/graal/graph/BitMap") \ - template(com_oracle_max_cri_ci_CiBitMap, "com/oracle/max/cri/ci/CiBitMap") \ - template(com_oracle_max_cri_ci_CiDebugInfo, "com/oracle/max/cri/ci/CiDebugInfo") \ - template(com_oracle_max_cri_ci_CiFrame, "com/oracle/max/cri/ci/CiFrame") \ - template(com_oracle_max_cri_ci_CiValue, "com/oracle/max/cri/ci/CiValue") \ - template(com_oracle_max_cri_ci_CiStackSlot, "com/oracle/max/cri/ci/CiStackSlot") \ - template(com_oracle_max_cri_ci_CiRegisterValue, "com/oracle/max/cri/ci/CiRegisterValue") \ - template(com_oracle_max_cri_ci_CiRegister, "com/oracle/max/cri/ci/CiRegister") \ - template(com_oracle_max_cri_ci_CiCodePos, "com/oracle/max/cri/ci/CiCodePos") \ - template(com_oracle_max_cri_ci_CiConstant, "com/oracle/max/cri/ci/CiConstant") \ - template(com_oracle_max_cri_ci_CiVirtualObject, "com/oracle/max/cri/ci/CiVirtualObject") \ - template(com_oracle_max_cri_ci_CiMonitorValue, "com/oracle/max/cri/ci/CiMonitorValue") \ - template(com_oracle_max_cri_ci_CiKind, "com/oracle/max/cri/ci/CiKind") \ - template(com_oracle_max_cri_ci_CiRuntimeCall, "com/oracle/max/cri/ci/CiRuntimeCall") \ + template(com_oracle_max_cri_ci_CiBitMap, "com/oracle/graal/api/meta/RiBitMap") \ + template(com_oracle_max_cri_ci_CiDebugInfo, "com/oracle/graal/api/code/CiDebugInfo") \ + template(com_oracle_max_cri_ci_CiFrame, "com/oracle/graal/api/code/CiFrame") \ + template(com_oracle_max_cri_ci_CiValue, "com/oracle/graal/api/meta/RiValue") \ + template(com_oracle_max_cri_ci_CiStackSlot, "com/oracle/graal/api/code/CiStackSlot") \ + template(com_oracle_max_cri_ci_CiRegisterValue, "com/oracle/graal/api/code/CiRegisterValue") \ + template(com_oracle_max_cri_ci_CiRegister, "com/oracle/graal/api/code/CiRegister") \ + template(com_oracle_max_cri_ci_CiCodePos, "com/oracle/graal/api/code/CiCodePos") \ + template(com_oracle_max_cri_ci_CiConstant, "com/oracle/graal/api/meta/RiConstant") \ + template(com_oracle_max_cri_ci_CiVirtualObject, "com/oracle/graal/api/code/CiVirtualObject") \ + template(com_oracle_max_cri_ci_CiMonitorValue, "com/oracle/graal/api/code/CiMonitorValue") \ + template(com_oracle_max_cri_ci_CiKind, "com/oracle/graal/api/meta/RiKind") \ + template(com_oracle_max_cri_ci_CiRuntimeCall, "com/oracle/graal/api/code/CiRuntimeCall") \ template(startCompiler_name, "startCompiler") \ template(bootstrap_name, "bootstrap") \ template(shutdownCompiler_name, "shutdownCompiler") \ @@ -324,36 +324,36 @@ template(setDefaultOptions_name, "setDefaultOptions") \ template(setOption_signature, "(Ljava/lang/String;)Z") \ template(createRiMethodResolved_name, "createRiMethodResolved") \ - template(createRiMethodResolved_signature, "(JLjava/lang/String;)Lcom/oracle/max/cri/ri/RiMethod;") \ + template(createRiMethodResolved_signature, "(JLjava/lang/String;)Lcom/oracle/graal/api/meta/RiMethod;") \ template(createRiMethodUnresolved_name, "createRiMethodUnresolved") \ - template(createRiMethodUnresolved_signature, "(Ljava/lang/String;Ljava/lang/String;Lcom/oracle/max/cri/ri/RiType;)Lcom/oracle/max/cri/ri/RiMethod;") \ + template(createRiMethodUnresolved_signature, "(Ljava/lang/String;Ljava/lang/String;Lcom/oracle/graal/api/meta/RiType;)Lcom/oracle/graal/api/meta/RiMethod;") \ template(createRiSignature_name, "createRiSignature") \ - template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/oracle/max/cri/ri/RiSignature;") \ + template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/RiSignature;") \ template(createRiField_name, "createRiField") \ - template(createRiField_signature, "(Lcom/oracle/max/cri/ri/RiType;Ljava/lang/String;Lcom/oracle/max/cri/ri/RiType;II)Lcom/oracle/max/cri/ri/RiField;") \ + template(createRiField_signature, "(Lcom/oracle/graal/api/meta/RiType;Ljava/lang/String;Lcom/oracle/graal/api/meta/RiType;II)Lcom/oracle/graal/api/meta/RiField;") \ template(createRiType_name, "createRiType") \ - template(createRiType_signature, "(JLjava/lang/String;)Lcom/oracle/max/cri/ri/RiType;") \ + template(createRiType_signature, "(JLjava/lang/String;)Lcom/oracle/graal/api/meta/RiType;") \ template(createRiTypePrimitive_name, "createRiTypePrimitive") \ - template(createRiTypePrimitive_signature, "(I)Lcom/oracle/max/cri/ri/RiType;") \ + template(createRiTypePrimitive_signature, "(I)Lcom/oracle/graal/api/meta/RiType;") \ template(createRiTypeUnresolved_name, "createRiTypeUnresolved") \ - template(createRiTypeUnresolved_signature, "(Ljava/lang/String;)Lcom/oracle/max/cri/ri/RiType;") \ + template(createRiTypeUnresolved_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/RiType;") \ template(createCiConstant_name, "createCiConstant") \ - template(createCiConstant_signature, "(Lcom/oracle/max/cri/ci/CiKind;J)Lcom/oracle/max/cri/ci/CiConstant;") \ + template(createCiConstant_signature, "(Lcom/oracle/graal/api/meta/RiKind;J)Lcom/oracle/graal/api/meta/RiConstant;") \ template(createCiConstantFloat_name, "createCiConstantFloat") \ - template(createCiConstantFloat_signature, "(F)Lcom/oracle/max/cri/ci/CiConstant;") \ + template(createCiConstantFloat_signature, "(F)Lcom/oracle/graal/api/meta/RiConstant;") \ template(createCiConstantDouble_name, "createCiConstantDouble") \ - template(createCiConstantDouble_signature, "(D)Lcom/oracle/max/cri/ci/CiConstant;") \ + template(createCiConstantDouble_signature, "(D)Lcom/oracle/graal/api/meta/RiConstant;") \ template(createCiConstantObject_name, "createCiConstantObject") \ - template(createCiConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/max/cri/ci/CiConstant;") \ + template(createCiConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/graal/api/meta/RiConstant;") \ template(getVMToCompiler_name, "getVMToCompiler") \ template(getVMToCompiler_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \ template(getInstance_name, "getInstance") \ template(initialize_name, "initialize") \ - template(getInstance_signature, "()Lcom/oracle/graal/hotspot/Compiler;") \ + template(getInstance_signature, "()Lcom/oracle/graal/hotspot/HotSpotCompiler;") \ template(forObject_name, "forObject") \ template(callbackInternal_name, "callbackInternal") \ template(callback_signature, "(Ljava/lang/Object;)Ljava/lang/Object;") \ - template(MethodInvalidatedException, "com/oracle/max/cri/ri/RiCompiledMethod$MethodInvalidatedException") \ + template(MethodInvalidatedException, "com/oracle/graal/api/meta/RiCompiledMethod$MethodInvalidatedException") \ \ \ /* common method and field names */ \
--- a/src/share/vm/graal/graalCompilerToVM.cpp Fri Jun 08 15:11:19 2012 +0200 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Fri Jun 08 15:17:43 2012 +0200 @@ -1122,25 +1122,25 @@ #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_##f)) #define PROXY "J" -#define TYPE "Lcom/oracle/max/cri/ri/RiType;" +#define TYPE "Lcom/oracle/graal/api/meta/RiType;" #define RESOLVED_TYPE "Lcom/oracle/graal/hotspot/ri/HotSpotTypeResolved;" -#define METHOD "Lcom/oracle/max/cri/ri/RiMethod;" +#define METHOD "Lcom/oracle/graal/api/meta/RiMethod;" #define RESOLVED_METHOD "Lcom/oracle/graal/hotspot/ri/HotSpotMethodResolved;" #define REFLECT_METHOD "Ljava/lang/reflect/Method;" -#define SIGNATURE "Lcom/oracle/max/cri/ri/RiSignature;" -#define FIELD "Lcom/oracle/max/cri/ri/RiField;" -#define RESOLVED_FIELD "Lcom/oracle/max/cri/ri/RiResolvedField;" -#define CONSTANT_POOL "Lcom/oracle/max/cri/ri/RiConstantPool;" -#define EXCEPTION_HANDLERS "[Lcom/oracle/max/cri/ri/RiExceptionHandler;" +#define SIGNATURE "Lcom/oracle/graal/api/meta/RiSignature;" +#define FIELD "Lcom/oracle/graal/api/meta/RiField;" +#define RESOLVED_FIELD "Lcom/oracle/graal/api/meta/RiResolvedField;" +#define CONSTANT_POOL "Lcom/oracle/graal/api/meta/RiConstantPool;" +#define EXCEPTION_HANDLERS "[Lcom/oracle/graal/api/meta/RiExceptionHandler;" #define TARGET_METHOD "Lcom/oracle/graal/hotspot/HotSpotTargetMethod;" #define CONFIG "Lcom/oracle/graal/hotspot/HotSpotVMConfig;" #define HS_METHOD "Lcom/oracle/graal/hotspot/ri/HotSpotMethod;" #define HS_COMP_METHOD "Lcom/oracle/graal/hotspot/ri/HotSpotCompiledMethod;" #define HS_CODE_INFO "Lcom/oracle/graal/hotspot/ri/HotSpotCodeInfo;" #define METHOD_DATA "Lcom/oracle/graal/hotspot/ri/HotSpotMethodData;" -#define CI_CONSTANT "Lcom/oracle/max/cri/ci/CiConstant;" -#define CI_KIND "Lcom/oracle/max/cri/ci/CiKind;" -#define CI_RUNTIME_CALL "Lcom/oracle/max/cri/ci/CiRuntimeCall;" +#define CI_CONSTANT "Lcom/oracle/graal/api/meta/RiConstant;" +#define CI_KIND "Lcom/oracle/graal/api/meta/RiKind;" +#define CI_RUNTIME_CALL "Lcom/oracle/graal/api/code/CiRuntimeCall;" #define STRING "Ljava/lang/String;" #define OBJECT "Ljava/lang/Object;" #define CLASS "Ljava/lang/Class;"
--- a/src/share/vm/graal/graalJavaAccess.hpp Fri Jun 08 15:11:19 2012 +0200 +++ b/src/share/vm/graal/graalJavaAccess.hpp Fri Jun 08 15:17:43 2012 +0200 @@ -46,7 +46,7 @@ #define COMPILER_CLASSES_DO(start_class, end_class, char_field, int_field, boolean_field, long_field, float_field, oop_field, static_oop_field) \ start_class(HotSpotTypeResolved) \ - oop_field(HotSpotTypeResolved, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ + oop_field(HotSpotTypeResolved, compiler, "Lcom/oracle/graal/hotspot/HotSpotCompiler;") \ oop_field(HotSpotTypeResolved, javaMirror, "Ljava/lang/Class;") \ oop_field(HotSpotTypeResolved, simpleName, "Ljava/lang/String;") \ int_field(HotSpotTypeResolved, accessFlags) \ @@ -63,9 +63,9 @@ oop_field(HotSpotKlassOop, javaMirror, "Ljava/lang/Class;") \ end_class \ start_class(HotSpotMethodResolved) \ - oop_field(HotSpotMethodResolved, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ + oop_field(HotSpotMethodResolved, compiler, "Lcom/oracle/graal/hotspot/HotSpotCompiler;") \ oop_field(HotSpotMethodResolved, name, "Ljava/lang/String;") \ - oop_field(HotSpotMethodResolved, holder, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ + oop_field(HotSpotMethodResolved, holder, "Lcom/oracle/graal/api/meta/RiResolvedType;") \ oop_field(HotSpotMethodResolved, javaMirror, "Ljava/lang/Object;") \ int_field(HotSpotMethodResolved, codeSize) \ int_field(HotSpotMethodResolved, accessFlags) \ @@ -74,7 +74,7 @@ boolean_field(HotSpotMethodResolved, canBeInlined) \ end_class \ start_class(HotSpotMethodData) \ - oop_field(HotSpotMethodData, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ + oop_field(HotSpotMethodData, compiler, "Lcom/oracle/graal/hotspot/HotSpotCompiler;") \ oop_field(HotSpotMethodData, hotspotMirror, "Ljava/lang/Object;") \ int_field(HotSpotMethodData, normalDataSize) \ int_field(HotSpotMethodData, extraDataSize) \ @@ -83,14 +83,14 @@ oop_field(HotSpotType, name, "Ljava/lang/String;") \ end_class \ start_class(HotSpotField) \ - oop_field(HotSpotField, constant, "Lcom/oracle/max/cri/ci/CiConstant;") \ + oop_field(HotSpotField, constant, "Lcom/oracle/graal/api/meta/RiConstant;") \ int_field(HotSpotField, offset) \ int_field(HotSpotField, accessFlags) \ end_class \ start_class(HotSpotCompiledMethod) \ - oop_field(HotSpotCompiledMethod, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ + oop_field(HotSpotCompiledMethod, compiler, "Lcom/oracle/graal/hotspot/HotSpotCompiler;") \ long_field(HotSpotCompiledMethod, nmethod) \ - oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;")\ + oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;")\ end_class \ start_class(HotSpotCodeInfo) \ long_field(HotSpotCodeInfo, start) \ @@ -100,66 +100,66 @@ static_oop_field(HotSpotProxy, DUMMY_CONSTANT_OBJ, "Ljava/lang/Long;") \ end_class \ start_class(HotSpotTargetMethod) \ - oop_field(HotSpotTargetMethod, targetMethod, "Lcom/oracle/max/cri/ci/CiTargetMethod;") \ + oop_field(HotSpotTargetMethod, targetMethod, "Lcom/oracle/graal/api/code/CiTargetMethod;") \ oop_field(HotSpotTargetMethod, method, "Lcom/oracle/graal/hotspot/ri/HotSpotMethodResolved;") \ oop_field(HotSpotTargetMethod, name, "Ljava/lang/String;") \ - oop_field(HotSpotTargetMethod, sites, "[Lcom/oracle/max/cri/ci/CiTargetMethod$Site;") \ - oop_field(HotSpotTargetMethod, exceptionHandlers, "[Lcom/oracle/max/cri/ci/CiTargetMethod$ExceptionHandler;") \ + oop_field(HotSpotTargetMethod, sites, "[Lcom/oracle/graal/api/code/CiTargetMethod$Site;") \ + oop_field(HotSpotTargetMethod, exceptionHandlers, "[Lcom/oracle/graal/api/code/CiTargetMethod$ExceptionHandler;") \ end_class \ start_class(HotSpotExceptionHandler) \ int_field(HotSpotExceptionHandler, startBci) \ int_field(HotSpotExceptionHandler, endBci) \ int_field(HotSpotExceptionHandler, handlerBci) \ int_field(HotSpotExceptionHandler, catchClassIndex) \ - oop_field(HotSpotExceptionHandler, catchClass, "Lcom/oracle/max/cri/ri/RiType;") \ + oop_field(HotSpotExceptionHandler, catchClass, "Lcom/oracle/graal/api/meta/RiType;") \ end_class \ start_class(CiTargetMethod) \ int_field(CiTargetMethod, frameSize) \ int_field(CiTargetMethod, customStackAreaOffset) \ oop_field(CiTargetMethod, targetCode, "[B") \ - oop_field(CiTargetMethod, assumptions, "Lcom/oracle/max/cri/ci/CiAssumptions;") \ + oop_field(CiTargetMethod, assumptions, "Lcom/oracle/graal/api/code/CiAssumptions;") \ int_field(CiTargetMethod, targetCodeSize) \ end_class \ start_class(CiAssumptions) \ - oop_field(CiAssumptions, list, "[Lcom/oracle/max/cri/ci/CiAssumptions$Assumption;") \ + oop_field(CiAssumptions, list, "[Lcom/oracle/graal/api/code/CiAssumptions$Assumption;") \ end_class \ start_class(CiAssumptions_MethodContents) \ - oop_field(CiAssumptions_MethodContents, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ + oop_field(CiAssumptions_MethodContents, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \ end_class \ start_class(CiAssumptions_ConcreteSubtype) \ - oop_field(CiAssumptions_ConcreteSubtype, context, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ - oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ + oop_field(CiAssumptions_ConcreteSubtype, context, "Lcom/oracle/graal/api/meta/RiResolvedType;") \ + oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/oracle/graal/api/meta/RiResolvedType;") \ end_class \ start_class(CiAssumptions_ConcreteMethod) \ - oop_field(CiAssumptions_ConcreteMethod, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ - oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ - oop_field(CiAssumptions_ConcreteMethod, impl, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ + oop_field(CiAssumptions_ConcreteMethod, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \ + oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/oracle/graal/api/meta/RiResolvedType;") \ + oop_field(CiAssumptions_ConcreteMethod, impl, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \ end_class \ start_class(CiTargetMethod_Site) \ int_field(CiTargetMethod_Site, pcOffset) \ end_class \ start_class(CiTargetMethod_Call) \ oop_field(CiTargetMethod_Call, target, "Ljava/lang/Object;") \ - oop_field(CiTargetMethod_Call, debugInfo, "Lcom/oracle/max/cri/ci/CiDebugInfo;") \ + oop_field(CiTargetMethod_Call, debugInfo, "Lcom/oracle/graal/api/code/CiDebugInfo;") \ end_class \ start_class(CiTargetMethod_DataPatch) \ - oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/max/cri/ci/CiConstant;") \ + oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/graal/api/meta/RiConstant;") \ int_field(CiTargetMethod_DataPatch, alignment) \ end_class \ start_class(CiTargetMethod_Safepoint) \ - oop_field(CiTargetMethod_Safepoint, debugInfo, "Lcom/oracle/max/cri/ci/CiDebugInfo;") \ + oop_field(CiTargetMethod_Safepoint, debugInfo, "Lcom/oracle/graal/api/code/CiDebugInfo;") \ end_class \ start_class(CiTargetMethod_ExceptionHandler) \ int_field(CiTargetMethod_ExceptionHandler, handlerPos) \ end_class \ start_class(CiTargetMethod_Mark) \ oop_field(CiTargetMethod_Mark, id, "Ljava/lang/Object;") \ - oop_field(CiTargetMethod_Mark, references, "[Lcom/oracle/max/cri/ci/CiTargetMethod$Mark;") \ + oop_field(CiTargetMethod_Mark, references, "[Lcom/oracle/graal/api/code/CiTargetMethod$Mark;") \ end_class \ start_class(CiDebugInfo) \ - oop_field(CiDebugInfo, codePos, "Lcom/oracle/max/cri/ci/CiCodePos;") \ - oop_field(CiDebugInfo, registerRefMap, "Lcom/oracle/max/cri/ci/CiBitMap;") \ - oop_field(CiDebugInfo, frameRefMap, "Lcom/oracle/max/cri/ci/CiBitMap;") \ + oop_field(CiDebugInfo, codePos, "Lcom/oracle/graal/api/code/CiCodePos;") \ + oop_field(CiDebugInfo, registerRefMap, "Lcom/oracle/graal/api/meta/RiBitMap;") \ + oop_field(CiDebugInfo, frameRefMap, "Lcom/oracle/graal/api/meta/RiBitMap;") \ end_class \ start_class(GraalBitMap) \ int_field(GraalBitMap, size) \ @@ -167,7 +167,7 @@ oop_field(GraalBitMap, extra, "[J") \ end_class \ start_class(CiFrame) \ - oop_field(CiFrame, values, "[Lcom/oracle/max/cri/ci/CiValue;") \ + oop_field(CiFrame, values, "[Lcom/oracle/graal/api/meta/RiValue;") \ int_field(CiFrame, numLocals) \ int_field(CiFrame, numStack) \ int_field(CiFrame, numLocks) \ @@ -176,49 +176,49 @@ boolean_field(CiFrame, duringCall) \ end_class \ start_class(CiCodePos) \ - oop_field(CiCodePos, caller, "Lcom/oracle/max/cri/ci/CiCodePos;") \ - oop_field(CiCodePos, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ + oop_field(CiCodePos, caller, "Lcom/oracle/graal/api/code/CiCodePos;") \ + oop_field(CiCodePos, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \ int_field(CiCodePos, bci) \ end_class \ start_class(CiConstant) \ - oop_field(CiConstant, kind, "Lcom/oracle/max/cri/ci/CiKind;") \ + oop_field(CiConstant, kind, "Lcom/oracle/graal/api/meta/RiKind;") \ oop_field(CiConstant, object, "Ljava/lang/Object;") \ long_field(CiConstant, primitive) \ end_class \ start_class(CiKind) \ char_field(CiKind, typeChar) \ - static_oop_field(CiKind, Boolean, "Lcom/oracle/max/cri/ci/CiKind;"); \ - static_oop_field(CiKind, Byte, "Lcom/oracle/max/cri/ci/CiKind;"); \ - static_oop_field(CiKind, Char, "Lcom/oracle/max/cri/ci/CiKind;"); \ - static_oop_field(CiKind, Short, "Lcom/oracle/max/cri/ci/CiKind;"); \ - static_oop_field(CiKind, Int, "Lcom/oracle/max/cri/ci/CiKind;"); \ - static_oop_field(CiKind, Long, "Lcom/oracle/max/cri/ci/CiKind;"); \ + static_oop_field(CiKind, Boolean, "Lcom/oracle/graal/api/meta/RiKind;"); \ + static_oop_field(CiKind, Byte, "Lcom/oracle/graal/api/meta/RiKind;"); \ + static_oop_field(CiKind, Char, "Lcom/oracle/graal/api/meta/RiKind;"); \ + static_oop_field(CiKind, Short, "Lcom/oracle/graal/api/meta/RiKind;"); \ + static_oop_field(CiKind, Int, "Lcom/oracle/graal/api/meta/RiKind;"); \ + static_oop_field(CiKind, Long, "Lcom/oracle/graal/api/meta/RiKind;"); \ end_class \ start_class(CiRuntimeCall) \ - static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, RegisterFinalizer, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, SetDeoptInfo, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, CreateNullPointerException, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, CreateOutOfBoundsException, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, JavaTimeMillis, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, JavaTimeNanos, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, Debug, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, ArithmeticFrem, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, ArithmeticDrem, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, ArithmeticCos, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, ArithmeticTan, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, ArithmeticSin, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, Deoptimize, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ - static_oop_field(CiRuntimeCall, GenericCallback, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, RegisterFinalizer, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, SetDeoptInfo, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, CreateNullPointerException, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, CreateOutOfBoundsException, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, JavaTimeMillis, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, JavaTimeNanos, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, Debug, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, ArithmeticFrem, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, ArithmeticDrem, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, ArithmeticCos, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, ArithmeticTan, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, ArithmeticSin, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, Deoptimize, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ + static_oop_field(CiRuntimeCall, GenericCallback, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ end_class \ start_class(RiMethod) \ end_class \ start_class(CiValue) \ - oop_field(CiValue, kind, "Lcom/oracle/max/cri/ci/CiKind;") \ - static_oop_field(CiValue, IllegalValue, "Lcom/oracle/max/cri/ci/CiValue;"); \ + oop_field(CiValue, kind, "Lcom/oracle/graal/api/meta/RiKind;") \ + static_oop_field(CiValue, IllegalValue, "Lcom/oracle/graal/api/meta/RiValue;"); \ end_class \ start_class(CiRegisterValue) \ - oop_field(CiRegisterValue, reg, "Lcom/oracle/max/cri/ci/CiRegister;") \ + oop_field(CiRegisterValue, reg, "Lcom/oracle/graal/api/code/CiRegister;") \ end_class \ start_class(CiRegister) \ int_field(CiRegister, number) \ @@ -229,12 +229,12 @@ end_class \ start_class(CiVirtualObject) \ int_field(CiVirtualObject, id) \ - oop_field(CiVirtualObject, type, "Lcom/oracle/max/cri/ri/RiType;") \ - oop_field(CiVirtualObject, values, "[Lcom/oracle/max/cri/ci/CiValue;") \ + oop_field(CiVirtualObject, type, "Lcom/oracle/graal/api/meta/RiType;") \ + oop_field(CiVirtualObject, values, "[Lcom/oracle/graal/api/meta/RiValue;") \ end_class \ start_class(CiMonitorValue) \ - oop_field(CiMonitorValue, owner, "Lcom/oracle/max/cri/ci/CiValue;") \ - oop_field(CiMonitorValue, lockData, "Lcom/oracle/max/cri/ci/CiValue;") \ + oop_field(CiMonitorValue, owner, "Lcom/oracle/graal/api/meta/RiValue;") \ + oop_field(CiMonitorValue, lockData, "Lcom/oracle/graal/api/meta/RiValue;") \ boolean_field(CiMonitorValue, eliminated) \ end_class \ /* end*/
--- a/src/share/vm/graal/graalVMToCompiler.cpp Fri Jun 08 15:11:19 2012 +0200 +++ b/src/share/vm/graal/graalVMToCompiler.cpp Fri Jun 08 15:17:43 2012 +0200 @@ -41,7 +41,7 @@ Handle VMToCompiler::compilerInstance() { if (JNIHandles::resolve(_compilerPermObject) == NULL) { KlassHandle compilerImplKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_graal_hotspot_CompilerImpl(), SystemDictionary::java_system_loader(), NULL, Thread::current()); - check_not_null(compilerImplKlass(), "Couldn't find class com.sun.hotspot.graal.CompilerImpl"); + check_not_null(compilerImplKlass(), "Couldn't find class com.sun.hotspot.graal.HotSpotCompilerImpl"); JavaValue result(T_OBJECT); JavaCalls::call_static(&result, compilerImplKlass, vmSymbols::getInstance_name(), vmSymbols::getInstance_signature(), Thread::current());
--- a/src/share/vm/runtime/arguments.cpp Fri Jun 08 15:11:19 2012 +0200 +++ b/src/share/vm/runtime/arguments.cpp Fri Jun 08 15:17:43 2012 +0200 @@ -2130,6 +2130,10 @@ // this declaration is checked for correctness by 'mx build' - only // modify its entries, not its name or shape const char* graal_projects[] = { + "com.oracle.graal.api", + "com.oracle.graal.api.meta", + "com.oracle.graal.api.code", + "com.oracle.graal.api.interpreter", "com.oracle.max.criutils", "com.oracle.graal.hotspot", "com.oracle.max.asm",