Mercurial > hg > graal-compiler
changeset 14032:d1c1f103d42c
renamed com.oracle.graal.asm.AbstractAssembler to com.oracle.graal.asm.Assembler
line wrap: on
line diff
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java Thu Feb 27 11:36:25 2014 -0800 @@ -34,7 +34,7 @@ /** * This class implements an assembler that can encode most X86 instructions. */ -public class AMD64Assembler extends AbstractAssembler { +public class AMD64Assembler extends Assembler { private static final int MinEncodingNeedsRex = 8;
--- a/graal/com.oracle.graal.asm.hsail/src/com/oracle/graal/asm/hsail/AbstractHSAILAssembler.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.asm.hsail/src/com/oracle/graal/asm/hsail/AbstractHSAILAssembler.java Thu Feb 27 11:36:25 2014 -0800 @@ -28,7 +28,7 @@ /** * The platform-dependent base class for the HSAIL assembler. */ -public abstract class AbstractHSAILAssembler extends AbstractAssembler { +public abstract class AbstractHSAILAssembler extends Assembler { public AbstractHSAILAssembler(TargetDescription target) { super(target);
--- a/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/AbstractPTXAssembler.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/AbstractPTXAssembler.java Thu Feb 27 11:36:25 2014 -0800 @@ -28,7 +28,7 @@ /** * The platform-dependent base class for the PTX assembler. */ -public abstract class AbstractPTXAssembler extends AbstractAssembler { +public abstract class AbstractPTXAssembler extends Assembler { public AbstractPTXAssembler(TargetDescription target) { super(target);
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java Thu Feb 27 11:36:25 2014 -0800 @@ -33,7 +33,7 @@ /** * This class implements an assembler that can encode most SPARC instructions. */ -public abstract class SPARCAssembler extends AbstractAssembler { +public abstract class SPARCAssembler extends Assembler { /** * Constructs an assembler for the SPARC architecture.
--- a/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/AbstractAssembler.java Thu Feb 27 11:33:17 2014 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,186 +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.graal.asm; - -import java.nio.*; -import java.util.*; - -import com.oracle.graal.api.code.*; - -/** - * The platform-independent base class for the assembler. - */ -public abstract class AbstractAssembler { - - public final TargetDescription target; - - /** - * Backing code buffer. - */ - private final Buffer codeBuffer; - - public AbstractAssembler(TargetDescription target) { - this.target = target; - if (target.arch.getByteOrder() == ByteOrder.BIG_ENDIAN) { - this.codeBuffer = new Buffer.BigEndian(); - } else { - this.codeBuffer = new Buffer.LittleEndian(); - } - } - - /** - * Returns the current position of the underlying code buffer. - * - * @return current position in code buffer - */ - public int position() { - return codeBuffer.position(); - } - - public final void emitByte(int x) { - codeBuffer.emitByte(x); - } - - public final void emitShort(int x) { - codeBuffer.emitShort(x); - } - - public final void emitInt(int x) { - codeBuffer.emitInt(x); - } - - public final void emitLong(long x) { - codeBuffer.emitLong(x); - } - - public final void emitByte(int b, int pos) { - codeBuffer.emitByte(b, pos); - } - - public final void emitShort(int b, int pos) { - codeBuffer.emitShort(b, pos); - } - - public final void emitInt(int b, int pos) { - codeBuffer.emitInt(b, pos); - } - - public final void emitLong(long b, int pos) { - codeBuffer.emitLong(b, pos); - } - - public final int getByte(int pos) { - return codeBuffer.getByte(pos); - } - - public final int getShort(int pos) { - return codeBuffer.getShort(pos); - } - - public final int getInt(int pos) { - return codeBuffer.getInt(pos); - } - - private static final String NEWLINE = System.getProperty("line.separator"); - - /** - * Some GPU architectures have a text based encoding. - */ - public final void emitString(String x) { - emitString0("\t"); // XXX REMOVE ME pretty-printing - emitString0(x); - emitString0(NEWLINE); - } - - // XXX for pretty-printing - public final void emitString0(String x) { - codeBuffer.emitBytes(x.getBytes(), 0, x.length()); - } - - public void emitString(String s, int pos) { - codeBuffer.emitBytes(s.getBytes(), pos); - } - - /** - * Closes this assembler. No extra data can be written to this assembler after this call. - * - * @param trimmedCopy if {@code true}, then a copy of the underlying byte array up to (but not - * including) {@code position()} is returned - * @return the data in this buffer or a trimmed copy if {@code trimmedCopy} is {@code true} - */ - public byte[] close(boolean trimmedCopy) { - return codeBuffer.close(trimmedCopy); - } - - public void bind(Label l) { - assert !l.isBound() : "can bind label only once"; - l.bind(position()); - l.patchInstructions(this); - } - - public abstract void align(int modulus); - - public abstract void jmp(Label l); - - protected abstract void patchJumpTarget(int branch, int jumpTarget); - - private Map<Label, String> nameMap; - - /** - * Creates a name for a label. - * - * @param l the label for which a name is being created - * @param id a label identifier that is unique with the scope of this assembler - * @return a label name in the form of "L123" - */ - protected String createLabelName(Label l, int id) { - return "L" + id; - } - - /** - * Gets a name for a label, creating it if it does not yet exist. By default, the returned name - * is only unique with the scope of this assembler. - */ - public String nameOf(Label l) { - if (nameMap == null) { - nameMap = new HashMap<>(); - } - String name = nameMap.get(l); - if (name == null) { - name = createLabelName(l, nameMap.size()); - nameMap.put(l, name); - } - return name; - } - - /** - * This is used by the CompilationResultBuilder to convert a {@link StackSlot} to an - * {@link AbstractAddress}. - */ - public abstract AbstractAddress makeAddress(Register base, int displacement); - - /** - * Returns a target specific placeholder address that can be used for code patching. - */ - public abstract AbstractAddress getPlaceholder(); -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Assembler.java Thu Feb 27 11:36:25 2014 -0800 @@ -0,0 +1,186 @@ +/* + * 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.asm; + +import java.nio.*; +import java.util.*; + +import com.oracle.graal.api.code.*; + +/** + * The platform-independent base class for the assembler. + */ +public abstract class Assembler { + + public final TargetDescription target; + + /** + * Backing code buffer. + */ + private final Buffer codeBuffer; + + public Assembler(TargetDescription target) { + this.target = target; + if (target.arch.getByteOrder() == ByteOrder.BIG_ENDIAN) { + this.codeBuffer = new Buffer.BigEndian(); + } else { + this.codeBuffer = new Buffer.LittleEndian(); + } + } + + /** + * Returns the current position of the underlying code buffer. + * + * @return current position in code buffer + */ + public int position() { + return codeBuffer.position(); + } + + public final void emitByte(int x) { + codeBuffer.emitByte(x); + } + + public final void emitShort(int x) { + codeBuffer.emitShort(x); + } + + public final void emitInt(int x) { + codeBuffer.emitInt(x); + } + + public final void emitLong(long x) { + codeBuffer.emitLong(x); + } + + public final void emitByte(int b, int pos) { + codeBuffer.emitByte(b, pos); + } + + public final void emitShort(int b, int pos) { + codeBuffer.emitShort(b, pos); + } + + public final void emitInt(int b, int pos) { + codeBuffer.emitInt(b, pos); + } + + public final void emitLong(long b, int pos) { + codeBuffer.emitLong(b, pos); + } + + public final int getByte(int pos) { + return codeBuffer.getByte(pos); + } + + public final int getShort(int pos) { + return codeBuffer.getShort(pos); + } + + public final int getInt(int pos) { + return codeBuffer.getInt(pos); + } + + private static final String NEWLINE = System.getProperty("line.separator"); + + /** + * Some GPU architectures have a text based encoding. + */ + public final void emitString(String x) { + emitString0("\t"); // XXX REMOVE ME pretty-printing + emitString0(x); + emitString0(NEWLINE); + } + + // XXX for pretty-printing + public final void emitString0(String x) { + codeBuffer.emitBytes(x.getBytes(), 0, x.length()); + } + + public void emitString(String s, int pos) { + codeBuffer.emitBytes(s.getBytes(), pos); + } + + /** + * Closes this assembler. No extra data can be written to this assembler after this call. + * + * @param trimmedCopy if {@code true}, then a copy of the underlying byte array up to (but not + * including) {@code position()} is returned + * @return the data in this buffer or a trimmed copy if {@code trimmedCopy} is {@code true} + */ + public byte[] close(boolean trimmedCopy) { + return codeBuffer.close(trimmedCopy); + } + + public void bind(Label l) { + assert !l.isBound() : "can bind label only once"; + l.bind(position()); + l.patchInstructions(this); + } + + public abstract void align(int modulus); + + public abstract void jmp(Label l); + + protected abstract void patchJumpTarget(int branch, int jumpTarget); + + private Map<Label, String> nameMap; + + /** + * Creates a name for a label. + * + * @param l the label for which a name is being created + * @param id a label identifier that is unique with the scope of this assembler + * @return a label name in the form of "L123" + */ + protected String createLabelName(Label l, int id) { + return "L" + id; + } + + /** + * Gets a name for a label, creating it if it does not yet exist. By default, the returned name + * is only unique with the scope of this assembler. + */ + public String nameOf(Label l) { + if (nameMap == null) { + nameMap = new HashMap<>(); + } + String name = nameMap.get(l); + if (name == null) { + name = createLabelName(l, nameMap.size()); + nameMap.put(l, name); + } + return name; + } + + /** + * This is used by the CompilationResultBuilder to convert a {@link StackSlot} to an + * {@link AbstractAddress}. + */ + public abstract AbstractAddress makeAddress(Register base, int displacement); + + /** + * Returns a target specific placeholder address that can be used for code patching. + */ + public abstract AbstractAddress getPlaceholder(); +}
--- a/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Label.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Label.java Thu Feb 27 11:36:25 2014 -0800 @@ -34,7 +34,7 @@ /** * References to instructions that jump to this unresolved label. These instructions need to be - * patched when the label is bound using the {@link #patchInstructions(AbstractAssembler)} + * patched when the label is bound using the {@link #patchInstructions(Assembler)} * method. */ private ArrayList<Integer> patchPositions = null; @@ -82,7 +82,7 @@ patchPositions.add(branchLocation); } - protected void patchInstructions(AbstractAssembler masm) { + protected void patchInstructions(Assembler masm) { assert isBound() : "Label should be bound"; if (patchPositions != null) { int target = position;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Thu Feb 27 11:36:25 2014 -0800 @@ -70,7 +70,7 @@ /** * Creates the assembler used to emit the machine code. */ - protected abstract AbstractAssembler createAssembler(FrameMap frameMap); + protected abstract Assembler createAssembler(FrameMap frameMap); /** * Creates the object used to fill in the details of a given compilation result.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Thu Feb 27 11:36:25 2014 -0800 @@ -187,7 +187,7 @@ } @Override - protected AbstractAssembler createAssembler(FrameMap frameMap) { + protected Assembler createAssembler(FrameMap frameMap) { return new AMD64MacroAssembler(getTarget(), frameMap.registerConfig); } @@ -206,7 +206,7 @@ boolean omitFrame = CanOmitFrame.getValue() && !frameMap.frameNeedsAllocating() && !lir.hasArgInCallerFrame() && !gen.hasForeignCall(); Stub stub = gen.getStub(); - AbstractAssembler masm = createAssembler(frameMap); + Assembler masm = createAssembler(frameMap); HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null, omitFrame); CompilationResultBuilder crb = factory.createBuilder(getCodeCache(), getForeignCalls(), frameMap, masm, frameContext, compilationResult); crb.setFrameSize(frameMap.frameSize());
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Thu Feb 27 11:36:25 2014 -0800 @@ -210,14 +210,14 @@ } @Override - protected AbstractAssembler createAssembler(FrameMap frameMap) { + protected Assembler createAssembler(FrameMap frameMap) { return new HSAILAssembler(getTarget()); } @Override public CompilationResultBuilder newCompilationResultBuilder(LIRGenerator lirGen, CompilationResult compilationResult, CompilationResultBuilderFactory factory) { FrameMap frameMap = lirGen.frameMap; - AbstractAssembler masm = createAssembler(frameMap); + Assembler masm = createAssembler(frameMap); HotSpotFrameContext frameContext = new HotSpotFrameContext(); CompilationResultBuilder crb = factory.createBuilder(getCodeCache(), getForeignCalls(), frameMap, masm, frameContext, compilationResult); crb.setFrameSize(frameMap.frameSize()); @@ -228,7 +228,7 @@ public void emitCode(CompilationResultBuilder crb, LIRGenerator lirGen, ResolvedJavaMethod method) { assert method != null : lirGen.getGraph() + " is not associated with a method"; // Emit the prologue. - AbstractAssembler asm = crb.asm; + Assembler asm = crb.asm; asm.emitString0("version 0:95: $full : $large;"); asm.emitString("");
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Thu Feb 27 11:36:25 2014 -0800 @@ -261,7 +261,7 @@ LIRInstruction op; - void emitDeclarations(AbstractAssembler asm) { + void emitDeclarations(Assembler asm) { for (Integer i : unsigned8) { asm.emitString(".reg .u8 %r" + i.intValue() + ";"); } @@ -360,7 +360,7 @@ // - has no incoming arguments passed on the stack // - has no instructions with debug info FrameMap frameMap = lirGen.frameMap; - AbstractAssembler masm = createAssembler(frameMap); + Assembler masm = createAssembler(frameMap); PTXFrameContext frameContext = new PTXFrameContext(); CompilationResultBuilder crb = factory.createBuilder(getCodeCache(), getForeignCalls(), frameMap, masm, frameContext, compilationResult); crb.setFrameSize(0); @@ -368,7 +368,7 @@ } @Override - protected AbstractAssembler createAssembler(FrameMap frameMap) { + protected Assembler createAssembler(FrameMap frameMap) { return new PTXMacroAssembler(getTarget(), frameMap.registerConfig); } @@ -384,7 +384,7 @@ // facilitate seemless PTX code generation subsequently. assert codeCacheOwner != null : lirGen.getGraph() + " is not associated with a method"; final String name = codeCacheOwner.getName(); - AbstractAssembler asm = crb.asm; + Assembler asm = crb.asm; // Emit initial boiler-plate directives. asm.emitString(".version 3.0"); @@ -436,7 +436,7 @@ } } - AbstractAssembler asm = crb.asm; + Assembler asm = crb.asm; registerAnalysis.emitDeclarations(asm); // emit predicate register declaration @@ -449,7 +449,7 @@ @Override public void emitCode(CompilationResultBuilder crb, LIRGenerator lirGen, ResolvedJavaMethod codeCacheOwner) { assert codeCacheOwner != null : lirGen.getGraph() + " is not associated with a method"; - AbstractAssembler asm = crb.asm; + Assembler asm = crb.asm; // Emit the prologue emitKernelEntry(crb, lirGen, codeCacheOwner);
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Thu Feb 27 11:36:25 2014 -0800 @@ -147,7 +147,7 @@ } @Override - protected AbstractAssembler createAssembler(FrameMap frameMap) { + protected Assembler createAssembler(FrameMap frameMap) { return new SPARCMacroAssembler(getTarget(), frameMap.registerConfig); } @@ -158,7 +158,7 @@ assert gen.deoptimizationRescueSlot == null || frameMap.frameNeedsAllocating() : "method that can deoptimize must have a frame"; Stub stub = gen.getStub(); - AbstractAssembler masm = createAssembler(frameMap); + Assembler masm = createAssembler(frameMap); // On SPARC we always use stack frames. HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null); CompilationResultBuilder crb = factory.createBuilder(getProviders().getCodeCache(), getProviders().getForeignCalls(), frameMap, masm, frameContext, compilationResult);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/SwitchStrategy.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/SwitchStrategy.java Thu Feb 27 11:36:25 2014 -0800 @@ -89,11 +89,11 @@ public abstract static class BaseSwitchClosure implements SwitchClosure { private final CompilationResultBuilder crb; - private final AbstractAssembler masm; + private final Assembler masm; private final LabelRef[] keyTargets; private final LabelRef defaultTarget; - public BaseSwitchClosure(CompilationResultBuilder crb, AbstractAssembler masm, LabelRef[] keyTargets, LabelRef defaultTarget) { + public BaseSwitchClosure(CompilationResultBuilder crb, Assembler masm, LabelRef[] keyTargets, LabelRef defaultTarget) { this.crb = crb; this.masm = masm; this.keyTargets = keyTargets;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java Thu Feb 27 11:36:25 2014 -0800 @@ -54,7 +54,7 @@ } } - public final AbstractAssembler asm; + public final Assembler asm; public final CompilationResult compilationResult; public final TargetDescription target; public final CodeCacheProvider codeCache; @@ -78,7 +78,7 @@ private List<ExceptionInfo> exceptionInfoList; - public CompilationResultBuilder(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext, + public CompilationResultBuilder(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, Assembler asm, FrameContext frameContext, CompilationResult compilationResult) { this.target = codeCache.getTarget(); this.codeCache = codeCache;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilderFactory.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilderFactory.java Thu Feb 27 11:36:25 2014 -0800 @@ -34,7 +34,7 @@ /** * Creates a new {@link CompilationResultBuilder}. */ - CompilationResultBuilder createBuilder(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext, + CompilationResultBuilder createBuilder(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, Assembler asm, FrameContext frameContext, CompilationResult compilationResult); /** @@ -42,7 +42,7 @@ */ CompilationResultBuilderFactory Default = new CompilationResultBuilderFactory() { - public CompilationResultBuilder createBuilder(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext, + public CompilationResultBuilder createBuilder(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, Assembler asm, FrameContext frameContext, CompilationResult compilationResult) { return new CompilationResultBuilder(codeCache, foreignCalls, frameMap, asm, frameContext, compilationResult); }
--- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java Thu Feb 27 11:36:25 2014 -0800 @@ -41,7 +41,7 @@ @ServiceProvider(OptimizedCallTargetInstrumentationFactory.class) public class AMD64OptimizedCallTargetInstrumentationFactory implements OptimizedCallTargetInstrumentationFactory { - public CompilationResultBuilder createBuilder(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext, + public CompilationResultBuilder createBuilder(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, Assembler asm, FrameContext frameContext, CompilationResult compilationResult) { return new OptimizedCallTargetInstrumentation(codeCache, foreignCalls, frameMap, asm, frameContext, compilationResult) { @Override
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentation.java Thu Feb 27 11:33:17 2014 -0800 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentation.java Thu Feb 27 11:36:25 2014 -0800 @@ -43,7 +43,7 @@ */ public abstract class OptimizedCallTargetInstrumentation extends CompilationResultBuilder { - public OptimizedCallTargetInstrumentation(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext, + public OptimizedCallTargetInstrumentation(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, Assembler asm, FrameContext frameContext, CompilationResult compilationResult) { super(codeCache, foreignCalls, frameMap, asm, frameContext, compilationResult); }