jruby · Mar 29, 2016 · Mar 29, 2016 · Mar 29, 2016 · Mar 29, 2016 · Mar 29, 2016
diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
@@ -51,7 +51,7 @@
 import org.jruby.truffle.core.format.exceptions.CantConvertException;
 import org.jruby.truffle.core.format.exceptions.NoImplicitConversionException;
 import org.jruby.truffle.core.format.exceptions.OutsideOfStringException;
-import org.jruby.truffle.core.format.exceptions.PackException;
+import org.jruby.truffle.core.format.exceptions.FormatException;
 import org.jruby.truffle.core.format.exceptions.RangeException;
 import org.jruby.truffle.core.format.exceptions.TooFewArgumentsException;
 import org.jruby.truffle.core.kernel.KernelNodes;
@@ -2406,7 +2406,7 @@ public DynamicObject packCached(
 
             try {
                 result = (BytesResult) callPackNode.call(frame, new Object[] { getStore(array), getSize(array) });
-            } catch (PackException e) {
+            } catch (FormatException e) {
                 CompilerDirectives.transferToInterpreter();
                 throw handleException(e);
             }
@@ -2424,15 +2424,15 @@ public DynamicObject packUncached(
 
             try {
                 result = (BytesResult) callPackNode.call(frame, compileFormat(format), new Object[] { getStore(array), getSize(array) });
-            } catch (PackException e) {
+            } catch (FormatException e) {
                 CompilerDirectives.transferToInterpreter();
                 throw handleException(e);
             }
 
             return finishPack(Layouts.STRING.getRope(format).byteLength(), result);
         }
 
-        private RuntimeException handleException(PackException exception) {
+        private RuntimeException handleException(FormatException exception) {
             try {
                 throw exception;
             } catch (TooFewArgumentsException e) {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/SharedTreeBuilder.java b/truffle/src/main/java/org/jruby/truffle/core/format/SharedTreeBuilder.java
@@ -10,7 +10,8 @@
 package org.jruby.truffle.core.format;
 
 import org.jruby.truffle.RubyContext;
-import org.jruby.truffle.core.format.control.NNode;
+import org.jruby.truffle.core.format.control.RepeatExplodedNode;
+import org.jruby.truffle.core.format.control.RepeatLoopNode;
 import org.jruby.truffle.core.format.control.SequenceNode;
 import org.jruby.truffle.core.format.control.StarNode;
 import org.jruby.truffle.core.format.pack.PackParser;
@@ -33,20 +34,28 @@ public FormatNode finishSubSequence(Deque<List<FormatNode>> sequenceStack, PackP
         if (ctx.INT() == null) {
             return sequenceNode;
         } else {
-            return new NNode(context, Integer.parseInt(ctx.INT().getText()), sequenceNode);
+            return createRepeatNode(Integer.parseInt(ctx.INT().getText()), sequenceNode);
         }
     }
 
     public FormatNode applyCount(PackParser.CountContext count, FormatNode node) {
         if (count == null) {
             return node;
         } else if (count.INT() != null) {
-            return new NNode(context, Integer.parseInt(count.INT().getText()), node);
+            return createRepeatNode(Integer.parseInt(count.INT().getText()), node);
         } else {
             return new StarNode(context, node);
         }
     }
 
+    private FormatNode createRepeatNode(int count, FormatNode node) {
+        if (count > context.getOptions().PACK_UNROLL_LIMIT) {
+            return new RepeatLoopNode(context, count, node);
+        } else {
+            return new RepeatExplodedNode(context, count, node);
+        }
+    }
+
     public StarLength parseCountContext(PackParser.CountContext ctx) {
         final boolean star;
         final int length;

diff --git a/...ore/format/control/ForwardUnpackNode.java → ...at/control/AdvanceSourcePositionNode.java b/...ore/format/control/ForwardUnpackNode.java → ...at/control/AdvanceSourcePositionNode.java
@@ -10,15 +10,18 @@
 package org.jruby.truffle.core.format.control;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
 import org.jruby.truffle.core.format.exceptions.OutsideOfStringException;
 
-public class ForwardUnpackNode extends FormatNode {
+public class AdvanceSourcePositionNode extends FormatNode {
 
-    private boolean toEnd;
+    private final boolean toEnd;
 
-    public ForwardUnpackNode(RubyContext context, boolean toEnd) {
+    private final ConditionProfile rangeProfile = ConditionProfile.createBinaryProfile();
+
+    public AdvanceSourcePositionNode(RubyContext context, boolean toEnd) {
         super(context);
         this.toEnd = toEnd;
     }
@@ -30,7 +33,7 @@ public Object execute(VirtualFrame frame) {
         } else {
             final int position = getSourcePosition(frame);
 
-            if (position + 1 > getSourceLength(frame)) {
+            if (rangeProfile.profile(position + 1 > getSourceLength(frame))) {
                 throw new OutsideOfStringException();
             }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/control/NNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/control/NNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/control/RepeatExplodedNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/control/RepeatExplodedNode.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.core.format.control;
+
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.ExplodeLoop;
+import org.jruby.truffle.RubyContext;
+import org.jruby.truffle.core.format.FormatNode;
+
+public class RepeatExplodedNode extends FormatNode {
+
+    private final int count;
+
+    @Child private FormatNode child;
+
+    public RepeatExplodedNode(RubyContext context, int count, FormatNode child) {
+        super(context);
+        this.count = count;
+        this.child = child;
+    }
+
+    @Override
+    @ExplodeLoop
+    public Object execute(VirtualFrame frame) {
+        for (int i = 0; i < count; i++) {
+            child.execute(frame);
+        }
+
+        return null;
+    }
+
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/control/RepeatLoopNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/control/RepeatLoopNode.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.core.format.control;
+
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import org.jruby.truffle.RubyContext;
+import org.jruby.truffle.core.format.FormatNode;
+
+public class RepeatLoopNode extends FormatNode {
+
+    private final int count;
+
+    @Child private FormatNode child;
+
+    public RepeatLoopNode(RubyContext context, int count, FormatNode child) {
+        super(context);
+        this.count = count;
+        this.child = child;
+    }
+
+    @Override
+    public Object execute(VirtualFrame frame) {
+        for (int i = 0; i < count; i++) {
+            child.execute(frame);
+        }
+
+        if (CompilerDirectives.inInterpreter()) {
+            getRootNode().reportLoopCount(count);
+        }
+
+        return null;
+    }
+
+}
diff --git a/...truffle/core/format/control/BackNode.java → ...at/control/ReverseOutputPositionNode.java b/...truffle/core/format/control/BackNode.java → ...at/control/ReverseOutputPositionNode.java
@@ -11,34 +11,28 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
 import org.jruby.truffle.core.format.exceptions.OutsideOfStringException;
 
-/**
- * Moves the output position to the previous byte - similar to seek
- * absolute -1 in a file stream.
- * <pre>
- * [0xabcd, 0x1234].pack('NN') # => "\x00\x00\xAB\xCD\x00\x00\x124"
- * [0xabcd, 0x1234].pack('NXN') # => "\x00\x00\xAB\x00\x00\x124"
- */
-public class BackNode extends FormatNode {
+public class ReverseOutputPositionNode extends FormatNode {
+
+    private final ConditionProfile rangeProfile = ConditionProfile.createBinaryProfile();
 
-    public BackNode(RubyContext context) {
+    public ReverseOutputPositionNode(RubyContext context) {
         super(context);
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
         final int position = getOutputPosition(frame);
 
-        if (position == 0) {
-            CompilerDirectives.transferToInterpreter();
+        if (rangeProfile.profile(position == 0)) {
             throw new OutsideOfStringException();
         }
 
         setOutputPosition(frame, position - 1);
-
         return null;
     }
 

diff --git a/...e/core/format/control/BackUnpackNode.java → ...at/control/ReverseSourcePositionNode.java b/...e/core/format/control/BackUnpackNode.java → ...at/control/ReverseSourcePositionNode.java
@@ -11,15 +11,18 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
 import org.jruby.truffle.core.format.exceptions.OutsideOfStringException;
 
-public class BackUnpackNode extends FormatNode {
+public class ReverseSourcePositionNode extends FormatNode {
 
     private boolean star;
 
-    public BackUnpackNode(RubyContext context, boolean star) {
+    private final ConditionProfile rangeProfile = ConditionProfile.createBinaryProfile();
+
+    public ReverseSourcePositionNode(RubyContext context, boolean star) {
         super(context);
         this.star = star;
     }
@@ -33,22 +36,19 @@ public Object execute(VirtualFrame frame) {
 
             final int target = position - remaining;
 
-            if (target < 0) {
-                CompilerDirectives.transferToInterpreter();
+            if (rangeProfile.profile(target < 0)) {
                 throw new OutsideOfStringException();
             }
 
             setSourcePosition(frame, target);
         } else {
-            if (position == 0) {
-                CompilerDirectives.transferToInterpreter();
+            if (rangeProfile.profile(position == 0)) {
                 throw new OutsideOfStringException();
             }
 
             setSourcePosition(frame, position - 1);
         }
 
-
         return null;
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/control/SequenceNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/control/SequenceNode.java
@@ -15,16 +15,11 @@
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
 
-/**
- * Run a sequence of child nodes.
- * <pre>
- * [1, 2, 3].pack('CCC') # =>  "\x01\x02\x03"
- */
 public class SequenceNode extends FormatNode {
 
     @Children private final FormatNode[] children;
 
-    public SequenceNode(RubyContext context, FormatNode... children) {
+    public SequenceNode(RubyContext context, FormatNode[] children) {
         super(context);
         this.children = children;
     }

diff --git a/...y/truffle/core/format/control/AtNode.java → ...format/control/SetOutputPositionNode.java b/...y/truffle/core/format/control/AtNode.java → ...format/control/SetOutputPositionNode.java
@@ -13,18 +13,11 @@
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
 
-/**
- * Moves the output position to a particular location - similar to seek
- * absolute in a file stream.
- * <pre>
- * [0xabcd].pack('N') # => "\x00\x00\xAB\xCD"
- * [0xabcd].pack('@2N') # => "\x00\x00\x00\x00\xAB\xCD"
- */
-public class AtNode extends FormatNode {
+public class SetOutputPositionNode extends FormatNode {
 
     private final int position;
 
-    public AtNode(RubyContext context, int position) {
+    public SetOutputPositionNode(RubyContext context, int position) {
         super(context);
         this.position = position;
     }