Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 131488410f51
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8dffcc128342
Choose a head ref
  • 3 commits
  • 12 files changed
  • 1 contributor

Commits on May 10, 2015

  1. [Truffle] Remove RHS RubyBignum in FloatNodes.

    @chrisseaton
    chrisseaton committed May 10, 2015
    Copy the full SHA
    5089ef5 View commit details

  2. [Truffle] Remove RHS RubyBignum in BignumNodes.

    @chrisseaton
    chrisseaton committed May 10, 2015
    Copy the full SHA
    640e116 View commit details

  3. [Truffle] Switch to using DynamicObject for RubyBignum's value field.

    @chrisseaton
    chrisseaton committed May 10, 2015
    Copy the full SHA
    8dffcc1 View commit details
117 changes: 77 additions & 40 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
View file
Original file line number Diff line number Diff line change
@@ -13,31 +13,68 @@
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.object.*;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import com.oracle.truffle.api.utilities.ConditionProfile;
import org.jruby.truffle.nodes.cast.BooleanCastNode;
import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.nodes.objects.Allocator;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.UndefinedPlaceholder;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.core.RubyBignum;
import org.jruby.truffle.runtime.core.RubyString;
import org.jruby.truffle.runtime.core.*;

import java.math.BigInteger;
import java.util.EnumSet;
import java.util.concurrent.locks.ReentrantLock;

@CoreClass(name = "Bignum")
public abstract class BignumNodes {

public static final BigInteger LONG_MAX = BigInteger.valueOf(Long.MAX_VALUE);
public static final BigInteger LONG_MIN = BigInteger.valueOf(Long.MIN_VALUE);

private static final HiddenKey VALUE_IDENTIFIER = new HiddenKey("value");
public static final Property VALUE_PROPERTY;

static {
Shape.Allocator allocator = RubyBasicObject.LAYOUT.createAllocator();
VALUE_PROPERTY = Property.create(VALUE_IDENTIFIER, allocator.locationForType(BigInteger.class, EnumSet.of(LocationModifier.NonNull)), 0);
}

public static Allocator createBigumAllocator(Shape emptyShape) {
Shape shape = emptyShape.addProperty(VALUE_PROPERTY);
final DynamicObjectFactory factory = shape.createFactory();

return new Allocator() {
@Override
public RubyBasicObject allocate(RubyContext context, RubyClass rubyClass, Node currentNode) {
return new RubyBignum(rubyClass, factory.newInstance(BigInteger.ZERO));
}
};
}

public static RubyBasicObject createRubyBignum(RubyClass rubyClass, BigInteger value) {
final RubyBasicObject bignum = rubyClass.getAllocator().allocate(rubyClass.getContext(), rubyClass, null);

try {
VALUE_PROPERTY.set(bignum.getDynamicObject(), value, bignum.getDynamicObject().getShape());
} catch (IncompatibleLocationException e) {
throw new UnsupportedOperationException();
} catch (FinalLocationException e) {
throw new UnsupportedOperationException();
}

return bignum;
}

public static BigInteger getBigIntegerValue(RubyBasicObject bignum) {
return ((RubyBignum) bignum).internalGetBigIntegerValue();
assert bignum.getDynamicObject().getShape().hasProperty(VALUE_IDENTIFIER);
return (BigInteger) VALUE_PROPERTY.get(bignum.getDynamicObject(), true);
}

public static abstract class BignumCoreMethodNode extends CoreMethodArrayArgumentsNode {
@@ -91,8 +128,8 @@ public double add(RubyBasicObject a, double b) {
return getBigIntegerValue(a).doubleValue() + b;
}

@Specialization
public Object add(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public Object add(RubyBasicObject a, RubyBasicObject b) {
return fixnumOrBignum(getBigIntegerValue(a).add(getBigIntegerValue(b)));
}

@@ -120,8 +157,8 @@ public double sub(RubyBasicObject a, double b) {
return getBigIntegerValue(a).doubleValue() - b;
}

@Specialization
public Object sub(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public Object sub(RubyBasicObject a, RubyBasicObject b) {
return fixnumOrBignum(getBigIntegerValue(a).subtract(getBigIntegerValue(b)));
}

@@ -152,8 +189,8 @@ public double mul(RubyBasicObject a, double b) {
}

@TruffleBoundary
@Specialization
public Object mul(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public Object mul(RubyBasicObject a, RubyBasicObject b) {
return fixnumOrBignum(getBigIntegerValue(a).multiply(getBigIntegerValue(b)));
}

@@ -181,8 +218,8 @@ public double div(RubyBasicObject a, double b) {
return getBigIntegerValue(a).doubleValue() / b;
}

@Specialization
public Object div(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public Object div(RubyBasicObject a, RubyBasicObject b) {
return fixnumOrBignum(getBigIntegerValue(a).divide(getBigIntegerValue(b)));
}

@@ -219,8 +256,8 @@ public Object mod(RubyBasicObject a, long b) {
return fixnumOrBignum(getBigIntegerValue(a).mod(BigInteger.valueOf(b)));
}

@Specialization
public Object mod(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public Object mod(RubyBasicObject a, RubyBasicObject b) {
final BigInteger bigint = getBigIntegerValue(b);
final int compare = bigint.compareTo(BigInteger.ZERO);
if (compare == 0) {
@@ -233,7 +270,7 @@ public Object mod(RubyBasicObject a, RubyBignum b) {
}

@Specialization(guards = {"!isInteger(b)", "!isLong(b)", "!isRubyBignum(b)"})
public Object mod(VirtualFrame frame, RubyBignum a, Object b) {
public Object mod(VirtualFrame frame, RubyBasicObject a, Object b) {
return ruby(frame, "redo_coerced :%, other", "other", b);
}

@@ -261,13 +298,13 @@ public boolean less(RubyBasicObject a, double b) {
return Double.compare(getBigIntegerValue(a).doubleValue(), b) < 0;
}

@Specialization
public boolean less(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public boolean less(RubyBasicObject a, RubyBasicObject b) {
return getBigIntegerValue(a).compareTo(getBigIntegerValue(b)) < 0;
}

@Specialization(guards = "!isRubyBignum(b)")
public Object lessCoerced(VirtualFrame frame, RubyBignum a, RubyBasicObject b) {
public Object lessCoerced(VirtualFrame frame, RubyBasicObject a, RubyBasicObject b) {
return ruby(frame, "redo_coerced :<, b", "b", b);
}

@@ -295,8 +332,8 @@ public boolean lessEqual(RubyBasicObject a, double b) {
return getBigIntegerValue(a).compareTo(BigInteger.valueOf((long) b)) <= 0;
}

@Specialization
public boolean lessEqual(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public boolean lessEqual(RubyBasicObject a, RubyBasicObject b) {
return getBigIntegerValue(a).compareTo(getBigIntegerValue(b)) <= 0;
}
}
@@ -326,13 +363,13 @@ public boolean equal(RubyBasicObject a, double b) {
return getBigIntegerValue(a).doubleValue() == b;
}

@Specialization
public boolean equal(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public boolean equal(RubyBasicObject a, RubyBasicObject b) {
return getBigIntegerValue(a).equals(getBigIntegerValue(b));
}

@Specialization(guards = "!isRubyBignum(b)")
public Object equal(VirtualFrame frame, RubyBignum a, RubyBasicObject b) {
public Object equal(VirtualFrame frame, RubyBasicObject a, RubyBasicObject b) {
if (booleanCastNode == null) {
CompilerDirectives.transferToInterpreter();
booleanCastNode = insert(BooleanCastNodeGen.create(getContext(), getSourceSection(), null));
@@ -377,8 +414,8 @@ public int compare(RubyBasicObject a, double b) {
}
}

@Specialization
public int compare(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public int compare(RubyBasicObject a, RubyBasicObject b) {
return getBigIntegerValue(a).compareTo(getBigIntegerValue(b));
}
}
@@ -405,8 +442,8 @@ public boolean greaterEqual(RubyBasicObject a, double b) {
return Double.compare(getBigIntegerValue(a).doubleValue(), b) >= 0;
}

@Specialization
public boolean greaterEqual(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public boolean greaterEqual(RubyBasicObject a, RubyBasicObject b) {
return getBigIntegerValue(a).compareTo(getBigIntegerValue(b)) >= 0;
}
}
@@ -433,8 +470,8 @@ public boolean greater(RubyBasicObject a, double b) {
return Double.compare(getBigIntegerValue(a).doubleValue(), b) > 0;
}

@Specialization
public boolean greater(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public boolean greater(RubyBasicObject a, RubyBasicObject b) {
return getBigIntegerValue(a).compareTo(getBigIntegerValue(b)) > 0;
}
}
@@ -456,8 +493,8 @@ public Object bitAnd(RubyBasicObject a, long b) {
return fixnumOrBignum(getBigIntegerValue(a).and(BigInteger.valueOf(b)));
}

@Specialization
public Object bitAnd(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public Object bitAnd(RubyBasicObject a, RubyBasicObject b) {
return fixnumOrBignum(getBigIntegerValue(a).and(getBigIntegerValue(b)));
}
}
@@ -479,8 +516,8 @@ public Object bitOr(RubyBasicObject a, long b) {
return fixnumOrBignum(getBigIntegerValue(a).or(BigInteger.valueOf(b)));
}

@Specialization
public Object bitOr(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public Object bitOr(RubyBasicObject a, RubyBasicObject b) {
return fixnumOrBignum(getBigIntegerValue(a).or(getBigIntegerValue(a)));
}
}
@@ -502,8 +539,8 @@ public Object bitXOr(RubyBasicObject a, long b) {
return fixnumOrBignum(getBigIntegerValue(a).xor(BigInteger.valueOf(b)));
}

@Specialization
public Object bitXOr(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public Object bitXOr(RubyBasicObject a, RubyBasicObject b) {
return fixnumOrBignum(getBigIntegerValue(a).xor(getBigIntegerValue(b)));
}
}
@@ -605,8 +642,8 @@ public RubyArray coerce(RubyBasicObject a, long b) {
return new RubyArray(getContext().getCoreLibrary().getArrayClass(), store, store.length);
}

@Specialization
public RubyArray coerce(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public RubyArray coerce(RubyBasicObject a, RubyBasicObject b) {
CompilerDirectives.transferToInterpreter();

Object[] store = new Object[] { b, a };
@@ -635,8 +672,8 @@ public RubyArray divMod(RubyBasicObject a, long b) {
return divModNode.execute(getBigIntegerValue(a), b);
}

@Specialization
public RubyArray divMod(RubyBasicObject a, RubyBignum b) {
@Specialization(guards = "isRubyBignum(b)")
public RubyArray divMod(RubyBasicObject a, RubyBasicObject b) {
return divModNode.execute(getBigIntegerValue(a), getBigIntegerValue(b));
}

3 changes: 1 addition & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/FixnumOrBignumNode.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@
import com.oracle.truffle.api.utilities.BranchProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyBignum;

import java.math.BigDecimal;
import java.math.BigInteger;
@@ -50,7 +49,7 @@ public Object fixnumOrBignum(BigInteger value) {
return longValue;
}
} else {
return new RubyBignum(getContext().getCoreLibrary().getBignumClass(), value);
return BignumNodes.createRubyBignum(getContext().getCoreLibrary().getBignumClass(), value);
}
}

Loading