diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/Float64ArrayPlugin.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/Float64ArrayPlugin.java index 5850ea080..3d70d85c2 100644 --- a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/Float64ArrayPlugin.java +++ b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/Float64ArrayPlugin.java @@ -17,6 +17,7 @@ import com.oracle.truffle.api.nodes.Node; import de.hpi.swa.trufflesqueak.exceptions.PrimitiveFailed; +import de.hpi.swa.trufflesqueak.image.SqueakImageContext; import de.hpi.swa.trufflesqueak.model.BooleanObject; import de.hpi.swa.trufflesqueak.model.FloatObject; import de.hpi.swa.trufflesqueak.model.NativeObject; @@ -102,7 +103,7 @@ protected static final double doFloat(final NativeObject receiver, final long in protected static final double doFraction(final NativeObject receiver, final long index, final PointersObject value, @Bind("this") final Node node, @Cached final AbstractPointersObjectNodes.AbstractPointersObjectReadNode readNode) { - return doDouble(receiver, index, getContext(node).fromFraction(value, readNode, node)); + return doDouble(receiver, index, SqueakImageContext.fromFraction(value, readNode, node)); } @SuppressWarnings("unused") diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/FloatArrayPlugin.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/FloatArrayPlugin.java index b10595019..07471e30e 100644 --- a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/FloatArrayPlugin.java +++ b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/FloatArrayPlugin.java @@ -17,6 +17,7 @@ import com.oracle.truffle.api.nodes.Node; import de.hpi.swa.trufflesqueak.exceptions.PrimitiveFailed; +import de.hpi.swa.trufflesqueak.image.SqueakImageContext; import de.hpi.swa.trufflesqueak.model.BooleanObject; import de.hpi.swa.trufflesqueak.model.FloatObject; import de.hpi.swa.trufflesqueak.model.NativeObject; @@ -103,7 +104,7 @@ protected static final double doFloat(final NativeObject receiver, final long in protected static final double doFraction(final NativeObject receiver, final long index, final PointersObject value, @Bind("this") final Node node, @Cached final AbstractPointersObjectNodes.AbstractPointersObjectReadNode readNode) { - return doDouble(receiver, index, getContext(node).fromFraction(value, readNode, node)); + return doDouble(receiver, index, SqueakImageContext.fromFraction(value, readNode, node)); } @SuppressWarnings("unused") diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/primitives/impl/ArithmeticPrimitives.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/primitives/impl/ArithmeticPrimitives.java index 50f76266e..d32011c5c 100644 --- a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/primitives/impl/ArithmeticPrimitives.java +++ b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/primitives/impl/ArithmeticPrimitives.java @@ -27,6 +27,7 @@ import de.hpi.swa.trufflesqueak.exceptions.PrimitiveFailed; import de.hpi.swa.trufflesqueak.exceptions.RespecializeException; +import de.hpi.swa.trufflesqueak.image.SqueakImageContext; import de.hpi.swa.trufflesqueak.model.AbstractSqueakObject; import de.hpi.swa.trufflesqueak.model.BooleanObject; import de.hpi.swa.trufflesqueak.model.FloatObject; @@ -1246,7 +1247,7 @@ protected static final Object doFraction(final double lhs, final PointersObject @Bind("this") final Node node, @Cached final AsFloatObjectIfNessaryNode boxNode, @Cached final AbstractPointersObjectNodes.AbstractPointersObjectReadNode readNode) { - return boxNode.execute(node, lhs - getContext(node).fromFraction(rhs, readNode, node)); + return boxNode.execute(node, lhs - SqueakImageContext.fromFraction(rhs, readNode, node)); } }