OpenJDK / graal / graal-jvmci-8
changeset 8201:931bbe0bec93
Remove stubs as a parameter to TargetMethodAssembler.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Mon, 11 Mar 2013 11:32:08 +0100 |
| parents | a848153df742 |
| children | 4ba3455566e0 |
| files | graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXBackend.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java |
| diffstat | 3 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXBackend.java Sun Mar 10 23:05:39 2013 +0100 +++ b/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXBackend.java Mon Mar 11 11:32:08 2013 +0100 @@ -74,7 +74,7 @@ AbstractAssembler masm = new PTXAssembler(target, frameMap.registerConfig); HotSpotFrameContext frameContext = omitFrame ? null : new HotSpotFrameContext(); - TargetMethodAssembler tasm = new TargetMethodAssembler(target, runtime(), frameMap, masm, frameContext, lir.stubs); + TargetMethodAssembler tasm = new TargetMethodAssembler(target, runtime(), frameMap, masm, frameContext); tasm.setFrameSize(frameMap.frameSize()); tasm.compilationResult.setCustomStackAreaOffset(frameMap.offsetToCustomArea()); return tasm;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Sun Mar 10 23:05:39 2013 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Mon Mar 11 11:32:08 2013 +0100 @@ -265,7 +265,7 @@ AbstractAssembler masm = new AMD64MacroAssembler(target, frameMap.registerConfig); HotSpotFrameContext frameContext = omitFrame ? null : new HotSpotFrameContext(); - TargetMethodAssembler tasm = new TargetMethodAssembler(target, runtime(), frameMap, masm, frameContext, lir.stubs); + TargetMethodAssembler tasm = new TargetMethodAssembler(target, runtime(), frameMap, masm, frameContext); tasm.setFrameSize(frameMap.frameSize()); tasm.compilationResult.setCustomStackAreaOffset(frameMap.offsetToCustomArea()); return tasm;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java Sun Mar 10 23:05:39 2013 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java Mon Mar 11 11:32:08 2013 +0100 @@ -54,11 +54,6 @@ public final FrameMap frameMap; /** - * Out-of-line stubs to be emitted. - */ - public final List<Code> stubs; - - /** * The object that emits code for managing a method's frame. If null, no frame is used by the * method. */ @@ -66,11 +61,10 @@ private List<ExceptionInfo> exceptionInfoList; - public TargetMethodAssembler(TargetDescription target, CodeCacheProvider runtime, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext, List<Code> stubs) { + public TargetMethodAssembler(TargetDescription target, CodeCacheProvider runtime, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext) { this.target = target; this.runtime = runtime; this.frameMap = frameMap; - this.stubs = stubs; this.asm = asm; this.compilationResult = new CompilationResult(); this.frameContext = frameContext;