Mercurial > hg > truffle
changeset 9744:8342b10b9cc3
rename: *RuntimeCallOp -> *ForeignCallOp
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 16 May 2013 18:41:22 +0200 |
parents | 590e157cf4d4 |
children | b9c5ce8d552d |
files | graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java |
diffstat | 2 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java Thu May 16 18:12:04 2013 +0200 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java Thu May 16 18:41:22 2013 +0200 @@ -787,9 +787,9 @@ protected void emitForeignCall(ForeignCallLinkage linkage, Value result, Value[] arguments, Value[] temps, LIRFrameState info) { long maxOffset = linkage.getMaxCallTargetOffset(); if (maxOffset != (int) maxOffset) { - append(new AMD64Call.DirectFarRuntimeCallOp(this, linkage, result, arguments, temps, info)); + append(new AMD64Call.DirectFarForeignCallOp(this, linkage, result, arguments, temps, info)); } else { - append(new AMD64Call.DirectNearRuntimeCallOp(linkage, result, arguments, temps, info)); + append(new AMD64Call.DirectNearForeignCallOp(linkage, result, arguments, temps, info)); } }
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java Thu May 16 18:12:04 2013 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java Thu May 16 18:41:22 2013 +0200 @@ -102,11 +102,11 @@ } } - public abstract static class RuntimeCallOp extends CallOp { + public abstract static class ForeignCallOp extends CallOp { protected final ForeignCallLinkage callTarget; - public RuntimeCallOp(ForeignCallLinkage callTarget, Value result, Value[] parameters, Value[] temps, LIRFrameState state) { + public ForeignCallOp(ForeignCallLinkage callTarget, Value result, Value[] parameters, Value[] temps, LIRFrameState state) { super(result, parameters, temps, state); this.callTarget = callTarget; } @@ -117,11 +117,11 @@ } } - @Opcode("CALL_NEAR_RUNTIME") - public static class DirectNearRuntimeCallOp extends RuntimeCallOp { + @Opcode("NEAR_FOREIGN_CALL") + public static class DirectNearForeignCallOp extends ForeignCallOp { - public DirectNearRuntimeCallOp(ForeignCallLinkage callTarget, Value result, Value[] parameters, Value[] temps, LIRFrameState state) { - super(callTarget, result, parameters, temps, state); + public DirectNearForeignCallOp(ForeignCallLinkage linkage, Value result, Value[] parameters, Value[] temps, LIRFrameState state) { + super(linkage, result, parameters, temps, state); } @Override @@ -130,12 +130,12 @@ } } - @Opcode("CALL_FAR_RUNTIME") - public static class DirectFarRuntimeCallOp extends RuntimeCallOp { + @Opcode("FAR_FOREIGN_CALL") + public static class DirectFarForeignCallOp extends ForeignCallOp { @Temp({REG}) protected AllocatableValue callTemp; - public DirectFarRuntimeCallOp(LIRGeneratorTool gen, ForeignCallLinkage callTarget, Value result, Value[] parameters, Value[] temps, LIRFrameState state) { + public DirectFarForeignCallOp(LIRGeneratorTool gen, ForeignCallLinkage callTarget, Value result, Value[] parameters, Value[] temps, LIRFrameState state) { super(callTarget, result, parameters, temps, state); callTemp = gen.newVariable(Kind.Long); }