Mercurial > hg > graal-jvmci-8
diff graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java @ 5506:56860d3f9f39
More refactorings and renamings in preparation of ci/ri split.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 07 Jun 2012 18:12:01 +0200 |
parents | 438ab53efdd0 |
children | dc71b06d09f8 |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Thu Jun 07 17:25:52 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Thu Jun 07 18:12:01 2012 +0200 @@ -85,11 +85,10 @@ } @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); @@ -205,7 +204,7 @@ } @Override - public RiRegisterConfig getRegisterConfig(RiMethod method) { + public CiRegisterConfig getRegisterConfig(RiMethod method) { return regConfig; } @@ -391,7 +390,7 @@ 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)), CiDeoptReason.BoundsCheckException, CiDeoptAction.InvalidateReprofile, n.leafGraphId()); graph.addBeforeFixed(n, arrayLength); return guard; @@ -491,7 +490,7 @@ } @Override - public RiRegisterConfig getGlobalStubRegisterConfig() { + public CiRegisterConfig getGlobalStubRegisterConfig() { return globalStubRegConfig; } @@ -502,7 +501,7 @@ } @Override - public int encodeDeoptActionAndReason(RiDeoptAction action, RiDeoptReason reason) { + public int encodeDeoptActionAndReason(CiDeoptAction action, CiDeoptReason reason) { final int actionShift = 0; final int reasonShift = 3; @@ -512,7 +511,7 @@ } @Override - public int convertDeoptAction(RiDeoptAction action) { + public int convertDeoptAction(CiDeoptAction action) { switch(action) { case None: return 0; case RecompileIfTooManyDeopts: return 1; @@ -524,7 +523,7 @@ } @Override - public int convertDeoptReason(RiDeoptReason reason) { + public int convertDeoptReason(CiDeoptReason reason) { switch(reason) { case None: return 0; case NullCheckException: return 1;