Ticket #1635: loopunroll.patch

src/pmc/exceptionhandler.pmc

@@ -32 +32 @@
     ATTR PMC    *handled_types_except;
     ATTR INTVAL min_severity;
     ATTR INTVAL max_severity;
+    ATTR void   *runloop_from;
 
 /*
 
@@ -112 +113 @@
         return PARROT_CONTINUATION(SELF)->invoked;
     }
 
+    VTABLE void set_pointer(void *value) {
+        SUPER(value);
+        SET_ATTR_runloop_from(INTERP, SELF, INTERP->current_runloop);
+    }
+
 /*
 
 =item C<opcode_t *invoke(void *next)>
@@ -300 +306 @@
                 : PMCNULL;
     }
 
+
+    METHOD rewind(INTVAL pos) {
+        INTVAL cid = INTERP->current_runloop_id;
+        INTVAL rid;
+        GET_ATTR_runloop_id(INTERP, SELF, rid);
+        if (rid != cid) {
+            void *vrl;
+            Parrot_runloop *rl, *cur, *old;
+            Parrot_eprintf(INTERP, "rid: %d cid: %d\n", rid, cid);
+            GET_ATTR_runloop_from(INTERP, SELF, vrl);
+            rl = (Parrot_runloop *)vrl;
+            while (INTERP->current_runloop != rl)
+                free_runloop_jump_point(INTERP);
+            rl->handler_start = (opcode_t *)pos;
+            longjmp(rl->resume, 3);
+        }
+    }
+
 }
 
 /*

src/call/ops.c

@@ -105 +105 @@
             offset = interp->current_runloop->handler_start - interp->code->base.data;
             /* Prevent incorrect reuse */
             goto reenter;
+          case 3:
+            /* runloop rewind from exception handling */
+            offset = interp->current_runloop->handler_start - interp->code->base.data;
+            interp->current_runloop_level = our_runloop_level;
+            interp->current_runloop_id    = our_runloop_id;
+            goto reenter;
           default:
             break;
         }