Mercurial > hg > graal-compiler
changeset 5584:90c4b9c01ded
changed snippet installation to use SnippetsInterface (sub)class instead of object
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 13 Jun 2012 13:26:56 +0200 |
parents | 9911227e6dd3 |
children | a7ed598130c2 |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/GraalIntrinsics.java graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Snippets.java |
diffstat | 3 files changed, 13 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Wed Jun 13 00:24:28 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Wed Jun 13 13:26:56 2012 +0200 @@ -69,11 +69,11 @@ } public void installSnippets() { - Snippets.install(this, compiler.getTarget(), new SystemSnippets()); - Snippets.install(this, compiler.getTarget(), new UnsafeSnippets()); - Snippets.install(this, compiler.getTarget(), new ArrayCopySnippets()); - Snippets.install(this, compiler.getTarget(), new CheckCastSnippets()); - Snippets.install(this, compiler.getTarget(), new NewInstanceSnippets()); + Snippets.install(this, compiler.getTarget(), SystemSnippets.class); + Snippets.install(this, compiler.getTarget(), UnsafeSnippets.class); + Snippets.install(this, compiler.getTarget(), ArrayCopySnippets.class); + Snippets.install(this, compiler.getTarget(), CheckCastSnippets.class); + Snippets.install(this, compiler.getTarget(), NewInstanceSnippets.class); checkcastSnippets = new CheckCastSnippets.Templates(this); newInstanceSnippets = new NewInstanceSnippets.Templates(this); }
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/GraalIntrinsics.java Wed Jun 13 00:24:28 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/GraalIntrinsics.java Wed Jun 13 13:26:56 2012 +0200 @@ -32,10 +32,10 @@ public class GraalIntrinsics { public static void installIntrinsics(ExtendedRiRuntime runtime, TargetDescription target) { if (GraalOptions.Intrinsify) { - Snippets.install(runtime, target, new MathSnippetsX86()); - Snippets.install(runtime, target, new DoubleSnippets()); - Snippets.install(runtime, target, new FloatSnippets()); - Snippets.install(runtime, target, new NodeClassSnippets()); + Snippets.install(runtime, target, MathSnippetsX86.class); + Snippets.install(runtime, target, DoubleSnippets.class); + Snippets.install(runtime, target, FloatSnippets.class); + Snippets.install(runtime, target, NodeClassSnippets.class); } } }
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Snippets.java Wed Jun 13 00:24:28 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Snippets.java Wed Jun 13 13:26:56 2012 +0200 @@ -44,13 +44,12 @@ */ public class Snippets { - public static void install(ExtendedRiRuntime runtime, TargetDescription target, SnippetsInterface obj) { - Class<? extends SnippetsInterface> clazz = obj.getClass(); + public static void install(ExtendedRiRuntime runtime, TargetDescription target, Class<? extends SnippetsInterface> snippetsHolder) { BoxingMethodPool pool = new BoxingMethodPool(runtime); - if (clazz.isAnnotationPresent(ClassSubstitution.class)) { - installSubstitution(runtime, target, clazz, pool, clazz.getAnnotation(ClassSubstitution.class).value()); + if (snippetsHolder.isAnnotationPresent(ClassSubstitution.class)) { + installSubstitution(runtime, target, snippetsHolder, pool, snippetsHolder.getAnnotation(ClassSubstitution.class).value()); } else { - installSnippets(runtime, target, clazz, pool); + installSnippets(runtime, target, snippetsHolder, pool); } }