[svn:parrot] r44613 - in trunk: include/parrot lib/Parrot

[cotto at svn.parrot.org]

Author: cotto
Date: Thu Mar  4 03:24:39 2010
New Revision: 44613
URL: https://trac.parrot.org/parrot/changeset/44613

Log:
[ops2c] remove some unused enums from op_jump_t, plus supporting code

Modified:
   trunk/include/parrot/op.h
   trunk/lib/Parrot/OpsFile.pm

Modified: trunk/include/parrot/op.h
==============================================================================
--- trunk/include/parrot/op.h	Thu Mar  4 03:17:54 2010	(r44612)
+++ trunk/include/parrot/op.h	Thu Mar  4 03:24:39 2010	(r44613)
@@ -52,12 +52,8 @@
 /* See lib/Parrot/OpsFile.pm if the names of these values change */
 typedef enum {
     PARROT_JUMP_RELATIVE = 1,
-    PARROT_JUMP_ADDRESS = 2,
-    PARROT_JUMP_POP = 4,
-    PARROT_JUMP_ENEXT = 8,
-    PARROT_JUMP_GNEXT = 16,
-    PARROT_JUMP_UNPREDICTABLE = 32,
-    PARROT_JUMP_RESTART = 64
+    PARROT_JUMP_ADDRESS  = 2,
+    PARROT_JUMP_ENEXT    = 4
 } op_jump_t;
 
 /* NOTE: Sure wish we could put the types here... */

Modified: trunk/lib/Parrot/OpsFile.pm
==============================================================================
--- trunk/lib/Parrot/OpsFile.pm	Thu Mar  4 03:17:54 2010	(r44612)
+++ trunk/lib/Parrot/OpsFile.pm	Thu Mar  4 03:24:39 2010	(r44613)
@@ -561,14 +561,6 @@
         or_flag( \$jumps, "PARROT_JUMP_ADDRESS"  ) if $absolute;
         or_flag( \$jumps, "PARROT_JUMP_RELATIVE" ) if $branch;
         or_flag( \$jumps, "PARROT_JUMP_ENEXT"    ) if $next;
-        or_flag( \$jumps, "PARROT_JUMP_RESTART"  ) if $restart;
-
-        # I'm assuming the op branches to the value in the last argument.
-        if ( ($jumps)
-            && ( $fixedargs[ @fixedargs - 1 ] )
-            && ( $fixedargs[ @fixedargs - 1 ] eq 'i' ) ) {
-            or_flag( \$jumps, "PARROT_JUMP_GNEXT" );
-        }
 
         $op->jump($jumps);
         $self->push_op($op);