Skip to content

Commit

Permalink
[Truffle] Put most of MatchDataNodes behind a boundary.
Browse files Browse the repository at this point in the history
@chrisseaton
chrisseaton committed Sep 22, 2015
1 parent 47d9900 commit e4834a0
Showing 1 changed file with 15 additions and 21 deletions.
36 changes: 15 additions & 21 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/MatchDataNodes.java
View file
Original file line number Diff line number Diff line change
@@ -204,10 +204,9 @@ public GetIndexNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@CompilerDirectives.TruffleBoundary
@Specialization
public Object getIndex(DynamicObject matchData, int index, NotProvided length) {
CompilerDirectives.transferToInterpreter();

final Object[] values = Arrays.copyOf(Layouts.MATCH_DATA.getValues(matchData), Layouts.MATCH_DATA.getValues(matchData).length);
final int normalizedIndex = ArrayOperations.normalizeIndex(values.length, index);

@@ -218,20 +217,19 @@ public Object getIndex(DynamicObject matchData, int index, NotProvided length) {
}
}

@CompilerDirectives.TruffleBoundary
@Specialization
public Object getIndex(DynamicObject matchData, int index, int length) {
CompilerDirectives.transferToInterpreter();
// TODO BJF 15-May-2015 Need to handle negative indexes and lengths and out of bounds
final Object[] values = Arrays.copyOf(Layouts.MATCH_DATA.getValues(matchData), Layouts.MATCH_DATA.getValues(matchData).length);
final int normalizedIndex = ArrayOperations.normalizeIndex(values.length, index);
final Object[] store = Arrays.copyOfRange(values, normalizedIndex, normalizedIndex + length);
return Layouts.ARRAY.createArray(getContext().getCoreLibrary().getArrayFactory(), store, length);
}

@CompilerDirectives.TruffleBoundary
@Specialization(guards = "isRubySymbol(index)")
public Object getIndexSymbol(DynamicObject matchData, DynamicObject index, NotProvided length) {
CompilerDirectives.transferToInterpreter();

try {
ByteList value = Layouts.SYMBOL.getByteList(index);
final int i = Layouts.REGEXP.getRegex(Layouts.MATCH_DATA.getRegexp(matchData)).nameToBackrefNumber(value.getUnsafeBytes(), value.getBegin(), value.getBegin() + value.getRealSize(), Layouts.MATCH_DATA.getRegion(matchData));
@@ -245,10 +243,9 @@ public Object getIndexSymbol(DynamicObject matchData, DynamicObject index, NotPr
}
}

@CompilerDirectives.TruffleBoundary
@Specialization(guards = "isRubyString(index)")
public Object getIndexString(DynamicObject matchData, DynamicObject index, NotProvided length) {
CompilerDirectives.transferToInterpreter();

try {
ByteList value = Layouts.STRING.getByteList(index);
final int i = Layouts.REGEXP.getRegex(Layouts.MATCH_DATA.getRegexp(matchData)).nameToBackrefNumber(value.getUnsafeBytes(), value.getBegin(), value.getBegin() + value.getRealSize(), Layouts.MATCH_DATA.getRegion(matchData));
@@ -275,6 +272,7 @@ public Object getIndex(VirtualFrame frame, DynamicObject matchData, Object index
return getIndex(matchData, toIntNode.doInt(frame, index), NotProvided.INSTANCE);
}

@CompilerDirectives.TruffleBoundary
@Specialization(guards = "isIntegerFixnumRange(range)")
public Object getIndex(DynamicObject matchData, DynamicObject range, NotProvided len) {
final Object[] values = Arrays.copyOf(Layouts.MATCH_DATA.getValues(matchData), Layouts.MATCH_DATA.getValues(matchData).length);
@@ -298,13 +296,10 @@ public BeginNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@CompilerDirectives.TruffleBoundary
@Specialization
public Object begin(DynamicObject matchData, int index) {
CompilerDirectives.transferToInterpreter();

if (badIndexProfile.profile((index < 0) || (index >= Layouts.MATCH_DATA.getRegion(matchData).numRegs))) {
CompilerDirectives.transferToInterpreter();

throw new RaiseException(
getContext().getCoreLibrary().indexError(String.format("index %d out of matches", index), this));

@@ -322,10 +317,9 @@ public CapturesNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@CompilerDirectives.TruffleBoundary
@Specialization
public DynamicObject toA(DynamicObject matchData) {
CompilerDirectives.transferToInterpreter();

Object[] objects = getCaptures(matchData);
return Layouts.ARRAY.createArray(getContext().getCoreLibrary().getArrayFactory(), objects, objects.length);
}
@@ -340,13 +334,10 @@ public EndNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@CompilerDirectives.TruffleBoundary
@Specialization
public Object end(DynamicObject matchData, int index) {
CompilerDirectives.transferToInterpreter();

if (badIndexProfile.profile((index < 0) || (index >= Layouts.MATCH_DATA.getRegion(matchData).numRegs))) {
CompilerDirectives.transferToInterpreter();

throw new RaiseException(
getContext().getCoreLibrary().indexError(String.format("index %d out of matches", index), this));

@@ -395,6 +386,7 @@ public LengthNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@CompilerDirectives.TruffleBoundary
@Specialization
public int length(DynamicObject matchData) {
return Arrays.copyOf(Layouts.MATCH_DATA.getValues(matchData), Layouts.MATCH_DATA.getValues(matchData).length).length;
@@ -412,6 +404,7 @@ public PreMatchNode(RubyContext context, SourceSection sourceSection) {
taintResultNode = new TaintResultNode(getContext(), getSourceSection());
}

@CompilerDirectives.TruffleBoundary
@Specialization
public Object preMatch(DynamicObject matchData) {
return taintResultNode.maybeTaint(Layouts.MATCH_DATA.getSource(matchData), Layouts.MATCH_DATA.getPre(matchData));
@@ -429,6 +422,7 @@ public PostMatchNode(RubyContext context, SourceSection sourceSection) {
taintResultNode = new TaintResultNode(getContext(), getSourceSection());
}

@CompilerDirectives.TruffleBoundary
@Specialization
public Object postMatch(DynamicObject matchData) {
return taintResultNode.maybeTaint(Layouts.MATCH_DATA.getSource(matchData), Layouts.MATCH_DATA.getPost(matchData));
@@ -443,10 +437,9 @@ public ToANode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@CompilerDirectives.TruffleBoundary
@Specialization
public DynamicObject toA(DynamicObject matchData) {
CompilerDirectives.transferToInterpreter();

Object[] objects = Arrays.copyOf(Layouts.MATCH_DATA.getValues(matchData), Layouts.MATCH_DATA.getValues(matchData).length);
return Layouts.ARRAY.createArray(getContext().getCoreLibrary().getArrayFactory(), objects, objects.length);
}
@@ -459,10 +452,9 @@ public ToSNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@CompilerDirectives.TruffleBoundary
@Specialization
public DynamicObject toS(DynamicObject matchData) {
CompilerDirectives.transferToInterpreter();

final ByteList bytes = Layouts.STRING.getByteList(Layouts.MATCH_DATA.getGlobal(matchData)).dup();
return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), bytes, StringSupport.CR_UNKNOWN, null);
}
@@ -475,6 +467,7 @@ public RegexpNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@CompilerDirectives.TruffleBoundary
@Specialization
public DynamicObject regexp(DynamicObject matchData) {
return Layouts.MATCH_DATA.getRegexp(matchData);
@@ -489,6 +482,7 @@ public RubiniusSourceNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@CompilerDirectives.TruffleBoundary
@Specialization
public DynamicObject rubiniusSource(DynamicObject matchData) {
return Layouts.MATCH_DATA.getSource(matchData);

0 comments on commit e4834a0

Please sign in to comment.