# HG changeset patch # User Doug Simon # Date 1368739619 -7200 # Node ID 82689c1c0dab98b70462ac048d963ac0e39ce7d0 # Parent ff9829c21f21df1b4a5305b5bd11c770bdb849f3 replaced VMErrorStub with use of ForeignCallStub deleted CRuntimeStub added more documentation to ForeignCallStub diff -r ff9829c21f21 -r 82689c1c0dab graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRuntime.java --- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRuntime.java Thu May 16 22:30:52 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRuntime.java Thu May 16 23:26:59 2013 +0200 @@ -24,6 +24,7 @@ import static com.oracle.graal.amd64.AMD64.*; import static com.oracle.graal.api.code.CallingConvention.Type.*; +import static com.oracle.graal.api.meta.Value.*; import static com.oracle.graal.hotspot.HotSpotBackend.*; import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.*; import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.*; @@ -60,11 +61,11 @@ // in templateInterpreter_x86_64.cpp around line 1923 RegisterValue exception = rax.asValue(Kind.Object); RegisterValue exceptionPc = rdx.asValue(word); - CallingConvention exceptionCc = new CallingConvention(0, Value.ILLEGAL, exception, exceptionPc); + CallingConvention exceptionCc = new CallingConvention(0, ILLEGAL, exception, exceptionPc); register(new HotSpotForeignCallLinkage(EXCEPTION_HANDLER, 0L, PRESERVES_REGISTERS, LEAF, exceptionCc)); register(new HotSpotForeignCallLinkage(EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, PRESERVES_REGISTERS, LEAF, exceptionCc)); - // The crypto stubs do callee saving + // The x86 crypto stubs do callee saving registerForeignCall(ENCRYPT_BLOCK, config.aescryptEncryptBlockStub, NativeCall, PRESERVES_REGISTERS, LEAF); registerForeignCall(DECRYPT_BLOCK, config.aescryptDecryptBlockStub, NativeCall, PRESERVES_REGISTERS, LEAF); registerForeignCall(ENCRYPT, config.cipherBlockChainingEncryptAESCryptStub, NativeCall, PRESERVES_REGISTERS, LEAF); diff -r ff9829c21f21 -r 82689c1c0dab graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Thu May 16 22:30:52 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Thu May 16 23:26:59 2013 +0200 @@ -47,7 +47,6 @@ import static com.oracle.graal.hotspot.stubs.NewInstanceStub.*; import static com.oracle.graal.hotspot.stubs.StubUtil.*; import static com.oracle.graal.hotspot.stubs.UnwindExceptionToCallerStub.*; -import static com.oracle.graal.hotspot.stubs.VMErrorStub.*; import static com.oracle.graal.java.GraphBuilderPhase.RuntimeCalls.*; import static com.oracle.graal.nodes.java.RegisterFinalizerNode.*; import static com.oracle.graal.replacements.Log.*; @@ -178,40 +177,57 @@ regConfig = createRegisterConfig(); } + protected abstract RegisterConfig createRegisterConfig(); + + /** + * Registers the linkage for a foreign call. + */ protected HotSpotForeignCallLinkage register(HotSpotForeignCallLinkage linkage) { - HotSpotForeignCallLinkage oldValue = foreignCalls.put(linkage.getDescriptor(), linkage); - assert oldValue == null : "already registered linkage for " + linkage.getDescriptor(); + assert !foreignCalls.containsKey(linkage.getDescriptor()) : "already registered linkage for " + linkage.getDescriptor(); + foreignCalls.put(linkage.getDescriptor(), linkage); return linkage; } /** - * Registers the details for linking a call to a {@link Stub}. + * Creates and registers the details for linking a foreign call to a {@link Stub}. */ - protected ForeignCallLinkage registerStubCall(ForeignCallDescriptor descriptor) { + protected HotSpotForeignCallLinkage registerStubCall(ForeignCallDescriptor descriptor) { return register(HotSpotForeignCallLinkage.create(descriptor, 0L, PRESERVES_REGISTERS, JavaCallee, NOT_LEAF)); } /** - * Registers the details for a call to a leaf function. A leaf function does not lock, GC or - * throw exceptions. That is, the thread's execution state during the call is never inspected by - * another thread. + * Creates and registers the linkage for a foreign call. */ - protected ForeignCallLinkage registerForeignCall(ForeignCallDescriptor descriptor, long address, CallingConvention.Type ccType, RegisterEffect effect, Transition transition) { + protected HotSpotForeignCallLinkage registerForeignCall(ForeignCallDescriptor descriptor, long address, CallingConvention.Type ccType, RegisterEffect effect, Transition transition) { Class resultType = descriptor.getResultType(); - assert resultType.isPrimitive() || Word.class.isAssignableFrom(resultType) : "foreign call must return object thread local storage: " + descriptor; + assert resultType.isPrimitive() || Word.class.isAssignableFrom(resultType) : "foreign calls must return objects in thread local storage: " + descriptor; return register(HotSpotForeignCallLinkage.create(descriptor, address, effect, ccType, transition)); } - protected abstract RegisterConfig createRegisterConfig(); + private static void link(Stub stub) { + stub.getLinkage().setCompiledStub(stub); + } + + /** + * Creates a {@linkplain ForeignCallStub stub} for a non-leaf foreign call. + * + * @param descriptor the signature of the call to this stub + * @param address the address of the code to call + * @param prependThread true if the JavaThread value for the current thread is to be prepended + * to the arguments for the call to {@code address} + */ + private void linkForeignCall(ForeignCallDescriptor descriptor, long address, boolean prependThread, Replacements replacements) { + ForeignCallStub stub = new ForeignCallStub(address, descriptor, prependThread, this, replacements); + HotSpotForeignCallLinkage linkage = stub.getLinkage(); + HotSpotForeignCallLinkage targetLinkage = stub.getTargetLinkage(); + linkage.setCompiledStub(stub); + register(linkage); + register(targetLinkage); + } public void registerReplacements(Replacements replacements) { HotSpotVMConfig c = config; - - registerStubCall(VERIFY_OOP); - registerStubCall(NEW_ARRAY); - registerStubCall(UNWIND_EXCEPTION_TO_CALLER); - registerStubCall(NEW_INSTANCE); - registerStubCall(VM_ERROR); + TargetDescription target = getTarget(); registerForeignCall(UNCOMMON_TRAP, c.uncommonTrapStub, NativeCall, PRESERVES_REGISTERS, LEAF); registerForeignCall(DEOPT_HANDLER, c.handleDeoptStub, NativeCall, PRESERVES_REGISTERS, LEAF); @@ -228,7 +244,28 @@ registerForeignCall(NEW_ARRAY_C, c.newArrayAddress, NativeCall, DESTROYS_REGISTERS, NOT_LEAF); registerForeignCall(NEW_INSTANCE_C, c.newInstanceAddress, NativeCall, DESTROYS_REGISTERS, NOT_LEAF); registerForeignCall(VM_MESSAGE_C, c.vmMessageAddress, NativeCall, DESTROYS_REGISTERS, NOT_LEAF); - registerForeignCall(VM_ERROR_C, c.vmErrorAddress, NativeCall, DESTROYS_REGISTERS, NOT_LEAF); + + link(new NewInstanceStub(this, replacements, target, registerStubCall(NEW_INSTANCE))); + link(new NewArrayStub(this, replacements, target, registerStubCall(NEW_ARRAY))); + link(new ExceptionHandlerStub(this, replacements, target, foreignCalls.get(EXCEPTION_HANDLER))); + link(new UnwindExceptionToCallerStub(this, replacements, target, registerStubCall(UNWIND_EXCEPTION_TO_CALLER))); + link(new VerifyOopStub(this, replacements, target, registerStubCall(VERIFY_OOP))); + + linkForeignCall(IDENTITY_HASHCODE, c.identityHashCodeAddress, true, replacements); + linkForeignCall(REGISTER_FINALIZER, c.registerFinalizerAddress, true, replacements); + linkForeignCall(CREATE_NULL_POINTER_EXCEPTION, c.createNullPointerExceptionAddress, true, replacements); + linkForeignCall(CREATE_OUT_OF_BOUNDS_EXCEPTION, c.createOutOfBoundsExceptionAddress, true, replacements); + linkForeignCall(MONITORENTER, c.monitorenterAddress, true, replacements); + linkForeignCall(MONITOREXIT, c.monitorexitAddress, true, replacements); + linkForeignCall(WRITE_BARRIER_PRE, c.writeBarrierPreAddress, true, replacements); + linkForeignCall(WRITE_BARRIER_POST, c.writeBarrierPostAddress, true, replacements); + linkForeignCall(NEW_MULTI_ARRAY, c.newMultiArrayAddress, true, replacements); + linkForeignCall(LOG_PRINTF, c.logPrintfAddress, true, replacements); + linkForeignCall(LOG_OBJECT, c.logObjectAddress, true, replacements); + linkForeignCall(LOG_PRIMITIVE, c.logPrimitiveAddress, true, replacements); + linkForeignCall(THREAD_IS_INTERRUPTED, c.threadIsInterruptedAddress, true, replacements); + linkForeignCall(VM_ERROR, c.vmErrorAddress, true, replacements); + linkForeignCall(OSR_MIGRATION_END, c.osrMigrationEndAddress, false, replacements); if (GraalOptions.IntrinsifyObjectMethods) { replacements.registerSubstitutions(ObjectSubstitutions.class); @@ -256,46 +293,10 @@ checkcastSnippets = new CheckCastSnippets.Templates(this, replacements, graalRuntime.getTarget()); instanceofSnippets = new InstanceOfSnippets.Templates(this, replacements, graalRuntime.getTarget()); newObjectSnippets = new NewObjectSnippets.Templates(this, replacements, graalRuntime.getTarget()); - monitorSnippets = new MonitorSnippets.Templates(this, replacements, graalRuntime.getTarget(), config.useFastLocking); + monitorSnippets = new MonitorSnippets.Templates(this, replacements, graalRuntime.getTarget(), c.useFastLocking); writeBarrierSnippets = new WriteBarrierSnippets.Templates(this, replacements, graalRuntime.getTarget()); boxingSnippets = new BoxingSnippets.Templates(this, replacements, graalRuntime.getTarget()); exceptionObjectSnippets = new LoadExceptionObjectSnippets.Templates(this, replacements, graalRuntime.getTarget()); - - TargetDescription target = getTarget(); - link(new NewInstanceStub(this, replacements, target, foreignCalls.get(NEW_INSTANCE))); - link(new NewArrayStub(this, replacements, target, foreignCalls.get(NEW_ARRAY))); - link(new ExceptionHandlerStub(this, replacements, target, foreignCalls.get(EXCEPTION_HANDLER))); - link(new UnwindExceptionToCallerStub(this, replacements, target, foreignCalls.get(UNWIND_EXCEPTION_TO_CALLER))); - link(new VerifyOopStub(this, replacements, target, foreignCalls.get(VERIFY_OOP))); - link(new VMErrorStub(this, replacements, target, foreignCalls.get(VM_ERROR))); - - linkForeignCall(IDENTITY_HASHCODE, config.identityHashCodeAddress, replacements, true); - linkForeignCall(REGISTER_FINALIZER, config.registerFinalizerAddress, replacements, true); - linkForeignCall(CREATE_NULL_POINTER_EXCEPTION, config.createNullPointerExceptionAddress, replacements, true); - linkForeignCall(CREATE_OUT_OF_BOUNDS_EXCEPTION, config.createOutOfBoundsExceptionAddress, replacements, true); - linkForeignCall(MONITORENTER, config.monitorenterAddress, replacements, true); - linkForeignCall(MONITOREXIT, config.monitorexitAddress, replacements, true); - linkForeignCall(WRITE_BARRIER_PRE, config.writeBarrierPreAddress, replacements, true); - linkForeignCall(WRITE_BARRIER_POST, config.writeBarrierPostAddress, replacements, true); - linkForeignCall(NEW_MULTI_ARRAY, config.newMultiArrayAddress, replacements, true); - linkForeignCall(LOG_PRINTF, config.logPrintfAddress, replacements, true); - linkForeignCall(LOG_OBJECT, config.logObjectAddress, replacements, true); - linkForeignCall(LOG_PRIMITIVE, config.logPrimitiveAddress, replacements, true); - linkForeignCall(THREAD_IS_INTERRUPTED, config.threadIsInterruptedAddress, replacements, true); - linkForeignCall(OSR_MIGRATION_END, config.osrMigrationEndAddress, replacements, false); - } - - private static void link(Stub stub) { - stub.getLinkage().setCompiledStub(stub); - } - - private void linkForeignCall(ForeignCallDescriptor descriptor, long address, Replacements replacements, boolean prependThread) { - ForeignCallStub stub = new ForeignCallStub(address, descriptor, prependThread, this, replacements); - HotSpotForeignCallLinkage linkage = stub.getLinkage(); - HotSpotForeignCallLinkage targetLinkage = stub.getTargetLinkage(); - linkage.setCompiledStub(stub); - register(linkage); - register(targetLinkage); } public HotSpotGraalRuntime getGraalRuntime() { diff -r ff9829c21f21 -r 82689c1c0dab graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/CRuntimeStub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/CRuntimeStub.java Thu May 16 22:30:52 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +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.graal.hotspot.stubs; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.SnippetTemplate.Arguments; -import com.oracle.graal.replacements.SnippetTemplate.SnippetInfo; - -/** - * Base class for a stub that saves registers around a C runtime call. - */ -public abstract class CRuntimeStub extends SnippetStub { - - public CRuntimeStub(final HotSpotRuntime runtime, Replacements replacements, TargetDescription target, HotSpotForeignCallLinkage linkage) { - super(runtime, replacements, target, linkage); - } - - @Override - protected Arguments makeArguments(SnippetInfo stub) { - Arguments args = new Arguments(stub); - for (int i = 0; i < stub.getParameterCount(); i++) { - args.add(stub.getParameterName(i), null); - } - return args; - } -} diff -r ff9829c21f21 -r 82689c1c0dab graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ExceptionHandlerStub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ExceptionHandlerStub.java Thu May 16 22:30:52 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ExceptionHandlerStub.java Thu May 16 23:26:59 2013 +0200 @@ -48,7 +48,7 @@ *

* The descriptor for a call to this stub is {@link HotSpotBackend#EXCEPTION_HANDLER}. */ -public class ExceptionHandlerStub extends CRuntimeStub { +public class ExceptionHandlerStub extends SnippetStub { public ExceptionHandlerStub(final HotSpotRuntime runtime, Replacements replacements, TargetDescription target, HotSpotForeignCallLinkage linkage) { super(runtime, replacements, target, linkage); diff -r ff9829c21f21 -r 82689c1c0dab graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java Thu May 16 22:30:52 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java Thu May 16 23:26:59 2013 +0200 @@ -52,7 +52,13 @@ import com.oracle.graal.word.phases.*; /** - * A stub for a {@link Transition non-leaf} foreign call from compiled code. + * A {@linkplain #getGraph() generated} stub for a {@link Transition non-leaf} foreign call from + * compiled code. A stub is required for such calls as the caller may be scheduled for + * deoptimization while the call is in progress. And since these are foreign/runtime calls on slow + * paths, we don't want to force the register allocator to spill around the call. As such, this stub + * saves and restores all allocatable registers. It also + * {@linkplain StubUtil#handlePendingException(boolean) handles} any exceptions raised during the + * foreign call. */ public class ForeignCallStub extends Stub { @@ -130,7 +136,7 @@ @Override public String toString() { - return format("HotSpotStub<%n(%p)>", this); + return format("ForeignCallStub<%n(%p)>", this); } }; } @@ -164,6 +170,49 @@ } } + /** + * Creates a graph for this stub. + *

+ * If the stub returns an object, the graph created corresponds to this pseudo code: + * + * 

+     *     Object foreignFunctionStub(args...) {
+     *         foreignFunction(currentThread,  args);
+     *         if (clearPendingException(thread())) {
+     *             getAndClearObjectResult(thread());
+     *             DeoptimizeCallerNode.deopt(InvalidateReprofile, RuntimeConstraint);
+     *         }
+     *         return verifyObject(getAndClearObjectResult(thread()));
+     *     }
+     *
+ * + * If the stub returns a primitive or word, the graph created corresponds to this pseudo code + * (using {@code int} as the primitive return type): + * + * 
+     *     int foreignFunctionStub(args...) {
+     *         int result = foreignFunction(currentThread,  args);
+     *         if (clearPendingException(thread())) {
+     *             DeoptimizeCallerNode.deopt(InvalidateReprofile, RuntimeConstraint);
+     *         }
+     *         return result;
+     *     }
+     *
+ * + * If the stub is void, the graph created corresponds to this pseudo code: + * + * 
+     *     void foreignFunctionStub(args...) {
+     *         foreignFunction(currentThread,  args);
+     *         if (clearPendingException(thread())) {
+     *             DeoptimizeCallerNode.deopt(InvalidateReprofile, RuntimeConstraint);
+     *         }
+     *     }
+     *
+ * + * In each example above, the {@code currentThread} argument is the C++ JavaThread value (i.e., + * %r15 on AMD64) and is only prepended if {@link #prependThread} is true. + */ @Override protected StructuredGraph getGraph() { Class[] args = linkage.getDescriptor().getArgumentTypes(); diff -r ff9829c21f21 -r 82689c1c0dab graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/SnippetStub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/SnippetStub.java Thu May 16 22:30:52 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/SnippetStub.java Thu May 16 23:26:59 2013 +0200 @@ -30,7 +30,6 @@ import com.oracle.graal.hotspot.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.Snippet.ConstantParameter; import com.oracle.graal.replacements.*; import com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates; import com.oracle.graal.replacements.SnippetTemplate.Arguments; @@ -77,9 +76,15 @@ } /** - * Adds the {@linkplain ConstantParameter constant} arguments of this stub. + * Adds the arguments to this snippet stub. */ - protected abstract Arguments makeArguments(SnippetInfo stub); + protected Arguments makeArguments(SnippetInfo stub) { + Arguments args = new Arguments(stub); + for (int i = 0; i < stub.getParameterCount(); i++) { + args.add(stub.getParameterName(i), null); + } + return args; + } @Override protected Object debugScopeContext() { diff -r ff9829c21f21 -r 82689c1c0dab graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UnwindExceptionToCallerStub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UnwindExceptionToCallerStub.java Thu May 16 22:30:52 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UnwindExceptionToCallerStub.java Thu May 16 23:26:59 2013 +0200 @@ -45,7 +45,7 @@ * Stub called by an {@link UnwindNode}. This stub executes in the frame of the method throwing an * exception and completes by jumping to the exception handler in the calling frame. */ -public class UnwindExceptionToCallerStub extends CRuntimeStub { +public class UnwindExceptionToCallerStub extends SnippetStub { public UnwindExceptionToCallerStub(final HotSpotRuntime runtime, Replacements replacements, TargetDescription target, HotSpotForeignCallLinkage linkage) { super(runtime, replacements, target, linkage); diff -r ff9829c21f21 -r 82689c1c0dab graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/VMErrorStub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/VMErrorStub.java Thu May 16 22:30:52 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +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.graal.hotspot.stubs; - -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.hotspot.stubs.StubUtil.*; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.api.meta.*; -import com.oracle.graal.graph.Node.ConstantNodeParameter; -import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.word.*; - -/** - * Stub called from {@link VMErrorNode}. - */ -public class VMErrorStub extends CRuntimeStub { - - public VMErrorStub(final HotSpotRuntime runtime, Replacements replacements, TargetDescription target, HotSpotForeignCallLinkage linkage) { - super(runtime, replacements, target, linkage); - } - - @Snippet - private static void vmError(String where, String format, long value) { - vmErrorC(VM_ERROR_C, thread(), where, format, value); - } - - public static final ForeignCallDescriptor VM_ERROR_C = descriptorFor(VMErrorStub.class, "vmErrorC"); - - @NodeIntrinsic(ForeignCallNode.class) - public static native void vmErrorC(@ConstantNodeParameter ForeignCallDescriptor vmErrorC, Word thread, String where, String format, long value); -} diff -r ff9829c21f21 -r 82689c1c0dab graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/VerifyOopStub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/VerifyOopStub.java Thu May 16 22:30:52 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/VerifyOopStub.java Thu May 16 23:26:59 2013 +0200 @@ -34,7 +34,7 @@ /** * Stub called from {@link VerifyOopStubCall}. */ -public class VerifyOopStub extends CRuntimeStub { +public class VerifyOopStub extends SnippetStub { public VerifyOopStub(final HotSpotRuntime runtime, Replacements replacements, TargetDescription target, HotSpotForeignCallLinkage linkage) { super(runtime, replacements, target, linkage);