Cleanups

hpi-swa · Jan 4, 2025 · 03c8f91 · 03c8f91
1 parent b1004cc
commit 03c8f91
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 38 deletions.
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/AbstractSqueakObject.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/AbstractSqueakObject.java
@@ -145,7 +145,7 @@ protected static final Object doSendGeneric(final Node node, final AbstractSquea
                             try {
                                 return primitiveNode.executeWithArguments(frame, receiver, arguments);
                             } catch (final PrimitiveFailed pf) {
-                                DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                                DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                             }
                         }
                     }

diff --git a/...rufflesqueak/src/de/hpi/swa/trufflesqueak/model/AbstractSqueakObjectWithClassAndHash.java b/...rufflesqueak/src/de/hpi/swa/trufflesqueak/model/AbstractSqueakObjectWithClassAndHash.java
@@ -163,7 +163,7 @@ public final Object send(final SqueakImageContext image, final String selector,
                         try {
                             return primitiveNode.executeWithArguments(image.externalSenderFrame, this, arguments);
                         } catch (final PrimitiveFailed pf) {
-                            DispatchUtils.handlePrimitiveFailedIndirect(null, primitiveNode, method, pf);
+                            DispatchUtils.handlePrimitiveFailedIndirect(null, method, pf);
                         }
                     }
                 }

diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/NativeObject.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/NativeObject.java
@@ -365,7 +365,7 @@ public Object executeAsSymbolSlow(final SqueakImageContext image, final VirtualF
                     try {
                         return primitiveNode.executeWithArguments(image.externalSenderFrame, receiver, arguments);
                     } catch (final PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(null, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(null, method, pf);
                     }
                 }
             }

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
@@ -125,7 +125,7 @@ protected final Object doIndirect(final VirtualFrame frame, final Object receive
                     try {
                         return ((Primitive0) primitiveNode).execute(frame, receiver);
                     } catch (final PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }

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
@@ -126,7 +126,7 @@ protected final Object doIndirect(final VirtualFrame frame, final Object receive
                     try {
                         return ((Primitive1) primitiveNode).execute(frame, receiver, arg1);
                     } catch (final PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }

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
@@ -128,7 +128,7 @@ protected final Object doIndirect(final VirtualFrame frame, final Object receive
                     try {
                         return ((Primitive2) primitiveNode).execute(frame, receiver, arg1, arg2);
                     } catch (final PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }

diff --git a/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector3Node.java b/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector3Node.java
@@ -130,7 +130,7 @@ protected final Object doIndirect(final VirtualFrame frame, final Object receive
                     try {
                         return ((Primitive3) primitiveNode).execute(frame, receiver, arg1, arg2, arg3);
                     } catch (final PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }

diff --git a/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector4Node.java b/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector4Node.java
@@ -132,7 +132,7 @@ protected final Object doIndirect(final VirtualFrame frame, final Object receive
                     try {
                         return ((Primitive4) primitiveNode).execute(frame, receiver, arg1, arg2, arg3, arg4);
                     } catch (final PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }

diff --git a/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector5Node.java b/....swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelector5Node.java
@@ -135,7 +135,7 @@ protected final Object doIndirect(final VirtualFrame frame, final Object receive
                     try {
                         return ((Primitive5) primitiveNode).execute(frame, receiver, arg1, arg2, arg3, arg4, arg5);
                     } catch (final PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }

diff --git a/...a.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelectorNaryNode.java b/...a.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchSelectorNaryNode.java
@@ -143,7 +143,7 @@ protected final Object doIndirect(final VirtualFrame frame, final Object receive
                     try {
                         return primitiveNode.executeWithArguments(frame, receiver, arguments);
                     } catch (final PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }

diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchUtils.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/dispatch/DispatchUtils.java
@@ -79,7 +79,7 @@ public static void logPrimitiveFailed(final NodeInterface primitiveNode) {
     }
 
     @TruffleBoundary
-    public static void handlePrimitiveFailedIndirect(final Node node, final AbstractPrimitiveNode primitiveNode, final CompiledCodeObject method, final PrimitiveFailed primitiveFailed) {
+    public static void handlePrimitiveFailedIndirect(final Node node, final CompiledCodeObject method, final PrimitiveFailed primitiveFailed) {
         if (method.hasStoreIntoTemp1AfterCallPrimitive()) {
             SqueakImageContext.get(node).setPrimFailCode(primitiveFailed);
         }

diff --git a/...a.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/primitives/impl/ControlPrimitives.java b/...a.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/primitives/impl/ControlPrimitives.java
@@ -176,7 +176,7 @@ protected static final Object perform0(final VirtualFrame frame, final Object re
                     try {
                         return ((Primitive0) primitiveNode).execute(frame, receiver);
                     } catch (PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }
@@ -214,7 +214,7 @@ protected static final Object perform1(final VirtualFrame frame, final Object re
                     try {
                         return ((Primitive1) primitiveNode).execute(frame, receiver, object1);
                     } catch (PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }
@@ -252,7 +252,7 @@ protected static final Object perform2(final VirtualFrame frame, final Object re
                     try {
                         return ((Primitive2) primitiveNode).execute(frame, receiver, object1, object2);
                     } catch (PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }
@@ -290,7 +290,7 @@ protected static final Object perform3(final VirtualFrame frame, final Object re
                     try {
                         return ((Primitive3) primitiveNode).execute(frame, receiver, object1, object2, object3);
                     } catch (PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }
@@ -330,7 +330,7 @@ protected static final Object perform4(final VirtualFrame frame, final Object re
                     try {
                         return ((Primitive4) primitiveNode).execute(frame, receiver, object1, object2, object3, object4);
                     } catch (PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }
@@ -370,7 +370,7 @@ protected static final Object perform5(final VirtualFrame frame, final Object re
                     try {
                         return ((Primitive5) primitiveNode).execute(frame, receiver, object1, object2, object3, object4, object5);
                     } catch (PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }
@@ -409,7 +409,7 @@ protected static final Object perform(final VirtualFrame frame, final Object rec
                     try {
                         return primitiveNode.executeWithArguments(frame, receiver, arguments);
                     } catch (PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }
@@ -1146,10 +1146,9 @@ protected abstract static class TestAndSetOwnershipOfCriticalSectionNode extends
             protected abstract Object execute(Node node, PointersObject mutex, Object mutexOwner, PointersObject activeProcess);
 
             @Specialization
-            protected static final boolean doNilOwner(final Node node, final PointersObject mutex, @SuppressWarnings("unused") final NilObject owner, final PointersObject activeProcess,
+            protected static final boolean doNilOwner(final Node node, final PointersObject mutex, final NilObject owner, final PointersObject activeProcess,
                             @Cached final AbstractPointersObjectWriteNode writeNode) {
-                writeNode.execute(node, mutex, MUTEX.OWNER, activeProcess);
-                return BooleanObject.FALSE;
+                return EnterCriticalSectionNode.doEnterNilOwner(node, mutex, owner, activeProcess, writeNode);
             }
 
             @SuppressWarnings("unused")
@@ -1178,8 +1177,7 @@ protected static final Object doCached(final VirtualFrame frame, final Object re
                         @Bind("this") final Node node,
                         @Exclusive @Cached final ArrayObjectToObjectArrayCopyNode arrayNode,
                         @Cached("create(cachedMethod, guard)") final DispatchDirectNaryNode dispatchNode) {
-            final Object[] arguments = arrayNode.execute(node, argArray);
-            return dispatchNode.execute(frame, receiver, arguments);
+            return dispatchNode.execute(frame, receiver, arrayNode.execute(node, argArray));
         }
 
         @ReportPolymorphism.Megamorphic
@@ -1196,7 +1194,7 @@ protected static final Object doExecute(final VirtualFrame frame, final Object r
                     try {
                         return primitiveNode.executeWithArguments(frame, receiver, arguments);
                     } catch (final PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
+                        DispatchUtils.handlePrimitiveFailedIndirect(node, method, pf);
                     }
                 }
             }
@@ -1215,8 +1213,7 @@ protected static final Object doCached(final VirtualFrame frame, @SuppressWarnin
                         @Bind("this") final Node node,
                         @Exclusive @Cached final ArrayObjectToObjectArrayCopyNode arrayNode,
                         @Cached("create(cachedMethod, guard)") final DispatchDirectNaryNode dispatchNode) {
-            final Object[] arguments = arrayNode.execute(node, argArray);
-            return dispatchNode.execute(frame, receiver, arguments);
+            return dispatchNode.execute(frame, receiver, arrayNode.execute(node, argArray));
         }
 
         @ReportPolymorphism.Megamorphic
@@ -1227,18 +1224,7 @@ protected static final Object doExecute(final VirtualFrame frame, @SuppressWarni
                         @Exclusive @Cached final ArrayObjectToObjectArrayCopyNode arrayNode,
                         @Cached final GetOrCreateContextOrMarkerNode senderNode,
                         @Cached final IndirectCallNode callNode) {
-            final Object[] arguments = arrayNode.execute(node, argArray);
-            if (method.hasPrimitive()) {
-                final AbstractPrimitiveNode primitiveNode = method.getPrimitiveNode();
-                if (primitiveNode != null) {
-                    try {
-                        return primitiveNode.executeWithArguments(frame, receiver, arguments);
-                    } catch (final PrimitiveFailed pf) {
-                        DispatchUtils.handlePrimitiveFailedIndirect(node, primitiveNode, method, pf);
-                    }
-                }
-            }
-            return callNode.call(method.getCallTarget(), FrameAccess.newWith(senderNode.execute(frame, node, method), null, receiver, arguments));
+            return PrimExecuteMethodArgsArray3Node.doExecute(frame, receiver, argArray, method, node, arrayNode, senderNode, callNode);
         }
     }