Start using @Bind.DefaultExpression

hpi-swa · Jan 28, 2025 · 561ff6d · 561ff6d
1 parent 8b5e911
commit 561ff6d
Show file tree

Hide file tree

Showing 22 changed files with 264 additions and 248 deletions.
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageContext.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageContext.java
@@ -18,6 +18,7 @@
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.TruffleLanguage.ParsingRequest;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.AllocationReporter;
@@ -77,6 +78,7 @@
 import de.hpi.swa.trufflesqueak.util.MethodCacheEntry;
 import de.hpi.swa.trufflesqueak.util.MiscUtils;
 
+@Bind.DefaultExpression("get($node)")
 public final class SqueakImageContext {
     private static final ContextReference<SqueakImageContext> REFERENCE = ContextReference.create(SqueakLanguage.class);
 

diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/interop/ConvertToSqueakNode.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/interop/ConvertToSqueakNode.java
@@ -7,6 +7,7 @@
 package de.hpi.swa.trufflesqueak.interop;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
@@ -43,9 +44,9 @@ protected static final boolean doBoolean(final Object value,
     }
 
     @Specialization(guards = "lib.isString(value)", limit = "1")
-    protected final NativeObject doString(final Object value,
+    protected static final NativeObject doString(final Object value,
+                    @Bind final SqueakImageContext image,
                     @CachedLibrary("value") final InteropLibrary lib) {
-        final SqueakImageContext image = getContext();
         try {
             return image.asByteString(lib.asString(value));
         } catch (final UnsupportedMessageException e) {

diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/LookupMethodNode.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/LookupMethodNode.java
@@ -6,6 +6,7 @@
  */
 package de.hpi.swa.trufflesqueak.nodes;
 
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
@@ -14,6 +15,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 
+import de.hpi.swa.trufflesqueak.image.SqueakImageContext;
 import de.hpi.swa.trufflesqueak.model.ClassObject;
 import de.hpi.swa.trufflesqueak.model.NativeObject;
 import de.hpi.swa.trufflesqueak.util.MethodCacheEntry;
@@ -42,8 +44,9 @@ protected static final Object doCached(final ClassObject classObject, final Nati
 
     @ReportPolymorphism.Megamorphic
     @Specialization(replaces = "doCached")
-    protected final Object doUncached(final ClassObject classObject, final NativeObject selector) {
-        final MethodCacheEntry cachedEntry = getContext().findMethodCacheEntry(classObject, selector);
+    protected static final Object doUncached(final ClassObject classObject, final NativeObject selector,
+                    @Bind final SqueakImageContext image) {
+        final MethodCacheEntry cachedEntry = image.findMethodCacheEntry(classObject, selector);
         if (cachedEntry.getResult() == null) {
             cachedEntry.setResult(classObject.lookupInMethodDictSlow(selector));
         }

diff --git a/....trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/MaterializeContextOnMethodExitNode.java b/....trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/MaterializeContextOnMethodExitNode.java
@@ -26,18 +26,19 @@ public static MaterializeContextOnMethodExitNode create() {
 
     public abstract void execute(VirtualFrame frame);
 
-    @Specialization(guards = {"getSqueakImageContext(frame).lastSeenContext == null", "hasEscapedContext(frame)"})
-    protected final void doStartMaterialization(final VirtualFrame frame) {
-        getContext().lastSeenContext = FrameAccess.getContext(frame);
+    @Specialization(guards = {"image.lastSeenContext == null", "hasEscapedContext(frame)"})
+    protected static final void doStartMaterialization(final VirtualFrame frame,
+                    @Bind final SqueakImageContext image) {
+        image.lastSeenContext = FrameAccess.getContext(frame);
     }
 
-    @Specialization(guards = {"getSqueakImageContext(frame).lastSeenContext != null"})
-    protected final void doMaterialize(final VirtualFrame frame,
+    @Specialization(guards = {"image.lastSeenContext != null"})
+    protected static final void doMaterialize(final VirtualFrame frame,
                     @Bind final Node node,
+                    @Bind final SqueakImageContext image,
                     @Cached final InlinedConditionProfile isNotLastSeenContextProfile,
                     @Cached final InlinedConditionProfile continueProfile,
                     @Cached(inline = true) final GetOrCreateContextNode getOrCreateContextNode) {
-        final SqueakImageContext image = getContext();
         final ContextObject lastSeenContext = image.lastSeenContext;
         final ContextObject context = getOrCreateContextNode.executeGet(frame, node);
         if (isNotLastSeenContextProfile.profile(node, context != lastSeenContext)) {
@@ -56,15 +57,10 @@ protected final void doMaterialize(final VirtualFrame frame,
     }
 
     @Specialization(guards = {"!hasEscapedContext(frame)"})
-    protected final void doNothing(@SuppressWarnings("unused") final VirtualFrame frame) {
+    protected static final void doNothing(@SuppressWarnings("unused") final VirtualFrame frame) {
         /*
          * Nothing to do because neither was a child context materialized nor has this context been
          * requested and allocated.
          */
     }
-
-    /* Avoid that the DSL generates an assertion for this. */
-    protected final SqueakImageContext getSqueakImageContext(@SuppressWarnings("unused") final VirtualFrame frame) {
-        return getContext();
-    }
 }
diff --git a/....hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/accessing/FloatObjectNodes.java b/....hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/accessing/FloatObjectNodes.java
@@ -6,13 +6,15 @@
  */
 package de.hpi.swa.trufflesqueak.nodes.accessing;
 
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 
+import de.hpi.swa.trufflesqueak.image.SqueakImageContext;
 import de.hpi.swa.trufflesqueak.model.FloatObject;
 import de.hpi.swa.trufflesqueak.nodes.AbstractNode;
 import de.hpi.swa.trufflesqueak.nodes.accessing.FloatObjectNodesFactory.AsFloatObjectIfNessaryNodeGen;
@@ -37,8 +39,8 @@ protected static final double doFinite(final double value) {
         }
 
         @Specialization(guards = "!isFinite(value)")
-        protected final FloatObject doNaNOrInfinite(final double value) {
-            return new FloatObject(getContext(), value);
+        protected static final FloatObject doNaNOrInfinite(final double value, @Bind final SqueakImageContext image) {
+            return new FloatObject(image, value);
         }
     }
 }
diff --git a/...wa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/accessing/SqueakObjectAtPut0Node.java b/...wa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/accessing/SqueakObjectAtPut0Node.java
@@ -6,6 +6,7 @@
  */
 package de.hpi.swa.trufflesqueak.nodes.accessing;
 
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
@@ -14,6 +15,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 
+import de.hpi.swa.trufflesqueak.image.SqueakImageContext;
 import de.hpi.swa.trufflesqueak.model.ArrayObject;
 import de.hpi.swa.trufflesqueak.model.BlockClosureObject;
 import de.hpi.swa.trufflesqueak.model.ClassObject;
@@ -67,8 +69,9 @@ protected static final void doVariablePointers(final Node node, final VariablePo
     }
 
     @Specialization
-    protected final void doLargeInteger(final LargeIntegerObject receiver, final long index, final long value) {
-        receiver.setNativeAt0(getContext(), index, value);
+    protected static final void doLargeInteger(final LargeIntegerObject receiver, final long index, final long value,
+                    @Bind final SqueakImageContext image) {
+        receiver.setNativeAt0(image, index, value);
     }
 
     @Specialization

diff --git a/...swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/accessing/SqueakObjectClassNode.java b/...swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/accessing/SqueakObjectClassNode.java
@@ -6,12 +6,14 @@
  */
 package de.hpi.swa.trufflesqueak.nodes.accessing;
 
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 
+import de.hpi.swa.trufflesqueak.image.SqueakImageContext;
 import de.hpi.swa.trufflesqueak.model.AbstractSqueakObject;
 import de.hpi.swa.trufflesqueak.model.AbstractSqueakObjectWithClassAndHash;
 import de.hpi.swa.trufflesqueak.model.CharacterObject;
@@ -39,48 +41,48 @@ public static final ClassObject executeUncached(final Object receiver) {
     }
 
     @Specialization
-    protected final ClassObject doNil(@SuppressWarnings("unused") final NilObject value) {
-        return getContext().nilClass;
+    protected static final ClassObject doNil(@SuppressWarnings("unused") final NilObject value, @Bind final SqueakImageContext image) {
+        return image.nilClass;
     }
 
     @Specialization(guards = "value == TRUE")
-    protected final ClassObject doTrue(@SuppressWarnings("unused") final boolean value) {
-        return getContext().trueClass;
+    protected static final ClassObject doTrue(@SuppressWarnings("unused") final boolean value, @Bind final SqueakImageContext image) {
+        return image.trueClass;
     }
 
     @Specialization(guards = "value != TRUE")
-    protected final ClassObject doFalse(@SuppressWarnings("unused") final boolean value) {
-        return getContext().falseClass;
+    protected static final ClassObject doFalse(@SuppressWarnings("unused") final boolean value, @Bind final SqueakImageContext image) {
+        return image.falseClass;
     }
 
     @Specialization
-    protected final ClassObject doSmallInteger(@SuppressWarnings("unused") final long value) {
-        return getContext().smallIntegerClass;
+    protected static final ClassObject doSmallInteger(@SuppressWarnings("unused") final long value, @Bind final SqueakImageContext image) {
+        return image.smallIntegerClass;
     }
 
     @Specialization
-    protected final ClassObject doChar(@SuppressWarnings("unused") final char value) {
-        return getContext().characterClass;
+    protected static final ClassObject doChar(@SuppressWarnings("unused") final char value, @Bind final SqueakImageContext image) {
+        return image.characterClass;
     }
 
     @Specialization
-    protected final ClassObject doDouble(@SuppressWarnings("unused") final double value) {
-        return getContext().smallFloatClass;
+    protected static final ClassObject doDouble(@SuppressWarnings("unused") final double value, @Bind final SqueakImageContext image) {
+        return image.smallFloatClass;
     }
 
     @Specialization
-    protected final ClassObject doCharacter(@SuppressWarnings("unused") final CharacterObject value) {
-        return getContext().characterClass;
+    protected static final ClassObject doCharacter(@SuppressWarnings("unused") final CharacterObject value, @Bind final SqueakImageContext image) {
+        return image.characterClass;
     }
 
     @Specialization
-    protected final ClassObject doContext(@SuppressWarnings("unused") final ContextObject value) {
-        return getContext().methodContextClass;
+    protected static final ClassObject doContext(@SuppressWarnings("unused") final ContextObject value, @Bind final SqueakImageContext image) {
+        return image.methodContextClass;
     }
 
     @Specialization
-    protected final ClassObject doFloat(@SuppressWarnings("unused") final FloatObject value) {
-        return getContext().floatClass;
+    protected static final ClassObject doFloat(@SuppressWarnings("unused") final FloatObject value, @Bind final SqueakImageContext image) {
+        return image.floatClass;
     }
 
     @Specialization
@@ -89,7 +91,7 @@ protected static final ClassObject doAbstractSqueakObjectWithClassAndHash(final
     }
 
     @Specialization(guards = {"!isAbstractSqueakObject(value)", "!isUsedJavaPrimitive(value)"})
-    protected final ClassObject doForeignObject(@SuppressWarnings("unused") final Object value) {
-        return getContext().getForeignObjectClass();
+    protected static final ClassObject doForeignObject(@SuppressWarnings("unused") final Object value, @Bind final SqueakImageContext image) {
+        return image.getForeignObjectClass();
     }
 }
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/bytecodes/SendBytecodes.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/bytecodes/SendBytecodes.java
@@ -405,8 +405,8 @@ protected static final long doLong(final long lhs, final long rhs) {
                 }
 
                 @Specialization(replaces = "doLong")
-                protected final Object doLongWithOverflow(final long lhs, final long rhs) {
-                    return LargeIntegerObject.add(getContext(), lhs, rhs);
+                protected static final Object doLongWithOverflow(final long lhs, final long rhs, @Bind final SqueakImageContext image) {
+                    return LargeIntegerObject.add(image, lhs, rhs);
                 }
 
                 @Specialization
@@ -428,8 +428,8 @@ protected static final long doLong(final long lhs, final long rhs) {
                 }
 
                 @Specialization(replaces = "doLong")
-                protected final Object doLongWithOverflow(final long lhs, final long rhs) {
-                    return LargeIntegerObject.subtract(getContext(), lhs, rhs);
+                protected static final Object doLongWithOverflow(final long lhs, final long rhs, @Bind final SqueakImageContext image) {
+                    return LargeIntegerObject.subtract(image, lhs, rhs);
                 }
 
                 @Specialization
@@ -559,8 +559,8 @@ protected static final long doLong(final long lhs, final long rhs) {
                 }
 
                 @Specialization(replaces = "doLong")
-                protected final Object doLongWithOverflow(final long lhs, final long rhs) {
-                    return LargeIntegerObject.multiply(getContext(), lhs, rhs);
+                protected static final Object doLongWithOverflow(final long lhs, final long rhs, @Bind final SqueakImageContext image) {
+                    return LargeIntegerObject.multiply(image, lhs, rhs);
                 }
 
                 @Specialization(rewriteOn = RespecializeException.class)

diff --git a/...queak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/CreateDoesNotUnderstandMessageNode.java b/...queak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/CreateDoesNotUnderstandMessageNode.java
@@ -12,6 +12,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 
+import de.hpi.swa.trufflesqueak.image.SqueakImageContext;
 import de.hpi.swa.trufflesqueak.model.ClassObject;
 import de.hpi.swa.trufflesqueak.model.NativeObject;
 import de.hpi.swa.trufflesqueak.model.PointersObject;
@@ -26,9 +27,10 @@ abstract class CreateDoesNotUnderstandMessageNode extends AbstractNode {
     @Specialization
     protected static final PointersObject doCreate(final NativeObject selector, final Object receiver, final Object[] arguments,
                     @Bind final Node node,
+                    @Bind final SqueakImageContext image,
                     @Cached final AbstractPointersObjectWriteNode writeNode,
                     @Cached final SqueakObjectClassNode classNode) {
         final ClassObject receiverClass = classNode.executeLookup(node, receiver);
-        return getContext(node).newMessage(writeNode, node, selector, receiverClass, arguments);
+        return image.newMessage(writeNode, node, selector, receiverClass, arguments);
     }
 }
diff --git a/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector0Node.java b/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector0Node.java
@@ -340,14 +340,15 @@ public abstract static class DispatchIndirect0Node extends AbstractNode {
         @Specialization
         protected static final Object doIndirect(final VirtualFrame frame, final NativeObject selector, final Object receiver,
                         @Bind final Node node,
+                        @Bind final SqueakImageContext image,
                         @Cached final SqueakObjectClassNode classNode,
                         @Cached final ResolveMethodNode methodNode,
                         @Cached final TryPrimitive0Node tryPrimitiveNode,
                         @Cached final CreateFrameArgumentsForIndirectCall0Node argumentsNode,
                         @Cached final IndirectCallNode callNode) {
             final ClassObject receiverClass = classNode.executeLookup(node, receiver);
-            final Object lookupResult = getContext(node).lookup(receiverClass, selector);
-            final CompiledCodeObject method = methodNode.execute(node, getContext(node), receiverClass, lookupResult);
+            final Object lookupResult = image.lookup(receiverClass, selector);
+            final CompiledCodeObject method = methodNode.execute(node, image, receiverClass, lookupResult);
             final Object result = tryPrimitiveNode.execute(frame, method, receiver);
             if (result != null) {
                 return result;

diff --git a/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector1Node.java b/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector1Node.java
@@ -340,14 +340,15 @@ public abstract static class DispatchIndirect1Node extends AbstractNode {
         @Specialization
         protected static final Object doIndirect(final VirtualFrame frame, final NativeObject selector, final Object receiver, final Object arg1,
                         @Bind final Node node,
+                        @Bind final SqueakImageContext image,
                         @Cached final SqueakObjectClassNode classNode,
                         @Cached final ResolveMethodNode methodNode,
                         @Cached final TryPrimitive1Node tryPrimitiveNode,
                         @Cached final CreateFrameArgumentsForIndirectCall1Node argumentsNode,
                         @Cached final IndirectCallNode callNode) {
             final ClassObject receiverClass = classNode.executeLookup(node, receiver);
-            final Object lookupResult = getContext(node).lookup(receiverClass, selector);
-            final CompiledCodeObject method = methodNode.execute(node, getContext(node), receiverClass, lookupResult);
+            final Object lookupResult = image.lookup(receiverClass, selector);
+            final CompiledCodeObject method = methodNode.execute(node, image, receiverClass, lookupResult);
             final Object result = tryPrimitiveNode.execute(frame, method, receiver, arg1);
             if (result != null) {
                 return result;

diff --git a/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector2Node.java b/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector2Node.java
@@ -342,14 +342,15 @@ public abstract static class DispatchIndirect2Node extends AbstractNode {
         @Specialization
         protected static final Object doIndirect(final VirtualFrame frame, final NativeObject selector, final Object receiver, final Object arg1, final Object arg2,
                         @Bind final Node node,
+                        @Bind final SqueakImageContext image,
                         @Cached final SqueakObjectClassNode classNode,
                         @Cached final ResolveMethodNode methodNode,
                         @Cached final TryPrimitive2Node tryPrimitiveNode,
                         @Cached final CreateFrameArgumentsForIndirectCall2Node argumentsNode,
                         @Cached final IndirectCallNode callNode) {
             final ClassObject receiverClass = classNode.executeLookup(node, receiver);
-            final Object lookupResult = getContext(node).lookup(receiverClass, selector);
-            final CompiledCodeObject method = methodNode.execute(node, getContext(node), receiverClass, lookupResult);
+            final Object lookupResult = image.lookup(receiverClass, selector);
+            final CompiledCodeObject method = methodNode.execute(node, image, receiverClass, lookupResult);
             final Object result = tryPrimitiveNode.execute(frame, method, receiver, arg1, arg2);
             if (result != null) {
                 return result;